Adding a patch for Linux 2.4.*, to make alsa-driver useable (wasn't before due to alsa-driver having an unresolved symbol to 'snd_fops'). Thanks to rajiv for pointing me into the right directio.

Package-Manager: portage-2.1.3.9

6 files changed, 38 insertions, 204 deletions

diff --git a/media-sound/alsa-driver/ChangeLog b/media-sound/alsa-driver/ChangeLog
index be9dfbbcbf17..5b00f2e026c3 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-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/ChangeLog,v 1.282 2007/10/18 17:43:12 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/ChangeLog,v 1.283 2007/10/21 15:18:25 phreak Exp $
+
+  21 Oct 2007; Christian Heim <phreak@gentoo.org>
+  +files/alsa-driver-1.0.15-linux-2.4.patch, -alsa-driver-1.0.15_rc2.ebuild,
+  alsa-driver-1.0.15.ebuild:
+  Adding a patch for Linux 2.4.*, to make alsa-driver useable (wasn't before
+  due to alsa-driver having an unresolved symbol to 'snd_fops'). Thanks to
+  rajiv for pointing me into the right directio.
 
 *alsa-driver-1.0.15 (18 Oct 2007)
 
diff --git a/media-sound/alsa-driver/Manifest b/media-sound/alsa-driver/Manifest
index f17f9df6197e..963606f94035 100644
--- a/media-sound/alsa-driver/Manifest
+++ b/media-sound/alsa-driver/Manifest
@@ -17,13 +17,16 @@ AUX alsa-driver-1.0.14_rc2-tumbler-ppc.patch 1105 RMD160 ae270a067ba51e4e5803734
 MD5 e755c981c442750f6ecbc088ba86d9ba files/alsa-driver-1.0.14_rc2-tumbler-ppc.patch 1105
 RMD160 ae270a067ba51e4e580373465d698dd8aa872c5f files/alsa-driver-1.0.14_rc2-tumbler-ppc.patch 1105
 SHA256 1c154e2235697383fae4b06a0d3ec9e5c437188481711e639a186d0d920aeb76 files/alsa-driver-1.0.14_rc2-tumbler-ppc.patch 1105
+AUX alsa-driver-1.0.15-linux-2.4.patch 272 RMD160 15d4705aa927e93dc293d34f5077851eea4bd2d7 SHA1 d7c12ba605810345d83740aef16efbf309e85f73 SHA256 cc0360788c0fdc8e404be7d2741ae63be70300b5724ac657164a9538f5c9749b
+MD5 17cf4122a276b527003c827379ae462c files/alsa-driver-1.0.15-linux-2.4.patch 272
+RMD160 15d4705aa927e93dc293d34f5077851eea4bd2d7 files/alsa-driver-1.0.15-linux-2.4.patch 272
+SHA256 cc0360788c0fdc8e404be7d2741ae63be70300b5724ac657164a9538f5c9749b files/alsa-driver-1.0.15-linux-2.4.patch 272
 DIST alsa-driver-1.0.13.tar.bz2 2404965 RMD160 cf17c49563321620c7c1037f6087c85b69278b12 SHA1 fd1534fc90098d05f878c8fef26125be9fd97d52 SHA256 91c37a7e2575cb44bc53cf9c13e2049db73d257242e4d6ab55150a0f704b84d3
 DIST alsa-driver-1.0.14.tar.bz2 2600096 RMD160 2d017ed11bd037e450ffa969602f84cc104e5b72 SHA1 9bb16c918e7e57a419c563425d1d8f76b535970a SHA256 4987c05fd5516f9cb36ff4b73ccb77300124423b2bd6c66260eed73317529eca
 DIST alsa-driver-1.0.14rc1.tar.bz2 2515938 RMD160 83f18e77bcd28e1eaccd66967de0dab0bfa84106 SHA1 2f815ac95c47eabf18c5ba0d0b1094249a5a5965 SHA256 09318cc3cc5bcf2eb69c1d75e2e045f625b8756d4879e5c2c0a1f3951524766d
 DIST alsa-driver-1.0.14rc2.tar.bz2 2525315 RMD160 cdaadd027d7be5a71e4fe281efcbbd9b64f7b892 SHA1 6a8fcab92e64da092aa0f566e13d1634b1ed1d2a SHA256 67e0f2ab476c0f08c642b33e4f57b17311fa07fd56eb3a02c76df22738f6d387
 DIST alsa-driver-1.0.14rc3.tar.bz2 2528674 RMD160 10c8d191079e9d7bfb37c71cbc8a2c509fd6423b SHA1 71836d8b08083028d48ae6f4d6792f78cce69fb4 SHA256 b7b99936bb118c0b808a386795625946e04841d24758e4c61370165e50999fc1
 DIST alsa-driver-1.0.15.tar.bz2 2677415 RMD160 f3cc3a1ad06b5a894fc6732f5261f5fc06c63421 SHA1 f68bb889538ba04b6d2ce7722d491f98dd00c144 SHA256 dd34ac303ac49b655f3a1a342fd4bafd90722ffd41ceb9af59821d5c13caa01d
-DIST alsa-driver-1.0.15rc2.tar.bz2 2672586 RMD160 d77bd70d5bcef9b88fcd199bbc435ba2c7d451e4 SHA1 de0dc4cfbc39f0c58371b0e741a5f36ef6b3bfa2 SHA256 e3d2d001c070077b84de46bb0256bc999ce41e451815b00e4b7f4f4633c4425d
 EBUILD alsa-driver-1.0.13.ebuild 5053 RMD160 b545351412e7222692d3e4746ff23fc29377a32a SHA1 f668e49b173072584426e4e22f94b0a8eb92da63 SHA256 1f85e1013ebc73b71be96b2e0b9c78aa81a466d8d188483e43591bf84e513821
 MD5 76be0e2298225b626343ad9c17d672ca alsa-driver-1.0.13.ebuild 5053
 RMD160 b545351412e7222692d3e4746ff23fc29377a32a alsa-driver-1.0.13.ebuild 5053
@@ -52,22 +55,18 @@ EBUILD alsa-driver-1.0.14_rc3.ebuild 7003 RMD160 060fc6cea9e90c0ce1fb38013418090
 MD5 d110d7edc6f7cdd9db7f4e5730937708 alsa-driver-1.0.14_rc3.ebuild 7003
 RMD160 060fc6cea9e90c0ce1fb380134180905b6c867a4 alsa-driver-1.0.14_rc3.ebuild 7003
 SHA256 27018b18e59295783f6bf8567c21738ef5a4c9e33649a38e6c7e736fae9cd37a alsa-driver-1.0.14_rc3.ebuild 7003
-EBUILD alsa-driver-1.0.15.ebuild 6973 RMD160 126d75da17b845497dc5743dac55c821d8ca3f6d SHA1 56a688ecdd53cef1dd060fe6c544646d9ae1bbb4 SHA256 2e517743b070ff9028c72d8aebf35c6ea5df5177f509a653b37d3cf5e46f6a41
-MD5 a90bc0ba0c07c4512fd1d2a32cf9f5b7 alsa-driver-1.0.15.ebuild 6973
-RMD160 126d75da17b845497dc5743dac55c821d8ca3f6d alsa-driver-1.0.15.ebuild 6973
-SHA256 2e517743b070ff9028c72d8aebf35c6ea5df5177f509a653b37d3cf5e46f6a41 alsa-driver-1.0.15.ebuild 6973
-EBUILD alsa-driver-1.0.15_rc2.ebuild 6977 RMD160 b2ce63617ff44a167a419fd9a6eaee208d89346c SHA1 b8a224455fb340dd4189b36081f4ff29b1c47bad SHA256 03bb8553f68ba39cc84bbde557492c8a74338ea914ef5cac5cd7ad512242288f
-MD5 57dce5ff69667643df0ebbe880f624bf alsa-driver-1.0.15_rc2.ebuild 6977
-RMD160 b2ce63617ff44a167a419fd9a6eaee208d89346c alsa-driver-1.0.15_rc2.ebuild 6977
-SHA256 03bb8553f68ba39cc84bbde557492c8a74338ea914ef5cac5cd7ad512242288f alsa-driver-1.0.15_rc2.ebuild 6977
+EBUILD alsa-driver-1.0.15.ebuild 7059 RMD160 402bc65d12ce2fca5e61c040090b4a99e8ab0b46 SHA1 72dbff63ce22e1c1a2eb967ae565afda1e8a3009 SHA256 c405c7ae5818d186ec7163ff2108f48dd0d3c2728cda93ce0495a3325039a93f
+MD5 e98d8f049517cc077415a48732103e0d alsa-driver-1.0.15.ebuild 7059
+RMD160 402bc65d12ce2fca5e61c040090b4a99e8ab0b46 alsa-driver-1.0.15.ebuild 7059
+SHA256 c405c7ae5818d186ec7163ff2108f48dd0d3c2728cda93ce0495a3325039a93f alsa-driver-1.0.15.ebuild 7059
 EBUILD alsa-driver-9999.ebuild 6607 RMD160 c9ba6d45ef438a5c0e3c7033001f807006d355c9 SHA1 552bd47dee56891409036e2b1812c972980906d8 SHA256 21f7540dd1a8c7ba197fc739ef9e252c572449f76bf7ba2eefd9e2460465dd22
 MD5 a848bdd54e898bd3a9328968f56e236c alsa-driver-9999.ebuild 6607
 RMD160 c9ba6d45ef438a5c0e3c7033001f807006d355c9 alsa-driver-9999.ebuild 6607
 SHA256 21f7540dd1a8c7ba197fc739ef9e252c572449f76bf7ba2eefd9e2460465dd22 alsa-driver-9999.ebuild 6607
-MISC ChangeLog 48547 RMD160 030b49b67e7dbd7a63b675785d2f29cd5754cfb7 SHA1 16dd489e401f17a30608f3cdf88db20b189a9637 SHA256 871e3ed393126e5b39e82eba88af3c721ea0e4dcd7a1b20bc99ccbc428bd0f40
-MD5 da23e0a347549b2746d29b312aec9306 ChangeLog 48547
-RMD160 030b49b67e7dbd7a63b675785d2f29cd5754cfb7 ChangeLog 48547
-SHA256 871e3ed393126e5b39e82eba88af3c721ea0e4dcd7a1b20bc99ccbc428bd0f40 ChangeLog 48547
+MISC ChangeLog 48905 RMD160 be36c6b87c1c3d8635fcf8231b2328e168e1508a SHA1 8e07129c0b5bfe67cff0f9f8bc8b0c65a15c1c0e SHA256 4e1bce1091b7034179fe5b72267e2270a923c360f9deb76efa1f4952552709d9
+MD5 7d72e517e81fbd10202e051c0a07a8d6 ChangeLog 48905
+RMD160 be36c6b87c1c3d8635fcf8231b2328e168e1508a ChangeLog 48905
+SHA256 4e1bce1091b7034179fe5b72267e2270a923c360f9deb76efa1f4952552709d9 ChangeLog 48905
 MISC metadata.xml 220 RMD160 e49f8bb330d1798cd2c8ee5335cef1784f0d7ccb SHA1 1b895fe6cae4b8eab08ba1a6a1212baf4b4b4105 SHA256 8570ef11cd59b0d8edb71e78eecaec423616836b10eacb86bee0de941f0ae054
 MD5 7c52acc7d4fe40bac97d3198a43dcbd6 metadata.xml 220
 RMD160 e49f8bb330d1798cd2c8ee5335cef1784f0d7ccb metadata.xml 220
@@ -96,16 +95,13 @@ SHA256 4d00b45f4a13e2dd77d80cee737cb995f60d7870d98ac8e6cb845be2eb183ced files/di
 MD5 08cca50e975907c75aa4bd44a8eefeb7 files/digest-alsa-driver-1.0.15 262
 RMD160 e073e374c88f4d72576a8213186d5049e9841cbd files/digest-alsa-driver-1.0.15 262
 SHA256 7765d1174aefa6792f512ea436e954a96e346e63766977c06c929a6807120eac files/digest-alsa-driver-1.0.15 262
-MD5 309cb5a9b0a770960fa8266b5a113970 files/digest-alsa-driver-1.0.15_rc2 271
-RMD160 5e490cac01d5b68643a9989b6ec125404c73b237 files/digest-alsa-driver-1.0.15_rc2 271
-SHA256 7dfcf09e8f2720b9bc8a6712152c874b90aa95b78b2c000a5f400b4ee883b7db files/digest-alsa-driver-1.0.15_rc2 271
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-alsa-driver-9999 0
 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-alsa-driver-9999 0
 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-alsa-driver-9999 0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFHF5tNyuNVb5qfaOYRAqJZAKChKfJDlVfUihLtBkNRdXAgKSpF3QCfaYtx
-r+zYtur8GoZNVcHgipI3lPc=
-=+Bs8
+iD8DBQFHG23ryuNVb5qfaOYRAk6JAKCwzloyoyB/Gkr7lqjxfcM8M3bftgCgjBXo
+MArecqyO3np+5kYRDXFc3PE=
+=9VaE
 -----END PGP SIGNATURE-----
diff --git a/media-sound/alsa-driver/alsa-driver-1.0.15.ebuild b/media-sound/alsa-driver/alsa-driver-1.0.15.ebuild
index ab37fbbdbc07..dc6f5325f559 100644
--- a/media-sound/alsa-driver/alsa-driver-1.0.15.ebuild
+++ b/media-sound/alsa-driver/alsa-driver-1.0.15.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 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.15.ebuild,v 1.1 2007/10/18 17:43:12 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/alsa-driver-1.0.15.ebuild,v 1.2 2007/10/21 15:18:25 phreak Exp $
 
-inherit autotools linux-mod flag-o-matic eutils multilib
+inherit autotools linux-mod flag-o-matic eutils multilib linux-info
 
 MY_P="${P/_rc/rc}"
 S="${WORKDIR}/${MY_P}"
@@ -114,6 +114,8 @@ src_unpack() {
 
 	cd "${S}"
 
+	kernel_is 2 4 && epatch "${FILESDIR}"/alsa-driver-1.0.15-linux-2.4.patch
+
 	convert_to_m "${S}/Makefile"
 	sed -i -e 's:\(.*depmod\):#\1:' "${S}/Makefile"
 	eautoconf
diff --git a/media-sound/alsa-driver/alsa-driver-1.0.15_rc2.ebuild b/media-sound/alsa-driver/alsa-driver-1.0.15_rc2.ebuild
deleted file mode 100644
index cd8a94a36b6f..000000000000
--- a/media-sound/alsa-driver/alsa-driver-1.0.15_rc2.ebuild
+++ /dev/null
@@ -1,179 +0,0 @@
-# Copyright 1999-2007 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.15_rc2.ebuild,v 1.1 2007/09/17 17:32:37 phreak Exp $
-
-inherit autotools linux-mod flag-o-matic eutils multilib
-
-MY_P="${P/_rc/rc}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Advanced Linux Sound Architecture kernel modules"
-HOMEPAGE="http://www.alsa-project.org/"
-
-if [[ ${MY_P} == ${MY_P/_p*/} ]]; then
-	SRC_URI="mirror://alsaproject/driver/${MY_P}.tar.bz2"
-else # Gentoo snapshots
-	SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
-fi
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-
-KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~ppc64 ~x86"
-IUSE="oss debug midi"
-
-IUSE_CARDS="seq-dummy dummy virmidi mtpav mts64 serial-u16550 mpu401
-loopback portman2x4 pcsp ad1848-lib cs4231-lib adlib ad1816a ad1848
-als100 azt2320 cmi8330 cs4231 cs4232 cs4236 dt019x es968 es1688 es18xx
-gusclassic gusextreme gusmax interwave interwave-stb opl3sa2
-opti92x-ad1848 opti92x-cs4231 opti93x miro sb8 sb16 sbawe sgalaxy
-sscape wavefront pc98-cs4232 msnd-pinnacle ad1889 als300 als4000
-ali5451 atiixp atiixp-modem au8810 au8820 au8830 azt3328 bt87x ca0106
-cmipci cs4281 cs46xx cs5535audio darla20 gina20 layla20 darla24 gina24
-layla24 mona mia echo3g indigo indigoio indigodj emu10k1 emu10k1x
-ens1370 ens1371 es1938 es1968 fm801 fm801-tea575x hda-intel hdsp hdspm
-ice1712 ice1724 intel8x0 intel8x0m korg1212 maestro3 mixart nm256
-pcxhr riptide rme32 rme96 rme9652 sonicvibes trident via82xx
-via82xx-modem vx222 ymfpci pdplus asihpi powermac aoa
-aoa-fabric-layout aoa-onyx aoa-tas aoa-toonie aoa-soundbus
-aoa-soundbus-i2s sa11xx-uda1341 armaaci s3c2410 pxa2xx-i2sound au1x00
-usb-audio usb-usx2y vxpocket pdaudiocf sun-amd7930 sun-cs4231 sun-dbri
-harmony soc at91-soc at91-soc-eti-b1-wm8731 pxa2xx-soc
-pxa2xx-soc-corgi pxa2xx-soc-spitz pxa2xx-soc-poodle pxa2xx-soc-tosa"
-
-for iuse_card in ${IUSE_CARDS}; do
-	IUSE="${IUSE} alsa_cards_${iuse_card}"
-done
-
-RDEPEND="virtual/modutils
-	 !media-sound/snd-aoa"
-DEPEND="${RDEPEND}
-	>=media-sound/alsa-headers-1.0.14
-	virtual/linux-sources
-	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:-${IUSE_ALSA_CARDS}}
-
-	local PNP_DRIVERS="interwave interwave-stb"
-	local PNP_ERROR="Some of the drivers you selected require PnP support in your kernel (${PNP_DRIVERS}). Either enable PnP in your kernel or trim which drivers get compiled using ALSA_CARDS in /etc/make.conf."
-
-	local ISA_DRIVERS="cs4232 msnd-pinnacle cs4231-lib adlib ad1816a ad1848 als100 azt2320
-		cmi8330 cs4231 cs4236 dt019x  es968 es1688 es18xx gusclassic gusextreme gusmax
-		interwave interwave-stb opl3sa2 opti92x-ad1848 opti92x-cs4231 opti93x miro sb8
-		sb16 sbawe sb16_csp sgalaxy sscape wavefront"
-	local ISA_ERROR="Some of the drivers you selected require ISA support in your kernel ($(echo $ISA_DRIVERS)). Either enable ISA in your kernel or trim which drivers get compiled using ALSA_CARDS in /etc/make.conf."
-
-	local FW_DRIVERS="darla20 gina20 layla20 darla24 gina24 layla24 mona mia echo3g indigo
-		indigoio indigodj emu10k1 korg1212 maestro3 riptide ymfpci asihpi"
-	local FW_LOADER_ERROR="Some of the drivers you selected require 'Userspace firmware loading support' in your kernel (${FW_DRIVERS}). Either enable that feature or trim which drivers get compiled using ALSA_CARDS in /etc/make.conf."
-
-	local PARPORT_DRIVERS="portman2x4"
-	local PARPORT_ERROR="Some if the drivers you selected require Parallel Port support (${PARPORT_DRIVERS}). Either enable that feature or trim which drivers get compiled using ALSA_CARDS in /etc/make.conf."
-
-	local TMP_ALSA_CARDS
-	local CHECK_PNP
-	local CHECK_ISA
-	local CHECK_FW
-	local CHECK_PARPORT
-	for card in ${ALSA_CARDS}; do
-		if has alsa_cards_${card} ${IUSE} && use alsa_cards_${card}; then
-			TMP_ALSA_CARDS="${TMP_ALSA_CARDS} ${card}"
-			has ${card} ${PNP_DRIVERS} && CHECK_PNP="PNP"
-			has ${card} ${ISA_DRIVERS} && CHECK_ISA="ISA"
-			has ${card} ${FW_DRIVERS} && CHECK_FW="FW_LOADER"
-			has ${card} ${PARPORT_DRIVERS} && CHECK_PARPORT="PARPORT"
-		fi
-	done
-	ALSA_CARDS="${TMP_ALSA_CARDS}"
-
-	local CONFIG_CHECK="!SND SOUND ${CHECK_PNP} ${CHECK_ISA} ${CHECK_FW} ${CHECK_PARPORT}"
-	local SND_ERROR="ALSA is already compiled into the kernel. This is the recommended configuration, don't emerge alsa-driver."
-	local SOUND_ERROR="Your kernel doesn't have sound support enabled."
-	local 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
-
-	if [[ ${PROFILE_ARCH} == "sparc64" ]] ; then
-		export CBUILD=${CBUILD-${CHOST}}
-		export CHOST="sparc64-unknown-linux-gnu"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-
-	convert_to_m "${S}/Makefile"
-	sed -i -e 's:\(.*depmod\):#\1:' "${S}/Makefile"
-	eautoconf
-}
-
-src_compile() {
-	local myABI=${ABI:-${DEFAULT_ABI}}
-
-	# 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) \
-		$(use_with debug debug full) \
-		--with-kernel="${KV_DIR}" \
-		--with-build="${KV_OUT_DIR}" \
-		--with-isapnp=yes \
-		$(use_with midi sequencer) \
-		--with-cards="${ALSA_CARDS}" || die "econf failed"
-
-	# linux-mod_src_compile doesn't work well with alsa
-
-	ARCH=$(tc-arch-kernel)
-	ABI=${KERNEL_ABI}
-	emake LDFLAGS="$(raw-ldflags)" HOSTCC="$(tc-getBUILD_CC)" CC="$(tc-getCC)" || die "Make Failed"
-	ARCH=$(tc-arch)
-	ABI=${myABI}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install-modules || die "make install failed"
-
-	dodoc CARDS-STATUS FAQ README WARNING TODO
-
-	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() {
-	elog
-	elog "Remember that all mixer channels will be MUTED by default."
-	elog "Use the 'alsamixer' program to unmute them, then save your"
-	elog "mixer settings with /etc/init.d/alsasound save"
-	elog
-	elog "If you experience problems, please try building the in-kernel"
-	elog "ALSA drivers instead. This ebuild is not recommended and is"
-	elog "likely to be removed from portage at a later date."
-	elog
-
-	linux-mod_pkg_postinst
-
-	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
-
-		find "${ROOT}/lib/modules/${KV_FULL}/kernel/sound" -type d -print0 | xargs --null rmdir
-	fi
-}
diff --git a/media-sound/alsa-driver/files/alsa-driver-1.0.15-linux-2.4.patch b/media-sound/alsa-driver/files/alsa-driver-1.0.15-linux-2.4.patch
new file mode 100644
index 000000000000..c301df6e34be
--- /dev/null
+++ b/media-sound/alsa-driver/files/alsa-driver-1.0.15-linux-2.4.patch
@@ -0,0 +1,11 @@
+--- a/alsa-kernel/core/sound.c
++++ b/alsa-kernel/core/sound.c
+@@ -168,7 +168,7 @@ static int snd_open(struct inode *inode,
+ 	return err;
+ }
+ 
+-static const struct file_operations snd_fops =
++struct file_operations snd_fops =
+ {
+ 	.owner =	THIS_MODULE,
+ 	.open =		snd_open
diff --git a/media-sound/alsa-driver/files/digest-alsa-driver-1.0.15_rc2 b/media-sound/alsa-driver/files/digest-alsa-driver-1.0.15_rc2
deleted file mode 100644
index 6608c5c8b027..000000000000
--- a/media-sound/alsa-driver/files/digest-alsa-driver-1.0.15_rc2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 638aa4159fae5cf1693c60952b246328 alsa-driver-1.0.15rc2.tar.bz2 2672586
-RMD160 d77bd70d5bcef9b88fcd199bbc435ba2c7d451e4 alsa-driver-1.0.15rc2.tar.bz2 2672586
-SHA256 e3d2d001c070077b84de46bb0256bc999ce41e451815b00e4b7f4f4633c4425d alsa-driver-1.0.15rc2.tar.bz2 2672586