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.

Package-Manager: portage-2.1.5_rc10

4 files changed, 29 insertions, 26 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/Manifest b/media-libs/libsamplerate/Manifest
index ce52a840cf4f..51a26c53dd0d 100644
--- a/media-libs/libsamplerate/Manifest
+++ b/media-libs/libsamplerate/Manifest
@@ -1,20 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX libsamplerate-0.1.2-automagic.patch 747 RMD160 2a7b5c514eeb2eef0a3eab71a551d3662940550c SHA1 cfe98a87f4eb96e2d06d6923bd37b891d748dc57 SHA256 226eb21832bfb49bb5b870ad94ea37c4ad62376d3ee57e5812742c609422bbde
 AUX libsamplerate-0.1.2-dontbuild-tests-examples.patch 1122 RMD160 3c3d55cefb1b0d0dea4a5ea9b0cd46ac32c9cc32 SHA1 badca44108e55f82b48d41a2295f4aae5b39cf4d SHA256 c08cce5c0b910155ac25f6b35e3365333aa2e32964f775218abd4bf6005a0c85
 AUX libsamplerate-0.1.3-dontbuild-tests-examples.patch 1187 RMD160 021f3890187c82719347c9281a90955b8d561d90 SHA1 89ea3db01d7225525cd64112df377d31cb8c7d81 SHA256 edea4de6720b9a21a60381e13c0802314318c9273cba472806590aa8566dd2be
+AUX libsamplerate-0.1.3-pkg_prog_pkg_config.patch 370 RMD160 f9107c7cb1760d87867410f90fbd7013804133c4 SHA1 dc0cd0ac35ca775d2949ae9445c11faf8e86bf38 SHA256 d5439f324b98f6aaa97969fb1bc14c2cf51455c45bd392cef0956eefaf130297
 DIST libsamplerate-0.1.2.tar.gz 707867 RMD160 4e5453821b80b17586ad66068e409ed0437cca02 SHA1 663ac147d1dfbe686bf687e78143259b5075fc13 SHA256 98b8766323c78b7b718dfd4ef6b9292bbf0796b742abb2319b8278cbeee731d4
 DIST libsamplerate-0.1.3.tar.gz 4261589 RMD160 7bf12883ade8f9dd24d4ee89cb740e5df06358ec SHA1 4a0b493aa868fb6f9e7e8e5db2fb44cfbcd2d123 SHA256 aa95c99c1662e165cdc30335e6d1282ea3388ce6badde6208d4eaf75090e832d
 EBUILD libsamplerate-0.1.2-r1.ebuild 1254 RMD160 35ce2550d19fda3d2934fb81fd0154342780acda SHA1 da53e125fce4b428971e82806ee81f6e9bdd22cb SHA256 bf890038746af96422a42461fc8155719aecb5972838d9a2abe6540b2384699e
 EBUILD libsamplerate-0.1.2.ebuild 1021 RMD160 003514f4abc77cfcc7c2029b2c509869e1d69e52 SHA1 3e6f101be38a7a25127805477e58ec65344783ec SHA256 39c90a6bcd4885bd703d6a55526994590d5e95bcde0096ef0d50cad542e366fb
-EBUILD libsamplerate-0.1.3.ebuild 1352 RMD160 b3fef56988594bd7b6bd568afa2a62930f40ea09 SHA1 c718f5c74f27faa9860ecc6017f6204771814db4 SHA256 e79a2eda1018d1b13c24aff3267382b1371b9cd1b078863c0f10a7ed55084c02
-MISC ChangeLog 6997 RMD160 8cb2660c1a7e0cba58ca8c3ad5d757305a852ca6 SHA1 cec436f411b6ad4a4a49a01d72f225690f54e100 SHA256 895f878ae3b1c414321b03272adf28c734938bf2fd71b94e96128804ba8d6b35
+EBUILD libsamplerate-0.1.3.ebuild 1293 RMD160 c96340b44e89531e7ece1312838841ce5c6143e4 SHA1 f914fb91b798860ae8f47a9ac225473d6e1fa13d SHA256 f1c79a647173730be4c4715236cdb75e46852e9bbb2a710cb7c6798998c29033
+MISC ChangeLog 7309 RMD160 56a6be52ed6d733489e595ef0a31b03afa208cb4 SHA1 045d6dd481702c4b0f7765df351c93b7e6249f11 SHA256 4e051ff303996f8d3eaad36255a8046f0f1c26705a4b5d985308a207d9f5a047
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkgDYaYACgkQAiZjviIA2XiTCQCdELgR787DBdHgZWIXr8i4g8Uk
-B9QAn2m3ftl0CDR/oax4FTeQWyL8gds1
-=bI/i
------END PGP SIGNATURE-----
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"