Bump to latest upstream version.

(Portage version: 2.0.53_rc7)

22 files changed, 537 insertions, 6 deletions

diff --git a/media-libs/alsa-lib/ChangeLog b/media-libs/alsa-lib/ChangeLog
index 901facac5829..7b124882b160 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.135 2005/11/15 19:02:26 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/ChangeLog,v 1.136 2005/11/16 19:59:17 flameeyes Exp $
+
+*alsa-lib-1.0.10 (16 Nov 2005)
+
+  16 Nov 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +alsa-lib-1.0.10.ebuild:
+  Bump to latest upstream version.
 
   15 Nov 2005; Chris Gianelloni <wolf31o2@gentoo.org>
   alsa-lib-1.0.10_rc3.ebuild:
diff --git a/media-libs/alsa-lib/Manifest b/media-libs/alsa-lib/Manifest
index d381a65f98d8..a9bb024bc98f 100644
--- a/media-libs/alsa-lib/Manifest
+++ b/media-libs/alsa-lib/Manifest
@@ -1,5 +1,6 @@
 MD5 2bff4fc295e32c5d9739c4efe9c0ddee ChangeLog 20068
 MD5 9c272add7e13dc69bac9eaf8c2cd0771 alsa-lib-0.9.8.ebuild 1558
+MD5 5b620b6844d3239f16c198d3ff0b329d alsa-lib-1.0.10.ebuild 2033
 MD5 56d4fd87ad9b48e621ad0de5d43ffba5 alsa-lib-1.0.10_rc2.ebuild 1982
 MD5 0f045dd4c0a80ec89e69dd934c0d31b0 alsa-lib-1.0.10_rc3.ebuild 1939
 MD5 255565a888541274148ccb6e1b226eb5 alsa-lib-1.0.7.ebuild 2051
@@ -12,6 +13,7 @@ MD5 d832d735aa8fa9959ff66276eb648cef files/alsa-lib-1.0.8-gcc4.patch 1656
 MD5 afc44aabeb36448990c19eaa9b3dfce0 files/alsa-lib-mixer.patch 264
 MD5 190a6c4ffe2eef20e3095ab70ea34941 files/configure.diff 586
 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 86565eb0601b611f39adb8f5ad47b622 files/digest-alsa-lib-1.0.7 67
diff --git a/media-libs/alsa-lib/alsa-lib-1.0.10.ebuild b/media-libs/alsa-lib/alsa-lib-1.0.10.ebuild
new file mode 100644
index 000000000000..ff670a1c25c3
--- /dev/null
+++ b/media-libs/alsa-lib/alsa-lib-1.0.10.ebuild
@@ -0,0 +1,71 @@
+# 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.10.ebuild,v 1.1 2005/11/16 19:59:17 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"
+	epatch "${FILESDIR}/${PN}-1.0.10_rc3-test.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.10 b/media-libs/alsa-lib/files/digest-alsa-lib-1.0.10
new file mode 100644
index 000000000000..3043c8ed975c
--- /dev/null
+++ b/media-libs/alsa-lib/files/digest-alsa-lib-1.0.10
@@ -0,0 +1 @@
+MD5 b1a4e15c9ff81798507de470a92fcc43 alsa-lib-1.0.10.tar.bz2 706777
diff --git a/media-libs/alsa-oss/ChangeLog b/media-libs/alsa-oss/ChangeLog
index db61e1674027..03194a9468cb 100644
--- a/media-libs/alsa-oss/ChangeLog
+++ b/media-libs/alsa-oss/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/alsa-oss
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-oss/ChangeLog,v 1.59 2005/11/15 19:03:34 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-oss/ChangeLog,v 1.60 2005/11/16 19:58:49 flameeyes Exp $
+
+*alsa-oss-1.0.10 (16 Nov 2005)
+
+  16 Nov 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +alsa-oss-1.0.10.ebuild:
+  Bump to latest upstream version.
 
   15 Nov 2005; Chris Gianelloni <wolf31o2@gentoo.org>
   alsa-oss-1.0.10_rc3.ebuild:
diff --git a/media-libs/alsa-oss/alsa-oss-1.0.10.ebuild b/media-libs/alsa-oss/alsa-oss-1.0.10.ebuild
new file mode 100644
index 000000000000..8853cae3c909
--- /dev/null
+++ b/media-libs/alsa-oss/alsa-oss-1.0.10.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-oss/alsa-oss-1.0.10.ebuild,v 1.1 2005/11/16 19:58:49 flameeyes Exp $
+
+inherit multilib
+
+MY_P="${P/_rc/rc}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Advanced Linux Sound Architecture OSS compatibility layer."
+HOMEPAGE="http://www.alsa-project.org/"
+SRC_URI="mirror://alsaproject/oss-lib/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND="virtual/libc
+	>=media-libs/alsa-lib-1.0"
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+	sed -i -e "s:/usr/$(get_libdir)/libaoss.so:libaoss.so:g" ${D}/usr/bin/aoss
+}
diff --git a/media-libs/alsa-oss/files/digest-alsa-oss-1.0.10 b/media-libs/alsa-oss/files/digest-alsa-oss-1.0.10
new file mode 100644
index 000000000000..7f8f0f92b87c
--- /dev/null
+++ b/media-libs/alsa-oss/files/digest-alsa-oss-1.0.10
@@ -0,0 +1 @@
+MD5 0b3f9f95b989fc1f9305fa1e4e0227f0 alsa-oss-1.0.10.tar.bz2 224104
diff --git a/media-sound/alsa-driver/ChangeLog b/media-sound/alsa-driver/ChangeLog
index fcf443354d82..7b1deb628490 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.169 2005/11/15 19:00:50 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/ChangeLog,v 1.170 2005/11/16 19:59:34 flameeyes Exp $
+
+*alsa-driver-1.0.10 (16 Nov 2005)
+
+  16 Nov 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +alsa-driver-1.0.10.ebuild:
+  Bump to latest upstream version.
 
   15 Nov 2005; Chris Gianelloni <wolf31o2@gentoo.org>
   alsa-driver-1.0.10_rc3.ebuild:
diff --git a/media-sound/alsa-driver/Manifest b/media-sound/alsa-driver/Manifest
index 8e231ebc99b2..6aeaf73ced14 100644
--- a/media-sound/alsa-driver/Manifest
+++ b/media-sound/alsa-driver/Manifest
@@ -1,4 +1,5 @@
 MD5 cc838ac5b1ec1b12617371da7386450d ChangeLog 29591
+MD5 4be56bef9fda79fd7e51bf9264273e43 alsa-driver-1.0.10.ebuild 4678
 MD5 83e0d77659b142d24afa2a86d91b3c4d alsa-driver-1.0.10_rc2.ebuild 4555
 MD5 05d84ba8681d1e857e581caf97e6db59 alsa-driver-1.0.10_rc3.ebuild 4675
 MD5 afcbb70f92f2785ee73a764383c47611 alsa-driver-1.0.3.ebuild 3349
@@ -10,6 +11,7 @@ MD5 ed352c464a295465543d8933c162f101 files/alsa-driver-1.0.10_rc1-include.patch
 MD5 2f9a74cca5e78c63142073f0c90b9ff8 files/alsa-driver-1.0.10_rc2-audigy2zs.patch 460
 MD5 f6a0e5f4624041d23bbd60726331310e files/alsa-driver-1.0.10_rc3-ppc-unbreakage.patch 2957
 MD5 be4912a88e538a1f620b2fd422859ef6 files/alsa-driver-1.0.9b-sparc64-ioctl-detect.patch 513
+MD5 5474546fa4977a1fa63fbab0a155fd15 files/digest-alsa-driver-1.0.10 72
 MD5 569ec84f258f90c508827a3040062f41 files/digest-alsa-driver-1.0.10_rc2 75
 MD5 ad7631557a0317471d29e4c26cfb4cf2 files/digest-alsa-driver-1.0.10_rc3 75
 MD5 938a2ee36c54416322d1acd47b249c99 files/digest-alsa-driver-1.0.3 71
diff --git a/media-sound/alsa-driver/alsa-driver-1.0.10.ebuild b/media-sound/alsa-driver/alsa-driver-1.0.10.ebuild
new file mode 100644
index 000000000000..cd22f8539bc3
--- /dev/null
+++ b/media-sound/alsa-driver/alsa-driver-1.0.10.ebuild
@@ -0,0 +1,163 @@
+# 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.10.ebuild,v 1.1 2005/11/16 19:59:34 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
+	epatch "${FILESDIR}/${PN}-1.0.10_rc3-ppc-unbreakage.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.10 b/media-sound/alsa-driver/files/digest-alsa-driver-1.0.10
new file mode 100644
index 000000000000..5d0bc883e3c8
--- /dev/null
+++ b/media-sound/alsa-driver/files/digest-alsa-driver-1.0.10
@@ -0,0 +1 @@
+MD5 e9e7c1ca664a14275d67185049f933f9 alsa-driver-1.0.10.tar.bz2 2194644
diff --git a/media-sound/alsa-headers/ChangeLog b/media-sound/alsa-headers/ChangeLog
index 863e0b4b77c4..acef9501af47 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.49 2005/11/15 18:59:08 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-headers/ChangeLog,v 1.50 2005/11/16 19:59:03 flameeyes Exp $
+
+*alsa-headers-1.0.10 (16 Nov 2005)
+
+  16 Nov 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +alsa-headers-1.0.10.ebuild:
+  Bump to latest upstream version.
 
   15 Nov 2005; Chris Gianelloni <wolf31o2@gentoo.org>
   alsa-headers-1.0.10_rc3.ebuild:
diff --git a/media-sound/alsa-headers/Manifest b/media-sound/alsa-headers/Manifest
index f2b311a01762..8cc6d3dea487 100644
--- a/media-sound/alsa-headers/Manifest
+++ b/media-sound/alsa-headers/Manifest
@@ -1,9 +1,11 @@
 MD5 e434f17c70466425e771d97491bfdead ChangeLog 6382
+MD5 83ab9c570f26a1706856f9b241d959b7 alsa-headers-1.0.10.ebuild 1058
 MD5 a9e144dbe9c96be33f280e18ee2e369d alsa-headers-1.0.10_rc2.ebuild 1060
 MD5 e7aeaf1b6f35a1374b19050ae7240c2e alsa-headers-1.0.10_rc3.ebuild 1057
 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 14b6c8d954e36bb9d40c97cf051220f0 files/digest-alsa-headers-1.0.8 71
diff --git a/media-sound/alsa-headers/alsa-headers-1.0.10.ebuild b/media-sound/alsa-headers/alsa-headers-1.0.10.ebuild
new file mode 100644
index 000000000000..87d6660a0956
--- /dev/null
+++ b/media-sound/alsa-headers/alsa-headers-1.0.10.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.10.ebuild,v 1.1 2005/11/16 19:59:03 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.10 b/media-sound/alsa-headers/files/digest-alsa-headers-1.0.10
new file mode 100644
index 000000000000..5d0bc883e3c8
--- /dev/null
+++ b/media-sound/alsa-headers/files/digest-alsa-headers-1.0.10
@@ -0,0 +1 @@
+MD5 e9e7c1ca664a14275d67185049f933f9 alsa-driver-1.0.10.tar.bz2 2194644
diff --git a/media-sound/alsa-tools/ChangeLog b/media-sound/alsa-tools/ChangeLog
index 056ec3978a10..30d6ad2132ec 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.82 2005/11/08 12:21:37 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/ChangeLog,v 1.83 2005/11/16 19:59:18 flameeyes Exp $
+
+*alsa-tools-1.0.10 (16 Nov 2005)
+
+  16 Nov 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +alsa-tools-1.0.10.ebuild:
+  Bump to latest upstream version.
 
 *alsa-tools-1.0.10_rc2 (08 Nov 2005)
 
diff --git a/media-sound/alsa-tools/alsa-tools-1.0.10.ebuild b/media-sound/alsa-tools/alsa-tools-1.0.10.ebuild
new file mode 100644
index 000000000000..41b82155e1de
--- /dev/null
+++ b/media-sound/alsa-tools/alsa-tools-1.0.10.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.10.ebuild,v 1.1 2005/11/16 19:59:18 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.10 b/media-sound/alsa-tools/files/digest-alsa-tools-1.0.10
new file mode 100644
index 000000000000..4408ba524e5f
--- /dev/null
+++ b/media-sound/alsa-tools/files/digest-alsa-tools-1.0.10
@@ -0,0 +1 @@
+MD5 537d691e87d9af6343cef5ddcad70018 alsa-tools-1.0.10.tar.bz2 1376274
diff --git a/media-sound/alsa-utils/ChangeLog b/media-sound/alsa-utils/ChangeLog
index 2b8833c2dd62..72bdb515b46f 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.117 2005/11/15 19:05:02 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/ChangeLog,v 1.118 2005/11/16 19:59:28 flameeyes Exp $
+
+*alsa-utils-1.0.10 (16 Nov 2005)
+
+  16 Nov 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +alsa-utils-1.0.10.ebuild:
+  Bump to latest upstream version.
 
   15 Nov 2005; Chris Gianelloni <wolf31o2@gentoo.org>
   alsa-utils-1.0.10_rc3.ebuild:
diff --git a/media-sound/alsa-utils/Manifest b/media-sound/alsa-utils/Manifest
index 68751377e5cb..dd9eb5920371 100644
--- a/media-sound/alsa-utils/Manifest
+++ b/media-sound/alsa-utils/Manifest
@@ -1,4 +1,5 @@
 MD5 d492daf915fe821dcb73dbce2181433b ChangeLog 18061
+MD5 e584b0034bf7eec144e0cd414ac0aeb2 alsa-utils-1.0.10.ebuild 2426
 MD5 8e9e89032a9705095a4f28b1034d05cd alsa-utils-1.0.10_rc2.ebuild 2588
 MD5 3fcdcba176499021ea34049081c97704 alsa-utils-1.0.10_rc3.ebuild 2585
 MD5 a2a37bf9cb817343a6a58e20cfea9bb8 alsa-utils-1.0.7.ebuild 2272
@@ -12,6 +13,7 @@ MD5 504c2047f55a094833631892ab099ada files/alsa-utils-1.0.9a-strsignal.patch 454
 MD5 2a50971b115f63d74d0054c7e3ee9144 files/alsasound 7106
 MD5 9224c89a555eeabd60baff541b5996b2 files/alsasound-1.0.10_rc2 7150
 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 ddaf1d5cc1a19dff65e19e6470bc711d files/digest-alsa-utils-1.0.7 69
diff --git a/media-sound/alsa-utils/alsa-utils-1.0.10.ebuild b/media-sound/alsa-utils/alsa-utils-1.0.10.ebuild
new file mode 100644
index 000000000000..09559703f948
--- /dev/null
+++ b/media-sound/alsa-utils/alsa-utils-1.0.10.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.10.ebuild,v 1.1 2005/11/16 19:59:29 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.10 b/media-sound/alsa-utils/files/digest-alsa-utils-1.0.10
new file mode 100644
index 000000000000..af2f41a7e8df
--- /dev/null
+++ b/media-sound/alsa-utils/files/digest-alsa-utils-1.0.10
@@ -0,0 +1 @@
+MD5 94bdec65e9c3fd02f7ef8ceb8f918afe alsa-utils-1.0.10.tar.bz2 991322