old

Package-Manager: portage-2.2.0_alpha173/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

9 files changed, 16 insertions, 669 deletions

diff --git a/media-sound/alsa-utils/ChangeLog b/media-sound/alsa-utils/ChangeLog
index 42fa05ea7f56..97543133d939 100644
--- a/media-sound/alsa-utils/ChangeLog
+++ b/media-sound/alsa-utils/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/alsa-utils
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/ChangeLog,v 1.344 2013/05/01 12:02:42 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/ChangeLog,v 1.345 2013/05/01 12:16:26 ssuominen Exp $
+
+  01 May 2013; Samuli Suominen <ssuominen@gentoo.org>
+  -alsa-utils-1.0.24.2-r1.ebuild, -alsa-utils-1.0.25-r1.ebuild,
+  -alsa-utils-1.0.26.ebuild, -alsa-utils-1.0.26-r1.ebuild,
+  -alsa-utils-1.0.26-r3.ebuild, -files/alsasound.confd-r3,
+  -files/alsasound.initd-r4:
+  old
 
 *alsa-utils-1.0.27 (01 May 2013)
 
diff --git a/media-sound/alsa-utils/Manifest b/media-sound/alsa-utils/Manifest
index 1e781762d2e8..0f25bb3d7a86 100644
--- a/media-sound/alsa-utils/Manifest
+++ b/media-sound/alsa-utils/Manifest
@@ -5,33 +5,23 @@ AUX alsa-modules.conf-rc 1028 SHA256 6060c101ca0793ea80e2b6b5bb8d6b118325092788f
 AUX alsa-utils-1.0.23-modprobe.d.patch 504 SHA256 3f6116f467f52eba2e2de46df24a08c99231fdf83ab92dd5f0051aabc5aee077 SHA512 b702b8a9d4a173bcca463c821790294c2b8148271a1f281d1c177c312edd7086b650becaa39b8e078881755e6f006c69e501da347eacfc201746d47648195472 WHIRLPOOL 5138926ec3fd3d1afc1c7c5e6a5df4d6a2e1349021decf97e94f1c903e689dda895852422772080f8af4042fdf0194ecfad700565a4c2631c82e18399385474a
 AUX alsa-utils-1.0.25-separate-usr-var-fs.patch 471 SHA256 2d92453c9427e46702a5624791dc58da8834c457d6eb6f1b96fd6d4eb651544a SHA512 88f2ecb66180bc757c1d4fc43eca10cebaa6e9850b05ecaabc0810ae5b25517d46091176342c307d36cda539a6ee6e601bf969c40f87305077d3b5a7706f0f5e WHIRLPOOL da1a144b518d5db3af19395fee9d7030b679f886dde091ffafb2d11417765d7972ee56dbab35cdf4f900c6e977f1ff91744528ea379613d141fc813cba2d386d
 AUX alsa-utils-1.0.26-kmod.patch 460 SHA256 65c9e14813d3da1fde93cfde1f926df65fa4ffd289586a7aeb8cde5a6c4e188e SHA512 35824e266d6dc58e107418253abb559aaf08ec1efa60d707549cde3007c6a23120475472604362e83fd014dc236710a0a584ca51bafaa4561db067698a308414 WHIRLPOOL 01658c41a77c4aca55a025823a833bf7ca2e261d6e82bf8e28540da1890517d36a05a97b21d912ce60634edbb445e0f6d924841ca3c358e6b6246d7477fd68e2
-AUX alsasound.confd-r3 874 SHA256 e5d26a6ea993540ca2d67aee4b40f1351b13f2c8023d53cb67c22cb3707e72de SHA512 a2ae4d3f7e7bbd799d69ede7e1f052147ebbf2763d8ef6c061832208e330aebe72b112cd36f227645b4543c5388a45db8c0a534a9ec4b6351cfad6584ad6922c WHIRLPOOL 4824b0cd4918e5e7a31488a8e429e846180ae88573ab3c17aef5f5220d74f529ae64ef8b6bf383ab10b7620753645ca8656f6ca45be2b8ccc547f9e5d84d610f
 AUX alsasound.confd-r4 340 SHA256 d1c55400b701a72dcb8bb85e016b5013fa3eb6a2766ffc20dae278d0ee4c1a43 SHA512 90c1e974276945f7632dc370a005b58d669b93edbf27116098d4831e69c11c26d9b21e7eacfaf12c50019f8c88dc1f370101e2d905fdde40887fe36bac00d83e WHIRLPOOL 0f46fe17f1a6626c3e2c8438d5006fdc8a302456820c2dfaa27955c295532aa1543e7ec0161702edd874e9588b6a383369693f080c91b0b38813b91588fc1e75
-AUX alsasound.initd-r4 6249 SHA256 a4421f45d61182095ccd9470857173058ff1af0d92b07f3e3cc3af65d630021d SHA512 7a73cac2d35bce80d79f14f2270097f3793f82d171f1f558ac2a6f072b850928a3b1656b7b0cf619b1c0cc40ae888d5a85b90045009d9f3a2ccc393b5345eab0 WHIRLPOOL 0a6cd0f6040e9c56c10280f8f82c3a586c721acb6443be15e50e3d3c6493f69a3ae5eb5f56b5fa2ebcce0c4ab468fd9870a9531794231e102240cba41a25ec15
 AUX alsasound.initd-r5 2099 SHA256 daf46bbc4156a82e0c6c7135ee94b31a3dfb6d366fcf3f45e8c842d1348601be SHA512 3b1399afd10551516545677fd6d8ef676e1eaaca5d76580563b9906b2de86854b8afef864b92dead342d41f3c3c342bff1bc6bd704f932677a524ba4e585a405 WHIRLPOOL 862d943d7d0742c00de9e02cff9b3fe159805880b3e0ea70e50c8c449e8b8c1cfa47d26286bd0807840b1f24c9c9c8cbaef890d71dab43644b52105efb2e7fae
-DIST alsa-driver-1.0.24.tar.bz2 3609960 SHA256 fe8aa69b209879dd6df820237a28cddcf1bed5417710e53336ec7281b5f48d2b SHA512 b3c1bd9299f2f9ffe73b428028ef7922d13793bc5c9dabfd67c42adb283581cf2a4b004cd929aab8fa5a916171d6b6e9fc58f33835c752595d6a1f59fbc6d327 WHIRLPOOL 26acaa7db77086115857c3b33a77fa9fdfb70da90f56e165374a459b6820c45b8aed4b73bb328c35dc91c9dcd617a2fa3c811adb1aab1380629e70f28faee3a2
 DIST alsa-driver-1.0.25.tar.bz2 3861484 SHA256 d80e219fd410b5bc62f9332e5964acd575cc8a0bcda80fa41d5eebeabde0ebc3 SHA512 51164c5f1c6e40e188be8e544ddc610b56ffb7d696bc925a0a30e6819d6cbd90a7f9f33c379d411d0e7a172a3ed1cf15b59c27654d63db1a9bad2051331d3017 WHIRLPOOL b70a3614baf72cc2762a2b8a65e07af0204c8550aa140aa01f7d5ee998a8cdf54f43600cfb61c2cb4773d55813afd9aef845f4219d955fbf0f3bc085cf003c7d
-DIST alsa-utils-1.0.24.2.tar.bz2 1130734 SHA256 95127f740291086486c06c28118cabca0814bde48fd14dac041a9812a5ac1be2 SHA512 9436194a8e404b7e5bd593aecb5c1b2a7fdda4c0d70c9a8696f2096bf399dad8a2bd7fec89f025af91ca25b51f1c77aaf46e3c5add300e7ca5253cda3afaec5f WHIRLPOOL 6f8039fec5424416bbff654b3916e0094d56fde34c14ea286f3158e3d6b15e2187950234fc7ae5fde58b24c3f61cef70640506f12beadbad29eb595ca44050f3
-DIST alsa-utils-1.0.25.tar.bz2 1132780 SHA256 2e676a2f634bbfe279b260e10a96f617cb72ee63c5bbf6c5f96bb615705b302c SHA512 2f2c8ed880d8fa07f6a507f7040a291b1509f1d9bb26aee8549aa1238d7e691dc372bc5271547fd76eabe5b67f781050cd84b28c13910171bd4afdcb5d6444e1 WHIRLPOOL a2fb6da26b02cac87ca00d71901e71fd9b4bb1b9f6e94387b2f5e833ba8c5a02f25b8a75f48110c686c05cb25752a1806ed3d8c04769e12addea0c89aafa471c
 DIST alsa-utils-1.0.26.tar.bz2 1134474 SHA256 f85f2a3aa6e78475bbe35b0cad3a8cabb99f45ebc5f37962f2137b8df8b081e7 SHA512 4b288ef2874645ecfd48d855f57e16bd20aa9b72ec1d18d17a0a79924a6c4b37c0045cd7f4d2ceb9005716871bf532200820b60c1efa0461b81a7cd714374b22 WHIRLPOOL 5212c07bc27cb4c14db67df313d2a66daed727e676b93f8420dddb1c4fb28365ce49e92e8ef2879e9ffba7f98dd26201f45e4e650ada20227d4647a045ded196
 DIST alsa-utils-1.0.27.tar.bz2 1142833 SHA256 6f76cd77341ceb22949c4fb9d4df145483f56baa899f0621d617b8df96a45aef SHA512 1bcfcce0cee2c9e72458525f8424abab4a0be93bceda0a90f0113be315ff0f1d956309b535bfd0cc9ce70f031718718301e8dc91f2d16cd91b34ebeb95693625 WHIRLPOOL e13a7a57d7dcc2f323dfdc1a9f6976adcb4a038d159ae6a5641eebebbfcc44e7ed2b833f2e7d8f324a28f9daa355f55ff4def7d0d820f61790e40733d8bd1cbe
-EBUILD alsa-utils-1.0.24.2-r1.ebuild 2972 SHA256 96555abe04e834f619864124531380dbbf8b30ecac47cbd258d525358294c6fd SHA512 03b2de7ea46b157491a1ea9b4d77e9b70fd22cde41de68aa39ed739ba45295dabd1c78afcf7111c3f587750a7d780d5ce25304e603800d024456f2e03b1ebfc8 WHIRLPOOL d8d2bc1ff145cc0229dc28f0bdb1ad6cbd7338c737ce29c8d0bb1bb5bac6592de4649a896339be798df8503a44fb4cdb65454fe559d72c03c606fb00a0250d18
-EBUILD alsa-utils-1.0.25-r1.ebuild 2266 SHA256 ca4716e2254859bdc2ce3d3ddae062d64f4586d43c31fbdd37458b1cded375b0 SHA512 7ce053b70fce50fa4ebf9a961f248cc9f79eb229e8ec1cce230abd744ce2bfa51274787546d8120915efadd7a95925bc7cdaf33662956df566fd5b881840c1c0 WHIRLPOOL a749c16831a550d57ed0152646467a6ea07a36929f30375dc10729b3d503057c0541380b7093ef98950e11253b4d50d73c952ccb1f09664dadd590ca7a2dea23
-EBUILD alsa-utils-1.0.26-r1.ebuild 2290 SHA256 21424e524db3d59ccfb48f5b2893ed9d25b7a0d7680043b5428a2bd1270fa46f SHA512 918fcffc0dffbd49f5f1604fd2ec129fbb54063b65346bc2078d2284a4babf014a3b651fa80cfcc23d95c10e26d0788236d42a01a56f3be80205d0673d5c7aad WHIRLPOOL dbcb96a7c287b937491194c853e1f7c86a1617b9bbc1196505cf9d97e746fa311dc8d0dae161ccf08caaf1270ce68a187586f8528a25949bd2ba492a7b89eed1
 EBUILD alsa-utils-1.0.26-r2.ebuild 2350 SHA256 6bc96fce2ba3fad5ced306b691201e267e4f7bcb70ba0e11900db219c9e64927 SHA512 2ccba1fc4444d8626b5811de5b2b3f79b4c28a4cafbbc3a83d5466624b765033092e93e7d59b8377e634bcfc54e38090da7e2ea6c850ee0880395ec80c947f39 WHIRLPOOL d438a717250ed7066342bc797fbeca15276ea29de665cc945297cef54c3399bb4194c2fe9cf38cbe95f83807a0fea0a05fb2dfa99fdadc34834425e2a8f61e97
-EBUILD alsa-utils-1.0.26-r3.ebuild 2205 SHA256 bb0771163b95c17b4f82ba24d6ccf4f22814d7c66c9cd7392df82b9c4d0025a5 SHA512 b9921b1f0f1775dede9b4098a10e2fe4e10fe0d237a6fa8e5f70c5cfc64fb532f44d73afd11ff23b5500da5fc4907edc73228e6d47a5c16aabe27daedbb15acb WHIRLPOOL 13232b98490fdee30ede119e8d4e2da964e8cb867cec17d17d404a1a50d5d48b9f10fcbefad46887ac5b522300153d6edfcd29826f919c6786e4a67ad61a2f7d
-EBUILD alsa-utils-1.0.26.ebuild 2121 SHA256 714cef9ad017cf2ba5e76af092b05a099085cde483f846ef5853aaaa6e7dc318 SHA512 03bf40d8c9cc1140e6cd09b03e6a6236dc5993623837494d0c089dc1e68b18e137cbafed8c27542e51b074b96af7e435cb02c9b3d8f2c2bbcaf69a3a7941eb78 WHIRLPOOL ad3aa0e1f5af7b598e33caa15c8aa9494c31edc53e428c92f068f1e0e41722d9020b791d133c444bb2aa3ea5791ce6ea2d3e68143c97c29a4bf4081bdb147b7d
 EBUILD alsa-utils-1.0.27.ebuild 2202 SHA256 914789445358b384e93820e690a9633603c8885280080f935a8f29887f439bd7 SHA512 bcbe3bc5df353726b71907cb1c6640a64e2836dd0c6dc52af72579babad7e1955c6edd5ec4c6e6db862bc372ff636f8dc8ca3c83b11ecaf2170ae1225eaec818 WHIRLPOOL 8b35933c7b515ad813ed7fc4735c526323a1943e96871d3855d599d7dd1a4fbc99b83cd23a97f69d6b41988ab949b721e34adbaafa20ef988153f613494763dd
-MISC ChangeLog 52955 SHA256 9ee44dd449e75a954662eb0d633cf767f1f3bc701791ed175080b4d2ecbf48a0 SHA512 0ae3eda31280ead36248a08f784b18075781f96dfe267bcdab6d19fec370a5ff8e519f2f15810db773d1ecf0a2572790e56a1ea2a193e9f3d0441754253d13c6 WHIRLPOOL f83112e09010bf1692dc09c84e1dc20b0ff32496bbe8810c4184bc143a76c277d37ff4b9fa1327c65a113dbbb7f2c74f0b29a502b161a5f368cf2f59ec682bf4
+MISC ChangeLog 53227 SHA256 19950e6a5d873eab009ce5b19578583de191996c6511fb9d65601310d95af47c SHA512 64534d18f7d94e07942c9079da1bfc41f89f71cf11546008bdc6b59de249cc3bfeb043b8e24421b5246e3013bf8e321664ebd67cab05c84580af277d1dda1411 WHIRLPOOL 9b7f403a5b71c05e30ff304aa28e6a792ae37c7a7d6959dcc8ab75bc47f34c065b0bd8d14f0fbf19e96432b3276b2ab1380ef873afb12d05296361bff5199751
 MISC metadata.xml 519 SHA256 c95261699625faf6df725dc2c7468b8464cfb415125711f893ca27fa9f42631c SHA512 0abb84b0570ecc8eaa7cfc61fbc53dba85a7faeee77c3f5e7761ca53596bdcba24015fe51025b4cf1a0e9c7cdd2f56cb4ecfb2ffa5912c782ac6c0bfc14e2c05 WHIRLPOOL 44ad8f3192836559aebf278528b3315e5e85a02854a97893d3a3b910e3e4e1371254e2caaa2171bb0c304afc77e9cbb04c1f5dbde67f053c9c1b580932cf06ab
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRgQP1AAoJEEdUh39IaPFN2NMIAIyf4j0aRgYzJ+A5jKqHFAcB
-cHRBncksSzJzDaU8XE3FLItvStMoMA/eDxbxveDJdiIVJd6N6UbVKfh9UoyPJGEJ
-S81ofWE5tMElBY5LonCQF0ZhlMETplVFmAyXI6sHkLl5wsSemOcCXbtM7Y1HiVky
-AUQc9u3Fb/zZu0NH23Lnhrkr/fSmJpQ10MPop+v7SvYQmHifMLTHJgwnwLRGLpG6
-Nfy24V1TXseoXHwH7R8SBTLD2t4w6gVu/iSoPDJ+y4mg2up1Wodrc3t9d0SG15VH
-4IkF0DkpR7+tbl8yI4lzFSjftZzSdg5a51aKPr+O713zDFjR0niLgjd7SnHsVsg=
-=CXwn
+iQEcBAEBCAAGBQJRgQctAAoJEEdUh39IaPFNiFYH/Ah91y8nu3mQMvlyrcSo29yM
+SqmMVVN0L0pzMITJwt/Iskyp6dqARjLuHBJFWtMtu4P6TLLfCUkLWkBfseCqu2e0
+kh1rMIDpRVV9m9dosz4ClaS+1ozgT4iGxRRF0x9sWE5tF+XrCCIkjEDvIspYzTWb
+67oDvraLi39ZD9+51XUR5UG4lWbR76p4QMuKG+92MgY4Kgbpo4hFZiMh4sy/fK3y
+8df7MRmzwN03L9zznSkv2jP/AosOFHz85nxkyraEBkdvZ2/50jsIZtRLug61zz1n
+7w2phYpedmNa2tgo6tW6VcCJ5UiO1nNZuJ57UIlFzBSFB0+aKOdIDhyXqrfk48I=
+=kRVX
 -----END PGP SIGNATURE-----
diff --git a/media-sound/alsa-utils/alsa-utils-1.0.24.2-r1.ebuild b/media-sound/alsa-utils/alsa-utils-1.0.24.2-r1.ebuild
deleted file mode 100644
index f9382b0b24cc..000000000000
--- a/media-sound/alsa-utils/alsa-utils-1.0.24.2-r1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2012 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.24.2-r1.ebuild,v 1.9 2012/07/23 15:04:38 swift Exp $
-
-EAPI=3
-inherit base systemd
-
-MY_P=${P/_rc/rc}
-ALSA_DRIVER_VER="1.0.24"
-
-DESCRIPTION="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)"
-HOMEPAGE="http://www.alsa-project.org/"
-SRC_URI="mirror://alsaproject/utils/${MY_P}.tar.bz2
-	mirror://alsaproject/driver/alsa-driver-${ALSA_DRIVER_VER}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0.9"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86"
-IUSE="doc nls minimal selinux"
-
-DEPEND=">=sys-libs/ncurses-5.1
-	dev-util/dialog
-	>=media-libs/alsa-lib-1.0.24.1
-	doc? ( app-text/xmlto )
-	selinux? ( sec-policy/selinux-alsa )"
-RDEPEND=">=sys-libs/ncurses-5.1
-	dev-util/dialog
-	>=media-libs/alsa-lib-1.0.24.1
-	!minimal? ( sys-apps/pciutils )
-	selinux? ( sec-policy/selinux-alsa )"
-
-S="${WORKDIR}/${MY_P}"
-PATCHES=( "${FILESDIR}/alsa-utils-1.0.23-modprobe.d.patch" )
-
-pkg_setup() {
-	if [[ -e "${ROOT}etc/modules.d/alsa" ]]; then
-		eerror "Obsolete config /etc/modules.d/alsa found."
-		die "Move /etc/modules.d/alsa to /etc/modprobe.d/alsa.conf."
-	fi
-
-	if [[ -e "${ROOT}etc/modprobe.d/alsa" ]]; then
-		eerror "Obsolete config /etc/modprobe.d/alsa found."
-		die "Move /etc/modprobe.d/alsa to /etc/modprobe.d/alsa.conf."
-	fi
-}
-
-src_configure() {
-	local myconf=""
-	use doc || myconf="--disable-xmlto"
-
-	econf ${myconf} \
-		$(use_enable nls) \
-		"$(systemd_with_unitdir)"
-}
-
-src_install() {
-	local ALSA_UTILS_DOCS="ChangeLog README TODO
-		seq/aconnect/README.aconnect
-		seq/aseqnet/README.aseqnet"
-
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc ${ALSA_UTILS_DOCS} || die
-
-	newbin "${WORKDIR}/alsa-driver-${ALSA_DRIVER_VER}/utils/alsa-info.sh" \
-		alsa-info
-
-	newinitd "${FILESDIR}/alsasound.initd-r4" alsasound
-	newconfd "${FILESDIR}/alsasound.confd-r3" alsasound
-	insinto /etc/modprobe.d
-	newins "${FILESDIR}/alsa-modules.conf-rc" alsa.conf
-
-	keepdir /var/lib/alsa
-}
-
-pkg_postinst() {
-	echo
-	elog "To take advantage of the init script, and automate the process of"
-	elog "saving and restoring sound-card mixer levels you should"
-	elog "add alsasound to the boot runlevel. You can do this as"
-	elog "root like so:"
-	elog "	# rc-update add alsasound boot"
-	echo
-	elog "The script will load ALSA modules, if you choose to use a modular"
-	elog "configuration. The Gentoo ALSA developers recommend you to build"
-	elog "your audio drivers into the kernel unless the device is hotpluggable"
-	elog "or you need to supply specific options (such as model= to HD Audio)."
-	echo
-	ewarn "Automated unloading of ALSA modules is deprecated and unsupported."
-	ewarn "Should you choose to use it, bug reports will not be accepted."
-	echo
-	if use minimal; then
-		ewarn "The minimal use flag disables the dependency on pciutils that"
-		ewarn "is needed by alsaconf at runtime."
-	fi
-}
diff --git a/media-sound/alsa-utils/alsa-utils-1.0.25-r1.ebuild b/media-sound/alsa-utils/alsa-utils-1.0.25-r1.ebuild
deleted file mode 100644
index 61c4335a2fc2..000000000000
--- a/media-sound/alsa-utils/alsa-utils-1.0.25-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2013 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.25-r1.ebuild,v 1.9 2013/03/13 10:56:39 ago Exp $
-
-EAPI=4
-inherit base systemd
-
-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
-	mirror://alsaproject/driver/alsa-driver-${PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0.9"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86"
-IUSE="doc nls minimal selinux"
-
-COMMON_DEPEND=">=sys-libs/ncurses-5.1
-	dev-util/dialog
-	>=media-libs/alsa-lib-1.0.25
-	media-libs/libsamplerate
-	selinux? ( sec-policy/selinux-alsa )"
-DEPEND="${COMMON_DEPEND}
-	doc? ( app-text/xmlto )"
-RDEPEND="${COMMON_DEPEND}
-	!minimal? ( sys-apps/pciutils )"
-
-S="${WORKDIR}/${MY_P}"
-PATCHES=(
-"${FILESDIR}/${PN}-1.0.23-modprobe.d.patch"
-"${FILESDIR}/${P}-separate-usr-var-fs.patch"
-)
-
-src_configure() {
-	local myconf=""
-	use doc || myconf="--disable-xmlto"
-
-	econf ${myconf} \
-		$(use_enable nls) \
-		"$(systemd_with_unitdir)"
-}
-
-src_install() {
-	local ALSA_UTILS_DOCS="ChangeLog README TODO
-		seq/aconnect/README.aconnect
-		seq/aseqnet/README.aseqnet"
-
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc ${ALSA_UTILS_DOCS} || die
-
-	newbin "${WORKDIR}/alsa-driver-${PV}/utils/alsa-info.sh" \
-		alsa-info
-
-	newinitd "${FILESDIR}/alsasound.initd-r5" alsasound
-	newconfd "${FILESDIR}/alsasound.confd-r4" alsasound
-	insinto /etc/modprobe.d
-	newins "${FILESDIR}/alsa-modules.conf-rc" alsa.conf
-
-	keepdir /var/lib/alsa
-}
-
-pkg_postinst() {
-	echo
-	elog "To take advantage of the init script, and automate the process of"
-	elog "saving and restoring sound-card mixer levels you should"
-	elog "add alsasound to the boot runlevel. You can do this as"
-	elog "root like so:"
-	elog "	# rc-update add alsasound boot"
-	echo
-	ewarn "The ALSA core should be built into the kernel or loaded through other"
-	ewarn "means. There is no longer any modular auto(un)loading in alsa-utils."
-	echo
-	if use minimal; then
-		ewarn "The minimal use flag disables the dependency on pciutils that"
-		ewarn "is needed by alsaconf at runtime."
-	fi
-}
diff --git a/media-sound/alsa-utils/alsa-utils-1.0.26-r1.ebuild b/media-sound/alsa-utils/alsa-utils-1.0.26-r1.ebuild
deleted file mode 100644
index 1ee974246d76..000000000000
--- a/media-sound/alsa-utils/alsa-utils-1.0.26-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2012 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.26-r1.ebuild,v 1.2 2012/12/11 16:31:40 axs Exp $
-
-EAPI=4
-inherit eutils systemd udev toolchain-funcs
-
-DESCRIPTION="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)"
-HOMEPAGE="http://www.alsa-project.org/"
-SRC_URI="mirror://alsaproject/utils/${P}.tar.bz2
-	!minimal? ( mirror://alsaproject/driver/alsa-driver-1.0.25.tar.bz2 )"
-
-LICENSE="GPL-2"
-SLOT="0.9"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
-IUSE="doc +libsamplerate minimal +ncurses nls selinux"
-
-COMMON_DEPEND=">=media-libs/alsa-lib-${PV}
-	libsamplerate? ( media-libs/libsamplerate )
-	ncurses? ( >=sys-libs/ncurses-5.7-r7 )
-	selinux? ( sec-policy/selinux-alsa )"
-RDEPEND="${COMMON_DEPEND}
-	!minimal? (
-		dev-util/dialog
-		sys-apps/pciutils
-	)"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	doc? ( app-text/xmlto )"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-1.0.23-modprobe.d.patch \
-		"${FILESDIR}"/${PN}-1.0.25-separate-usr-var-fs.patch
-}
-
-src_configure() {
-	local myconf
-	use doc || myconf='--disable-xmlto'
-
-	econf \
-		$(use_enable libsamplerate alsaloop) \
-		$(use_enable nls) \
-		$(use_enable ncurses alsamixer) \
-		$(use_enable !minimal alsaconf) \
-		"$(systemd_with_unitdir)" \
-		--with-udev-rules-dir="$(udev_get_udevdir)"/rules.d \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc ChangeLog README TODO seq/*/README.*
-
-	use minimal || newbin "${WORKDIR}"/alsa-driver-*/utils/alsa-info.sh alsa-info
-
-	newinitd "${FILESDIR}"/alsasound.initd-r5 alsasound
-	newconfd "${FILESDIR}"/alsasound.confd-r4 alsasound
-
-	insinto /etc/modprobe.d
-	newins "${FILESDIR}"/alsa-modules.conf-rc alsa.conf
-
-	keepdir /var/lib/alsa
-}
-
-pkg_postinst() {
-	echo
-	elog "To take advantage of the init script, and automate the process of"
-	elog "saving and restoring sound-card mixer levels you should"
-	elog "add alsasound to the boot runlevel. You can do this as"
-	elog "root like so:"
-	elog "	# rc-update add alsasound boot"
-	echo
-	ewarn "The ALSA core should be built into the kernel or loaded through other"
-	ewarn "means. There is no longer any modular auto(un)loading in alsa-utils."
-	echo
-}
diff --git a/media-sound/alsa-utils/alsa-utils-1.0.26-r3.ebuild b/media-sound/alsa-utils/alsa-utils-1.0.26-r3.ebuild
deleted file mode 100644
index 914b3b98b368..000000000000
--- a/media-sound/alsa-utils/alsa-utils-1.0.26-r3.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2013 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.26-r3.ebuild,v 1.2 2013/04/19 16:02:22 ssuominen Exp $
-
-EAPI=5
-inherit eutils systemd udev
-
-DESCRIPTION="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)"
-HOMEPAGE="http://www.alsa-project.org/"
-SRC_URI="mirror://alsaproject/utils/${P}.tar.bz2
-	mirror://alsaproject/driver/alsa-driver-1.0.25.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0.9"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
-IUSE="doc +libsamplerate +ncurses nls selinux"
-
-RDEPEND=">=media-libs/alsa-lib-${PV}
-	libsamplerate? ( media-libs/libsamplerate )
-	ncurses? ( >=sys-libs/ncurses-5.7-r7 )
-	selinux? ( sec-policy/selinux-alsa )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-text/xmlto )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.0.25-separate-usr-var-fs.patch
-}
-
-src_configure() {
-	local myconf
-	use doc || myconf='--disable-xmlto'
-
-	# --disable-alsaconf because it doesn't work with sys-apps/kmod wrt #456214
-	econf \
-		$(use_enable libsamplerate alsaloop) \
-		$(use_enable nls) \
-		$(use_enable ncurses alsamixer) \
-		--disable-alsaconf \
-		"$(systemd_with_unitdir)" \
-		--with-udev-rules-dir="$(get_udevdir)"/rules.d \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc ChangeLog README TODO seq/*/README.*
-
-	newbin "${WORKDIR}"/alsa-driver-*/utils/alsa-info.sh alsa-info
-
-	newinitd "${FILESDIR}"/alsasound.initd-r5 alsasound
-	newconfd "${FILESDIR}"/alsasound.confd-r4 alsasound
-
-	insinto /etc/modprobe.d
-	newins "${FILESDIR}"/alsa-modules.conf-rc alsa.conf
-
-	keepdir /var/lib/alsa
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog
-		elog "To take advantage of the init script, and automate the process of"
-		elog "saving and restoring sound-card mixer levels you should"
-		elog "add alsasound to the boot runlevel. You can do this as"
-		elog "root like so:"
-		elog "# rc-update add alsasound boot"
-		ewarn
-		ewarn "The ALSA core should be built into the kernel or loaded through other"
-		ewarn "means. There is no longer any modular auto(un)loading in alsa-utils."
-	fi
-}
diff --git a/media-sound/alsa-utils/alsa-utils-1.0.26.ebuild b/media-sound/alsa-utils/alsa-utils-1.0.26.ebuild
deleted file mode 100644
index 6b5309fe4d12..000000000000
--- a/media-sound/alsa-utils/alsa-utils-1.0.26.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2012 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.26.ebuild,v 1.2 2012/12/11 16:31:40 axs Exp $
-
-EAPI=4
-inherit eutils systemd udev toolchain-funcs
-
-DESCRIPTION="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)"
-HOMEPAGE="http://www.alsa-project.org/"
-SRC_URI="mirror://alsaproject/utils/${P}.tar.bz2
-	mirror://alsaproject/driver/alsa-driver-1.0.25.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0.9"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
-IUSE="doc nls minimal selinux"
-
-COMMON_DEPEND=">=media-libs/alsa-lib-${PV}
-	media-libs/libsamplerate
-	>=sys-libs/ncurses-5.7-r7
-	selinux? ( sec-policy/selinux-alsa )"
-RDEPEND="${COMMON_DEPEND}
-	dev-util/dialog
-	!minimal? ( sys-apps/pciutils )"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	doc? ( app-text/xmlto )"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-1.0.23-modprobe.d.patch \
-		"${FILESDIR}"/${PN}-1.0.25-separate-usr-var-fs.patch
-}
-
-src_configure() {
-	local myconf
-	use doc || myconf='--disable-xmlto'
-
-	econf \
-		$(use_enable nls) \
-		$(use_enable !minimal alsaconf) \
-		"$(systemd_with_unitdir)" \
-		--with-udev-rules-dir="$(udev_get_udevdir)"/rules.d \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc ChangeLog README TODO seq/*/README.*
-
-	newbin "${WORKDIR}"/alsa-driver-*/utils/alsa-info.sh alsa-info
-
-	newinitd "${FILESDIR}"/alsasound.initd-r5 alsasound
-	newconfd "${FILESDIR}"/alsasound.confd-r4 alsasound
-
-	insinto /etc/modprobe.d
-	newins "${FILESDIR}"/alsa-modules.conf-rc alsa.conf
-
-	keepdir /var/lib/alsa
-}
-
-pkg_postinst() {
-	echo
-	elog "To take advantage of the init script, and automate the process of"
-	elog "saving and restoring sound-card mixer levels you should"
-	elog "add alsasound to the boot runlevel. You can do this as"
-	elog "root like so:"
-	elog "	# rc-update add alsasound boot"
-	echo
-	ewarn "The ALSA core should be built into the kernel or loaded through other"
-	ewarn "means. There is no longer any modular auto(un)loading in alsa-utils."
-	echo
-}
diff --git a/media-sound/alsa-utils/files/alsasound.confd-r3 b/media-sound/alsa-utils/files/alsasound.confd-r3
deleted file mode 100644
index 0a5d58fc1f82..000000000000
--- a/media-sound/alsa-utils/files/alsasound.confd-r3
+++ /dev/null
@@ -1,31 +0,0 @@
-# ENABLE_OSS_EMUL:
-# Do you want to enable in-kernel oss emulation?
-# no - Do not load oss emul drivers
-# yes - Load oss emul drivers if they're found
-
-ENABLE_OSS_EMUL="yes"
-
-# RESTORE_ON_START:
-# Do you want to restore your mixer settings?  If not, your cards will be
-# muted.
-# no - Do not restore state
-# yes - Restore state
-
-RESTORE_ON_START="yes"
-
-# SAVE_ON_STOP:
-# Do you want to save changes made to your mixer volumes when alsasound
-# stops? 
-# no - Do not save state
-# yes - Save state
-
-SAVE_ON_STOP="yes"
-
-# LOAD_ON_START:
-# Do you want to load sound modules when alsasound starts?
-# Note: The Gentoo ALSA developers encourage you to build your sound 
-#       drivers into the kernel unless the device is hotpluggable or 
-#       you need to supply specific options (such as model= to HD-Audio).
-# no - Do not load modules
-# yes - Load modules
-LOAD_ON_START="yes"
diff --git a/media-sound/alsa-utils/files/alsasound.initd-r4 b/media-sound/alsa-utils/files/alsasound.initd-r4
deleted file mode 100644
index 6d49375b1437..000000000000
--- a/media-sound/alsa-utils/files/alsasound.initd-r4
+++ /dev/null
@@ -1,218 +0,0 @@
-#!/sbin/runscript
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/files/alsasound.initd-r4,v 1.2 2011/10/23 15:59:07 polynomial-c Exp $
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-alsastatedir=/var/lib/alsa
-alsascrdir=/etc/alsa.d
-
-extra_commands="save restore"
-
-depend() {
-	need localmount
-	after bootmisc modules isapnp coldplug hotplug
-}
-
-load_modules() {
-	# List of drivers for each card.
-	local DRIVERS="$(modprobe -c | sed -n -e 's/^alias \(snd-card-[[:digit:]]\+\) .*/\1/p')"
-
-	# Fall back on the automated aliases if we don't have ALSA configured properly...
-	if [ -z "${DRIVERS}" ] && \
-	( [ ! -r /proc/asound/cards ] || grep -q ' no soundcards ' /proc/asound/cards 2>/dev/null ) ; then
-		ewarn "Could not detect custom ALSA settings.  Loading all detected alsa drivers."
-		DRIVERS="$(modprobe -c | sed -n -e '/^alias pci:.* snd.*/ s/^alias pci:[^ ]* \(.*\)/\1/p' | sort | uniq)"
-		if [ -z "${DRIVERS}" ] ; then
-			eerror "Unable to find any ALSA drivers. Have you compiled alsa-drivers correctly?"
-		fi
-	fi
-
-	if [ "${ENABLE_OSS_EMUL}" = "yes" ] ; then
-		DRIVERS="${DRIVERS} $(modprobe -l | sed -n -e '/snd.*oss/ s:.*\/\([[:alnum:]_-]\+\).ko:\1:p')"
-	fi
-
-	# We want to ensure snd-seq is loaded as it is needed for things like
-	# timidity even if we don't use a real sequencer.
-	DRIVERS="${DRIVERS} $(modprobe -l | sed -n -e '/snd.seq\./ s:.*\/\([[:alnum:]_-]\+\).ko:\1:p')"
-
-	# We want to ensure snd-ioctl32 is loaded as it is needed for 32bit
-	# compatibility
-	DRIVERS="${DRIVERS} $(modprobe -l | sed -n -e '/snd.ioctl32\./ s:.*\/\([[:alnum:]_-]\+\).ko:\1:p')"
-
-	local DRIVER= DMOD=
-	for DRIVER in ${DRIVERS} ; do
-		[ "${DRIVER}" = "off" ] && continue
-		DMOD="$(echo "${DRIVER}" | sed -e 's/-/_/g')"
-		if ! grep -q "^${DMOD} " /proc/modules ; then
-			ebegin "Loading: ${DRIVER}"
-			modprobe ${DRIVER}
-			eend $?
-		fi
-	done
-
-	if [ -f /proc/asound/seq/drivers ] ; then
-		local SEQUENCERS="$(sed -n -e 's/\([^,]*\),empty,.*/\1/p' /proc/asound/seq/drivers)"
-		local SEQUENCER
-		for SEQUENCER in ${SEQUENCERS} ; do
-			DMOD="$(echo "${SEQUENCER}" | sed -e 's/-/_/g')"
-			if ! grep -q "^${DMOD} " /proc/modules ; then
-				ebegin "Loading: ${SEQUENCER}"
-				modprobe ${SEQUENCER}
-				eend $?
-			fi
-		done
-	fi
-
-	for DRIVER in ${DRIVERS}
-	do
-		local TMP=${DRIVER##snd-}
-		TMP=${TMP##snd_}
-		if [ -x "${alsascrdir}/${TMP}" ] ; then
-			ebegin "Running: ${alsascrdir}/${TMP}"
-			"${alsascrdir}/${TMP}"
-			eend $?
-		fi
-	done
-
-	if [ ! -d /proc/asound ] || grep -q ' no soundcards ' /proc/asound/cards ; then
-		eerror "ERROR: Failed to load necessary drivers"
-		return 1
-	fi
-}
-
-unload_modules_24() {
-	local LOADED_MODULES="$(lsmod | sed -n -e 's/^\(snd[^ ]*\) .*/\1/p')"
-	local MODULE
-	for MODULE in ${LOADED_MODULES} ; do
-	    rmmod "${MODULE}"
-	done
-	rmmod soundcore 2>/dev/null
-	rmmod gameport 2>/dev/null
-
-	lsmod | grep -vq '^snd'
-}
-
-unload_modules_recursive() {
-	local revdeps="$(lsmod | sed -n -e "s/,/ /g" -e "s/^$1 *[0-9]* *[0-9]* \(.*\)/\1/p")"
-
-	for module in ${revdeps} ; do
-		unload_modules_recursive "${module}"
-	done
-
-	vebegin "Unloading: $1"
-	rmmod --wait "$1"
-	veend $?
-}
-
-unload_modules_26() {
-	# First of all, remove the snd module and all the modules depending
-	# on it, this should remove already most of ALSA modules.
-	lsmod | grep -q "^snd[[:space:]]" && unload_modules_recursive snd
-
-	# Then find the remaining ones, and handle them too.
-	for module in $(lsmod | sed -n -e 's/^\(snd[^ ]*\) .*/\1/p'); do
-		unload_modules_recursive "${module}"
-	done
-
-	lsmod | grep -vq "^snd"
-}
-
-terminate() {
-	#
-	# Kill processes holding open sound devices
-	#
-	# DEVS=`find /dev/ -follow -type c -maxdepth 1 -print 2>/dev/null | xargs ls -dils | grep "1*1[46]," | cut -d: -f2 | cut -d" " -f2; echo /proc/asound/dev/*`
-	local ossdevs="/dev/admmidi* /dev/adsp* /dev/amidi* /dev/audio* /dev/dmfm* \
-			/dev/dmmidi* /dev/dsp* /dev/dspW* /dev/midi0* /dev/mixer* /dev/music \
-			/dev/patmgr* /dev/sequencer* /dev/sndstat"
-	local alsadevs="/proc/asound/dev/* /dev/sound/* /dev/snd/*"
-	fuser -k ${ossdevs} ${alsadevs} >/dev/null 2>/dev/null
-
-	# remove all sequencer connections if any
-	[ -f /proc/asound/seq/clients ] && type aconnect >/dev/null 2>/dev/null && aconnect --removeall
-}
-
-restore() {
-	ebegin "Restoring Mixer Levels"
-
-	if [ ! -r "${alsastatedir}/asound.state" ] ; then
-		ewarn "No mixer config in ${alsastatedir}/asound.state, you have to unmute your card!"
-		eend 0
-		return 0
-	fi
-
-	local cards="$(sed -n -e 's/ *\([[:digit:]]*\) .*/\1/p' /proc/asound/cards)"
-	local CARDNUM
-	for cardnum in ${cards}; do
-		[ -e /dev/snd/controlC${cardnum} ] || sleep 2
-		[ -e /dev/snd/controlC${cardnum} ] || sleep 2
-		[ -e /dev/snd/controlC${cardnum} ] || sleep 2
-		[ -e /dev/snd/controlC${cardnum} ] || sleep 2
-		alsactl -f "${alsastatedir}/asound.state" restore ${cardnum} \
-			|| ewarn "Errors while restoring defaults, ignoring"
-	done
-
-	for ossfile in "${alsastatedir}"/oss/card*_pcm* ; do
-		[ -e "${ossfile}" ] || continue
-		# We use cat because I'm not sure if cp works properly on /proc
-		local procfile=${ossfile##${alsastatedir}/oss}
-		procfile="$(echo "${procfile}" | sed -e 's,_,/,g')"
-		if [ -e /proc/asound/"${procfile}"/oss ] ; then
-		    cat "${ossfile}" > /proc/asound/"${procfile}"/oss 
-		fi
-	done
-
-	eend 0
-}
-
-save() {
-	ebegin "Storing ALSA Mixer Levels"
-
-	mkdir -p "${alsastatedir}"
-	if ! alsactl -f "${alsastatedir}/asound.state" store; then
-		eerror "Error saving levels."
-		eend 1
-		return 1
-	fi
-
-	for ossfile in /proc/asound/card*/pcm*/oss; do
-		[ -e "${ossfile}" ] || continue
-		local device=${ossfile##/proc/asound/} ; device=${device%%/oss}
-		device="$(echo "${device}" | sed -e 's,/,_,g')"
-		mkdir -p "${alsastatedir}/oss/"
-		cp "${ossfile}" "${alsastatedir}/oss/${device}"
-	done
-
-	eend 0
-}
-
-start() {
-	if [ -f /proc/modules ] && [ "${LOAD_ON_START}" = "yes" ]; then
-		ebegin "Loading ALSA modules"
-		eindent
-		load_modules
-		eoutdent
-		eend $? || return 1
-	fi
-
-	if [ ! -d /proc/asound ]; then
-		eerror "ALSA failed to load."
-		eend 1
-		return 1
-	elif [ "${RESTORE_ON_START}" = "yes" ]; then
-		restore
-	fi
-
-	return 0
-}
-
-stop() {
-	if [ ! -d /proc/asound ] ; then
-		eerror "ALSA is not loaded"
-		return 0
-	fi
-
-	[ "${SAVE_ON_STOP}" = "yes" ] && save
-
-	return 0
-}