Version bump. Port to EAPI=3.

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

3 files changed, 157 insertions, 2 deletions

diff --git a/media-sound/alsa-tools/ChangeLog b/media-sound/alsa-tools/ChangeLog
index 7a068f3e24bd..6f0c5d79c6c7 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-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/ChangeLog,v 1.198 2011/01/22 22:56:27 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/ChangeLog,v 1.199 2011/02/06 00:32:39 chainsaw Exp $
+
+*alsa-tools-1.0.24.1 (06 Feb 2011)
+
+  06 Feb 2011; Tony Vroon <chainsaw@gentoo.org> +alsa-tools-1.0.24.1.ebuild:
+  Version bump. Port to EAPI=3.
 
   22 Jan 2011; Kacper Kowalik <xarthisius@gentoo.org>
   alsa-tools-1.0.23.ebuild:
diff --git a/media-sound/alsa-tools/Manifest b/media-sound/alsa-tools/Manifest
index 8ff95dad216d..1340a10ae002 100644
--- a/media-sound/alsa-tools/Manifest
+++ b/media-sound/alsa-tools/Manifest
@@ -5,11 +5,13 @@ DIST alsa-tools-1.0.20.tar.bz2 1555723 RMD160 2d4a35726c012b2bb1f24cff68847452e1
 DIST alsa-tools-1.0.21.tar.bz2 1556178 RMD160 639acff29e783dd36d4404f353eacbe99dbe53f5 SHA1 23e8090bc7c47e68564dfd005c57d65e37491a0e SHA256 b5299ef71d33172183776c98ebbdbfa061d918aa6963b60267608a529b069329
 DIST alsa-tools-1.0.22.tar.bz2 1555768 RMD160 2bfc7c047341cfdae25610db0fac6223a330a0e4 SHA1 7c4ad5cf600fb9943b43a557995dc7ef93c00e9d SHA256 4185a075287072f91df8eee5a37d99a688093cd231226909e3c8b57db775fb40
 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
 EBUILD alsa-tools-1.0.20-r1.ebuild 3560 RMD160 36813dfb4f88823e6e13bb021e7d78566bb0c4aa SHA1 c4c8d49ad7a81b2dfe449befc74caf6b71457695 SHA256 f005cd9dac47c9ba816cfd56633a4bc3b7fc3886b93e43761f82343e5f6b1106
 EBUILD alsa-tools-1.0.20-r2.ebuild 3618 RMD160 bf8bd70d5084e91cbcee15ff9d15c955cacf213e SHA1 230879bf75af781be94a4b0bce37a5612977fe72 SHA256 1619eaf036ee2f482c50e154c98b96e6480d115a63556d44c0064bfadfabc2fc
 EBUILD alsa-tools-1.0.21-r1.ebuild 3523 RMD160 5c390e1aa77f63668f20a5ac183a26e6dcf488de SHA1 c12299fc960fb3715e3d584b014451172866296e SHA256 7686b8d5a8bbc72a5103b1868acd9ed8ea0fcc6454e66106a1c7b521fa04e371
 EBUILD alsa-tools-1.0.21.ebuild 3460 RMD160 dfe8671efddbb440ba3f441b6ab312b5ccf2f23f SHA1 a3a4816534b5eff294e86f6bfec4bf82831fbbf6 SHA256 f9fba410ea65f659c99f34e66b836c59867c91c0e9f2a29c85a942cf3ebbe1f3
 EBUILD alsa-tools-1.0.22.ebuild 3534 RMD160 6938f3fd3cb8b599ad090c912db2687822f9354d SHA1 f4ef54cb996bebc5b44cbc0df1db76b25b7780b7 SHA256 9f3e7a0842906ff5c7ba2d4dee4663d6d39d54be84e48f5e4b09af76b8c3eeaa
 EBUILD alsa-tools-1.0.23.ebuild 3569 RMD160 cdc3e262fb28741bf6882c393ebe3deb4bf52bb8 SHA1 7512c42bddfb6325b3889a3b76f71fb419ecca35 SHA256 1d7096bf2d0b2b83065a7549da9422a961c0a572e9ae596bfe304ba9ed774f87
-MISC ChangeLog 28807 RMD160 a00e68d0d4bece8043e6412589bd96c8410e8d9d SHA1 ed063b6586aeae0f1153c4938e0208476862013b SHA256 f710938fc99f98e428dcd780ae317bc89f9741150bf2000caf5650a02b44e2ea
+EBUILD alsa-tools-1.0.24.1.ebuild 3773 RMD160 ab6ea7996bc221dfdacda3d8fa2ed5a7a5647c7d SHA1 870df456dde05f3bb123c11a6672a13187259dad SHA256 20f64ab2b994b8ddcbefe4c6640c66400d8752ad7740b92a22857aec6672eedd
+MISC ChangeLog 28951 RMD160 cf0a63453e64002a60ba3aa7aed8518889a44586 SHA1 a3c0d7c25e2e08d6368e17a19cf17e2ebeee0189 SHA256 174f15952ed712e5398f7e09402ae394e468d8eb41ae04023a93fe35cfdec00b
 MISC metadata.xml 230 RMD160 fa99b07bbc82d3dde53c4bb732ec862ee8fc6bb5 SHA1 1337d895713f767f43778dce0b300da5bf852d80 SHA256 1f81ba2d193a0ca53dcedb87b01a28851a9d7b14d77db3b2c2647330f4ba6f00
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
new file mode 100644
index 000000000000..754265987c00
--- /dev/null
+++ b/media-sound/alsa-tools/alsa-tools-1.0.24.1.ebuild
@@ -0,0 +1,148 @@
+# 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.1 2011/02/06 00:32:39 chainsaw 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* )
+	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/usr/$(get_libdir)/fltk-1.1"
+		append-flags "-I/usr/include/fltk-1.1"
+	fi
+
+	local f
+	for f in ${ALSA_TOOLS}
+	do
+		cd "${S}/${f}"
+		case "${f}" in
+			echomixer,envy24control,rmedigicontrol )
+				econf --with-gtk2 || die "econf ${f} failed"
+				;;
+			* )
+				econf || die "econf ${f} failed"
+				;;
+		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
+}