Fix automagic, clean up ebuild, add TODOs.

Package-Manager: portage-2.1.2.12

4 files changed, 30 insertions, 33 deletions

diff --git a/dev-perl/PDL/ChangeLog b/dev-perl/PDL/ChangeLog
index 40e738b9bab1..15baaf57c89c 100644
--- a/dev-perl/PDL/ChangeLog
+++ b/dev-perl/PDL/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-perl/PDL
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/PDL/ChangeLog,v 1.75 2007/09/11 16:38:06 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/PDL/ChangeLog,v 1.76 2007/09/11 17:11:42 jer Exp $
+
+  11 Sep 2007; Jeroen Roovers <jer@gentoo.org> -files/gsl.patch,
+  PDL-2.4.3-r1.ebuild:
+  Fix automagic, clean up ebuild, add TODOs.
 
   11 Sep 2007; Jeroen Roovers <jer@gentoo.org> +files/PDL-2.4.3-PIC.patch,
   PDL-2.4.3-r1.ebuild:
diff --git a/dev-perl/PDL/Manifest b/dev-perl/PDL/Manifest
index 94e87cbc3c4c..0ab9dbad3689 100644
--- a/dev-perl/PDL/Manifest
+++ b/dev-perl/PDL/Manifest
@@ -6,10 +6,6 @@ AUX PDL-2.4.3-PIC.patch 358 RMD160 1af7dd94adf4788e7ea7b60633d91283e96e7789 SHA1
 MD5 a889b95b3b7d390a8f4ddd89db4edeee files/PDL-2.4.3-PIC.patch 358
 RMD160 1af7dd94adf4788e7ea7b60633d91283e96e7789 files/PDL-2.4.3-PIC.patch 358
 SHA256 603f9a332db839497e0f32f78698264ac32c2dcc997b41036c406b2447ea0ddb files/PDL-2.4.3-PIC.patch 358
-AUX gsl.patch 483 RMD160 7c70e77d32405fc9cb7923cb28b934d300c7f26e SHA1 52a6d5ee66fbee2339b7df72edbb2115584d6f4d SHA256 b685fd25c7cc750b2cebd8b143f3c598ff575cabf3441c0faa5dd255f0750f89
-MD5 5c22c0f59ad10f36608505d621618f2b files/gsl.patch 483
-RMD160 7c70e77d32405fc9cb7923cb28b934d300c7f26e files/gsl.patch 483
-SHA256 b685fd25c7cc750b2cebd8b143f3c598ff575cabf3441c0faa5dd255f0750f89 files/gsl.patch 483
 AUX perldl.conf 2716 RMD160 77dc4d976b87022352af8403fb3ffe5996dc1f9b SHA1 d946062fc29edcad0838a51f67d1307338cb4069 SHA256 1a192836f6c1c156ad38a6e6f00478bdb2bccf06054465da4ba95ac3488e0dbc
 MD5 62cbe79e2c7c354d5c165b63c571cc13 files/perldl.conf 2716
 RMD160 77dc4d976b87022352af8403fb3ffe5996dc1f9b files/perldl.conf 2716
@@ -20,18 +16,18 @@ EBUILD PDL-2.4.2-r1.ebuild 2603 RMD160 487c6402665ca9a956e02473e8777ef6c4a3bbb5
 MD5 0ed47f8f0addfb4b99d253658d53f093 PDL-2.4.2-r1.ebuild 2603
 RMD160 487c6402665ca9a956e02473e8777ef6c4a3bbb5 PDL-2.4.2-r1.ebuild 2603
 SHA256 ec76325b4d748098e71cdf97accd71ca122cb2199d778e0649089b29e5f9d438 PDL-2.4.2-r1.ebuild 2603
-EBUILD PDL-2.4.3-r1.ebuild 2508 RMD160 f35cd5ccfb1d6813234e7fcfc08272d044416db5 SHA1 142011ecd19fbe7a5fb3ae88df47a5658902d932 SHA256 60c901a207a9cc6cf9db3956c6e8bf707b81e0a22e9c83c8a24649a82c2ab8f8
-MD5 13d1eeacc9ce26ae2d7f4fcb8889d374 PDL-2.4.3-r1.ebuild 2508
-RMD160 f35cd5ccfb1d6813234e7fcfc08272d044416db5 PDL-2.4.3-r1.ebuild 2508
-SHA256 60c901a207a9cc6cf9db3956c6e8bf707b81e0a22e9c83c8a24649a82c2ab8f8 PDL-2.4.3-r1.ebuild 2508
+EBUILD PDL-2.4.3-r1.ebuild 2800 RMD160 4ac58646d5661c530adc9b914767970ed36c6d21 SHA1 90f564fae3938c16ff62136ee6897d049ce3a830 SHA256 fe157807982172c9960dff4d76e4e8b464a4ce6c959405f6aa6d0bec5f8547ff
+MD5 955d49f3290b8c78156451cd5ceac3fa PDL-2.4.3-r1.ebuild 2800
+RMD160 4ac58646d5661c530adc9b914767970ed36c6d21 PDL-2.4.3-r1.ebuild 2800
+SHA256 fe157807982172c9960dff4d76e4e8b464a4ce6c959405f6aa6d0bec5f8547ff PDL-2.4.3-r1.ebuild 2800
 EBUILD PDL-2.4.3.ebuild 2643 RMD160 81d3bb953f1478dc1d61c040fd22d0c0c0921a54 SHA1 ee0a55f4000b29072c1827826cdb2ee39703d4a6 SHA256 555f4de5e3243ebfa4d3fa3e6bd64e9dad734e2ed7410dd71a8753cdc9740fa6
 MD5 3017704b37c52d5b4d19693bec04d168 PDL-2.4.3.ebuild 2643
 RMD160 81d3bb953f1478dc1d61c040fd22d0c0c0921a54 PDL-2.4.3.ebuild 2643
 SHA256 555f4de5e3243ebfa4d3fa3e6bd64e9dad734e2ed7410dd71a8753cdc9740fa6 PDL-2.4.3.ebuild 2643
-MISC ChangeLog 9142 RMD160 de2f7f0ff82b17deac82caaa861233945d25fa73 SHA1 5520d1114915f2cb31c9135ea3d5fd23a44affb7 SHA256 aacbb26e5bdea9fee6a97476a891530db1f1ca406bab19ac9bc7536840630541
-MD5 6d2c846bceb2a270470c555a59e388cb ChangeLog 9142
-RMD160 de2f7f0ff82b17deac82caaa861233945d25fa73 ChangeLog 9142
-SHA256 aacbb26e5bdea9fee6a97476a891530db1f1ca406bab19ac9bc7536840630541 ChangeLog 9142
+MISC ChangeLog 9276 RMD160 5b44eaa249b97b5883ed399c3ce0fabf1d6470fb SHA1 056fab041f62e887f15cd5aac7ea205ce90b68ba SHA256 41ab01ea0f6e0cb6f23693a27ac2b6858173189fff4da4784a052095b544a4aa
+MD5 d3482f2d6b9dc03dc319bb9de3152671 ChangeLog 9276
+RMD160 5b44eaa249b97b5883ed399c3ce0fabf1d6470fb ChangeLog 9276
+SHA256 41ab01ea0f6e0cb6f23693a27ac2b6858173189fff4da4784a052095b544a4aa ChangeLog 9276
 MISC metadata.xml 305 RMD160 647980838c590f54441a053916ea629e53e551c0 SHA1 99ef1deeae9a934fb6e46cf5fc4a5fcb8379a74a SHA256 f05dbef15061919972882cab07057e102760a542beba17d131194091401cd7ca
 MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
 RMD160 647980838c590f54441a053916ea629e53e551c0 metadata.xml 305
diff --git a/dev-perl/PDL/PDL-2.4.3-r1.ebuild b/dev-perl/PDL/PDL-2.4.3-r1.ebuild
index 607747e9fad6..91ee75d4a02a 100644
--- a/dev-perl/PDL/PDL-2.4.3-r1.ebuild
+++ b/dev-perl/PDL/PDL-2.4.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/PDL/PDL-2.4.3-r1.ebuild,v 1.12 2007/09/11 16:38:06 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/PDL/PDL-2.4.3-r1.ebuild,v 1.13 2007/09/11 17:11:42 jer Exp $
 
 inherit perl-module eutils multilib
 
@@ -31,8 +31,16 @@ mydoc="DEPENDENCIES DEVELOPMENT MANIFEST* Release_Notes TODO"
 
 src_unpack() {
 	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/PDL-2.4.2-makemakerfix.patch"
+
+	# Unconditional -fPIC for the lib (#55238, #180807)
+	epatch "${FILESDIR}/${P}-PIC.patch"
+
+	# TODO: everything in this function below this
+	# TODO: line really belongs in src_compile() :
 
-	cd ${S}; epatch ${FILESDIR}/PDL-2.4.2-makemakerfix.patch
 	# This 'fix' breaks compiles for non-opengl users
 	#if ! use opengl ; then
 	#	sed -e "s:WITH_3D => undef:WITH_3D => 0:" \
@@ -40,12 +48,15 @@ src_unpack() {
 	#fi
 
 	if use badval ; then
-		sed -i -e "s:WITH_BADVAL => 0:WITH_BADVAL => 1:" \
-			${S}/perldl.conf
+		sed -i -e "s:WITH_BADVAL => 0:WITH_BADVAL => 1:" "${S}/perldl.conf"
 	fi
 
-	# Unconditional -fPIC for the lib (#55238, #180807)
-	epatch "${FILESDIR}/${P}-PIC.patch"
+	# Turn off GSL automagic:
+	if use gsl ; then
+		sed -i -e "s:WITH_GSL => undef:WITH_GSL => 1:" "${S}/perldl.conf"
+	else
+		sed -i -e "s:WITH_GSL => undef:WITH_GSL => 0:" "${S}/perldl.conf"
+	fi
 }
 
 src_install() {
diff --git a/dev-perl/PDL/files/gsl.patch b/dev-perl/PDL/files/gsl.patch
deleted file mode 100644
index 87c74446a604..000000000000
--- a/dev-perl/PDL/files/gsl.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- perldl.conf.old	2004-01-07 23:47:08.000000000 -0500
-+++ perldl.conf	2004-01-07 23:35:33.000000000 -0500
-@@ -85,9 +85,9 @@
-         WITH_GSL => undef,    # Leave it up to PDL to decide
- 
- # Location to search for the GSL libs
--	GSL_LIBS => [ '/lib','/usr/lib','/usr/local/lib'],
-+	GSL_LIBS => undef,
- # Location to find GSL includes:
-- 	GSL_INC => '-I/usr/include/gsl -I/usr/local/include',
-+ 	GSL_INC => undef,
- 
- # Whether or not to build the PDL::FFTW module
- # 0 -> don't use