old

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

5 files changed, 14 insertions, 447 deletions

diff --git a/media-sound/alsa-tools/ChangeLog b/media-sound/alsa-tools/ChangeLog
index 29dafe64dabb..7917d53d12c1 100644
--- a/media-sound/alsa-tools/ChangeLog
+++ b/media-sound/alsa-tools/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/alsa-tools
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/ChangeLog,v 1.214 2013/05/01 12:49:15 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/ChangeLog,v 1.215 2013/05/01 12:51:16 ssuominen Exp $
+
+  01 May 2013; Samuli Suominen <ssuominen@gentoo.org>
+  -alsa-tools-1.0.23.ebuild, -alsa-tools-1.0.24.1.ebuild,
+  -alsa-tools-1.0.25.ebuild:
+  old
 
 *alsa-tools-1.0.27 (01 May 2013)
 
diff --git a/media-sound/alsa-tools/Manifest b/media-sound/alsa-tools/Manifest
index b4a4e059af44..bcb0b9fe760c 100644
--- a/media-sound/alsa-tools/Manifest
+++ b/media-sound/alsa-tools/Manifest
@@ -2,26 +2,20 @@
 Hash: SHA256
 
 AUX envy24control-config-dir.patch 593 SHA256 6cc8c284109839102a12a11de0e834865aa860460d3e387d71a9ae013ba8e1f9 SHA512 267be12fb2d9d561cc2746317beaf5168362005cb98a55d3efe5741dcd974b088bfa049f2ed185919083fe2e24596eec67de2f2984da5369b9aa0eac983b5cef WHIRLPOOL abcc73750027f595b70fa9471334d5bc3b0f326e7847d6fd12ef0ad1107435af8f3236ad5e9b4ab89a9091cd97e1c87258f635137959d3136c3e7780e12394eb
-DIST alsa-tools-1.0.23.tar.bz2 1603719 SHA256 5e048633f0324c11998cdbc283ced30d72887f9bed1f2aeb85b9ee5e9e907099
-DIST alsa-tools-1.0.24.1.tar.bz2 1716198 SHA256 17d43de93ab2db98886d89a53e45341daa46a4ef6edd405db87f4b5a5dc64a05
-DIST alsa-tools-1.0.25.tar.bz2 1574402 SHA256 a974d0f3e837796f67d04df88c783aebcf4ac3c5f9ac31e2b65c10e8cb4b1dca SHA512 21c5a9938d65f095f44c6f57323dce7a30d9f6b543bcc5b4108a0230858955e99cea454994f252551bb7303cec35f9610f51895caeb7fb6e539fa2f731f2eedc WHIRLPOOL deafe8656e08f91480dac56506c19992d18c1c6ad4720f2c75ceb6ef6f1617a07799f17edd474a975e31d351f813092868cb1d29bd96986b45c3ee91f5ccba24
 DIST alsa-tools-1.0.26.tar.bz2 1754369 SHA256 0798c62a5c88ad3ff4797d0f709c5f7ba40db54ed7a6c778703461282a43efdd SHA512 829e0e26df31f21a945b8d459407acfab0e154c862076674524e7fffbbf20731fc23e37bd9c30e2c6fded9c1aa91b4149fd27cd15c4fdc842f88084fe344abd8 WHIRLPOOL 0900b023266958519db26b6cca7bde0217a8ec1310a3fd4ac61409077fb3649fc2fa30a4eeb7f0504eccc872a4f3acff6679d7199c3b379b4cfbce4610f67b05
 DIST alsa-tools-1.0.27.tar.bz2 1650746 SHA256 6562611b5a6560712f109e09740a9d4fa47296b07ed9590cb44139c5f154ada2 SHA512 aad985329e5649b5bd7c142e95c5d1c415f28bac1afb81ad21fedac76e736d18abe4aa129e798650d91b2dd14fb18f3960ed5218768c689319c2360c432b4589 WHIRLPOOL 0d827aee4219e393c61a55920e3d66eb4e208e9d3d93ac9c1bf208c5c0c8cdf2d58f63d70b534458f3542cd3cbd5478129d73aecc57ce6654bc43f0bc73c0f25
-EBUILD alsa-tools-1.0.23.ebuild 3542 SHA256 e8393502a46ab920a2d6d4739a442ded8a42c97fdeb56981d821a352e0fe316d SHA512 40f95c253e06066dec8baa2078cd2f83af96580219d238be3738c4693bf3b1259ca4faa6b48f52642487b68cc8c878642ff77c032a87e458dd4aa4856745ebf6 WHIRLPOOL c63a374610d4a42c33d5d3ff49e12654d6d303e947ace11bb672a82f3b70f7db86cc5ba4ed0313766d455d86e933dc91d10126bb554e0dac1d0443987f439e10
-EBUILD alsa-tools-1.0.24.1.ebuild 3733 SHA256 b70aee9a1644c2f5fe37ac3036105288f2a61ecf604a8b2cfbecdaea4b34ee8e SHA512 6104389b85a08aa85b7f429f56df1b4f1719e019b7b49b61dee0f63e931d91ed2c9700212aec1deb8279ab312a3332b741f8c1068d47e4b6a9e30e9dff228f24 WHIRLPOOL 4e8f9fab2eebfa8d2ec157f47c34ee543e1cd1f0d2856b25a719f860df2de0061f676e5fee4cbd8cae6e8ea2d0b27f195c9f0b67a79ffcad30bf92a50a82e141
-EBUILD alsa-tools-1.0.25.ebuild 3724 SHA256 213ebd6d096b1b884701ba31152ad4c8898b2077d8a7fc1e85fcd54f7bd62119 SHA512 1fed924ea4714a15820e8c0f592bb3daaa32d16cbbdc63eb58ca82eaf782b1ec2efbb47468573e82af714304d925a05e8180d988e87d4353e7620d3e4d8eb5e0 WHIRLPOOL bf89b698e28b7c9d8ce0a057abf4927240c6a50c67bfa15cf5184e7bc49f8484412e4ee9d93a328037c6c195f08bc1ea9272f8efe3bfb4ff69c1223188ffea3a
 EBUILD alsa-tools-1.0.26.ebuild 3724 SHA256 cc0301a1ba2d4b74cc47dedaa9fdf289c118abbb9b1c28d4f061b4115adc267f SHA512 63fd913959173d955d9fc209e47668db0dbe67ff68358e7d0f05860c74fc55fa25e78a5849d316f62f0e9af60c9f78da3e06924c2787621ffe765c7dece6eb9f WHIRLPOOL e28321213a9e60bdcdcd89d37c79bb9b8cc1acd9f245c0b8a3370aac662f3b5c1f09a42da050e5c7288e739f03014d07d7dd7b5de402614a1decb3df7c749130
 EBUILD alsa-tools-1.0.27.ebuild 3731 SHA256 a8438d00e3d9706409b5dc0d0d1114004ec79f343d243a31daeb2ef77f35afe4 SHA512 ba7d70c698dc1fb343151f36af271eadc3467523b020f46387078cb0a95f5965cf1ffedb7e49ac24843a8feceb330ecd8b2a2a477444a387d9e5150c49a94f90 WHIRLPOOL 9b21c0c135cf3d1a5e1781bfeddb16cd1bddd31b3fdd235bc4151f4d648df16ef7976d7567b3e9622bbebee9bd2ecbf3a5b23030785825290b4f62d2a6af5a9f
-MISC ChangeLog 31462 SHA256 e59ca102fcf77d3914985cd7aed2a562d09612c98e2a487bfcef2388c16d5ac1 SHA512 f81d931cb816be1346c297f1c44bf67f6b6d1eb7f5fa0120a69fa3f7f69cc05797ce5eb80dfb790c1637a235435ceb9d850d5d6e8c9e6b331515992f1102cf18 WHIRLPOOL c25751b792c0b34d074494c8eceb0c589441bd6d1b790956bcf4c986452c2755913b09bf5b1da221852cdfcc784e6242aa36897893e7765a6945e1b90a560450
+MISC ChangeLog 31610 SHA256 eee3f64ac8680b7d5afc3071a75615326e24b7ed8acaea2a6ad9e1fec4540206 SHA512 7b2eee9f0e7c55cb6be8a3e65e0d250d5929fb9ffb7a5d2d12672d60d848e0b092ae073105ebf26cf9ea8af7a72cd427d6dbd4e6f84586d0687309bc59bb2173 WHIRLPOOL 97040e5f2d925a59015e7fe7e9ac5ac90889268a5a4479a845a65d67b25995e640c4cb81f8092f74b93c21a922fa334a9eb076d6fc83ec14ead7d35c0a8c6be9
 MISC metadata.xml 230 SHA256 1f81ba2d193a0ca53dcedb87b01a28851a9d7b14d77db3b2c2647330f4ba6f00 SHA512 88eb296bc7f80d8c2a2f7145401f37e13a89d84bb87a267d4f7c0e6f9caae43747fb9a92de96fbdc5c3ba6a25e861148a5c9b1a20f588b06ecb2fbbb9555f35f WHIRLPOOL 7d2facc317d281f6e251013e28c23c66a50a8e555ab143485615072016dce537aa487b7873baea11f9124e64770aa543962be57937654f7a93b461d38ce9694f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRgQ7eAAoJEEdUh39IaPFNmEMH/1GZrjfxmyW2lhWe+eahLo4o
-5jIJT9wNEcrtVQAb8z03PjS+0ulISj/uI66C0ILYRR5RGlipTRH62DKEFPCkEJdp
-q50hZSMm7vLcRfAPd/shQ+4qBWmD2Ip5ncrCrWHYl8GqNJ47pfx3lxJ2LuNESzjg
-FfQ5lAMxvcyvzeWuFG5vLzL+Ig0ostu01pnLUi4Z1ngmy7nhdf2qu0UqlWo8C+zY
-VU2zzWT2STYXvh1OKDfTiosNhOCRtrLTp0YRLLrnsJOIiOf2mzaQFYLIPGwAs5Y+
-kKCccH2uz5xe/ejN+nhrkk8hwps6zhjnzurk2yaeU9OpseuRuRu3mbutblDTJpE=
-=JcbJ
+iQEcBAEBCAAGBQJRgQ9WAAoJEEdUh39IaPFNZGcH/RtmwpzLL7DPNbSoejWIMBCe
+N54G8SNs9jkb52WX65fwJp0YjJwoRAlhwh8znSl4tf8kYqNZxIG/P9yV4GcWFRLt
+O5/XWKRXjc4eJPv6rSD8IiNn9vALcWcOByYYtima6Oom2nNY77D75hEQaGMkQ4tZ
+UWz/fYqoTy/gUHEMwKxscXHoV6wisAwcsJAW9BqhEKBAEcv87yJOVsQRRD0KUHtl
+NMydHvoe1M4ExZYmsfimte0lc39BUnGRL/tFsNrVsoOA54byeZ/tVS7SSdXMjRW5
+p4uHzq8m2sMWJYOyQ7tz1ckoSvw36bFEkYJm+VnHaKYLbDuPiK7ZlGbee8A6qDA=
+=zE7h
 -----END PGP SIGNATURE-----
diff --git a/media-sound/alsa-tools/alsa-tools-1.0.23.ebuild b/media-sound/alsa-tools/alsa-tools-1.0.23.ebuild
deleted file mode 100644
index d9843e66a787..000000000000
--- a/media-sound/alsa-tools/alsa-tools-1.0.23.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2011 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.23.ebuild,v 1.10 2011/03/22 09:59:02 jlec Exp $
-
-EAPI=1
-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"
-
-ECHOAUDIO_CARDS="alsa_cards_darla20 alsa_cards_gina20
-alsa_cards_layla20 alsa_cards_darla24 alsa_cards_gina24
-alsa_cards_layla24 alsa_cards_mona alsa_cards_mia alsa_cards_indigo
-alsa_cards_indigoio alsa_cards_echo3g"
-
-IUSE="fltk gtk alsa_cards_hdsp alsa_cards_hdspm alsa_cards_mixart
-alsa_cards_vx222 alsa_cards_usb-usx2y alsa_cards_sb16 alsa_cards_sbawe
-alsa_cards_emu10k1 alsa_cards_emu10k1x alsa_cards_ice1712
-alsa_cards_rme32 alsa_cards_rme96 alsa_cards_sscape alsa_cards_pcxhr
-${ECHOAUDIO_CARDS}"
-
-RDEPEND=">=media-libs/alsa-lib-1.0.22
-	>=dev-python/pyalsa-1.0.22
-	fltk? ( x11-libs/fltk:1 )
-	gtk? ( x11-libs/gtk+:2 )"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-
-	ALSA_TOOLS="ac3dec seq/sbiload us428control hwmixvolume"
-
-	if use gtk; then
-		use alsa_cards_ice1712 && \
-			ALSA_TOOLS="${ALSA_TOOLS} envy24control"
-		use alsa_cards_rme32 && use alsa_cards_rme96 && \
-			ALSA_TOOLS="${ALSA_TOOLS} rmedigicontrol"
-	fi
-
-	if use alsa_cards_hdsp || use alsa_cards_hdspm; then
-		ALSA_TOOLS="${ALSA_TOOLS} hdsploader"
-		use fltk && ALSA_TOOLS="${ALSA_TOOLS} hdspconf hdspmixer"
-	fi
-
-	use alsa_cards_mixart && ALSA_TOOLS="${ALSA_TOOLS} mixartloader"
-	use alsa_cards_vx222 && ALSA_TOOLS="${ALSA_TOOLS} vxloader"
-	use alsa_cards_usb-usx2y && ALSA_TOOLS="${ALSA_TOOLS} usx2yloader"
-	use alsa_cards_pcxhr && ALSA_TOOLS="${ALSA_TOOLS} pcxhr"
-	use alsa_cards_sscape && ALSA_TOOLS="${ALSA_TOOLS} sscape_ctl"
-
-	{ use alsa_cards_sb16 || use alsa_cards_sbawe; } && \
-		ALSA_TOOLS="${ALSA_TOOLS} sb16_csp"
-
-	if use alsa_cards_emu10k1 || use alsa_cards_emu10k1x; then
-		ALSA_TOOLS="${ALSA_TOOLS} as10k1 ld10k1"
-	fi
-
-	if use gtk; then
-		for card in ${ECHOAUDIO_CARDS}; do
-			if use ${card}; then
-				ALSA_TOOLS="${ALSA_TOOLS} echomixer"
-			fi
-		done
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# bug 273129
-	epatch "${FILESDIR}"/envy24control-config-dir.patch
-
-	# This block only deals with the tools that still use GTK and the
-	# AM_PATH_GTK macro.
-	for dir in echomixer envy24control rmedigicontrol; do
-		has "${dir}" "${ALSA_TOOLS}" || continue
-		pushd "${dir}" &> /dev/null
-		sed -i -e '/AM_PATH_GTK/d' configure.in
-		eautoreconf
-		popd &> /dev/null
-	done
-
-	# This block deals with the tools that are being patched
-	for dir in hdspconf; do
-		has "${dir}" "${ALSA_TOOLS}" || continue
-		pushd "${dir}" &> /dev/null
-		eautoreconf
-		popd &> /dev/null
-	done
-
-	elibtoolize
-}
-
-src_compile() {
-	if use fltk; then
-		# hdspmixer requires fltk
-		append-ldflags "-L$(dirname $(fltk-config --libs))"
-		append-flags "-I/usr/include/fltk-1"
-	fi
-
-	local f
-	for f in ${ALSA_TOOLS}
-	do
-		cd "${S}/${f}"
-		econf --with-gtk2
-		emake || die "emake ${f} 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})" || die
-				dodoc "${doc}.$(basename ${f})" || die
-			fi
-		done
-	done
-}
diff --git a/media-sound/alsa-tools/alsa-tools-1.0.24.1.ebuild b/media-sound/alsa-tools/alsa-tools-1.0.24.1.ebuild
deleted file mode 100644
index 1f0b1dc5a211..000000000000
--- a/media-sound/alsa-tools/alsa-tools-1.0.24.1.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2011 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.24.1.ebuild,v 1.3 2011/03/22 09:59:02 jlec Exp $
-
-EAPI=3
-inherit base 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"
-
-ECHOAUDIO_CARDS="alsa_cards_darla20 alsa_cards_gina20
-alsa_cards_layla20 alsa_cards_darla24 alsa_cards_gina24
-alsa_cards_layla24 alsa_cards_mona alsa_cards_mia alsa_cards_indigo
-alsa_cards_indigoio alsa_cards_echo3g"
-
-IUSE="fltk gtk alsa_cards_hdsp alsa_cards_hdspm alsa_cards_mixart
-alsa_cards_vx222 alsa_cards_usb-usx2y alsa_cards_sb16 alsa_cards_sbawe
-alsa_cards_emu10k1 alsa_cards_emu10k1x alsa_cards_ice1712
-alsa_cards_rme32 alsa_cards_rme96 alsa_cards_sscape alsa_cards_pcxhr
-${ECHOAUDIO_CARDS}"
-
-RDEPEND=">=media-libs/alsa-lib-${PV}
-	>=dev-python/pyalsa-1.0.24
-	fltk? ( >=x11-libs/fltk-1.1.10-r2:1 )
-	gtk? ( x11-libs/gtk+:2 )"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-PATCHES=( "${FILESDIR}/envy24control-config-dir.patch" )
-
-pkg_setup() {
-
-	ALSA_TOOLS="ac3dec seq/sbiload us428control hwmixvolume"
-
-	if use gtk; then
-		use alsa_cards_ice1712 && \
-			ALSA_TOOLS="${ALSA_TOOLS} envy24control"
-		use alsa_cards_rme32 && use alsa_cards_rme96 && \
-			ALSA_TOOLS="${ALSA_TOOLS} rmedigicontrol"
-	fi
-
-	if use alsa_cards_hdsp || use alsa_cards_hdspm; then
-		ALSA_TOOLS="${ALSA_TOOLS} hdsploader"
-		use fltk && ALSA_TOOLS="${ALSA_TOOLS} hdspconf hdspmixer"
-	fi
-
-	use alsa_cards_mixart && ALSA_TOOLS="${ALSA_TOOLS} mixartloader"
-	use alsa_cards_vx222 && ALSA_TOOLS="${ALSA_TOOLS} vxloader"
-	use alsa_cards_usb-usx2y && ALSA_TOOLS="${ALSA_TOOLS} usx2yloader"
-	use alsa_cards_pcxhr && ALSA_TOOLS="${ALSA_TOOLS} pcxhr"
-	use alsa_cards_sscape && ALSA_TOOLS="${ALSA_TOOLS} sscape_ctl"
-
-	{ use alsa_cards_sb16 || use alsa_cards_sbawe; } && \
-		ALSA_TOOLS="${ALSA_TOOLS} sb16_csp"
-
-	if use alsa_cards_emu10k1 || use alsa_cards_emu10k1x; then
-		ALSA_TOOLS="${ALSA_TOOLS} as10k1 ld10k1"
-	fi
-
-	if use gtk; then
-		for card in ${ECHOAUDIO_CARDS}; do
-			if use ${card}; then
-				ALSA_TOOLS="${ALSA_TOOLS} echomixer"
-			fi
-		done
-	fi
-}
-
-src_prepare() {
-	base_src_prepare()
-
-	# This block only deals with the tools that still use GTK and the
-	# AM_PATH_GTK macro.
-	for dir in echomixer envy24control rmedigicontrol; do
-		has "${dir}" "${ALSA_TOOLS}" || continue
-		pushd "${dir}" &> /dev/null
-		sed -i -e '/AM_PATH_GTK/d' configure.in
-		eautoreconf
-		popd &> /dev/null
-	done
-
-	# This block deals with the tools that are being patched
-	for dir in hdspconf; do
-		has "${dir}" "${ALSA_TOOLS}" || continue
-		pushd "${dir}" &> /dev/null
-		eautoreconf
-		popd &> /dev/null
-	done
-
-	elibtoolize
-}
-
-src_configure() {
-	if use fltk; then
-		# hdspmixer requires fltk
-		append-ldflags "-L$(dirname $(fltk-config --libs))"
-		append-flags "-I$(fltk-config --includedir)"
-	fi
-
-	local f
-	for f in ${ALSA_TOOLS}
-	do
-		cd "${S}/${f}"
-		case "${f}" in
-			echomixer,envy24control,rmedigicontrol )
-				econf --with-gtk2
-				;;
-			* )
-				econf
-				;;
-		esac
-	done
-}
-
-src_compile() {
-	local f
-	for f in ${ALSA_TOOLS}
-	do
-		cd "${S}/${f}"
-		emake || die "emake ${f} 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})" || die
-				dodoc "${doc}.$(basename ${f})" || die
-			fi
-		done
-	done
-}
diff --git a/media-sound/alsa-tools/alsa-tools-1.0.25.ebuild b/media-sound/alsa-tools/alsa-tools-1.0.25.ebuild
deleted file mode 100644
index eeae5c8782d2..000000000000
--- a/media-sound/alsa-tools/alsa-tools-1.0.25.ebuild
+++ /dev/null
@@ -1,148 +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-tools/alsa-tools-1.0.25.ebuild,v 1.6 2013/03/13 10:56:57 ago Exp $
-
-EAPI=4
-inherit base 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"
-
-ECHOAUDIO_CARDS="alsa_cards_darla20 alsa_cards_gina20
-alsa_cards_layla20 alsa_cards_darla24 alsa_cards_gina24
-alsa_cards_layla24 alsa_cards_mona alsa_cards_mia alsa_cards_indigo
-alsa_cards_indigoio alsa_cards_echo3g"
-
-IUSE="fltk gtk alsa_cards_hdsp alsa_cards_hdspm alsa_cards_mixart
-alsa_cards_vx222 alsa_cards_usb-usx2y alsa_cards_sb16 alsa_cards_sbawe
-alsa_cards_emu10k1 alsa_cards_emu10k1x alsa_cards_ice1712
-alsa_cards_rme32 alsa_cards_rme96 alsa_cards_sscape alsa_cards_pcxhr
-${ECHOAUDIO_CARDS}"
-
-RDEPEND=">=media-libs/alsa-lib-${PV}
-	>=dev-python/pyalsa-${PV}
-	fltk? ( >=x11-libs/fltk-1.1.10-r2:1 )
-	gtk? ( x11-libs/gtk+:2 )"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-PATCHES=( "${FILESDIR}/envy24control-config-dir.patch" )
-
-pkg_setup() {
-
-	ALSA_TOOLS="ac3dec seq/sbiload us428control hwmixvolume"
-
-	if use gtk; then
-		use alsa_cards_ice1712 && \
-			ALSA_TOOLS="${ALSA_TOOLS} envy24control"
-		use alsa_cards_rme32 && use alsa_cards_rme96 && \
-			ALSA_TOOLS="${ALSA_TOOLS} rmedigicontrol"
-	fi
-
-	if use alsa_cards_hdsp || use alsa_cards_hdspm; then
-		ALSA_TOOLS="${ALSA_TOOLS} hdsploader"
-		use fltk && ALSA_TOOLS="${ALSA_TOOLS} hdspconf hdspmixer"
-	fi
-
-	use alsa_cards_mixart && ALSA_TOOLS="${ALSA_TOOLS} mixartloader"
-	use alsa_cards_vx222 && ALSA_TOOLS="${ALSA_TOOLS} vxloader"
-	use alsa_cards_usb-usx2y && ALSA_TOOLS="${ALSA_TOOLS} usx2yloader"
-	use alsa_cards_pcxhr && ALSA_TOOLS="${ALSA_TOOLS} pcxhr"
-	use alsa_cards_sscape && ALSA_TOOLS="${ALSA_TOOLS} sscape_ctl"
-
-	{ use alsa_cards_sb16 || use alsa_cards_sbawe; } && \
-		ALSA_TOOLS="${ALSA_TOOLS} sb16_csp"
-
-	if use alsa_cards_emu10k1 || use alsa_cards_emu10k1x; then
-		ALSA_TOOLS="${ALSA_TOOLS} as10k1 ld10k1"
-	fi
-
-	if use gtk; then
-		for card in ${ECHOAUDIO_CARDS}; do
-			if use ${card}; then
-				ALSA_TOOLS="${ALSA_TOOLS} echomixer"
-			fi
-		done
-	fi
-}
-
-src_prepare() {
-	base_src_prepare()
-
-	# This block only deals with the tools that still use GTK and the
-	# AM_PATH_GTK macro.
-	for dir in echomixer envy24control rmedigicontrol; do
-		has "${dir}" "${ALSA_TOOLS}" || continue
-		pushd "${dir}" &> /dev/null
-		sed -i -e '/AM_PATH_GTK/d' configure.in
-		eautoreconf
-		popd &> /dev/null
-	done
-
-	# This block deals with the tools that are being patched
-	for dir in hdspconf; do
-		has "${dir}" "${ALSA_TOOLS}" || continue
-		pushd "${dir}" &> /dev/null
-		eautoreconf
-		popd &> /dev/null
-	done
-
-	elibtoolize
-}
-
-src_configure() {
-	if use fltk; then
-		# hdspmixer requires fltk
-		append-ldflags "-L$(dirname $(fltk-config --libs))"
-		append-flags "-I$(fltk-config --includedir)"
-	fi
-
-	local f
-	for f in ${ALSA_TOOLS}
-	do
-		cd "${S}/${f}"
-		case "${f}" in
-			echomixer,envy24control,rmedigicontrol )
-				econf --with-gtk2
-				;;
-			* )
-				econf
-				;;
-		esac
-	done
-}
-
-src_compile() {
-	local f
-	for f in ${ALSA_TOOLS}
-	do
-		cd "${S}/${f}"
-		emake || die "emake ${f} 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})" || die
-				dodoc "${doc}.$(basename ${f})" || die
-			fi
-		done
-	done
-}