diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2009-12-01 11:18:46 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2009-12-01 11:18:46 +0000 |
| commit | 0bac8f16fb9323568d4609e6b749a4bf0bdf3948 (patch) | |
| tree | 16d3c34fecb6dfa0765dd81289626560711c750f /net-print/hplip | |
| parent | Version bump KDE 4.3.4 (diff) | |
| download | gentoo-2-0bac8f16fb9323568d4609e6b749a4bf0bdf3948.tar.gz gentoo-2-0bac8f16fb9323568d4609e6b749a4bf0bdf3948.tar.bz2 gentoo-2-0bac8f16fb9323568d4609e6b749a4bf0bdf3948.zip | |
Fix dependencies over cups to avoid downgrades to 1.3 for users with zeroconf USE flag enabled.
(Portage version: 2.2_rc54/cvs/Linux x86_64)
Diffstat (limited to 'net-print/hplip')
| -rw-r--r-- | net-print/hplip/ChangeLog | 7 | ||||
| -rw-r--r-- | net-print/hplip/hplip-3.9.10.ebuild | 7 | ||||
| -rw-r--r-- | net-print/hplip/hplip-3.9.8-r3.ebuild | 7 |
3 files changed, 14 insertions, 7 deletions
diff --git a/net-print/hplip/ChangeLog b/net-print/hplip/ChangeLog index d29abe5389a2..b61bdc71aca1 100644 --- a/net-print/hplip/ChangeLog +++ b/net-print/hplip/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-print/hplip # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.133 2009/11/30 18:20:27 billie Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.134 2009/12/01 11:18:46 flameeyes Exp $ + + 01 Dec 2009; Diego E. Pettenò <flameeyes@gentoo.org> + hplip-3.9.8-r3.ebuild, hplip-3.9.10.ebuild: + Fix dependencies over cups to avoid downgrades to 1.3 for users with + zeroconf USE flag enabled. 30 Nov 2009; Daniel Pielmeier <billie@gentoo.org> hplip-2.8.6b.ebuild, hplip-3.9.4b-r1.ebuild, hplip-3.9.8-r3.ebuild, hplip-3.9.10.ebuild: diff --git a/net-print/hplip/hplip-3.9.10.ebuild b/net-print/hplip/hplip-3.9.10.ebuild index 1e4a6cd780de..8714173a9df8 100644 --- a/net-print/hplip/hplip-3.9.10.ebuild +++ b/net-print/hplip/hplip-3.9.10.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.9.10.ebuild,v 1.3 2009/11/30 18:20:27 billie Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.9.10.ebuild,v 1.4 2009/12/01 11:18:46 flameeyes Exp $ EAPI="2" @@ -22,10 +22,11 @@ COMMON_DEPEND=" virtual/ghostscript media-libs/jpeg hpijs? ( >=net-print/foomatic-filters-3.0.20080507[cups] ) - !static-ppds? ( || ( >=net-print/cups-1.4.0[zeroconf?] net-print/cupsddk ) ) + !static-ppds? ( || ( >=net-print/cups-1.4.0 net-print/cupsddk ) ) udev-acl? ( >=sys-fs/udev-145[extras] ) !minimal? ( - net-print/cups[zeroconf?] + !zeroconf? ( net-print/cups ) + zeroconf? ( || ( net-print/cups[avahi] net-print/cups[zeroconf] ) ) virtual/libusb:0 >=dev-lang/python-2.4.4[threads,xml] scanner? ( >=media-gfx/sane-backends-1.0.19-r1 ) diff --git a/net-print/hplip/hplip-3.9.8-r3.ebuild b/net-print/hplip/hplip-3.9.8-r3.ebuild index a4c837e04712..ed726cfa4891 100644 --- a/net-print/hplip/hplip-3.9.8-r3.ebuild +++ b/net-print/hplip/hplip-3.9.8-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.9.8-r3.ebuild,v 1.2 2009/11/30 18:20:27 billie Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.9.8-r3.ebuild,v 1.3 2009/12/01 11:18:46 flameeyes Exp $ EAPI="2" @@ -22,10 +22,11 @@ COMMON_DEPEND=" virtual/ghostscript media-libs/jpeg hpijs? ( >=net-print/foomatic-filters-3.0.20080507[cups] ) - !static-ppds? ( || ( >=net-print/cups-1.4.0[zeroconf?] net-print/cupsddk ) ) + !static-ppds? ( || ( >=net-print/cups-1.4.0 net-print/cupsddk ) ) udev-acl? ( >=sys-fs/udev-145[extras] ) !minimal? ( - net-print/cups[zeroconf?] + !zeroconf? ( net-print/cups ) + zeroconf? ( || ( net-print/cups[avahi] net-print/cups[zeroconf] ) ) virtual/libusb:0 >=dev-lang/python-2.4.4[threads,xml] scanner? ( >=media-gfx/sane-backends-1.0.19-r1 ) |