Version bump, as announced by Jaroslav Kysela on alsa-devel.

Package-Manager: portage-2.1.11.13/cvs/Linux x86_64

3 files changed, 170 insertions, 15 deletions

diff --git a/media-sound/alsa-tools/ChangeLog b/media-sound/alsa-tools/ChangeLog
index eecd13a095ef..64a4e732ca2c 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/ChangeLog,v 1.206 2012/04/01 15:14:24 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/ChangeLog,v 1.207 2012/09/07 13:04:22 chainsaw Exp $
+
+*alsa-tools-1.0.26 (07 Sep 2012)
+
+  07 Sep 2012; Tony Vroon <chainsaw@gentoo.org> +alsa-tools-1.0.26.ebuild:
+  Version bump, as announced by Jaroslav Kysela on alsa-devel.
 
   01 Apr 2012; Raúl Porcel <armin76@gentoo.org> alsa-tools-1.0.25.ebuild:
   sparc stable wrt #406101
diff --git a/media-sound/alsa-tools/Manifest b/media-sound/alsa-tools/Manifest
index b7ddd51fd15c..85b4c92510e0 100644
--- a/media-sound/alsa-tools/Manifest
+++ b/media-sound/alsa-tools/Manifest
@@ -1,19 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX envy24control-config-dir.patch 593 RMD160 7db6a5e50e0d89a6a5baac7a6f25eb814e87537e SHA1 a4c1586b4ee313ee74c85c8725c05102e9ea7bfe SHA256 6cc8c284109839102a12a11de0e834865aa860460d3e387d71a9ae013ba8e1f9
-DIST alsa-tools-1.0.23.tar.bz2 1603719 RMD160 140e5f19874c1f7d43f5b0bd26b8ef1fe0060370 SHA1 4683fa0bd151d4a17c45125aebd8eaec58cf6ca3 SHA256 5e048633f0324c11998cdbc283ced30d72887f9bed1f2aeb85b9ee5e9e907099
-DIST alsa-tools-1.0.24.1.tar.bz2 1716198 RMD160 1a8f83d716900ca665e1a0105ea5771b9b215e13 SHA1 1b3e3c13caf16760d6a7523c08ef7b75ff09e238 SHA256 17d43de93ab2db98886d89a53e45341daa46a4ef6edd405db87f4b5a5dc64a05
-DIST alsa-tools-1.0.25.tar.bz2 1574402 RMD160 d34c280cf74b5589116c45dcfe3c20f815999378 SHA1 de854f4c5c4df2d847ce64bd8a631bdb51ef9889 SHA256 a974d0f3e837796f67d04df88c783aebcf4ac3c5f9ac31e2b65c10e8cb4b1dca
-EBUILD alsa-tools-1.0.23.ebuild 3542 RMD160 d6c7d7bb8d5d81e8d801aa27969cbf9e1e1947e3 SHA1 6fd6971e3f25296ec7ba1fd852f1ee661c700bcf SHA256 e8393502a46ab920a2d6d4739a442ded8a42c97fdeb56981d821a352e0fe316d
-EBUILD alsa-tools-1.0.24.1.ebuild 3733 RMD160 5ac80abd7e1194e2240f91e2c262a3008f5348e4 SHA1 e2d9baf42e524d9969882d1bad3629af4b204b88 SHA256 b70aee9a1644c2f5fe37ac3036105288f2a61ecf604a8b2cfbecdaea4b34ee8e
-EBUILD alsa-tools-1.0.25.ebuild 3729 RMD160 f9c18a36c3c8cde0a09dec6cc4052fcd34936cb8 SHA1 6d5357d02cf0b8f75fcbe50d1b95f72650fd6034 SHA256 07a5083b89fef9e0914fab9d7823673b3e1154fdecab883beb4672ebbc327486
-MISC ChangeLog 30322 RMD160 9d3bcf929bb2bb232aa4eda6b754d94cf9b7b42d SHA1 2043196cf8c16740a0c2f374b4373ff9d2ac10f1 SHA256 c71074025caabb8e87f18085f961b5e4c594d5f138e94b098c72750d9f099610
-MISC metadata.xml 230 RMD160 fa99b07bbc82d3dde53c4bb732ec862ee8fc6bb5 SHA1 1337d895713f767f43778dce0b300da5bf852d80 SHA256 1f81ba2d193a0ca53dcedb87b01a28851a9d7b14d77db3b2c2647330f4ba6f00
+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
+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 3729 SHA256 07a5083b89fef9e0914fab9d7823673b3e1154fdecab883beb4672ebbc327486 SHA512 654cf1f39f403dc0fa570edb40875f9ce4aa69c0ffe92c092520535d151b0588953e96ea76d95b23ea69a9df578920d7d881c1c087d205b4db499bfc27b09ff5 WHIRLPOOL 86c197df3b1d4629acd0c2d82d9540e0453ef19f34142785bd45030d757459bff469720a3d120c1cfa440ad6b35eaea474a27b3b2e0b0f6f217575729956ffd6
+EBUILD alsa-tools-1.0.26.ebuild 3734 SHA256 763de2a7f2801a37ca26858924746c6bfacff507662b60be7808f3578d17cc06 SHA512 3287907304f37948981d211935c25d6be41c69ff115a3530fe090095506aa975b54bdb64792f36859bb963e5600a3839c398b7f957a0da80391d2a43cf87aa5e WHIRLPOOL f80844e45d4f80a3bf1e688045bd27f5176c08eb0660f2ad7e8e1a8a919b1e9d74009d4223640ce99a081788d043379ed826c23a2b416be072014e48653be1df
+MISC ChangeLog 30496 SHA256 77f2d44119836d0a0216d59182f1f3bd74732ebbc5af9a95e705ad6397dbe493 SHA512 e741272e8348c67619955efacef19ffd935d6c22ff9504fbeb53289d33f0c670afe3ce0cc6ff6bd5152c5c1fd07ce7efed47f4697f20810e0d1a669ec88f465e WHIRLPOOL af05627d55e1a10fd86571e32ccc8c6871b68b38b1ee3f73a9db3accba76e0ce8e66fbe05fa8283ae4a9b8ead27773c3a2b1b97a817653aa5a7472ac29113ced
+MISC metadata.xml 230 SHA256 1f81ba2d193a0ca53dcedb87b01a28851a9d7b14d77db3b2c2647330f4ba6f00 SHA512 88eb296bc7f80d8c2a2f7145401f37e13a89d84bb87a267d4f7c0e6f9caae43747fb9a92de96fbdc5c3ba6a25e861148a5c9b1a20f588b06ecb2fbbb9555f35f WHIRLPOOL 7d2facc317d281f6e251013e28c23c66a50a8e555ab143485615072016dce537aa487b7873baea11f9124e64770aa543962be57937654f7a93b461d38ce9694f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk94cNYACgkQuQc30/atMkCeGwCbBGJL0SWzjDqlY59XQZta2bO3
-0DkAoML/8yplu0TQl8AZ4ILN6SVo+HeD
-=PVh7
+iEYEAREIAAYFAlBJ8PEACgkQp5vW4rUFj5rNhACfYbx6H3KZVhFaWHrwSqt6+SL3
+UUsAoJZjke6DuO1ScZTahZhh9Z2a2TRw
+=yZfU
 -----END PGP SIGNATURE-----
diff --git a/media-sound/alsa-tools/alsa-tools-1.0.26.ebuild b/media-sound/alsa-tools/alsa-tools-1.0.26.ebuild
new file mode 100644
index 000000000000..5a6bf24255e2
--- /dev/null
+++ b/media-sound/alsa-tools/alsa-tools-1.0.26.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2012 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.26.ebuild,v 1.1 2012/09/07 13:04:22 chainsaw 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
+}