Create special -r0 for stabilization wrt #473404#c3 without multilib-minimal.eclass

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

4 files changed, 108 insertions, 30 deletions

diff --git a/media-libs/alsa-lib/ChangeLog b/media-libs/alsa-lib/ChangeLog
index 95166d9c14aa..c23f06cfc58c 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.362 2013/07/15 13:45:47 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/ChangeLog,v 1.363 2013/07/15 18:45:05 ssuominen Exp $
+
+*alsa-lib-1.0.27.1-r1 (15 Jul 2013)
+
+  15 Jul 2013; Samuli Suominen <ssuominen@gentoo.org> alsa-lib-1.0.27.1.ebuild,
+  +alsa-lib-1.0.27.1-r1.ebuild:
+  Create special -r0 for stabilization wrt #473404#c3 without
+  multilib-minimal.eclass
 
   15 Jul 2013; Samuli Suominen <ssuominen@gentoo.org>
   alsa-lib-1.0.26-r1.ebuild:
diff --git a/media-libs/alsa-lib/Manifest b/media-libs/alsa-lib/Manifest
index 87cc3ebf0b3d..79126978f131 100644
--- a/media-libs/alsa-lib/Manifest
+++ b/media-libs/alsa-lib/Manifest
@@ -13,17 +13,18 @@ DIST alsa-lib-1.0.27.tar.bz2 898132 SHA256 947caa14cf53c614d0a206fe9f5964de6ee96
 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.ebuild 2049 SHA256 6a7db20ed17cc3cd37387d94602a28792975603ee8ee3f6bb1189b8f08c4f5d4 SHA512 0aefe830a007640bb4d495f41a80a7f332ac2b830cb0c3afb81e47022293a89b821dc88dcc54cb44ccfa93defd49e59b0d0996f42fc8913f4a5c7b6c662d5361 WHIRLPOOL 53898f1dadc9e043bc3d42b8b0ac90b967b30f1184edd7443a909ce10b3f10a53269e8bf78dfe1390bc16a193301d3dd0fc8bab98cacb7af087f7333f93ae247
-MISC ChangeLog 53665 SHA256 8a5ad8946607850654f62a424adc64972df9631364e6192c6a251d1297cf2eb8 SHA512 4af37592a91741489c9cab34786debf74ffa870315258ca0e2ff10d4e1d048a1e4bd50c416e6953e6b0556e54a39a31dc3fa3640db66ac4a4cbec08ff3cf4e42 WHIRLPOOL 6bd6c2627840318a5737b16e2a4d68e3e0e54e6f2d3e3f1c8980a93d3e788098132aac55390aab88592880739390dc3e952e33c07918993e81743603f0833226
+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 metadata.xml 435 SHA256 11a9185677809c9d71ae36243dc523514aa91b935c22e729224cc5ab3c9d616d SHA512 e96497c31a8433bd6c407ebc9777d651c4b4ae409893cbf12ee14d8322d69c85dc273e6d9936b9b9b401f350cc8eb299f7938f5a8403d2d3d9e7628c23a89225 WHIRLPOOL 3d354a400cb3c71cc7b7f9b33622706f3e297bbd7275b80f54e7b8e070ac7169aac09d68e5861df09b357feee3a781687a678b6a04150c3e1ae851a40d03aaa6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJR4/0HAAoJEEdUh39IaPFNJ1AH/2kPvW3M65xEHhI0+tWv9mur
-fazyL+xrZzYfWZHpTG8RsqZoYug0+Pszl5yu0NsFo9N6hhBHp7HV09UtDxXtyXzn
-L6bg+UcD/kDDhe0RHxehBLVk1I4tbnFaWquiOmY/x88Lz1T1CeWL1RM2tOYWo22U
-tJ0+stS6NHANDKnoPONvCVf7rtFh++NjqVqAcLV9e2TIvTsfwODq6xwj+glFOY2W
-/N22qYi5y5rQe+54DpqtYtPSFc4idcnCu2uCEvg/U5Lewr9xMgMzNKK/OGKAL2AO
-mdMYqfCndXNAsqfBYZcD7baJ52bW6EcbDExZ71O9kUlvuxoRmVT4o7Ns531qS7Q=
-=KUF8
+iQEcBAEBCAAGBQJR5EMsAAoJEEdUh39IaPFN1qUIAJl7kc6yk6ZRN45+A0I6jWzm
+8/OPd1by0i8E70dQglbc9iZNH0XP09W+ZAmGgkvkVz1y99QPK4Sx7OoYCI9MOpd/
+7LdEk7BdtSyktYCVRDuMBsyNF6xMi/eCt+fWTuifbtDQS3bfbpRuK+oDFrZL6KGc
+Cbgata6IDZLaOMIduviXmqISrtGjLdUa857MCLLNiDogXHZZjs+6WRcd0jICCYTO
+sT5VXszAV3scAJpVCtuNWRV59PjDO2bZtmZgeo6TURMnCn/8DgnGWEZP02BqJTJg
+2I9nUakUMZuY2uXpCW/GLlhtScJ2a08kEyeh4hMF9FqPSzRmLUebgtQNSoB8PRk=
+=950G
 -----END PGP SIGNATURE-----
diff --git a/media-libs/alsa-lib/alsa-lib-1.0.27.1-r1.ebuild b/media-libs/alsa-lib/alsa-lib-1.0.27.1-r1.ebuild
new file mode 100644
index 000000000000..58d79893cfd5
--- /dev/null
+++ b/media-libs/alsa-lib/alsa-lib-1.0.27.1-r1.ebuild
@@ -0,0 +1,81 @@
+# 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.1-r1.ebuild,v 1.1 2013/07/15 18:45:05 ssuominen Exp $
+
+EAPI=5
+
+# no support for python3_2 or above yet wrt #471326
+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() {
+	find . -name Makefile.am -exec sed -i -e '/CFLAGS/s:-g -O2::' {} + || die
+	epatch_user
+	eautoreconf
+}
+
+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 \
+		--disable-maintainer-mode \
+		--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 doc/asoundrc.txt NOTES TODO
+}
diff --git a/media-libs/alsa-lib/alsa-lib-1.0.27.1.ebuild b/media-libs/alsa-lib/alsa-lib-1.0.27.1.ebuild
index 66ad9d2d97b1..c5eb4465ec6d 100644
--- a/media-libs/alsa-lib/alsa-lib-1.0.27.1.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.0.27.1.ebuild
@@ -1,13 +1,13 @@
 # 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.1.ebuild,v 1.2 2013/06/26 20:09:37 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/alsa-lib-1.0.27.1.ebuild,v 1.3 2013/07/15 18:45:05 ssuominen Exp $
 
 EAPI=5
 
 # no support for python3_2 or above yet wrt #471326
 PYTHON_COMPAT=( python2_7 )
 
-inherit autotools eutils multilib multilib-minimal python-single-r1
+inherit autotools eutils multilib python-single-r1
 
 DESCRIPTION="Advanced Linux Sound Architecture Library"
 HOMEPAGE="http://www.alsa-project.org/"
@@ -18,9 +18,7 @@ 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(-)] )"
+RDEPEND="python? ( ${PYTHON_DEPS} )"
 DEPEND="${RDEPEND}
 	doc? ( >=app-doc/doxygen-1.2.6 )"
 
@@ -34,15 +32,9 @@ src_prepare() {
 	eautoreconf
 }
 
-multilib_src_configure() {
+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"
+	use elibc_uclibc && myconf="--without-versioned"
 
 	ECONF_SOURCE=${S} \
 	econf \
@@ -57,24 +49,21 @@ multilib_src_configure() {
 		${myconf}
 }
 
-multilib_src_compile() {
+src_compile() {
 	emake
 
-	if [[ ${ABI} == ${DEFAULT_ABI} ]] && use doc; then
+	if use doc; then
 		emake doc
 		fgrep -Zrl "${S}" doc/doxygen/html | \
 			xargs -0 sed -i -e "s:${S}::"
 	fi
 }
 
-multilib_src_install() {
+src_install() {
 	emake DESTDIR="${D}" install
-	if [[ ${ABI} == ${DEFAULT_ABI} ]] && use doc; then
+	if 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 doc/asoundrc.txt NOTES TODO