From: Diego Elio Pettenò <flameeyes@gentoo.org>
Date: Mon, 31 Oct 2005 18:23:13 +0000 (+0000)
Subject: Resolve collision-protect errors as per bug #93286.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c2872a042ae7f59c062fea9faeafb7a9a8e55907;p=gentoo.git

Resolve collision-protect errors as per bug #93286.
Package-Manager: portage-2.0.53_rc7
---

diff --git a/media-sound/alsa-driver/ChangeLog b/media-sound/alsa-driver/ChangeLog
index a9dba64d4d66..359b76c9fcef 100644
--- a/media-sound/alsa-driver/ChangeLog
+++ b/media-sound/alsa-driver/ChangeLog
@@ -1,6 +1,10 @@
 # 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.160 2005/10/30 21:39:23 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/ChangeLog,v 1.161 2005/10/31 18:23:13 flameeyes Exp $
+
+  31 Oct 2005; Diego Pettenò <flameeyes@gentoo.org>
+  alsa-driver-1.0.10_rc2.ebuild:
+  Resolve collision-protect errors as per bug #93286.
 
   30 Oct 2005; Diego Pettenò <flameeyes@gentoo.org>
   +files/alsa-driver-1.0.10_rc2-audigy2zs.patch,
diff --git a/media-sound/alsa-driver/Manifest b/media-sound/alsa-driver/Manifest
index eab07c88706e..1bc31345e258 100644
--- a/media-sound/alsa-driver/Manifest
+++ b/media-sound/alsa-driver/Manifest
@@ -1,8 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 b405b3dd00f433a93256e197c186482a ChangeLog 28134
-MD5 30e2221cce294766193f92f251a63171 alsa-driver-1.0.10_rc2.ebuild 4661
+MD5 2a3ae9689febf11b940031bc5595f390 ChangeLog 28275
+MD5 98c0e30ec9aa5bf117d14cadfc5919db alsa-driver-1.0.10_rc2.ebuild 4518
 MD5 3c0f4daec01807f3cce65c8fff87ff3f alsa-driver-1.0.3.ebuild 3366
 MD5 4f4a1c953e628c974d5accd88a6c0d0c alsa-driver-1.0.8.ebuild 4688
 MD5 2225d603271147071152961c6f768d37 alsa-driver-1.0.9b.ebuild 4560
@@ -18,10 +15,3 @@ MD5 496627835733f8108e6b10dfc8ee9bf4 files/digest-alsa-driver-1.0.9b 72
 MD5 27ccbe36406f145c1d63725a53517233 files/makefile.patch 1122
 MD5 b2791ec892d9be6952fe139cc2309abf files/xbox-1.0.8.patch 1525
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDZT25j5H05b2HAEkRAg/LAJ9nbuF25VGyf6rlJUNG+DPUUxffHACeKOKi
-GGmDRR0vHrb7zfSw+dfK2lY=
-=CmyM
------END PGP SIGNATURE-----
diff --git a/media-sound/alsa-driver/alsa-driver-1.0.10_rc2.ebuild b/media-sound/alsa-driver/alsa-driver-1.0.10_rc2.ebuild
index cc34cdc88b42..d66479e10f68 100644
--- a/media-sound/alsa-driver/alsa-driver-1.0.10_rc2.ebuild
+++ b/media-sound/alsa-driver/alsa-driver-1.0.10_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.10_rc2.ebuild,v 1.3 2005/10/30 21:39:23 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/alsa-driver-1.0.10_rc2.ebuild,v 1.4 2005/10/31 18:23:13 flameeyes Exp $
 
 inherit linux-mod flag-o-matic eutils
 
@@ -69,6 +69,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${PN}-1.0.10_rc1-include.patch
 	epatch "${FILESDIR}"/${P}-audigy2zs.patch
 	convert_to_m ${S}/Makefile
+	sed -i -e 's:\(.*depmod\):#\1:' ${S}/Makefile
 }
 
 src_compile() {
@@ -103,15 +104,7 @@ src_compile() {
 
 
 src_install() {
-	dodir /usr/include/sound
-
-	make DESTDIR=${D} install || die "make install failed"
-
-	# Provided by alsa-headers now
-	rm -rf ${D}/usr/include/sound
-
-	# We have our own scripts in alsa-utils
-	rm -f ${D}/etc/init.d/alsasound ${D}/etc/rc.d/init.d/alsasound
+	make DESTDIR=${D} install-modules || die "make install failed"
 
 	dodoc CARDS-STATUS FAQ README WARNING TODO
 
@@ -146,7 +139,6 @@ pkg_postinst() {
 	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:"