Fix compiling alsa programs that need u_int*_t since new glibc. Thanks to David Henningsson, Richard Shaw, Gary Buhrmaster, Matthieu Baerts and Adam Conrad

Package-Manager: portage-2.1.11.60/cvs/Linux x86_64
Manifest-Sign-Key: 0x4A5D8F23

5 files changed, 102 insertions, 19 deletions

diff --git a/media-libs/alsa-lib/ChangeLog b/media-libs/alsa-lib/ChangeLog
index 369961143d7f..087b7d5dba45 100644
--- a/media-libs/alsa-lib/ChangeLog
+++ b/media-libs/alsa-lib/ChangeLog
@@ -1,6 +1,14 @@
 # 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.343 2013/04/02 12:13:45 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/ChangeLog,v 1.344 2013/04/04 18:36:26 je_fro Exp $
+
+*alsa-lib-1.0.26-r2 (04 Apr 2013)
+
+  04 Apr 2013; Jeff Gardner <je_fro@gentoo.org>
+  +files/1.0.26-r2.types-fix.diff, +alsa-lib-1.0.26-r2.ebuild:
+  Fix compiling alsa programs that need u_int*_t since new glibc. Thanks to
+  David Henningsson, Richard Shaw, Gary Buhrmaster, Matthieu Baerts and Adam
+  Conrad
 
   02 Apr 2013; Agostino Sarubbo <ago@gentoo.org> alsa-lib-1.0.26-r1.ebuild:
   Stable for arm, wrt bug #463451
diff --git a/media-libs/alsa-lib/Manifest b/media-libs/alsa-lib/Manifest
index 8b5f6d89fd6a..1d9c653a1acd 100644
--- a/media-libs/alsa-lib/Manifest
+++ b/media-libs/alsa-lib/Manifest
@@ -1,30 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX 1.0.25-extraneous-cflags.diff 897 SHA256 687dad4aac106fb55a25478bdfd52fafdd35e44be9b6a8b4c2f89c380ee8807c SHA512 df070edb139ca1b6aaae3012c975683e09defe0467d51eb4b5c11ecfd067a641f3ae711a5bc6a169f69d375cfb63360a6c9ec1060e50fbb3e62d81abe165147e WHIRLPOOL 9a148294fc336e1a333b472eaa96e30513b7f11594ea7739e950143fad0e009cc44b54cd9a085f2fa6313c12509558a12d5fe1c5cebccb0020948e3108beffbf
+AUX 1.0.26-r2.types-fix.diff 229 SHA256 c5cc549d627368953a1d6035778f5031c28cac0f5d6f75a736dc10c709c7d799 SHA512 7f7427846f210d31ecdbdbfd02d534ed16d43fa5f9ed4294ad7292e36a5ed9ace996b4c43f6212e11868bb389082127957c6d6258974e0beed523ed36f8a5062 WHIRLPOOL 99c5ef483f529f59c5a6f86418d17902148caac8c5d9e9b05cc3e0f6273a82c5d5f65f7ae2cd21a1d3a201d3fa2d726a0a8bea965a200557835a2f3a4aab7188
 DIST alsa-lib-1.0.24.1.tar.bz2 832555 SHA256 a32f7c21015b6c71f9a80ff70a2b6a50e4ff4d5c77c744ff0793dea7ba7a2517 SHA512 f5915894c004c3725bb3a066118c8941ec53b57739f38e180b393ac0cc9963c0eaeb8a5d1b8301968d0be9267c102217c85d1f49b1ebfca2703127ff7a3eb533 WHIRLPOOL 95a86df89fa169adb775aba13b4766ad1d5cf929f75048a64158e6a5a08bf9bfffe40e20c688ff8839302f0ccda9e2f227540b530b5da045ecf75f3af6968a4c
 DIST alsa-lib-1.0.25.tar.bz2 838403 SHA256 5a1a805cf04106316d549ec650116ce6711a162e107ba8b3c551866680e286e6 SHA512 bd7066d588d0eadc7872980847d7474fce25ddcff813aa8a9a62216a2f981118d7b4de745b3dd3ab7203b892657e0574d5b66e31dfd8e883e76afb4c6ae8139e WHIRLPOOL 6dcda3ba93c8130971d45d50e96ea08e5a1c1785b3bb95183d67f6cfe6ef5476f2e97cbd3075f252ee839a0145b8c831c6384c1bb8eaf9ad9312eef161f82b52
 DIST alsa-lib-1.0.26.tar.bz2 883076 SHA256 8c9f8161603cc3db640619650401292c3e110da63429ab6938aac763319f6e7d SHA512 2f917171c1e2f50947d7b62da468c5febfa91fba5c04b4694171f7fa0e61ddf398daf7e657876bab1f1ec08932e82f147786b10f815172409f057b0fcd69003a WHIRLPOOL c6353ccf335e24e97258f26fed14ce66fff21b721bef1d6648f212653c0c58a99c889784bf7d42cadbc0f2b1514c877fe8ed94f30c7b45d55f9193c335849c0f
-EBUILD alsa-lib-1.0.24.1.ebuild 2608 SHA256 7a8df39d6a94221c1fbbbd40edd4c822f30c8c00cce3422ca2826af46c34a2ca SHA512 c2140933dbb556a8bb581a2162eee22791fa3739af18357b11ec756e613da5aaafa443483e68a0eda2d7a7c6d3fef75559520f8513d3ac9ec4479741704e53e7 WHIRLPOOL a360f0dde09099d3d1ff8528460680bc2b19d5d6678d5ad77d318c5b9c62f8046551062f224223bcc125a4798289f3de0006687df16e6fd587e7bf2c10e67b91
+EBUILD alsa-lib-1.0.24.1.ebuild 2608 SHA256 edbb02c9dc68aa1a9aa2afc0cbe1fcd3f2801cb9d1f4f164087352762b9dfa8a SHA512 7dcd681123f3ce85c2da9ab56a881adf6133293c935d1c873c4837afc57dc3dac0944b12d1919f439138d12a3077465e1fc064002aea427c11158052095df523 WHIRLPOOL 3d2275fd5d93e155fa745d6a0f7d13787c7c5f9454cf573d52098df224afcf65e19a44bee793f67d42fab457a89f22d5d44b23a37ca03b74b20c7ce99dcafa25
 EBUILD alsa-lib-1.0.25-r1.ebuild 1629 SHA256 8a287466ccbb5e520051a1302cc054ca1bf0f4df54b217c7a5fda11d35be70af SHA512 cd8be8ec6e489fec76b0261b76d37ef18900f7efd1c64da503dfb5e2271cbd2a5818611a376bc191c4e0c0760505b1a3e2137d31605fab8026ebdb1711687b3c WHIRLPOOL 5c88b5d1c8b32f21f66d7f27dc641f9ce08ecc410c4e3db3eab71436129768fb5c9cc449cd939e17eb260186335b9a7a1fcbd7d367212174999620f45408ae07
 EBUILD alsa-lib-1.0.26-r1.ebuild 1614 SHA256 4643594dba6369f72dcfcd834385a301405aee8f0ccb4441fa762fb2784bfe12 SHA512 0fdaa91508bfc540f7890128db927420ae165f77c4ab93b66910b36c1aa23f17175cc137ddfbf58be6068714bc8059e2d3acff517bf2e84b9801a3a42a4b2579 WHIRLPOOL 56bfc68cbfb352114e73639470174eed6841c521bf6d05305c9eaa88ffc4491f2eca6c0e447aa09c5ae31f467685304eb45f0ffc022eec2066eb6428c4d8179f
+EBUILD alsa-lib-1.0.26-r2.ebuild 1670 SHA256 9f37535d11a77710c03046fa8451446dda6096ed2e1a3eb4d6103bd9201381f5 SHA512 d4441cdab8afbbd3bee1358c388ab8057a34069b8d26668a82552e0db1d561e7f61842e8214968eb53d5a02edc7998b3a3a68f4a0f0f84c48c8f1a64c02700f6 WHIRLPOOL 6a8e7e94459606e35e7c78759d0911dea55915f3c3ebdbc3fa935eaf5da1f5510828ce87e2bf1b4ac77c09ee6cc7262f31193c24c26a2a809fee99b46ec80f19
 EBUILD alsa-lib-1.0.26.ebuild 1516 SHA256 6f4427ab6afedb57875c4a2877d27028728fcbf9453ad09bf9c166d2f2efe0f3 SHA512 8e2279828e66e028e25fde0dfa36bcc2acca6327f445ca9883e2e2214e5528fa4a7760a0123c426bb6d3fb45e8263b182cc7ae7a101b9be80c8cf2ee03487e86 WHIRLPOOL 327bc7002de5c06b3385ea83b616e600be3bd7e9b579a7f1c85000ebb18130bb3029a59279ed363a98d8e912205670ef698a7feab694e13ba2a02ddbd7c860d3
-MISC ChangeLog 50593 SHA256 7ec3d0cfb1c500d5749e64429d3e70fa520d81164c9e5ae07f3c5c46d3f80688 SHA512 90bcc08ac9310a81ad2a73531d8aa68a03f0c3e3578f49b00650258abcd7daf507f164e0d4a60f10cbc76fdf302020201287207319fd3b0bfbc6853f595eac8f WHIRLPOOL ff72a890204d5dc2b2a0bea53791138e503e1e8ab969ba5c9be69dc7959e7fa1d996e4e3a90bcbdd4e4077f2154782f534665378908905294ccd66f5e7a755f9
+MISC ChangeLog 50905 SHA256 a0e8d54c3ac3ecca84d41723ed549436db058a9494d36c08b7a6df324a046645 SHA512 255e7e4e50985856d05d6976901226a82810dc0d5047c16081847accf528a2ecd9329a9a05ea016c9f340133b213dd11a46bf794f3db6cc28541b8452d816b7c WHIRLPOOL e6be3d2eae922c0a92b9768099675cc6200f1c922083a4b279ce8f74b82e2eed783e2c893714115169b100a1edda5fab04f48b54a8e9e7273ee90aac79abdee8
 MISC metadata.xml 349 SHA256 68b0f168985d3b03a0997eb9f9338662d1584dc7fe7ea35ae8f7564e5e20c2e3 SHA512 477956b85f7ddddac6b0bb67a52803a569f3ee6011ab917a3d2a60975a11c0a9ef5acedebbcb75bdbd04063e2c6e7aabf10a0c2444dd10492eda4cb8f817f688 WHIRLPOOL c42f98c4da4bd5c20d32bfa6a3d9d68b71aaccbc905cad9a7552366be99c1e1f010279d458b620e97e2c1044cef0af066cf79fc5a1fcecf8fb31c91a3e1e95ab
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRWsrmAAoJELp701BxlEWfzFoP/077iyAEzYoyJ2gGMPUZmGUx
-CSWvZU8/rldEBS2q9tWeifvhIZttdR2gt9M7oKKPNX4SEjQovsRxdWuG1uavZsFu
-s61Lhfp60hYbkFcahdAxrYnC1oEf+n06QYNM8Fosqr6Nxn2BH0JCs0rxb4GbDJMX
-sSdifufC540nr8ASwj9RjSsre7e+Qc72xcQ488WuOD7ngJH66mTRik+XsGNFi19y
-luT7crxkBp0dWww9vX2Il+FaWTkgCGHiE9MC6JMxD6cevQC3fCzeiCv1+FSEJTCc
-B5WqUHPEQUqT3GDng3dKAFDTyy7KpkVeeTISQaf3nOIYm9umhiKxgSZU8pAU+POi
-GAuf67pm9OJzMnIt3usxVUt67hrPUhgRf/JOAFA+qyNV+PkyIzLgp1eSyQcAnvCc
-6kzCmFSEjmBmCenJKf+xPeS7kXZ7xaY+aDS4GsDRMCzyQ1FhrTrKE4VQp7RiKHhd
-q/kyEuCdN81oFsT/NxI4y7Xywh9kzPJ+8fra94Glq34GR3aweRurgwY61fh8Jxc9
-imhg1kFDaoSdb1LaBDIcL1/Bi/ye7YZiaJy6dHd7rtFdJGsusTs/uy9E+1h6WdF7
-mwjF4Hp8E6AnZkR0llXrobvcIN5aQSC5yk+eCNETHp0gbfCjv3IQJQms6gffYLMp
-R4jCLnUokTiRbWPE+Nf7
-=oBBr
+iEYEAREIAAYFAlFdyDAACgkQiR2KxEpdjyMyDgCeLAQdGPvuVgys7hxr9iruJJ4V
+AywAnjJ6zKvxgd/445S8wd4wN0SUQ0od
+=wyIm
 -----END PGP SIGNATURE-----
diff --git a/media-libs/alsa-lib/alsa-lib-1.0.24.1.ebuild b/media-libs/alsa-lib/alsa-lib-1.0.24.1.ebuild
index 0810c4f4dafc..5dee3206af7e 100644
--- a/media-libs/alsa-lib/alsa-lib-1.0.24.1.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.0.24.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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.24.1.ebuild,v 1.9 2011/12/29 21:35:32 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/alsa-lib-1.0.24.1.ebuild,v 1.10 2013/04/04 18:36:26 je_fro Exp $
 
 EAPI=3
 
diff --git a/media-libs/alsa-lib/alsa-lib-1.0.26-r2.ebuild b/media-libs/alsa-lib/alsa-lib-1.0.26-r2.ebuild
new file mode 100644
index 000000000000..65b0fc007263
--- /dev/null
+++ b/media-libs/alsa-lib/alsa-lib-1.0.26-r2.ebuild
@@ -0,0 +1,72 @@
+# 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.26-r2.ebuild,v 1.1 2013/04/04 18:36:26 je_fro Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_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}
+	>=media-sound/alsa-headers-1.0.25
+	doc? ( >=app-doc/doxygen-1.2.6 )"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/1.0.25-extraneous-cflags.diff
+	epatch "${FILESDIR}"/1.0.26-r2.types-fix.diff
+	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/files/1.0.26-r2.types-fix.diff b/media-libs/alsa-lib/files/1.0.26-r2.types-fix.diff
new file mode 100644
index 000000000000..49d7602cf64f
--- /dev/null
+++ b/media-libs/alsa-lib/files/1.0.26-r2.types-fix.diff
@@ -0,0 +1,11 @@
+--- a/include/asoundlib-head.h
++++ b/include/asoundlib-head.h
+@@ -31,6 +31,7 @@
+ #include <unistd.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <sys/types.h>
+ #include <string.h>
+ #include <fcntl.h>
+ #include <assert.h>
+