Ebuild cleanups.

5 files changed, 21 insertions, 18 deletions

diff --git a/media-sound/alsa-driver/ChangeLog b/media-sound/alsa-driver/ChangeLog
index 03e3bb6c1543..7207535e5b78 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 Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/ChangeLog,v 1.79 2004/04/06 17:42:29 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/ChangeLog,v 1.80 2004/04/08 07:44:16 eradicator Exp $
+
+  08 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-driver-0.5.12a.ebuild, alsa-driver-0.9.0_rc2.ebuild,
+  alsa-driver-0.9.2.ebuild:
+  Ebuild cleanups.
 
   06 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
   alsa-driver-1.0.3.ebuild, alsa-driver-1.0.4.ebuild:
diff --git a/media-sound/alsa-driver/Manifest b/media-sound/alsa-driver/Manifest
index af3f920bd990..02807272a4e9 100644
--- a/media-sound/alsa-driver/Manifest
+++ b/media-sound/alsa-driver/Manifest
@@ -1,11 +1,11 @@
-MD5 3a832f8e243a523db06b78f64496010f alsa-driver-0.5.12a.ebuild 1674
-MD5 5b3c57a23a9a20cf50693dcbd71387e5 alsa-driver-0.9.2.ebuild 2695
+MD5 d846a567c35f2f6de11d0969ca7e51d5 alsa-driver-0.5.12a.ebuild 1633
+MD5 85d61c1e5013df6d9214a79bbfec56a7 alsa-driver-0.9.2.ebuild 2667
 MD5 469bfd04ec1dc8a49bed4be17b24d7db alsa-driver-1.0.4.ebuild 3317
 MD5 2c3d8e8ee062ea5667b436384d4277eb alsa-driver-1.0.3.ebuild 3366
-MD5 9200265be0fc56782ad52caaf2c382ed ChangeLog 14035
+MD5 1889d92f4294e088989fddf9e4b4a5f2 ChangeLog 14200
 MD5 977252129edb014d00f4bf5421f54724 alsa-driver-1.0.2c.ebuild 2686
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 67c2da5b847168398d251c18c8c6f683 alsa-driver-0.9.0_rc2.ebuild 2664
+MD5 d125d4393af3e7304890c996b3766173 alsa-driver-0.9.0_rc2.ebuild 2577
 MD5 dc7de4d099d11a37538c09496e2597e1 alsa-driver-0.9.8.ebuild 2376
 MD5 45f2cf526eaa8ff274ac6876f15302d1 files/alsa 518
 MD5 5f8f784625ea9710adde055f639dcbeb files/digest-alsa-driver-1.0.2c 72
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 4e64f0add1dc..5fe96c9a29c5 100644
--- a/media-sound/alsa-driver/alsa-driver-0.5.12a.ebuild
+++ b/media-sound/alsa-driver/alsa-driver-0.5.12a.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # 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.15 2004/03/01 05:37:12 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/alsa-driver-0.5.12a.ebuild,v 1.16 2004/04/08 07:44:16 eradicator Exp $
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Advanced Linux Sound Architecture modules"
-SRC_URI="ftp://ftp.alsa-project.org/pub/driver/alsa-driver-${PV}.tar.bz2"
+SRC_URI="mirror://alsaproject/driver/${P}.tar.bz2"
 HOMEPAGE="http://www.alsa-project.org"
 
 #virtual/glibc should depend on specific kernel headers
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 9745e67c420e..84bde8df44a0 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 Technologies, Inc.
 # 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.14 2004/03/01 05:37:12 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/alsa-driver-0.9.0_rc2.ebuild,v 1.15 2004/04/08 07:44:16 eradicator Exp $
 
 DESCRIPTION="Advanced Linux Sound Architecture kernel modules"
 HOMEPAGE="http://www.alsa-project.org/"
@@ -14,8 +14,9 @@ HOMEPAGE="http://www.alsa-project.org/"
 #
 [ x"${ALSA_CARDS}" = x ] && ALSA_CARDS=all
 
-SRC_URI="ftp://ftp.alsa-project.org/pub/driver/${P/_rc/rc}.tar.bz2"
-S=${WORKDIR}/${P/_rc/rc}
+MY_P=${P/_rc/rc}
+SRC_URI="mirror://alsaproject/driver/${MY_P}.tar.bz2"
+S=${WORKDIR}/${MY_P}
 
 # Need the baselayout 1.7.9 or newer for the init script to work correctly.
 DEPEND="sys-devel/autoconf
@@ -36,10 +37,9 @@ src_unpack() {
 	# http://sourceforge.net/tracker/?func=detail&aid=551668&group_id=27464&atid=390601
 	unpack ${A}
 	cd ${S}
-	sed -e 's:/etc/rc.d/init.d:/etc/init.d:' < Makefile > Makefile.hacked
-	mv Makefile.hacked Makefile
-	if [ ${ARCH} = "ppc" ]
-		then patch -p1 < ${FILESDIR}/alsa-driver-0.9.0rc1-ppc.patch || die "Patching failed"
+	sed -i -e 's:/etc/rc.d/init.d:/etc/init.d:' Makefile
+	if use ppc; then 
+		epatch ${FILESDIR}/alsa-driver-0.9.0rc1-ppc.patch
 	fi
 }
 
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 ba02cab397a8..1a1977b90c45 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 Technologies, Inc.
 # 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.5 2004/03/01 05:37:12 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/alsa-driver-0.9.2.ebuild,v 1.6 2004/04/08 07:44:16 eradicator Exp $
 
 DESCRIPTION="Advanced Linux Sound Architecture kernel modules"
 HOMEPAGE="http://www.alsa-project.org/"
@@ -25,8 +25,7 @@ PROVIDE="virtual/alsa"
 SLOT="0.9"
 KEYWORDS="x86 ~ppc -sparc"
 
-SRC_URI="ftp://ftp.alsa-project.org/pub/driver/${P}.tar.bz2"
-S=${WORKDIR}/${P}
+SRC_URI="mirror://alsaproject/driver/${P}.tar.bz2"
 
 src_unpack() {
 	unpack ${A}