Split X useflag into fltk and gtk flags as per bug #111028. Patch from Henrik 'Brix' Andersen <brix@gentoo.org>. Don't rewrite LDFLAGS.

(Portage version: 2.0.53_rc7)

5 files changed, 111 insertions, 14 deletions

diff --git a/media-sound/alsa-tools/ChangeLog b/media-sound/alsa-tools/ChangeLog
index 4fa9bee05359..ea4291726349 100644
--- a/media-sound/alsa-tools/ChangeLog
+++ b/media-sound/alsa-tools/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/alsa-tools
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/ChangeLog,v 1.78 2005/10/30 22:52:09 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/ChangeLog,v 1.79 2005/10/31 16:47:16 flameeyes Exp $
+
+*alsa-tools-1.0.9-r2 (31 Oct 2005)
+
+  31 Oct 2005; Diego Pettenò <flameeyes@gentoo.org>
+  alsa-tools-1.0.9-r1.ebuild, +alsa-tools-1.0.9-r2.ebuild:
+  Split X useflag into fltk and gtk flags as per bug #111028. Patch from
+  Henrik 'Brix' Andersen <brix@gentoo.org>. Don't rewrite LDFLAGS.
 
 *alsa-tools-1.0.9-r1 (30 Oct 2005)
 
diff --git a/media-sound/alsa-tools/Manifest b/media-sound/alsa-tools/Manifest
index daac57f3bd9b..4efb8a7b959a 100644
--- a/media-sound/alsa-tools/Manifest
+++ b/media-sound/alsa-tools/Manifest
@@ -1,21 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 4f92566c84115c9c30282468411d4379 ChangeLog 10916
 MD5 a61565c41f57b7e963d503fa49b81ffe alsa-tools-1.0.7.ebuild 2325
 MD5 89881d144ad73dd853bb44c56d2fe839 alsa-tools-1.0.8-r1.ebuild 2437
-MD5 1b2d56972866462517c120452735365a alsa-tools-1.0.9-r1.ebuild 2366
+MD5 f6a5df56e72e4536ebdff1bbe6115544 alsa-tools-1.0.9-r1.ebuild 2367
+MD5 25051a6e2c1e8dba9ab7ed304af2e591 alsa-tools-1.0.9-r2.ebuild 2240
 MD5 3a596fb47a6e44a98f01b8c2cc8c5d83 alsa-tools-1.0.9.ebuild 2351
 MD5 e2a96585b296f3f975f2cc8146eb3b74 files/alsa-tools-1.0.6-gcc34.patch 280
 MD5 d71b074ecf904c67e2cffaa96ca52367 files/digest-alsa-tools-1.0.7 69
 MD5 92018b0f62f8da61cc08aa7a03c5bb42 files/digest-alsa-tools-1.0.8-r1 69
 MD5 b2bfa51076f226abb79fed1c136b1d80 files/digest-alsa-tools-1.0.9 70
 MD5 b2bfa51076f226abb79fed1c136b1d80 files/digest-alsa-tools-1.0.9-r1 70
+MD5 b2bfa51076f226abb79fed1c136b1d80 files/digest-alsa-tools-1.0.9-r2 70
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDZU6mj5H05b2HAEkRAqg+AJ0TIENYcu1kpL3NFlQSoSxNzJzjCACeKexC
-8iPCYgu5+kDx/AtC+roUZOA=
-=im12
------END PGP SIGNATURE-----
diff --git a/media-sound/alsa-tools/alsa-tools-1.0.9-r1.ebuild b/media-sound/alsa-tools/alsa-tools-1.0.9-r1.ebuild
index ecbd230260f4..77df03761b32 100644
--- a/media-sound/alsa-tools/alsa-tools-1.0.9-r1.ebuild
+++ b/media-sound/alsa-tools/alsa-tools-1.0.9-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.9-r1.ebuild,v 1.1 2005/10/30 22:52:09 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.9-r1.ebuild,v 1.2 2005/10/31 16:47:16 flameeyes Exp $
 
 inherit gnuconfig eutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://alsaproject/tools/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0.9"
-KEYWORDS="~amd64 ~mips ~ppc ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="X"
 
 DEPEND=">=media-libs/alsa-lib-1.0.0
diff --git a/media-sound/alsa-tools/alsa-tools-1.0.9-r2.ebuild b/media-sound/alsa-tools/alsa-tools-1.0.9-r2.ebuild
new file mode 100644
index 000000000000..01bb4f812553
--- /dev/null
+++ b/media-sound/alsa-tools/alsa-tools-1.0.9-r2.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2005 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.9-r2.ebuild,v 1.1 2005/10/31 16:47:16 flameeyes Exp $
+
+inherit gnuconfig eutils
+
+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"
+IUSE="fltk gtk"
+
+DEPEND=">=media-libs/alsa-lib-1.0.0
+	virtual/alsa
+	fltk? ( =x11-libs/fltk-1.1* )
+	gtk? ( =x11-libs/gtk+-1.2* )"
+
+pkg_setup() {
+	# This is a list of the tools in the package.
+	# Some of the tools don't make proper use of CFLAGS, even though
+	# all of them seem to use autoconf.  This needs to be fixed.
+	#
+	# By default, all the supported tools will be compiled.
+	# If you want to only compile for specific tool(s), set ALSA_TOOLS
+	# environment to a space-separated list of tools that you want to build.
+	# For example:
+	#
+	#   env ALSA_TOOLS='as10k1 ac3dec' emerge alsa-tools
+	#
+	if [ -z "${ALSA_TOOLS}" ]; then
+		ALSA_TOOLS="ac3dec as10k1 hdsploader mixartloader seq/sbiload \
+					sscape_ctl us428control usx2yloader vxloader"
+
+		if use fltk; then
+			ALSA_TOOLS="${ALSA_TOOLS} hdspconf hdspmixer"
+		fi
+
+		if use gtk; then
+			ALSA_TOOLS="${ALSA_TOOLS} echomixer envy24control rmedigicontrol"
+		fi
+
+		# sb16_csp won't build on ppc64 _AND_ ppc (and is not needed)
+		if  use !ppc64 && use !ppc; then
+			ALSA_TOOLS="${ALSA_TOOLS} sb16_csp"
+		fi
+
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	gnuconfig_update
+}
+
+src_compile() {
+	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
+
+	# hdspmixer is missing depconf - copy from the hdsploader directory
+	cp ${S}/hdsploader/depcomp ${S}/hdspmixer/
+
+	local f
+	for f in ${ALSA_TOOLS}
+	do
+		cd "${S}/${f}"
+		econf || die "econf failed"
+		make || die "make failed"
+	done
+}
+
+src_install() {
+	local f
+	for f in ${ALSA_TOOLS}
+	do
+		# Install the main stuff
+		cd "${S}/${f}"
+		make 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}`"
+			dodoc "${doc}.`basename ${f}`"
+			fi
+		done
+	done
+}
diff --git a/media-sound/alsa-tools/files/digest-alsa-tools-1.0.9-r2 b/media-sound/alsa-tools/files/digest-alsa-tools-1.0.9-r2
new file mode 100644
index 000000000000..78c0dadf2a22
--- /dev/null
+++ b/media-sound/alsa-tools/files/digest-alsa-tools-1.0.9-r2
@@ -0,0 +1 @@
+MD5 3139b9d6c10e14acbb926f23b488e745 alsa-tools-1.0.9.tar.bz2 1371170