Make fftw optional (as it's unusable on FreeBSD).

Package-Manager: portage-2.1_rc4-r4

3 files changed, 31 insertions, 15 deletions

diff --git a/media-libs/libsamplerate/ChangeLog b/media-libs/libsamplerate/ChangeLog
index 03569b7fc0d3..4ed508109bbc 100644
--- a/media-libs/libsamplerate/ChangeLog
+++ b/media-libs/libsamplerate/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libsamplerate
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsamplerate/ChangeLog,v 1.34 2006/06/08 13:56:55 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsamplerate/ChangeLog,v 1.35 2006/06/08 14:02:21 flameeyes Exp $
+
+  08 Jun 2006; Diego Pettenò <flameeyes@gentoo.org>
+  libsamplerate-0.1.2.ebuild:
+  Make fftw optional (as it's unusable on FreeBSD).
 
   08 Jun 2006; Diego Pettenò <flameeyes@gentoo.org>
   libsamplerate-0.1.2.ebuild:
diff --git a/media-libs/libsamplerate/Manifest b/media-libs/libsamplerate/Manifest
index 40bb56e5e849..09f985b444db 100644
--- a/media-libs/libsamplerate/Manifest
+++ b/media-libs/libsamplerate/Manifest
@@ -7,14 +7,14 @@ EBUILD libsamplerate-0.1.1-r1.ebuild 1002 RMD160 a949ed537afc9c2ad83fb94bef0057e
 MD5 75f188aacec508439e54abda70a35d74 libsamplerate-0.1.1-r1.ebuild 1002
 RMD160 a949ed537afc9c2ad83fb94bef0057e3b749cdd5 libsamplerate-0.1.1-r1.ebuild 1002
 SHA256 e2c83f3867d1444b44d41107f4f9b8467c6be4d956dc68737c02c07dedaa3db6 libsamplerate-0.1.1-r1.ebuild 1002
-EBUILD libsamplerate-0.1.2.ebuild 827 RMD160 37f42e2080616c6654b30532f572e4a16066f40b SHA1 4bf1a4b03b82a7ffbbfdbb201e2c3289764b40af SHA256 14d2b7cdf646c1026d40cc29b5c610f84b4efaf7ffaf64c16a7e5496a6f948a4
-MD5 da4e3132f48a717e7ac4f710cd0276de libsamplerate-0.1.2.ebuild 827
-RMD160 37f42e2080616c6654b30532f572e4a16066f40b libsamplerate-0.1.2.ebuild 827
-SHA256 14d2b7cdf646c1026d40cc29b5c610f84b4efaf7ffaf64c16a7e5496a6f948a4 libsamplerate-0.1.2.ebuild 827
-MISC ChangeLog 4635 RMD160 5d40b6b8fb3a37d9bc2891b6aaf5fa872069ad50 SHA1 e8158dc94521680dca82a1a0b35c8ef354d9d413 SHA256 cd106d570d8b5d97c23f692cc410932f0f3f9a6d1e094145dc9f475c3beab15d
-MD5 ce8e98f42112c908af02f19410d2a258 ChangeLog 4635
-RMD160 5d40b6b8fb3a37d9bc2891b6aaf5fa872069ad50 ChangeLog 4635
-SHA256 cd106d570d8b5d97c23f692cc410932f0f3f9a6d1e094145dc9f475c3beab15d ChangeLog 4635
+EBUILD libsamplerate-0.1.2.ebuild 1034 RMD160 b705a83f746dc8c54fa91c0926dfe96758085e42 SHA1 e7c275719a7d59639178a9222fc44310176b079e SHA256 584fd3daaba96b2afff0ecf858f2a4870edf8f9e784db181f19faabd4dbd341a
+MD5 a28144222f1a032ace109e76ae704698 libsamplerate-0.1.2.ebuild 1034
+RMD160 b705a83f746dc8c54fa91c0926dfe96758085e42 libsamplerate-0.1.2.ebuild 1034
+SHA256 584fd3daaba96b2afff0ecf858f2a4870edf8f9e784db181f19faabd4dbd341a libsamplerate-0.1.2.ebuild 1034
+MISC ChangeLog 4771 RMD160 4c79d4cb31cf1337209e829bd2ab0e920d208dca SHA1 7da1549c762b73668babafd1750d6f8991d3d3d1 SHA256 5731bd0b379cc6c94ab8706e9db9ed8241febcbc1e2b112d6f0452d4a507bd38
+MD5 bf7e72c1875965660331df754723317c ChangeLog 4771
+RMD160 4c79d4cb31cf1337209e829bd2ab0e920d208dca ChangeLog 4771
+SHA256 5731bd0b379cc6c94ab8706e9db9ed8241febcbc1e2b112d6f0452d4a507bd38 ChangeLog 4771
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
@@ -28,7 +28,7 @@ SHA256 b55249e7d9ac5d549524a23a4ab8c6c80412d6830aee4fdf892eaad2cad8843b files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEiCytAiZjviIA2XgRAtYHAKCNy6ivJ/87LXkITvNjuSdnHbiZ4gCfZw61
-7+UwbKZO8k8b+dLlNf++eNc=
-=4ehZ
+iD8DBQFEiC30AiZjviIA2XgRAiqeAKCXBdievglJYn6T4O94N6u0rZWa/gCgqB+X
+unj9DbQ56uPj2pWzc7FiXhU=
+=noQ/
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libsamplerate/libsamplerate-0.1.2.ebuild b/media-libs/libsamplerate/libsamplerate-0.1.2.ebuild
index be6371964327..b9cd00f608de 100644
--- a/media-libs/libsamplerate/libsamplerate-0.1.2.ebuild
+++ b/media-libs/libsamplerate/libsamplerate-0.1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsamplerate/libsamplerate-0.1.2.ebuild,v 1.14 2006/06/08 13:56:55 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsamplerate/libsamplerate-0.1.2.ebuild,v 1.15 2006/06/08 14:02:21 flameeyes Exp $
 
 DESCRIPTION="Secret Rabbit Code (aka libsamplerate) is a Sample Rate Converter for audio"
 HOMEPAGE="http://www.mega-nerd.com/SRC/"
@@ -9,13 +9,25 @@ SRC_URI="http://www.mega-nerd.com/SRC/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha ~amd64 arm hppa ia64 ~mips ppc ~ppc-macos ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="sndfile"
+IUSE="sndfile fftw"
 
-RDEPEND=">=sci-libs/fftw-3.0.1
+RDEPEND="fftw? ( >=sci-libs/fftw-3.0.1 )
 	sndfile? ( >=media-libs/libsndfile-1.0.2 )"
 DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.14.0"
 
+src_compile() {
+	local myconf
+
+	use fftw || myconf="${myconf} --disable-fftw"
+
+	econf \
+		${myconf} \
+		--disable-dependency-tracking \
+		|| die "econf failed"
+	emake || die "emake failed"
+}
+
 src_install() {
 	make DESTDIR="${D}" install || die "make install failed"
 	dodoc AUTHORS ChangeLog NEWS README