diff options
author | Daniel Pielmeier <billie@gentoo.org> | 2012-05-21 17:27:50 +0000 |
---|---|---|
committer | Daniel Pielmeier <billie@gentoo.org> | 2012-05-21 17:27:50 +0000 |
commit | 68980df770c9a8d30a4bbc9d209c719451c416bf (patch) | |
tree | 2e5a90e487fb348bf7d26a87e1d9f8556302e601 /net-print | |
parent | Marking libxml2-2.8.0_rc1 ppc for bug 416209 (diff) | |
download | gentoo-2-68980df770c9a8d30a4bbc9d209c719451c416bf.tar.gz gentoo-2-68980df770c9a8d30a4bbc9d209c719451c416bf.tar.bz2 gentoo-2-68980df770c9a8d30a4bbc9d209c719451c416bf.zip |
Remove REQUIRED_USE to fix big #416693. Thanks to T6n9naYMKJ@ymail.com.
(Portage version: 2.1.10.49/cvs/Linux i686)
Diffstat (limited to 'net-print')
-rw-r--r-- | net-print/hplip/ChangeLog | 6 | ||||
-rw-r--r-- | net-print/hplip/hplip-3.12.2-r2.ebuild | 10 | ||||
-rw-r--r-- | net-print/hplip/hplip-3.12.4.ebuild | 10 |
3 files changed, 19 insertions, 7 deletions
diff --git a/net-print/hplip/ChangeLog b/net-print/hplip/ChangeLog index 427076695f57..3feea3161834 100644 --- a/net-print/hplip/ChangeLog +++ b/net-print/hplip/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-print/hplip # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.227 2012/05/08 15:40:31 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.228 2012/05/21 17:27:50 billie Exp $ + + 21 May 2012; Daniel Pielmeier <billie@gentoo.org> hplip-3.12.2-r2.ebuild, + hplip-3.12.4.ebuild: + Remove REQUIRED_USE to fix big #416693. Thanks to T6n9naYMKJ@ymail.com. 08 May 2012; Brent Baude <ranger@gentoo.org> hplip-3.12.4.ebuild: Marking hplip-3.12.4 ppc64 for bug 414161 diff --git a/net-print/hplip/hplip-3.12.2-r2.ebuild b/net-print/hplip/hplip-3.12.2-r2.ebuild index 5692db70dd24..44fe2210be94 100644 --- a/net-print/hplip/hplip-3.12.2-r2.ebuild +++ b/net-print/hplip/hplip-3.12.2-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.12.2-r2.ebuild,v 1.5 2012/05/06 11:42:45 billie Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.12.2-r2.ebuild,v 1.6 2012/05/21 17:27:50 billie Exp $ EAPI=4 @@ -23,8 +23,6 @@ KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" # Thus support for it is also disabled in hplip. IUSE="doc fax +hpcups hpijs kde libnotify minimal parport policykit qt4 scanner snmp static-ppds -acl X" -REQUIRED_USE="|| ( hpijs hpcups )" - COMMON_DEPEND=" virtual/jpeg hpijs? ( >=net-print/foomatic-filters-3.0.20080507[cups] ) @@ -84,6 +82,12 @@ pkg_setup() { use scanner && ! use X && ewarn "You need USE=X for the scanner GUI." + if ! use hpcups && ! use hpijs ; then + ewarn "Installing neither hpcups (USE=-hpcups) nor hpijs (USE=-hpijs) driver," + ewarn "which is probably not what you want." + ewarn "You will almost certainly not be able to print." + fi + if use minimal ; then ewarn "Installing driver portions only, make sure you know what you are doing." ewarn "Depending on the USE flags set for hpcups or hpijs the appropiate driver" diff --git a/net-print/hplip/hplip-3.12.4.ebuild b/net-print/hplip/hplip-3.12.4.ebuild index 975149538004..0dc40aff82c8 100644 --- a/net-print/hplip/hplip-3.12.4.ebuild +++ b/net-print/hplip/hplip-3.12.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.12.4.ebuild,v 1.7 2012/05/08 15:40:31 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.12.4.ebuild,v 1.8 2012/05/21 17:27:50 billie Exp $ EAPI=4 @@ -23,8 +23,6 @@ KEYWORDS="amd64 ~arm ppc ppc64 x86" # Thus support for it is also disabled in hplip. IUSE="doc fax +hpcups hpijs kde libnotify minimal parport policykit qt4 scanner snmp static-ppds -acl X" -REQUIRED_USE="|| ( hpijs hpcups )" - COMMON_DEPEND=" virtual/jpeg hpijs? ( >=net-print/foomatic-filters-3.0.20080507[cups] ) @@ -84,6 +82,12 @@ pkg_setup() { use scanner && ! use X && ewarn "You need USE=X for the scanner GUI." + if ! use hpcups && ! use hpijs ; then + ewarn "Installing neither hpcups (USE=-hpcups) nor hpijs (USE=-hpijs) driver," + ewarn "which is probably not what you want." + ewarn "You will almost certainly not be able to print." + fi + if use minimal ; then ewarn "Installing driver portions only, make sure you know what you are doing." ewarn "Depending on the USE flags set for hpcups or hpijs the appropiate driver" |