Version bump to latest version, and remove release candidate.

Package-Manager: portage-2.1.1_rc1-r2

15 files changed, 92 insertions, 536 deletions

diff --git a/media-sound/alsa-driver/Manifest b/media-sound/alsa-driver/Manifest
index 15bcb7770d22..76f54eaf845a 100644
--- a/media-sound/alsa-driver/Manifest
+++ b/media-sound/alsa-driver/Manifest
@@ -27,7 +27,7 @@ RMD160 2dbbb2693e2726cdf9488244311003e4415b0bb7 files/alsa-driver-mcp55.patch 71
 SHA256 208dd634215c50020f0d5b11d2ff16962c07e53f007b73d4aa0aa2b5ac54074e files/alsa-driver-mcp55.patch 714
 DIST alsa-driver-1.0.10.tar.bz2 2194644 RMD160 24cf013e40095d0e143969ce864fb34aff1edefe SHA256 60fd070075791fff13d3c3682da370b47778a564bc25c1b72f02f1d60ffa98f0
 DIST alsa-driver-1.0.11.tar.bz2 2343130 RMD160 8f6d0d1f61bcf8d62fa5ca1df13accf0cec54650 SHA1 8cb4ca26c656b000cd6258f406a79e4b5022a94f SHA256 c717b8a237e38e17a2c71f3fcde6a89907accd175f8bac4f09c054444e14069f
-DIST alsa-driver-1.0.12rc1.tar.bz2 2395489 RMD160 ec682a22f7046c3786dcb069e20fc1fe1e82cbe9 SHA1 4bbec049141210416f9bc99e90ce48c1e23b871c SHA256 1d4b44a755e67a1322b15533ffa1e8e3b6f4eca623f786be86e3d9ad8cc0cea3
+DIST alsa-driver-1.0.12.tar.bz2 2400785 RMD160 426d0243dab046879cfac0c1010774d387ca4e09 SHA1 8e4c23af7b6255107edf7b0bd8d9ad9dc549193c SHA256 08c2d9a426b646fbbdffbe708994af33c3cad90a42fff2ad004bcc8a97252bc1
 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
@@ -36,14 +36,14 @@ EBUILD alsa-driver-1.0.11.ebuild 5134 RMD160 5cf5632f21ec116d323e2fe19db71bd4ead
 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_rc1-r1.ebuild 5173 RMD160 df7c5d669dab399abec088345a146d9dcfc0363b SHA1 778e14de40d85609347630d4286fd188ae79d332 SHA256 bf5622c11baecbff3d2147e82f5c5918bb7e511097083289e1a8fd4065d9270f
-MD5 6432ca718aa0a05d0eeb5f48c7714128 alsa-driver-1.0.12_rc1-r1.ebuild 5173
-RMD160 df7c5d669dab399abec088345a146d9dcfc0363b alsa-driver-1.0.12_rc1-r1.ebuild 5173
-SHA256 bf5622c11baecbff3d2147e82f5c5918bb7e511097083289e1a8fd4065d9270f alsa-driver-1.0.12_rc1-r1.ebuild 5173
-MISC ChangeLog 38081 RMD160 c27765364f218a3bed280e874ed3ebf7eda7fbc3 SHA1 a4d9eb4ec2f446f447a0b901a58b4abedff6d484 SHA256 31596c67a8b67130b41c1355d099f67c1b8e006aec08c914ddca5ab0a68108e4
-MD5 562db87b4beb34379640b7cf7102c572 ChangeLog 38081
-RMD160 c27765364f218a3bed280e874ed3ebf7eda7fbc3 ChangeLog 38081
-SHA256 31596c67a8b67130b41c1355d099f67c1b8e006aec08c914ddca5ab0a68108e4 ChangeLog 38081
+EBUILD alsa-driver-1.0.12.ebuild 5166 RMD160 ee425684043d23a65f40860d29db963c25ae0ab5 SHA1 75c29e321f67e067613ad5be25df2dbdc5a16e15 SHA256 6b1cbd2562eaeac69d49a26241f10ae14b92e91918d31d15807a41134fa0cab7
+MD5 397aba8b4f62a3c1f2e8142c4db0d2e7 alsa-driver-1.0.12.ebuild 5166
+RMD160 ee425684043d23a65f40860d29db963c25ae0ab5 alsa-driver-1.0.12.ebuild 5166
+SHA256 6b1cbd2562eaeac69d49a26241f10ae14b92e91918d31d15807a41134fa0cab7 alsa-driver-1.0.12.ebuild 5166
+MISC ChangeLog 38299 RMD160 2dae2add5165b0176d9df59a23bd74b59cd9f49f SHA1 ba83abf564314a1815193770e73543775040375c SHA256 a5e0237e585b67b432b1823b3ea5c1ba306eeeb7c3f88fa2684dbde9fd4291f1
+MD5 cded5e1fd4c7578de1edbbe0d3b07c7b ChangeLog 38299
+RMD160 2dae2add5165b0176d9df59a23bd74b59cd9f49f ChangeLog 38299
+SHA256 a5e0237e585b67b432b1823b3ea5c1ba306eeeb7c3f88fa2684dbde9fd4291f1 ChangeLog 38299
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
@@ -54,13 +54,13 @@ SHA256 1ae6a70927822418fdc319e0f5454b0799cc1c8d49deee5a4660b34d91458f9c files/di
 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 99149044f48398af37c69b8140037020 files/digest-alsa-driver-1.0.12_rc1-r1 271
-RMD160 a54051df4adac2e89d66386fc6663b4cda7eb5da files/digest-alsa-driver-1.0.12_rc1-r1 271
-SHA256 f1c2be6353a83ed145d4e76fa7fe8a2a8a4e62898ff8ce815fbf69370f5fec87 files/digest-alsa-driver-1.0.12_rc1-r1 271
+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
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFEqU7zAiZjviIA2XgRAtWyAJ4nbRqbBfY68L0bTQxXTtJGXa/44gCggh/o
-d46NSED4G3m6YykEcvnq4yg=
-=U8g2
+iD8DBQFE9qdlAiZjviIA2XgRAhRZAKC2kS85PUQysPhtT8xbK32PEqQfwACdGlbE
+RG1guCvZ7ElJQgWQUgDAOu4=
+=kdz/
 -----END PGP SIGNATURE-----
diff --git a/media-sound/alsa-driver/alsa-driver-1.0.12_rc1-r1.ebuild b/media-sound/alsa-driver/alsa-driver-1.0.12_rc1-r1.ebuild
deleted file mode 100644
index ce01991f2042..000000000000
--- a/media-sound/alsa-driver/alsa-driver-1.0.12_rc1-r1.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_rc1-r1.ebuild,v 1.2 2006/07/03 17:07:37 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}
-	 !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/digest-alsa-driver-1.0.12_rc1-r1 b/media-sound/alsa-driver/files/digest-alsa-driver-1.0.12_rc1-r1
deleted file mode 100644
index b92ea29b4294..000000000000
--- a/media-sound/alsa-driver/files/digest-alsa-driver-1.0.12_rc1-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 78d721fbbf51d84752c39313de06336a alsa-driver-1.0.12rc1.tar.bz2 2395489
-RMD160 ec682a22f7046c3786dcb069e20fc1fe1e82cbe9 alsa-driver-1.0.12rc1.tar.bz2 2395489
-SHA256 1d4b44a755e67a1322b15533ffa1e8e3b6f4eca623f786be86e3d9ad8cc0cea3 alsa-driver-1.0.12rc1.tar.bz2 2395489
diff --git a/media-sound/alsa-firmware/Manifest b/media-sound/alsa-firmware/Manifest
index b8794777ee57..c6168444c528 100644
--- a/media-sound/alsa-firmware/Manifest
+++ b/media-sound/alsa-firmware/Manifest
@@ -3,7 +3,7 @@ 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.12rc1.tar.bz2 2760769 RMD160 6a96ce297aebc5d40ba9e0c2575bf8eb95f626d9 SHA1 caee71e0898a2669017b4dbe51b32e15187a132d SHA256 776916ebb98dc0345215a2c6c83c266366c0858eb901dbdcb00def7fa1b59388
+DIST alsa-firmware-1.0.12.tar.bz2 2843601 RMD160 bab5128c20b8e85f01acc279ba5d389766076a0c SHA1 aa033609ebfedeccc21e120d54dc2dcb8e1d86e5 SHA256 6e7d3104c4de7d031790c1e750067b13e9481bf2855b0806a300d1e697549fbd
 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
@@ -13,18 +13,18 @@ EBUILD alsa-firmware-1.0.11.ebuild 726 RMD160 ba5ade53188aa1f8c5f962305428694abf
 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_rc1.ebuild 735 RMD160 a2beebd87b4656d76fd9e32a3c0758bc00a9e49c SHA1 5256afcffffba02d1361e42f2a417664ac1378f6 SHA256 4ec8e6df1e6b5978f457202c936500e0c3c9364fa49e632ef7104a2a01d08824
-MD5 8c821cfbe2f4ae32b5fa9f5447467156 alsa-firmware-1.0.12_rc1.ebuild 735
-RMD160 a2beebd87b4656d76fd9e32a3c0758bc00a9e49c alsa-firmware-1.0.12_rc1.ebuild 735
-SHA256 4ec8e6df1e6b5978f457202c936500e0c3c9364fa49e632ef7104a2a01d08824 alsa-firmware-1.0.12_rc1.ebuild 735
+EBUILD alsa-firmware-1.0.12.ebuild 731 RMD160 254c918122cf2aa9ac678ab12d00a31ce4bcb447 SHA1 264b4bb3897f84adc4facaa126188b88d8ee2ce1 SHA256 a0431103dc48edc00f58fedd3b1429eb36f46ca447c5e07b70d8065fc7bd3fb7
+MD5 4f8e80c4410b31750d43fa7fed922212 alsa-firmware-1.0.12.ebuild 731
+RMD160 254c918122cf2aa9ac678ab12d00a31ce4bcb447 alsa-firmware-1.0.12.ebuild 731
+SHA256 a0431103dc48edc00f58fedd3b1429eb36f46ca447c5e07b70d8065fc7bd3fb7 alsa-firmware-1.0.12.ebuild 731
 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 4462 RMD160 37bfb1ce20d71b171be6b3864074fe6e9366b242 SHA1 60e44edcd135c6a4e80917b9f6efb774a70f93f1 SHA256 b0a289801d23155c9863107f493bc77e241345cd626c8ae57b64fbf3593dae15
-MD5 179755f002dab4307f5b0d6397e14bf2 ChangeLog 4462
-RMD160 37bfb1ce20d71b171be6b3864074fe6e9366b242 ChangeLog 4462
-SHA256 b0a289801d23155c9863107f493bc77e241345cd626c8ae57b64fbf3593dae15 ChangeLog 4462
+MISC ChangeLog 4683 RMD160 0272270b6c53461a22c06f81cfb8596b991dce3e SHA1 022ff99bf23346849bb3521c014796a0d0c0c228 SHA256 679a4faf6222c60bab294142fcb478c390313f84869ae5d24cb42163579e4cea
+MD5 1d974cf86c07215ef6a28ac295889068 ChangeLog 4683
+RMD160 0272270b6c53461a22c06f81cfb8596b991dce3e ChangeLog 4683
+SHA256 679a4faf6222c60bab294142fcb478c390313f84869ae5d24cb42163579e4cea ChangeLog 4683
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
@@ -35,16 +35,16 @@ SHA256 f535e1249d6aa514bfd1acfb763bb09ac50ae799b780078b40c429192bd0aecc files/di
 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 d3c5991d3bb425f02bf1f0cb07a7ebc8 files/digest-alsa-firmware-1.0.12_rc1 277
-RMD160 e08f3e1ffc9609f0c5c50e0e691268318d9e84de files/digest-alsa-firmware-1.0.12_rc1 277
-SHA256 069d4a2a0bcfb3a5f91145fc943b9531dbcf0ff77117cfa27b5e5e5d0f868811 files/digest-alsa-firmware-1.0.12_rc1 277
+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
 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.3 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFEm+JUAiZjviIA2XgRAs1tAKDbmPmcza8DxgPSSPnRmm9Uv7bGbACglcbf
-jEp1tOvj954uBRiYrmUfRik=
-=rmzL
+iD8DBQFE9qi1AiZjviIA2XgRAlN/AJ0dQGGCzADVGvG0CSE34p5yxHxDHwCfW0HA
+49B1vtVHRp7jOpMNToygqSI=
+=QB7y
 -----END PGP SIGNATURE-----
diff --git a/media-sound/alsa-firmware/alsa-firmware-1.0.12_rc1.ebuild b/media-sound/alsa-firmware/alsa-firmware-1.0.12_rc1.ebuild
deleted file mode 100644
index f59209b64722..000000000000
--- a/media-sound/alsa-firmware/alsa-firmware-1.0.12_rc1.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.12_rc1.ebuild,v 1.1 2006/06/23 12:45:02 flameeyes 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 () {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc README
-}
diff --git a/media-sound/alsa-firmware/files/digest-alsa-firmware-1.0.12_rc1 b/media-sound/alsa-firmware/files/digest-alsa-firmware-1.0.12_rc1
deleted file mode 100644
index 4192ea364ef2..000000000000
--- a/media-sound/alsa-firmware/files/digest-alsa-firmware-1.0.12_rc1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 261b08f95d7a65a510df48e16e92ea7a alsa-firmware-1.0.12rc1.tar.bz2 2760769
-RMD160 6a96ce297aebc5d40ba9e0c2575bf8eb95f626d9 alsa-firmware-1.0.12rc1.tar.bz2 2760769
-SHA256 776916ebb98dc0345215a2c6c83c266366c0858eb901dbdcb00def7fa1b59388 alsa-firmware-1.0.12rc1.tar.bz2 2760769
diff --git a/media-sound/alsa-headers/Manifest b/media-sound/alsa-headers/Manifest
index 763eb96d2d60..2e4a12f4f488 100644
--- a/media-sound/alsa-headers/Manifest
+++ b/media-sound/alsa-headers/Manifest
@@ -1,10 +1,13 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX alsa-headers-1.0.6a-user.patch 419 RMD160 a778185703b19cfe07b7c4578a10196fd9f9d5c0 SHA1 9f76087732817fc1d4a01ebf87e418269028b1ef SHA256 fbe9dfbbdfdf83b2c895a5d401cec13c16a490a03617419be701f167c38cab09
 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 SHA256 60fd070075791fff13d3c3682da370b47778a564bc25c1b72f02f1d60ffa98f0
 DIST alsa-driver-1.0.11.tar.bz2 2343130 RMD160 8f6d0d1f61bcf8d62fa5ca1df13accf0cec54650 SHA1 8cb4ca26c656b000cd6258f406a79e4b5022a94f SHA256 c717b8a237e38e17a2c71f3fcde6a89907accd175f8bac4f09c054444e14069f
-DIST alsa-driver-1.0.12rc1.tar.bz2 2395489 RMD160 ec682a22f7046c3786dcb069e20fc1fe1e82cbe9 SHA1 4bbec049141210416f9bc99e90ce48c1e23b871c SHA256 1d4b44a755e67a1322b15533ffa1e8e3b6f4eca623f786be86e3d9ad8cc0cea3
+DIST alsa-driver-1.0.12.tar.bz2 2400785 RMD160 426d0243dab046879cfac0c1010774d387ca4e09 SHA1 8e4c23af7b6255107edf7b0bd8d9ad9dc549193c SHA256 08c2d9a426b646fbbdffbe708994af33c3cad90a42fff2ad004bcc8a97252bc1
 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
@@ -13,14 +16,14 @@ EBUILD alsa-headers-1.0.11.ebuild 1011 RMD160 934ed8c1ad8de6508792d32ea24697e879
 MD5 bd01a316d942578b60d5e3c4cbe2bf2a alsa-headers-1.0.11.ebuild 1011
 RMD160 934ed8c1ad8de6508792d32ea24697e87925ed70 alsa-headers-1.0.11.ebuild 1011
 SHA256 c17a668b91388d939fcd7400877414773cba58d619d6373d2ff46931b24ded50 alsa-headers-1.0.11.ebuild 1011
-EBUILD alsa-headers-1.0.12_rc1.ebuild 1038 RMD160 fbe32eb42c29525f74bce16cb7cb15fa6984a487 SHA1 d4938062057eb6f881b990d73f3af11a42de2132 SHA256 a5e927a840282cf05f0eb984f37f2c47208735b3722e552a1f5a608216b67c66
-MD5 5f4965b367cf75c9082a102da3e7c096 alsa-headers-1.0.12_rc1.ebuild 1038
-RMD160 fbe32eb42c29525f74bce16cb7cb15fa6984a487 alsa-headers-1.0.12_rc1.ebuild 1038
-SHA256 a5e927a840282cf05f0eb984f37f2c47208735b3722e552a1f5a608216b67c66 alsa-headers-1.0.12_rc1.ebuild 1038
-MISC ChangeLog 10885 RMD160 fbd269a0f905cdbf25eeaeecbfd3f82efae11f0e SHA1 8f204f3244ed3385661a42ab685cf87394ba3c43 SHA256 e24d9d1b4395c676ca72a5a04cc4116db9bd6e5c649841b40cb57338fe1d9334
-MD5 b9c929ba2ba593d4f56c9b4bc889672f ChangeLog 10885
-RMD160 fbd269a0f905cdbf25eeaeecbfd3f82efae11f0e ChangeLog 10885
-SHA256 e24d9d1b4395c676ca72a5a04cc4116db9bd6e5c649841b40cb57338fe1d9334 ChangeLog 10885
+EBUILD alsa-headers-1.0.12.ebuild 1034 RMD160 49e425b1d607c97d7283463246c224537a947b0a SHA1 f5b0bf0ca1e9c5a2dc6275400a53f43f4bccac6e SHA256 8c1a77b9750cf6609fa3404a158d64e8578949491a4ba0aac7432a65449ceb75
+MD5 db864bf177323fc90b50c255c75adca4 alsa-headers-1.0.12.ebuild 1034
+RMD160 49e425b1d607c97d7283463246c224537a947b0a alsa-headers-1.0.12.ebuild 1034
+SHA256 8c1a77b9750cf6609fa3404a158d64e8578949491a4ba0aac7432a65449ceb75 alsa-headers-1.0.12.ebuild 1034
+MISC ChangeLog 11107 RMD160 db4d31c5131df138525ae13f6c618b9af1908691 SHA1 ec6650fe3d8c013ae74880723665cd40db2bcc45 SHA256 5cd9746ba981399214e1c3f2251029f0222245fca52b4a969e36b28100b94a26
+MD5 dd77692ecf76e391fcd2709f3e317cc2 ChangeLog 11107
+RMD160 db4d31c5131df138525ae13f6c618b9af1908691 ChangeLog 11107
+SHA256 5cd9746ba981399214e1c3f2251029f0222245fca52b4a969e36b28100b94a26 ChangeLog 11107
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
@@ -31,6 +34,13 @@ SHA256 1ae6a70927822418fdc319e0f5454b0799cc1c8d49deee5a4660b34d91458f9c files/di
 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
-MD5 99149044f48398af37c69b8140037020 files/digest-alsa-headers-1.0.12_rc1 271
-RMD160 a54051df4adac2e89d66386fc6663b4cda7eb5da files/digest-alsa-headers-1.0.12_rc1 271
-SHA256 f1c2be6353a83ed145d4e76fa7fe8a2a8a4e62898ff8ce815fbf69370f5fec87 files/digest-alsa-headers-1.0.12_rc1 271
+MD5 4b1e19d8f01d2241c557f5dce0100587 files/digest-alsa-headers-1.0.12 262
+RMD160 ab82f746b4ea2579f0da3e76c2785021519d16c0 files/digest-alsa-headers-1.0.12 262
+SHA256 34b56f728a398a64beed2b762914cc50d8347a67f406109da576294ab15186aa files/digest-alsa-headers-1.0.12 262
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFE9qdSAiZjviIA2XgRAjGFAJ9gDPV8yLlofYvyqYDNIImt22RW6wCfYqqB
+Pqt2EyrjqxyzTrICeuP4vQU=
+=wSR8
+-----END PGP SIGNATURE-----
diff --git a/media-sound/alsa-headers/alsa-headers-1.0.12_rc1.ebuild b/media-sound/alsa-headers/alsa-headers-1.0.12_rc1.ebuild
deleted file mode 100644
index 295dcce310a2..000000000000
--- a/media-sound/alsa-headers/alsa-headers-1.0.12_rc1.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.12_rc1.ebuild,v 1.1 2006/06/23 12:47:26 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/files/digest-alsa-headers-1.0.12_rc1 b/media-sound/alsa-headers/files/digest-alsa-headers-1.0.12_rc1
deleted file mode 100644
index b92ea29b4294..000000000000
--- a/media-sound/alsa-headers/files/digest-alsa-headers-1.0.12_rc1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 78d721fbbf51d84752c39313de06336a alsa-driver-1.0.12rc1.tar.bz2 2395489
-RMD160 ec682a22f7046c3786dcb069e20fc1fe1e82cbe9 alsa-driver-1.0.12rc1.tar.bz2 2395489
-SHA256 1d4b44a755e67a1322b15533ffa1e8e3b6f4eca623f786be86e3d9ad8cc0cea3 alsa-driver-1.0.12rc1.tar.bz2 2395489
diff --git a/media-sound/alsa-tools/Manifest b/media-sound/alsa-tools/Manifest
index 8e2604129b0f..5fdee67832b0 100644
--- a/media-sound/alsa-tools/Manifest
+++ b/media-sound/alsa-tools/Manifest
@@ -7,7 +7,7 @@ RMD160 f1b3fa1fca50da0827beff8f87f514814d938833 files/alsa-tools-1.0.11-asneeded
 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.12rc1.tar.bz2 1444446 RMD160 322659fdc29a7fec539edaf59c1f36eafc3d03bf SHA1 f5f918c7115c0e038d06ac5211f57cf2c2bda887 SHA256 99130ea5442a357e20459bc5472f948ff6a06ce8d13c0792906966dd0b9f1c9f
+DIST alsa-tools-1.0.12.tar.bz2 1465411 RMD160 4ae10ebf8a88edcb1fd8b8f6131fd48bc9c7bc23 SHA1 9aa777baccda064c8dea6331334ea0ef1c402006 SHA256 6b47e71152eb2b805e0f9dcfdfea1fbf9141467823322e6118e7a4ca97a2008c
 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
@@ -16,14 +16,14 @@ EBUILD alsa-tools-1.0.11.ebuild 2588 RMD160 a1ed81a1a3b9d4253e303155f21cb1f4f53b
 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_rc1.ebuild 2606 RMD160 909b53a333ab3479f63319e2241d792ff3cdb1dd SHA1 b91c469de18cb800d28437fc556eb669575c2bab SHA256 6b0b6759f5e16469865602dca68c4c55129fb81a15854219540f27ddea81acaa
-MD5 63427d6c28326201c57aaa90a73aa7bb alsa-tools-1.0.12_rc1.ebuild 2606
-RMD160 909b53a333ab3479f63319e2241d792ff3cdb1dd alsa-tools-1.0.12_rc1.ebuild 2606
-SHA256 6b0b6759f5e16469865602dca68c4c55129fb81a15854219540f27ddea81acaa alsa-tools-1.0.12_rc1.ebuild 2606
-MISC ChangeLog 15188 RMD160 3a96a781dc658ba7a3a059a139fd84d0d39df469 SHA1 82b02c7a7ee5ca140939cd0a176ab6295cf389eb SHA256 aac578f4de144c3175d89c5ebdb25ed1af092964ea93dc5e3854dfeeadbd6e33
-MD5 85336c0b2b45bd6a85a293ca29000eae ChangeLog 15188
-RMD160 3a96a781dc658ba7a3a059a139fd84d0d39df469 ChangeLog 15188
-SHA256 aac578f4de144c3175d89c5ebdb25ed1af092964ea93dc5e3854dfeeadbd6e33 ChangeLog 15188
+EBUILD alsa-tools-1.0.12.ebuild 2602 RMD160 217b299b6ba5e764c54c2ebdb50e7d0dbda5f5a6 SHA1 87749e58e18a172756c8aad72fcf2239b6ecc431 SHA256 ebdb90607fc3b951652123d5e09c46c02424fcf7cae0e151a583f88b0b46df0e
+MD5 ac89bd99b3e12521e9a7e9199491ff0c alsa-tools-1.0.12.ebuild 2602
+RMD160 217b299b6ba5e764c54c2ebdb50e7d0dbda5f5a6 alsa-tools-1.0.12.ebuild 2602
+SHA256 ebdb90607fc3b951652123d5e09c46c02424fcf7cae0e151a583f88b0b46df0e alsa-tools-1.0.12.ebuild 2602
+MISC ChangeLog 15400 RMD160 6bf7b61789e55fa134cdc825778be173f05163b2 SHA1 04a880cb41b7f1b6695c7c80ddd82285221671fe SHA256 320086c3d38f36093c52b1a03db5adf7695b41f97dfe7584d3228b29135dbb93
+MD5 6517c37945747af2ae0bfbbade2e6d96 ChangeLog 15400
+RMD160 6bf7b61789e55fa134cdc825778be173f05163b2 ChangeLog 15400
+SHA256 320086c3d38f36093c52b1a03db5adf7695b41f97dfe7584d3228b29135dbb93 ChangeLog 15400
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
@@ -34,13 +34,13 @@ SHA256 ce424d0a0a3bd9e96853bc7be548bfa41ecd5fa99e6911c49c6225f93a40afe2 files/di
 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 ac6a58fbf728747991d25af31a47110e files/digest-alsa-tools-1.0.12_rc1 268
-RMD160 7680043e4ba953b415ad36faf137485167dd22f0 files/digest-alsa-tools-1.0.12_rc1 268
-SHA256 4160452c5e5daede99b228994dafe72c654fc03cac8e3cc16d92133ed8976915 files/digest-alsa-tools-1.0.12_rc1 268
+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
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFEuBB7AiZjviIA2XgRAqsiAKCUb35vy9OwnbJkdDdTdYTt1Zs+hgCfUzCO
-IamJru5WT642oYjT6TwOclE=
-=0Pe0
+iD8DBQFE9qe4AiZjviIA2XgRAuUgAKDnkUoYO6a0dYQjUKSELaAhq/R+/wCfY5EO
+kBBBcxoYS1D5JqZEmoxzgg4=
+=PC8e
 -----END PGP SIGNATURE-----
diff --git a/media-sound/alsa-tools/alsa-tools-1.0.12_rc1.ebuild b/media-sound/alsa-tools/alsa-tools-1.0.12_rc1.ebuild
deleted file mode 100644
index 841edc4a7440..000000000000
--- a/media-sound/alsa-tools/alsa-tools-1.0.12_rc1.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.12_rc1.ebuild,v 1.2 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}/${PN}-1.0.11-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}"
-		emake 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.12_rc1 b/media-sound/alsa-tools/files/digest-alsa-tools-1.0.12_rc1
deleted file mode 100644
index c8f973ba5f90..000000000000
--- a/media-sound/alsa-tools/files/digest-alsa-tools-1.0.12_rc1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 4455d877b2a9cd5b9577c658c9b3549c alsa-tools-1.0.12rc1.tar.bz2 1444446
-RMD160 322659fdc29a7fec539edaf59c1f36eafc3d03bf alsa-tools-1.0.12rc1.tar.bz2 1444446
-SHA256 99130ea5442a357e20459bc5472f948ff6a06ce8d13c0792906966dd0b9f1c9f alsa-tools-1.0.12rc1.tar.bz2 1444446
diff --git a/media-sound/alsa-utils/Manifest b/media-sound/alsa-utils/Manifest
index 94d16f2732ed..547b612fa157 100644
--- a/media-sound/alsa-utils/Manifest
+++ b/media-sound/alsa-utils/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX alsa-modules.conf-rc 1160 RMD160 63e6b6b130fc27bc7e3eb60e4f290c0dc1b44be9 SHA1 d3d705ea7904074bd5c1d94cfbf1ee6dec21060d SHA256 d4f35c53b6679a3e199a621b07bc04bc72064f1327a988c56001176274285896
 MD5 68789bb2407f09b5a06d43934dc8a9ff files/alsa-modules.conf-rc 1160
 RMD160 63e6b6b130fc27bc7e3eb60e4f290c0dc1b44be9 files/alsa-modules.conf-rc 1160
@@ -24,7 +27,7 @@ RMD160 16ab3f3d931436947172da8efa656d6af1635049 files/alsasound.confd 515
 SHA256 01f2c85c61cd9b40124945f31ece9ecabc3aefe3c57c53dd3c1eda994e2c2827 files/alsasound.confd 515
 DIST alsa-utils-1.0.10.tar.bz2 991322 RMD160 aed292c7d7e87ed2eb651971836aec6a73021df2 SHA256 2c4b9f2f7424891085775e1c45074daa954345c228cb9ec0c86888e977514e70
 DIST alsa-utils-1.0.11.tar.bz2 990018 RMD160 17da9d3743a70352ae448569fbeb2f2aab3e78b0 SHA1 abc890763afb5c4e9d5a3b4a1649a0145368d389 SHA256 4b33229437ddab4196b8fd0bdfaf074314185a5afd3e24bbe28025022b42d01b
-DIST alsa-utils-1.0.12rc1.tar.bz2 989452 RMD160 0c7d84dd8c6ce45cdf8264369b4e6ea15cf177d3 SHA1 0dd2f6ba0219e3dcd35b9823dc6fd6a09f034904 SHA256 8224e6044994ea1af106911d8a1c421213d29e96c8c8ab444200b93101b7b637
+DIST alsa-utils-1.0.12.tar.bz2 979797 RMD160 26ff9d4fed31bdecbfeb65b09ef52c05aecba733 SHA1 ea43e407ae50ec50a00679d79c86909f895f632c SHA256 a2fb425ee6b824f2442d38ce14ce630ae8332b1f4a6eeb45bee1c0cafac725a8
 DIST alsa-utils-1.0.9a.tar.bz2 957419 RMD160 7ec91b91eb94d1afec41033dda0ae546782f6a97 SHA256 7808105fee11029d85f8cb3405ce14e1fea7be9ac1d2cae588f4485f90f722eb
 EBUILD alsa-utils-1.0.10.ebuild 2417 RMD160 857568f75c1b3e51db84761a52abdfff5631d03c SHA1 9f5cd41a36303651f065155617554f5516ca8100 SHA256 e0d80978078dc577bfe1909fa6e04f7683a3ae40573519d97be87735e2e53c2a
 MD5 9dbe3716444af3250a790093b0d653d7 alsa-utils-1.0.10.ebuild 2417
@@ -34,18 +37,18 @@ EBUILD alsa-utils-1.0.11.ebuild 2560 RMD160 8aafe9a04d7daf62308c8b2dc5f2184b1def
 MD5 d78be004d5d528027c7a6517e0951bd6 alsa-utils-1.0.11.ebuild 2560
 RMD160 8aafe9a04d7daf62308c8b2dc5f2184b1defe561 alsa-utils-1.0.11.ebuild 2560
 SHA256 afe6d77c328c619ac52fcc58645abcf8159a2429f78b4d2e6a228fd85d3d0fb8 alsa-utils-1.0.11.ebuild 2560
-EBUILD alsa-utils-1.0.12_rc1.ebuild 2581 RMD160 3faa014ef106e8b22c167a7974ba9312e810e2c4 SHA1 833f271f08c9cc7de80b25e71b5c05aba7ea1629 SHA256 703687c956309130816ef8b79563f5254aab9d728d3ab2c390c374f242af72d6
-MD5 dd836f00fcecd84bee0654eaabfaf201 alsa-utils-1.0.12_rc1.ebuild 2581
-RMD160 3faa014ef106e8b22c167a7974ba9312e810e2c4 alsa-utils-1.0.12_rc1.ebuild 2581
-SHA256 703687c956309130816ef8b79563f5254aab9d728d3ab2c390c374f242af72d6 alsa-utils-1.0.12_rc1.ebuild 2581
+EBUILD alsa-utils-1.0.12.ebuild 2577 RMD160 baaec90e0d9a9d7ffb818201134173faf32b0fa7 SHA1 03abea2a620b24555221ff8b6908e63bd931baeb SHA256 6f266084a63d9d2bbe45c06ed3df1f8d1664df34b8b75906b6536d945c6c8045
+MD5 1c3350ae69bddad61ef4d11a81ac96e4 alsa-utils-1.0.12.ebuild 2577
+RMD160 baaec90e0d9a9d7ffb818201134173faf32b0fa7 alsa-utils-1.0.12.ebuild 2577
+SHA256 6f266084a63d9d2bbe45c06ed3df1f8d1664df34b8b75906b6536d945c6c8045 alsa-utils-1.0.12.ebuild 2577
 EBUILD alsa-utils-1.0.9a.ebuild 2345 RMD160 ef0cc5515b5c0f5e069f1c545b7d0b1b69eb0213 SHA1 59d3a961e1eb3ef78753b9ecaef9e0b837552a51 SHA256 ffdd684ca2886d5dbc77516924879e07df05ead939044e139557b3ad22180a24
 MD5 0b361dacc5fe031fb1748d6345a9b83b alsa-utils-1.0.9a.ebuild 2345
 RMD160 ef0cc5515b5c0f5e069f1c545b7d0b1b69eb0213 alsa-utils-1.0.9a.ebuild 2345
 SHA256 ffdd684ca2886d5dbc77516924879e07df05ead939044e139557b3ad22180a24 alsa-utils-1.0.9a.ebuild 2345
-MISC ChangeLog 23338 RMD160 f1341c1b88d4bcfa57e2dd8ed24752885e6340d4 SHA1 642c3a431c2041b3df995907c476f6faec15e1c3 SHA256 2996ca21d61bd1515608c09dcdce545d7d1ff1e73dcd15c0333c5609cebd2e90
-MD5 829fa6c5d484661dd85ccfecf50546ae ChangeLog 23338
-RMD160 f1341c1b88d4bcfa57e2dd8ed24752885e6340d4 ChangeLog 23338
-SHA256 2996ca21d61bd1515608c09dcdce545d7d1ff1e73dcd15c0333c5609cebd2e90 ChangeLog 23338
+MISC ChangeLog 23554 RMD160 944e2d4ff9aa6ff8699deba7115e4b7feb9630fc SHA1 e4467cb64219a61c448502202a803d1a9f68df8f SHA256 5977801505e85200b7a240e175405e4ebea1d8b76adee4922605a86970674c38
+MD5 ae5d0d8bd08654ed567d848673b46aeb ChangeLog 23554
+RMD160 944e2d4ff9aa6ff8699deba7115e4b7feb9630fc ChangeLog 23554
+SHA256 5977801505e85200b7a240e175405e4ebea1d8b76adee4922605a86970674c38 ChangeLog 23554
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
@@ -56,9 +59,16 @@ SHA256 af7e2d1fea3098ee2112c08c544165055f0e1c5ff36cc196f9fdc4906bc7dddc files/di
 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
-MD5 a9a1ebb3f74f18e6b9fb0c52f3fef893 files/digest-alsa-utils-1.0.12_rc1 265
-RMD160 4849fca35908e03ca97551ae973138957ed39082 files/digest-alsa-utils-1.0.12_rc1 265
-SHA256 70ad7e37977aca39c09c5bf22719b37f7ea282e3a559367277c0cb59f66f9b64 files/digest-alsa-utils-1.0.12_rc1 265
+MD5 a66779e342489bdfa952fe128564be87 files/digest-alsa-utils-1.0.12 256
+RMD160 061a20140632c554d627849bcb53d4f071116ebf files/digest-alsa-utils-1.0.12 256
+SHA256 45f79b78674df77704930c117a8596a0020b4f7b40d1e9aa1696820b8536c9a7 files/digest-alsa-utils-1.0.12 256
 MD5 5c2d0b8adaa239ceb45fba4f15064013 files/digest-alsa-utils-1.0.9a 256
 RMD160 6a913195956cc5b122f436590db095e28321e03c files/digest-alsa-utils-1.0.9a 256
 SHA256 2b9e18aa7dcde10bd74ec830ef9c321dae3c9a6a19a7a353162522c830ab7eb4 files/digest-alsa-utils-1.0.9a 256
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFE9qe1AiZjviIA2XgRAiUoAJ9zoBHhpNghU9sGu0V81fw7JvlmpgCgjiu+
+cH0krO0a2uMINRkDuYilu6s=
+=7qsk
+-----END PGP SIGNATURE-----
diff --git a/media-sound/alsa-utils/alsa-utils-1.0.12_rc1.ebuild b/media-sound/alsa-utils/alsa-utils-1.0.12_rc1.ebuild
deleted file mode 100644
index ddc6696d1adc..000000000000
--- a/media-sound/alsa-utils/alsa-utils-1.0.12_rc1.ebuild
+++ /dev/null
@@ -1,84 +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.12_rc1.ebuild,v 1.1 2006/06/23 12:44:25 flameeyes Exp $
-
-inherit eutils 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_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${PN}-1.0.11_rc2-nls.patch"
-	epatch "${FILESDIR}/${PN}-1.0.11_rc5-alsaconf-redirect.patch"
-}
-
-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"
-
-	emake 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.12_rc1 b/media-sound/alsa-utils/files/digest-alsa-utils-1.0.12_rc1
deleted file mode 100644
index 1ae576adb865..000000000000
--- a/media-sound/alsa-utils/files/digest-alsa-utils-1.0.12_rc1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 fe05a1cad553547e991fd159e22ff5bf alsa-utils-1.0.12rc1.tar.bz2 989452
-RMD160 0c7d84dd8c6ce45cdf8264369b4e6ea15cf177d3 alsa-utils-1.0.12rc1.tar.bz2 989452
-SHA256 8224e6044994ea1af106911d8a1c421213d29e96c8c8ab444200b93101b7b637 alsa-utils-1.0.12rc1.tar.bz2 989452