Removed old ebuilds. Cleaned up remaining ones.

11 files changed, 14 insertions, 275 deletions

diff --git a/media-sound/alsa-driver/ChangeLog b/media-sound/alsa-driver/ChangeLog
index ff78fea6c15e..cf5c86874075 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-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/ChangeLog,v 1.75 2004/03/24 03:42:56 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/ChangeLog,v 1.76 2004/03/27 08:01:29 eradicator Exp $
+
+  27 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-driver-0.9.8.ebuild, alsa-driver-1.0.0_rc2.ebuild,
+  alsa-driver-1.0.1.ebuild, alsa-driver-1.0.2c.ebuild, files/alsa-compile-fix,
+  files/alsa-driver-0.9.5-spinlock_t.patch, files/alsa-driver-0.9.7-pde.patch,
+  files/wolk.patch:
+  Removed old ebuilds.  Cleaned up remaining ones.
 
   23 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org>
   alsa-driver-1.0.3.ebuild:
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 ab57a34172f6..64ddee72e25b 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,8 @@
 # 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.8.ebuild,v 1.9 2004/03/05 03:29:47 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/alsa-driver-0.9.8.ebuild,v 1.10 2004/03/27 08:01:29 eradicator Exp $
+
+inherit eutils
 
 DESCRIPTION="Advanced Linux Sound Architecture kernel modules"
 HOMEPAGE="http://www.alsa-project.org/"
@@ -30,7 +32,6 @@ KEYWORDS="x86 ppc -sparc amd64"
 
 SRC_URI="mirror://alsaproject/driver/${P}.tar.bz2"
 RESTRICT="nomirror"
-S=${WORKDIR}/${P}
 
 src_unpack() {
 	unpack ${A}
diff --git a/media-sound/alsa-driver/alsa-driver-1.0.0_rc2.ebuild b/media-sound/alsa-driver/alsa-driver-1.0.0_rc2.ebuild
deleted file mode 100644
index 94eddf7c5cce..000000000000
--- a/media-sound/alsa-driver/alsa-driver-1.0.0_rc2.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# 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-1.0.0_rc2.ebuild,v 1.6 2004/03/24 03:42:56 eradicator Exp $
-
-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/glibc
-	virtual/linux-sources
-	>=sys-apps/portage-1.9.10
-	>=sys-apps/baselayout-1.7.9"
-PROVIDE="virtual/alsa"
-
-SLOT="${KV}"
-KEYWORDS="~x86 ~ppc -sparc"
-
-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"
-#RESTRICT="nomirror"
-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
-}
diff --git a/media-sound/alsa-driver/alsa-driver-1.0.1.ebuild b/media-sound/alsa-driver/alsa-driver-1.0.1.ebuild
deleted file mode 100644
index c348f94eeae9..000000000000
--- a/media-sound/alsa-driver/alsa-driver-1.0.1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# 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-1.0.1.ebuild,v 1.6 2004/03/24 03:42:56 eradicator Exp $
-
-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/glibc
-	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"
-RESTRICT="nomirror"
-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
-}
diff --git a/media-sound/alsa-driver/alsa-driver-1.0.2c.ebuild b/media-sound/alsa-driver/alsa-driver-1.0.2c.ebuild
index bbd9260fd591..cd4eae5aa03f 100644
--- a/media-sound/alsa-driver/alsa-driver-1.0.2c.ebuild
+++ b/media-sound/alsa-driver/alsa-driver-1.0.2c.ebuild
@@ -1,6 +1,8 @@
 # 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-1.0.2c.ebuild,v 1.3 2004/03/24 03:42:56 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/alsa-driver-1.0.2c.ebuild,v 1.4 2004/03/27 08:01:29 eradicator Exp $
+
+inherit eutils
 
 DESCRIPTION="Advanced Linux Sound Architecture kernel modules"
 HOMEPAGE="http://www.alsa-project.org/"
diff --git a/media-sound/alsa-driver/files/alsa-compile-fix b/media-sound/alsa-driver/files/alsa-compile-fix
deleted file mode 100644
index 846bdb37fa24..000000000000
--- a/media-sound/alsa-driver/files/alsa-compile-fix
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -ru alsa-driver-0.9.6.orig/include/adriver.h alsa-driver-0.9.6/include/adriver.h
---- alsa-driver-0.9.6.orig/include/adriver.h	2003-09-10 15:22:02.000000000 +0200
-+++ alsa-driver-0.9.6/include/adriver.h	2003-09-10 15:28:30.000000000 +0200
-@@ -193,7 +193,10 @@
- #undef synchronize_irq
- #define synchronize_irq(irq)	synchronize_irq_wrapper(irq)
- #endif /* LINUX_VERSION_CODE < 2.5.28 */
--#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 5, 68) && !defined(WE_ARE_WOLKS)
-+#if ((LINUX_VERSION_CODE < KERNEL_VERSION(2, 5, 68) \
-+	&& LINUX_VERSION_CODE >= KERNEL_VERSION(2, 5, 0)) \
-+	|| LINUX_VERSION_CODE < KERNEL_VERSION(2, 4, 23)) \
-+	&& !defined(WE_ARE_WOLKS)
- #define IRQ_NONE	/*void*/
- #define IRQ_HANDLED	/*void*/
- #define IRQ_RETVAL(x)	/*void*/
diff --git a/media-sound/alsa-driver/files/alsa-driver-0.9.5-spinlock_t.patch b/media-sound/alsa-driver/files/alsa-driver-0.9.5-spinlock_t.patch
deleted file mode 100644
index 39a409c3e1f3..000000000000
--- a/media-sound/alsa-driver/files/alsa-driver-0.9.5-spinlock_t.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- alsa-driver-0.9.5/include/ak4117.h.spinlock_t	2003-07-15 13:05:22.000000000 +0200
-+++ alsa-driver-0.9.5/include/ak4117.h	2003-07-15 13:05:37.000000000 +0200
-@@ -163,7 +163,7 @@
- 	ak4117_read_t * read;
- 	void * private_data;
- 	unsigned int init: 1;
--	spinlock_t * lock;
-+	spinlock_t  lock;
- 	unsigned char regmap[5];
- 	snd_kcontrol_t *kctls[AK4117_CONTROLS];
- 	snd_pcm_substream_t *substream;
---- alsa-driver-0.9.5/pcmcia/pdaudiocf/pdaudiocf_core.c.spinlock_t	2003-07-15 13:42:27.000000000 +0200
-+++ alsa-driver-0.9.5/pcmcia/pdaudiocf/pdaudiocf_core.c	2003-07-15 13:42:39.000000000 +0200
-@@ -133,8 +133,7 @@
- 	if (chip == NULL)
- 		return NULL;
- 	chip->card = card;
--	spin_lock_init(&chip->lock);
--	spin_lock_init(&chip->irq_lock);
-+	spin_lock_init(&chip->reg_lock);
- 	spin_lock_init(&chip->ak4117_lock);
- 	tasklet_init(&chip->tq, pdacf_tasklet, (unsigned long)chip);
- 	card->private_data = chip;
---- alsa-driver-0.9.5/pcmcia/pdaudiocf/pdaudiocf_pcm.c.spinlock_t	2003-07-15 13:43:56.000000000 +0200
-+++ alsa-driver-0.9.5/pcmcia/pdaudiocf/pdaudiocf_pcm.c	2003-07-15 13:44:13.000000000 +0200
-@@ -126,7 +126,7 @@
- 	tmp |= val;
- 	pdacf_reg_write(chip, PDAUDIOCF_REG_SCR, tmp);
-       __end:
--	spin_unlock(&chip_reg_lock);
-+	spin_unlock(&chip->reg_lock);
- 	if (cmd == SNDRV_PCM_TRIGGER_STOP)
- 		pdacf_reinit(chip, 0);
- 	snd_ak4117_check_rate_and_errors(chip->ak4117, AK4117_CHECK_NO_RATE);
diff --git a/media-sound/alsa-driver/files/alsa-driver-0.9.7-pde.patch b/media-sound/alsa-driver/files/alsa-driver-0.9.7-pde.patch
deleted file mode 100644
index 8ab6291996e0..000000000000
--- a/media-sound/alsa-driver/files/alsa-driver-0.9.7-pde.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- configure.in.org	2003-10-24 16:26:20.000000000 +0000
-+++ configure.in	2003-10-24 16:26:47.000000000 +0000
-@@ -1029,10 +1029,11 @@
- #include "$CONFIG_SND_KERNELDIR/include/linux/fs.h"
- #include "$CONFIG_SND_KERNELDIR/include/linux/proc_fs.h"
- ],[
--	PDE(NULL);
-+    struct proc_dir_entry * (*func)();
-+    func = PDE;
- ],
--    AC_MSG_RESULT("no");pde_defined="0",
-     AC_MSG_RESULT("yes");pde_defined="1",
-+    AC_MSG_RESULT("no");pde_defined="0",
-     AC_MSG_RESULT("unknown");pde_defined="0"
- )
- CFLAGS=$ac_save_CFLAGS
diff --git a/media-sound/alsa-driver/files/digest-alsa-driver-1.0.0_rc2 b/media-sound/alsa-driver/files/digest-alsa-driver-1.0.0_rc2
deleted file mode 100644
index a5fc29ef8e01..000000000000
--- a/media-sound/alsa-driver/files/digest-alsa-driver-1.0.0_rc2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d19c793d87c94350a849302b0b6bf151 alsa-driver-1.0.0rc2.tar.bz2 1660662
diff --git a/media-sound/alsa-driver/files/digest-alsa-driver-1.0.1 b/media-sound/alsa-driver/files/digest-alsa-driver-1.0.1
deleted file mode 100644
index 92e8c30a232f..000000000000
--- a/media-sound/alsa-driver/files/digest-alsa-driver-1.0.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9a0266f25bb0ba563727ee2f107aeb4a alsa-driver-1.0.1.tar.bz2 1662258
diff --git a/media-sound/alsa-driver/files/wolk.patch b/media-sound/alsa-driver/files/wolk.patch
deleted file mode 100644
index 8e8f1eb0c103..000000000000
--- a/media-sound/alsa-driver/files/wolk.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- alsa-driver-0.9.6_old/include/adriver.h	2003-07-03 13:36:16.000000000 +0200
-+++ alsa-driver-0.9.6_new/include/adriver.h	2003-09-03 19:38:00.000000000 +0200
-@@ -121,7 +121,7 @@
- #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 5, 3) && !defined(need_resched)
- #define need_resched() (current->need_resched)
- #endif
--#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 5, 4)
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 5, 4) && !defined(WE_ARE_WOLKS)
- #include <linux/fs.h>
- static inline struct proc_dir_entry *PDE(const struct inode *inode)
- {
-@@ -193,7 +193,7 @@
- #undef synchronize_irq
- #define synchronize_irq(irq)	synchronize_irq_wrapper(irq)
- #endif /* LINUX_VERSION_CODE < 2.5.28 */
--#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 5, 68)
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 5, 68) && !defined(WE_ARE_WOLKS)
- #define IRQ_NONE	/*void*/
- #define IRQ_HANDLED	/*void*/
- #define IRQ_RETVAL(x)	/*void*/