old

Package-Manager: portage-2.2.0_alpha186/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

9 files changed, 16 insertions, 578 deletions

diff --git a/media-libs/alsa-lib/ChangeLog b/media-libs/alsa-lib/ChangeLog
index c23f06cfc58c..001bbf0571b4 100644
--- a/media-libs/alsa-lib/ChangeLog
+++ b/media-libs/alsa-lib/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/alsa-lib
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/ChangeLog,v 1.363 2013/07/15 18:45:05 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/ChangeLog,v 1.364 2013/07/15 18:46:21 ssuominen Exp $
+
+  15 Jul 2013; Samuli Suominen <ssuominen@gentoo.org>
+  -alsa-lib-1.0.27-r2.ebuild, -alsa-lib-1.0.27-r3.ebuild,
+  -files/alsa-lib-1.0.27-dlclose.patch, -files/alsa-lib-1.0.27-inline.patch,
+  -files/alsa-lib-1.0.27-inline-2.patch, -files/alsa-lib-1.0.27-kernel.patch,
+  -files/alsa-lib-1.0.27-pcm.patch:
+  old
 
 *alsa-lib-1.0.27.1-r1 (15 Jul 2013)
 
diff --git a/media-libs/alsa-lib/Manifest b/media-libs/alsa-lib/Manifest
index 79126978f131..ca014ff6ca86 100644
--- a/media-libs/alsa-lib/Manifest
+++ b/media-libs/alsa-lib/Manifest
@@ -2,29 +2,21 @@
 Hash: SHA256
 
 AUX 1.0.25-extraneous-cflags.diff 465 SHA256 ac22ee102fa41baf179b755ca0203b87712e57e515c85b72b45ed5bc9e75d555 SHA512 1c84f3f1c4bd8bd866c2c0fed24136b818dad28bf91fd6e39b4e17c7f1b72d53af7d3e4a6358b9c80f616052ae87540561743757f98e1dcd613ae2d1c7ab8348 WHIRLPOOL 7ca6ec58257fb572bc2eb7ebb6efc12f9d7319e4beaf78137d4d876abf1e53fc151bad682600363407b4afae3887cbce267ebb580e29685c0ac61b6b33cc6431
-AUX alsa-lib-1.0.27-dlclose.patch 2999 SHA256 4663756b2c501bbc69fe31b6066c93620e847a14b96905311c89f0986caa405e SHA512 bd763f4b6d986c6342b9d7d6896cab9ea8b7638ddd81aa9330fd7e1d7912da2d19d58c17137fae25b545f6e3295a2dd4c9e6c87b5a93a7f770a90612ad39aa07 WHIRLPOOL c14ac89cb2c9421020bf3ab51db2fe59dcd3798748d2232b6cc2840b5eae25ff231647548005c6f0cf178fe1e14eec31851b58781e0488dc6e68b1870e9b7351
-AUX alsa-lib-1.0.27-inline-2.patch 689 SHA256 d4df6f0309ce2f8ea13db5f357ba955a00750a6c0d0e6e3113f690626ec3d8da SHA512 978c904073364b614ea214c3fafa06ad033bb07cd243d740efd527980be5f99a158c7d392fd64bdb13d2f5cab8c9f7b43f2a34aada8ca65c07b1538ab75c9441 WHIRLPOOL 22e9706a36be0d4379215334e1e6d141bf60c03a42b4d1166880bbbe1164f34bcef72681b3d3984a202de9dab70a961a9e36b5ecc36bad900cf474509d8c2077
-AUX alsa-lib-1.0.27-inline.patch 6503 SHA256 0d9fe7b525039e7915545715395880a4a9047730a521d832e9006facd038e244 SHA512 a9cb3a2b67beb1d2302d620ffc1952626ff473a421276e7a5a623f1099b5ed0ebaf2877a4b17b19f3a02b68e5662cf696d1507e68628dce20eee2a0851307c9a WHIRLPOOL c3de5b3e1e996f975103887dbdd56c68a7e7ce4595dcf2f05d23fa85fd41f3a92c057ad14e93336484d880832db53b52a057ae7587f7dcdc755000e375909b90
-AUX alsa-lib-1.0.27-kernel.patch 2679 SHA256 633ba95643ede5b594053dd588d27175e88b2ae372c04a52e86134737e05241a SHA512 f57d4761a94013a581573f16f146a4b552556f82b8d8c28e04a5058741529839a3eca7a49b2a1776e6340fa6fc5f1d01f21131629fa940710383f1ee7d985f0d WHIRLPOOL 6b57cbf524a142a61b702e00ad3de8dfae974df99a0869a1f9ecd5a0625b317fc081d91279f41044e2d5cd65853effe9168b4701e9830d2b36cd2391eebd358e
-AUX alsa-lib-1.0.27-pcm.patch 845 SHA256 b6fb50bd56f8f14c299d4629be05b0d13c80f910ed06464541bf7e685cf98ea8 SHA512 2997465fca9e9160a527ed4d509343753bf5185cfd8a0a2714ed4ea64507e582d0e3dea0d055adbed6aa17835527c5a87d50a033bedf95a94ff247697b0015d0 WHIRLPOOL e6cc9be59ee06f591a494e436fd6cfe8b384069a402403ea58b54d150f2e6ef5979612216a16dbc95739e52d1a335951fd2d8970bb23cffa9c457ad7d5921da0
 DIST alsa-lib-1.0.26.tar.bz2 883076 SHA256 8c9f8161603cc3db640619650401292c3e110da63429ab6938aac763319f6e7d SHA512 2f917171c1e2f50947d7b62da468c5febfa91fba5c04b4694171f7fa0e61ddf398daf7e657876bab1f1ec08932e82f147786b10f815172409f057b0fcd69003a WHIRLPOOL c6353ccf335e24e97258f26fed14ce66fff21b721bef1d6648f212653c0c58a99c889784bf7d42cadbc0f2b1514c877fe8ed94f30c7b45d55f9193c335849c0f
 DIST alsa-lib-1.0.27.1.tar.bz2 906234 SHA256 690e07a3ef6270d40ed2130638dba3c18395aae8db4a109bcc473643ce29a03b SHA512 546a52c5c23d51e3a49a36565c0bdda98efc3bbe8ba217c72cfb6986b0e1a6104a3040bc223a74966139416ce39709421a3131f3edb29362a3f949b0ae939909 WHIRLPOOL 485a5b260edc208776ca553d13065d242f1266e38b25dab252596fc8d4c9c3482d11fd3e472c7c96c97b396718a715ca12f36c76635bd069ebe09edc6815693f
-DIST alsa-lib-1.0.27.tar.bz2 898132 SHA256 947caa14cf53c614d0a206fe9f5964de6ee9617f9007e8fceffd6b3cfd89bc5d SHA512 70e12f7ba8e1d1c7e7c240c033affd991a536b57b95bb82b25cc7f9ef36157c2045ceec360df373e2979e8c03ed64019bbb1949a279d965bd208bd6a704351eb WHIRLPOOL 055ecbda55733d3a63cee9bcda8a04f168b83313b6eccff5fa568a1d7727cb7ff5ca40e25d1f8bf651cb97f129884e7e0963877fb2c06252f8e4a0e130a4b407
 EBUILD alsa-lib-1.0.26-r1.ebuild 1582 SHA256 c1588f960b915f657309ab524d1b2f2286f1faf8eecb4114243009fa3816f370 SHA512 df792c0360764de1ff4d3bff933e2496f65fa1ae59de4bae2c51b572d799502b2f84e5fdd14aebeadfe230e36acbf44dbdf7ffb448e744b7aaf7163f31534d3e WHIRLPOOL 90023a4143d91e0c8ae71f496e8812b43b1ba33b24a1f5e6d89a191b0a8b79427a49866e541ef4d0e5f137f9d8360f519cc99bd7e9f5c06bf52bfe404760d967
-EBUILD alsa-lib-1.0.27-r2.ebuild 1839 SHA256 51406748ddc9188c09232243d97b613d951caf910f2f3f1c6c5dbd31daeed58c SHA512 28951436422de199ed67569154f1030d86b611ab88ff94295d3b1147748531695d581feb3d81ba2d90681193c7a62a749cab9c68cf4b45da26c3d712efa95d93 WHIRLPOOL 3d3ae3df060e6c54df6e9addec810a400b60a4dd75222fcff7796d6561d3fec6b96346da03531ada7e522f654b1c494364a5d6d0ca59d1b2dd8f329b105a6525
-EBUILD alsa-lib-1.0.27-r3.ebuild 2261 SHA256 3cc8c947e4b48006d58834d52f2b9c9fc748d2df8e15a3943cd67112cef34b70 SHA512 9f2818ffe55b87ee9ef58661bec93fa3211e9026e09e78b3771817e5097071ceaac6e2b968e97cb0aeb51a2b93f34ddac6c6237c7cda63eede55bc10f3bc73ed WHIRLPOOL ce5765b69b87de0bfd5fde0f63d73a18c0dbf5ad16af42868c6bfce1b48bff97c5078362d8ee9257ad65aaa36d3bfe98b8dd0104b934f86854b5846624147544
 EBUILD alsa-lib-1.0.27.1-r1.ebuild 2053 SHA256 0f388e4bfa3f362854e547f890f1557cbec6e4a19a70a6207f1b82512d9efe47 SHA512 8d854cb0324690c0163f63b3a842f83a161a9b17507fc68802aa572b189b24479bd39ec31f382876a0cfdda6b4f60406caa149aee4f8e576af51824358a6986f WHIRLPOOL dc0f6c707c1462564b66888593741bfb24d8ae91b47417cc2fcd9dcfa1678bdb16cb057e283aec0bd865002ba28ddedfb81c8a26088854f6deb89c2882ec312e
 EBUILD alsa-lib-1.0.27.1.ebuild 1626 SHA256 ae88cb99a7cde956f3ca6480893db2132142a77c2a25aabf0e4617e7eccbd018 SHA512 37576843b2a408f2ee51ce2bed7e949ad889024bceb3623fc83f543e63c91067d85f3f945f5b254be4a5778059f191149534ae586a40dff2e777f40fbd237288 WHIRLPOOL c4f242ad6889367ddfc6d26e5a2209ad710d57aa8cd7e6f8f1f00e42e6607ee9d9baea2c3b600c4c73b87a81dd36704643c32bf04d6d6edb75d63d502121bb3c
-MISC ChangeLog 53903 SHA256 71b8eff6bb7a18de43b290871715e214e8ab6410e6688a2a1c09ffe69d72d70b SHA512 6b1a8fb78898c1351761a9a28ffb2c15b84910f442cc35155f73794ef6ce9d2a90220d356400523c7f6aa38424ffa59e8643d9d23600cde7e0784b31d7b90ae9 WHIRLPOOL 7ee9beb284ea273e577b360804d3d7458afe670d7458061ec353d2d065e42e1315dbd456994c4fdf97cbd5ebb05e6c121b47b796c0a88ae3883fa9bb6b5372f4
+MISC ChangeLog 54213 SHA256 01f7374b9b841a60d39b4e3bfa8267410a77a29977934b9ae9818e48d62d2e18 SHA512 1b79c92669bb41760c5c0c8942e51afd1c4493127eabb12a149917d8f874934c5b51ad8396a033d353cbe61031c9a9888203ebfb5e55ab7c3137f5081a0e096d WHIRLPOOL a52d3f945c772998caedaa158c60feb493be48d6a854f6fda8cdf218051113da8f673d7a061fda7f93ebb851a82e073ff1f837cd39c60fa3028a4ac10da670d3
 MISC metadata.xml 435 SHA256 11a9185677809c9d71ae36243dc523514aa91b935c22e729224cc5ab3c9d616d SHA512 e96497c31a8433bd6c407ebc9777d651c4b4ae409893cbf12ee14d8322d69c85dc273e6d9936b9b9b401f350cc8eb299f7938f5a8403d2d3d9e7628c23a89225 WHIRLPOOL 3d354a400cb3c71cc7b7f9b33622706f3e297bbd7275b80f54e7b8e070ac7169aac09d68e5861df09b357feee3a781687a678b6a04150c3e1ae851a40d03aaa6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJR5EMsAAoJEEdUh39IaPFN1qUIAJl7kc6yk6ZRN45+A0I6jWzm
-8/OPd1by0i8E70dQglbc9iZNH0XP09W+ZAmGgkvkVz1y99QPK4Sx7OoYCI9MOpd/
-7LdEk7BdtSyktYCVRDuMBsyNF6xMi/eCt+fWTuifbtDQS3bfbpRuK+oDFrZL6KGc
-Cbgata6IDZLaOMIduviXmqISrtGjLdUa857MCLLNiDogXHZZjs+6WRcd0jICCYTO
-sT5VXszAV3scAJpVCtuNWRV59PjDO2bZtmZgeo6TURMnCn/8DgnGWEZP02BqJTJg
-2I9nUakUMZuY2uXpCW/GLlhtScJ2a08kEyeh4hMF9FqPSzRmLUebgtQNSoB8PRk=
-=950G
+iQEcBAEBCAAGBQJR5EN5AAoJEEdUh39IaPFNKEMH/A4TPQrYyy8Lv4KLJ2kn7dPa
+BH2uffv2Xy9Qxzr/Plm331lqpmkT9rZvLUo4hoAOEc0BYDBZLCEf9J2YONy4/vG7
+xO8e2f8m0Nve74XnuGg8C6NJvZ7vPb2oU1Dv197Vyr3BOVaXmRToAkVEcJr1d83t
+oe17IvrG/v0NNpzsotDpTbfU/0h1ujfcZ74l1NB0vjVXDjKplJFlhTvFX8cbH1P8
+RZWz5ZFshOcwvoVLj409qfThLAafOA0dgzewqIf8WVMe5J/IZ22Eyii7A0YAx2kE
+a+KUwUtlJLbSpp7QZcqQhlnjYRbJUVqCinhUM4aG9QdsmIPETcZSBs+Bs8lTs7Y=
+=H1lD
 -----END PGP SIGNATURE-----
diff --git a/media-libs/alsa-lib/alsa-lib-1.0.27-r2.ebuild b/media-libs/alsa-lib/alsa-lib-1.0.27-r2.ebuild
deleted file mode 100644
index 677fa039d98d..000000000000
--- a/media-libs/alsa-lib/alsa-lib-1.0.27-r2.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/alsa-lib-1.0.27-r2.ebuild,v 1.2 2013/05/06 13:50:28 ssuominen Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils multilib python-single-r1
-
-DESCRIPTION="Advanced Linux Sound Architecture Library"
-HOMEPAGE="http://www.alsa-project.org/"
-SRC_URI="mirror://alsaproject/lib/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc debug alisp python"
-
-RDEPEND="python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}
-	doc? ( >=app-doc/doxygen-1.2.6 )"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# dlclose, pcm, kernel, inline, inline-2 are all from upstream
-	epatch \
-		"${FILESDIR}"/1.0.25-extraneous-cflags.diff \
-		"${FILESDIR}"/${P}-{dlclose,pcm,kernel}.patch \
-		"${FILESDIR}"/${P}-inline{,-2}.patch
-
-	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.in || die #466980
-
-	epatch_user
-
-	eautoreconf
-	# if eautoreconf'd with recent autoconf, then epunt_cxx is
-	# unncessary wrt #460974
-#	epunt_cxx
-}
-
-src_configure() {
-	local myconf
-	use elibc_uclibc && myconf="--without-versioned"
-
-	econf \
-		--enable-shared \
-		--disable-resmgr \
-		--enable-rawmidi \
-		--enable-seq \
-		--enable-aload \
-		$(use_with debug) \
-		$(use_enable alisp) \
-		$(use_enable python) \
-		${myconf}
-}
-
-src_compile() {
-	emake
-
-	if use doc; then
-		emake doc
-		fgrep -Zrl "${S}" "${S}/doc/doxygen/html" | \
-			xargs -0 sed -i -e "s:${S}::"
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	prune_libtool_files --all
-	find "${ED}"/usr/$(get_libdir)/alsa-lib -name '*.a' -exec rm -f {} +
-
-	dodoc ChangeLog TODO
-	use doc && dohtml -r doc/doxygen/html/*
-}
diff --git a/media-libs/alsa-lib/alsa-lib-1.0.27-r3.ebuild b/media-libs/alsa-lib/alsa-lib-1.0.27-r3.ebuild
deleted file mode 100644
index c2e566e5cb04..000000000000
--- a/media-libs/alsa-lib/alsa-lib-1.0.27-r3.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/alsa-lib-1.0.27-r3.ebuild,v 1.3 2013/06/26 20:09:37 aballier Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils multilib multilib-minimal python-single-r1
-
-DESCRIPTION="Advanced Linux Sound Architecture Library"
-HOMEPAGE="http://www.alsa-project.org/"
-SRC_URI="mirror://alsaproject/lib/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc debug alisp python"
-
-RDEPEND="python? ( ${PYTHON_DEPS} )
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r1
-					!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
-DEPEND="${RDEPEND}
-	doc? ( >=app-doc/doxygen-1.2.6 )"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# dlclose, pcm, kernel, inline, inline-2 are all from upstream
-	epatch \
-		"${FILESDIR}"/1.0.25-extraneous-cflags.diff \
-		"${FILESDIR}"/${P}-{dlclose,pcm,kernel}.patch \
-		"${FILESDIR}"/${P}-inline{,-2}.patch
-
-	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.in || die #466980
-
-	epatch_user
-
-	eautoreconf
-	# if eautoreconf'd with recent autoconf, then epunt_cxx is
-	# unncessary wrt #460974
-#	epunt_cxx
-}
-
-multilib_src_configure() {
-	local myconf
-	# enable Python only on final ABI
-	if [[ ${ABI} == ${DEFAULT_ABI} ]]; then
-		myconf="$(use_enable python)"
-	else
-		myconf="--disable-python"
-	fi
-	use elibc_uclibc && myconf+=" --without-versioned"
-
-	ECONF_SOURCE=${S} \
-	econf \
-		--enable-shared \
-		--disable-resmgr \
-		--enable-rawmidi \
-		--enable-seq \
-		--enable-aload \
-		$(use_with debug) \
-		$(use_enable alisp) \
-		${myconf}
-}
-
-multilib_src_compile() {
-	emake
-
-	if [[ ${ABI} == ${DEFAULT_ABI} ]] && use doc; then
-		emake doc
-		fgrep -Zrl "${S}" doc/doxygen/html | \
-			xargs -0 sed -i -e "s:${S}::"
-	fi
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-	if [[ ${ABI} == ${DEFAULT_ABI} ]] && use doc; then
-		dohtml -r doc/doxygen/html/.
-	fi
-}
-
-multilib_src_install_all() {
-	prune_libtool_files --all
-	find "${ED}"/usr/$(get_libdir)/alsa-lib -name '*.a' -exec rm -f {} +
-	dodoc ChangeLog TODO
-}
diff --git a/media-libs/alsa-lib/files/alsa-lib-1.0.27-dlclose.patch b/media-libs/alsa-lib/files/alsa-lib-1.0.27-dlclose.patch
deleted file mode 100644
index 72df461859e1..000000000000
--- a/media-libs/alsa-lib/files/alsa-lib-1.0.27-dlclose.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-From e1e40c25535af35fa5cdf7ffc95a01fbff098ddd Mon Sep 17 00:00:00 2001
-From: Takashi Iwai <tiwai@suse.de>
-Date: Mon, 15 Apr 2013 18:12:17 +0200
-Subject: [PATCH] Fix doubly call of dlclose() in dlobj caching code
-
-When multiple dlobj_cache items point to the same dlobj, dlclose() may
-be called wrongly multiple times when these items are cleared, because
-we manage the dlobj_cache list as a flat list.  This results in a bad
-segfault we've seen in openal-soft, for example.
-
-For fixing this, we need the refcounting of dlobj itself.  But, in
-this case, we don't have to manage yet another list,  since dlopen()
-does a proper refcounting by itself.  That is, we can just call always
-dlopen() at each time a new function is assigned, and also call
-dlclose() for each released dlobj_cache item at cleanup.
-
-Bugzilla: https://bugzilla.novell.com/show_bug.cgi?id=814250
-
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
----
- src/dlmisc.c | 31 +++++++++++--------------------
- 1 file changed, 11 insertions(+), 20 deletions(-)
-
-diff --git a/src/dlmisc.c b/src/dlmisc.c
-index 3788382..2de0234 100644
---- a/src/dlmisc.c
-+++ b/src/dlmisc.c
-@@ -208,8 +208,7 @@ void *snd_dlobj_cache_get(const char *lib, const char *name,
- {
- 	struct list_head *p;
- 	struct dlobj_cache *c;
--	void *func, *dlobj = NULL;
--	int dlobj_close = 0;
-+	void *func, *dlobj;
- 
- 	snd_dlobj_lock();
- 	list_for_each(p, &pcm_dlobj_list) {
-@@ -220,7 +219,6 @@ void *snd_dlobj_cache_get(const char *lib, const char *name,
- 			continue;
- 		if (!lib && c->lib)
- 			continue;
--		dlobj = c->dlobj;
- 		if (strcmp(c->name, name) == 0) {
- 			c->refcnt++;
- 			func = c->func;
-@@ -228,17 +226,16 @@ void *snd_dlobj_cache_get(const char *lib, const char *name,
- 			return func;
- 		}
- 	}
-+
-+	dlobj = snd_dlopen(lib, RTLD_NOW);
- 	if (dlobj == NULL) {
--		dlobj = snd_dlopen(lib, RTLD_NOW);
--		if (dlobj == NULL) {
--			if (verbose)
--				SNDERR("Cannot open shared library %s",
-+		if (verbose)
-+			SNDERR("Cannot open shared library %s",
- 						lib ? lib : "[builtin]");
--			snd_dlobj_unlock();
--			return NULL;
--		}
--		dlobj_close = 1;
-+		snd_dlobj_unlock();
-+		return NULL;
- 	}
-+
- 	func = snd_dlsym(dlobj, name, version);
- 	if (func == NULL) {
- 		if (verbose)
-@@ -257,8 +254,7 @@ void *snd_dlobj_cache_get(const char *lib, const char *name,
- 		free((void *)c->lib);
- 		free(c);
- 	      __err:
--		if (dlobj_close)
--			snd_dlclose(dlobj);
-+		snd_dlclose(dlobj);
- 		snd_dlobj_unlock();
- 		return NULL;
- 	}
-@@ -298,16 +294,11 @@ void snd_dlobj_cache_cleanup(void)
- 	struct list_head *p, *npos;
- 	struct dlobj_cache *c;
- 
--	/* clean up caches only when really no user is present */
- 	snd_dlobj_lock();
--	list_for_each(p, &pcm_dlobj_list) {
--		c = list_entry(p, struct dlobj_cache, list);
--		if (c->refcnt)
--			goto unlock;
--	}
--
- 	list_for_each_safe(p, npos, &pcm_dlobj_list) {
- 		c = list_entry(p, struct dlobj_cache, list);
-+		if (c->refcnt)
-+			continue;
- 		list_del(p);
- 		snd_dlclose(c->dlobj);
- 		free((void *)c->name); /* shut up gcc warning */
--- 
-1.7.11.7
-
diff --git a/media-libs/alsa-lib/files/alsa-lib-1.0.27-inline-2.patch b/media-libs/alsa-lib/files/alsa-lib-1.0.27-inline-2.patch
deleted file mode 100644
index e99bae864a9e..000000000000
--- a/media-libs/alsa-lib/files/alsa-lib-1.0.27-inline-2.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From a8f405b8f90d752c3609b9e918dc949c4efadf87 Mon Sep 17 00:00:00 2001
-From: Takashi Iwai <tiwai@suse.de>
-Date: Thu, 25 Apr 2013 09:55:49 +0200
-Subject: [PATCH] Add definition of __inline__ for non-GCC
-
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
----
- include/asoundlib-head.h | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/include/asoundlib-head.h b/include/asoundlib-head.h
-index 6edbab0..71b5c29 100644
---- a/include/asoundlib-head.h
-+++ b/include/asoundlib-head.h
-@@ -40,6 +40,10 @@
- #include <errno.h>
- #include <stdarg.h>
- 
-+#ifndef __GNUC__
-+#define __inline__ inline
-+#endif
-+
- #include <alsa/asoundef.h>
- #include <alsa/version.h>
- #include <alsa/global.h>
--- 
-1.7.11.7
-
diff --git a/media-libs/alsa-lib/files/alsa-lib-1.0.27-inline.patch b/media-libs/alsa-lib/files/alsa-lib-1.0.27-inline.patch
deleted file mode 100644
index cc5cb8d75b73..000000000000
--- a/media-libs/alsa-lib/files/alsa-lib-1.0.27-inline.patch
+++ /dev/null
@@ -1,155 +0,0 @@
-From 30122df4faf7ccc79b9525db95f55c5a8ed6fe4d Mon Sep 17 00:00:00 2001
-From: Takashi Iwai <tiwai@suse.de>
-Date: Thu, 25 Apr 2013 09:52:33 +0200
-Subject: [PATCH] Use __inline__ for exported headers
-
-Some programs are still using C90.
-
-Bugzilla: https://bugzilla.novell.com/show_bug.cgi?id=817077
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
----
- include/control.h     |  4 ++--
- include/iatomic.h     | 14 +++++++-------
- include/pcm.h         |  2 +-
- include/pcm_extplug.h |  4 ++--
- include/use-case.h    |  4 ++--
- 5 files changed, 14 insertions(+), 14 deletions(-)
-
-diff --git a/include/control.h b/include/control.h
-index 27fe2ac..5fdf379 100644
---- a/include/control.h
-+++ b/include/control.h
-@@ -234,7 +234,7 @@ int snd_ctl_open_lconf(snd_ctl_t **ctl, const char *name, int mode, snd_config_t
- int snd_ctl_open_fallback(snd_ctl_t **ctl, snd_config_t *root, const char *name, const char *orig_name, int mode);
- int snd_ctl_close(snd_ctl_t *ctl);
- int snd_ctl_nonblock(snd_ctl_t *ctl, int nonblock);
--static inline int snd_ctl_abort(snd_ctl_t *ctl) { return snd_ctl_nonblock(ctl, 2); }
-+static __inline__ int snd_ctl_abort(snd_ctl_t *ctl) { return snd_ctl_nonblock(ctl, 2); }
- int snd_async_add_ctl_handler(snd_async_handler_t **handler, snd_ctl_t *ctl, 
- 			      snd_async_callback_t callback, void *private_data);
- snd_ctl_t *snd_async_handler_get_ctl(snd_async_handler_t *handler);
-@@ -532,7 +532,7 @@ int snd_hctl_open(snd_hctl_t **hctl, const char *name, int mode);
- int snd_hctl_open_ctl(snd_hctl_t **hctlp, snd_ctl_t *ctl);
- int snd_hctl_close(snd_hctl_t *hctl);
- int snd_hctl_nonblock(snd_hctl_t *hctl, int nonblock);
--static inline int snd_hctl_abort(snd_hctl_t *hctl) { return snd_hctl_nonblock(hctl, 2); }
-+static __inline__ int snd_hctl_abort(snd_hctl_t *hctl) { return snd_hctl_nonblock(hctl, 2); }
- int snd_hctl_poll_descriptors_count(snd_hctl_t *hctl);
- int snd_hctl_poll_descriptors(snd_hctl_t *hctl, struct pollfd *pfds, unsigned int space);
- int snd_hctl_poll_descriptors_revents(snd_hctl_t *ctl, struct pollfd *pfds, unsigned int nfds, unsigned short *revents);
-diff --git a/include/iatomic.h b/include/iatomic.h
-index e92dbfd..5711fe8 100644
---- a/include/iatomic.h
-+++ b/include/iatomic.h
-@@ -980,7 +980,7 @@ static __inline__ int atomic_dec_and_test(volatile atomic_t *v)
- 	return result;
- }
- 
--static inline int atomic_add_negative(int i, volatile atomic_t *v)
-+static __inline__ int atomic_add_negative(int i, volatile atomic_t *v)
- {
- 	unsigned long flags;
- 	int result;
-@@ -1160,36 +1160,36 @@ typedef struct {
- 
- void snd_atomic_read_wait(snd_atomic_read_t *t);
- 
--static inline void snd_atomic_write_init(snd_atomic_write_t *w)
-+static __inline__ void snd_atomic_write_init(snd_atomic_write_t *w)
- {
- 	w->begin = 0;
- 	w->end = 0;
- }
- 
--static inline void snd_atomic_write_begin(snd_atomic_write_t *w)
-+static __inline__ void snd_atomic_write_begin(snd_atomic_write_t *w)
- {
- 	w->begin++;
- 	wmb();
- }
- 
--static inline void snd_atomic_write_end(snd_atomic_write_t *w)
-+static __inline__ void snd_atomic_write_end(snd_atomic_write_t *w)
- {
- 	wmb();
- 	w->end++;
- }
- 
--static inline void snd_atomic_read_init(snd_atomic_read_t *r, snd_atomic_write_t *w)
-+static __inline__ void snd_atomic_read_init(snd_atomic_read_t *r, snd_atomic_write_t *w)
- {
- 	r->write = w;
- }
- 
--static inline void snd_atomic_read_begin(snd_atomic_read_t *r)
-+static __inline__ void snd_atomic_read_begin(snd_atomic_read_t *r)
- {
- 	r->end = r->write->end;
- 	rmb();
- }
- 
--static inline int snd_atomic_read_ok(snd_atomic_read_t *r)
-+static __inline__ int snd_atomic_read_ok(snd_atomic_read_t *r)
- {
- 	rmb();
- 	return r->end == r->write->begin;
-diff --git a/include/pcm.h b/include/pcm.h
-index e440030..95b8aed 100644
---- a/include/pcm.h
-+++ b/include/pcm.h
-@@ -451,7 +451,7 @@ int snd_pcm_poll_descriptors_count(snd_pcm_t *pcm);
- int snd_pcm_poll_descriptors(snd_pcm_t *pcm, struct pollfd *pfds, unsigned int space);
- int snd_pcm_poll_descriptors_revents(snd_pcm_t *pcm, struct pollfd *pfds, unsigned int nfds, unsigned short *revents);
- int snd_pcm_nonblock(snd_pcm_t *pcm, int nonblock);
--static inline int snd_pcm_abort(snd_pcm_t *pcm) { return snd_pcm_nonblock(pcm, 2); }
-+static __inline__ int snd_pcm_abort(snd_pcm_t *pcm) { return snd_pcm_nonblock(pcm, 2); }
- int snd_async_add_pcm_handler(snd_async_handler_t **handler, snd_pcm_t *pcm, 
- 			      snd_async_callback_t callback, void *private_data);
- snd_pcm_t *snd_async_handler_get_pcm(snd_async_handler_t *handler);
-diff --git a/include/pcm_extplug.h b/include/pcm_extplug.h
-index 884f322..e3b71bc 100644
---- a/include/pcm_extplug.h
-+++ b/include/pcm_extplug.h
-@@ -188,7 +188,7 @@ int snd_pcm_extplug_set_slave_param_minmax(snd_pcm_extplug_t *extplug, int type,
- /**
-  * set the parameter constraint with a single value
-  */
--static inline int snd_pcm_extplug_set_param(snd_pcm_extplug_t *extplug, int type, unsigned int val)
-+static __inline__ int snd_pcm_extplug_set_param(snd_pcm_extplug_t *extplug, int type, unsigned int val)
- {
- 	return snd_pcm_extplug_set_param_list(extplug, type, 1, &val);
- }
-@@ -196,7 +196,7 @@ static inline int snd_pcm_extplug_set_param(snd_pcm_extplug_t *extplug, int type
- /**
-  * set the parameter constraint for slave PCM with a single value
-  */
--static inline int snd_pcm_extplug_set_slave_param(snd_pcm_extplug_t *extplug, int type, unsigned int val)
-+static __inline__ int snd_pcm_extplug_set_slave_param(snd_pcm_extplug_t *extplug, int type, unsigned int val)
- {
- 	return snd_pcm_extplug_set_slave_param_list(extplug, type, 1, &val);
- }
-diff --git a/include/use-case.h b/include/use-case.h
-index defd4ea..93b3456 100644
---- a/include/use-case.h
-+++ b/include/use-case.h
-@@ -354,7 +354,7 @@ int snd_use_case_mgr_reset(snd_use_case_mgr_t *uc_mgr);
-  * \param list Returned allocated list
-  * \return Number of list entries if success, otherwise a negative error code
-  */
--static inline int snd_use_case_card_list(const char **list[])
-+static __inline__ int snd_use_case_card_list(const char **list[])
- {
- 	return snd_use_case_get_list(NULL, NULL, list);
- }
-@@ -365,7 +365,7 @@ static inline int snd_use_case_card_list(const char **list[])
-  * \param list Returned list of verbs
-  * \return Number of list entries if success, otherwise a negative error code
-  */
--static inline int snd_use_case_verb_list(snd_use_case_mgr_t *uc_mgr,
-+static __inline__ int snd_use_case_verb_list(snd_use_case_mgr_t *uc_mgr,
- 					 const char **list[])
- {
- 	return snd_use_case_get_list(uc_mgr, "_verbs", list);
--- 
-1.7.11.7
-
diff --git a/media-libs/alsa-lib/files/alsa-lib-1.0.27-kernel.patch b/media-libs/alsa-lib/files/alsa-lib-1.0.27-kernel.patch
deleted file mode 100644
index 3d4eaf3cbc72..000000000000
--- a/media-libs/alsa-lib/files/alsa-lib-1.0.27-kernel.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From 886f0cc3c274643de464e646535afb4ceee1d816 Mon Sep 17 00:00:00 2001
-From: Daniel Mack <zonque@gmail.com>
-Date: Thu, 18 Apr 2013 10:37:50 +0200
-Subject: [PATCH] bring pcm.h and pcm.c in sync with the kernel list
-
-In particular, this adds definitions and descriptions for G.723 and
-DSD types.
-
-Signed-off-by: Daniel Mack <zonque@gmail.com>
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
----
- include/pcm.h | 14 +++++++++++++-
- src/pcm/pcm.c | 12 ++++++++++++
- 2 files changed, 25 insertions(+), 1 deletion(-)
-
-diff --git a/include/pcm.h b/include/pcm.h
-index d94ba90..e440030 100644
---- a/include/pcm.h
-+++ b/include/pcm.h
-@@ -199,7 +199,19 @@ typedef enum _snd_pcm_format {
- 	SND_PCM_FORMAT_U18_3LE,
- 	/** Unsigned 18bit Big Endian in 3bytes format */
- 	SND_PCM_FORMAT_U18_3BE,
--	SND_PCM_FORMAT_LAST = SND_PCM_FORMAT_U18_3BE,
-+	/* G.723 (ADPCM) 24 kbit/s, 8 samples in 3 bytes */
-+	SND_PCM_FORMAT_G723_24,
-+	/* G.723 (ADPCM) 24 kbit/s, 1 sample in 1 byte */
-+	SND_PCM_FORMAT_G723_24_1B,
-+	/* G.723 (ADPCM) 40 kbit/s, 8 samples in 3 bytes */
-+	SND_PCM_FORMAT_G723_40,
-+	/* G.723 (ADPCM) 40 kbit/s, 1 sample in 1 byte */
-+	SND_PCM_FORMAT_G723_40_1B,
-+	/* Direct Stream Digital (DSD) in 1-byte samples (x8) */
-+	SND_PCM_FORMAT_DSD_U8,
-+	/* Direct Stream Digital (DSD) in 2-byte samples (x16) */
-+	SND_PCM_FORMAT_DSD_U16_LE,
-+	SND_PCM_FORMAT_LAST = SND_PCM_FORMAT_DSD_U16_LE,
- 
- #if __BYTE_ORDER == __LITTLE_ENDIAN
- 	/** Signed 16 bit CPU endian */
-diff --git a/src/pcm/pcm.c b/src/pcm/pcm.c
-index 2a87a7b..438fb3f 100644
---- a/src/pcm/pcm.c
-+++ b/src/pcm/pcm.c
-@@ -1558,6 +1558,12 @@ static const char *const snd_pcm_format_names[] = {
- 	FORMAT(S18_3BE),
- 	FORMAT(U18_3LE),
- 	FORMAT(U18_3BE),
-+	FORMAT(G723_24),
-+	FORMAT(G723_24_1B),
-+	FORMAT(G723_40),
-+	FORMAT(G723_40_1B),
-+	FORMAT(DSD_U8),
-+	FORMAT(DSD_U16_LE),
- };
- 
- static const char *const snd_pcm_format_aliases[SND_PCM_FORMAT_LAST+1] = {
-@@ -1611,6 +1617,12 @@ static const char *const snd_pcm_format_descriptions[] = {
- 	FORMATD(S18_3BE, "Signed 18 bit Big Endian in 3bytes"),
- 	FORMATD(U18_3LE, "Unsigned 18 bit Little Endian in 3bytes"),
- 	FORMATD(U18_3BE, "Unsigned 18 bit Big Endian in 3bytes"),
-+	FORMATD(G723_24, "G.723 (ADPCM) 24 kbit/s, 8 samples in 3 bytes"),
-+	FORMATD(G723_24_1B, "G.723 (ADPCM) 24 kbit/s, 1 sample in 1 byte"),
-+	FORMATD(G723_40, "G.723 (ADPCM) 40 kbit/s, 8 samples in 3 bytes"),
-+	FORMATD(G723_40_1B, "G.723 (ADPCM) 40 kbit/s, 1 sample in 1 byte"),
-+	FORMATD(DSD_U8,  "Direct Stream Digital, 1-byte (x8), oldest bit in MSB"),
-+	FORMATD(DSD_U16_LE, "Direct Stream Digital, 2-byte (x16), little endian, oldest bits in MSB"),
- };
- 
- static const char *const snd_pcm_type_names[] = {
--- 
-1.7.11.7
-
diff --git a/media-libs/alsa-lib/files/alsa-lib-1.0.27-pcm.patch b/media-libs/alsa-lib/files/alsa-lib-1.0.27-pcm.patch
deleted file mode 100644
index 44ca8003a135..000000000000
--- a/media-libs/alsa-lib/files/alsa-lib-1.0.27-pcm.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 697f8c296ccb4b38cec930782b5ef1419aaf4245 Mon Sep 17 00:00:00 2001
-From: Daniel Mack <zonque@gmail.com>
-Date: Thu, 18 Apr 2013 10:37:49 +0200
-Subject: [PATCH] pcm.c: fix indentation
-
-Signed-off-by: Daniel Mack <zonque@gmail.com>
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
----
- src/pcm/pcm.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/pcm/pcm.c b/src/pcm/pcm.c
-index 38febb9..2a87a7b 100644
---- a/src/pcm/pcm.c
-+++ b/src/pcm/pcm.c
-@@ -1638,11 +1638,11 @@ static const char *const snd_pcm_type_names[] = {
- 	PCMTYPE(LADSPA), 
- 	PCMTYPE(DMIX), 
- 	PCMTYPE(JACK),
--        PCMTYPE(DSNOOP),
--        PCMTYPE(IEC958),
-+	PCMTYPE(DSNOOP),
-+	PCMTYPE(IEC958),
- 	PCMTYPE(SOFTVOL),
--        PCMTYPE(IOPLUG),
--        PCMTYPE(EXTPLUG),
-+	PCMTYPE(IOPLUG),
-+	PCMTYPE(EXTPLUG),
- 	PCMTYPE(MMAP_EMUL),
- };
- 
--- 
-1.7.11.7
-