IUSE/SANE_BACKENDS handling was a bit too clever, see bug #278274

Package-Manager: portage-2.1.6.13/cvs/Linux i686

4 files changed, 19 insertions, 76 deletions

diff --git a/media-gfx/sane-backends/ChangeLog b/media-gfx/sane-backends/ChangeLog
index fa8e047a6816..46a5fd0afa5a 100644
--- a/media-gfx/sane-backends/ChangeLog
+++ b/media-gfx/sane-backends/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/sane-backends
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v 1.163 2009/07/17 20:20:09 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v 1.164 2009/07/19 10:47:47 phosphan Exp $
+
+  19 Jul 2009; Patrick Kursawe <phosphan@gentoo.org>
+  sane-backends-1.0.20.ebuild, sane-backends-1.0.20-r1.ebuild:
+  IUSE/SANE_BACKENDS handling was a bit too clever, see bug #278274
 
 *sane-backends-1.0.20-r1 (17 Jul 2009)
 
diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest
index 84c78dc7b44d..b7cfaca8ddfd 100644
--- a/media-gfx/sane-backends/Manifest
+++ b/media-gfx/sane-backends/Manifest
@@ -16,7 +16,8 @@ EBUILD sane-backends-1.0.17.ebuild 3769 RMD160 aaeaa544e2ff07ee3c56c6fc48c0c85b2
 EBUILD sane-backends-1.0.18-r6.ebuild 4278 RMD160 6813867226c83bacea836184ac70cf1b77fffe17 SHA1 a573b3639310b109360cdc29a24261e2059cbd9e SHA256 b9a5718ea3c36f15de7025b50a0812ae851d7ccf8cc5737f69e55a4a94f18157
 EBUILD sane-backends-1.0.19-r1.ebuild 4376 RMD160 64c5af36b02721e20948f1c6bf69879f7221f8a4 SHA1 f65a57801bea0710c7122de004afa6d52105ae8f SHA256 2d857ae083482603c58557235535638f4f9a9c337d07ae713878da835141b832
 EBUILD sane-backends-1.0.19-r2.ebuild 4482 RMD160 e9139e5efc0c9eadf07b4ed4d88e40e62401246d SHA1 2c15f4318c477c9d959acaf26f026cbb04683991 SHA256 babc258bbfb6cf0edbea22e5b85fd9b2d9f6f0113eddc8471ad545d926b2c7ac
-EBUILD sane-backends-1.0.20-r1.ebuild 5776 RMD160 4909d30b22bf5a60477660ca9414ab3f51903a38 SHA1 d94bced5fa210d726b03468bce3fc4cb50d1a412 SHA256 776b2d0a005789368d9e48242cf53192c3f2380eea3d75040d603d90cebadb2f
-EBUILD sane-backends-1.0.20.ebuild 5840 RMD160 44dab6329833fdce0e83ddfd4c45d8e041c10000 SHA1 12533963b1d1341059682897a84ceee7a1e7a939 SHA256 3ad8e220b309e0dd72b4d5988e8d5cf1afc92faaed3c727b7ee2c82dbb06613f
-MISC ChangeLog 27534 RMD160 1fa1068c1f99d2e578d501d663882dcdb12d2495 SHA1 16ea9828e8a02a51c044c194f28db135939d99cb SHA256 d6a52389f0ce792246c4190a20531bbf0fe344ca4549a06738879cb78408af97
+EBUILD sane-backends-1.0.20-r1.ebuild 4890 RMD160 3ab805e52b20576ca99c20c3c8ba35635dd9cf73 SHA1 319170630c7d14fd58bec772ece2899684943857 SHA256 f439e46382b088646dc0acb793557e16005acdf6f0715768b7983593a4dd11e0
+EBUILD sane-backends-1.0.20.ebuild 4954 RMD160 534176ffa20c9d64f51f7db0c956eefe4717f63c SHA1 8cfb392350b0acae1b22634724241f7422eee7e5 SHA256 be38a77cca37c0b47bacefc8fd1be87868d2adf09107ffda9ef7aaa431deafed
+MISC ChangeLog 27719 RMD160 910e3de91411baf3847ad8a5d8d45b80fe71754a SHA1 0245f62664de221a99276d2883e2f5dbabfc25c3 SHA256 3025f8e3cb87cefeeec49297ab094778884cc7e2fb18a80e7b4ac8535a926990
 MISC metadata.xml 224 RMD160 d646bef174a902fd1910871e794292c44f292052 SHA1 411f9bc454756fe51f5ff5033b73f91b0b07a204 SHA256 c2d7984543cf5a2770459f930dc78cbe0a220cb3297123dc108b225edc33a822
+MISC sane-backends-1.0.20.ebuild.orig 5840 RMD160 44dab6329833fdce0e83ddfd4c45d8e041c10000 SHA1 12533963b1d1341059682897a84ceee7a1e7a939 SHA256 3ad8e220b309e0dd72b4d5988e8d5cf1afc92faaed3c727b7ee2c82dbb06613f
diff --git a/media-gfx/sane-backends/sane-backends-1.0.20-r1.ebuild b/media-gfx/sane-backends/sane-backends-1.0.20-r1.ebuild
index 89254333fe70..d77a2af8c022 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.20-r1.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.20-r1.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/media-gfx/sane-backends/sane-backends-1.0.20-r1.ebuild,v 1.1 2009/07/17 20:20:09 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.20-r1.ebuild,v 1.2 2009/07/19 10:47:47 phosphan Exp $
 
 EAPI="1"
 
@@ -86,21 +86,10 @@ IUSE_SANE_BACKENDS="
 	umax1220u
 	xerox_mfp"
 
-IUSE="avahi usb gphoto2 ipv6 v4l doc sane_backends_nothing"
+IUSE="avahi usb gphoto2 ipv6 v4l doc"
 
-# Use old SANE_BACKENDS values as defaults for our USE_EXPAND variable
 for backend in ${IUSE_SANE_BACKENDS}; do
-	IUSE="${IUSE} "
-	if [ -z "${SANE_BACKENDS}" ]; then
-		IUSE="${IUSE}+"
-	else
-		for oldbackend in ${SANE_BACKENDS}; do
-			if [ "${oldbackend}" == "${backend}" ]; then
-				IUSE="${IUSE}+"
-			fi
-		done
-	fi
-	IUSE="${IUSE}sane_backends_${backend}"
+	IUSE="${IUSE} +sane_backends_${backend}"
 done
 
 DESCRIPTION="Scanner Access Now Easy - Backends"
@@ -154,12 +143,11 @@ SLOT="0"
 LICENSE="GPL-2 public-domain"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
-BACKENDS=""
+# the blank is intended - an empty string would result in building ALL backends.
+BACKENDS=" "
 
 pkg_setup() {
 
-	ensure_a_backend_is_building
-
 	enewgroup scanner
 
 	use gphoto2 && BACKENDS="gphoto2"
@@ -194,13 +182,6 @@ src_unpack() {
 src_compile() {
 	append-flags -fno-strict-aliasing
 
-	# if you are using a backend that is not contained in the sane-backends
-	# distribution, it can make sense to build just the libs and no backend
-	# at all.
-	if use sane_backends_nothing; then
-		BACKENDS=" "
-		elog "You are using sane_backends_nothing - disabling all backends!"
-	fi
 	myconf=$(use_enable usb libusb)
 	if ! use doc; then
 		myconf="${myconf} --disable-latex"
@@ -249,15 +230,3 @@ src_install () {
 	dodoc NEWS AUTHORS ChangeLog* README README.linux
 	echo "SANE_CONFIG_DIR=/etc/sane.d" >> "${D}"/etc/env.d/30sane
 }
-
-ensure_a_backend_is_building() {
-	use v4l && return
-	use gphoto2 && return
-	use sane_backends_nothing && return
-	for b in ${IUSE_SANE_BACKENDS}; do
-		use "sane_backends_${b}" && return
-	done
-	eerror "You must specify at least one backend or sane_backends_nothing to build."
-	eerror "See \"emerge -pv sane-backends\" for a list."
-	die "No backend selected."
-}
diff --git a/media-gfx/sane-backends/sane-backends-1.0.20.ebuild b/media-gfx/sane-backends/sane-backends-1.0.20.ebuild
index ad8470cce094..63fd61cb3078 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.20.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.20.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/media-gfx/sane-backends/sane-backends-1.0.20.ebuild,v 1.3 2009/07/08 18:47:16 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.20.ebuild,v 1.4 2009/07/19 10:47:47 phosphan Exp $
 
 EAPI="1"
 
@@ -86,21 +86,10 @@ IUSE_SANE_BACKENDS="
 	umax1220u
 	xerox_mfp"
 
-IUSE="avahi usb gphoto2 ipv6 v4l doc sane_backends_nothing"
+IUSE="avahi usb gphoto2 ipv6 v4l doc"
 
-# Use old SANE_BACKENDS values as defaults for our USE_EXPAND variable
 for backend in ${IUSE_SANE_BACKENDS}; do
-	IUSE="${IUSE} "
-	if [ -z "${SANE_BACKENDS}" ]; then
-		IUSE="${IUSE}+"
-	else
-		for oldbackend in ${SANE_BACKENDS}; do
-			if [ "${oldbackend}" == "${backend}" ]; then
-				IUSE="${IUSE}+"
-			fi
-		done
-	fi
-	IUSE="${IUSE}sane_backends_${backend}"
+	IUSE="${IUSE} +sane_backends_${backend}"
 done
 
 DESCRIPTION="Scanner Access Now Easy - Backends"
@@ -154,12 +143,11 @@ SLOT="0"
 LICENSE="GPL-2 public-domain"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
-BACKENDS=""
+# the blank is intended - an empty string would result in building ALL backends.
+BACKENDS=" "
 
 pkg_setup() {
 
-	ensure_a_backend_is_building
-
 	enewgroup scanner
 
 	use gphoto2 && BACKENDS="gphoto2"
@@ -193,13 +181,6 @@ src_unpack() {
 src_compile() {
 	append-flags -fno-strict-aliasing
 
-	# if you are using a backend that is not contained in the sane-backends
-	# distribution, it can make sense to build just the libs and no backend
-	# at all.
-	if use sane_backends_nothing; then
-		BACKENDS=" "
-		elog "You are using sane_backends_nothing - disabling all backends!"
-	fi
 	if use usb && has_version "=dev-libs/libusb-1*"; then
 		myconf="--enable-libusb_1_0 --disable-libusb"
 	else
@@ -252,15 +233,3 @@ src_install () {
 	dodoc NEWS AUTHORS ChangeLog* README README.linux
 	echo "SANE_CONFIG_DIR=/etc/sane.d" >> "${D}"/etc/env.d/30sane
 }
-
-ensure_a_backend_is_building() {
-	use v4l && return
-	use gphoto2 && return
-	use sane_backends_nothing && return
-	for b in ${IUSE_SANE_BACKENDS}; do
-		use "sane_backends_${b}" && return
-	done
-	eerror "You must specify at least one backend or sane_backends_nothing to build."
-	eerror "See \"emerge -pv sane-backends\" for a list."
-	die "No backend selected."
-}