Install hda-verb and hdajackretask utilities and pull in x11-libs/gtk+:3 for latter wrt #467424 by Jordi Mallach

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

3 files changed, 168 insertions, 9 deletions

diff --git a/media-sound/alsa-tools/ChangeLog b/media-sound/alsa-tools/ChangeLog
index ddfdde223957..812c3f6c1f7a 100644
--- a/media-sound/alsa-tools/ChangeLog
+++ b/media-sound/alsa-tools/ChangeLog
@@ -1,6 +1,13 @@
 # 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.216 2013/05/01 16:25:03 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/ChangeLog,v 1.217 2013/05/02 01:01:41 ssuominen Exp $
+
+*alsa-tools-1.0.27-r1 (02 May 2013)
+
+  02 May 2013; Samuli Suominen <ssuominen@gentoo.org>
+  +alsa-tools-1.0.27-r1.ebuild:
+  Install hda-verb and hdajackretask utilities and pull in x11-libs/gtk+:3 for
+  latter wrt #467424 by Jordi Mallach
 
   01 May 2013; Samuli Suominen <ssuominen@gentoo.org> alsa-tools-1.0.27.ebuild:
   Call epatch_user wrt #468162 by Doug Goldstein
diff --git a/media-sound/alsa-tools/Manifest b/media-sound/alsa-tools/Manifest
index 3613a62b0775..eeed07e22da4 100644
--- a/media-sound/alsa-tools/Manifest
+++ b/media-sound/alsa-tools/Manifest
@@ -5,17 +5,18 @@ AUX envy24control-config-dir.patch 593 SHA256 6cc8c284109839102a12a11de0e834865a
 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.26.ebuild 3724 SHA256 cc0301a1ba2d4b74cc47dedaa9fdf289c118abbb9b1c28d4f061b4115adc267f SHA512 63fd913959173d955d9fc209e47668db0dbe67ff68358e7d0f05860c74fc55fa25e78a5849d316f62f0e9af60c9f78da3e06924c2787621ffe765c7dece6eb9f WHIRLPOOL e28321213a9e60bdcdcd89d37c79bb9b8cc1acd9f245c0b8a3370aac662f3b5c1f09a42da050e5c7288e739f03014d07d7dd7b5de402614a1decb3df7c749130
+EBUILD alsa-tools-1.0.27-r1.ebuild 3818 SHA256 178b48eda2eb80f962d3926859bec5cf6c0701e7bbdae5bd650f79448be1ee3c SHA512 23b3c33c7e79c983160e2d83abcaac05be5ecbb614563f13ad3b0c5af172b9e089f0aac25a0c98f91547a295bb3ffeec2ad576e3763fe1f156ebc25e85d592b5 WHIRLPOOL ffefdced20562a88396574c757f5f10770d78331263375f1c3a4ffa19e13cb655b642fcffa4e9b0950ada7842bc1f7f1184d715c94b79b6591c5edbc17b049dd
 EBUILD alsa-tools-1.0.27.ebuild 3745 SHA256 deaf7e83c7d4d0236d8bad5caf6d2e188797cced6565fbf0ff9249bd7fb630a8 SHA512 51b42709be998a4ea02f0cd9d023f6dd26ec59b9c26d096863f49e18c0a6795617b3e6686c6a6f62ca7e7a4926aa53aa2688f026e5d09a565ba993b91b101a7e WHIRLPOOL 6fdb481ab3fbf9274c1588d2b1d9f0480ca44c5002ef79c8133c82ef5f952b0b8387838a035ef8c921eddaa0d02aacf66b4e3764a767944c6a4add1c40932049
-MISC ChangeLog 31740 SHA256 7150a30235a24173bed895fe1fe0d1471c740f063eb195df43cdddd13ce80fc4 SHA512 5fe90db9c251395fedbbfe169de48c835981924f4d780cb3c7268f239710b323a0185a6c94443331a5931b4156fe452c17f3c5e7ea02b4b80432be794dd11a09 WHIRLPOOL 37ed29b814c330beaf559085649cbf181888f336aa85fd3ecc20ed0d1abb1634875434475dd0650d485d06ecb4cfc3dacb96e096cea288413268d226d5ac20f8
+MISC ChangeLog 31981 SHA256 636a22c324ab0628471a88e68cfdb01af7eec2c7e259921e46b271973544d40b SHA512 8dea57f1f2beaf812be18a8dacb3525ea6bd9b0480b22548159b304457060c03f0f707b5e570b5778a730413e5b901869a784f8585513e2aedcb551fbc7a2905 WHIRLPOOL 7bb6fc264d8e35db6a89fdcb7f2881137d0635bef0d32198b791a8d90a2ed98f4b90587335de9b7c6d547b530884a032efe6a64ab4bed8a94a03ffe606ecfe4c
 MISC metadata.xml 230 SHA256 1f81ba2d193a0ca53dcedb87b01a28851a9d7b14d77db3b2c2647330f4ba6f00 SHA512 88eb296bc7f80d8c2a2f7145401f37e13a89d84bb87a267d4f7c0e6f9caae43747fb9a92de96fbdc5c3ba6a25e861148a5c9b1a20f588b06ecb2fbbb9555f35f WHIRLPOOL 7d2facc317d281f6e251013e28c23c66a50a8e555ab143485615072016dce537aa487b7873baea11f9124e64770aa543962be57937654f7a93b461d38ce9694f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRgUFxAAoJEEdUh39IaPFNpVUH/R5mkBfZsmzH6HDy8CGGJVEW
-pc0g9T0dhznytiVJJYLnHb2La5J3csvTa7Gzj7pcp89FnZmCuG7/41xk2rj4WjLe
-glbXS89fvoHoKJyCrDGB/qDDCJCktm+d8UNHm9ItPJbh0rVbM8QeUhjXRE75Ee/q
-7R6XaYmwDRiBjfm1ac9tHkADalfy52ZcDpaGJUZ69LkVcLdZO6tGWnYb2UMhrMuE
-4FZFXIAtEnwNe0YTzLTNGo2nW5kELpxbT1CzUbb/tp02M8dFFRqQWOej5uZFa0Gj
-+7MXRoSO7WIVV6JTqvSuVmnOXZs24qrv2KcbrkUlt4/+Cyy1yPU8FSazGcnPV4M=
-=jgbn
+iQEcBAEBCAAGBQJRgbqFAAoJEEdUh39IaPFNtooH+wX/pFQtZ+VGRofd6j5pPSM0
+Roi10TkBvLmTMBkNoda8ByF4luxDVOaqerBtDk+J7M9os7ZjqSN5kmyYV341EUmY
+WLmqCfHU0JvSod7LWb7G9Fcuu2qcHLFtT4csdl4T9G8vxZTjb2MjUG/IoVGqxiBr
+MFHlDfntbXYChy10Q1b+BnUtGf39YOKiykBVdyCJPjvTU6f/68HIuR14c5RjrmkL
+OYDdTmFEMF3mHF6E9MhxgDGzTdNYw4hes7DyIkfZm0YL10wA4ClVWHl3rG01gTUN
+VoA8pmvbHSAAmcnA9TRMyydbvmClE2rYRucvcSG5ixAvROUuLjosTgj4y086d/Y=
+=pKav
 -----END PGP SIGNATURE-----
diff --git a/media-sound/alsa-tools/alsa-tools-1.0.27-r1.ebuild b/media-sound/alsa-tools/alsa-tools-1.0.27-r1.ebuild
new file mode 100644
index 000000000000..7efcd0bb08a3
--- /dev/null
+++ b/media-sound/alsa-tools/alsa-tools-1.0.27-r1.ebuild
@@ -0,0 +1,151 @@
+# 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.27-r1.ebuild,v 1.1 2013/05/02 01:01:41 ssuominen Exp $
+
+EAPI=5
+inherit autotools eutils flag-o-matic
+
+DESCRIPTION="Advanced Linux Sound Architecture tools"
+HOMEPAGE="http://www.alsa-project.org/"
+SRC_URI="mirror://alsaproject/tools/${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.26
+	fltk? ( >=x11-libs/fltk-1.3.0:1 )
+	gtk? (
+		x11-libs/gtk+:2
+		x11-libs/gtk+:3
+		)"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	ALSA_TOOLS="seq/sbiload us428control hwmixvolume hda-verb"
+
+	if use gtk; then
+		ALSA_TOOLS="${ALSA_TOOLS} hdajackretask"
+		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() {
+	epatch "${FILESDIR}"/envy24control-config-dir.patch
+
+	epatch_user
+
+	# 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
+		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
+	done
+}
+
+src_install() {
+	local f
+	for f in ${ALSA_TOOLS}
+	do
+		# Install the main stuff
+		cd "${S}/${f}"
+		# hotplugdir is for usx2yloader/Makefile.am
+		emake DESTDIR="${D}" hotplugdir=/lib/firmware install
+
+		# 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})"
+			fi
+		done
+	done
+
+	# Punt at least /usr/lib/liblo10k1.la (last checked, 1.0.27)
+	prune_libtool_files
+}