[gentoo-commits] gentoo-x86 commit in media-sound/alsa-tools: alsa-tools-1.0.14.ebuild ChangeLog alsa-tools-1.0.15.ebuild alsa-tools-1.0.16_rc1.ebuild

[Tony Vroon (chainsaw)]

chainsaw    08/01/31 16:51:05

  Modified:             alsa-tools-1.0.14.ebuild ChangeLog
                        alsa-tools-1.0.15.ebuild
  Added:                alsa-tools-1.0.16_rc1.ebuild
  Log:
  Version bump, for bug #207427. Quote a few variables now that we're at it.
  (Portage version: 2.1.4)

Revision  Changes    Path
1.7                  media-sound/alsa-tools/alsa-tools-1.0.14.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.14.ebuild?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.14.ebuild?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.14.ebuild?r1=1.6&r2=1.7

Index: alsa-tools-1.0.14.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.14.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- alsa-tools-1.0.14.ebuild	22 Oct 2007 20:32:58 -0000	1.6
+++ alsa-tools-1.0.14.ebuild	31 Jan 2008 16:51:04 -0000	1.7
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 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.14.ebuild,v 1.6 2007/10/22 20:32:58 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.14.ebuild,v 1.7 2008/01/31 16:51:04 chainsaw Exp $
 
 WANT_AUTOMAKE="1.9"
 WANT_AUTOCONF="2.5"
@@ -106,7 +106,7 @@
 	fi
 
 	# hdspmixer is missing depconf - copy from the hdsploader directory
-	cp ${S}/hdsploader/depcomp ${S}/hdspmixer/
+	cp "${S}/hdsploader/depcomp" "${S}/hdspmixer/"
 
 	local f
 	for f in ${ALSA_TOOLS}



1.154                media-sound/alsa-tools/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/alsa-tools/ChangeLog?rev=1.154&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/alsa-tools/ChangeLog?rev=1.154&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/alsa-tools/ChangeLog?r1=1.153&r2=1.154

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/ChangeLog,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -r1.153 -r1.154
--- ChangeLog	24 Oct 2007 19:50:24 -0000	1.153
+++ ChangeLog	31 Jan 2008 16:51:04 -0000	1.154
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/alsa-tools
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/ChangeLog,v 1.153 2007/10/24 19:50:24 phreak Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/ChangeLog,v 1.154 2008/01/31 16:51:04 chainsaw Exp $
+
+*alsa-tools-1.0.16_rc1 (31 Jan 2008)
+
+  31 Jan 2008; Tony Vroon <chainsaw@g.o> alsa-tools-1.0.14.ebuild,
+  alsa-tools-1.0.15.ebuild, +alsa-tools-1.0.16_rc1.ebuild:
+  Version bump, for bug #207427. Quote a few variables now that we're at it.
 
   24 Oct 2007; Christian Heim <phreak@g.o> -alsa-tools-1.0.13.ebuild,
   -alsa-tools-1.0.14_rc1.ebuild, -alsa-tools-1.0.14_rc1-r1.ebuild,



1.3                  media-sound/alsa-tools/alsa-tools-1.0.15.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.15.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.15.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.15.ebuild?r1=1.2&r2=1.3

Index: alsa-tools-1.0.15.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.15.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- alsa-tools-1.0.15.ebuild	22 Oct 2007 20:32:58 -0000	1.2
+++ alsa-tools-1.0.15.ebuild	31 Jan 2008 16:51:04 -0000	1.3
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 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.15.ebuild,v 1.2 2007/10/22 20:32:58 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.15.ebuild,v 1.3 2008/01/31 16:51:04 chainsaw Exp $
 
 WANT_AUTOMAKE="1.9"
 WANT_AUTOCONF="2.5"
@@ -105,7 +105,7 @@
 	fi
 
 	# hdspmixer is missing depconf - copy from the hdsploader directory
-	cp ${S}/hdsploader/depcomp ${S}/hdspmixer/
+	cp "${S}/hdsploader/depcomp" "${S}/hdspmixer/"
 
 	local f
 	for f in ${ALSA_TOOLS}



1.1                  media-sound/alsa-tools/alsa-tools-1.0.16_rc1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.16_rc1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.16_rc1.ebuild?rev=1.1&content-type=text/plain

Index: alsa-tools-1.0.16_rc1.ebuild
===================================================================
# Copyright 1999-2008 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.16_rc1.ebuild,v 1.1 2008/01/31 16:51:04 chainsaw Exp $

WANT_AUTOMAKE="1.9"
WANT_AUTOCONF="2.5"

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"

IUSE="fltk gtk midi 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}
	fltk? ( =x11-libs/fltk-1.1* )
	gtk? ( =x11-libs/gtk+-2* )"
DEPEND="${RDEPEND}"

S="${WORKDIR}/${MY_P}"

pkg_setup() {
	if use midi && ! built_with_use --missing true media-libs/alsa-lib midi; then
		eerror ""
		eerror "To be able to build ${CATEGORY}/${PN} with midi support you"
		eerror "need to have built media-libs/alsa-lib with midi USE flag."
		die "Missing midi USE flag on media-libs/alsa-lib"
	fi

	ALSA_TOOLS="ac3dec"

	use midi && ALSA_TOOLS="${ALSA_TOOLS} seq/sbiload us428control"

	if use gtk; then
		use midi && 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}"

	epatch "${FILESDIR}/${PN}-1.0.11-asneeded.patch"

	for dir in echomixer envy24control rmedigicontrol; do
		pushd ${dir} &> /dev/null
		sed -i -e '/AM_PATH_GTK/d' configure.in
		eautomake
		popd &> /dev/null
	done

	elibtoolize
}

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 --with-gtk2 || die "econf ${f} failed"
		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}`"
			dodoc "${doc}.`basename ${f}`"
			fi
		done
	done
}



-- 
gentoo-commits@l.g.o mailing list