13 files changed, 22 insertions, 461 deletions
diff --git a/media-sound/alsa-driver/ChangeLog b/media-sound/alsa-driver/ChangeLog
index c11aaa2d5905..807fcbe43a36 100644
--- a/media-sound/alsa-driver/ChangeLog
+++ b/media-sound/alsa-driver/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/alsa-driver
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/ChangeLog,v 1.91 2004/07/23 10:41:10 chrb Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/ChangeLog,v 1.92 2004/07/24 05:44:34 eradicator Exp $
+
+  23 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -alsa-driver-1.0.2c.ebuild, -alsa-driver-1.0.4-r1.ebuild,
+  -alsa-driver-1.0.4.ebuild, -alsa-driver-1.0.5.ebuild:
+  Removing old versions.  Fixing DEPEND.
 
   23 Jul 2004; Chris Bainbridge <chrb@gentoo.org> alsa-driver-1.0.5a.ebuild:
   Added xbox patch, bug #47166
diff --git a/media-sound/alsa-driver/alsa-driver-0.5.12a.ebuild b/media-sound/alsa-driver/alsa-driver-0.5.12a.ebuild
index c70224fefdba..21d2491ae1c3 100644
--- a/media-sound/alsa-driver/alsa-driver-0.5.12a.ebuild
+++ b/media-sound/alsa-driver/alsa-driver-0.5.12a.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/alsa-driver-0.5.12a.ebuild,v 1.19 2004/07/01 07:48:17 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/alsa-driver-0.5.12a.ebuild,v 1.20 2004/07/24 05:44:34 eradicator Exp $
 
 IUSE=""
 
@@ -8,8 +8,8 @@ DESCRIPTION="Advanced Linux Sound Architecture modules"
 SRC_URI="mirror://alsaproject/driver/${P}.tar.bz2"
 HOMEPAGE="http://www.alsa-project.org"
 
-#virtual/libc should depend on specific kernel headers
-DEPEND="sys-devel/autoconf virtual/libc"
+RDEPEND=""
+DEPEND="sys-devel/autoconf virtual/linux-sources"
 PROVIDE="virtual/alsa"
 
 SLOT="0.5"
diff --git a/media-sound/alsa-driver/alsa-driver-0.9.0_rc2.ebuild b/media-sound/alsa-driver/alsa-driver-0.9.0_rc2.ebuild
index 55a74e6b442a..14d91044c1cf 100644
--- a/media-sound/alsa-driver/alsa-driver-0.9.0_rc2.ebuild
+++ b/media-sound/alsa-driver/alsa-driver-0.9.0_rc2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/alsa-driver-0.9.0_rc2.ebuild,v 1.19 2004/07/01 07:48:17 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/alsa-driver-0.9.0_rc2.ebuild,v 1.20 2004/07/24 05:44:34 eradicator Exp $
 
 inherit eutils
 
@@ -24,9 +24,11 @@ S=${WORKDIR}/${MY_P}
 
 # Need the baselayout 1.7.9 or newer for the init script to work correctly.
 DEPEND="sys-devel/autoconf
-	virtual/libc
-	>=sys-apps/portage-1.9.10
-	>=sys-apps/baselayout-1.7.9"
+	virtual/linux-sources
+	>=sys-apps/portage-1.9.10"
+
+RDEPEND=">=sys-apps/baselayout-1.7.9"
+
 PROVIDE="virtual/alsa"
 
 SLOT="0.9"
diff --git a/media-sound/alsa-driver/alsa-driver-0.9.2.ebuild b/media-sound/alsa-driver/alsa-driver-0.9.2.ebuild
index c2aae5b4f7ab..3d224e2bd753 100644
--- a/media-sound/alsa-driver/alsa-driver-0.9.2.ebuild
+++ b/media-sound/alsa-driver/alsa-driver-0.9.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/alsa-driver-0.9.2.ebuild,v 1.9 2004/07/01 07:48:17 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/alsa-driver-0.9.2.ebuild,v 1.10 2004/07/24 05:44:34 eradicator Exp $
 
 IUSE=""
 
@@ -19,9 +19,9 @@ LICENSE="GPL-2 LGPL-2.1"
 
 # Need the baselayout 1.7.9 or newer for the init script to work correctly.
 DEPEND="sys-devel/autoconf
-	virtual/libc
-	>=sys-apps/portage-1.9.10
-	>=sys-apps/baselayout-1.7.9"
+	virtual/linux-sources
+	>=sys-apps/portage-1.9.10"
+RDEPEND=">=sys-apps/baselayout-1.7.9"
 PROVIDE="virtual/alsa"
 
 SLOT="0.9"
diff --git a/media-sound/alsa-driver/alsa-driver-0.9.8.ebuild b/media-sound/alsa-driver/alsa-driver-0.9.8.ebuild
index 45d4e640b463..7dd594b108b2 100644
--- a/media-sound/alsa-driver/alsa-driver-0.9.8.ebuild
+++ b/media-sound/alsa-driver/alsa-driver-0.9.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/alsa-driver-0.9.8.ebuild,v 1.13 2004/07/21 16:24:05 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/alsa-driver-0.9.8.ebuild,v 1.14 2004/07/24 05:44:34 eradicator Exp $
 
 inherit eutils
 
@@ -21,10 +21,9 @@ IUSE="oss"
 
 # Need the baselayout 1.7.9 or newer for the init script to work correctly.
 DEPEND="sys-devel/autoconf
-	virtual/libc
 	virtual/linux-sources
-	>=sys-apps/portage-1.9.10
-	>=sys-apps/baselayout-1.7.9"
+	>=sys-apps/portage-1.9.10"
+RDEPEND=">=sys-apps/baselayout-1.7.9"
 PROVIDE="virtual/alsa"
 
 SLOT="${KV}"
diff --git a/media-sound/alsa-driver/alsa-driver-1.0.2c.ebuild b/media-sound/alsa-driver/alsa-driver-1.0.2c.ebuild
deleted file mode 100644
index 24a701d9853b..000000000000
--- a/media-sound/alsa-driver/alsa-driver-1.0.2c.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2004 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.2c.ebuild,v 1.7 2004/07/21 16:24:05 mholzer Exp $
-
-inherit 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
-#
-[ x"${ALSA_CARDS}" = x ] && ALSA_CARDS=all
-
-IUSE="oss"
-
-# Need the baselayout 1.7.9 or newer for the init script to work correctly.
-DEPEND="sys-devel/autoconf
-	virtual/libc
-	virtual/linux-sources
-	>=sys-apps/portage-1.9.10
-	>=sys-apps/baselayout-1.7.9"
-PROVIDE="virtual/alsa"
-
-SLOT="${KV}"
-KEYWORDS="~x86 ~ppc -sparc ~amd64 ~alpha ~ia64"
-
-MY_P=${P/_rc/rc}
-#SRC_URI="ftp://ftp.alsa-project.org/pub/driver/${MY_P}.tar.bz2"
-SRC_URI="mirror://alsaproject/driver/${P}.tar.bz2"
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	ewarn "This does not work with kernel 2.6 !!!"
-	ewarn "Please use the kernel modules or alsa-driver-1.0.3 or greater"
-	# The makefile still installs an alsasound initscript,
-	# which we REALLY dont want.
-	# This patch stops that
-	epatch ${FILESDIR}/makefile.patch || die "Makefile patch failed"
-	epatch ${FILESDIR}/${PN}-0.9.8-au-fix.patch
-}
-
-
-src_compile() {
-	# Portage should determine the version of the kernel sources
-	check_KV
-
-	myconf=""
-	use oss && myconf="$myconf --with-oss=yes" || \
-		myconf="$myconf --with-oss=no"
-
-	./configure \
-		$myconf \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--with-kernel="${ROOT}usr/src/linux" \
-		--with-isapnp=yes \
-		--with-sequencer=yes \
-		--with-cards="${ALSA_CARDS}" \
-		|| die "./configure failed"
-
-	emake || die "Parallel Make Failed"
-}
-
-
-src_install() {
-	dodir /usr/include/sound
-	make DESTDIR=${D} install || die
-
-	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.4-r1.ebuild b/media-sound/alsa-driver/alsa-driver-1.0.4-r1.ebuild
deleted file mode 100644
index 6c5f54eaa5dd..000000000000
--- a/media-sound/alsa-driver/alsa-driver-1.0.4-r1.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2004 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.4-r1.ebuild,v 1.4 2004/07/21 16:24:05 mholzer 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"
-
-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}/${P}-devfix.patch
-
-	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
-
-	# 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.4.ebuild b/media-sound/alsa-driver/alsa-driver-1.0.4.ebuild
deleted file mode 100644
index f33be8aa326d..000000000000
--- a/media-sound/alsa-driver/alsa-driver-1.0.4.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2004 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.4.ebuild,v 1.7 2004/07/21 16:24:05 mholzer Exp $
-
-inherit kernel-mod flag-o-matic
-
-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"
-
-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}
-
-	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
-
-	# 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.5.ebuild b/media-sound/alsa-driver/alsa-driver-1.0.5.ebuild
deleted file mode 100644
index ce4c7826cdb1..000000000000
--- a/media-sound/alsa-driver/alsa-driver-1.0.5.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2004 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.5.ebuild,v 1.4 2004/07/21 16:24:05 mholzer 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"
-
-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}/${P}-devfix.patch
-
-	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
-
-	# 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/files/digest-alsa-driver-1.0.2c b/media-sound/alsa-driver/files/digest-alsa-driver-1.0.2c
deleted file mode 100644
index 7f61c74f49be..000000000000
--- a/media-sound/alsa-driver/files/digest-alsa-driver-1.0.2c
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3a0f049d8d0f331f869d52029a724419 alsa-driver-1.0.2c.tar.bz2 1704847
diff --git a/media-sound/alsa-driver/files/digest-alsa-driver-1.0.4 b/media-sound/alsa-driver/files/digest-alsa-driver-1.0.4
deleted file mode 100644
index d70af40d079b..000000000000
--- a/media-sound/alsa-driver/files/digest-alsa-driver-1.0.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 30684fbfcc84633df9740ab3f8e6bc97 alsa-driver-1.0.4.tar.bz2 1717290
diff --git a/media-sound/alsa-driver/files/digest-alsa-driver-1.0.4-r1 b/media-sound/alsa-driver/files/digest-alsa-driver-1.0.4-r1
deleted file mode 100644
index d70af40d079b..000000000000
--- a/media-sound/alsa-driver/files/digest-alsa-driver-1.0.4-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 30684fbfcc84633df9740ab3f8e6bc97 alsa-driver-1.0.4.tar.bz2 1717290
diff --git a/media-sound/alsa-driver/files/digest-alsa-driver-1.0.5 b/media-sound/alsa-driver/files/digest-alsa-driver-1.0.5
deleted file mode 100644
index 9c58b979d4e6..000000000000
--- a/media-sound/alsa-driver/files/digest-alsa-driver-1.0.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5c6ad2af258038dbf356a25f6ef740d2 alsa-driver-1.0.5.tar.bz2 1728284