public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in net-print/hplip: ChangeLog hplip-3.9.10.ebuild hplip-3.9.8-r3.ebuild
@ 2009-12-01 12:43 Diego Petteno (flameeyes)
  0 siblings, 0 replies; 2+ messages in thread
From: Diego Petteno (flameeyes) @ 2009-12-01 12:43 UTC (permalink / raw
  To: gentoo-commits

flameeyes    09/12/01 12:43:28

  Modified:             ChangeLog hplip-3.9.10.ebuild hplip-3.9.8-r3.ebuild
  Log:
  Actually, remove the zeroconf USE flag, since it was only used to depend on cups[zeroconf] (which would force a downgrade of cups).
  (Portage version: 2.2_rc54/cvs/Linux x86_64)

Revision  Changes    Path
1.135                net-print/hplip/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/hplip/ChangeLog?rev=1.135&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/hplip/ChangeLog?rev=1.135&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/hplip/ChangeLog?r1=1.134&r2=1.135

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- ChangeLog	1 Dec 2009 11:18:46 -0000	1.134
+++ ChangeLog	1 Dec 2009 12:43:27 -0000	1.135
@@ -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:



1.5                  net-print/hplip/hplip-3.9.10.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/hplip/hplip-3.9.10.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/hplip/hplip-3.9.10.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/hplip/hplip-3.9.10.ebuild?r1=1.4&r2=1.5

Index: hplip-3.9.10.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.9.10.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- hplip-3.9.10.ebuild	1 Dec 2009 11:18:46 -0000	1.4
+++ hplip-3.9.10.ebuild	1 Dec 2009 12:43:27 -0000	1.5
@@ -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 @@
 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 @@
 	!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 @@
 	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() {



1.4                  net-print/hplip/hplip-3.9.8-r3.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/hplip/hplip-3.9.8-r3.ebuild?rev=1.4&view=markup
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
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/hplip/hplip-3.9.8-r3.ebuild?r1=1.3&r2=1.4

Index: hplip-3.9.8-r3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.9.8-r3.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- hplip-3.9.8-r3.ebuild	1 Dec 2009 11:18:46 -0000	1.3
+++ hplip-3.9.8-r3.ebuild	1 Dec 2009 12:43:27 -0000	1.4
@@ -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 @@
 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 @@
 	!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 @@
 	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() {






^ permalink raw reply	[flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in net-print/hplip: ChangeLog hplip-3.9.10.ebuild hplip-3.9.8-r3.ebuild
@ 2009-12-01 11:18 Diego Petteno (flameeyes)
  0 siblings, 0 replies; 2+ messages in thread
From: Diego Petteno (flameeyes) @ 2009-12-01 11:18 UTC (permalink / raw
  To: gentoo-commits

flameeyes    09/12/01 11:18:46

  Modified:             ChangeLog hplip-3.9.10.ebuild hplip-3.9.8-r3.ebuild
  Log:
  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)

Revision  Changes    Path
1.134                net-print/hplip/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/hplip/ChangeLog?rev=1.134&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/hplip/ChangeLog?rev=1.134&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/hplip/ChangeLog?r1=1.133&r2=1.134

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- ChangeLog	30 Nov 2009 18:20:27 -0000	1.133
+++ ChangeLog	1 Dec 2009 11:18:46 -0000	1.134
@@ -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:



1.4                  net-print/hplip/hplip-3.9.10.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/hplip/hplip-3.9.10.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/hplip/hplip-3.9.10.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/hplip/hplip-3.9.10.ebuild?r1=1.3&r2=1.4

Index: hplip-3.9.10.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.9.10.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- hplip-3.9.10.ebuild	30 Nov 2009 18:20:27 -0000	1.3
+++ hplip-3.9.10.ebuild	1 Dec 2009 11:18:46 -0000	1.4
@@ -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 @@
 	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 )



1.3                  net-print/hplip/hplip-3.9.8-r3.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/hplip/hplip-3.9.8-r3.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/hplip/hplip-3.9.8-r3.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/hplip/hplip-3.9.8-r3.ebuild?r1=1.2&r2=1.3

Index: hplip-3.9.8-r3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.9.8-r3.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- hplip-3.9.8-r3.ebuild	30 Nov 2009 18:20:27 -0000	1.2
+++ hplip-3.9.8-r3.ebuild	1 Dec 2009 11:18:46 -0000	1.3
@@ -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 @@
 	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 )






^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2009-12-01 12:43 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-12-01 12:43 [gentoo-commits] gentoo-x86 commit in net-print/hplip: ChangeLog hplip-3.9.10.ebuild hplip-3.9.8-r3.ebuild Diego Petteno (flameeyes)
  -- strict thread matches above, loose matches on Subject: below --
2009-12-01 11:18 Diego Petteno (flameeyes)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox