Fix automagic dependency on fftw. Thanks to Sébastien Fabbro (#266845)

Package-Manager: portage-2.2_rc31/cvs/Linux i686

3 files changed, 34 insertions, 16 deletions

diff --git a/dev-perl/PDL/ChangeLog b/dev-perl/PDL/ChangeLog
index fed8f555bab9..76c6293cf610 100644
--- a/dev-perl/PDL/ChangeLog
+++ b/dev-perl/PDL/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-perl/PDL
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/PDL/ChangeLog,v 1.80 2009/01/01 18:54:31 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/PDL/ChangeLog,v 1.81 2009/04/21 18:08:03 tove Exp $
+
+  21 Apr 2009; Torsten Veller <tove@gentoo.org> PDL-2.4.4.ebuild:
+  Fix automagic dependency on fftw. Thanks to Sébastien Fabbro (#266845)
 
   01 Jan 2009; Raúl Porcel <armin76@gentoo.org> PDL-2.4.3-r1.ebuild,
   PDL-2.4.4.ebuild:
diff --git a/dev-perl/PDL/Manifest b/dev-perl/PDL/Manifest
index 944c202cdddc..ef98c5b6a414 100644
--- a/dev-perl/PDL/Manifest
+++ b/dev-perl/PDL/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX PDL-2.4.2-makemakerfix.patch 425 RMD160 dea21a20bbd8a857c59e79472ace63743980f418 SHA1 70b596978e68e2df62628b5c56236caae9f348c4 SHA256 c9abca98e5d046a35f097c8d0ede0cd9a548c1645c02778748efe6388c960db0
 AUX PDL-2.4.3-PIC.patch 358 RMD160 1af7dd94adf4788e7ea7b60633d91283e96e7789 SHA1 1677fa6b4054c46e4cff23d1692469f35435a57a SHA256 603f9a332db839497e0f32f78698264ac32c2dcc997b41036c406b2447ea0ddb
 AUX PDL-2.4.4-PIC.patch 634 RMD160 d11e7661901daf60f77270213d6141f5ea176f14 SHA1 c54ece3ccb8fc2e3d7509b2e3d53a68677af6e2a SHA256 df6f9f98bec340ce55b89cb27184ce63b2d4d932f33a50f9f0461ce598386276
@@ -8,6 +11,13 @@ DIST PDL-2.4.4.tar.gz 2341784 RMD160 304b55b8eb46e14d57a09c613f0c0af227d6fdb3 SH
 EBUILD PDL-2.4.2-r1.ebuild 2603 RMD160 487c6402665ca9a956e02473e8777ef6c4a3bbb5 SHA1 073adb0ed50a468d3ee4e1bde146b2ae1c5c8801 SHA256 ec76325b4d748098e71cdf97accd71ca122cb2199d778e0649089b29e5f9d438
 EBUILD PDL-2.4.3-r1.ebuild 2810 RMD160 28c85d8fdd2e534acdff6f58f9874f32b0723ab3 SHA1 61412047597a6229b9d49307307f970a6b7f88c8 SHA256 7718c42b0c6045cd85a9f28ad575718b14bd57f4948276f7a55eddad35588d33
 EBUILD PDL-2.4.3.ebuild 2643 RMD160 81d3bb953f1478dc1d61c040fd22d0c0c0921a54 SHA1 ee0a55f4000b29072c1827826cdb2ee39703d4a6 SHA256 555f4de5e3243ebfa4d3fa3e6bd64e9dad734e2ed7410dd71a8753cdc9740fa6
-EBUILD PDL-2.4.4.ebuild 2744 RMD160 8a87d47a47eef5aa5b120416687798a991b60cca SHA1 7ee3784728e6b8347299f024f6ab0a357dbacfa0 SHA256 b6741a8fd34725ea3ec2591e2b813ebbcc7244130d68f4666a681202f3438d5b
-MISC ChangeLog 9740 RMD160 c6d1f47e636c5ffb0a6c68d9fb048e162e26d7f6 SHA1 43a5d88aa7678f4b3640c6e344632b2c9672f4a1 SHA256 730b73a6f547d268c1436655c8a09d173ded2236b1f0df72a155a6db9ce790f4
+EBUILD PDL-2.4.4.ebuild 2967 RMD160 dfe81aa6ebb0ddb30b3bfd12d0d7c6563860ebf0 SHA1 3180816dbfdf7610ba19e9505ee072a7cc72c8bb SHA256 1b7ca3454188f26139c078b5f0a8d30647a453ad3804f0dd087426fbff09a3c3
+MISC ChangeLog 9878 RMD160 413cb28c4ab9c63d6fd0fcc43185f4f0102e16a1 SHA1 c0e14feae5c5747d1fa42740d12e1e319ccf0136 SHA256 a934c975a0f015b8fc402a90d996b85cf1f2b5dffd9f6c9fc7bae85587fe0398
 MISC metadata.xml 334 RMD160 17f02229e030ae58f2e8a6441af1596e0328f041 SHA1 0675a8aa5ea1ec9cfb08d7b9f515799c898870bc SHA256 fd47745c623c750430899ef615dcf3fe9b24f723e9c48f1a9207285d1ad208d2
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.10 (GNU/Linux)
+
+iEYEARECAAYFAknuC5AACgkQV3J2n04Eaux+dACggRU68y8spKmCrYoId33n2Uf7
+97EAnRLNVrNAwLCqYB1g8U0y4RlWxQ8k
+=aT0W
+-----END PGP SIGNATURE-----
diff --git a/dev-perl/PDL/PDL-2.4.4.ebuild b/dev-perl/PDL/PDL-2.4.4.ebuild
index 197bd0f0dcb8..84bed3a3ba34 100644
--- a/dev-perl/PDL/PDL-2.4.4.ebuild
+++ b/dev-perl/PDL/PDL-2.4.4.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/PDL/PDL-2.4.4.ebuild,v 1.3 2009/01/01 18:54:31 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/PDL/PDL-2.4.4.ebuild,v 1.4 2009/04/21 18:08:03 tove Exp $
+
+EAPI=2
 
 MODULE_AUTHOR=CHM
 inherit perl-module eutils multilib
@@ -10,7 +12,7 @@ DESCRIPTION="PDL Perl Module"
 LICENSE="Artistic as-is"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~s390 ~sh ~sparc ~x86"
-IUSE="opengl badval gsl"
+IUSE="badval fftw gsl opengl"
 
 DEPEND=">=sys-libs/ncurses-5.2
 	perl-core/Filter
@@ -22,16 +24,13 @@ DEPEND=">=sys-libs/ncurses-5.2
 	opengl? ( virtual/opengl virtual/glu )
 	dev-perl/Term-ReadLine-Perl
 	gsl? ( sci-libs/gsl )
-	>=sys-apps/sed-4"
+	fftw? ( sci-libs/fftw:2.1 )"
 
 mydoc="DEPENDENCIES DEVELOPMENT MANIFEST* Release_Notes TODO"
 
 #SRC_TEST="do"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
+src_prepare() {
 	epatch "${FILESDIR}/PDL-2.4.2-makemakerfix.patch"
 
 	# Unconditional -fPIC for the lib (#55238, #180807, #250335)
@@ -56,6 +55,12 @@ src_unpack() {
 	else
 		sed -i -e "s:WITH_GSL => undef:WITH_GSL => 0:" "${S}/perldl.conf"
 	fi
+	# Turn off FFTW automagic too:
+	if use fftw ; then
+		sed -i -e "s:WITH_FFTW => undef:WITH_FFTW => 1:" "${S}/perldl.conf"
+	else
+		sed -i -e "s:WITH_FFTW => undef:WITH_FFTW => 0:" "${S}/perldl.conf"
+	fi
 }
 
 src_install() {
@@ -65,17 +70,17 @@ src_install() {
 	PERLVERSION=${version}
 	eval `perl '-V:archname'`
 	ARCHVERSION=${archname}
-	mv ${D}/usr/$(get_libdir)/perl5/vendor_perl/${PERLVERSION}/${ARCHVERSION}/PDL/HtmlDocs/PDL \
-		${D}/usr/share/doc/${PF}/html
+	mv "${D}"/usr/$(get_libdir)/perl5/vendor_perl/${PERLVERSION}/${ARCHVERSION}/PDL/HtmlDocs/PDL \
+		"${D}"/usr/share/doc/${PF}/html
 
 	mydir=${D}/usr/share/doc/${PF}/html/PDL
 
-	for i in ${mydir}/* ${mydir}/IO/* ${mydir}/Fit/* ${mydir}/Pod/* ${mydir}/Graphics/*
+	for i in "${mydir}"/* "${mydir}"/IO/* "${mydir}"/Fit/* "${mydir}"/Pod/* "${mydir}"/Graphics/*
 	do
-		dosed ${i/${D}}
+		dosed "${i/${D}}"
 	done
-	cp ${S}/Doc/scantree.pl ${D}/usr/$(get_libdir)/perl5/vendor_perl/${PERLVERSION}/${ARCHVERSION}/PDL/Doc/
-	cp ${S}/Doc/mkhtmldoc.pl ${D}/usr/$(get_libdir)/perl5/vendor_perl/${PERLVERSION}/${ARCHVERSION}/PDL/Doc/
+	cp "${S}"/Doc/scantree.pl "${D}"/usr/$(get_libdir)/perl5/vendor_perl/${PERLVERSION}/${ARCHVERSION}/PDL/Doc/
+	cp "${S}"/Doc/mkhtmldoc.pl "${D}"/usr/$(get_libdir)/perl5/vendor_perl/${PERLVERSION}/${ARCHVERSION}/PDL/Doc/
 }
 
 pkg_postinst() {