Don't install modules into the kernel subdir. This way, youu don't need to re-emerge alsa-driver every time you do a make modules_install in your kernel.

(Portage version: 2.0.51.17)

2 files changed, 25 insertions, 3 deletions

diff --git a/media-sound/alsa-driver/ChangeLog b/media-sound/alsa-driver/ChangeLog
index 40fbb880d178..223a74085375 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.134 2005/02/18 23:37:27 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/ChangeLog,v 1.135 2005/03/01 20:51:07 eradicator Exp $
+
+  01 Mar 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-driver-1.0.8.ebuild:
+  Don't install modules into the kernel subdir. This way, youu don't need to
+  re-emerge alsa-driver every time you do a make modules_install in your
+  kernel.
 
   19 Feb 2005; Jan Brinkmann <luckyduck@gentoo.org>
   +files/1.0.8-msi_audigyls.patch, alsa-driver-1.0.8.ebuild:
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 f15a76dc8de4..7cd91cf6fefc 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.7 2005/02/18 23:37:27 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/alsa-driver-1.0.8.ebuild,v 1.8 2005/03/01 20:51:07 eradicator Exp $
 
 IUSE="oss doc"
 inherit linux-mod flag-o-matic eutils
@@ -125,6 +125,12 @@ src_install() {
 		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
+	fi
 }
 
 pkg_postinst() {
@@ -143,5 +149,15 @@ 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; 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}
+		done
+	fi
+}