Removing old versions and adding /dev/null redirect for rmdir messages.

Package-Manager: portage-2.0.51.19

13 files changed, 42 insertions, 567 deletions

diff --git a/media-sound/alsa-driver/ChangeLog b/media-sound/alsa-driver/ChangeLog
index a8d0fc6578c0..4363e4d54f65 100644
--- a/media-sound/alsa-driver/ChangeLog
+++ b/media-sound/alsa-driver/ChangeLog
@@ -1,6 +1,13 @@
 # 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.140 2005/04/03 17:52:58 chrb Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/ChangeLog,v 1.141 2005/04/04 22:30:57 eradicator Exp $
+
+  04 Apr 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  -alsa-driver-1.0.5a.ebuild, -alsa-driver-1.0.6a.ebuild,
+  -alsa-driver-1.0.7-r3.ebuild, alsa-driver-1.0.7-r4.ebuild,
+  -alsa-driver-1.0.8_rc1.ebuild, alsa-driver-1.0.8.ebuild,
+  alsa-driver-1.0.9_rc2.ebuild:
+  Removing old versions and adding /dev/null redirect for rmdir messages.
 
   03 Apr 2005; Chris Bainbridge <chrb@gentoo.org> +files/xbox-1.0.8.patch,
   alsa-driver-1.0.8.ebuild:
diff --git a/media-sound/alsa-driver/Manifest b/media-sound/alsa-driver/Manifest
index 1a2147901a84..fe3c12dff522 100644
--- a/media-sound/alsa-driver/Manifest
+++ b/media-sound/alsa-driver/Manifest
@@ -1,34 +1,36 @@
-MD5 63200593b956f6870a2f53f9a6119e82 ChangeLog 24216
-MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 57c6706a8709cabb84985c93fff4b549 ChangeLog 24564
 MD5 d417126925406313a627c240a60c480f alsa-driver-0.9.8.ebuild 2315
 MD5 3c0f4daec01807f3cce65c8fff87ff3f alsa-driver-1.0.3.ebuild 3366
-MD5 59bef0f889afb94c05fb75ce5bb587fb alsa-driver-1.0.8.ebuild 4615
-MD5 9b2cf1594fd2216b4c6ce2e0f26616fb alsa-driver-1.0.5a.ebuild 3609
-MD5 ebbacca951ebb440e5236ada4a110783 alsa-driver-1.0.6a.ebuild 3531
-MD5 37ec8a5ebd0f6a68e2ea0c5ab9a421d8 alsa-driver-1.0.7-r3.ebuild 3824
-MD5 dd9beca8be6b9eb6c3f3266ed81a2776 alsa-driver-1.0.7-r4.ebuild 4758
-MD5 bb1d66bcbe75c22ab458272c4f893754 alsa-driver-1.0.8_rc1.ebuild 3549
-MD5 054f7b0317205e52863896c56164a5f1 alsa-driver-1.0.9_rc2.ebuild 4407
-MD5 27ccbe36406f145c1d63725a53517233 files/makefile.patch 1122
-MD5 b2791ec892d9be6952fe139cc2309abf files/xbox-1.0.8.patch 1525
-MD5 5445a523e0e8aa31b9f293b1ac380b37 files/1.0.8-msi_audigyls.patch 1771
+MD5 9ea52b4adac3f201b06229c3fa431da9 alsa-driver-1.0.7-r4.ebuild 4692
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 6f09dc63bc18f2d9e3369dc425211b62 alsa-driver-1.0.8.ebuild 4634
+MD5 7338cce87f62f2ee545092945b74eb18 alsa-driver-1.0.9_rc2.ebuild 4402
 MD5 8c120f7730b91118d0a8148d2deb3a43 files/alsa-driver-0.9.8-au-fix.patch 1267
-MD5 8cfc2afad77baecf06694bee8bd67d4a files/alsa-driver-1.0.7-xbox.patch 645
-MD5 27684bd356b1a43809d3f8c847a6abce files/alsa-driver-1.0.6a-kbuild.patch 575
 MD5 1d70561326ef89e94179634d92782610 files/alsa-driver-1.0.4-devfix.patch 2756
 MD5 08af7cfec9cd33819c62880d6219f3a5 files/alsa-driver-1.0.5-devfix.patch 763
+MD5 a2ee6fa920bbac70835b4a58e5759e8c files/alsa-driver-1.0.5a-cs46xx-passthrough.patch 446
 MD5 8bb31a005a1db2e306c51d017fd44e70 files/alsa-driver-1.0.5a-xbox-ac97.patch 721
-MD5 4d7c4de4eaa3007e13360d7434ecb284 files/alsa-driver-1.0.7-ioctl32.patch-r2 44165
+MD5 f9d35aa6adca1137e05b1cb8852ff672 files/alsa-driver-1.0.6a-emu10k1-passthrough.patch 658
+MD5 27684bd356b1a43809d3f8c847a6abce files/alsa-driver-1.0.6a-kbuild.patch 575
 MD5 831a1a1097613c2444cc3e512ff09a01 files/alsa-driver-1.0.7-audigy71.patch 643
-MD5 a2ee6fa920bbac70835b4a58e5759e8c files/alsa-driver-1.0.5a-cs46xx-passthrough.patch 446
 MD5 bc0105e64f35a41aa0602c43e7f09733 files/alsa-driver-1.0.7-configure.patch 21924
-MD5 f9d35aa6adca1137e05b1cb8852ff672 files/alsa-driver-1.0.6a-emu10k1-passthrough.patch 658
-MD5 deb0bfd8e2cfe0ba434fb5a820294502 files/digest-alsa-driver-1.0.5a 72
-MD5 e1b13905eac70fe728dcb85fcaac27a9 files/digest-alsa-driver-1.0.6a 72
-MD5 479ee887025f4ce7944adee1e4a6fdf3 files/digest-alsa-driver-1.0.7-r3 71
-MD5 479ee887025f4ce7944adee1e4a6fdf3 files/digest-alsa-driver-1.0.7-r4 71
-MD5 178c3d0a289f3998f750d292905084a9 files/digest-alsa-driver-1.0.8_rc1 74
-MD5 69d2d3b5885887bee01a6d6ab37c1aed files/digest-alsa-driver-1.0.9_rc2 74
-MD5 938a2ee36c54416322d1acd47b249c99 files/digest-alsa-driver-1.0.3 71
+MD5 4d7c4de4eaa3007e13360d7434ecb284 files/alsa-driver-1.0.7-ioctl32.patch-r2 44165
+MD5 8cfc2afad77baecf06694bee8bd67d4a files/alsa-driver-1.0.7-xbox.patch 645
 MD5 439dab13c036317c9b308b234ecf7290 files/digest-alsa-driver-0.9.8 71
+MD5 938a2ee36c54416322d1acd47b249c99 files/digest-alsa-driver-1.0.3 71
+MD5 479ee887025f4ce7944adee1e4a6fdf3 files/digest-alsa-driver-1.0.7-r4 71
 MD5 14b6c8d954e36bb9d40c97cf051220f0 files/digest-alsa-driver-1.0.8 71
+MD5 27ccbe36406f145c1d63725a53517233 files/makefile.patch 1122
+MD5 5445a523e0e8aa31b9f293b1ac380b37 files/1.0.8-msi_audigyls.patch 1771
+MD5 69d2d3b5885887bee01a6d6ab37c1aed files/digest-alsa-driver-1.0.9_rc2 74
+MD5 b2791ec892d9be6952fe139cc2309abf files/xbox-1.0.8.patch 1525
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCUcArArHZZzCEUG0RAhEMAJ9FR9O2aLef4x33+8XO506G96PJHwCeOAvY
+o6BNzkyDWbhR/ib0od3kLVA=
+=7Apq
+-----END PGP SIGNATURE-----
diff --git a/media-sound/alsa-driver/alsa-driver-1.0.5a.ebuild b/media-sound/alsa-driver/alsa-driver-1.0.5a.ebuild
deleted file mode 100644
index 8448b8b91e5f..000000000000
--- a/media-sound/alsa-driver/alsa-driver-1.0.5a.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# 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.5a.ebuild,v 1.6 2005/01/01 11:43:17 eradicator Exp $
-
-inherit kernel-mod flag-o-matic eutils
-
-DESCRIPTION="Advanced Linux Sound Architecture kernel modules"
-HOMEPAGE="http://www.alsa-project.org/"
-LICENSE="GPL-2 LGPL-2.1"
-
-# 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
-#
-[ -z "${ALSA_CARDS}" ] && ALSA_CARDS=all
-
-IUSE="oss"
-
-RDEPEND="virtual/modutils
-	 ~media-sound/alsa-headers-${PV}"
-
-DEPEND="${RDEPEND}
-	virtual/linux-sources
-	sys-devel/autoconf
-	sys-apps/debianutils"
-
-PROVIDE="virtual/alsa"
-
-SLOT="${KV}"
-KEYWORDS="x86 ~ppc -sparc amd64 ~alpha ~ia64"
-
-MY_P=${P/_rc/rc}
-SRC_URI="mirror://alsaproject/driver/${P}.tar.bz2"
-# nouserpriv is neccessary for 2.6.x kernels... Hopefully the ALSA guys will figure out another way to do this...
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-1.0.5-devfix.patch
-
-	epatch ${FILESDIR}/${P}-cs46xx-passthrough.patch
-
-	if [ "${PROFILE_ARCH}" == "xbox" ]; then
-		epatch ${FILESDIR}/${P}-xbox-ac97.patch
-	fi
-
-	if kernel-mod_is_2_6_kernel || kernel-mod_is_2_5_kernel; then
-		FULL_KERNEL_PATH="${ROOT}/usr/src/${KV_DIR}"
-
-		if ! [ -d "${FULL_KERNEL_PATH}" ]; then
-			eerror "An error seems to have occurred.  We looked in ${FULL_KERNEL_PATH} for your kernel sources, but we didn't see them."
-			die "ALSA driver configuration failure."
-		fi
-
-		einfo "A 2.5 or 2.6 kernel was detected.  We are copying the kernel source tree from"
-		einfo "${FULL_KERNEL_PATH} to ${T}/linux"
-		einfo "because the alsa-driver build process overwrites files in the 2.6.x kernel tree."
-
-		# Copy everything over to our tmp dir...
-		cp -a ${FULL_KERNEL_PATH} ${T}/linux
-	fi
-}
-
-src_compile() {
-	# Default ARCH & kernel path to set in compilation and make
-	KER_ARCH=${ARCH}
-	KER_DIR=${KERNEL_DIR}
-
-	# If we're using a 2.5 or 2.6 kernel, use our copied kernel tree.
-	if [ -d "${T}/linux" ]; then
-		KER_DIR="${T}/linux"
-
-		# Set the kernel ARCH
-		use x86 && KER_ARCH="i386"
-		use amd64 && KER_ARCH="x86_64"
-	fi
-
-	econf `use_with oss` \
-		--with-kernel="${KER_DIR}" \
-		--with-isapnp=yes \
-		--with-sequencer=yes \
-		--with-cards="${ALSA_CARDS}" || die "econf failed"
-
-	# Should fix bug #46901
-	is-flag "-malign-double" && filter-flags "-fomit-frame-pointer"
-
-	emake ARCH="${KER_ARCH}" || die "Parallel Make Failed"
-}
-
-
-src_install() {
-	dodir /usr/include/sound
-	make DESTDIR=${D} install || die
-
-	# Provided by alsa-headers now
-	rm -rf ${D}/usr/include/sound
-
-	# We have our own scripts in alsa-utils
-	test -e ${D}/etc/init.d/alsasound && rm ${D}/etc/init.d/alsasound
-	test -e ${D}/etc/rc.d/init.d/alsasound && rm ${D}/etc/rc.d/init.d/alsasound
-
-	rm doc/Makefile
-	dodoc CARDS-STATUS COPYING FAQ INSTALL README WARNING TODO doc/*
-}
-
-pkg_postinst() {
-	if [ "${ROOT}" = / ]
-	then
-		[ -x /usr/sbin/update-modules ] && /usr/sbin/update-modules
-	fi
-
-	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
-}
diff --git a/media-sound/alsa-driver/alsa-driver-1.0.6a.ebuild b/media-sound/alsa-driver/alsa-driver-1.0.6a.ebuild
deleted file mode 100644
index 91231dffa50d..000000000000
--- a/media-sound/alsa-driver/alsa-driver-1.0.6a.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# 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.6a.ebuild,v 1.7 2005/01/18 10:07:19 dragonheart Exp $
-
-IUSE="oss"
-
-inherit kernel-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/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="${KV}"
-KEYWORDS="~alpha amd64 ~ia64 ~mips ~ppc -sparc x86"
-
-RDEPEND="virtual/modutils
-	 ~media-sound/alsa-headers-${PV}"
-
-DEPEND="${RDEPEND}
-	virtual/linux-sources
-	sys-devel/autoconf
-	sys-apps/debianutils"
-
-PROVIDE="virtual/alsa"
-
-# 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
-#
-[ -z "${ALSA_CARDS}" ] && ALSA_CARDS=all
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-1.0.5-devfix.patch
-	epatch ${FILESDIR}/${PN}-1.0.5a-cs46xx-passthrough.patch
-
-	if [ "${PROFILE_ARCH}" == "xbox" ]; then
-		epatch ${FILESDIR}/${PN}-1.0.5a-xbox-ac97.patch
-	fi
-
-	if kernel-mod_is_2_5_kernel || (kernel-mod_is_2_6_kernel && [ ${KV_PATCH} -lt 6 ]); then
-		FULL_KERNEL_PATH="${ROOT}/usr/src/${KV_DIR}"
-
-		if ! [ -d "${FULL_KERNEL_PATH}" ]; then
-			eerror "An error seems to have occurred.  We looked in ${FULL_KERNEL_PATH} for your kernel sources, but we didn't see them."
-			die "ALSA driver configuration failure."
-		fi
-
-		einfo "A 2.5 or 2.6 kernel was detected.  We are copying the kernel source tree from"
-		einfo "${FULL_KERNEL_PATH} to ${T}/linux"
-		einfo "because the alsa-driver build process overwrites files in the 2.6.x kernel tree."
-
-		# Copy everything over to our tmp dir...
-		cp -a ${FULL_KERNEL_PATH} ${T}/linux
-	else
-		# SUBDIRS -> M
-		epatch ${FILESDIR}/${PN}-1.0.6a-kbuild.patch
-	fi
-}
-
-src_compile() {
-	# Default ARCH & kernel path to set in compilation and make
-	KER_DIR=${KERNEL_DIR}
-
-	# If we're using a 2.5 or 2.6 kernel, use our copied kernel tree.
-	if [ -d "${T}/linux" ]; then
-		KER_DIR="${T}/linux"
-	fi
-
-	econf `use_with oss` \
-		--with-kernel="${KER_DIR}" \
-		--with-isapnp=yes \
-		--with-sequencer=yes \
-		--with-cards="${ALSA_CARDS}" || die "econf failed"
-
-	# Should fix bug #46901
-	is-flag "-malign-double" && filter-flags "-fomit-frame-pointer"
-
-	set_arch_to_kernel
-	emake || die "Parallel Make Failed"
-	set_arch_to_portage
-}
-
-
-src_install() {
-	dodir /usr/include/sound
-	make DESTDIR=${D} install || die
-
-	# Provided by alsa-headers now
-	rm -rf ${D}/usr/include/sound
-
-	# We have our own scripts in alsa-utils
-	test -e ${D}/etc/init.d/alsasound && rm ${D}/etc/init.d/alsasound
-	test -e ${D}/etc/rc.d/init.d/alsasound && rm ${D}/etc/rc.d/init.d/alsasound
-
-	rm doc/Makefile
-	dodoc CARDS-STATUS COPYING FAQ INSTALL README WARNING TODO doc/*
-}
-
-pkg_postinst() {
-	if [ "${ROOT}" = / ]
-	then
-		[ -x /usr/sbin/update-modules ] && /usr/sbin/update-modules
-	fi
-
-	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
-}
diff --git a/media-sound/alsa-driver/alsa-driver-1.0.7-r3.ebuild b/media-sound/alsa-driver/alsa-driver-1.0.7-r3.ebuild
deleted file mode 100644
index e24f0b879490..000000000000
--- a/media-sound/alsa-driver/alsa-driver-1.0.7-r3.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# 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.7-r3.ebuild,v 1.9 2005/01/18 10:07:19 dragonheart Exp $
-
-IUSE="oss doc"
-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/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~mips ~ppc sparc x86"
-
-RDEPEND="virtual/modutils
-	 ~media-sound/alsa-headers-${PV}"
-
-DEPEND="${RDEPEND}
-	sys-devel/patch
-	virtual/linux-sources
-	>=sys-devel/autoconf-2.50
-	sys-apps/debianutils"
-
-PROVIDE="virtual/alsa"
-
-pkg_setup() {
-	CONFIG_CHECK="SOUND !SND !SOUND_PRIME"
-	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."
-
-	linux-mod_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
-	#
-	[ -z "${ALSA_CARDS}" ] && ALSA_CARDS=all
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-1.0.5-devfix.patch
-
-	[ "${PROFILE_ARCH}" == "xbox" ] && \
-		epatch ${FILESDIR}/${PN}-1.0.5a-xbox-ac97.patch
-
-	convert_to_m ${S}/Makefile
-
-	# Fix ioctl32 support
-	epatch ${FILESDIR}/${P}-ioctl32.patch-r2
-
-	# Fix audigy 7.1 detection on some cards... bug #72433
-	epatch ${FILESDIR}/${P}-audigy71.patch
-
-	# Fix order of configure operations so the kernel compiler isn't used
-	# for tests.
-	epatch ${FILESDIR}/${PN}-1.0.7-configure.patch
-	export WANT_AUTOCONF=2.5
-	autoconf
-}
-
-src_compile() {
-	# Should fix bug #46901
-	is-flag "-malign-double" && filter-flags "-fomit-frame-pointer"
-
-	econf `use_with oss` \
-		--with-kernel="${KV_DIR}" \
-		--with-build="${KV_DIR}" \
-		--with-isapnp=yes \
-		--with-sequencer=yes \
-		--with-cards="${ALSA_CARDS}" || die "econf failed"
-
-	# linux-mod_src_compile doesn't work well with alsa
-	set_arch_to_kernel
-	# -j1 : see bug #71028
-	emake -j1 || die "Make Failed"
-	set_arch_to_portage
-
-	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() {
-	dodir /usr/include/sound
-	make DESTDIR=${D} install || die
-
-	# Provided by alsa-headers now
-	rm -rf ${D}/usr/include/sound
-
-	# We have our own scripts in alsa-utils
-	test -e ${D}/etc/init.d/alsasound && rm ${D}/etc/init.d/alsasound
-	test -e ${D}/etc/rc.d/init.d/alsasound && rm ${D}/etc/rc.d/init.d/alsasound
-
-	dodoc CARDS-STATUS INSTALL 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
-}
-
-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"
-}
diff --git a/media-sound/alsa-driver/alsa-driver-1.0.7-r4.ebuild b/media-sound/alsa-driver/alsa-driver-1.0.7-r4.ebuild
index 7f54238d80b2..3650b795ce58 100644
--- a/media-sound/alsa-driver/alsa-driver-1.0.7-r4.ebuild
+++ b/media-sound/alsa-driver/alsa-driver-1.0.7-r4.ebuild
@@ -1,6 +1,6 @@
 # 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.7-r4.ebuild,v 1.9 2005/01/18 10:07:19 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/alsa-driver-1.0.7-r4.ebuild,v 1.10 2005/04/04 22:30:57 eradicator Exp $
 
 IUSE="oss doc"
 inherit linux-mod flag-o-matic eutils
@@ -14,9 +14,7 @@ SRC_URI="mirror://alsaproject/driver/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-#KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~sparc ~x86"
-# This just has updates for xbox over -r3
-KEYWORDS="x86 ~ppc"
+KEYWORDS="~alpha amd64 ~ia64 ~mips ~ppc sparc x86"
 
 RDEPEND="virtual/modutils
 	 ~media-sound/alsa-headers-${PV}"
diff --git a/media-sound/alsa-driver/alsa-driver-1.0.8.ebuild b/media-sound/alsa-driver/alsa-driver-1.0.8.ebuild
index 045904b1b6d9..7b0cefd5620a 100644
--- a/media-sound/alsa-driver/alsa-driver-1.0.8.ebuild
+++ b/media-sound/alsa-driver/alsa-driver-1.0.8.ebuild
@@ -1,6 +1,6 @@
 # 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.8.ebuild,v 1.13 2005/04/03 17:52:59 chrb Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/alsa-driver-1.0.8.ebuild,v 1.14 2005/04/04 22:30:57 eradicator Exp $
 
 IUSE="oss doc"
 inherit linux-mod flag-o-matic eutils
@@ -14,7 +14,7 @@ SRC_URI="mirror://alsaproject/driver/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~mips ppc sparc x86 ppc64"
+KEYWORDS="~alpha amd64 ~ia64 ~mips ppc ppc64 sparc x86"
 
 RDEPEND="virtual/modutils
 	 ~media-sound/alsa-headers-${PV}"
@@ -165,7 +165,7 @@ pkg_postinst() {
 		done
 
 		for dir in $(find ${ROOT}/lib/modules/${KV_FULL}/kernel/sound -type d | tac); do
-			rmdir ${dir}
+			rmdir ${dir} &> /dev/null
 		done
 	fi
 }
diff --git a/media-sound/alsa-driver/alsa-driver-1.0.8_rc1.ebuild b/media-sound/alsa-driver/alsa-driver-1.0.8_rc1.ebuild
deleted file mode 100644
index fba5088b1143..000000000000
--- a/media-sound/alsa-driver/alsa-driver-1.0.8_rc1.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# 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.8_rc1.ebuild,v 1.4 2005/01/18 10:07:19 dragonheart Exp $
-
-IUSE="oss doc"
-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 ~sparc x86"
-
-RDEPEND="virtual/modutils
-	 ~media-sound/alsa-headers-${PV}"
-
-DEPEND="${RDEPEND}
-	sys-devel/patch
-	virtual/linux-sources
-	>=sys-devel/autoconf-2.50
-	sys-apps/debianutils"
-
-PROVIDE="virtual/alsa"
-
-pkg_setup() {
-	CONFIG_CHECK="SOUND !SND !SOUND_PRIME"
-	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."
-
-	linux-mod_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
-	#
-	if [ -z "${ALSA_CARDS}" ]; then
-		ewarn "\${ALSA_CARDS} isn't set, so we are compiling all alsa drivers."
-		ALSA_CARDS="all"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-
-	[ "${PROFILE_ARCH}" == "xbox" ] && \
-		epatch ${FILESDIR}/${PN}-1.0.7-xbox.patch
-
-	convert_to_m ${S}/Makefile
-}
-
-src_compile() {
-	# Should fix bug #46901
-	is-flag "-malign-double" && filter-flags "-fomit-frame-pointer"
-
-	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
-	set_arch_to_kernel
-	# -j1 : see bug #71028
-	emake -j1 || die "Parallel Make Failed"
-	set_arch_to_portage
-
-	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() {
-	dodir /usr/include/sound
-	make DESTDIR="${D}" install || die
-
-	# Provided by alsa-headers now
-	rm -rf ${D}/usr/include/sound
-
-	# We have our own scripts in alsa-utils
-	test -e ${D}/etc/init.d/alsasound && rm ${D}/etc/init.d/alsasound
-	test -e ${D}/etc/rc.d/init.d/alsasound && rm ${D}/etc/rc.d/init.d/alsasound
-
-	dodoc CARDS-STATUS INSTALL 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
-}
-
-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"
-}
diff --git a/media-sound/alsa-driver/alsa-driver-1.0.9_rc2.ebuild b/media-sound/alsa-driver/alsa-driver-1.0.9_rc2.ebuild
index b58b2ab79487..552226840311 100644
--- a/media-sound/alsa-driver/alsa-driver-1.0.9_rc2.ebuild
+++ b/media-sound/alsa-driver/alsa-driver-1.0.9_rc2.ebuild
@@ -1,6 +1,6 @@
 # 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.9_rc2.ebuild,v 1.1 2005/03/31 03:32:12 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/alsa-driver-1.0.9_rc2.ebuild,v 1.2 2005/04/04 22:30:57 eradicator Exp $
 
 IUSE="oss doc"
 inherit linux-mod flag-o-matic eutils
@@ -40,7 +40,7 @@ pkg_setup() {
 	# Which drivers need PNP
 	local PNP_DRIVERS="interwave interwave-stb"
 
-	CONFIG_CHECK="SOUND !SND !SOUND_PRIME"
+	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."
@@ -154,7 +154,7 @@ pkg_postinst() {
 		done
 
 		for dir in $(find ${ROOT}/lib/modules/${KV_FULL}/kernel/sound -type d | tac); do
-			rmdir ${dir}
+			rmdir ${dir} &> /dev/null
 		done
 	fi
 }
diff --git a/media-sound/alsa-driver/files/digest-alsa-driver-1.0.5a b/media-sound/alsa-driver/files/digest-alsa-driver-1.0.5a
deleted file mode 100644
index e54298f3877b..000000000000
--- a/media-sound/alsa-driver/files/digest-alsa-driver-1.0.5a
+++ /dev/null
@@ -1 +0,0 @@
-MD5 019d190e0499c77c6a4922477ae2f5d4 alsa-driver-1.0.5a.tar.bz2 1729509
diff --git a/media-sound/alsa-driver/files/digest-alsa-driver-1.0.6a b/media-sound/alsa-driver/files/digest-alsa-driver-1.0.6a
deleted file mode 100644
index 2137a42d5511..000000000000
--- a/media-sound/alsa-driver/files/digest-alsa-driver-1.0.6a
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e5baf4561d250c2bdee62332b216c5fc alsa-driver-1.0.6a.tar.bz2 1790858
diff --git a/media-sound/alsa-driver/files/digest-alsa-driver-1.0.7-r3 b/media-sound/alsa-driver/files/digest-alsa-driver-1.0.7-r3
deleted file mode 100644
index daf5cb7de471..000000000000
--- a/media-sound/alsa-driver/files/digest-alsa-driver-1.0.7-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 30be8b50ab699f917fb20537bc6509ad alsa-driver-1.0.7.tar.bz2 1829053
diff --git a/media-sound/alsa-driver/files/digest-alsa-driver-1.0.8_rc1 b/media-sound/alsa-driver/files/digest-alsa-driver-1.0.8_rc1
deleted file mode 100644
index b68e5ffbf3cd..000000000000
--- a/media-sound/alsa-driver/files/digest-alsa-driver-1.0.8_rc1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 21020d6cfa467f4b9f86d45067777aee alsa-driver-1.0.8rc1.tar.bz2 1887764