Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/net-print
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2009-12-01 12:43:27 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2009-12-01 12:43:27 +0000
commita0c70dc8c7ec0bdbcfefee59e963129dc4b05801 (patch)
tree887e828759a6e574edc324dffa5be64259fdb584 /net-print
parentclean up (diff)
downloadhistorical-a0c70dc8c7ec0bdbcfefee59e963129dc4b05801.tar.gz
historical-a0c70dc8c7ec0bdbcfefee59e963129dc4b05801.tar.bz2
historical-a0c70dc8c7ec0bdbcfefee59e963129dc4b05801.zip
Actually, remove the zeroconf USE flag, since it was only used to depend on cups[zeroconf] (which would force a downgrade of cups).
Package-Manager: portage-2.2_rc54/cvs/Linux x86_64
Diffstat (limited to 'net-print')
-rw-r--r--net-print/hplip/ChangeLog7
-rw-r--r--net-print/hplip/Manifest13
-rw-r--r--net-print/hplip/hplip-3.9.10.ebuild12
-rw-r--r--net-print/hplip/hplip-3.9.8-r3.ebuild12
4 files changed, 25 insertions, 19 deletions
diff --git a/net-print/hplip/ChangeLog b/net-print/hplip/ChangeLog
index b61bdc71aca1..407c4cc3b6c5 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.134 2009/12/01 11:18:46 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.135 2009/12/01 12:43:27 flameeyes Exp $
+
+ 01 Dec 2009; Diego E. Pettenò <flameeyes@gentoo.org>
+ hplip-3.9.8-r3.ebuild, hplip-3.9.10.ebuild:
+ Actually, remove the zeroconf USE flag, since it was only used to depend
+ on cups[zeroconf] (which would force a downgrade of cups).
01 Dec 2009; Diego E. Pettenò <flameeyes@gentoo.org>
hplip-3.9.8-r3.ebuild, hplip-3.9.10.ebuild:
diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index b4ea2ab7633f..da03a5fbf16c 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -10,15 +10,16 @@ DIST hplip-3.9.10.tar.gz 20999540 RMD160 65ea83e53bc19df0e2a054e723c74734fc5f39a
DIST hplip-3.9.4b.tar.gz 15712313 RMD160 bfed762c59b8dc2210d450ba86a5636773831cc1 SHA1 d2b06f1ee347a1f3aacd6b52600d08fc71ac5b12 SHA256 57496c01fb3ead9678e630c1c4a385e156b76d328440da550ebfc24b95ff8b1a
DIST hplip-3.9.8.tar.gz 15715640 RMD160 8b06537176bfb32d32ae20eec1cfa6765609ecc0 SHA1 bcf0d1d8d6a006dd00224b4f90c208c21af28e55 SHA256 6471d99bde2b1182f45082c50dbd9e424a3ec2c0e98c48c934a1cd0d4ccb4e36
EBUILD hplip-2.8.6b.ebuild 5243 RMD160 340bda9d2f26d4a6440a06ab40d25f7bab6ec8b5 SHA1 bb3a445a0b8d433985876ef91c01b8f18968935e SHA256 771ac5ef5f0a0b9c089b21a46bf4809d2e867d62c7a1b5e48d70a0f8154488af
-EBUILD hplip-3.9.10.ebuild 8478 RMD160 f74d121542c0f967a971fd5e9b8621833fcc803b SHA1 7453eff8457ef6eb6c4a00658feb0b36e07e0788 SHA256 1eaa43d61abc76498db83052223d2633e90df5cc9a46d78fc10353423eb89279
+EBUILD hplip-3.9.10.ebuild 8400 RMD160 c166da115529cf57c9049f1862525136a4a89ae3 SHA1 95072176952f793c1bf7b3d449d4beec8cb422a4 SHA256 db04e8f1011b9c986983bf2e2ea4ea6d6fd6d46990c486815f70006b1f82f2e9
EBUILD hplip-3.9.4b-r1.ebuild 6465 RMD160 99c22e2497c695a6f4756953ffba4006e035572c SHA1 739c86c85cc82a28c4344953be33d7a16573c5df SHA256 34547dc3ad9b7a905fc86380a10c8a8b8c010a3deb576544ac9f74b21e6d1840
-EBUILD hplip-3.9.8-r3.ebuild 8121 RMD160 ac29400dae4ddaf1ad5db40f4434481980e0d3e9 SHA1 9536ef91ee168c2d6e934d51d5c07a1f9bb3e810 SHA256 18348f0652b3bc708b1affaaca2a0c2bd4c8ed1a0b5ba25d2eea6c54b681fd72
-MISC ChangeLog 22966 RMD160 51e63a756edd55d57db9111af5d3d94262d3d03c SHA1 5bde5bcb3f70d07948a00122423156de07df289c SHA256 46160cb1ed0d7ccdf2725cfa3677b52a234be13ad0f679a0e56907870ff921fe
+EBUILD hplip-3.9.8-r3.ebuild 8043 RMD160 3fb2bc1970f674254cf33dce4f28909cfc579155 SHA1 0902a36e7f5e78294b6d0161bd972f3039ca7a0b SHA256 6b506822b4514d3a949b29343337eb820621a8329b0807ebca963c6721a3c262
+MISC ChangeLog 23205 RMD160 6f2e9554da3fb08ae4ce7db904aa5c6a9c3f8617 SHA1 d692a5e53b96e9d57381ac7988ae1ac126b768af SHA256 37a068bb1722bb12cf00d65a32f6b5b899d11bbc59b4d6ddc13672a920c11284
+MISC hplip-3.9.8-r3.ebuild.rej 527 RMD160 f1ea0ae940b9081dbcdd35c3d511dac2bd74972b SHA1 c629d249d362a5e8fd32666f77fe5becc10f8fc1 SHA256 4323c8261d2cc2b895510ca6674542510239fa429daf2c198140b8539ff69b74
MISC metadata.xml 2717 RMD160 b9498de6ef7a6c2a576e672b2116857ef1ec44b5 SHA1 810311f22a22a0d414525931c1ef4896abaf4840 SHA256 9e157960d81e23c7b7a56271f4e3cad18e450e238f4abe32ae6952cca4f0bc9f
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.13 (GNU/Linux)
-iEYEARECAAYFAksU+0wACgkQAiZjviIA2Xi2ywCfYjV47IK11O/YfcFvxr1iiltJ
-4vUAnil52s+bHjmKpfm2u6O8ZAoG5a8G
-=XoB3
+iEYEARECAAYFAksVDyUACgkQAiZjviIA2XhUKgCfeMEtsnZvRQtQH6jyrooyxa9i
+4K0AoNxWiTQTLKaDPeGg7ToiqM+x5dOC
+=THod
-----END PGP SIGNATURE-----
diff --git a/net-print/hplip/hplip-3.9.10.ebuild b/net-print/hplip/hplip-3.9.10.ebuild
index 8714173a9df8..6580ed54e0d8 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.4 2009/12/01 11:18:46 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.9.10.ebuild,v 1.5 2009/12/01 12:43:27 flameeyes Exp $
EAPI="2"
@@ -14,7 +14,7 @@ LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="doc fax gtk +hpcups hpijs libnotify minimal -new-hpcups parport policykit qt3 qt4 scanner snmp static-ppds -udev-acl zeroconf"
+IUSE="doc fax gtk +hpcups hpijs libnotify minimal -new-hpcups parport policykit qt3 qt4 scanner snmp static-ppds -udev-acl"
# Note : libusb-compat untested (calchan 20090516)
@@ -25,8 +25,7 @@ COMMON_DEPEND="
!static-ppds? ( || ( >=net-print/cups-1.4.0 net-print/cupsddk ) )
udev-acl? ( >=sys-fs/udev-145[extras] )
!minimal? (
- !zeroconf? ( net-print/cups )
- zeroconf? ( || ( net-print/cups[avahi] net-print/cups[zeroconf] ) )
+ net-print/cups
virtual/libusb:0
>=dev-lang/python-2.4.4[threads,xml]
scanner? ( >=media-gfx/sane-backends-1.0.19-r1 )
@@ -267,8 +266,9 @@ pkg_postinst() {
elog "'rc-update del hplip' if you are updating from an old version."
elog
elog "Starting with versions of hplip >=3.9.8 mDNS is the default network search"
- elog "mechanism. To make use of it you need to activate the zeroconf flag. If you"
- elog "prefer the SLP method you have to choose this when configuring the device."
+ elog "mechanism. To make use of it you need to activate the zeroconf flag on cups."
+ elog "If you prefer the SLP method you have to choose this when configuring the"
+ elog "device."
}
pkg_postrm() {
diff --git a/net-print/hplip/hplip-3.9.8-r3.ebuild b/net-print/hplip/hplip-3.9.8-r3.ebuild
index ed726cfa4891..d599e91177a3 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.3 2009/12/01 11:18:46 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.9.8-r3.ebuild,v 1.4 2009/12/01 12:43:27 flameeyes Exp $
EAPI="2"
@@ -14,7 +14,7 @@ LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="doc fax gtk +hpcups hpijs libnotify minimal parport policykit qt3 qt4 scanner snmp static-ppds -udev-acl zeroconf"
+IUSE="doc fax gtk +hpcups hpijs libnotify minimal parport policykit qt3 qt4 scanner snmp static-ppds -udev-acl"
# Note : libusb-compat untested (calchan 20090516)
@@ -25,8 +25,7 @@ COMMON_DEPEND="
!static-ppds? ( || ( >=net-print/cups-1.4.0 net-print/cupsddk ) )
udev-acl? ( >=sys-fs/udev-145[extras] )
!minimal? (
- !zeroconf? ( net-print/cups )
- zeroconf? ( || ( net-print/cups[avahi] net-print/cups[zeroconf] ) )
+ net-print/cups
virtual/libusb:0
>=dev-lang/python-2.4.4[threads,xml]
scanner? ( >=media-gfx/sane-backends-1.0.19-r1 )
@@ -256,8 +255,9 @@ pkg_postinst() {
elog "'rc-update del hplip' if you are updating from an old version."
elog
elog "Starting with versions of hplip >=3.9.8 mDNS is the default network search"
- elog "mechanism. To make use of it you need to activate the zeroconf flag. If you"
- elog "prefer the SLP method you have to choose this when configuring the device."
+ elog "mechanism. To make use of it you need to activate the zeroconf flag on cups."
+ elog "If you prefer the SLP method you have to choose this when configuring the"
+ elog "device."
}
pkg_postrm() {