Error out gracefully when the midi useflag on experimental alsa-lib is unset.

(Portage version: 2.1.2)

6 files changed, 57 insertions, 17 deletions

diff --git a/media-sound/alsa-utils/ChangeLog b/media-sound/alsa-utils/ChangeLog
index 1cbec854737a..231320f9acbc 100644
--- a/media-sound/alsa-utils/ChangeLog
+++ b/media-sound/alsa-utils/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/alsa-utils
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/ChangeLog,v 1.188 2007/01/16 23:49:11 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/ChangeLog,v 1.189 2007/01/19 10:12:30 flameeyes Exp $
+
+  19 Jan 2007; Diego Pettenò <flameeyes@gentoo.org>
+  alsa-utils-1.0.11.ebuild, alsa-utils-1.0.12.ebuild,
+  alsa-utils-1.0.13.ebuild, alsa-utils-1.0.14_rc1.ebuild,
+  alsa-utils-1.0.14_rc2.ebuild:
+  Error out gracefully when the midi useflag on experimental alsa-lib is unset.
 
   16 Jan 2007; Diego Pettenò <flameeyes@gentoo.org>
   +files/alsa-utils-1.0.14_rc2-seq.patch, alsa-utils-1.0.14_rc2.ebuild:
diff --git a/media-sound/alsa-utils/alsa-utils-1.0.11.ebuild b/media-sound/alsa-utils/alsa-utils-1.0.11.ebuild
index 58eb2d46aa2f..4277b37d253a 100644
--- a/media-sound/alsa-utils/alsa-utils-1.0.11.ebuild
+++ b/media-sound/alsa-utils/alsa-utils-1.0.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/alsa-utils-1.0.11.ebuild,v 1.12 2007/01/05 17:20:33 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/alsa-utils-1.0.11.ebuild,v 1.13 2007/01/19 10:12:30 flameeyes Exp $
 
 inherit eutils autotools
 
@@ -23,6 +23,15 @@ RDEPEND="${DEPEND}
 
 S=${WORKDIR}/${MY_P}
 
+pkg_setup() {
+	if ! built_with_use --missing true media-libs/alsa-lib midi; then
+		eerror ""
+		eerror "To be able to build alsa-utils-${PF} you need"
+		eerror "to have built media-libs/alsa-lib with midi USE flag."
+		die "Missing midi USE flag on media-libs/alsa-lib"
+	fi
+}
+
 src_unpack() {
 	unpack ${A}
 	cd ${S}
@@ -76,7 +85,7 @@ pkg_postinst() {
 	if use sparc; then
 		ewarn "Old versions of alsa-drivers had a broken snd-ioctl32 module"
 		ewarn "which causes sparc64 machines to lockup on such tasks as"
-		ewarn "changing the volume.  Because of this, it is VERY important"
+		ewarn "changing the volume.	 Because of this, it is VERY important"
 		ewarn "that you do not use the snd-ioctl32 modules contained in"
 		ewarn "development-sources or <=gentoo-dev-sources-2.6.7-r14.  Doing so"
 		ewarn "may result in an unbootable system if you start alsasound at boot."
diff --git a/media-sound/alsa-utils/alsa-utils-1.0.12.ebuild b/media-sound/alsa-utils/alsa-utils-1.0.12.ebuild
index adf795d6daee..eae6f541b2be 100644
--- a/media-sound/alsa-utils/alsa-utils-1.0.12.ebuild
+++ b/media-sound/alsa-utils/alsa-utils-1.0.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/alsa-utils-1.0.12.ebuild,v 1.10 2007/01/05 17:20:33 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/alsa-utils-1.0.12.ebuild,v 1.11 2007/01/19 10:12:30 flameeyes Exp $
 
 inherit eutils autotools
 
@@ -23,6 +23,15 @@ RDEPEND="${DEPEND}
 
 S=${WORKDIR}/${MY_P}
 
+pkg_setup() {
+	if ! built_with_use --missing true media-libs/alsa-lib midi; then
+		eerror ""
+		eerror "To be able to build alsa-utils-${PF} you need"
+		eerror "to have built media-libs/alsa-lib with midi USE flag."
+		die "Missing midi USE flag on media-libs/alsa-lib"
+	fi
+}
+
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
diff --git a/media-sound/alsa-utils/alsa-utils-1.0.13.ebuild b/media-sound/alsa-utils/alsa-utils-1.0.13.ebuild
index c50615c75626..c4445d31070c 100644
--- a/media-sound/alsa-utils/alsa-utils-1.0.13.ebuild
+++ b/media-sound/alsa-utils/alsa-utils-1.0.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/alsa-utils-1.0.13.ebuild,v 1.10 2007/01/05 17:20:33 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/alsa-utils-1.0.13.ebuild,v 1.11 2007/01/19 10:12:30 flameeyes Exp $
 
 inherit eutils autotools
 
@@ -23,6 +23,15 @@ RDEPEND="${DEPEND}
 
 S=${WORKDIR}/${MY_P}
 
+pkg_setup() {
+	if ! built_with_use --missing true media-libs/alsa-lib midi; then
+		eerror ""
+		eerror "To be able to build alsa-utils-${PF} you need"
+		eerror "to have built media-libs/alsa-lib with midi USE flag."
+		die "Missing midi USE flag on media-libs/alsa-lib"
+	fi
+}
+
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
diff --git a/media-sound/alsa-utils/alsa-utils-1.0.14_rc1.ebuild b/media-sound/alsa-utils/alsa-utils-1.0.14_rc1.ebuild
index e850ab800390..03f78a2b0847 100644
--- a/media-sound/alsa-utils/alsa-utils-1.0.14_rc1.ebuild
+++ b/media-sound/alsa-utils/alsa-utils-1.0.14_rc1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/alsa-utils-1.0.14_rc1.ebuild,v 1.7 2007/01/14 09:15:51 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/alsa-utils-1.0.14_rc1.ebuild,v 1.8 2007/01/19 10:12:30 flameeyes Exp $
 
 inherit eutils autotools
 
@@ -23,6 +23,15 @@ RDEPEND="${DEPEND}
 
 S=${WORKDIR}/${MY_P}
 
+pkg_setup() {
+	if ! built_with_use --missing true media-libs/alsa-lib midi; then
+		eerror ""
+		eerror "To be able to build alsa-utils-${PF} you need"
+		eerror "to have built media-libs/alsa-lib with midi USE flag."
+		die "Missing midi USE flag on media-libs/alsa-lib"
+	fi
+}
+
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
diff --git a/media-sound/alsa-utils/alsa-utils-1.0.14_rc2.ebuild b/media-sound/alsa-utils/alsa-utils-1.0.14_rc2.ebuild
index 55a8b449da57..1361233661c7 100644
--- a/media-sound/alsa-utils/alsa-utils-1.0.14_rc2.ebuild
+++ b/media-sound/alsa-utils/alsa-utils-1.0.14_rc2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/alsa-utils-1.0.14_rc2.ebuild,v 1.2 2007/01/16 23:49:11 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/alsa-utils-1.0.14_rc2.ebuild,v 1.3 2007/01/19 10:12:30 flameeyes Exp $
 
 WANT_AUTOMAKE="latest"
 WANT_AUTOCONF="latest"
@@ -26,16 +26,14 @@ RDEPEND="${DEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
-#pkg_setup() {
-# leave commented out for now as built_with_use cannot be used for this check
-#	if use midi && ! built_with_use media-libs/alsa-lib midi; then
-#		ewarn "To be able to build alsa-utils with midi support you need"
-#		ewarn "to have built media-libs/alsa-lib with midi useflag, if"
-#		ewarn "it has one. Otherwise, the package might fail to build."
-#		# This is not fatal because the version of alsa-lib with midi disabled
-#		# is not yet unmasked.
-#	fi
-#}
+pkg_setup() {
+	if use midi && ! built_with_use --missing true media-libs/alsa-lib midi; then
+		eerror ""
+		eerror "To be able to build alsa-utils with midi support you need"
+		eerror "to have built media-libs/alsa-lib with midi USE flag."
+		die "Missing midi USE flag on media-libs/alsa-lib"
+	fi
+}
 
 src_unpack() {
 	unpack ${A}