Add missing PKG_PROG_PKG_CONFIG to configure.ac wrt #221779, and remove USE fftw because it was not used for any of the installed files. Thanks to Maxim Britov for reporting.

(Portage version: 2.1.5_rc10)

3 files changed, 26 insertions, 14 deletions

diff --git a/media-libs/libsamplerate/ChangeLog b/media-libs/libsamplerate/ChangeLog
index b60e6a439f16..961b00d5633f 100644
--- a/media-libs/libsamplerate/ChangeLog
+++ b/media-libs/libsamplerate/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/libsamplerate
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsamplerate/ChangeLog,v 1.51 2008/04/14 13:52:31 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsamplerate/ChangeLog,v 1.52 2008/05/13 09:28:20 drac Exp $
+
+  13 May 2008; Samuli Suominen <drac@gentoo.org>
+  +files/libsamplerate-0.1.3-pkg_prog_pkg_config.patch,
+  libsamplerate-0.1.3.ebuild:
+  Add missing PKG_PROG_PKG_CONFIG to configure.ac wrt #221779, and remove
+  USE fftw because it was not used for any of the installed files. Thanks to
+  Maxim Britov for reporting.
 
 *libsamplerate-0.1.3 (14 Apr 2008)
 
diff --git a/media-libs/libsamplerate/files/libsamplerate-0.1.3-pkg_prog_pkg_config.patch b/media-libs/libsamplerate/files/libsamplerate-0.1.3-pkg_prog_pkg_config.patch
new file mode 100644
index 000000000000..f1f9b391da4e
--- /dev/null
+++ b/media-libs/libsamplerate/files/libsamplerate-0.1.3-pkg_prog_pkg_config.patch
@@ -0,0 +1,10 @@
+--- configure.ac	2008-05-09 23:32:26.000000000 +0300
++++ configure.ac	2008-05-09 23:32:14.000000000 +0300
+@@ -8,6 +8,7 @@
+ AC_CANONICAL_TARGET([])
+ AM_INIT_AUTOMAKE(libsamplerate,0.1.3)
+ AM_CONFIG_HEADER(src/config.h)
++PKG_PROG_PKG_CONFIG
+ 
+ #------------------------------------------------------------------------------------
+ # Rules for library version information:
diff --git a/media-libs/libsamplerate/libsamplerate-0.1.3.ebuild b/media-libs/libsamplerate/libsamplerate-0.1.3.ebuild
index e8649aececbc..e71ff08ed812 100644
--- a/media-libs/libsamplerate/libsamplerate-0.1.3.ebuild
+++ b/media-libs/libsamplerate/libsamplerate-0.1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsamplerate/libsamplerate-0.1.3.ebuild,v 1.1 2008/04/14 13:52:31 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsamplerate/libsamplerate-0.1.3.ebuild,v 1.2 2008/05/13 09:28:20 drac Exp $
 
 WANT_AUTOMAKE=1.7
 
@@ -13,19 +13,18 @@ SRC_URI="http://www.mega-nerd.com/SRC/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="sndfile fftw"
+IUSE="sndfile"
 
-RDEPEND="fftw? ( >=sci-libs/fftw-3.0.1 )
-	sndfile? ( >=media-libs/libsndfile-1.0.2 )"
+RDEPEND="sndfile? ( >=media-libs/libsndfile-1.0.2 )"
 DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.14.0"
+	>=dev-util/pkgconfig-0.14"
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-
-	epatch "${FILESDIR}/${PN}-0.1.2-automagic.patch"
-	epatch "${FILESDIR}/${P}-dontbuild-tests-examples.patch"
+	epatch "${FILESDIR}"/${PN}-0.1.2-automagic.patch \
+		"${FILESDIR}"/${P}-dontbuild-tests-examples.patch \
+		"${FILESDIR}"/${P}-pkg_prog_pkg_config.patch
 
 	# Fix for autoconf 2.62
 	sed -i -e '/AC_MSG_WARN(\[\[/d' \
@@ -35,12 +34,8 @@ src_unpack() {
 }
 
 src_compile() {
-	local myconf
-
-	use fftw || myconf="${myconf} --disable-fftw"
-
 	econf \
-		${myconf} \
+		--disable-fftw \
 		$(use_enable sndfile) \
 		--disable-dependency-tracking \
 		|| die "econf failed"