From: Diego Elio Pettenò <flameeyes@gentoo.org>
Date: Thu, 21 Dec 2006 10:40:56 +0000 (+0000)
Subject: Winter cleaning, so to let arch teams know that they need to hurry up on cleaning... 
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=800d32a34645f13610112e81be82e705a41b4dee;p=gentoo.git

Winter cleaning, so to let arch teams know that they need to hurry up on cleaning after themselves.
Package-Manager: portage-2.1.2_rc3-r8
---

diff --git a/media-sound/alsa-driver/Manifest b/media-sound/alsa-driver/Manifest
index ed3a1bfc48eb..d67be9de69c9 100644
--- a/media-sound/alsa-driver/Manifest
+++ b/media-sound/alsa-driver/Manifest
@@ -1,44 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX alsa-driver-1.0.10-gfp-flags.patch 955 RMD160 ed4d383d6608110c5c3a7ebef2a0fc636ea77d82 SHA1 5bfdc27dbb955b9d2761f6a6ca05c826777c5d24 SHA256 f7976e121aad036e11550212b26f2d4568cc688687e950bcdc14ef5932f3eb66
-MD5 075d7776dfb62176431e206a9cd5fc84 files/alsa-driver-1.0.10-gfp-flags.patch 955
-RMD160 ed4d383d6608110c5c3a7ebef2a0fc636ea77d82 files/alsa-driver-1.0.10-gfp-flags.patch 955
-SHA256 f7976e121aad036e11550212b26f2d4568cc688687e950bcdc14ef5932f3eb66 files/alsa-driver-1.0.10-gfp-flags.patch 955
-AUX alsa-driver-1.0.10-oops.patch 1388 RMD160 c3be6f450c24a0c27a51a2656d49036a06c35220 SHA1 c6556010bb936ead90fba058e5ac250118e0ab68 SHA256 6532594628a77d37eaac2ef6dacd179846f5955915d9696a5ded843b7d017a13
-MD5 11884fe8b770282d2470c5620622e379 files/alsa-driver-1.0.10-oops.patch 1388
-RMD160 c3be6f450c24a0c27a51a2656d49036a06c35220 files/alsa-driver-1.0.10-oops.patch 1388
-SHA256 6532594628a77d37eaac2ef6dacd179846f5955915d9696a5ded843b7d017a13 files/alsa-driver-1.0.10-oops.patch 1388
 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-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
-AUX alsa-driver-1.0.11-powermac.patch 606 RMD160 00cabe7d0c0fb1839edf4718582fcb690920ec50 SHA1 71621053ab9efa1fd1d94108bff3af211edb5161 SHA256 af98ea8acbcdaec4210cd1370eebfdbd750e074600451a7473b26205c70433db
-MD5 781a67b4cfef4c9d809cefb8af2eeda8 files/alsa-driver-1.0.11-powermac.patch 606
-RMD160 00cabe7d0c0fb1839edf4718582fcb690920ec50 files/alsa-driver-1.0.11-powermac.patch 606
-SHA256 af98ea8acbcdaec4210cd1370eebfdbd750e074600451a7473b26205c70433db files/alsa-driver-1.0.11-powermac.patch 606
 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.10.tar.bz2 2194644 RMD160 24cf013e40095d0e143969ce864fb34aff1edefe SHA1 a672c29a156097a3122e2ad1dd2f45f2fcba69e4 SHA256 60fd070075791fff13d3c3682da370b47778a564bc25c1b72f02f1d60ffa98f0
-DIST alsa-driver-1.0.11.tar.bz2 2343130 RMD160 8f6d0d1f61bcf8d62fa5ca1df13accf0cec54650 SHA1 8cb4ca26c656b000cd6258f406a79e4b5022a94f SHA256 c717b8a237e38e17a2c71f3fcde6a89907accd175f8bac4f09c054444e14069f
 DIST alsa-driver-1.0.12.tar.bz2 2400785 RMD160 426d0243dab046879cfac0c1010774d387ca4e09 SHA1 8e4c23af7b6255107edf7b0bd8d9ad9dc549193c SHA256 08c2d9a426b646fbbdffbe708994af33c3cad90a42fff2ad004bcc8a97252bc1
 DIST alsa-driver-1.0.13.tar.bz2 2404965 RMD160 cf17c49563321620c7c1037f6087c85b69278b12 SHA1 fd1534fc90098d05f878c8fef26125be9fd97d52 SHA256 91c37a7e2575cb44bc53cf9c13e2049db73d257242e4d6ab55150a0f704b84d3
-DIST alsa-driver-1.0.14_pre20061130.tar.bz2 7261863 RMD160 026d3e288f91c9cea325394e1656b33a1da2bbe4 SHA1 14da9c81de99b3cd81c476027829cfc9a1b30368 SHA256 ba835bad2864f9d3d83e55c087aca336270b13bde87bad2b72e2636f1798bf1f
 DIST alsa-driver-1.0.14rc1.tar.bz2 2515938 RMD160 83f18e77bcd28e1eaccd66967de0dab0bfa84106 SHA1 2f815ac95c47eabf18c5ba0d0b1094249a5a5965 SHA256 09318cc3cc5bcf2eb69c1d75e2e045f625b8756d4879e5c2c0a1f3951524766d
-EBUILD alsa-driver-1.0.10-r2.ebuild 4791 RMD160 4940a1d64edb487b93b0d29f48d937fa2563c3cc SHA1 805fc601f63c756feda2286f94244d9e63a9bec7 SHA256 bdaa51fefcad30e94b4a663fb64db3aa9eaa089c9162dec3b8236407bd49c2fc
-MD5 9916e84eeec916e6f6ec0f3aeffccb6a alsa-driver-1.0.10-r2.ebuild 4791
-RMD160 4940a1d64edb487b93b0d29f48d937fa2563c3cc alsa-driver-1.0.10-r2.ebuild 4791
-SHA256 bdaa51fefcad30e94b4a663fb64db3aa9eaa089c9162dec3b8236407bd49c2fc alsa-driver-1.0.10-r2.ebuild 4791
-EBUILD alsa-driver-1.0.11.ebuild 5134 RMD160 5cf5632f21ec116d323e2fe19db71bd4ead1ffaf SHA1 17192392a1bb7401d06bbd63882517df02312b6f SHA256 abe0999a1b8ef9b759bc4dbfe24802ff3dc50c45b8d50d7ceb238479add71f73
-MD5 0ca9e75c9aa10f06cf578837ead7c3f7 alsa-driver-1.0.11.ebuild 5134
-RMD160 5cf5632f21ec116d323e2fe19db71bd4ead1ffaf alsa-driver-1.0.11.ebuild 5134
-SHA256 abe0999a1b8ef9b759bc4dbfe24802ff3dc50c45b8d50d7ceb238479add71f73 alsa-driver-1.0.11.ebuild 5134
 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
@@ -47,10 +20,6 @@ EBUILD alsa-driver-1.0.13.ebuild 5160 RMD160 abad5a48b406673f2a8fa62a41415fe4342
 MD5 50ff8f799846587b055c416226461783 alsa-driver-1.0.13.ebuild 5160
 RMD160 abad5a48b406673f2a8fa62a41415fe434299338 alsa-driver-1.0.13.ebuild 5160
 SHA256 497b820de807f9c3812b2e33dc117a9be8f3bbe00db67e31f2800775cdd9e95a alsa-driver-1.0.13.ebuild 5160
-EBUILD alsa-driver-1.0.14_pre20061130.ebuild 6922 RMD160 daca9222bfe443bfaffec9c25911c101bb004a46 SHA1 488a67dc2ecbdc039bd02c1e7683d63bb4416447 SHA256 d167bb4f9ab34d9522fac3017cf0597d17a5e3e421c261b1ca961470b353725f
-MD5 4c8e2c60bcbc9710a792a14710f243b0 alsa-driver-1.0.14_pre20061130.ebuild 6922
-RMD160 daca9222bfe443bfaffec9c25911c101bb004a46 alsa-driver-1.0.14_pre20061130.ebuild 6922
-SHA256 d167bb4f9ab34d9522fac3017cf0597d17a5e3e421c261b1ca961470b353725f alsa-driver-1.0.14_pre20061130.ebuild 6922
 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
@@ -59,29 +28,20 @@ EBUILD alsa-driver-9999.ebuild 4939 RMD160 ffc8cdac211e2136904639fe54c9aca242c3d
 MD5 c34a52c4d50bc207111ac34f68f82cdb alsa-driver-9999.ebuild 4939
 RMD160 ffc8cdac211e2136904639fe54c9aca242c3d7a9 alsa-driver-9999.ebuild 4939
 SHA256 92c3eea9df5cc7a53049d601098f0f296a01dd7f69e76ad1b874c2e9896ad22c alsa-driver-9999.ebuild 4939
-MISC ChangeLog 42183 RMD160 7bec8129520882022203dfb6bd397f2922927baa SHA1 d9260fa1f7bdccddc7133de7796c0c7f3bfc0877 SHA256 e36022b0b283c2e441c7751cff966e62e34200480df0d2bab26409855b54bebb
-MD5 11cb56172d58a0f5a077e7594e0fdd21 ChangeLog 42183
-RMD160 7bec8129520882022203dfb6bd397f2922927baa ChangeLog 42183
-SHA256 e36022b0b283c2e441c7751cff966e62e34200480df0d2bab26409855b54bebb ChangeLog 42183
+MISC ChangeLog 42620 RMD160 ede62ca6dafd8737764fe989d54b7c076a7bb0c6 SHA1 51f5f8ca4108a48f850acd14bbb005859c3f91fb SHA256 f741f8df5f23fd46e6b1f7e304b988db9cb824b01718e0e9bce18b9b1161dae6
+MD5 5483efc11b93952becdb2c9c6cc7fa6a ChangeLog 42620
+RMD160 ede62ca6dafd8737764fe989d54b7c076a7bb0c6 ChangeLog 42620
+SHA256 f741f8df5f23fd46e6b1f7e304b988db9cb824b01718e0e9bce18b9b1161dae6 ChangeLog 42620
 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 d92d5663dd6f93e9e54b6cba30ee0a7b files/digest-alsa-driver-1.0.10-r2 262
-RMD160 8d149dd66b34d17be4162d9316331b4902c54e5f files/digest-alsa-driver-1.0.10-r2 262
-SHA256 1ae6a70927822418fdc319e0f5454b0799cc1c8d49deee5a4660b34d91458f9c files/digest-alsa-driver-1.0.10-r2 262
-MD5 22644311058526795f233aaa7a6fc155 files/digest-alsa-driver-1.0.11 262
-RMD160 daeedeaa4b2d5bfa3dd386358fc231486bc0f895 files/digest-alsa-driver-1.0.11 262
-SHA256 685909b916bf91fe04291a0f9dcb11865ed4efb588efb3b876ec3e367fede2ad files/digest-alsa-driver-1.0.11 262
 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
-MD5 685a59fc770ac322194ea3b8bc32c4bb files/digest-alsa-driver-1.0.14_pre20061130 298
-RMD160 d71e795772659d99f3a6db5fc5ea335274136646 files/digest-alsa-driver-1.0.14_pre20061130 298
-SHA256 4d4b80e773755a488ee5d08ef3835ff58cd0dff79c4427dfdb97074e5ef52b58 files/digest-alsa-driver-1.0.14_pre20061130 298
 MD5 28d9b8b0d667802a060f3d2619046d22 files/digest-alsa-driver-1.0.14_rc1 271
 RMD160 b09664e66f08a3af26e8c36ce1c03eba90c06704 files/digest-alsa-driver-1.0.14_rc1 271
 SHA256 2fcc9c3a03d7cb5056f3254204a82ed8d48ff5c5c58a8447ebeeb609654fb4c8 files/digest-alsa-driver-1.0.14_rc1 271
@@ -91,7 +51,7 @@ SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFfbV9AiZjviIA2XgRArERAKClN6Grby4Uag0STFALkW+eZDG92gCeLfY5
-d3dNcZgpYThMpcaGBqUzX9o=
-=QISM
+iD8DBQFFimS1AiZjviIA2XgRAqIeAKDdaS21cPCa7AymEyWSyGmwTvElhgCfRlsa
+HOSKGAbRBTAiO3UxoXlCOog=
+=8KwO
 -----END PGP SIGNATURE-----
diff --git a/media-sound/alsa-driver/alsa-driver-1.0.10-r2.ebuild b/media-sound/alsa-driver/alsa-driver-1.0.10-r2.ebuild
deleted file mode 100644
index 90a0c5dd3b04..000000000000
--- a/media-sound/alsa-driver/alsa-driver-1.0.10-r2.ebuild
+++ /dev/null
@@ -1,168 +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.10-r2.ebuild,v 1.7 2006/01/22 07:19:21 josejx Exp $
-
-inherit linux-mod flag-o-matic eutils
-
-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}"
-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}/${P}-oops.patch"
-
-	if kernel_is ge 2 6 15 ; then
-		epatch "${FILESDIR}"/${P}-gfp-flags.patch
-	fi
-
-	convert_to_m ${S}/Makefile
-	sed -i -e 's:\(.*depmod\):#\1:' ${S}/Makefile
-}
-
-src_compile() {
-	# 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)
-	# -j1 : see bug #71028
-	emake -j1 HOSTCC=$(tc-getBUILD_CC) CC=$(tc-getCC) || 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() {
-	make 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/alsa-driver-1.0.11.ebuild b/media-sound/alsa-driver/alsa-driver-1.0.11.ebuild
deleted file mode 100644
index dbf7ee2c0ef6..000000000000
--- a/media-sound/alsa-driver/alsa-driver-1.0.11.ebuild
+++ /dev/null
@@ -1,177 +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.11.ebuild,v 1.12 2006/06/21 20:19:07 flameeyes 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}"
-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}/${P}-powermac.patch"
-	epatch "${FILESDIR}"/${PN}-1.0.10_rc1-include.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}/${P}-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() {
-	make 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/alsa-driver-1.0.14_pre20061130.ebuild b/media-sound/alsa-driver/alsa-driver-1.0.14_pre20061130.ebuild
deleted file mode 100644
index 2417e6779e91..000000000000
--- a/media-sound/alsa-driver/alsa-driver-1.0.14_pre20061130.ebuild
+++ /dev/null
@@ -1,189 +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.14_pre20061130.ebuild,v 1.5 2006/12/07 08:07:13 flameeyes Exp $
-
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="latest"
-
-inherit linux-mod flag-o-matic eutils multilib autotools
-
-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 debug"
-
-IUSE_CARDS="seq-dummy dummy virmidi mtpav mts64 serial-u16550 mpu401 serialmidi loopback
-portman2x4 pcsp ad1848-lib cs4231-lib adlib ad1816a ad1848 als100 azt2320 cmi8330
-cs4231 cs4232 cs4236 dt019x es968 es1688 es18xx gusclassic gusextreme gusmax
-interwave interwave-stb opl3sa2 opti92x-ad1848 opti92x-cs4231 opti93x miro
-sb8 sb16 sbawe sgalaxy sscape wavefront pc98-cs4232 msnd-pinnacle ad1889 als300
-als4000 ali5451 atiixp atiixp-modem au8810 au8820 au8830 azt3328 bt87x ca0106 cmipci
-cs4281 cs46xx cs5535audio darla20 gina20 layla20 darla24 gina24 layla24 mona mia
-echo3g indigo indigoio indigodj emu10k1 emu10k1x ens1370 ens1371 es1938 es1968
-fm801 fm801-tea575x hda-intel hdsp hdspm ice1712 ice1724 intel8x0 intel8x0m korg1212
-maestro3 mixart nm256 pcxhr riptide rme32 rme96 rme9652 sonicvibes trident via82xx
-via82xx-modem vx222 ymfpci pdplus asihpi powermac aoa aoa-fabric-layout aoa-onyx
-aoa-tas aoa-toonie aoa-soundbus aoa-soundbus-i2s sa11xx-uda1341 armaaci
-s3c2410 pxa2xx-i2sound au1x00 usb-audio usb-usx2y vxpocket pdaudiocf sun-amd7930
-sun-cs4231 sun-dbri harmony soc at91-soc at91-soc-eti-b1-wm8731 pxa2xx-soc
-pxa2xx-soc-corgi pxa2xx-soc-spitz pxa2xx-soc-poodle pxa2xx-soc-tosa"
-
-for iuse_card in ${IUSE_CARDS}; do
-	IUSE="${IUSE} alsa_cards_${iuse_card}"
-done
-
-
-RDEPEND="virtual/modutils
-	 ~media-sound/alsa-headers-${PV}
-	 !media-sound/snd-aoa"
-DEPEND="${RDEPEND}
-	virtual/linux-sources
-	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:-${IUSE_ALSA_CARDS}}
-
-	local PNP_DRIVERS="interwave interwave-stb"
-	local PNP_ERROR="Some of the drivers you selected require PnP support in your kernel (${PNP_DRIVERS}). Either enable PnP in your kernel or trim which drivers get compiled using ALSA_CARDS in /etc/make.conf."
-
-	local ISA_DRIVERS="cs4232 msnd-pinnacle cs4231-lib adlib ad1816a ad1848 als100 azt2320
-		cmi8330 cs4231 cs4236 dt019x  es968 es1688 es18xx gusclassic gusextreme gusmax
-		interwave interwave-stb opl3sa2 opti92x-ad1848 opti92x-cs4231 opti93x miro sb8
-		sb16 sbawe sb16_csp sgalaxy sscape wavefront"
-	local ISA_ERROR="Some of the drivers you selected require ISA support in your kernel ($(echo $ISA_DRIVERS)). Either enable ISA in your kernel or trim which drivers get compiled using ALSA_CARDS in /etc/make.conf."
-
-	local FW_DRIVERS="emu10k1 asihpi"
-	local FW_LOADER_ERROR="Some of the drivers you selected require 'Userspace firmware loading support' in your kernel (${FW_DRIVERS}). Either enable that feature or trim which drivers get compiled using ALSA_CARDS in /etc/make.conf."
-
-	local TMP_ALSA_CARDS
-	local CHECK_PNP
-	local CHECK_ISA
-	local CHECK_FW
-	for card in ${ALSA_CARDS}; do
-		if has alsa_cards_${card} ${IUSE} && use alsa_cards_${card}; then
-			TMP_ALSA_CARDS="${TMP_ALSA_CARDS} ${card}"
-			has ${card} ${PNP_DRIVERS} && CHECK_PNP="PNP"
-			has ${card} ${ISA_DRIVERS} && CHECK_ISA="ISA"
-			has ${card} ${FW_DRIVERS} && CHECK_FW="FW_LOADER"
-		fi
-	done
-	ALSA_CARDS="${TMP_ALSA_CARDS}"
-
-	local CONFIG_CHECK="!SND SOUND ${CHECK_PNP} ${CHECK_ISA} ${CHECK_FW}"
-	local SND_ERROR="ALSA is already compiled into the kernel."
-	local SOUND_ERROR="Your kernel doesn't have sound support enabled."
-	local SOUND_PRIME_ERROR="Your kernel is configured to use the deprecated OSS drivers.	 Please disable them and re-emerge alsa-driver."
-
-	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"
-
-	emake -j1 all-deps || die "make all-deps failed"
-	eaclocal
-	eautoconf
-}
-
-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}
-}
-
-
-src_install() {
-	emake DESTDIR="${D}" install-modules || die "make install failed"
-
-	dodoc CARDS-STATUS FAQ README WARNING TODO
-
-	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() {
-	elog
-	elog "The alsasound initscript and modules.d/alsa have now moved to alsa-utils"
-	elog
-	elog "Also, remember that all mixer channels will be MUTED by default."
-	elog "Use the 'alsamixer' program to unmute them."
-	elog
-	elog "If you experience problems, please report bugs to http://bugs.gentoo.org."
-	elog
-
-	linux-mod_pkg_postinst
-
-	elog "Check out the ALSA installation guide availible at the following URL:"
-	elog "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
-
-		find "${ROOT}/lib/modules/${KV_FULL}/kernel/sound" -type d -print0 | xargs rmdir
-	fi
-}
diff --git a/media-sound/alsa-driver/files/alsa-driver-1.0.10-gfp-flags.patch b/media-sound/alsa-driver/files/alsa-driver-1.0.10-gfp-flags.patch
deleted file mode 100644
index e210de89c69f..000000000000
--- a/media-sound/alsa-driver/files/alsa-driver-1.0.10-gfp-flags.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Hugh Dickins GFP flag changes to ALSA
-
---- alsa-driver-1.0.10/alsa-kernel/core/memalloc.c.orig	2005-10-31 13:11:53.000000000 +0000
-+++ alsa-driver-1.0.10/alsa-kernel/core/memalloc.c	2005-12-04 06:48:20.000000000 +0000
-@@ -197,6 +197,7 @@ void *snd_malloc_pages(size_t size, gfp_
- 
- 	snd_assert(size > 0, return NULL);
- 	snd_assert(gfp_flags != 0, return NULL);
-+	gfp_flags |= __GFP_COMP;	/* compound page lets parts be mapped */
- 	pg = get_order(size);
- 	if ((res = (void *) __get_free_pages(gfp_flags, pg)) != NULL) {
- 		mark_pages(virt_to_page(res), pg);
-@@ -241,6 +242,7 @@ static void *snd_malloc_dev_pages(struct
- 	snd_assert(dma != NULL, return NULL);
- 	pg = get_order(size);
- 	gfp_flags = GFP_KERNEL
-+		| __GFP_COMP	/* compound page lets parts be mapped */
- 		| __GFP_NORETRY /* don't trigger OOM-killer */
- 		| __GFP_NOWARN; /* no stack trace print - this call is non-critical */
- 	res = dma_alloc_coherent(dev, PAGE_SIZE << pg, dma, gfp_flags);
-
diff --git a/media-sound/alsa-driver/files/alsa-driver-1.0.10-oops.patch b/media-sound/alsa-driver/files/alsa-driver-1.0.10-oops.patch
deleted file mode 100644
index e7c7d75ca998..000000000000
--- a/media-sound/alsa-driver/files/alsa-driver-1.0.10-oops.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Subject: [PATCH] Fix platform_driver emulation for kernels <= 2.6.14
-
-The platform_driver_register() substitute in alsa-driver-1.0.10 sets
-drv->driver.probe and drv->driver.remove functions without checking for
-non-NULL drv->probe and drv->remove; snd_platform_driver_probe() and
-snd_platform_driver_remove() also do not check for NULL in those fields.
-However, snd_generic_driver has NULL ->probe and ->remove functions,
-therefore attempts to use it on kernels <= 2.6.14 lead to oopses.
-
-This patch changes platform_driver_register() provided by alsa-driver
-for old kernels to match the implementation in post-2.6.14 kernels,
-which checks for NULL ->probe and ->remove functions.
-
-Signed-off-by: Sergey Vlasov <vsu@altlinux.ru>
-
---- alsa-driver-1.0.10/include/platform_device_compat.h.alt-platform_device_compat	2005-11-14 17:42:27 +0300
-+++ alsa-driver-1.0.10/include/platform_device_compat.h	2005-12-03 23:01:26 +0300
-@@ -61,8 +61,10 @@
- static inline int platform_driver_register(struct platform_driver *drv)
- {
- 	drv->driver.bus = &platform_bus_type;
--	drv->driver.probe = snd_platform_driver_probe;
--	drv->driver.remove = snd_platform_driver_remove;
-+	if (drv->probe)
-+		drv->driver.probe = snd_platform_driver_probe;
-+	if (drv->remove)
-+		drv->driver.remove = snd_platform_driver_remove;
- 	if (drv->suspend)
- 		drv->driver.suspend = snd_platform_driver_suspend;
- 	if (drv->resume)
diff --git a/media-sound/alsa-driver/files/alsa-driver-1.0.11-kernel-2.6.17.patch b/media-sound/alsa-driver/files/alsa-driver-1.0.11-kernel-2.6.17.patch
deleted file mode 100644
index 825d87f7c8dc..000000000000
--- a/media-sound/alsa-driver/files/alsa-driver-1.0.11-kernel-2.6.17.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-In kernel 2.6.17 non-counting semaphores are replaced by mutexes, this patch
-makes serialmidi driver to work with the changes.
-Index: alsa-driver-1.0.11/drivers/serialmidi.c
-===================================================================
---- alsa-driver-1.0.11.orig/drivers/serialmidi.c
-+++ alsa-driver-1.0.11/drivers/serialmidi.c
-@@ -314,12 +314,12 @@ static void tx_loop(serialmidi_t *serial
- 	if (driver == NULL)
- 		return;
- 
--	if (down_trylock(&tty->atomic_write))
-+	if (!mutex_trylock(&tty->atomic_write_lock))
- 		return;
- 	while (1) {
- 		count = driver->write_room(tty);
- 		if (count <= 0) {
--			up(&tty->atomic_write);
-+			mutex_unlock(&tty->atomic_write_lock);
- 			return;
- 		}
- 		count = count > TX_BUF_SIZE ? TX_BUF_SIZE : count;
-@@ -336,7 +336,7 @@ static void tx_loop(serialmidi_t *serial
- 			break;
- 		}
- 	}
--	up(&tty->atomic_write);
-+	mutex_unlock(&tty->atomic_write_lock);
- }
- 
- static void ldisc_write_wakeup(struct tty_struct *tty)
diff --git a/media-sound/alsa-driver/files/alsa-driver-1.0.11-powermac.patch b/media-sound/alsa-driver/files/alsa-driver-1.0.11-powermac.patch
deleted file mode 100644
index 652b6385aa90..000000000000
--- a/media-sound/alsa-driver/files/alsa-driver-1.0.11-powermac.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: alsa-driver-1.0.11/ppc/pmac.c
-===================================================================
---- alsa-driver-1.0.11.orig/ppc/pmac.c
-+++ alsa-driver-1.0.11/ppc/pmac.c
-@@ -5,5 +5,13 @@
- #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16)
- #include "pmac_old.c"
- #else
-+#if LINUX_VERSION_CODE == KERNEL_VERSION(2,6,16)
-+/* hack for machine_is(powermac) */
-+static int _machine_is(void);
-+#define machine_is(x)	_machine_is()
-+#endif
- #include "../alsa-kernel/ppc/pmac.c"
-+#if LINUX_VERSION_CODE == KERNEL_VERSION(2,6,16)
-+static int _machine_is(void) { return _machine == _MACH_Pmac; }
-+#endif
- #endif
diff --git a/media-sound/alsa-driver/files/digest-alsa-driver-1.0.10-r2 b/media-sound/alsa-driver/files/digest-alsa-driver-1.0.10-r2
deleted file mode 100644
index 23dd3c2be143..000000000000
--- a/media-sound/alsa-driver/files/digest-alsa-driver-1.0.10-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 e9e7c1ca664a14275d67185049f933f9 alsa-driver-1.0.10.tar.bz2 2194644
-RMD160 24cf013e40095d0e143969ce864fb34aff1edefe alsa-driver-1.0.10.tar.bz2 2194644
-SHA256 60fd070075791fff13d3c3682da370b47778a564bc25c1b72f02f1d60ffa98f0 alsa-driver-1.0.10.tar.bz2 2194644
diff --git a/media-sound/alsa-driver/files/digest-alsa-driver-1.0.11 b/media-sound/alsa-driver/files/digest-alsa-driver-1.0.11
deleted file mode 100644
index f7189caea4a5..000000000000
--- a/media-sound/alsa-driver/files/digest-alsa-driver-1.0.11
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 57534e4297cd683371402220e3753885 alsa-driver-1.0.11.tar.bz2 2343130
-RMD160 8f6d0d1f61bcf8d62fa5ca1df13accf0cec54650 alsa-driver-1.0.11.tar.bz2 2343130
-SHA256 c717b8a237e38e17a2c71f3fcde6a89907accd175f8bac4f09c054444e14069f alsa-driver-1.0.11.tar.bz2 2343130
diff --git a/media-sound/alsa-driver/files/digest-alsa-driver-1.0.14_pre20061130 b/media-sound/alsa-driver/files/digest-alsa-driver-1.0.14_pre20061130
deleted file mode 100644
index 1b2782e75e71..000000000000
--- a/media-sound/alsa-driver/files/digest-alsa-driver-1.0.14_pre20061130
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 4242572cad1a76d467b457dcb7bcc89a alsa-driver-1.0.14_pre20061130.tar.bz2 7261863
-RMD160 026d3e288f91c9cea325394e1656b33a1da2bbe4 alsa-driver-1.0.14_pre20061130.tar.bz2 7261863
-SHA256 ba835bad2864f9d3d83e55c087aca336270b13bde87bad2b72e2636f1798bf1f alsa-driver-1.0.14_pre20061130.tar.bz2 7261863
diff --git a/media-sound/alsa-firmware/Manifest b/media-sound/alsa-firmware/Manifest
index 132a620a323b..dacb3bff8d10 100644
--- a/media-sound/alsa-firmware/Manifest
+++ b/media-sound/alsa-firmware/Manifest
@@ -1,20 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST alsa-firmware-1.0.10.tar.bz2 1564905
-DIST alsa-firmware-1.0.11.tar.bz2 1567000 RMD160 c6abbf343b7de053bff5f4a442168082330a0734 SHA1 534e04e0edcf1bf4e42915121ab90af1dd0c01b6 SHA256 1c3da33dbb1487476b32ef88ad66e3792adf78bb868f9d09059397c10e689d99
 DIST alsa-firmware-1.0.12.tar.bz2 2843601 RMD160 bab5128c20b8e85f01acc279ba5d389766076a0c SHA1 aa033609ebfedeccc21e120d54dc2dcb8e1d86e5 SHA256 6e7d3104c4de7d031790c1e750067b13e9481bf2855b0806a300d1e697549fbd
 DIST alsa-firmware-1.0.13.tar.bz2 2842664 RMD160 58354210d79e5c3a137d066d9d2278c6cfd0c492 SHA1 de5532d5456bc42317ae42f569a1e55391a8cd45 SHA256 28a704759a5f7bc4692cbff6988bb85c5d5cd6cf84d0d39208af65441c0d57bb
 DIST alsa-firmware-1.0.14rc1.tar.bz2 3003831 RMD160 b5e8885f97f33c95d8175832574a687207bc9da3 SHA1 e880c6616b1704dbf9084d5281d44dbbe0710f3d SHA256 57d4bc483b940ff92f241e18e1eaa9a12e6b504c1b689092c85853cbb8890097
-DIST alsa-firmware-1.0.8.tar.bz2 1564653
-EBUILD alsa-firmware-1.0.10.ebuild 676 RMD160 c1fb753c62bd6564fcc60b9e90bdec2c0efd8e69 SHA1 ae3a74280560cea26f79e98b491dc83ae51b24ed SHA256 05c3126cfc3a20b62730dd3ed4c435c663924fb59d9c9d5148d3938ac40bba53
-MD5 e77ab16ed47e8bf397d1cb7e04aa191b alsa-firmware-1.0.10.ebuild 676
-RMD160 c1fb753c62bd6564fcc60b9e90bdec2c0efd8e69 alsa-firmware-1.0.10.ebuild 676
-SHA256 05c3126cfc3a20b62730dd3ed4c435c663924fb59d9c9d5148d3938ac40bba53 alsa-firmware-1.0.10.ebuild 676
-EBUILD alsa-firmware-1.0.11.ebuild 726 RMD160 ba5ade53188aa1f8c5f962305428694abf21fe4e SHA1 089b962c3b4cdea53c2da54c39287d9ea0c75580 SHA256 68ba648f12d2e05e3481d4e77d8d4020d1997bd36295d6ac847751d277a125e5
-MD5 7fbc08db8569a4f81079091aa2502d21 alsa-firmware-1.0.11.ebuild 726
-RMD160 ba5ade53188aa1f8c5f962305428694abf21fe4e alsa-firmware-1.0.11.ebuild 726
-SHA256 68ba648f12d2e05e3481d4e77d8d4020d1997bd36295d6ac847751d277a125e5 alsa-firmware-1.0.11.ebuild 726
 EBUILD alsa-firmware-1.0.12.ebuild 736 RMD160 cf99a5f965fa017c074412cdc238342401c30b94 SHA1 9dde06e66cdfebed1c5d1694bcbdf0cdae3b2e23 SHA256 0e7a36a9ad8a6effd9679d86339bd45e7a5c789d01c9186aca84b4ebfd4220b1
 MD5 7e73decc46fc03ef217741e636956030 alsa-firmware-1.0.12.ebuild 736
 RMD160 cf99a5f965fa017c074412cdc238342401c30b94 alsa-firmware-1.0.12.ebuild 736
@@ -27,24 +16,14 @@ EBUILD alsa-firmware-1.0.14_rc1.ebuild 748 RMD160 d1fbb33d74f66d9ab1279c78142d52
 MD5 a6f6ce0dcfeb180fc6d333889c2aeecb alsa-firmware-1.0.14_rc1.ebuild 748
 RMD160 d1fbb33d74f66d9ab1279c78142d52b79829501d alsa-firmware-1.0.14_rc1.ebuild 748
 SHA256 0e46c89adeb27e00769672825bebc37ca64a4d20294ec9a68742dcbb1e7c3015 alsa-firmware-1.0.14_rc1.ebuild 748
-EBUILD alsa-firmware-1.0.8-r1.ebuild 649 RMD160 228b4c3982b71ca119a4d0d94c1e53ffc1e78bd4 SHA1 34c8e0726d86231953d7be0503ec300ad4290c14 SHA256 676a699a9fc9723645c8aa1510ba214877cdc7b5a7554b3e727620b99f70717f
-MD5 3420599c69435348716238fa365b5215 alsa-firmware-1.0.8-r1.ebuild 649
-RMD160 228b4c3982b71ca119a4d0d94c1e53ffc1e78bd4 alsa-firmware-1.0.8-r1.ebuild 649
-SHA256 676a699a9fc9723645c8aa1510ba214877cdc7b5a7554b3e727620b99f70717f alsa-firmware-1.0.8-r1.ebuild 649
-MISC ChangeLog 6541 RMD160 d58d02eda0f52cd572aab887f2f4744a51caac0a SHA1 e1df1f3ba913d88406ede1525728304c512ddb46 SHA256 18dac092a64430491978d0977f1229aaca79dfa2824454d2bb559ed61f91963f
-MD5 48840b36f38ae58be33fcc5a5af59775 ChangeLog 6541
-RMD160 d58d02eda0f52cd572aab887f2f4744a51caac0a ChangeLog 6541
-SHA256 18dac092a64430491978d0977f1229aaca79dfa2824454d2bb559ed61f91963f ChangeLog 6541
+MISC ChangeLog 6795 RMD160 053dd69a1ef199a894ac59d7d98b05c4845d99aa SHA1 3266a59e985add807986e6819f48edb597bd7646 SHA256 f776d5540973bf72f328c5e712a5a4fac7fd04d3d20ad1ec508cf59511d6e938
+MD5 485e7e489b7ffe371c65228a604837db ChangeLog 6795
+RMD160 053dd69a1ef199a894ac59d7d98b05c4845d99aa ChangeLog 6795
+SHA256 f776d5540973bf72f328c5e712a5a4fac7fd04d3d20ad1ec508cf59511d6e938 ChangeLog 6795
 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 deb370043b630e033e580fec20c65efd files/digest-alsa-firmware-1.0.10 74
-RMD160 6a11fc0b370da63e555fecc5beaaa55448406eb2 files/digest-alsa-firmware-1.0.10 74
-SHA256 f535e1249d6aa514bfd1acfb763bb09ac50ae799b780078b40c429192bd0aecc files/digest-alsa-firmware-1.0.10 74
-MD5 bbd9f4a416e2bf901b5857ae93dfa03e files/digest-alsa-firmware-1.0.11 268
-RMD160 d20f9076ad8b9703430a08e43ea7975792182554 files/digest-alsa-firmware-1.0.11 268
-SHA256 d16675d43108ab975461b8bfd770e5fbfd21018c55b14d08dd6374aca5821936 files/digest-alsa-firmware-1.0.11 268
 MD5 e8e3ea548c712e21b9950b4e7953a7a9 files/digest-alsa-firmware-1.0.12 268
 RMD160 9d8bf7edc890b8a8a3095af6f4918baa5dcc7391 files/digest-alsa-firmware-1.0.12 268
 SHA256 f658a6d052513634908f01b98fdf85265c424014742c21d8da683cfab5d04c3d files/digest-alsa-firmware-1.0.12 268
@@ -54,13 +33,10 @@ SHA256 d714c7ac62340e97121f43b568ca9c53aaea876f112dabeb3e0c5b12fc463dfc files/di
 MD5 ca4e236289a00b54efe399ce8684b1de files/digest-alsa-firmware-1.0.14_rc1 277
 RMD160 26d395fa2288f841db348fe82fe37803a173c835 files/digest-alsa-firmware-1.0.14_rc1 277
 SHA256 6cc738207f04de25baac741f21849df67df42c9548fa0fc48f2d18814e408023 files/digest-alsa-firmware-1.0.14_rc1 277
-MD5 455a8b164a15d1dfd6a5784479456b7e files/digest-alsa-firmware-1.0.8-r1 73
-RMD160 8907d73789d78ee4bf3ff898de1f88f84f202960 files/digest-alsa-firmware-1.0.8-r1 73
-SHA256 0c077a7463be8d5c67f23c7f7477825ed4480ec17bd5dcbc9af2de89315ae0ac files/digest-alsa-firmware-1.0.8-r1 73
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFfbUVAiZjviIA2XgRAmzDAJwMdRL3PfFjXjag1IdIbpMVttWKGACfXOtG
-OTYlpa+HCSK8CMwBWlqanV0=
-=uets
+iD8DBQFFimSLAiZjviIA2XgRAt7DAJ9NUnIPReX/phJ96rheR365xlqKsgCfcy4R
++irP2yiMaaDSuWTuzbFWbbg=
+=trhG
 -----END PGP SIGNATURE-----
diff --git a/media-sound/alsa-firmware/alsa-firmware-1.0.10.ebuild b/media-sound/alsa-firmware/alsa-firmware-1.0.10.ebuild
deleted file mode 100644
index d425fcbffee3..000000000000
--- a/media-sound/alsa-firmware/alsa-firmware-1.0.10.ebuild
+++ /dev/null
@@ -1,27 +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-firmware/alsa-firmware-1.0.10.ebuild,v 1.2 2006/01/13 01:49:44 gustavoz Exp $
-
-DESCRIPTION="Advanced Linux Sound Architecture firmware"
-HOMEPAGE="http://www.alsa-project.org/"
-SRC_URI="mirror://alsaproject/firmware/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 sparc ~x86"
-IUSE=""
-
-DEPEND=""
-
-src_compile() {
-	econf \
-		--with-hotplug-dir=/lib/firmware \
-		|| die "configure failed"
-
-	emake || die "make failed"
-}
-
-src_install () {
-	make DESTDIR="${D}" install || die "make install failed"
-	dodoc README
-}
diff --git a/media-sound/alsa-firmware/alsa-firmware-1.0.11.ebuild b/media-sound/alsa-firmware/alsa-firmware-1.0.11.ebuild
deleted file mode 100644
index 40ff4cbda0a8..000000000000
--- a/media-sound/alsa-firmware/alsa-firmware-1.0.11.ebuild
+++ /dev/null
@@ -1,31 +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-firmware/alsa-firmware-1.0.11.ebuild,v 1.5 2006/05/14 03:33:34 metalgod Exp $
-
-MY_P="${P/_rc/rc}"
-
-DESCRIPTION="Advanced Linux Sound Architecture firmware"
-HOMEPAGE="http://www.alsa-project.org/"
-SRC_URI="mirror://alsaproject/firmware/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc sparc x86"
-IUSE=""
-
-S="${WORKDIR}/${MY_P}"
-
-DEPEND=""
-
-src_compile() {
-	econf \
-		--with-hotplug-dir=/lib/firmware \
-		|| die "configure failed"
-
-	emake || die "make failed"
-}
-
-src_install () {
-	make DESTDIR="${D}" install || die "make install failed"
-	dodoc README
-}
diff --git a/media-sound/alsa-firmware/alsa-firmware-1.0.8-r1.ebuild b/media-sound/alsa-firmware/alsa-firmware-1.0.8-r1.ebuild
deleted file mode 100644
index ecbe34a05792..000000000000
--- a/media-sound/alsa-firmware/alsa-firmware-1.0.8-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-firmware/alsa-firmware-1.0.8-r1.ebuild,v 1.1 2005/04/22 11:15:04 eradicator Exp $
-
-IUSE=""
-
-MY_P=${P/_rc/rc}
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Advanced Linux Sound Architecture firmware"
-HOMEPAGE="http://www.alsa-project.org/"
-SRC_URI="mirror://alsaproject/firmware/${P}.tar.bz2"
-
-SLOT="0"
-KEYWORDS="amd64 sparc x86"
-LICENSE="GPL-2"
-
-DEPEND=""
-
-src_compile() {
-	econf --with-hotplug-dir=/lib/firmware
-	emake || die
-}
-
-src_install () {
-	make DESTDIR="${D}" install || die
-	dodoc README
-}
diff --git a/media-sound/alsa-firmware/files/digest-alsa-firmware-1.0.10 b/media-sound/alsa-firmware/files/digest-alsa-firmware-1.0.10
deleted file mode 100644
index 5fe2a869c14a..000000000000
--- a/media-sound/alsa-firmware/files/digest-alsa-firmware-1.0.10
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cea668b251e48583c732b51a5b041dc0 alsa-firmware-1.0.10.tar.bz2 1564905
diff --git a/media-sound/alsa-firmware/files/digest-alsa-firmware-1.0.11 b/media-sound/alsa-firmware/files/digest-alsa-firmware-1.0.11
deleted file mode 100644
index b1ed37a57a71..000000000000
--- a/media-sound/alsa-firmware/files/digest-alsa-firmware-1.0.11
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 bd573f4dac7f4786a20bb4427229acef alsa-firmware-1.0.11.tar.bz2 1567000
-RMD160 c6abbf343b7de053bff5f4a442168082330a0734 alsa-firmware-1.0.11.tar.bz2 1567000
-SHA256 1c3da33dbb1487476b32ef88ad66e3792adf78bb868f9d09059397c10e689d99 alsa-firmware-1.0.11.tar.bz2 1567000
diff --git a/media-sound/alsa-firmware/files/digest-alsa-firmware-1.0.8-r1 b/media-sound/alsa-firmware/files/digest-alsa-firmware-1.0.8-r1
deleted file mode 100644
index e8c25112002f..000000000000
--- a/media-sound/alsa-firmware/files/digest-alsa-firmware-1.0.8-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6073fde43e0aea850ecdf64d0c2e46b2 alsa-firmware-1.0.8.tar.bz2 1564653
diff --git a/media-sound/alsa-headers/Manifest b/media-sound/alsa-headers/Manifest
index 06ebab8c5ac2..bb17ddf8fcf5 100644
--- a/media-sound/alsa-headers/Manifest
+++ b/media-sound/alsa-headers/Manifest
@@ -5,16 +5,10 @@ AUX alsa-headers-1.0.6a-user.patch 419 RMD160 a778185703b19cfe07b7c4578a10196fd9
 MD5 6985658411b4e459ef8b03a25f480404 files/alsa-headers-1.0.6a-user.patch 419
 RMD160 a778185703b19cfe07b7c4578a10196fd9f9d5c0 files/alsa-headers-1.0.6a-user.patch 419
 SHA256 fbe9dfbbdfdf83b2c895a5d401cec13c16a490a03617419be701f167c38cab09 files/alsa-headers-1.0.6a-user.patch 419
-DIST alsa-driver-1.0.10.tar.bz2 2194644 RMD160 24cf013e40095d0e143969ce864fb34aff1edefe SHA1 a672c29a156097a3122e2ad1dd2f45f2fcba69e4 SHA256 60fd070075791fff13d3c3682da370b47778a564bc25c1b72f02f1d60ffa98f0
 DIST alsa-driver-1.0.11.tar.bz2 2343130 RMD160 8f6d0d1f61bcf8d62fa5ca1df13accf0cec54650 SHA1 8cb4ca26c656b000cd6258f406a79e4b5022a94f SHA256 c717b8a237e38e17a2c71f3fcde6a89907accd175f8bac4f09c054444e14069f
 DIST alsa-driver-1.0.12.tar.bz2 2400785 RMD160 426d0243dab046879cfac0c1010774d387ca4e09 SHA1 8e4c23af7b6255107edf7b0bd8d9ad9dc549193c SHA256 08c2d9a426b646fbbdffbe708994af33c3cad90a42fff2ad004bcc8a97252bc1
 DIST alsa-driver-1.0.13.tar.bz2 2404965 RMD160 cf17c49563321620c7c1037f6087c85b69278b12 SHA1 fd1534fc90098d05f878c8fef26125be9fd97d52 SHA256 91c37a7e2575cb44bc53cf9c13e2049db73d257242e4d6ab55150a0f704b84d3
-DIST alsa-driver-1.0.14_pre20061130.tar.bz2 7261863 RMD160 026d3e288f91c9cea325394e1656b33a1da2bbe4 SHA1 14da9c81de99b3cd81c476027829cfc9a1b30368 SHA256 ba835bad2864f9d3d83e55c087aca336270b13bde87bad2b72e2636f1798bf1f
 DIST alsa-driver-1.0.14rc1.tar.bz2 2515938 RMD160 83f18e77bcd28e1eaccd66967de0dab0bfa84106 SHA1 2f815ac95c47eabf18c5ba0d0b1094249a5a5965 SHA256 09318cc3cc5bcf2eb69c1d75e2e045f625b8756d4879e5c2c0a1f3951524766d
-EBUILD alsa-headers-1.0.10.ebuild 1015 RMD160 cddc74d435e2d7816d12a06f9735ac514b9b753d SHA1 0f1009af00f92a56df72ed6ac6a88450a03a6855 SHA256 33e93e86259d993c46fe7841661728f41e5fae6757728533ce905ba2dda8e087
-MD5 1a0b1d5fcef6fc499f300757037e9756 alsa-headers-1.0.10.ebuild 1015
-RMD160 cddc74d435e2d7816d12a06f9735ac514b9b753d alsa-headers-1.0.10.ebuild 1015
-SHA256 33e93e86259d993c46fe7841661728f41e5fae6757728533ce905ba2dda8e087 alsa-headers-1.0.10.ebuild 1015
 EBUILD alsa-headers-1.0.11.ebuild 1011 RMD160 934ed8c1ad8de6508792d32ea24697e87925ed70 SHA1 c5b7f0a4bb7b1f90b0c73ad6c9c9b3d1368ccc65 SHA256 c17a668b91388d939fcd7400877414773cba58d619d6373d2ff46931b24ded50
 MD5 bd01a316d942578b60d5e3c4cbe2bf2a alsa-headers-1.0.11.ebuild 1011
 RMD160 934ed8c1ad8de6508792d32ea24697e87925ed70 alsa-headers-1.0.11.ebuild 1011
@@ -27,10 +21,6 @@ EBUILD alsa-headers-1.0.13.ebuild 1052 RMD160 c5fd3ba6c795f4925611b57835933b497a
 MD5 684b72382ee8003da0142c95809bc930 alsa-headers-1.0.13.ebuild 1052
 RMD160 c5fd3ba6c795f4925611b57835933b497ad98808 alsa-headers-1.0.13.ebuild 1052
 SHA256 4258a9b2e1b528eb0f2760cf1feaf704ebce8afc49ec2e23ef3dc17b5543896c alsa-headers-1.0.13.ebuild 1052
-EBUILD alsa-headers-1.0.14_pre20061130.ebuild 1041 RMD160 92bcf71b2abf9b1c5d64db3c84554f1e2f7dcf4b SHA1 b51c86e004c5437c9d14ea1ae43838dab31f174d SHA256 f111be322f4e0a93018f26a0148d90b70ba535249857043927e1dc0cc3ffba44
-MD5 2c95ff230327fd3b0455bc92a3e3d568 alsa-headers-1.0.14_pre20061130.ebuild 1041
-RMD160 92bcf71b2abf9b1c5d64db3c84554f1e2f7dcf4b alsa-headers-1.0.14_pre20061130.ebuild 1041
-SHA256 f111be322f4e0a93018f26a0148d90b70ba535249857043927e1dc0cc3ffba44 alsa-headers-1.0.14_pre20061130.ebuild 1041
 EBUILD alsa-headers-1.0.14_rc1.ebuild 1033 RMD160 0851bd8cf998d1ac95790edfde7eb4b68b5dfa2a SHA1 e7dd768f758db78ab4b8bf0677391fd5673c986c SHA256 542078be58c177cc10765d93165814499cf8f4ea83306874464a5002155994c7
 MD5 6a2e290a7a767f61bd9fb6fbe867b9d1 alsa-headers-1.0.14_rc1.ebuild 1033
 RMD160 0851bd8cf998d1ac95790edfde7eb4b68b5dfa2a alsa-headers-1.0.14_rc1.ebuild 1033
@@ -39,17 +29,14 @@ EBUILD alsa-headers-9999.ebuild 973 RMD160 54a5389cce1a30ac72e7e0804f764f39bc145
 MD5 3769aa50b6e5557d78eb53b863b14e42 alsa-headers-9999.ebuild 973
 RMD160 54a5389cce1a30ac72e7e0804f764f39bc145f7b alsa-headers-9999.ebuild 973
 SHA256 b6152a8633fafdfc169c78ee695a8e15a338b1a5738d9decb7d570ab1fe1bd92 alsa-headers-9999.ebuild 973
-MISC ChangeLog 14525 RMD160 6725ce6a1d06e27fd4c33dd122c333de9749022c SHA1 adc2687ab664a805028c746febcc9f1984f736e4 SHA256 345762b5fd3e41ccafb6faa322bdb4f4717291d11c4ee7955547f820946f04aa
-MD5 91321fa75e24d15003a8001e26c4bfdb ChangeLog 14525
-RMD160 6725ce6a1d06e27fd4c33dd122c333de9749022c ChangeLog 14525
-SHA256 345762b5fd3e41ccafb6faa322bdb4f4717291d11c4ee7955547f820946f04aa ChangeLog 14525
+MISC ChangeLog 14755 RMD160 666901cdef5ca6ce6ce6de6dcf180d02e6b07296 SHA1 5aea00a46eb6b4767368aeef68b84a9866568ee2 SHA256 172f53c73f3ab0425bf9d6719d93108a1904ddfef8ae2c52c289eb301c4500f3
+MD5 fd2e45235dc6d62c6d07dca176036f84 ChangeLog 14755
+RMD160 666901cdef5ca6ce6ce6de6dcf180d02e6b07296 ChangeLog 14755
+SHA256 172f53c73f3ab0425bf9d6719d93108a1904ddfef8ae2c52c289eb301c4500f3 ChangeLog 14755
 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 d92d5663dd6f93e9e54b6cba30ee0a7b files/digest-alsa-headers-1.0.10 262
-RMD160 8d149dd66b34d17be4162d9316331b4902c54e5f files/digest-alsa-headers-1.0.10 262
-SHA256 1ae6a70927822418fdc319e0f5454b0799cc1c8d49deee5a4660b34d91458f9c files/digest-alsa-headers-1.0.10 262
 MD5 22644311058526795f233aaa7a6fc155 files/digest-alsa-headers-1.0.11 262
 RMD160 daeedeaa4b2d5bfa3dd386358fc231486bc0f895 files/digest-alsa-headers-1.0.11 262
 SHA256 685909b916bf91fe04291a0f9dcb11865ed4efb588efb3b876ec3e367fede2ad files/digest-alsa-headers-1.0.11 262
@@ -59,9 +46,6 @@ SHA256 34b56f728a398a64beed2b762914cc50d8347a67f406109da576294ab15186aa files/di
 MD5 22b201fa4a4e6f6c844b7a469072daf0 files/digest-alsa-headers-1.0.13 262
 RMD160 cc71e221ac628aa73cc60f3df7a43301ac78999b files/digest-alsa-headers-1.0.13 262
 SHA256 45a8c562fbfcf8f05cb4ff799d55c3aa6506ef33539cbfd159a9d24bd634f553 files/digest-alsa-headers-1.0.13 262
-MD5 685a59fc770ac322194ea3b8bc32c4bb files/digest-alsa-headers-1.0.14_pre20061130 298
-RMD160 d71e795772659d99f3a6db5fc5ea335274136646 files/digest-alsa-headers-1.0.14_pre20061130 298
-SHA256 4d4b80e773755a488ee5d08ef3835ff58cd0dff79c4427dfdb97074e5ef52b58 files/digest-alsa-headers-1.0.14_pre20061130 298
 MD5 28d9b8b0d667802a060f3d2619046d22 files/digest-alsa-headers-1.0.14_rc1 271
 RMD160 b09664e66f08a3af26e8c36ce1c03eba90c06704 files/digest-alsa-headers-1.0.14_rc1 271
 SHA256 2fcc9c3a03d7cb5056f3254204a82ed8d48ff5c5c58a8447ebeeb609654fb4c8 files/digest-alsa-headers-1.0.14_rc1 271
@@ -71,7 +55,7 @@ SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFfbUfAiZjviIA2XgRAiPYAJ0RQHmWBp7R30zRBKCvonQtE6KpuQCfWmuE
-zBAHxjxXJpmvkWE/prnLn08=
-=WL+g
+iD8DBQFFimS2AiZjviIA2XgRAsP9AJ0eu83m6UgwrUJufQGWQdd1uYV9jwCdEmbQ
+9MwsMB3gv4xEjfIHPN0PgUM=
+=R7de
 -----END PGP SIGNATURE-----
diff --git a/media-sound/alsa-headers/alsa-headers-1.0.10.ebuild b/media-sound/alsa-headers/alsa-headers-1.0.10.ebuild
deleted file mode 100644
index 3d6d204d74d0..000000000000
--- a/media-sound/alsa-headers/alsa-headers-1.0.10.ebuild
+++ /dev/null
@@ -1,44 +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-headers/alsa-headers-1.0.10.ebuild,v 1.11 2006/04/24 10:20:43 flameeyes Exp $
-
-inherit eutils
-
-MY_PN=${PN/headers/driver}
-MY_P="${MY_PN}-${PV/_rc/rc}"
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="Header files for 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 arm hppa ia64 ~mips ppc ppc64 sh sparc x86"
-IUSE=""
-
-DEPEND=""
-
-# Remove the sound symlink workaround...
-pkg_setup() {
-	if [[ -L ${ROOT}/usr/include/sound ]]; then
-		rm  ${ROOT}/usr/include/sound
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-1.0.6a-user.patch
-}
-
-src_compile() {
-	einfo "No compilation neccessary"
-}
-
-src_install() {
-	cd ${S}/alsa-kernel/include
-	insinto /usr/include/sound
-	doins *.h || die "include failed"
-}
diff --git a/media-sound/alsa-headers/alsa-headers-1.0.14_pre20061130.ebuild b/media-sound/alsa-headers/alsa-headers-1.0.14_pre20061130.ebuild
deleted file mode 100644
index dc652de52547..000000000000
--- a/media-sound/alsa-headers/alsa-headers-1.0.14_pre20061130.ebuild
+++ /dev/null
@@ -1,44 +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-headers/alsa-headers-1.0.14_pre20061130.ebuild,v 1.2 2006/12/03 18:55:49 flameeyes Exp $
-
-inherit eutils
-
-MY_PN=${PN/headers/driver}
-MY_P="${MY_PN}-${PV/_rc/rc}"
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="Header files for 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 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
-IUSE=""
-
-DEPEND=""
-
-RESTRICT="binchecks strip"
-
-# Remove the sound symlink workaround...
-pkg_setup() {
-	if [[ -L "${ROOT}/usr/include/sound" ]]; then
-		rm	"${ROOT}/usr/include/sound"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	epatch "${FILESDIR}/${PN}-1.0.6a-user.patch"
-}
-
-src_compile() { :; }
-
-src_install() {
-	cd "${S}/alsa-kernel/include"
-	insinto /usr/include/sound
-	doins *.h || die "include failed"
-}
diff --git a/media-sound/alsa-headers/files/digest-alsa-headers-1.0.10 b/media-sound/alsa-headers/files/digest-alsa-headers-1.0.10
deleted file mode 100644
index 23dd3c2be143..000000000000
--- a/media-sound/alsa-headers/files/digest-alsa-headers-1.0.10
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 e9e7c1ca664a14275d67185049f933f9 alsa-driver-1.0.10.tar.bz2 2194644
-RMD160 24cf013e40095d0e143969ce864fb34aff1edefe alsa-driver-1.0.10.tar.bz2 2194644
-SHA256 60fd070075791fff13d3c3682da370b47778a564bc25c1b72f02f1d60ffa98f0 alsa-driver-1.0.10.tar.bz2 2194644
diff --git a/media-sound/alsa-headers/files/digest-alsa-headers-1.0.14_pre20061130 b/media-sound/alsa-headers/files/digest-alsa-headers-1.0.14_pre20061130
deleted file mode 100644
index 1b2782e75e71..000000000000
--- a/media-sound/alsa-headers/files/digest-alsa-headers-1.0.14_pre20061130
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 4242572cad1a76d467b457dcb7bcc89a alsa-driver-1.0.14_pre20061130.tar.bz2 7261863
-RMD160 026d3e288f91c9cea325394e1656b33a1da2bbe4 alsa-driver-1.0.14_pre20061130.tar.bz2 7261863
-SHA256 ba835bad2864f9d3d83e55c087aca336270b13bde87bad2b72e2636f1798bf1f alsa-driver-1.0.14_pre20061130.tar.bz2 7261863
diff --git a/media-sound/alsa-tools/Manifest b/media-sound/alsa-tools/Manifest
index 7ff9997efb95..ae868d414966 100644
--- a/media-sound/alsa-tools/Manifest
+++ b/media-sound/alsa-tools/Manifest
@@ -5,19 +5,9 @@ AUX alsa-tools-1.0.11-asneeded.patch 1845 RMD160 f1b3fa1fca50da0827beff8f87f5148
 MD5 f49f91697e8927971c5b0c65338eac5c files/alsa-tools-1.0.11-asneeded.patch 1845
 RMD160 f1b3fa1fca50da0827beff8f87f514814d938833 files/alsa-tools-1.0.11-asneeded.patch 1845
 SHA256 95d69d5b9400818243806b643450f8b75e9411efa2acb8ad02e5063fea0de33c files/alsa-tools-1.0.11-asneeded.patch 1845
-DIST alsa-tools-1.0.10.tar.bz2 1376274 RMD160 0cbdd0f6e1692b129aca7f56e78fea1fd3b02db6 SHA256 ff73db0ec2ab67755206801cdc8137d16e28d04478f0a29cbb9b2ff47960bfdc
-DIST alsa-tools-1.0.11.tar.bz2 1445743 RMD160 b011fbbf5ca387a565fa251e7d351b14f05373cd SHA1 aa2f5bee9840c809c364da3e8909acf93f1d079a SHA256 0dd23c7412ca6ea9c005a9a95b0abc46f22792e5df1b4dac7bca2b56335b5e54
 DIST alsa-tools-1.0.12.tar.bz2 1465411 RMD160 4ae10ebf8a88edcb1fd8b8f6131fd48bc9c7bc23 SHA1 9aa777baccda064c8dea6331334ea0ef1c402006 SHA256 6b47e71152eb2b805e0f9dcfdfea1fbf9141467823322e6118e7a4ca97a2008c
 DIST alsa-tools-1.0.13.tar.bz2 1464807 RMD160 1e55ab98dcc78dabbfec8f057bb164482d334c9a SHA1 43c32b3304140f31cce7f5f9fe4dcd57f01b0965 SHA256 1d82c6f64d035e20fb151b8791972cad47ef229bc365fd046ff64f74bec31eb3
 DIST alsa-tools-1.0.14rc1.tar.bz2 1466476 RMD160 7c0e0131bfa91b9b07705204ebacca2b5b87a19b SHA1 c170029c5a783abb122f0a93b4343e75a6d3fc84 SHA256 d29ebd324359263d98428213f4fc2f58a12b108f9fce9c3b8bde18e315f4ac36
-EBUILD alsa-tools-1.0.10.ebuild 2357 RMD160 69abb265af70748c663a6e247bbc20ddb470a09f SHA1 11dc7c600c22277ac5e648ae9baa71c131f789d2 SHA256 c5ed769e214e528941b25e7dbefd634f38d076f8a69b75c8d7f8c6f8ae673933
-MD5 db32ef0e6d621ad6cdc1120fc3673607 alsa-tools-1.0.10.ebuild 2357
-RMD160 69abb265af70748c663a6e247bbc20ddb470a09f alsa-tools-1.0.10.ebuild 2357
-SHA256 c5ed769e214e528941b25e7dbefd634f38d076f8a69b75c8d7f8c6f8ae673933 alsa-tools-1.0.10.ebuild 2357
-EBUILD alsa-tools-1.0.11.ebuild 2588 RMD160 a1ed81a1a3b9d4253e303155f21cb1f4f53bb198 SHA1 8d42a2d5bdcc5f631a12901da52568f8609fa35e SHA256 d3fa5366ee293d0ab48c2d53549f26d5ba6e58bd51bf35c481182040368b3b2e
-MD5 872312ccf487cab10866769975bb84c6 alsa-tools-1.0.11.ebuild 2588
-RMD160 a1ed81a1a3b9d4253e303155f21cb1f4f53bb198 alsa-tools-1.0.11.ebuild 2588
-SHA256 d3fa5366ee293d0ab48c2d53549f26d5ba6e58bd51bf35c481182040368b3b2e alsa-tools-1.0.11.ebuild 2588
 EBUILD alsa-tools-1.0.12.ebuild 2598 RMD160 5d444670b2c6f5b7d7caf596dcfd854dae007036 SHA1 592cd9a7eb7b80b84fe108e73439ee0ce39073af SHA256 af7c7d82e43dc3de0a1b46300d1dc5541a3a19d93a57146eea5a883f9697a0b1
 MD5 d3f02a97658ad4fbe118c0c071153eb5 alsa-tools-1.0.12.ebuild 2598
 RMD160 5d444670b2c6f5b7d7caf596dcfd854dae007036 alsa-tools-1.0.12.ebuild 2598
@@ -30,20 +20,14 @@ EBUILD alsa-tools-1.0.14_rc1.ebuild 2610 RMD160 feff6f013d99dfcd22cc3a3d294c3faa
 MD5 bea8aadc83907e305f4852ee2748d0cd alsa-tools-1.0.14_rc1.ebuild 2610
 RMD160 feff6f013d99dfcd22cc3a3d294c3faab9dc901f alsa-tools-1.0.14_rc1.ebuild 2610
 SHA256 f7b31778d4fddcc8e6cdada560a784b94658f6506c2f79bd7eb7de7f8204cccf alsa-tools-1.0.14_rc1.ebuild 2610
-MISC ChangeLog 17310 RMD160 2f296d3f476cbaa06f550305ab1be0e321a12b12 SHA1 7b0c528a832493b400d98374076611dcf548d2bb SHA256 ccd4433c81574701d4e6fef23a829e79f78b3fb028bc4d133af499d0c3dd4936
-MD5 38bd2036c0fe2185734f0ecdab2be171 ChangeLog 17310
-RMD160 2f296d3f476cbaa06f550305ab1be0e321a12b12 ChangeLog 17310
-SHA256 ccd4433c81574701d4e6fef23a829e79f78b3fb028bc4d133af499d0c3dd4936 ChangeLog 17310
+MISC ChangeLog 17524 RMD160 8f24f55a252fe467db9d67cdd12f658d4309c8e3 SHA1 f28f8db37ecd347e7c8ca5f2106e3c5a2be3f14b SHA256 9eff43da5719a05d85ffee2fa724eef84de0c30a0d6d7295bd7b37ab4810a315
+MD5 7a60b0b326a4caa4f55a8c867fd2690f ChangeLog 17524
+RMD160 8f24f55a252fe467db9d67cdd12f658d4309c8e3 ChangeLog 17524
+SHA256 9eff43da5719a05d85ffee2fa724eef84de0c30a0d6d7295bd7b37ab4810a315 ChangeLog 17524
 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 09a1d4e040f26bf2416dc5a690a1e4b0 files/digest-alsa-tools-1.0.10 259
-RMD160 c3d04413fee407baf7501802a53d889bb45106e3 files/digest-alsa-tools-1.0.10 259
-SHA256 ce424d0a0a3bd9e96853bc7be548bfa41ecd5fa99e6911c49c6225f93a40afe2 files/digest-alsa-tools-1.0.10 259
-MD5 34b1ebcbc8fcc1e8eb025b63e55618e6 files/digest-alsa-tools-1.0.11 259
-RMD160 2336ac69e23105cda0913e10d3a10f045ea99b0e files/digest-alsa-tools-1.0.11 259
-SHA256 49c70401b586b38e09532a5a866450d92f6890a13464c8280a472afdce41612f files/digest-alsa-tools-1.0.11 259
 MD5 e22c0ef0de23e52175805fd4afa5a329 files/digest-alsa-tools-1.0.12 259
 RMD160 8afa38dda1f6cf26d2a757836c7f87a049329a2c files/digest-alsa-tools-1.0.12 259
 SHA256 34c85ebf1c99f8568dd67c8bdd8979104c9827043fb5b1e60027cad9495c8985 files/digest-alsa-tools-1.0.12 259
@@ -56,7 +40,7 @@ SHA256 ed4e83c5e9dfb0acb7f9bed2ffcbe387ce74d04845da9b4b0d5636ce7d72560d files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFfbVZAiZjviIA2XgRAmUjAKCIR0gZbkSyCsoKiaSovacRrUH73wCdE5/5
-WDdfDzMiQOQnawIKLZCcN+U=
-=TLhP
+iD8DBQFFimSeAiZjviIA2XgRAutMAJ0Zzzg0KjCFMFjHF4i9PrYW12LAkwCg2qs8
+fBSTB/skFtIn9lt50Qa79/Y=
+=zglI
 -----END PGP SIGNATURE-----
diff --git a/media-sound/alsa-tools/alsa-tools-1.0.10.ebuild b/media-sound/alsa-tools/alsa-tools-1.0.10.ebuild
deleted file mode 100644
index d2a7a949123f..000000000000
--- a/media-sound/alsa-tools/alsa-tools-1.0.10.ebuild
+++ /dev/null
@@ -1,96 +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-tools/alsa-tools-1.0.10.ebuild,v 1.8 2006/07/14 21:45:22 flameeyes Exp $
-
-inherit eutils flag-o-matic
-
-MY_P="${P/_rc/rc}"
-
-DESCRIPTION="Advanced Linux Sound Architecture tools"
-HOMEPAGE="http://www.alsa-project.org"
-SRC_URI="mirror://alsaproject/tools/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0.9"
-KEYWORDS="amd64 ~mips ppc ppc64 sparc x86"
-IUSE="fltk gtk"
-
-RDEPEND=">=media-libs/alsa-lib-1.0.0
-	virtual/alsa
-	fltk? ( =x11-libs/fltk-1.1* )
-	gtk? ( =x11-libs/gtk+-1.2* )"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	# This is a list of the tools in the package.
-	# Some of the tools don't make proper use of CFLAGS, even though
-	# all of them seem to use autoconf.	 This needs to be fixed.
-	#
-	# By default, all the supported tools will be compiled.
-	# If you want to only compile for specific tool(s), set ALSA_TOOLS
-	# environment to a space-separated list of tools that you want to build.
-	# For example:
-	#
-	#	env ALSA_TOOLS='as10k1 ac3dec' emerge alsa-tools
-	#
-	if [ -z "${ALSA_TOOLS}" ]; then
-		ALSA_TOOLS="ac3dec as10k1 hdsploader mixartloader seq/sbiload \
-					sscape_ctl us428control usx2yloader vxloader"
-
-		if use fltk; then
-			ALSA_TOOLS="${ALSA_TOOLS} hdspconf hdspmixer"
-		fi
-
-		if use gtk; then
-			ALSA_TOOLS="${ALSA_TOOLS} echomixer envy24control rmedigicontrol"
-		fi
-
-		# sb16_csp won't build on ppc64 _AND_ ppc (and is not needed)
-		if	use !ppc64 && use !ppc; then
-			ALSA_TOOLS="${ALSA_TOOLS} sb16_csp"
-		fi
-
-	fi
-}
-
-src_compile() {
-	if use fltk; then
-		# hdspmixer requires fltk
-		append-ldflags "-L/usr/$(get_libdir)/fltk-1.1"
-		append-flags "-I/usr/include/fltk-1.1"
-	fi
-
-	# hdspmixer is missing depconf - copy from the hdsploader directory
-	cp ${S}/hdsploader/depcomp ${S}/hdspmixer/
-
-	local f
-	for f in ${ALSA_TOOLS}
-	do
-		cd "${S}/${f}"
-		econf || die "econf failed"
-		make || die "make failed"
-	done
-}
-
-src_install() {
-	local f
-	for f in ${ALSA_TOOLS}
-	do
-		# Install the main stuff
-		cd "${S}/${f}"
-		make DESTDIR="${D}" install || die
-
-		# Install the text documentation
-		local doc
-		for doc in README TODO ChangeLog AUTHORS
-		do
-			if [ -f "${doc}" ]
-			then
-			mv "${doc}" "${doc}.`basename ${f}`"
-			dodoc "${doc}.`basename ${f}`"
-			fi
-		done
-	done
-}
diff --git a/media-sound/alsa-tools/alsa-tools-1.0.11.ebuild b/media-sound/alsa-tools/alsa-tools-1.0.11.ebuild
deleted file mode 100644
index ae7f91eccb2f..000000000000
--- a/media-sound/alsa-tools/alsa-tools-1.0.11.ebuild
+++ /dev/null
@@ -1,111 +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-tools/alsa-tools-1.0.11.ebuild,v 1.9 2006/07/14 21:45:22 flameeyes Exp $
-
-inherit eutils flag-o-matic autotools
-
-MY_P="${P/_rc/rc}"
-
-DESCRIPTION="Advanced Linux Sound Architecture tools"
-HOMEPAGE="http://www.alsa-project.org"
-SRC_URI="mirror://alsaproject/tools/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0.9"
-KEYWORDS="amd64 ~mips ppc ppc64 sparc x86"
-IUSE="fltk gtk"
-
-RDEPEND=">=media-libs/alsa-lib-1.0.0
-	virtual/alsa
-	fltk? ( =x11-libs/fltk-1.1* )
-	gtk? ( =x11-libs/gtk+-1.2* )"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	# This is a list of the tools in the package.
-	# Some of the tools don't make proper use of CFLAGS, even though
-	# all of them seem to use autoconf.	 This needs to be fixed.
-	#
-	# By default, all the supported tools will be compiled.
-	# If you want to only compile for specific tool(s), set ALSA_TOOLS
-	# environment to a space-separated list of tools that you want to build.
-	# For example:
-	#
-	#	env ALSA_TOOLS='as10k1 ac3dec' emerge alsa-tools
-	#
-	if [ -z "${ALSA_TOOLS}" ]; then
-		ALSA_TOOLS="ac3dec as10k1 hdsploader mixartloader seq/sbiload \
-					sscape_ctl us428control usx2yloader vxloader"
-
-		if use fltk; then
-			ALSA_TOOLS="${ALSA_TOOLS} hdspconf hdspmixer"
-		fi
-
-		if use gtk; then
-			ALSA_TOOLS="${ALSA_TOOLS} echomixer envy24control rmedigicontrol"
-		fi
-
-		# sb16_csp won't build on ppc64 _AND_ ppc (and is not needed)
-		if	use !ppc64 && use !ppc; then
-			ALSA_TOOLS="${ALSA_TOOLS} sb16_csp"
-		fi
-
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${P}-asneeded.patch"
-
-	for dir in echomixer envy24control rmedigicontrol; do
-		pushd ${dir} &> /dev/null
-		eautomake
-		popd &> /dev/null
-	done
-
-	elibtoolize
-}
-
-src_compile() {
-	if use fltk; then
-		# hdspmixer requires fltk
-		append-ldflags "-L/usr/$(get_libdir)/fltk-1.1"
-		append-flags "-I/usr/include/fltk-1.1"
-	fi
-
-	# hdspmixer is missing depconf - copy from the hdsploader directory
-	cp ${S}/hdsploader/depcomp ${S}/hdspmixer/
-
-	local f
-	for f in ${ALSA_TOOLS}
-	do
-		cd "${S}/${f}"
-		econf || die "econf failed"
-		make || die "make failed"
-	done
-}
-
-src_install() {
-	local f
-	for f in ${ALSA_TOOLS}
-	do
-		# Install the main stuff
-		cd "${S}/${f}"
-		make DESTDIR="${D}" install || die
-
-		# Install the text documentation
-		local doc
-		for doc in README TODO ChangeLog AUTHORS
-		do
-			if [ -f "${doc}" ]
-			then
-			mv "${doc}" "${doc}.`basename ${f}`"
-			dodoc "${doc}.`basename ${f}`"
-			fi
-		done
-	done
-}
diff --git a/media-sound/alsa-tools/files/digest-alsa-tools-1.0.10 b/media-sound/alsa-tools/files/digest-alsa-tools-1.0.10
deleted file mode 100644
index b80365fbde93..000000000000
--- a/media-sound/alsa-tools/files/digest-alsa-tools-1.0.10
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 537d691e87d9af6343cef5ddcad70018 alsa-tools-1.0.10.tar.bz2 1376274
-RMD160 0cbdd0f6e1692b129aca7f56e78fea1fd3b02db6 alsa-tools-1.0.10.tar.bz2 1376274
-SHA256 ff73db0ec2ab67755206801cdc8137d16e28d04478f0a29cbb9b2ff47960bfdc alsa-tools-1.0.10.tar.bz2 1376274
diff --git a/media-sound/alsa-tools/files/digest-alsa-tools-1.0.11 b/media-sound/alsa-tools/files/digest-alsa-tools-1.0.11
deleted file mode 100644
index 98117c94da2c..000000000000
--- a/media-sound/alsa-tools/files/digest-alsa-tools-1.0.11
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 a2840af7f1624d46257b6a53aea43eb7 alsa-tools-1.0.11.tar.bz2 1445743
-RMD160 b011fbbf5ca387a565fa251e7d351b14f05373cd alsa-tools-1.0.11.tar.bz2 1445743
-SHA256 0dd23c7412ca6ea9c005a9a95b0abc46f22792e5df1b4dac7bca2b56335b5e54 alsa-tools-1.0.11.tar.bz2 1445743
diff --git a/media-sound/alsa-utils/Manifest b/media-sound/alsa-utils/Manifest
index 9b678ca83312..91bf392c26d8 100644
--- a/media-sound/alsa-utils/Manifest
+++ b/media-sound/alsa-utils/Manifest
@@ -21,15 +21,10 @@ AUX alsasound.confd 515 RMD160 16ab3f3d931436947172da8efa656d6af1635049 SHA1 6d5
 MD5 f4f492c382b243ebf558809a372fd6b7 files/alsasound.confd 515
 RMD160 16ab3f3d931436947172da8efa656d6af1635049 files/alsasound.confd 515
 SHA256 01f2c85c61cd9b40124945f31ece9ecabc3aefe3c57c53dd3c1eda994e2c2827 files/alsasound.confd 515
-DIST alsa-utils-1.0.10.tar.bz2 991322 RMD160 aed292c7d7e87ed2eb651971836aec6a73021df2 SHA1 0432425d7ca6592fb8050e4a776b23a5258faeaf SHA256 2c4b9f2f7424891085775e1c45074daa954345c228cb9ec0c86888e977514e70
 DIST alsa-utils-1.0.11.tar.bz2 990018 RMD160 17da9d3743a70352ae448569fbeb2f2aab3e78b0 SHA1 abc890763afb5c4e9d5a3b4a1649a0145368d389 SHA256 4b33229437ddab4196b8fd0bdfaf074314185a5afd3e24bbe28025022b42d01b
 DIST alsa-utils-1.0.12.tar.bz2 979797 RMD160 26ff9d4fed31bdecbfeb65b09ef52c05aecba733 SHA1 ea43e407ae50ec50a00679d79c86909f895f632c SHA256 a2fb425ee6b824f2442d38ce14ce630ae8332b1f4a6eeb45bee1c0cafac725a8
 DIST alsa-utils-1.0.13.tar.bz2 980874 RMD160 2a3cd882543232f81e211d216c9e8112da3f8977 SHA1 05b460a0e7ae6519ea37240476f026b59dbc710d SHA256 d7fe8a7995bc74331c89fbc1937a0682d239339d6659a402cd7b8e4b96c050f0
 DIST alsa-utils-1.0.14rc1.tar.bz2 980802 RMD160 7d05cca060486d64e6ba87aa8c4a7e9b7a069ddb SHA1 7766c7c09f162b10e1abcb6733f57d5935d7f1ec SHA256 9b8ede92cfa5f28d6bf6bb1253bdc562f8ac937797fb5e5303609e2e49c2e886
-EBUILD alsa-utils-1.0.10.ebuild 2417 RMD160 857568f75c1b3e51db84761a52abdfff5631d03c SHA1 9f5cd41a36303651f065155617554f5516ca8100 SHA256 e0d80978078dc577bfe1909fa6e04f7683a3ae40573519d97be87735e2e53c2a
-MD5 9dbe3716444af3250a790093b0d653d7 alsa-utils-1.0.10.ebuild 2417
-RMD160 857568f75c1b3e51db84761a52abdfff5631d03c alsa-utils-1.0.10.ebuild 2417
-SHA256 e0d80978078dc577bfe1909fa6e04f7683a3ae40573519d97be87735e2e53c2a alsa-utils-1.0.10.ebuild 2417
 EBUILD alsa-utils-1.0.11.ebuild 2560 RMD160 8aafe9a04d7daf62308c8b2dc5f2184b1defe561 SHA1 e1a9f3c24fe7183bab26cba5b9007ab6ea385dec SHA256 afe6d77c328c619ac52fcc58645abcf8159a2429f78b4d2e6a228fd85d3d0fb8
 MD5 d78be004d5d528027c7a6517e0951bd6 alsa-utils-1.0.11.ebuild 2560
 RMD160 8aafe9a04d7daf62308c8b2dc5f2184b1defe561 alsa-utils-1.0.11.ebuild 2560
@@ -46,17 +41,14 @@ EBUILD alsa-utils-1.0.14_rc1.ebuild 2586 RMD160 9568d6f43fdd8aae498c19af5b8a4850
 MD5 78caa6d2797ed29c4d03ff02ab436c72 alsa-utils-1.0.14_rc1.ebuild 2586
 RMD160 9568d6f43fdd8aae498c19af5b8a4850a2ebe78b alsa-utils-1.0.14_rc1.ebuild 2586
 SHA256 bd6fef1f84d65bc8a0b457b44958774cc192a94a6e6de697d72f98acc0e09465 alsa-utils-1.0.14_rc1.ebuild 2586
-MISC ChangeLog 26526 RMD160 f1610544aa24a10b357eb49e9d6800a54f298ca5 SHA1 646d5dbff67d9649d0661e60f1017e8a67d0282d SHA256 d47c84f5b73691a91c800a0ee6570608511dfab451ce093a4d8cf11e2a7054f4
-MD5 f4038ff80bf38e50905efcdc639cf36c ChangeLog 26526
-RMD160 f1610544aa24a10b357eb49e9d6800a54f298ca5 ChangeLog 26526
-SHA256 d47c84f5b73691a91c800a0ee6570608511dfab451ce093a4d8cf11e2a7054f4 ChangeLog 26526
+MISC ChangeLog 26713 RMD160 4a2ed0a60ea1f72bc58fc5afdbe1abe7cc4c678f SHA1 2856059b134d4988d4d5f3ceee7a407d470f5144 SHA256 3e17dd06bd43185ceb331ad20428943d8eb11e17d02182c6c1da86ce4744c0b8
+MD5 dc8d91ecd70007ef8c5970ed28949d28 ChangeLog 26713
+RMD160 4a2ed0a60ea1f72bc58fc5afdbe1abe7cc4c678f ChangeLog 26713
+SHA256 3e17dd06bd43185ceb331ad20428943d8eb11e17d02182c6c1da86ce4744c0b8 ChangeLog 26713
 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 8cfd8214a95b738a106e445cbcc17c30 files/digest-alsa-utils-1.0.10 256
-RMD160 f2bc67430e6fc5b5fc918588c37ceb255b55db1a files/digest-alsa-utils-1.0.10 256
-SHA256 af7e2d1fea3098ee2112c08c544165055f0e1c5ff36cc196f9fdc4906bc7dddc files/digest-alsa-utils-1.0.10 256
 MD5 a24eb6c8877ac01761cb398d4935e6ed files/digest-alsa-utils-1.0.11 256
 RMD160 422fb507940fa0ced1e6c8e2c90ae663c9cfed36 files/digest-alsa-utils-1.0.11 256
 SHA256 8443ae03e8421713892de04e3bb5e0ade613531cf69a437349b5cc2bf9f04f3b files/digest-alsa-utils-1.0.11 256
@@ -72,7 +64,7 @@ SHA256 1a28d2f5f3186283c68d15b4893b297a550cfe99eb416389fed13d8298c46ae3 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFf9WkAiZjviIA2XgRAoBkAKCu2uJtRAchLzaXoaOM78Bv1jQz4ACdGLJi
-Dv03V5GryLnSTscwEZQVOmM=
-=hFs9
+iD8DBQFFimS0AiZjviIA2XgRAjBPAKDTyHEAwRXRLVbI+Uk7GC3YUeSoSQCgpCNu
+LYmWyve1wkrS6qT8QHJhTTk=
+=h/M3
 -----END PGP SIGNATURE-----
diff --git a/media-sound/alsa-utils/alsa-utils-1.0.10.ebuild b/media-sound/alsa-utils/alsa-utils-1.0.10.ebuild
deleted file mode 100644
index 53cab07456ac..000000000000
--- a/media-sound/alsa-utils/alsa-utils-1.0.10.ebuild
+++ /dev/null
@@ -1,76 +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-utils/alsa-utils-1.0.10.ebuild,v 1.9 2006/03/01 05:22:57 vapier Exp $
-
-inherit eutils flag-o-matic autotools
-
-MY_P="${P/_rc/rc}"
-
-DESCRIPTION="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)"
-HOMEPAGE="http://www.alsa-project.org/"
-SRC_URI="mirror://alsaproject/utils/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0.9"
-KEYWORDS="alpha amd64 hppa ~ia64 ~mips ppc ppc64 sh sparc x86"
-IUSE="nls"
-
-DEPEND=">=sys-libs/ncurses-5.1
-	dev-util/dialog
-	>=media-libs/alsa-lib-1.0.10_rc1"
-RDEPEND="${DEPEND}
-	sys-apps/pciutils"
-
-S=${WORKDIR}/${MY_P}
-
-src_compile() {
-	econf \
-		$(use_enable nls) \
-		|| die "configure failed"
-
-	emake || die "make failed"
-}
-
-src_install() {
-	local ALSA_UTILS_DOCS="ChangeLog README TODO
-		seq/aconnect/README.aconnect
-		seq/aseqnet/README.aseqnet"
-
-	make DESTDIR="${D}" install || die "Installation Failed"
-
-	dodoc ${ALSA_UTILS_DOCS}
-	newdoc alsamixer/README README.alsamixer
-
-	newconfd ${FILESDIR}/alsasound.confd alsasound
-	insinto /etc/modules.d
-	newins ${FILESDIR}/alsa-modules.conf-rc alsa
-	newinitd ${FILESDIR}/alsasound-1.0.10_rc2 alsasound
-}
-
-pkg_postinst() {
-	echo
-	einfo "The alsasound initscript is now provided by alsa-utils"
-	einfo "instead of alsa-driver for compatibility with kernel-sources"
-	einfo "which provide ALSA internally."
-	echo
-	einfo "To take advantage of this, and automate the process of"
-	einfo "loading and unloading the ALSA sound drivers as well as"
-	einfo "storing and restoring sound-card mixer levels you should"
-	einfo "add alsasound to the boot runlevel. You can do this as"
-	einfo "root like so:"
-	einfo "	# rc-update add alsasound boot"
-	echo
-	einfo "You will also need to edit the file /etc/modules.d/alsa"
-	einfo "and run modules-update. You can do this like so:"
-	einfo "	# nano -w /etc/modules.d/alsa && modules-update"
-	echo
-
-	if use sparc; then
-		ewarn "Old versions of alsa-drivers had a broken snd-ioctl32 module"
-		ewarn "which causes sparc64 machines to lockup on such tasks as"
-		ewarn "changing the volume.  Because of this, it is VERY important"
-		ewarn "that you do not use the snd-ioctl32 modules contained in"
-		ewarn "development-sources or <=gentoo-dev-sources-2.6.7-r14.  Doing so"
-		ewarn "may result in an unbootable system if you start alsasound at boot."
-	fi
-}
diff --git a/media-sound/alsa-utils/files/digest-alsa-utils-1.0.10 b/media-sound/alsa-utils/files/digest-alsa-utils-1.0.10
deleted file mode 100644
index badbcec337e6..000000000000
--- a/media-sound/alsa-utils/files/digest-alsa-utils-1.0.10
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 94bdec65e9c3fd02f7ef8ceb8f918afe alsa-utils-1.0.10.tar.bz2 991322
-RMD160 aed292c7d7e87ed2eb651971836aec6a73021df2 alsa-utils-1.0.10.tar.bz2 991322
-SHA256 2c4b9f2f7424891085775e1c45074daa954345c228cb9ec0c86888e977514e70 alsa-utils-1.0.10.tar.bz2 991322