| 1 |
flameeyes 09/12/01 12:43:28 |
| 2 |
|
| 3 |
Modified: ChangeLog hplip-3.9.10.ebuild hplip-3.9.8-r3.ebuild |
| 4 |
Log: |
| 5 |
Actually, remove the zeroconf USE flag, since it was only used to depend on cups[zeroconf] (which would force a downgrade of cups). |
| 6 |
(Portage version: 2.2_rc54/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.135 net-print/hplip/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/hplip/ChangeLog?rev=1.135&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/hplip/ChangeLog?rev=1.135&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/hplip/ChangeLog?r1=1.134&r2=1.135 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v |
| 18 |
retrieving revision 1.134 |
| 19 |
retrieving revision 1.135 |
| 20 |
diff -u -r1.134 -r1.135 |
| 21 |
--- ChangeLog 1 Dec 2009 11:18:46 -0000 1.134 |
| 22 |
+++ ChangeLog 1 Dec 2009 12:43:27 -0000 1.135 |
| 23 |
@@ -1,6 +1,11 @@ |
| 24 |
# ChangeLog for net-print/hplip |
| 25 |
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.134 2009/12/01 11:18:46 flameeyes Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.135 2009/12/01 12:43:27 flameeyes Exp $ |
| 28 |
+ |
| 29 |
+ 01 Dec 2009; Diego E. Pettenò <flameeyes@g.o> |
| 30 |
+ hplip-3.9.8-r3.ebuild, hplip-3.9.10.ebuild: |
| 31 |
+ Actually, remove the zeroconf USE flag, since it was only used to depend |
| 32 |
+ on cups[zeroconf] (which would force a downgrade of cups). |
| 33 |
|
| 34 |
01 Dec 2009; Diego E. Pettenò <flameeyes@g.o> |
| 35 |
hplip-3.9.8-r3.ebuild, hplip-3.9.10.ebuild: |
| 36 |
|
| 37 |
|
| 38 |
|
| 39 |
1.5 net-print/hplip/hplip-3.9.10.ebuild |
| 40 |
|
| 41 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/hplip/hplip-3.9.10.ebuild?rev=1.5&view=markup |
| 42 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/hplip/hplip-3.9.10.ebuild?rev=1.5&content-type=text/plain |
| 43 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/hplip/hplip-3.9.10.ebuild?r1=1.4&r2=1.5 |
| 44 |
|
| 45 |
Index: hplip-3.9.10.ebuild |
| 46 |
=================================================================== |
| 47 |
RCS file: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.9.10.ebuild,v |
| 48 |
retrieving revision 1.4 |
| 49 |
retrieving revision 1.5 |
| 50 |
diff -u -r1.4 -r1.5 |
| 51 |
--- hplip-3.9.10.ebuild 1 Dec 2009 11:18:46 -0000 1.4 |
| 52 |
+++ hplip-3.9.10.ebuild 1 Dec 2009 12:43:27 -0000 1.5 |
| 53 |
@@ -1,6 +1,6 @@ |
| 54 |
# Copyright 1999-2009 Gentoo Foundation |
| 55 |
# Distributed under the terms of the GNU General Public License v2 |
| 56 |
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.9.10.ebuild,v 1.4 2009/12/01 11:18:46 flameeyes Exp $ |
| 57 |
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.9.10.ebuild,v 1.5 2009/12/01 12:43:27 flameeyes Exp $ |
| 58 |
|
| 59 |
EAPI="2" |
| 60 |
|
| 61 |
@@ -14,7 +14,7 @@ |
| 62 |
SLOT="0" |
| 63 |
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" |
| 64 |
|
| 65 |
-IUSE="doc fax gtk +hpcups hpijs libnotify minimal -new-hpcups parport policykit qt3 qt4 scanner snmp static-ppds -udev-acl zeroconf" |
| 66 |
+IUSE="doc fax gtk +hpcups hpijs libnotify minimal -new-hpcups parport policykit qt3 qt4 scanner snmp static-ppds -udev-acl" |
| 67 |
|
| 68 |
# Note : libusb-compat untested (calchan 20090516) |
| 69 |
|
| 70 |
@@ -25,8 +25,7 @@ |
| 71 |
!static-ppds? ( || ( >=net-print/cups-1.4.0 net-print/cupsddk ) ) |
| 72 |
udev-acl? ( >=sys-fs/udev-145[extras] ) |
| 73 |
!minimal? ( |
| 74 |
- !zeroconf? ( net-print/cups ) |
| 75 |
- zeroconf? ( || ( net-print/cups[avahi] net-print/cups[zeroconf] ) ) |
| 76 |
+ net-print/cups |
| 77 |
virtual/libusb:0 |
| 78 |
>=dev-lang/python-2.4.4[threads,xml] |
| 79 |
scanner? ( >=media-gfx/sane-backends-1.0.19-r1 ) |
| 80 |
@@ -267,8 +266,9 @@ |
| 81 |
elog "'rc-update del hplip' if you are updating from an old version." |
| 82 |
elog |
| 83 |
elog "Starting with versions of hplip >=3.9.8 mDNS is the default network search" |
| 84 |
- elog "mechanism. To make use of it you need to activate the zeroconf flag. If you" |
| 85 |
- elog "prefer the SLP method you have to choose this when configuring the device." |
| 86 |
+ elog "mechanism. To make use of it you need to activate the zeroconf flag on cups." |
| 87 |
+ elog "If you prefer the SLP method you have to choose this when configuring the" |
| 88 |
+ elog "device." |
| 89 |
} |
| 90 |
|
| 91 |
pkg_postrm() { |
| 92 |
|
| 93 |
|
| 94 |
|
| 95 |
1.4 net-print/hplip/hplip-3.9.8-r3.ebuild |
| 96 |
|
| 97 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/hplip/hplip-3.9.8-r3.ebuild?rev=1.4&view=markup |
| 98 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/hplip/hplip-3.9.8-r3.ebuild?rev=1.4&content-type=text/plain |
| 99 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/hplip/hplip-3.9.8-r3.ebuild?r1=1.3&r2=1.4 |
| 100 |
|
| 101 |
Index: hplip-3.9.8-r3.ebuild |
| 102 |
=================================================================== |
| 103 |
RCS file: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.9.8-r3.ebuild,v |
| 104 |
retrieving revision 1.3 |
| 105 |
retrieving revision 1.4 |
| 106 |
diff -u -r1.3 -r1.4 |
| 107 |
--- hplip-3.9.8-r3.ebuild 1 Dec 2009 11:18:46 -0000 1.3 |
| 108 |
+++ hplip-3.9.8-r3.ebuild 1 Dec 2009 12:43:27 -0000 1.4 |
| 109 |
@@ -1,6 +1,6 @@ |
| 110 |
# Copyright 1999-2009 Gentoo Foundation |
| 111 |
# Distributed under the terms of the GNU General Public License v2 |
| 112 |
-# $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 $ |
| 113 |
+# $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 $ |
| 114 |
|
| 115 |
EAPI="2" |
| 116 |
|
| 117 |
@@ -14,7 +14,7 @@ |
| 118 |
SLOT="0" |
| 119 |
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" |
| 120 |
|
| 121 |
-IUSE="doc fax gtk +hpcups hpijs libnotify minimal parport policykit qt3 qt4 scanner snmp static-ppds -udev-acl zeroconf" |
| 122 |
+IUSE="doc fax gtk +hpcups hpijs libnotify minimal parport policykit qt3 qt4 scanner snmp static-ppds -udev-acl" |
| 123 |
|
| 124 |
# Note : libusb-compat untested (calchan 20090516) |
| 125 |
|
| 126 |
@@ -25,8 +25,7 @@ |
| 127 |
!static-ppds? ( || ( >=net-print/cups-1.4.0 net-print/cupsddk ) ) |
| 128 |
udev-acl? ( >=sys-fs/udev-145[extras] ) |
| 129 |
!minimal? ( |
| 130 |
- !zeroconf? ( net-print/cups ) |
| 131 |
- zeroconf? ( || ( net-print/cups[avahi] net-print/cups[zeroconf] ) ) |
| 132 |
+ net-print/cups |
| 133 |
virtual/libusb:0 |
| 134 |
>=dev-lang/python-2.4.4[threads,xml] |
| 135 |
scanner? ( >=media-gfx/sane-backends-1.0.19-r1 ) |
| 136 |
@@ -256,8 +255,9 @@ |
| 137 |
elog "'rc-update del hplip' if you are updating from an old version." |
| 138 |
elog |
| 139 |
elog "Starting with versions of hplip >=3.9.8 mDNS is the default network search" |
| 140 |
- elog "mechanism. To make use of it you need to activate the zeroconf flag. If you" |
| 141 |
- elog "prefer the SLP method you have to choose this when configuring the device." |
| 142 |
+ elog "mechanism. To make use of it you need to activate the zeroconf flag on cups." |
| 143 |
+ elog "If you prefer the SLP method you have to choose this when configuring the" |
| 144 |
+ elog "device." |
| 145 |
} |
| 146 |
|
| 147 |
pkg_postrm() { |
Archives