diff options
| author |   Stefan Schweizer <genstef@gentoo.org> | 2006-08-18 19:53:34 +0000 |
|---|---|---|
| committer | Stefan Schweizer <genstef@gentoo.org> | 2006-08-18 19:53:34 +0000 |
| commit | 16b27ea4c4c7f91446e3928d9220a78466e2c252 (patch) | |
| tree | 3a35a8bd2ec54609f71c5d45bf6f5700d8a00fe5 /net-print | |
| parent | minor fixups as suggested by ferdy (bug #144336) (diff) | |
| download | gentoo-2-16b27ea4c4c7f91446e3928d9220a78466e2c252.tar.gz gentoo-2-16b27ea4c4c7f91446e3928d9220a78466e2c252.tar.bz2 gentoo-2-16b27ea4c4c7f91446e3928d9220a78466e2c252.zip | |
Depend with X useflag on xdg-utils to select the browser thanks to Wiktor Wandachowicz <siryes@gmail.com> in bug 137934
(Portage version: 2.1.1_pre5-r2)
Diffstat (limited to 'net-print')
| -rw-r--r-- | net-print/cups/ChangeLog | 6 | ||||
| -rw-r--r-- | net-print/cups/cups-1.2.2.ebuild | 16 |
2 files changed, 18 insertions, 4 deletions
diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog index bb01e5a1d33c..7e2e4168c3a6 100644 --- a/net-print/cups/ChangeLog +++ b/net-print/cups/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-print/cups # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.193 2006/08/17 23:59:44 genstef Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.194 2006/08/18 19:53:34 genstef Exp $ + + 18 Aug 2006; Stefan Schweizer <genstef@gentoo.org> cups-1.2.2.ebuild: + Depend with X useflag on xdg-utils to select the browser thanks to Wiktor + Wandachowicz <siryes@gmail.com> in bug 137934 17 Aug 2006; Stefan Schweizer <genstef@gentoo.org> cups-1.1.23-r8.ebuild, cups-1.2.2.ebuild: diff --git a/net-print/cups/cups-1.2.2.ebuild b/net-print/cups/cups-1.2.2.ebuild index db7ff1eb6559..a676800125b4 100644 --- a/net-print/cups/cups-1.2.2.ebuild +++ b/net-print/cups/cups-1.2.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.2.2.ebuild,v 1.2 2006/08/17 23:59:44 genstef Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.2.2.ebuild,v 1.3 2006/08/18 19:53:34 genstef Exp $ inherit autotools eutils flag-o-matic multilib pam @@ -14,7 +14,7 @@ SRC_URI="http://ftp.easysw.com/pub/cups/${PV}/${MY_P}-source.tar.bz2" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE="ssl slp pam samba nls gnutls dbus tiff png ppds jpeg" +IUSE="ssl slp pam samba nls gnutls dbus tiff png ppds jpeg X" DEP="pam? ( virtual/pam ) ssl? ( @@ -44,7 +44,10 @@ RDEPEND="${DEP} media-gfx/gimp-print net-print/foo2zjs net-print/cups-pdf - ) )" + ) ) + X? ( x86? ( x11-misc/xdg-utils ) ) + " + # keywording xdg-utils in bug 144345 PDEPEND="samba? ( >=net-fs/samba-3.0.8 ) virtual/ghostscript" PROVIDE="virtual/lpr" @@ -137,6 +140,13 @@ src_install() { keepdir /usr/share/cups/profiles /usr/libexec/cups/driver /var/log/cups \ /var/run/cups/certs /var/cache/cups /var/spool/cups/tmp + + # .desktop handling. X useflag. xdg-open from freedesktop is preferred + if use X; then + sed -i -e "s:htmlview:xdg-open:" ${D}/usr/share/applications/cups.desktop + else + rm -r ${D}/usr/share/applications + fi } pkg_preinst() { |