Remove latest old version, remove stale patches, and re-add a needed one.

(Portage version: 2.1.2_rc3-r9)
 (Signed Manifest commit)

5 files changed, 30 insertions, 235 deletions

diff --git a/media-sound/alsa-driver/Manifest b/media-sound/alsa-driver/Manifest
index 70cfa0dea745..e7b4ecbcb15e 100644
--- a/media-sound/alsa-driver/Manifest
+++ b/media-sound/alsa-driver/Manifest
@@ -1,41 +1,32 @@
-AUX alsa-driver-1.0.10_rc1-include.patch 346 RMD160 ec6016414723673e089a4c8cda7e7efe54904280 SHA1 7cb825c81df6ba73bf8d2a1ad15f0ba898fd7fa7 SHA256 ad4f3c447e3b0f2b0ebdd5dfa9723875660b58210ddab7fc6fbb669d4628135d
-MD5 ed352c464a295465543d8933c162f101 files/alsa-driver-1.0.10_rc1-include.patch 346
-RMD160 ec6016414723673e089a4c8cda7e7efe54904280 files/alsa-driver-1.0.10_rc1-include.patch 346
-SHA256 ad4f3c447e3b0f2b0ebdd5dfa9723875660b58210ddab7fc6fbb669d4628135d files/alsa-driver-1.0.10_rc1-include.patch 346
-AUX alsa-driver-mcp55.patch 714 RMD160 2dbbb2693e2726cdf9488244311003e4415b0bb7 SHA1 df6796469607af6761eb6f7d25970c3ed8f3d646 SHA256 208dd634215c50020f0d5b11d2ff16962c07e53f007b73d4aa0aa2b5ac54074e
-MD5 3918ed83387e69901058ac589dbbb697 files/alsa-driver-mcp55.patch 714
-RMD160 2dbbb2693e2726cdf9488244311003e4415b0bb7 files/alsa-driver-mcp55.patch 714
-SHA256 208dd634215c50020f0d5b11d2ff16962c07e53f007b73d4aa0aa2b5ac54074e files/alsa-driver-mcp55.patch 714
-DIST alsa-driver-1.0.12.tar.bz2 2400785 RMD160 426d0243dab046879cfac0c1010774d387ca4e09 SHA1 8e4c23af7b6255107edf7b0bd8d9ad9dc549193c SHA256 08c2d9a426b646fbbdffbe708994af33c3cad90a42fff2ad004bcc8a97252bc1
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX alsa-driver-1.0.11-kernel-2.6.17.patch 953 RMD160 8790da12c78912a4dec53f287838846e303a18dd SHA1 71b552329bc6ab179956b3f7d65f92fa393dec4c SHA256 517f494c5fe3039d62a18268f2c3d03cbcd6b2bff09771bfaafd439c39642c2c
+MD5 5e6246cc8148d4938810985fef9fc6c2 files/alsa-driver-1.0.11-kernel-2.6.17.patch 953
+RMD160 8790da12c78912a4dec53f287838846e303a18dd files/alsa-driver-1.0.11-kernel-2.6.17.patch 953
+SHA256 517f494c5fe3039d62a18268f2c3d03cbcd6b2bff09771bfaafd439c39642c2c files/alsa-driver-1.0.11-kernel-2.6.17.patch 953
 DIST alsa-driver-1.0.13.tar.bz2 2404965 RMD160 cf17c49563321620c7c1037f6087c85b69278b12 SHA1 fd1534fc90098d05f878c8fef26125be9fd97d52 SHA256 91c37a7e2575cb44bc53cf9c13e2049db73d257242e4d6ab55150a0f704b84d3
 DIST alsa-driver-1.0.14rc1.tar.bz2 2515938 RMD160 83f18e77bcd28e1eaccd66967de0dab0bfa84106 SHA1 2f815ac95c47eabf18c5ba0d0b1094249a5a5965 SHA256 09318cc3cc5bcf2eb69c1d75e2e045f625b8756d4879e5c2c0a1f3951524766d
-EBUILD alsa-driver-1.0.12.ebuild 5158 RMD160 a395fffd3fb5b43085e9ef2f2e0b9ef4a0c7ae9c SHA1 a364f69feb4d7a519f9604d5c1b6fa8294e56ee4 SHA256 b6d1387053e35b0af9a6018982d6918298f34d295acc65cb75824b8d5b962125
-MD5 20e195d1ede8a7ab2b7a29727f82a2eb alsa-driver-1.0.12.ebuild 5158
-RMD160 a395fffd3fb5b43085e9ef2f2e0b9ef4a0c7ae9c alsa-driver-1.0.12.ebuild 5158
-SHA256 b6d1387053e35b0af9a6018982d6918298f34d295acc65cb75824b8d5b962125 alsa-driver-1.0.12.ebuild 5158
-EBUILD alsa-driver-1.0.13.ebuild 5157 RMD160 6e4d4c1b99d6dbf162d58011397c1ead0b423a65 SHA1 cef146534461ac78255824c93aef84202cbdc10f SHA256 0bb60119005b82cdd489274f6b4f7a77ab9fbed30333c539ff777938cba50513
-MD5 08f089a2602aee991f595177d1d131c4 alsa-driver-1.0.13.ebuild 5157
-RMD160 6e4d4c1b99d6dbf162d58011397c1ead0b423a65 alsa-driver-1.0.13.ebuild 5157
-SHA256 0bb60119005b82cdd489274f6b4f7a77ab9fbed30333c539ff777938cba50513 alsa-driver-1.0.13.ebuild 5157
-EBUILD alsa-driver-1.0.14_rc1.ebuild 6914 RMD160 e9c517be4e02d52119ff608b01e333b01fe6c493 SHA1 cbf8d524c7e411a490c7bb8dd49290aa120af757 SHA256 0cde9407eb5a5dadbf249d76d9c249c127a9bdc9194a7825600d12bcce5659ee
-MD5 f7e1fdd9bd97c752294cd60ae9e680a3 alsa-driver-1.0.14_rc1.ebuild 6914
-RMD160 e9c517be4e02d52119ff608b01e333b01fe6c493 alsa-driver-1.0.14_rc1.ebuild 6914
-SHA256 0cde9407eb5a5dadbf249d76d9c249c127a9bdc9194a7825600d12bcce5659ee alsa-driver-1.0.14_rc1.ebuild 6914
-EBUILD alsa-driver-9999.ebuild 4939 RMD160 ffc8cdac211e2136904639fe54c9aca242c3d7a9 SHA1 7fcb2126ef4c538a3128c954172652283310bf99 SHA256 92c3eea9df5cc7a53049d601098f0f296a01dd7f69e76ad1b874c2e9896ad22c
-MD5 c34a52c4d50bc207111ac34f68f82cdb alsa-driver-9999.ebuild 4939
-RMD160 ffc8cdac211e2136904639fe54c9aca242c3d7a9 alsa-driver-9999.ebuild 4939
-SHA256 92c3eea9df5cc7a53049d601098f0f296a01dd7f69e76ad1b874c2e9896ad22c alsa-driver-9999.ebuild 4939
-MISC ChangeLog 42726 RMD160 794bd29ff762037e3ff6bef1b9ec06cf3ba516c6 SHA1 e1330345219a75fa6728689bc14c3f5b637056aa SHA256 58d536d3b168e0cb191e7651b06bc9779ec89166cff620d4268850612cfc267e
-MD5 b7a2de6009291005819b57f971713fda ChangeLog 42726
-RMD160 794bd29ff762037e3ff6bef1b9ec06cf3ba516c6 ChangeLog 42726
-SHA256 58d536d3b168e0cb191e7651b06bc9779ec89166cff620d4268850612cfc267e ChangeLog 42726
+EBUILD alsa-driver-1.0.13.ebuild 5065 RMD160 d9794eae68f06e8127f334d4fbf4f86e3bc1ca8f SHA1 f17166d56e9f48cebe0ae93f03ceb980f089756d SHA256 503ea89b408704a0d58b5f35988adc884795c40ab10dd94759ce91894b1249fd
+MD5 e7e2a6a1f49879c3c8920d2542d33454 alsa-driver-1.0.13.ebuild 5065
+RMD160 d9794eae68f06e8127f334d4fbf4f86e3bc1ca8f alsa-driver-1.0.13.ebuild 5065
+SHA256 503ea89b408704a0d58b5f35988adc884795c40ab10dd94759ce91894b1249fd alsa-driver-1.0.13.ebuild 5065
+EBUILD alsa-driver-1.0.14_rc1.ebuild 6819 RMD160 e6b84ee9f1ba7b0027a898b09ba1716bdc547e4a SHA1 e9512b5eee157e137154d06d45260cd09dad84e5 SHA256 a6d338fa2233b8bbdfd8900abef7f87af9f87e8d42d5102defe1c16a0ac22a85
+MD5 2192f6ba973e3e3fde0b4714b16a7da8 alsa-driver-1.0.14_rc1.ebuild 6819
+RMD160 e6b84ee9f1ba7b0027a898b09ba1716bdc547e4a alsa-driver-1.0.14_rc1.ebuild 6819
+SHA256 a6d338fa2233b8bbdfd8900abef7f87af9f87e8d42d5102defe1c16a0ac22a85 alsa-driver-1.0.14_rc1.ebuild 6819
+EBUILD alsa-driver-9999.ebuild 4833 RMD160 428db274715f43b3f617bee7a1ee089c4362c6c7 SHA1 230739968d5438300e6417ebb0019c497e2c59d4 SHA256 c083edd17448cf57235c22757ed40cd688a291af79e8ce6782b7b366d8e52909
+MD5 d6a4945817218998f012b0e934eefe76 alsa-driver-9999.ebuild 4833
+RMD160 428db274715f43b3f617bee7a1ee089c4362c6c7 alsa-driver-9999.ebuild 4833
+SHA256 c083edd17448cf57235c22757ed40cd688a291af79e8ce6782b7b366d8e52909 alsa-driver-9999.ebuild 4833
+MISC ChangeLog 43104 RMD160 74e0c9bb86541a7ccb6bf6bd951ec7fe21a2239c SHA1 ecde5f234b7c69594a9f44215383168e1be46b25 SHA256 b270f19aa69825a041df5ce39066a539133c88be925fc4f133db8af2093bae2c
+MD5 e33c1cb56f10bf1a211dde7d770a3657 ChangeLog 43104
+RMD160 74e0c9bb86541a7ccb6bf6bd951ec7fe21a2239c ChangeLog 43104
+SHA256 b270f19aa69825a041df5ce39066a539133c88be925fc4f133db8af2093bae2c ChangeLog 43104
 MISC metadata.xml 220 RMD160 e49f8bb330d1798cd2c8ee5335cef1784f0d7ccb SHA1 1b895fe6cae4b8eab08ba1a6a1212baf4b4b4105 SHA256 8570ef11cd59b0d8edb71e78eecaec423616836b10eacb86bee0de941f0ae054
 MD5 7c52acc7d4fe40bac97d3198a43dcbd6 metadata.xml 220
 RMD160 e49f8bb330d1798cd2c8ee5335cef1784f0d7ccb metadata.xml 220
 SHA256 8570ef11cd59b0d8edb71e78eecaec423616836b10eacb86bee0de941f0ae054 metadata.xml 220
-MD5 4b1e19d8f01d2241c557f5dce0100587 files/digest-alsa-driver-1.0.12 262
-RMD160 ab82f746b4ea2579f0da3e76c2785021519d16c0 files/digest-alsa-driver-1.0.12 262
-SHA256 34b56f728a398a64beed2b762914cc50d8347a67f406109da576294ab15186aa files/digest-alsa-driver-1.0.12 262
 MD5 22b201fa4a4e6f6c844b7a469072daf0 files/digest-alsa-driver-1.0.13 262
 RMD160 cc71e221ac628aa73cc60f3df7a43301ac78999b files/digest-alsa-driver-1.0.13 262
 SHA256 45a8c562fbfcf8f05cb4ff799d55c3aa6506ef33539cbfd159a9d24bd634f553 files/digest-alsa-driver-1.0.13 262
@@ -45,3 +36,10 @@ SHA256 2fcc9c3a03d7cb5056f3254204a82ed8d48ff5c5c58a8447ebeeb609654fb4c8 files/di
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-alsa-driver-9999 0
 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-alsa-driver-9999 0
 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-alsa-driver-9999 0
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQFFiq8RAiZjviIA2XgRAjSLAKC7dYRUjj7lUom1Grn8en32uRFipACfY6EP
+IzqzUHDEopkOe+74sYm0cyE=
+=Mlbb
+-----END PGP SIGNATURE-----
diff --git a/media-sound/alsa-driver/alsa-driver-1.0.12.ebuild b/media-sound/alsa-driver/alsa-driver-1.0.12.ebuild
deleted file mode 100644
index 1a2bf081f51b..000000000000
--- a/media-sound/alsa-driver/alsa-driver-1.0.12.ebuild
+++ /dev/null
@@ -1,179 +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.12.ebuild,v 1.6 2006/10/18 05:15:33 tsunam Exp $
-
-inherit linux-mod flag-o-matic eutils multilib
-
-MY_P="${P/_rc/rc}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Advanced Linux Sound Architecture kernel modules"
-HOMEPAGE="http://www.alsa-project.org/"
-SRC_URI="mirror://alsaproject/driver/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-
-KEYWORDS="alpha ~amd64 ia64 ~mips ppc ppc64 x86"
-IUSE="oss doc debug"
-
-RDEPEND="virtual/modutils
-	 ~media-sound/alsa-headers-${PV}
-	 !media-sound/snd-aoa"
-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
-
-		# Ignore PNP checks for ppc architecture, as PNP can't be enabled there.
-		if [[ ${ARCH} != "ppc" ]]; then
-			CONFIG_CHECK="${CONFIG_CHECK} PNP"
-		fi
-	else
-		for pnpdriver in ${PNP_DRIVERS}; do
-			hasq ${pnpdriver} ${ALSA_CARDS} && CONFIG_CHECK="${CONFIG_CHECK} PNP"
-		done
-	fi
-
-	linux-mod_pkg_setup
-
-	if [[ ${PROFILE_ARCH} == "sparc64" ]] ; then
-		export CBUILD=${CBUILD-${CHOST}}
-		export CHOST="sparc64-unknown-linux-gnu"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-
-	epatch "${FILESDIR}/${PN}-1.0.10_rc1-include.patch"
-
-	epatch "${FILESDIR}/${PN}-mcp55.patch"
-
-	if kernel_is ge 2 6 17 ; then
-		# These are needed for some drivers to build with kernel 2.6.17
-		# until a refreshed release of alsa-driver is done
-		epatch "${FILESDIR}/${PN}-1.0.11-kernel-2.6.17.patch"
-
-		# asihpi driver is broken, skip it until upstream releases something
-		# working.
-		sed -i -e 's:asihpi/::' "${S}/pci/Makefile"
-	fi
-
-	convert_to_m "${S}/Makefile"
-	sed -i -e 's:\(.*depmod\):#\1:' "${S}/Makefile"
-}
-
-src_compile() {
-	local myABI=${ABI:-${DEFAULT_ABI}}
-
-	# Should fix bug #46901
-	is-flag "-malign-double" && filter-flags "-fomit-frame-pointer"
-	append-flags "-I${KV_DIR}/arch/$(tc-arch-kernel)/include"
-
-	econf $(use_with oss) \
-		$(use_with debug debug full) \
-		--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
-
-	ARCH=$(tc-arch-kernel)
-	ABI=${KERNEL_ABI}
-	emake LDFLAGS="$(raw-ldflags)" HOSTCC=$(tc-getBUILD_CC) CC=$(tc-getCC) || die "Make Failed"
-	ARCH=$(tc-arch)
-	ABI=${myABI}
-
-	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() {
-	emake DESTDIR=${D} install-modules || die "make install failed"
-
-	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/alsa-driver-1.0.10_rc1-include.patch b/media-sound/alsa-driver/files/alsa-driver-1.0.10_rc1-include.patch
deleted file mode 100644
index b75dd50f7bc4..000000000000
--- a/media-sound/alsa-driver/files/alsa-driver-1.0.10_rc1-include.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- alsa-kernel/pci/ac97/ac97_bus.c.old	2005-08-25 05:46:13.232161352 +0900
-+++ alsa-kernel/pci/ac97/ac97_bus.c	2005-08-25 05:46:36.326650456 +0900
-@@ -11,7 +11,7 @@
-  * (at your option) any later version.
-  */
- 
--#include <linux/module.h>
-+#include <sound/driver.h>
- #include <linux/init.h>
- #include <linux/device.h>
- #include <linux/string.h>
diff --git a/media-sound/alsa-driver/files/alsa-driver-mcp55.patch b/media-sound/alsa-driver/files/alsa-driver-mcp55.patch
deleted file mode 100644
index d95b86440dcf..000000000000
--- a/media-sound/alsa-driver/files/alsa-driver-mcp55.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- alsa-kernel/pci/intel8x0.c	2006-06-22 12:24:28.000000000 -0400
-+++ alsa-kernel/pci/intel8x0.c.new	2006-06-30 22:37:14.000000000 -0400
-@@ -434,6 +434,7 @@
- 	{ 0x10de, 0x00da, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_NFORCE },	/* NFORCE3 */
- 	{ 0x10de, 0x00ea, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_NFORCE },	/* CK8S */
- 	{ 0x10de, 0x026b, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_NFORCE },	/* MCP51 */
-+	{ 0x10de, 0x0371, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_NFORCE },	/* MCP55 */
- 	{ 0x1022, 0x746d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL },	/* AMD8111 */
- 	{ 0x1022, 0x7445, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL },	/* AMD768 */
- 	{ 0x10b9, 0x5455, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_ALI },   /* Ali5455 */
diff --git a/media-sound/alsa-driver/files/digest-alsa-driver-1.0.12 b/media-sound/alsa-driver/files/digest-alsa-driver-1.0.12
deleted file mode 100644
index 1609a7eb7ee7..000000000000
--- a/media-sound/alsa-driver/files/digest-alsa-driver-1.0.12
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 3af21876a3cb4de1e72d39adff0a145b alsa-driver-1.0.12.tar.bz2 2400785
-RMD160 426d0243dab046879cfac0c1010774d387ca4e09 alsa-driver-1.0.12.tar.bz2 2400785
-SHA256 08c2d9a426b646fbbdffbe708994af33c3cad90a42fff2ad004bcc8a97252bc1 alsa-driver-1.0.12.tar.bz2 2400785