Drop old version, FILESDIR cleanup.

Package-Manager: portage-2529-svn

8 files changed, 12 insertions, 263 deletions

diff --git a/media-sound/alsa-driver/ChangeLog b/media-sound/alsa-driver/ChangeLog
index 480f5fb3a6c5..98e6897e02a6 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-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/ChangeLog,v 1.186 2006/01/10 19:46:55 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/ChangeLog,v 1.187 2006/01/11 15:33:16 flameeyes Exp $
+
+  11 Jan 2006; Diego Pettenò <flameeyes@gentoo.org>
+  -files/xbox-1.0.8.patch,
+  -files/alsa-driver-1.0.9b-sparc64-ioctl-detect.patch,
+  -files/1.0.8-msi_audigyls.patch,
+  -files/alsa-driver-1.0.10_rc2-audigy2zs.patch, -alsa-driver-1.0.9b.ebuild:
+  Drop old version, FILESDIR cleanup.
 
   10 Jan 2006; Diego Pettenò <flameeyes@gentoo.org>
   alsa-driver-1.0.11_rc2.ebuild:
diff --git a/media-sound/alsa-driver/Manifest b/media-sound/alsa-driver/Manifest
index a3a1f81f0d84..88f01bc79fac 100644
--- a/media-sound/alsa-driver/Manifest
+++ b/media-sound/alsa-driver/Manifest
@@ -1,33 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 86a2eccb4e13cbb1e45a4161da36728f ChangeLog 32225
+MD5 6fc4c25b2e441c776bd78aecaa6751bf ChangeLog 32512
 MD5 4d36586e82b663b31cef834a9fa0d38b alsa-driver-1.0.10-r1.ebuild 4720
 MD5 ebd180c4a898e9bf0fe0cb8f9dc2b0d6 alsa-driver-1.0.10.ebuild 4620
 MD5 05d84ba8681d1e857e581caf97e6db59 alsa-driver-1.0.10_rc3.ebuild 4675
 MD5 6b7004043027c26fec7e40de8edcb77d alsa-driver-1.0.11_rc2.ebuild 4856
 MD5 35dddcb56c05ef64f654c2d1172c4ee8 alsa-driver-1.0.3.ebuild 3315
-MD5 62ebbf151305f21e16788535ec83b40d alsa-driver-1.0.9b.ebuild 4551
-MD5 5445a523e0e8aa31b9f293b1ac380b37 files/1.0.8-msi_audigyls.patch 1771
 MD5 8c120f7730b91118d0a8148d2deb3a43 files/alsa-driver-0.9.8-au-fix.patch 1267
 MD5 11884fe8b770282d2470c5620622e379 files/alsa-driver-1.0.10-oops.patch 1388
 MD5 ed352c464a295465543d8933c162f101 files/alsa-driver-1.0.10_rc1-include.patch 346
-MD5 2f9a74cca5e78c63142073f0c90b9ff8 files/alsa-driver-1.0.10_rc2-audigy2zs.patch 460
 MD5 f6a0e5f4624041d23bbd60726331310e files/alsa-driver-1.0.10_rc3-ppc-unbreakage.patch 2957
-MD5 be4912a88e538a1f620b2fd422859ef6 files/alsa-driver-1.0.9b-sparc64-ioctl-detect.patch 513
 MD5 5474546fa4977a1fa63fbab0a155fd15 files/digest-alsa-driver-1.0.10 72
 MD5 5474546fa4977a1fa63fbab0a155fd15 files/digest-alsa-driver-1.0.10-r1 72
 MD5 ad7631557a0317471d29e4c26cfb4cf2 files/digest-alsa-driver-1.0.10_rc3 75
 MD5 855ac1fe064602102d683b3396a7c582 files/digest-alsa-driver-1.0.11_rc2 75
 MD5 938a2ee36c54416322d1acd47b249c99 files/digest-alsa-driver-1.0.3 71
-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)
 
-iD8DBQFDxA9AAiZjviIA2XgRAizdAJ9WqNJ64FPJCAlm7JmyfPJhB78wcwCgl7ba
-eHa2r/9cauRL9zNIogFzRzU=
-=G52H
+iD8DBQFDxSVVAiZjviIA2XgRAioOAJ9qE0+TlePZf1oUtI8xoTW3FIGIXwCgrge5
+PFHFllF1iqhPk43zt1zqD0c=
+=68YN
 -----END PGP SIGNATURE-----
diff --git a/media-sound/alsa-driver/alsa-driver-1.0.9b.ebuild b/media-sound/alsa-driver/alsa-driver-1.0.9b.ebuild
deleted file mode 100644
index b1cc2197e02e..000000000000
--- a/media-sound/alsa-driver/alsa-driver-1.0.9b.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2006 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.9b.ebuild,v 1.12 2006/01/10 15:09:47 gustavoz Exp $
-
-inherit linux-mod flag-o-matic eutils
-
-DESCRIPTION="Advanced Linux Sound Architecture kernel modules"
-HOMEPAGE="http://www.alsa-project.org/"
-SRC_URI="mirror://alsaproject/driver/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-
-KEYWORDS="alpha amd64 ~ia64 ~mips ppc ppc64 ~sparc x86"
-IUSE="oss doc"
-
-RDEPEND="virtual/modutils
-	 ~media-sound/alsa-headers-${PV}"
-DEPEND="${RDEPEND}
-	virtual/linux-sources
-	sparc? ( >=sys-devel/autoconf-2.50 )
-	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:-all}
-
-	# Which drivers need PNP
-	local PNP_DRIVERS="interwave interwave-stb"
-
-	CONFIG_CHECK="SOUND"
-	SND_ERROR="ALSA is already compiled into the kernel."
-	SOUND_ERROR="Your kernel doesn't have sound support enabled."
-	SOUND_PRIME_ERROR="Your kernel is configured to use the deprecated OSS drivers.  Please disable them and re-emerge alsa-driver."
-	PNP_ERROR="Some of the drivers you selected require PNP in your kernel (${PNP_DRIVERS}).  Either enable PNP in your kernel or trim which drivers get compiled using ALSA_CARDS in /etc/make.conf."
-
-	if [[ "${ALSA_CARDS}" == "all" ]]; then
-		CONFIG_CHECK="${CONFIG_CHECK} PNP"
-	else
-		for pnpdriver in ${PNP_DRIVERS}; do
-			hasq ${pnpdriver} ${ALSA_CARDS} && CONFIG_CHECK="${CONFIG_CHECK} PNP"
-		done
-	fi
-
-	linux-mod_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-
-	if use sparc ; then
-		epatch ${FILESDIR}/alsa-driver-1.0.9b-sparc64-ioctl-detect.patch
-		WANT_AUTOCONF=2.5 autoconf || die
-	fi
-
-	convert_to_m ${S}/Makefile
-}
-
-src_compile() {
-	# Should fix bug #46901
-	is-flag "-malign-double" && filter-flags "-fomit-frame-pointer"
-
-	econf $(use_with oss) \
-		--with-kernel="${KV_DIR}" \
-		--with-build="${KV_OUT_DIR}" \
-		--with-isapnp=yes \
-		--with-sequencer=yes \
-		--with-cards="${ALSA_CARDS}" || die "econf failed"
-
-	# linux-mod_src_compile doesn't work well with alsa
-
-	# -j1 : see bug #71028
-	ARCH=$(tc-arch-kernel)
-	emake -j1 || die "Make Failed"
-	ARCH=$(tc-arch)
-
-	if use doc;
-	then
-		ebegin "Building Documentation"
-		cd ${S}/scripts
-		emake || die Failed making docs in ${S}/scripts
-
-		cd ${S}/doc/DocBook
-		emake || die Failed making docs in ${S}/doc/DocBook
-		eend $?
-	fi
-}
-
-
-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
-	test -e ${D}/etc/init.d/alsasound && rm ${D}/etc/init.d/alsasound
-	test -e ${D}/etc/rc.d/init.d/alsasound && rm ${D}/etc/rc.d/init.d/alsasound
-
-	dodoc CARDS-STATUS FAQ README WARNING TODO
-
-	if use doc; then
-		docinto doc
-		dodoc doc/*
-		rm ${D}/usr/share/doc/${PF}/doc/Makefile.gz
-
-		docinto DocBook
-		dodoc doc/DocBook/*
-		rm ${D}/usr/share/doc/${PF}/DocBook/Makefile.gz
-
-		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 &> /dev/null
-	fi
-}
-
-pkg_postinst() {
-	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
-	einfo "Version 1.0.3 and above should work with version 2.6 kernels."
-	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:"
-	einfo "http://www.gentoo.org/doc/en/alsa-guide.xml"
-
-	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
-
-		for dir in $(find ${ROOT}/lib/modules/${KV_FULL}/kernel/sound -type d | tac); do
-			rmdir ${dir} &> /dev/null
-		done
-	fi
-}
diff --git a/media-sound/alsa-driver/files/1.0.8-msi_audigyls.patch b/media-sound/alsa-driver/files/1.0.8-msi_audigyls.patch
deleted file mode 100644
index 3e39e51b8a59..000000000000
--- a/media-sound/alsa-driver/files/1.0.8-msi_audigyls.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- alsa-driver-1.0.8/alsa-kernel/pci/ca0106/ca0106_main.c	2005-01-04 14:55:46.000000000 +0100
-+++ /home/sdl/ca0106_main.c	2005-02-11 22:11:46.000000000 +0100
-@@ -169,6 +169,7 @@
- 	 { 0x10051102, "AudigyLS [SB0310b]"} , /* Unknown AudigyLS that also says SB0310 on it */
- 	 { 0x10061102, "Live! 7.1 24bit [SB0410]"} , /* New Sound Blaster Live! 7.1 24bit. This does not have an AC97. 53SB041000001 */
- 	 { 0x10071102, "Live! 7.1 24bit [SB0413]"} , /* New Dell Sound Blaster Live! 7.1 24bit. This does not have an AC97.  */
-+	 { 0x10091462, "AudigyLS by MSI [SB0438]"}, /* MSI SB Audigy2LS without AC97 */
- 	 { 0, "AudigyLS [Unknown]" }
- };
- 
-@@ -1133,7 +1134,9 @@
-         snd_ca0106_ptr_write(chip, CAPTURE_SOURCE, 0x0, 0x333300e4); /* Select MIC, Line in, TAD in, AUX in */
- 	chip->capture_source = 3; /* Set CAPTURE_SOURCE */
- 
--        if ((chip->serial == 0x10061102) || (chip->serial == 0x10071102) ) { /* The SB0410 and SB0413 use GPIO differently. */
-+        if ((chip->serial == 0x10061102) || 
-+	    (chip->serial == 0x10071102) ||
-+	    (chip->serial == 0x10091462)) { /* The SB0410 and SB0413 use GPIO differently. */
- 		/* FIXME: Still need to find out what the other GPIO bits do. E.g. For digital spdif out. */
- 		outl(0x0, chip->port+GPIO);
- 		//outl(0x00f0e000, chip->port+GPIO); /* Analog */
-@@ -1200,7 +1203,9 @@
- 		snd_card_free(card);
- 		return err;
- 	}
--        if ((chip->serial != 0x10061102) && (chip->serial != 0x10071102) ) { /* The SB0410 and SB0413 do not have an ac97 chip. */
-+        if ((chip->serial != 0x10061102) && 
-+	    (chip->serial != 0x10071102) && 
-+	    (chip->serial != 0x10091462) ) { /* The SB0410 and SB0413 do not have an ac97 chip. */
- 		if ((err = snd_ca0106_ac97(chip)) < 0) {
- 			snd_card_free(card);
- 			return err;
diff --git a/media-sound/alsa-driver/files/alsa-driver-1.0.10_rc2-audigy2zs.patch b/media-sound/alsa-driver/files/alsa-driver-1.0.10_rc2-audigy2zs.patch
deleted file mode 100644
index cf539b47330f..000000000000
--- a/media-sound/alsa-driver/files/alsa-driver-1.0.10_rc2-audigy2zs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- alsa-kernel/include/emu10k1.h.old	2005-10-24 10:50:25.000000000 +0200
-+++ alsa-kernel/include/emu10k1.h	2005-10-24 10:49:06.000000000 +0200
-@@ -48,7 +48,7 @@
- 
- /* FIXME? - according to the OSS driver the EMU10K1 needs a 29 bit DMA mask */
- #define EMU10K1_DMA_MASK	0x7fffffffUL	/* 31bit */
--#define AUDIGY_DMA_MASK		0xffffffffUL	/* 32bit */
-+#define AUDIGY_DMA_MASK		0x7fffffffUL	/* 32bit */
- 
- #define TMEMSIZE        256*1024
- #define TMEMSIZEREG     4
diff --git a/media-sound/alsa-driver/files/alsa-driver-1.0.9b-sparc64-ioctl-detect.patch b/media-sound/alsa-driver/files/alsa-driver-1.0.9b-sparc64-ioctl-detect.patch
deleted file mode 100644
index 61ab47540e1b..000000000000
--- a/media-sound/alsa-driver/files/alsa-driver-1.0.9b-sparc64-ioctl-detect.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Naurp alsa-driver-1.0.9b.orig/configure.in alsa-driver-1.0.9b/configure.in
---- alsa-driver-1.0.9b.orig/configure.in	2005-06-07 05:27:46.000000000 -0700
-+++ alsa-driver-1.0.9b/configure.in	2005-07-18 22:58:40.000000000 -0700
-@@ -2042,6 +2042,10 @@ if test "$kversion.$kpatchlevel" = "2.6"
-   ac_save_CFLAGS="$CFLAGS"
-   ac_save_CC="$CC"
-   CFLAGS="$KERNEL_CHECK_CFLAGS -Werror"
-+  if test -n "$CONFIG_SPARC64"; then
-+    CFLAGS="$CFLAGS -ffixed-g4"
-+  fi
-+
-   CC=$KCC
-   AC_TRY_COMPILE([
- #define __KERNEL__
diff --git a/media-sound/alsa-driver/files/digest-alsa-driver-1.0.9b b/media-sound/alsa-driver/files/digest-alsa-driver-1.0.9b
deleted file mode 100644
index 719c2f9128a6..000000000000
--- a/media-sound/alsa-driver/files/digest-alsa-driver-1.0.9b
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8a4e056a22f5c4fa7a9ffc45eaa86cb5 alsa-driver-1.0.9b.tar.bz2 2019617
diff --git a/media-sound/alsa-driver/files/xbox-1.0.8.patch b/media-sound/alsa-driver/files/xbox-1.0.8.patch
deleted file mode 100644
index 17a78c7f4f19..000000000000
--- a/media-sound/alsa-driver/files/xbox-1.0.8.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -cr --exclude=sound alsa-driver-1.0.8.orig/alsa-kernel/pci/ac97/ac97_codec.c alsa-driver-1.0.8/alsa-kernel/pci/ac97/ac97_codec.c
-*** alsa-driver-1.0.8.orig/alsa-kernel/pci/ac97/ac97_codec.c	Tue Jan 11 17:44:52 2005
---- alsa-driver-1.0.8/alsa-kernel/pci/ac97/ac97_codec.c	Sun Apr  3 17:52:06 2005
-***************
-*** 1920,1930 ****
-  	
-  	/* test for AC'97 */
-  	if (!(ac97->scaps & AC97_SCAP_SKIP_AUDIO) && !(ac97->scaps & AC97_SCAP_AUDIO)) {
-! 		/* test if we can write to the record gain volume register */
-! 		snd_ac97_write_cache(ac97, AC97_REC_GAIN, 0x8a06);
-! 		if (((err = snd_ac97_read(ac97, AC97_REC_GAIN)) & 0x7fff) == 0x0a06)
-! 			ac97->scaps |= AC97_SCAP_AUDIO;
-  	}
-  	if (ac97->scaps & AC97_SCAP_AUDIO) {
-  		ac97->caps = snd_ac97_read(ac97, AC97_RESET);
-  		ac97->ext_id = snd_ac97_read(ac97, AC97_EXTENDED_ID);
---- 1920,1935 ----
-  	
-  	/* test for AC'97 */
-  	if (!(ac97->scaps & AC97_SCAP_SKIP_AUDIO) && !(ac97->scaps & AC97_SCAP_AUDIO)) {
-! 	       if ((ac97->scaps & AC97_SCAP_DETECT_BY_VENDOR))
-! 	               ac97->scaps |= AC97_SCAP_AUDIO;
-! 	       else {
-! 	         /* test if we can write to the record gain volume register */
-! 	         snd_ac97_write_cache(ac97, AC97_REC_GAIN, 0x8a06);
-! 	         if (((err = snd_ac97_read(ac97, AC97_REC_GAIN)) & 0x7fff) == 0x0a06)
-! 	                 ac97->scaps |= AC97_SCAP_AUDIO;
-! 	      }
-  	}
-+ 
-  	if (ac97->scaps & AC97_SCAP_AUDIO) {
-  		ac97->caps = snd_ac97_read(ac97, AC97_RESET);
-  		ac97->ext_id = snd_ac97_read(ac97, AC97_EXTENDED_ID);