Cope with reduced complexity in alsa-lib 1.0.25 packaging. Signed off by Nirbheek Chauhan & Pacho Ramos.

Package-Manager: portage-2.1.10.44/cvs/Linux x86_64

5 files changed, 22 insertions, 21 deletions

diff --git a/net-wireless/bluez/ChangeLog b/net-wireless/bluez/ChangeLog
index b09338ee0643..91ec61b4e414 100644
--- a/net-wireless/bluez/ChangeLog
+++ b/net-wireless/bluez/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-wireless/bluez
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/ChangeLog,v 1.115 2012/01/23 15:13:24 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/ChangeLog,v 1.116 2012/01/26 11:39:09 chainsaw Exp $
+
+  26 Jan 2012; Tony Vroon <chainsaw@gentoo.org> bluez-4.96.ebuild,
+  bluez-4.98.ebuild, bluez-4.98-r1.ebuild:
+  Cope with reduced complexity in alsa-lib 1.0.25 packaging. Signed off by
+  Nirbheek Chauhan & Pacho Ramos.
 
   23 Jan 2012; Agostino Sarubbo <ago@gentoo.org> bluez-4.98-r1.ebuild:
   Stable for amd64, wrt bug #399745
diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest
index 8b24d3ad3a95..e286571a05a6 100644
--- a/net-wireless/bluez/Manifest
+++ b/net-wireless/bluez/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX bluetooth-conf.d 181 RMD160 287e1806e25a4f74b4a9f6fc401b78dac31d44ee SHA1 595f897553a6e99000b4a4757f8973b9f39ce11d SHA256 63a96c907996158f637abc3202235b81e7c8a998df487b3e83554062433dd2f8
 AUX bluetooth-init.d 767 RMD160 7afb50646e359ed1ede5abdc4e5e01319dc9e3c4 SHA1 3685d4dbbf56802cb03a483dad23825968dc57f8 SHA256 38efb9dffaab70477f7525dd6657dffc725c61e29c05b0649e95c31f589b31ce
@@ -18,19 +18,15 @@ DIST bluez-4.96.tar.gz 1164913 RMD160 7775a70c5cd86fc418547fae83621dab39196147 S
 DIST bluez-4.98.tar.xz 838868 RMD160 eeb933670dc610d46f574da274edc58c3e07942a SHA1 4fe7cbee9db8bd82c30046d4ccca132702b511ad SHA256 6eb21e712e8835eb1aec84bdfb38891cc4dc5353af921b8235d481da13c565d9
 DIST oui-20110801.txt.xz 520980 RMD160 2f7c863825fa8ae35d9beebe6bbd49fddd32f32e SHA1 a210a711e4e8046627676e5adf56132c977b663c SHA256 47be96b0e7b4a3235260f94ad77445fbf5226832ede588d9ea67d61759ff32e3
 DIST oui-20120113.txt.xz 541268 RMD160 445c782408d427bce66eadd3e179c425e3eb4c76 SHA1 6bc294d6992242648189b234e04afc96fce4a7cf SHA256 f65d2096566d88f9c55ce4da9104696cecb262a7d07c2f2ff58332f1ab40ae84
-EBUILD bluez-4.96.ebuild 4830 RMD160 b16236cc76ee923fe5b263c675540fd6ddd4612e SHA1 3a56c6fbe2911b0b02e69c0b808351af3cf2ce8b SHA256 349ad45c64c56b196554ef31b46980914d5ecfb47badadd4e8d27ab1d04e5ccf
-EBUILD bluez-4.98-r1.ebuild 4506 RMD160 b25a2393b42644ebb94b87f02862fbd13b5cfa02 SHA1 a4a879a4d5a590567c5c3c1a1e0784d07557013e SHA256 348344704d0130088472ddc60b9cca84f9cccb6378dfabc78eb1caa7ab5107f2
-EBUILD bluez-4.98.ebuild 4493 RMD160 005c01425f8c5bf76e395893b0a98dbe69231577 SHA1 b28ce95515d479ca783567628d09a066530bae5c SHA256 1f7eb88f5040d16aaebdb161779619f0becfed066eaa92a4a4684e1c2e56bcb7
-MISC ChangeLog 23423 RMD160 a0c691583909e8c5b5a839060ba25939b80522ee SHA1 d4b85da6c24824d17741bcb87fbbf2cdb5a19cac SHA256 62661e2dd1197e4b40461ed3dc2d4d206a5e308d6929f5556a0b8926043082e1
+EBUILD bluez-4.96.ebuild 4834 RMD160 0e74d5819e7ea6a19d79ad810c67ee4c3082be7c SHA1 886b3c35f5eef4a49e73baa40f9e0b64e499f334 SHA256 124b2b14a9851319e45da0f0e484587d50f5c4e8d81e3b4e943a4d6c83f89201
+EBUILD bluez-4.98-r1.ebuild 4517 RMD160 63d9c02cafb9e95e054fb8b0333ad554f6fc7122 SHA1 5b261214d1c15a0f9c31a6cfb4656fea7088cf10 SHA256 6a9cdfaf63bebe76c32acbe4a0d57148b53172fc84906025c3030de20fe5ce9c
+EBUILD bluez-4.98.ebuild 4502 RMD160 205fb388b983a9fb5f8175cf4b55557768d1481b SHA1 1c9277dade40d1fd54e7204ff5be960b543275de SHA256 bea7c0d5e051c6caf5f664a4b91c18a39f41a236833a611ece1a49436a44fbff
+MISC ChangeLog 23648 RMD160 1aecdc65d27b54663687980f120f3f9292a94674 SHA1 e936d0bf2c5c6880bed81ef5b7f9572f627069e0 SHA256 0e5145c1f11e30a993770e165d0fb73ce28bf88c85f8953f5990161dbcc6dbfb
 MISC metadata.xml 1002 RMD160 39cba3b507b69bcf58bb5561d8d6af1fd4a9aef4 SHA1 b7eaf92005d3a6f1a697f179f87a2b31e52cf50e SHA256 eefe2611dfa35dc04b39e2c7b36d9ebdfb3764bf945249bf994bd20606dfdeef
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPHXjdAAoJEOTDgjZ80txdkhsH/1drz1kSwWI8dJFSIbioHrcz
-ksG2SVMwvYbugUpmJ7JZ318Znjj/Jumtx0qzYIghGdt8wWtTlTyJNnxQELb2q4fi
-RJx66WUFnBm4RcMb0G3hWtM3bS7pRH5itL0ypm5Lwxi7KiV10MSkRfLAhDF31Qah
-3hJ3hh3d1BjGdbhX3o8K3QzyP0dH9ZbtbME3OQeLsxPneRgseIhUKlNnWqnF4ZZ7
-voGkhuqW3Zha9VyQ1URbEQgqsxEHUofwxwS/0qObGf8Xq/N9WBBp4dfwolNw/kWj
-xiFLPilXgo62snHppZlDVoX2x+7KTjbBo6vbQxatUz8gtPuMTyGIOk6N1R5+MuA=
-=LfOI
+iEYEARECAAYFAk8hO2QACgkQp5vW4rUFj5ozSwCeLkNrlcLNm9scqRk5KbGthlSH
+AIoAn3NriFhAXYHX9HHtdWz45qw39XAF
+=77M2
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/bluez/bluez-4.96.ebuild b/net-wireless/bluez/bluez-4.96.ebuild
index cb806b1ab03f..6e64300785f5 100644
--- a/net-wireless/bluez/bluez-4.96.ebuild
+++ b/net-wireless/bluez/bluez-4.96.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/bluez-4.96.ebuild,v 1.6 2011/10/25 14:23:08 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/bluez-4.96.ebuild,v 1.7 2012/01/26 11:39:09 chainsaw Exp $
 
 EAPI="4"
 
@@ -26,7 +26,7 @@ CDEPEND="
 	sys-apps/dbus
 	>=sys-fs/udev-146[extras]
 	alsa? (
-		media-libs/alsa-lib[alsa_pcm_plugins_extplug,alsa_pcm_plugins_ioplug]
+		media-libs/alsa-lib[alsa_pcm_plugins_extplug(+),alsa_pcm_plugins_ioplug(+)]
 		media-libs/libsndfile
 	)
 	caps? ( >=sys-libs/libcap-ng-0.6.2 )
diff --git a/net-wireless/bluez/bluez-4.98-r1.ebuild b/net-wireless/bluez/bluez-4.98-r1.ebuild
index 9ba69858367a..2161d1271d4a 100644
--- a/net-wireless/bluez/bluez-4.98-r1.ebuild
+++ b/net-wireless/bluez/bluez-4.98-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/bluez-4.98-r1.ebuild,v 1.3 2012/01/23 15:13:24 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/bluez-4.98-r1.ebuild,v 1.4 2012/01/26 11:39:09 chainsaw Exp $
 
 EAPI="4"
 PYTHON_DEPEND="test-programs? 2"
@@ -27,7 +27,7 @@ CDEPEND="
 	sys-apps/dbus
 	>=sys-fs/udev-169
 	alsa? (
-		media-libs/alsa-lib[alsa_pcm_plugins_extplug,alsa_pcm_plugins_ioplug]
+		media-libs/alsa-lib[alsa_pcm_plugins_extplug(+),alsa_pcm_plugins_ioplug(+)]
 		media-libs/libsndfile
 	)
 	caps? ( >=sys-libs/libcap-ng-0.6.2 )
diff --git a/net-wireless/bluez/bluez-4.98.ebuild b/net-wireless/bluez/bluez-4.98.ebuild
index 02032a2131f3..5b51076b9183 100644
--- a/net-wireless/bluez/bluez-4.98.ebuild
+++ b/net-wireless/bluez/bluez-4.98.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/bluez-4.98.ebuild,v 1.2 2012/01/19 11:33:25 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/bluez-4.98.ebuild,v 1.3 2012/01/26 11:39:09 chainsaw Exp $
 
 EAPI="4"
 PYTHON_DEPEND="test-programs? 2"
@@ -27,7 +27,7 @@ CDEPEND="
 	sys-apps/dbus
 	>=sys-fs/udev-146[extras]
 	alsa? (
-		media-libs/alsa-lib[alsa_pcm_plugins_extplug,alsa_pcm_plugins_ioplug]
+		media-libs/alsa-lib[alsa_pcm_plugins_extplug(+),alsa_pcm_plugins_ioplug(+)]
 		media-libs/libsndfile
 	)
 	caps? ( >=sys-libs/libcap-ng-0.6.2 )