From 18b3404d9b2fc552cf065f8f924e41c24d3b508f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Diego=20Elio=20Petten=C3=B2?= Date: Fri, 19 Jan 2007 10:12:30 +0000 Subject: [PATCH] Error out gracefully when the midi useflag on experimental alsa-lib is unset. Package-Manager: portage-2.1.2 --- media-sound/alsa-utils/ChangeLog | 8 ++- media-sound/alsa-utils/Manifest | 54 +++++++++---------- .../alsa-utils/alsa-utils-1.0.11.ebuild | 13 ++++- .../alsa-utils/alsa-utils-1.0.12.ebuild | 11 +++- .../alsa-utils/alsa-utils-1.0.13.ebuild | 11 +++- .../alsa-utils/alsa-utils-1.0.14_rc1.ebuild | 11 +++- .../alsa-utils/alsa-utils-1.0.14_rc2.ebuild | 20 ++++--- 7 files changed, 84 insertions(+), 44 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ò + 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ò +files/alsa-utils-1.0.14_rc2-seq.patch, alsa-utils-1.0.14_rc2.ebuild: diff --git a/media-sound/alsa-utils/Manifest b/media-sound/alsa-utils/Manifest index fcda1627209b..218134d20a8a 100644 --- a/media-sound/alsa-utils/Manifest +++ b/media-sound/alsa-utils/Manifest @@ -30,30 +30,30 @@ DIST alsa-utils-1.0.12.tar.bz2 979797 RMD160 26ff9d4fed31bdecbfeb65b09ef52c05aec DIST alsa-utils-1.0.13.tar.bz2 980874 RMD160 2a3cd882543232f81e211d216c9e8112da3f8977 SHA1 05b460a0e7ae6519ea37240476f026b59dbc710d SHA256 d7fe8a7995bc74331c89fbc1937a0682d239339d6659a402cd7b8e4b96c050f0 DIST alsa-utils-1.0.14rc1.tar.bz2 980802 RMD160 7d05cca060486d64e6ba87aa8c4a7e9b7a069ddb SHA1 7766c7c09f162b10e1abcb6733f57d5935d7f1ec SHA256 9b8ede92cfa5f28d6bf6bb1253bdc562f8ac937797fb5e5303609e2e49c2e886 DIST alsa-utils-1.0.14rc2.tar.bz2 981123 RMD160 9975bc5c71df585ad1818647a1abb2be68910403 SHA1 6b1556930e413764ef71e7097d3436999ae8e4eb SHA256 306bd7c4436c1c56a0a499317e23b5b58aea3718df17c138ab0df56fd9bf3e0c -EBUILD alsa-utils-1.0.11.ebuild 2552 RMD160 862674eb942971b72c5cabada756bf3f59f4c3d4 SHA1 46244688e7e83af1a5cf0ac0c1b8546e021a9396 SHA256 8f2011dd08e2a0dc3df6da259910a3d00704ee9e3095fc0ea676f35953945cd8 -MD5 3c76d4f883720c0a495723aff153af0e alsa-utils-1.0.11.ebuild 2552 -RMD160 862674eb942971b72c5cabada756bf3f59f4c3d4 alsa-utils-1.0.11.ebuild 2552 -SHA256 8f2011dd08e2a0dc3df6da259910a3d00704ee9e3095fc0ea676f35953945cd8 alsa-utils-1.0.11.ebuild 2552 -EBUILD alsa-utils-1.0.12.ebuild 2555 RMD160 efd00af76f56b509cd2fe3a07aee0f88d568d060 SHA1 5b7f6325313a2de8321b67590e3f6ea7e9321f16 SHA256 93f9855cd154c67c0da7bee742e9c4649fa6144d646962d5d6e028363ece3acf -MD5 8ebe1d0a6921575d1bdd22ac5ae6e493 alsa-utils-1.0.12.ebuild 2555 -RMD160 efd00af76f56b509cd2fe3a07aee0f88d568d060 alsa-utils-1.0.12.ebuild 2555 -SHA256 93f9855cd154c67c0da7bee742e9c4649fa6144d646962d5d6e028363ece3acf alsa-utils-1.0.12.ebuild 2555 -EBUILD alsa-utils-1.0.13.ebuild 2557 RMD160 b7774cf7cafc3936d03aa73b1064daaa8f88fe7b SHA1 b727fe0504fbe2e0ff7238d333e456ff96f7715a SHA256 61134b85c7d61b0bc95faf243842a4f169bb2059872d962ac93997688a0baf83 -MD5 19df8b89c036f215e864682dd4053176 alsa-utils-1.0.13.ebuild 2557 -RMD160 b7774cf7cafc3936d03aa73b1064daaa8f88fe7b alsa-utils-1.0.13.ebuild 2557 -SHA256 61134b85c7d61b0bc95faf243842a4f169bb2059872d962ac93997688a0baf83 alsa-utils-1.0.13.ebuild 2557 -EBUILD alsa-utils-1.0.14_rc1.ebuild 2567 RMD160 bc3da62968d1aa7c0f45b287348d4542393cb553 SHA1 5ae08a6e01974d979a69ca3f8715946ac91cab14 SHA256 7a7f4e9101e5eee058eff3843cae40fffdb5ea4768e95611ae639c9bc02ca414 -MD5 d29de6459ee4ffbf7b2208dc2011dd56 alsa-utils-1.0.14_rc1.ebuild 2567 -RMD160 bc3da62968d1aa7c0f45b287348d4542393cb553 alsa-utils-1.0.14_rc1.ebuild 2567 -SHA256 7a7f4e9101e5eee058eff3843cae40fffdb5ea4768e95611ae639c9bc02ca414 alsa-utils-1.0.14_rc1.ebuild 2567 -EBUILD alsa-utils-1.0.14_rc2.ebuild 3196 RMD160 2b5298b70d0f2899b930e7b35cdec8b852ea3906 SHA1 2ab6db64fb557507edf04a68ecb585e54e0d2182 SHA256 8309628e5ad9dc455c5acedded476744543d3c19b3f5878395b1dfbe90e21d7f -MD5 7c2c31893543b526134828d34707c078 alsa-utils-1.0.14_rc2.ebuild 3196 -RMD160 2b5298b70d0f2899b930e7b35cdec8b852ea3906 alsa-utils-1.0.14_rc2.ebuild 3196 -SHA256 8309628e5ad9dc455c5acedded476744543d3c19b3f5878395b1dfbe90e21d7f alsa-utils-1.0.14_rc2.ebuild 3196 -MISC ChangeLog 27894 RMD160 646c687136f017eb7fbf422b43046d0556939066 SHA1 a45c0e243d52354466cd77633cd5987939d4b468 SHA256 4e005dd16d8448da1d58b7dd49beea8d13cb3884d45a6d740c9ff632a023b8fa -MD5 7e96c4f93f6810ee31c99fcb758b0610 ChangeLog 27894 -RMD160 646c687136f017eb7fbf422b43046d0556939066 ChangeLog 27894 -SHA256 4e005dd16d8448da1d58b7dd49beea8d13cb3884d45a6d740c9ff632a023b8fa ChangeLog 27894 +EBUILD alsa-utils-1.0.11.ebuild 2827 RMD160 7ab1d8a5f6b7928ecf0e0058a642db4150a25632 SHA1 51badf43afe7aee5cc3b290dae8fd97e58f0a5bf SHA256 02eca640add0619d537ef43eddf8cb935359d8e5966c004aed88401d1b0b01a1 +MD5 8bc699d00d4b5270357371afab4c671c alsa-utils-1.0.11.ebuild 2827 +RMD160 7ab1d8a5f6b7928ecf0e0058a642db4150a25632 alsa-utils-1.0.11.ebuild 2827 +SHA256 02eca640add0619d537ef43eddf8cb935359d8e5966c004aed88401d1b0b01a1 alsa-utils-1.0.11.ebuild 2827 +EBUILD alsa-utils-1.0.12.ebuild 2830 RMD160 7ffcf341240ffdd8e2ec34596155efdf650f8ac5 SHA1 75f61c3a1b62b7be77476a715af4402cff380698 SHA256 e90bb617f1a90d10680814fec53cf896df982e2d7c0bea318ac5d97c600f4556 +MD5 747e75e1cb26b7a26af0a3172d042324 alsa-utils-1.0.12.ebuild 2830 +RMD160 7ffcf341240ffdd8e2ec34596155efdf650f8ac5 alsa-utils-1.0.12.ebuild 2830 +SHA256 e90bb617f1a90d10680814fec53cf896df982e2d7c0bea318ac5d97c600f4556 alsa-utils-1.0.12.ebuild 2830 +EBUILD alsa-utils-1.0.13.ebuild 2832 RMD160 37b0a5e4c00029e5cfbf9706bd78369276b6ae0b SHA1 1c187dfca0802d7996f16c49e2f67cc983fe2749 SHA256 f6107e2ffd5957f30627e89205128b8a9a0106a58e3119f3c328369329dbb702 +MD5 b52947a0fedd5d6550533c551910ae43 alsa-utils-1.0.13.ebuild 2832 +RMD160 37b0a5e4c00029e5cfbf9706bd78369276b6ae0b alsa-utils-1.0.13.ebuild 2832 +SHA256 f6107e2ffd5957f30627e89205128b8a9a0106a58e3119f3c328369329dbb702 alsa-utils-1.0.13.ebuild 2832 +EBUILD alsa-utils-1.0.14_rc1.ebuild 2845 RMD160 9ed5aa20265778a877c3b19e679530b5332dae99 SHA1 cb574992b5abb7de3c74f95f7a0524a97e2f17ef SHA256 c69d2f7dfb238db068cad267c477a2f3178949ed33000384173d441468af93a6 +MD5 afef2230bd5c723cc71cece7e4b51b6c alsa-utils-1.0.14_rc1.ebuild 2845 +RMD160 9ed5aa20265778a877c3b19e679530b5332dae99 alsa-utils-1.0.14_rc1.ebuild 2845 +SHA256 c69d2f7dfb238db068cad267c477a2f3178949ed33000384173d441468af93a6 alsa-utils-1.0.14_rc1.ebuild 2845 +EBUILD alsa-utils-1.0.14_rc2.ebuild 3025 RMD160 0fdafd51671c8b60e0fed78adac5d197677ddca3 SHA1 5e90bd71552166f5e12db46324ac988386923789 SHA256 3b36bd45c61657c96f82f168f299ce6c754abbb16a213dfa94325209896bd2ef +MD5 5ccd9fda3711bbbc3c718c5b1a0b3830 alsa-utils-1.0.14_rc2.ebuild 3025 +RMD160 0fdafd51671c8b60e0fed78adac5d197677ddca3 alsa-utils-1.0.14_rc2.ebuild 3025 +SHA256 3b36bd45c61657c96f82f168f299ce6c754abbb16a213dfa94325209896bd2ef alsa-utils-1.0.14_rc2.ebuild 3025 +MISC ChangeLog 28172 RMD160 c84bcd95f6b4f6080d614dfa433cc17e5b2f148f SHA1 2eeaed73e0ab7c5cf13c4ef98dc100ab01415c35 SHA256 af5889e767ad1d1dc3f4c983d84c2f5bc037f344bb7472c6f8e348d877427e12 +MD5 6628b48e93dc6eedab39fa93e5b07752 ChangeLog 28172 +RMD160 c84bcd95f6b4f6080d614dfa433cc17e5b2f148f ChangeLog 28172 +SHA256 af5889e767ad1d1dc3f4c983d84c2f5bc037f344bb7472c6f8e348d877427e12 ChangeLog 28172 MISC metadata.xml 220 RMD160 e49f8bb330d1798cd2c8ee5335cef1784f0d7ccb SHA1 1b895fe6cae4b8eab08ba1a6a1212baf4b4b4105 SHA256 8570ef11cd59b0d8edb71e78eecaec423616836b10eacb86bee0de941f0ae054 MD5 7c52acc7d4fe40bac97d3198a43dcbd6 metadata.xml 220 RMD160 e49f8bb330d1798cd2c8ee5335cef1784f0d7ccb metadata.xml 220 @@ -76,7 +76,7 @@ SHA256 262613d1f667889dbf9295f128b935e0d7de80b17279b01972d952071279f785 files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.1 (GNU/Linux) -iD8DBQFFrWSIAiZjviIA2XgRAvVcAJ4307CulkemOILIv9CNfmgaAz7M6wCgw8y5 -UnImPXZiX/p2nsf/dRu4pY4= -=Is5A +iD8DBQFFsJmZAiZjviIA2XgRAtf9AKDpfydMAKomWysLBY5+swn/J99VRQCg72Co ++fWEyAWIAocPWkuSEBLuNvA= +=tRkq -----END PGP SIGNATURE----- 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} -- 2.26.2