From: Diego Elio Pettenò Date: Fri, 19 Jan 2007 10:05:02 +0000 (+0000) Subject: Error out gracefully when the midi useflag on experimental alsa-lib is unset. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ca412dca42bc3ea511fd9f706df6afb18e6949d8;p=gentoo.git Error out gracefully when the midi useflag on experimental alsa-lib is unset. Package-Manager: portage-2.1.2 --- diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog index cc00c718732f..683d3b5225d7 100644 --- a/kde-base/kdelibs/ChangeLog +++ b/kde-base/kdelibs/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for kde-base/kdelibs # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.404 2007/01/18 16:06:34 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.405 2007/01/19 10:05:02 flameeyes Exp $ + + 19 Jan 2007; Diego Pettenò + kdelibs-3.5.2-r6.ebuild, kdelibs-3.5.5-r4.ebuild, kdelibs-3.5.5-r5.ebuild, + kdelibs-3.5.5-r6.ebuild, kdelibs-3.5.5-r7.ebuild, kdelibs-3.5.6.ebuild: + Error out gracefully when the midi useflag on experimental alsa-lib is unset. 18 Jan 2007; Diego Pettenò kdelibs-3.5.6.ebuild: Don't depend on arts 3.5.6, as 3.5.5 is just the same. diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest index 635b6c99c627..ed1216e4557a 100644 --- a/kde-base/kdelibs/Manifest +++ b/kde-base/kdelibs/Manifest @@ -68,34 +68,34 @@ DIST kdelibs-3.5.5-seli-xinerama.patch.bz2 5470 RMD160 46ed378f1ff2f7e2fa113aa0b DIST kdelibs-3.5.5.tar.bz2 15486690 RMD160 8e389869f9a53445754c76a0f7535ef2fffc6d03 SHA1 7961818e41e22cce7c58219c4eb63ed5fbb94307 SHA256 e487cdd56aa14eec3e100501a5e14658c6329fac30ea0ce812c860e3564c31e3 DIST kdelibs-3.5.6.tar.bz2 15298371 RMD160 5f0bed409235d9eac6eb200b9c187a100313fa79 SHA1 05547d25521c56f221469ce164f10aa09f3eeb6b SHA256 3a4241355cb5760cf0d083e1495d76cd87f57338492f32c7631ba37206a21feb DIST kdeprint-3.5.2-cups-1.2-patches.tar.bz2 5017 RMD160 acd244fad5168ddf683dc988e7d51607641acd47 SHA1 084e9b9fcb156699b6a1f576455aba561df5d1fa SHA256 7d0fc597c9c3a9062cbbe38017907ec53b0d2ea1699402d35ab4b690c54f0876 -EBUILD kdelibs-3.5.2-r6.ebuild 5092 RMD160 59165a1749416511d64b516ae0429a6ed73783a4 SHA1 281dd059c59c7b9a7a94b08a3519f83102af3bf3 SHA256 bd586c576d694a543dcbe3764e6a3bb7829d830effdf298879f643f236936e12 -MD5 daa4cb527fbe3d815da904567a202093 kdelibs-3.5.2-r6.ebuild 5092 -RMD160 59165a1749416511d64b516ae0429a6ed73783a4 kdelibs-3.5.2-r6.ebuild 5092 -SHA256 bd586c576d694a543dcbe3764e6a3bb7829d830effdf298879f643f236936e12 kdelibs-3.5.2-r6.ebuild 5092 -EBUILD kdelibs-3.5.5-r4.ebuild 5360 RMD160 66d8e630e6269d84000bee5ed1d1d3bf2ceebb4e SHA1 4662c13f0b41dc0d8ad507fea4537f73df4ed697 SHA256 22b89b42a7e3287a60387ab97bc6b48e5d4cfe70a3d06c32ba604ac5d14daa2b -MD5 b80d2bf932253f613dc8df5fd125c247 kdelibs-3.5.5-r4.ebuild 5360 -RMD160 66d8e630e6269d84000bee5ed1d1d3bf2ceebb4e kdelibs-3.5.5-r4.ebuild 5360 -SHA256 22b89b42a7e3287a60387ab97bc6b48e5d4cfe70a3d06c32ba604ac5d14daa2b kdelibs-3.5.5-r4.ebuild 5360 -EBUILD kdelibs-3.5.5-r5.ebuild 5510 RMD160 71aa52206b863a1596c276c052efba1ac559e2c9 SHA1 9e441a6fd30702b183a1642b134899e5d1e7ee71 SHA256 add6103c0107ada54dff81c76cb90ced57b7c57fd3792fba9f27bf36467dcad9 -MD5 667c2087790f9e31a355a68bcff941d7 kdelibs-3.5.5-r5.ebuild 5510 -RMD160 71aa52206b863a1596c276c052efba1ac559e2c9 kdelibs-3.5.5-r5.ebuild 5510 -SHA256 add6103c0107ada54dff81c76cb90ced57b7c57fd3792fba9f27bf36467dcad9 kdelibs-3.5.5-r5.ebuild 5510 -EBUILD kdelibs-3.5.5-r6.ebuild 5808 RMD160 cd42f1e41db0ad14650d63b05e62f1459dadabf5 SHA1 e57e0322e5c147db92e0c73d41d28a77d14fc5f8 SHA256 a82eb9b52488645da6cdd96c3a0ede68d983ac73cb2b58082c627e1c2d49151c -MD5 355589d422fde46e2d583c7fd765d359 kdelibs-3.5.5-r6.ebuild 5808 -RMD160 cd42f1e41db0ad14650d63b05e62f1459dadabf5 kdelibs-3.5.5-r6.ebuild 5808 -SHA256 a82eb9b52488645da6cdd96c3a0ede68d983ac73cb2b58082c627e1c2d49151c kdelibs-3.5.5-r6.ebuild 5808 -EBUILD kdelibs-3.5.5-r7.ebuild 5996 RMD160 f37424f73b48a64d10de6bcaf7db7322a8517934 SHA1 f40f63893651c9999ddb660576c9915e8ea6e98b SHA256 d52c7510b89fec39598e83c6d587c396ffc4c13e9905750a217e7c05e101a50a -MD5 a8b6b1f0b8bfc8c770de36d8a41cc1c6 kdelibs-3.5.5-r7.ebuild 5996 -RMD160 f37424f73b48a64d10de6bcaf7db7322a8517934 kdelibs-3.5.5-r7.ebuild 5996 -SHA256 d52c7510b89fec39598e83c6d587c396ffc4c13e9905750a217e7c05e101a50a kdelibs-3.5.5-r7.ebuild 5996 -EBUILD kdelibs-3.5.6.ebuild 5431 RMD160 6effd38a13ea8c30f46708a0340dd1f67648f2b9 SHA1 4ace7e571a0fb76187c79a6a20c934d3158200b6 SHA256 dcfef936673e3593e34bd89222b56bb37aa99ccf8daee1c947a02a53ee63ae77 -MD5 c1159219e30deeafecf2ede795b8bc68 kdelibs-3.5.6.ebuild 5431 -RMD160 6effd38a13ea8c30f46708a0340dd1f67648f2b9 kdelibs-3.5.6.ebuild 5431 -SHA256 dcfef936673e3593e34bd89222b56bb37aa99ccf8daee1c947a02a53ee63ae77 kdelibs-3.5.6.ebuild 5431 -MISC ChangeLog 66247 RMD160 44388797d538b5943ee681a6bf7aa39a9b331e53 SHA1 f67562d4cdba28d397096e2946ad3e331eac4622 SHA256 b3447792a581e99836263e5e8babab73c6b9be8445248f6aba7a726c9fd80f89 -MD5 444b9e4eab9f8045337c28617c1dbbb8 ChangeLog 66247 -RMD160 44388797d538b5943ee681a6bf7aa39a9b331e53 ChangeLog 66247 -SHA256 b3447792a581e99836263e5e8babab73c6b9be8445248f6aba7a726c9fd80f89 ChangeLog 66247 +EBUILD kdelibs-3.5.2-r6.ebuild 5500 RMD160 bd654f1153a5843a9d31baa52b61e1e11b33822b SHA1 8a8ed2ee3a76170f6b8d0d21c3a6a229ba92f012 SHA256 c430a26d5699cfd1d96d8d8878c253eaed2a4fa774f94dbea8d3a269ba5a6b62 +MD5 b5cc01d05401b865f301295e8655c7b0 kdelibs-3.5.2-r6.ebuild 5500 +RMD160 bd654f1153a5843a9d31baa52b61e1e11b33822b kdelibs-3.5.2-r6.ebuild 5500 +SHA256 c430a26d5699cfd1d96d8d8878c253eaed2a4fa774f94dbea8d3a269ba5a6b62 kdelibs-3.5.2-r6.ebuild 5500 +EBUILD kdelibs-3.5.5-r4.ebuild 5771 RMD160 d76a94e762f2dfddaedb925e2f317d34a8d0874f SHA1 f7f9e3e962d9fa0da58a90e3080613284a7cef69 SHA256 59bdb9e87d9b480c13a3762f4e014e22ba7621e3471f9bfed3611b4334cde0c5 +MD5 e40227f48b285c2e3fb55f1b47de7cc9 kdelibs-3.5.5-r4.ebuild 5771 +RMD160 d76a94e762f2dfddaedb925e2f317d34a8d0874f kdelibs-3.5.5-r4.ebuild 5771 +SHA256 59bdb9e87d9b480c13a3762f4e014e22ba7621e3471f9bfed3611b4334cde0c5 kdelibs-3.5.5-r4.ebuild 5771 +EBUILD kdelibs-3.5.5-r5.ebuild 5918 RMD160 de5835b3ea207969cffa1db84b05d5413be62a2c SHA1 f78cc2fd03f380509a14b9568376b68e1aea3696 SHA256 25a2e541dc76f2f5a38d47758f7825ad804079110e75f1be3f2d29e58b15d684 +MD5 c84aab7cb9dd091cacc40ba043e557de kdelibs-3.5.5-r5.ebuild 5918 +RMD160 de5835b3ea207969cffa1db84b05d5413be62a2c kdelibs-3.5.5-r5.ebuild 5918 +SHA256 25a2e541dc76f2f5a38d47758f7825ad804079110e75f1be3f2d29e58b15d684 kdelibs-3.5.5-r5.ebuild 5918 +EBUILD kdelibs-3.5.5-r6.ebuild 6216 RMD160 1f5cb1adc91cb9ac32b885456a9c5f22ff79493b SHA1 211601eec4c8a57a595dca41fec89109a6b324fa SHA256 ab249ddfae0a8786541a1046907df079263e84a7e9a5794dc04b2531fe8c254a +MD5 e1603bd45726f43eab0fedbc5b270b73 kdelibs-3.5.5-r6.ebuild 6216 +RMD160 1f5cb1adc91cb9ac32b885456a9c5f22ff79493b kdelibs-3.5.5-r6.ebuild 6216 +SHA256 ab249ddfae0a8786541a1046907df079263e84a7e9a5794dc04b2531fe8c254a kdelibs-3.5.5-r6.ebuild 6216 +EBUILD kdelibs-3.5.5-r7.ebuild 6408 RMD160 838c28861d247eab5e91c890f588983810df2c07 SHA1 97f6d2249ef76c0442431b92e414243e839c29d9 SHA256 cbb891d1636785ad765945a4614485aff8464d9bd214807e29b674b23a260656 +MD5 05a3e227b6da6252feea4187b02c131b kdelibs-3.5.5-r7.ebuild 6408 +RMD160 838c28861d247eab5e91c890f588983810df2c07 kdelibs-3.5.5-r7.ebuild 6408 +SHA256 cbb891d1636785ad765945a4614485aff8464d9bd214807e29b674b23a260656 kdelibs-3.5.5-r7.ebuild 6408 +EBUILD kdelibs-3.5.6.ebuild 5839 RMD160 865cd5fec0c3bd2a48c66e2bf32e46060f9ea5a2 SHA1 549e3da3e341005267b1e9d09e72ef3959a13a5b SHA256 51c46bed17fd4a37d4ee2fb304f6e1500756f47d62d46891f3ed8dbed12d707e +MD5 85b5cf70a905b110092555024d634fab kdelibs-3.5.6.ebuild 5839 +RMD160 865cd5fec0c3bd2a48c66e2bf32e46060f9ea5a2 kdelibs-3.5.6.ebuild 5839 +SHA256 51c46bed17fd4a37d4ee2fb304f6e1500756f47d62d46891f3ed8dbed12d707e kdelibs-3.5.6.ebuild 5839 +MISC ChangeLog 66532 RMD160 270903a854a84415bb64c462794953c01b497c50 SHA1 edc1cb0f21d3829e939f21879f867d18d37abe76 SHA256 ceb11620e94991ebc3074e5df34f163ee17716457e3fd40e7b0e8d86059f9e17 +MD5 ee5e4d399bf336cc0dca649e0a974406 ChangeLog 66532 +RMD160 270903a854a84415bb64c462794953c01b497c50 ChangeLog 66532 +SHA256 ceb11620e94991ebc3074e5df34f163ee17716457e3fd40e7b0e8d86059f9e17 ChangeLog 66532 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156 @@ -121,7 +121,7 @@ SHA256 fdd6e7b644281143cd6919d82e855a24dfa3bcc64de59938c02ea25eebfadb9a files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.1 (GNU/Linux) -iD8DBQFFr5slAiZjviIA2XgRAi66AJ99g3/CzawOknSNjlE8jvSUk6Yg4wCeKndw -YLUX4nURTJCFijIP+U30hBk= -=wp5U +iD8DBQFFsJf0AiZjviIA2XgRAg/CAJ9ScSBQWnHKZpDgaufSvSVyksOKtACgy8uy +cn+LeOGTmAEdeFtYsCI5kJ8= +=1NRI -----END PGP SIGNATURE----- diff --git a/kde-base/kdelibs/kdelibs-3.5.2-r6.ebuild b/kde-base/kdelibs/kdelibs-3.5.2-r6.ebuild index 7d539e909e0a..b429519ce210 100644 --- a/kde-base/kdelibs/kdelibs-3.5.2-r6.ebuild +++ b/kde-base/kdelibs/kdelibs-3.5.2-r6.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/kde-base/kdelibs/kdelibs-3.5.2-r6.ebuild,v 1.20 2007/01/05 16:57:50 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.5.2-r6.ebuild,v 1.21 2007/01/19 10:05:02 flameeyes Exp $ inherit kde flag-o-matic eutils multilib set-kdedir 3.5 @@ -67,6 +67,15 @@ pkg_setup() { ewarn "For more information, see bug #128922." echo "" fi + + if use alsa && ! built_with_use --missing true media-libs/alsa-lib midi; then + eerror "The alsa USE flag in this package enables ALSA support" + eerror "for libkmid, KDE midi library." + eerror "For this reason, you have to merge media-libs/alsa-lib" + eerror "with the midi USE flag enabled, or disable alsa USE flag" + eerror "for this package." + die "Missing midi USE flag on media-libs/alsa-lib" + fi } src_unpack() { diff --git a/kde-base/kdelibs/kdelibs-3.5.5-r4.ebuild b/kde-base/kdelibs/kdelibs-3.5.5-r4.ebuild index 689790dd516c..cd77ae5bf391 100644 --- a/kde-base/kdelibs/kdelibs-3.5.5-r4.ebuild +++ b/kde-base/kdelibs/kdelibs-3.5.5-r4.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.5.5-r4.ebuild,v 1.8 2006/12/11 14:40:16 kloeri Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.5.5-r4.ebuild,v 1.9 2007/01/19 10:05:02 flameeyes Exp $ inherit kde flag-o-matic eutils multilib set-kdedir 3.5 @@ -71,6 +71,15 @@ pkg_setup() { elog "behaviour, try to rebuild kde-base/kdelibs with utempter use-flag enabled." echo "" fi + + if use alsa && ! built_with_use --missing true media-libs/alsa-lib midi; then + eerror "The alsa USE flag in this package enables ALSA support" + eerror "for libkmid, KDE midi library." + eerror "For this reason, you have to merge media-libs/alsa-lib" + eerror "with the midi USE flag enabled, or disable alsa USE flag" + eerror "for this package." + die "Missing midi USE flag on media-libs/alsa-lib" + fi } src_unpack() { diff --git a/kde-base/kdelibs/kdelibs-3.5.5-r5.ebuild b/kde-base/kdelibs/kdelibs-3.5.5-r5.ebuild index f59f324ff8fb..78035f4b0b9f 100644 --- a/kde-base/kdelibs/kdelibs-3.5.5-r5.ebuild +++ b/kde-base/kdelibs/kdelibs-3.5.5-r5.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.5.5-r5.ebuild,v 1.16 2006/12/01 19:08:34 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.5.5-r5.ebuild,v 1.17 2007/01/19 10:05:02 flameeyes Exp $ inherit kde flag-o-matic eutils multilib set-kdedir 3.5 @@ -72,6 +72,15 @@ pkg_setup() { elog "behaviour, try to rebuild kde-base/kdelibs with utempter use-flag enabled." echo "" fi + + if use alsa && ! built_with_use --missing true media-libs/alsa-lib midi; then + eerror "The alsa USE flag in this package enables ALSA support" + eerror "for libkmid, KDE midi library." + eerror "For this reason, you have to merge media-libs/alsa-lib" + eerror "with the midi USE flag enabled, or disable alsa USE flag" + eerror "for this package." + die "Missing midi USE flag on media-libs/alsa-lib" + fi } src_unpack() { diff --git a/kde-base/kdelibs/kdelibs-3.5.5-r6.ebuild b/kde-base/kdelibs/kdelibs-3.5.5-r6.ebuild index 5583c4d7c3e1..f4fc49726acf 100644 --- a/kde-base/kdelibs/kdelibs-3.5.5-r6.ebuild +++ b/kde-base/kdelibs/kdelibs-3.5.5-r6.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.5.5-r6.ebuild,v 1.8 2006/12/01 19:08:34 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.5.5-r6.ebuild,v 1.9 2007/01/19 10:05:02 flameeyes Exp $ inherit kde flag-o-matic eutils multilib set-kdedir 3.5 @@ -74,6 +74,15 @@ pkg_setup() { elog "behaviour, try to rebuild kde-base/kdelibs with utempter use-flag enabled." echo "" fi + + if use alsa && ! built_with_use --missing true media-libs/alsa-lib midi; then + eerror "The alsa USE flag in this package enables ALSA support" + eerror "for libkmid, KDE midi library." + eerror "For this reason, you have to merge media-libs/alsa-lib" + eerror "with the midi USE flag enabled, or disable alsa USE flag" + eerror "for this package." + die "Missing midi USE flag on media-libs/alsa-lib" + fi } src_unpack() { diff --git a/kde-base/kdelibs/kdelibs-3.5.5-r7.ebuild b/kde-base/kdelibs/kdelibs-3.5.5-r7.ebuild index e48fad09dab6..2a39b8d75402 100644 --- a/kde-base/kdelibs/kdelibs-3.5.5-r7.ebuild +++ b/kde-base/kdelibs/kdelibs-3.5.5-r7.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.5.5-r7.ebuild,v 1.6 2006/12/18 03:05:32 weeve Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.5.5-r7.ebuild,v 1.7 2007/01/19 10:05:02 flameeyes Exp $ inherit kde flag-o-matic eutils multilib set-kdedir 3.5 @@ -75,6 +75,15 @@ pkg_setup() { elog "behaviour, try to rebuild kde-base/kdelibs with utempter use-flag enabled." echo "" fi + + if use alsa && ! built_with_use --missing true media-libs/alsa-lib midi; then + eerror "The alsa USE flag in this package enables ALSA support" + eerror "for libkmid, KDE midi library." + eerror "For this reason, you have to merge media-libs/alsa-lib" + eerror "with the midi USE flag enabled, or disable alsa USE flag" + eerror "for this package." + die "Missing midi USE flag on media-libs/alsa-lib" + fi } src_unpack() { diff --git a/kde-base/kdelibs/kdelibs-3.5.6.ebuild b/kde-base/kdelibs/kdelibs-3.5.6.ebuild index 736dc89f2e2b..3a54eaf160d5 100644 --- a/kde-base/kdelibs/kdelibs-3.5.6.ebuild +++ b/kde-base/kdelibs/kdelibs-3.5.6.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/kde-base/kdelibs/kdelibs-3.5.6.ebuild,v 1.2 2007/01/18 16:06:34 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.5.6.ebuild,v 1.3 2007/01/19 10:05:02 flameeyes Exp $ inherit kde flag-o-matic eutils multilib set-kdedir 3.5 @@ -75,6 +75,15 @@ pkg_setup() { elog "behaviour, try to rebuild kde-base/kdelibs with utempter use-flag enabled." echo "" fi + + if use alsa && ! built_with_use --missing true media-libs/alsa-lib midi; then + eerror "The alsa USE flag in this package enables ALSA support" + eerror "for libkmid, KDE midi library." + eerror "For this reason, you have to merge media-libs/alsa-lib" + eerror "with the midi USE flag enabled, or disable alsa USE flag" + eerror "for this package." + die "Missing midi USE flag on media-libs/alsa-lib" + fi } src_unpack() {