old, pull in missing virtual/pkgconfig

(Portage version: 2.2.0_alpha173/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)

3 files changed, 10 insertions, 152 deletions

diff --git a/media-sound/alsa-tools/ChangeLog b/media-sound/alsa-tools/ChangeLog
index 812c3f6c1f7a..0d1554b77d99 100644
--- a/media-sound/alsa-tools/ChangeLog
+++ b/media-sound/alsa-tools/ChangeLog
@@ -1,13 +1,17 @@
 # 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.217 2013/05/02 01:01:41 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/ChangeLog,v 1.218 2013/05/02 01:11:23 ssuominen Exp $
+
+  02 May 2013; Samuli Suominen <ssuominen@gentoo.org>
+  -alsa-tools-1.0.27.ebuild:
+  old
 
 *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
+  Install hda-verb and hdajackretask utilities and pull in x11-libs/gtk+:3 and
+  virtual/pkgconfig 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/alsa-tools-1.0.27-r1.ebuild b/media-sound/alsa-tools/alsa-tools-1.0.27-r1.ebuild
index 7efcd0bb08a3..e00231170a01 100644
--- a/media-sound/alsa-tools/alsa-tools-1.0.27-r1.ebuild
+++ b/media-sound/alsa-tools/alsa-tools-1.0.27-r1.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.27-r1.ebuild,v 1.2 2013/05/02 01:11:23 ssuominen Exp $
 
 EAPI=5
 inherit autotools eutils flag-o-matic
@@ -31,7 +31,8 @@ RDEPEND=">=media-libs/alsa-lib-${PV}
 		x11-libs/gtk+:2
 		x11-libs/gtk+:3
 		)"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
 
 pkg_setup() {
 	ALSA_TOOLS="seq/sbiload us428control hwmixvolume hda-verb"
diff --git a/media-sound/alsa-tools/alsa-tools-1.0.27.ebuild b/media-sound/alsa-tools/alsa-tools-1.0.27.ebuild
deleted file mode 100644
index 87e957656d5c..000000000000
--- a/media-sound/alsa-tools/alsa-tools-1.0.27.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# 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.ebuild,v 1.2 2013/05/01 16:25:03 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.1.10-r2:1 )
-	gtk? ( x11-libs/gtk+:2 )"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	ALSA_TOOLS="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() {
-	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
-}