Bump to latest upstream version (masked).

(Portage version: 2.1_pre1)

20 files changed, 504 insertions, 55 deletions

diff --git a/media-libs/alsa-lib/ChangeLog b/media-libs/alsa-lib/ChangeLog
index 68aa1d2fd771..afc9514b1ed0 100644
--- a/media-libs/alsa-lib/ChangeLog
+++ b/media-libs/alsa-lib/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/alsa-lib
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/ChangeLog,v 1.140 2005/11/23 19:10:09 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/ChangeLog,v 1.141 2005/12/21 15:48:32 flameeyes Exp $
+
+*alsa-lib-1.0.11_rc1 (21 Dec 2005)
+
+  21 Dec 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +alsa-lib-1.0.11_rc1.ebuild:
+  Bump to latest upstream version (masked).
 
   23 Nov 2005; Luis Medinas <metalgod@gentoo.org> alsa-lib-1.0.10.ebuild:
   Stable on amd64. See bug #111968.
diff --git a/media-libs/alsa-lib/Manifest b/media-libs/alsa-lib/Manifest
index ece07f3b5307..da080a091c9c 100644
--- a/media-libs/alsa-lib/Manifest
+++ b/media-libs/alsa-lib/Manifest
@@ -1,11 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 2845f669f9cec5edad9f96cb93103297 ChangeLog 20778
 MD5 9c272add7e13dc69bac9eaf8c2cd0771 alsa-lib-0.9.8.ebuild 1558
 MD5 1ba475d889739b2f722da2761566b8fc alsa-lib-1.0.10.ebuild 2070
 MD5 56d4fd87ad9b48e621ad0de5d43ffba5 alsa-lib-1.0.10_rc2.ebuild 1982
 MD5 7409d8cc024104fac6141b0af31d794e alsa-lib-1.0.10_rc3.ebuild 1936
+MD5 e4b7e3df5d5ed82351b8d352c7a18c3d alsa-lib-1.0.11_rc1.ebuild 2072
 MD5 255565a888541274148ccb6e1b226eb5 alsa-lib-1.0.7.ebuild 2051
 MD5 51ae1bb8d288687265e0dc774e2b377c alsa-lib-1.0.8.ebuild 1581
 MD5 a8445caff5c6c234b3b9886b51b6f74e alsa-lib-1.0.9.ebuild 1802
@@ -20,14 +18,8 @@ MD5 8a3190d9f23acedd006359afb79f60bc files/digest-alsa-lib-0.9.8 67
 MD5 22257ca92b0882a755f50554b5d38a5b files/digest-alsa-lib-1.0.10 68
 MD5 9983325ef78244eb4a682bbad04a4584 files/digest-alsa-lib-1.0.10_rc2 71
 MD5 36025db2dfefd31acba9ff0d31b9ad11 files/digest-alsa-lib-1.0.10_rc3 71
+MD5 9056c58732c493a6f55e13ebb49e3cf9 files/digest-alsa-lib-1.0.11_rc1 71
 MD5 86565eb0601b611f39adb8f5ad47b622 files/digest-alsa-lib-1.0.7 67
 MD5 46a389b403bc763310e942cc9fc6d7b1 files/digest-alsa-lib-1.0.8 67
 MD5 5cbe7a7471c2f69dde2e86924eaf101e files/digest-alsa-lib-1.0.9 67
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDhL5swUpWvClEHQoRAnRqAJ9A/khuWXDyDdXgr0XkGErcT7wRiQCfdv+5
-B46OUX2JSi0mb8NMRNr9HoI=
-=hAeg
------END PGP SIGNATURE-----
diff --git a/media-libs/alsa-lib/alsa-lib-1.0.11_rc1.ebuild b/media-libs/alsa-lib/alsa-lib-1.0.11_rc1.ebuild
new file mode 100644
index 000000000000..2f20486b7fd4
--- /dev/null
+++ b/media-libs/alsa-lib/alsa-lib-1.0.11_rc1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2005 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.11_rc1.ebuild,v 1.1 2005/12/21 15:48:32 flameeyes Exp $
+
+inherit eutils autotools
+
+MY_P="${P/_rc/rc}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Advanced Linux Sound Architecture Library"
+HOMEPAGE="http://www.alsa-project.org/"
+SRC_URI="mirror://alsaproject/lib/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+
+# -sparc: http://bugtrack.alsa-project.org/alsa-bug/view.php?id=1268
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86"
+IUSE="doc jack"
+
+RDEPEND="virtual/alsa
+	>=media-sound/alsa-headers-${PV}"
+DEPEND="${RDEPEND}
+	doc? ( >=app-doc/doxygen-1.2.6 )"
+
+PDEPEND="jack? ( =media-plugins/alsa-jack-${PV/_rc*/}* )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch "${FILESDIR}/${PN}-1.0.10_rc3-hardened.patch"
+
+	eautoreconf
+}
+
+src_compile() {
+	# needed to avoid gcc looping internaly
+	use hppa && export CFLAGS="-O1 -pipe"
+
+	econf \
+		--enable-static \
+		--enable-shared \
+		|| die "configure failed"
+
+	emake || die "make failed"
+
+	if use doc; then
+		emake doc || die "failed to generate docs"
+	fi
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+
+	dodoc ChangeLog TODO
+	use doc && dohtml -r doc/doxygen/html/*
+}
+
+pkg_postinst() {
+	einfo "If you are using an emu10k1 based sound card, and you are upgrading"
+	einfo "from a version of alsalib <1.0.6, you will need to recompile packages"
+	einfo "that link against alsa-lib due to some ABI changes between 1.0.5 and"
+	einfo "1.0.6 unique to that hardware. You can do this by executing:"
+	einfo "revdep-rebuild --soname libasound.so.2"
+	einfo "See the following URL for more information:"
+	einfo "http://bugs.gentoo.org/show_bug.cgi?id=65347"
+	echo
+	ewarn "Please use media-sound/alsa-driver rather than in-kernel drivers as there"
+	ewarn "have been some problems recently with the in-kernel drivers.  See bug #87544."
+}
diff --git a/media-libs/alsa-lib/files/digest-alsa-lib-1.0.11_rc1 b/media-libs/alsa-lib/files/digest-alsa-lib-1.0.11_rc1
new file mode 100644
index 000000000000..d88ca612b2d7
--- /dev/null
+++ b/media-libs/alsa-lib/files/digest-alsa-lib-1.0.11_rc1
@@ -0,0 +1 @@
+MD5 e347cc3570bc671b8a590f9db12eaeed alsa-lib-1.0.11rc1.tar.bz2 701213
diff --git a/media-sound/alsa-driver/ChangeLog b/media-sound/alsa-driver/ChangeLog
index b990e0668d2d..aac4e97e99a3 100644
--- a/media-sound/alsa-driver/ChangeLog
+++ b/media-sound/alsa-driver/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/alsa-driver
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/ChangeLog,v 1.175 2005/12/19 09:33:13 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/ChangeLog,v 1.176 2005/12/21 15:48:55 flameeyes Exp $
+
+*alsa-driver-1.0.11_rc1 (21 Dec 2005)
+
+  21 Dec 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +alsa-driver-1.0.11_rc1.ebuild:
+  Bump to latest upstream version (masked).
 
   19 Dec 2005; Diego Pettenò <flameeyes@gentoo.org>
   alsa-driver-1.0.10-r1.ebuild:
diff --git a/media-sound/alsa-driver/Manifest b/media-sound/alsa-driver/Manifest
index 73aa2672137d..14dc185c3508 100644
--- a/media-sound/alsa-driver/Manifest
+++ b/media-sound/alsa-driver/Manifest
@@ -1,11 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 a86adeb1350458a583bdc6ab9f337cbe ChangeLog 30477
 MD5 4d36586e82b663b31cef834a9fa0d38b alsa-driver-1.0.10-r1.ebuild 4720
 MD5 c55716cc7bf263f6ed218b149e8dfe91 alsa-driver-1.0.10.ebuild 4623
 MD5 83e0d77659b142d24afa2a86d91b3c4d alsa-driver-1.0.10_rc2.ebuild 4555
 MD5 05d84ba8681d1e857e581caf97e6db59 alsa-driver-1.0.10_rc3.ebuild 4675
+MD5 69c6bc4aef2e7212bacc15d179cf5021 alsa-driver-1.0.11_rc1.ebuild 4625
 MD5 afcbb70f92f2785ee73a764383c47611 alsa-driver-1.0.3.ebuild 3349
 MD5 5f53d077d0ff6216fca0d50170172f0c alsa-driver-1.0.8.ebuild 4679
 MD5 79f7336e1fcbf3cd90de84db0283b03a alsa-driver-1.0.9b.ebuild 4552
@@ -20,16 +18,10 @@ MD5 5474546fa4977a1fa63fbab0a155fd15 files/digest-alsa-driver-1.0.10 72
 MD5 5474546fa4977a1fa63fbab0a155fd15 files/digest-alsa-driver-1.0.10-r1 72
 MD5 569ec84f258f90c508827a3040062f41 files/digest-alsa-driver-1.0.10_rc2 75
 MD5 ad7631557a0317471d29e4c26cfb4cf2 files/digest-alsa-driver-1.0.10_rc3 75
+MD5 f5c89eb671533fd51f386faf216cc982 files/digest-alsa-driver-1.0.11_rc1 75
 MD5 938a2ee36c54416322d1acd47b249c99 files/digest-alsa-driver-1.0.3 71
 MD5 14b6c8d954e36bb9d40c97cf051220f0 files/digest-alsa-driver-1.0.8 71
 MD5 496627835733f8108e6b10dfc8ee9bf4 files/digest-alsa-driver-1.0.9b 72
 MD5 27ccbe36406f145c1d63725a53517233 files/makefile.patch 1122
 MD5 b2791ec892d9be6952fe139cc2309abf files/xbox-1.0.8.patch 1525
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDpn5uAiZjviIA2XgRAnphAKCheLiYJzInOqzsEaKtf7+i6SY9ZwCgnCQg
-2QUHGpWawewfsUsEuGTuf28=
-=AvPW
------END PGP SIGNATURE-----
diff --git a/media-sound/alsa-driver/alsa-driver-1.0.11_rc1.ebuild b/media-sound/alsa-driver/alsa-driver-1.0.11_rc1.ebuild
new file mode 100644
index 000000000000..f579dc27caf1
--- /dev/null
+++ b/media-sound/alsa-driver/alsa-driver-1.0.11_rc1.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/alsa-driver-1.0.11_rc1.ebuild,v 1.1 2005/12/21 15:48:55 flameeyes Exp $
+
+inherit linux-mod flag-o-matic eutils
+
+MY_P="${P/_rc/rc}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Advanced Linux Sound Architecture kernel modules"
+HOMEPAGE="http://www.alsa-project.org/"
+SRC_URI="mirror://alsaproject/driver/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+
+KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~ppc64 ~x86"
+IUSE="oss doc"
+
+RDEPEND="virtual/modutils
+	 ~media-sound/alsa-headers-${PV}"
+DEPEND="${RDEPEND}
+	virtual/linux-sources
+	sparc? ( >=sys-devel/autoconf-2.50 )
+	sys-apps/debianutils"
+
+PROVIDE="virtual/alsa"
+
+pkg_setup() {
+	# By default, drivers for all supported cards will be compiled.
+	# If you want to only compile for specific card(s), set ALSA_CARDS
+	# environment to a space-separated list of drivers that you want to build.
+	# For example:
+	#
+	#   env ALSA_CARDS='emu10k1 intel8x0 ens1370' emerge alsa-driver
+	#
+	ALSA_CARDS=${ALSA_CARDS:-all}
+
+	# Which drivers need PNP
+	local PNP_DRIVERS="interwave interwave-stb"
+
+	CONFIG_CHECK="SOUND"
+	SND_ERROR="ALSA is already compiled into the kernel."
+	SOUND_ERROR="Your kernel doesn't have sound support enabled."
+	SOUND_PRIME_ERROR="Your kernel is configured to use the deprecated OSS drivers.  Please disable them and re-emerge alsa-driver."
+	PNP_ERROR="Some of the drivers you selected require PNP in your kernel (${PNP_DRIVERS}).  Either enable PNP in your kernel or trim which drivers get compiled using ALSA_CARDS in /etc/make.conf."
+
+	if [[ "${ALSA_CARDS}" == "all" ]]; then
+
+		# Ignore PNP checks for ppc architecture, as PNP can't be enabled there.
+		if [[ ${ARCH} != "ppc" ]]; then
+			CONFIG_CHECK="${CONFIG_CHECK} PNP"
+		fi
+	else
+		for pnpdriver in ${PNP_DRIVERS}; do
+			hasq ${pnpdriver} ${ALSA_CARDS} && CONFIG_CHECK="${CONFIG_CHECK} PNP"
+		done
+	fi
+
+	linux-mod_pkg_setup
+
+	if [[ ${PROFILE_ARCH} == "sparc64" ]] ; then
+		CBUILD=${CBUILD-${CHOST}}
+		CHOST="sparc64-unknown-linux-gnu"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+
+	epatch "${FILESDIR}"/${PN}-1.0.10_rc1-include.patch
+
+	convert_to_m ${S}/Makefile
+	sed -i -e 's:\(.*depmod\):#\1:' ${S}/Makefile
+}
+
+src_compile() {
+	# Should fix bug #46901
+	is-flag "-malign-double" && filter-flags "-fomit-frame-pointer"
+	append-flags "-I${KV_DIR}/arch/$(tc-arch-kernel)/include"
+
+	econf $(use_with oss) \
+		--with-kernel="${KV_DIR}" \
+		--with-build="${KV_OUT_DIR}" \
+		--with-isapnp=yes \
+		--with-sequencer=yes \
+		--with-cards="${ALSA_CARDS}" || die "econf failed"
+
+	# linux-mod_src_compile doesn't work well with alsa
+
+	ARCH=$(tc-arch-kernel)
+	# -j1 : see bug #71028
+	emake -j1 HOSTCC=$(tc-getBUILD_CC) CC=$(tc-getCC) || die "Make Failed"
+	ARCH=$(tc-arch)
+
+	if use doc;
+	then
+		ebegin "Building Documentation"
+		cd ${S}/scripts
+		emake || die Failed making docs in ${S}/scripts
+
+		cd ${S}/doc/DocBook
+		emake || die Failed making docs in ${S}/doc/DocBook
+		eend $?
+	fi
+}
+
+
+src_install() {
+	make DESTDIR=${D} install-modules || die "make install failed"
+
+	dodoc CARDS-STATUS FAQ README WARNING TODO
+
+	if use doc; then
+		docinto doc
+		dodoc doc/*
+		rm ${D}/usr/share/doc/${PF}/doc/Makefile.gz
+
+		docinto DocBook
+		dodoc doc/DocBook/*
+		rm ${D}/usr/share/doc/${PF}/DocBook/Makefile.gz
+
+		docinto Documentation
+		dodoc sound/Documentation/*
+	fi
+
+	if kernel_is 2 6; then
+		# mv the drivers somewhere they won't be killed by the kernel's make modules_install
+		mv ${D}/lib/modules/${KV_FULL}/kernel/sound ${D}/lib/modules/${KV_FULL}/${PN}
+		rmdir ${D}/lib/modules/${KV_FULL}/kernel &> /dev/null
+	fi
+}
+
+pkg_postinst() {
+	einfo
+	einfo "The alsasound initscript and modules.d/alsa have now moved to alsa-utils"
+	einfo
+	einfo "Also, remember that all mixer channels will be MUTED by default."
+	einfo "Use the 'alsamixer' program to unmute them."
+	einfo
+	einfo "Version 1.0.3 and above should work with version 2.6 kernels."
+	einfo "If you experience problems, please report bugs to http://bugs.gentoo.org."
+	einfo
+
+	linux-mod_pkg_postinst
+
+	einfo "Check out the ALSA installation guide availible at the following URL:"
+	einfo "http://www.gentoo.org/doc/en/alsa-guide.xml"
+
+	if kernel_is 2 6 && [ -e ${ROOT}/lib/modules/${KV_FULL}/kernel/sound ]; then
+		# Cleanup if they had older alsa installed
+		for file in $(find ${ROOT}/lib/modules/${KV_FULL}/${PN} -type f); do
+			rm -f ${file//${KV_FULL}\/${PN}/${KV_FULL}\/kernel\/sound}
+		done
+
+		for dir in $(find ${ROOT}/lib/modules/${KV_FULL}/kernel/sound -type d | tac); do
+			rmdir ${dir} &> /dev/null
+		done
+	fi
+}
diff --git a/media-sound/alsa-driver/files/digest-alsa-driver-1.0.11_rc1 b/media-sound/alsa-driver/files/digest-alsa-driver-1.0.11_rc1
new file mode 100644
index 000000000000..8f5997aa7433
--- /dev/null
+++ b/media-sound/alsa-driver/files/digest-alsa-driver-1.0.11_rc1
@@ -0,0 +1 @@
+MD5 3972451d7ae38965e0d03d48daf9f77a alsa-driver-1.0.11rc1.tar.bz2 2275581
diff --git a/media-sound/alsa-headers/ChangeLog b/media-sound/alsa-headers/ChangeLog
index 9678c24c7f29..1c0f3e845a7e 100644
--- a/media-sound/alsa-headers/ChangeLog
+++ b/media-sound/alsa-headers/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/alsa-headers
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-headers/ChangeLog,v 1.53 2005/11/23 19:05:43 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-headers/ChangeLog,v 1.54 2005/12/21 15:48:00 flameeyes Exp $
+
+*alsa-headers-1.0.11_rc1 (21 Dec 2005)
+
+  21 Dec 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +alsa-headers-1.0.11_rc1.ebuild:
+  Bump to latest upstream version (masked).
 
   23 Nov 2005; Luis Medinas <metalgod@gentoo.org>
   alsa-headers-1.0.10.ebuild:
diff --git a/media-sound/alsa-headers/Manifest b/media-sound/alsa-headers/Manifest
index 83ae5c8405a7..6996156dc8a9 100644
--- a/media-sound/alsa-headers/Manifest
+++ b/media-sound/alsa-headers/Manifest
@@ -1,23 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 afdca919b62b2714003d930ffcbf5a2c ChangeLog 6863
 MD5 504d8fc67bbb5ba83f6c58c610d392e5 alsa-headers-1.0.10.ebuild 1053
 MD5 a9e144dbe9c96be33f280e18ee2e369d alsa-headers-1.0.10_rc2.ebuild 1060
 MD5 68e0083b150cb84847cd0788fa19969c alsa-headers-1.0.10_rc3.ebuild 1054
+MD5 52d215598608e16a654ec65f62e71ce7 alsa-headers-1.0.11_rc1.ebuild 1055
 MD5 c6fb273cd23828076b44c689f5363999 alsa-headers-1.0.8.ebuild 1045
 MD5 b92b40894cafd64ded78e9e35b527bd7 alsa-headers-1.0.9b.ebuild 1024
 MD5 6985658411b4e459ef8b03a25f480404 files/alsa-headers-1.0.6a-user.patch 419
 MD5 5474546fa4977a1fa63fbab0a155fd15 files/digest-alsa-headers-1.0.10 72
 MD5 569ec84f258f90c508827a3040062f41 files/digest-alsa-headers-1.0.10_rc2 75
 MD5 ad7631557a0317471d29e4c26cfb4cf2 files/digest-alsa-headers-1.0.10_rc3 75
+MD5 f5c89eb671533fd51f386faf216cc982 files/digest-alsa-headers-1.0.11_rc1 75
 MD5 14b6c8d954e36bb9d40c97cf051220f0 files/digest-alsa-headers-1.0.8 71
 MD5 496627835733f8108e6b10dfc8ee9bf4 files/digest-alsa-headers-1.0.9b 72
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDhL1iwUpWvClEHQoRApb6AJ90nngwcazGpsNk0g9UOTygTFoo1ACeJlcF
-ylqaCMs9y/tE5z4bWTAckko=
-=56Ef
------END PGP SIGNATURE-----
diff --git a/media-sound/alsa-headers/alsa-headers-1.0.11_rc1.ebuild b/media-sound/alsa-headers/alsa-headers-1.0.11_rc1.ebuild
new file mode 100644
index 000000000000..d240cdf6e343
--- /dev/null
+++ b/media-sound/alsa-headers/alsa-headers-1.0.11_rc1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-headers/alsa-headers-1.0.11_rc1.ebuild,v 1.1 2005/12/21 15:48:01 flameeyes Exp $
+
+inherit eutils
+
+MY_PN=${PN/headers/driver}
+MY_P="${MY_PN}-${PV/_rc/rc}"
+S=${WORKDIR}/${MY_P}
+MY_FILESDIR="${FILESDIR/headers/driver}"
+
+DESCRIPTION="Header files for Advanced Linux Sound Architecture kernel modules"
+HOMEPAGE="http://www.alsa-project.org/"
+SRC_URI="mirror://alsaproject/driver/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND=""
+
+# Remove the sound symlink workaround...
+pkg_setup() {
+	if [[ -L ${ROOT}/usr/include/sound ]]; then
+		rm  ${ROOT}/usr/include/sound
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-1.0.6a-user.patch
+}
+
+src_compile() {
+	einfo "No compilation neccessary"
+}
+
+src_install() {
+	cd ${S}/alsa-kernel/include
+	insinto /usr/include/sound
+	doins *.h || die "include failed"
+}
diff --git a/media-sound/alsa-headers/files/digest-alsa-headers-1.0.11_rc1 b/media-sound/alsa-headers/files/digest-alsa-headers-1.0.11_rc1
new file mode 100644
index 000000000000..8f5997aa7433
--- /dev/null
+++ b/media-sound/alsa-headers/files/digest-alsa-headers-1.0.11_rc1
@@ -0,0 +1 @@
+MD5 3972451d7ae38965e0d03d48daf9f77a alsa-driver-1.0.11rc1.tar.bz2 2275581
diff --git a/media-sound/alsa-tools/ChangeLog b/media-sound/alsa-tools/ChangeLog
index 6a5c9387dc7e..dd75df9214f7 100644
--- a/media-sound/alsa-tools/ChangeLog
+++ b/media-sound/alsa-tools/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/alsa-tools
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/ChangeLog,v 1.85 2005/11/23 19:13:00 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/ChangeLog,v 1.86 2005/12/21 15:48:40 flameeyes Exp $
+
+*alsa-tools-1.0.11_rc1 (21 Dec 2005)
+
+  21 Dec 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +alsa-tools-1.0.11_rc1.ebuild:
+  Bump to latest upstream version (masked).
 
   23 Nov 2005; Luis Medinas <metalgod@gentoo.org> alsa-tools-1.0.10.ebuild:
   Stable on amd64. See bug #111968.
diff --git a/media-sound/alsa-tools/Manifest b/media-sound/alsa-tools/Manifest
index ee0c61d826f6..fadd5d5067be 100644
--- a/media-sound/alsa-tools/Manifest
+++ b/media-sound/alsa-tools/Manifest
@@ -1,9 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 9fb778a93646891cd70e860b03c56cd6 ChangeLog 11847
 MD5 adee665791bf371b52c862e29c6460bf alsa-tools-1.0.10.ebuild 2409
 MD5 fcf3afa6e8dc04d230a3be035930283d alsa-tools-1.0.10_rc2.ebuild 2416
+MD5 48889df124bf3482368ac858c33980e8 alsa-tools-1.0.11_rc1.ebuild 2411
 MD5 a61565c41f57b7e963d503fa49b81ffe alsa-tools-1.0.7.ebuild 2325
 MD5 89881d144ad73dd853bb44c56d2fe839 alsa-tools-1.0.8-r1.ebuild 2437
 MD5 9e250b9f58ca18e6d2f0c73ba622afad alsa-tools-1.0.9-r1.ebuild 2380
@@ -12,16 +10,10 @@ MD5 3a596fb47a6e44a98f01b8c2cc8c5d83 alsa-tools-1.0.9.ebuild 2351
 MD5 e2a96585b296f3f975f2cc8146eb3b74 files/alsa-tools-1.0.6-gcc34.patch 280
 MD5 f679ba128fdc2882d1f7197dbc2a04d8 files/digest-alsa-tools-1.0.10 71
 MD5 f1cafa65d9aa68072b763e782ac2f261 files/digest-alsa-tools-1.0.10_rc2 74
+MD5 1607747cb3cbf5a0761dcebcdb175272 files/digest-alsa-tools-1.0.11_rc1 74
 MD5 d71b074ecf904c67e2cffaa96ca52367 files/digest-alsa-tools-1.0.7 69
 MD5 92018b0f62f8da61cc08aa7a03c5bb42 files/digest-alsa-tools-1.0.8-r1 69
 MD5 b2bfa51076f226abb79fed1c136b1d80 files/digest-alsa-tools-1.0.9 70
 MD5 b2bfa51076f226abb79fed1c136b1d80 files/digest-alsa-tools-1.0.9-r1 70
 MD5 b2bfa51076f226abb79fed1c136b1d80 files/digest-alsa-tools-1.0.9-r2 70
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDhL8UwUpWvClEHQoRAod1AJ9mqyxiO0mrcX07994QBi1oA7VPvwCfQNIf
-0NmsR9Dn/mYFICcvNTxzUvI=
-=AQyg
------END PGP SIGNATURE-----
diff --git a/media-sound/alsa-tools/alsa-tools-1.0.11_rc1.ebuild b/media-sound/alsa-tools/alsa-tools-1.0.11_rc1.ebuild
new file mode 100644
index 000000000000..ec1597ceb677
--- /dev/null
+++ b/media-sound/alsa-tools/alsa-tools-1.0.11_rc1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.11_rc1.ebuild,v 1.1 2005/12/21 15:48:40 flameeyes Exp $
+
+inherit gnuconfig eutils flag-o-matic
+
+MY_P="${P/_rc/rc}"
+
+DESCRIPTION="Advanced Linux Sound Architecture tools"
+HOMEPAGE="http://www.alsa-project.org"
+SRC_URI="mirror://alsaproject/tools/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0.9"
+KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="fltk gtk"
+
+DEPEND=">=media-libs/alsa-lib-1.0.0
+	virtual/alsa
+	fltk? ( =x11-libs/fltk-1.1* )
+	gtk? ( =x11-libs/gtk+-1.2* )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	# This is a list of the tools in the package.
+	# Some of the tools don't make proper use of CFLAGS, even though
+	# all of them seem to use autoconf.  This needs to be fixed.
+	#
+	# By default, all the supported tools will be compiled.
+	# If you want to only compile for specific tool(s), set ALSA_TOOLS
+	# environment to a space-separated list of tools that you want to build.
+	# For example:
+	#
+	#   env ALSA_TOOLS='as10k1 ac3dec' emerge alsa-tools
+	#
+	if [ -z "${ALSA_TOOLS}" ]; then
+		ALSA_TOOLS="ac3dec as10k1 hdsploader mixartloader seq/sbiload \
+					sscape_ctl us428control usx2yloader vxloader"
+
+		if use fltk; then
+			ALSA_TOOLS="${ALSA_TOOLS} hdspconf hdspmixer"
+		fi
+
+		if use gtk; then
+			ALSA_TOOLS="${ALSA_TOOLS} echomixer envy24control rmedigicontrol"
+		fi
+
+		# sb16_csp won't build on ppc64 _AND_ ppc (and is not needed)
+		if  use !ppc64 && use !ppc; then
+			ALSA_TOOLS="${ALSA_TOOLS} sb16_csp"
+		fi
+
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	gnuconfig_update
+}
+
+src_compile() {
+	if use fltk; then
+		# hdspmixer requires fltk
+		append-ldflags "-L/usr/$(get_libdir)/fltk-1.1"
+		append-flags "-I/usr/include/fltk-1.1"
+	fi
+
+	# hdspmixer is missing depconf - copy from the hdsploader directory
+	cp ${S}/hdsploader/depcomp ${S}/hdspmixer/
+
+	local f
+	for f in ${ALSA_TOOLS}
+	do
+		cd "${S}/${f}"
+		econf || die "econf failed"
+		make || die "make failed"
+	done
+}
+
+src_install() {
+	local f
+	for f in ${ALSA_TOOLS}
+	do
+		# Install the main stuff
+		cd "${S}/${f}"
+		make DESTDIR="${D}" install || die
+
+		# Install the text documentation
+		local doc
+		for doc in README TODO ChangeLog AUTHORS
+		do
+			if [ -f "${doc}" ]
+			then
+			mv "${doc}" "${doc}.`basename ${f}`"
+			dodoc "${doc}.`basename ${f}`"
+			fi
+		done
+	done
+}
diff --git a/media-sound/alsa-tools/files/digest-alsa-tools-1.0.11_rc1 b/media-sound/alsa-tools/files/digest-alsa-tools-1.0.11_rc1
new file mode 100644
index 000000000000..b32976f975b7
--- /dev/null
+++ b/media-sound/alsa-tools/files/digest-alsa-tools-1.0.11_rc1
@@ -0,0 +1 @@
+MD5 5b3eb4f7a3ec1b8f296fbe4bbd281812 alsa-tools-1.0.11rc1.tar.bz2 1441919
diff --git a/media-sound/alsa-utils/ChangeLog b/media-sound/alsa-utils/ChangeLog
index 898dc98a2d00..7503bd24c841 100644
--- a/media-sound/alsa-utils/ChangeLog
+++ b/media-sound/alsa-utils/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/alsa-utils
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/ChangeLog,v 1.122 2005/12/15 22:42:46 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/ChangeLog,v 1.123 2005/12/21 15:48:04 flameeyes Exp $
+
+*alsa-utils-1.0.11_rc1 (21 Dec 2005)
+
+  21 Dec 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +alsa-utils-1.0.11_rc1.ebuild:
+  Bump to latest upstream version (masked).
 
   15 Dec 2005; Diego Pettenò <flameeyes@gentoo.org>
   files/alsasound-1.0.10_rc2:
diff --git a/media-sound/alsa-utils/Manifest b/media-sound/alsa-utils/Manifest
index 02c12eb7c3f2..4bcdddd97447 100644
--- a/media-sound/alsa-utils/Manifest
+++ b/media-sound/alsa-utils/Manifest
@@ -1,10 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 82b9eed57b6630ae2f00d3ce15af7cab ChangeLog 18742
 MD5 1b85b334459a87cebe65f1a04a5f30af alsa-utils-1.0.10.ebuild 2421
 MD5 8e9e89032a9705095a4f28b1034d05cd alsa-utils-1.0.10_rc2.ebuild 2588
 MD5 13f8ee3120f13e393a218955f2b3ac62 alsa-utils-1.0.10_rc3.ebuild 2582
+MD5 3018ea0527337a826bd3528567f73724 alsa-utils-1.0.11_rc1.ebuild 2423
 MD5 a2a37bf9cb817343a6a58e20cfea9bb8 alsa-utils-1.0.7.ebuild 2272
 MD5 26f5354615b23de013a20117251274ee alsa-utils-1.0.8.ebuild 2269
 MD5 d9b19e1fc31acdd0b7091ce79400ce85 alsa-utils-1.0.9a-r1.ebuild 2525
@@ -19,15 +17,9 @@ MD5 f4f492c382b243ebf558809a372fd6b7 files/alsasound.confd 515
 MD5 a86ec4a87712d028c83f9066f4505551 files/digest-alsa-utils-1.0.10 70
 MD5 5583841a2a5a206ad2838524c2cc7528 files/digest-alsa-utils-1.0.10_rc2 73
 MD5 8c0d2ce137d1d9a639a0b9d23c8dffb1 files/digest-alsa-utils-1.0.10_rc3 73
+MD5 d2d3bb29084e36b9640b5cc937e16201 files/digest-alsa-utils-1.0.11_rc1 73
 MD5 ddaf1d5cc1a19dff65e19e6470bc711d files/digest-alsa-utils-1.0.7 69
 MD5 ec6210532acb9b397bacb3eb81f7593a files/digest-alsa-utils-1.0.8 69
 MD5 2bfc6eaf49d769272a46ed2046b73944 files/digest-alsa-utils-1.0.9a 70
 MD5 2bfc6eaf49d769272a46ed2046b73944 files/digest-alsa-utils-1.0.9a-r1 70
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDofFyAiZjviIA2XgRAiTCAKDs/ng6YtTrYHxLgv2PyC7ZpPFd4gCfRTNq
-OfHzLt0RZgBnzJJz2NX42yE=
-=7iyc
------END PGP SIGNATURE-----
diff --git a/media-sound/alsa-utils/alsa-utils-1.0.11_rc1.ebuild b/media-sound/alsa-utils/alsa-utils-1.0.11_rc1.ebuild
new file mode 100644
index 000000000000..7b587b36989c
--- /dev/null
+++ b/media-sound/alsa-utils/alsa-utils-1.0.11_rc1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/alsa-utils-1.0.11_rc1.ebuild,v 1.1 2005/12/21 15:48:04 flameeyes Exp $
+
+inherit eutils flag-o-matic autotools
+
+MY_P="${P/_rc/rc}"
+
+DESCRIPTION="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)"
+HOMEPAGE="http://www.alsa-project.org/"
+SRC_URI="mirror://alsaproject/utils/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0.9"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86"
+IUSE="nls"
+
+DEPEND=">=sys-libs/ncurses-5.1
+	dev-util/dialog
+	>=media-libs/alsa-lib-1.0.10_rc1"
+RDEPEND="${DEPEND}
+	sys-apps/pciutils"
+
+S=${WORKDIR}/${MY_P}
+
+src_compile() {
+	econf \
+		$(use_enable nls) \
+		|| die "configure failed"
+
+	emake || die "make failed"
+}
+
+src_install() {
+	local ALSA_UTILS_DOCS="ChangeLog README TODO
+		seq/aconnect/README.aconnect
+		seq/aseqnet/README.aseqnet"
+
+	make DESTDIR="${D}" install || die "Installation Failed"
+
+	dodoc ${ALSA_UTILS_DOCS}
+	newdoc alsamixer/README README.alsamixer
+
+	newconfd ${FILESDIR}/alsasound.confd alsasound
+	insinto /etc/modules.d
+	newins ${FILESDIR}/alsa-modules.conf-rc alsa
+	newinitd ${FILESDIR}/alsasound-1.0.10_rc2 alsasound
+}
+
+pkg_postinst() {
+	echo
+	einfo "The alsasound initscript is now provided by alsa-utils"
+	einfo "instead of alsa-driver for compatibility with kernel-sources"
+	einfo "which provide ALSA internally."
+	echo
+	einfo "To take advantage of this, and automate the process of"
+	einfo "loading and unloading the ALSA sound drivers as well as"
+	einfo "storing and restoring sound-card mixer levels you should"
+	einfo "add alsasound to the boot runlevel. You can do this as"
+	einfo "root like so:"
+	einfo "	# rc-update add alsasound boot"
+	echo
+	einfo "You will also need to edit the file /etc/modules.d/alsa"
+	einfo "and run modules-update. You can do this like so:"
+	einfo "	# nano -w /etc/modules.d/alsa && modules-update"
+	echo
+
+	if use sparc; then
+		ewarn "Old versions of alsa-drivers had a broken snd-ioctl32 module"
+		ewarn "which causes sparc64 machines to lockup on such tasks as"
+		ewarn "changing the volume.  Because of this, it is VERY important"
+		ewarn "that you do not use the snd-ioctl32 modules contained in"
+		ewarn "development-sources or <=gentoo-dev-sources-2.6.7-r14.  Doing so"
+		ewarn "may result in an unbootable system if you start alsasound at boot."
+	fi
+}
diff --git a/media-sound/alsa-utils/files/digest-alsa-utils-1.0.11_rc1 b/media-sound/alsa-utils/files/digest-alsa-utils-1.0.11_rc1
new file mode 100644
index 000000000000..eebcd0c75b07
--- /dev/null
+++ b/media-sound/alsa-utils/files/digest-alsa-utils-1.0.11_rc1
@@ -0,0 +1 @@
+MD5 cba710f926f5bd3fdac6091d456890ac alsa-utils-1.0.11rc1.tar.bz2 996111