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

(Portage version: 2.1.6.13/cvs/Linux i686)

3 files changed, 15 insertions, 73 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/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."
-}