bug 33936 closed

10 files changed, 115 insertions, 12 deletions

diff --git a/dev-perl/PDL/ChangeLog b/dev-perl/PDL/ChangeLog
index 6ec0919b0372..a2428dd9418c 100644
--- a/dev-perl/PDL/ChangeLog
+++ b/dev-perl/PDL/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-perl/PDL
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/PDL/ChangeLog,v 1.23 2004/08/30 19:20:14 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/PDL/ChangeLog,v 1.24 2004/09/04 16:10:13 mcummings Exp $
+
+*PDL-2.4.0-r2 (04 Sep 2004)
+
+  04 Sep 2004; Michael Cummings <mcummings@gentoo.org> +files/gsl.patch,
+  +PDL-2.4.0-r2.ebuild:
+  This patch, provided in bug 33936, fixes a bug in the gsl library detection.
+  Patience and patch supplied by Karl Steddom <k-steddom@tamu.edu>
 
   30 Aug 2004; Danny van Dyk <kugelfang@gentoo.org> PDL-2.4.0.ebuild:
   Applying -fPIC to compile flags now unconditionally. See BUG #55238.
diff --git a/dev-perl/PDL/Manifest b/dev-perl/PDL/Manifest
index dc2f1d4a8b45..f85880dc676e 100644
--- a/dev-perl/PDL/Manifest
+++ b/dev-perl/PDL/Manifest
@@ -2,12 +2,15 @@ MD5 57da9fcb7055ea5315307a0023974ea8 ChangeLog 2821
 MD5 8240c6adf86f34dbc6807beccc8587a8 PDL-2.3.2-r1.ebuild 1399
 MD5 1187d3fe3d04914c1c95201e411598e5 PDL-2.3.2-r2.ebuild 1398
 MD5 1824ca99a76fddb073332c2defda86f5 PDL-2.3.4.ebuild 1476
-MD5 415789ad56fe42fcceae2cf64b8eb74a PDL-2.4.0-r1.ebuild 1772
+MD5 4cf44a33661d273352c3333ec955c719 PDL-2.4.0-r1.ebuild 1871
 MD5 3c3a64c1ae1f2d78fc3f9536034378cf PDL-2.4.0.ebuild 1841
 MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
+MD5 1d4b9ad93d33cdf50ce7f57a5e012974 PDL-2.4.0-r2.ebuild 1998
+MD5 5c22c0f59ad10f36608505d621618f2b files/gsl.patch 483
 MD5 6227c564933ab56193b3e40c1b9849a9 files/digest-PDL-2.3.2-r1 62
 MD5 6227c564933ab56193b3e40c1b9849a9 files/digest-PDL-2.3.2-r2 62
 MD5 35ac408924354a06245cd6ff352d3f26 files/digest-PDL-2.3.4 62
 MD5 c02b2911c7ccf0e1034e719bf515c9fd files/digest-PDL-2.4.0 62
 MD5 c02b2911c7ccf0e1034e719bf515c9fd files/digest-PDL-2.4.0-r1 62
 MD5 62cbe79e2c7c354d5c165b63c571cc13 files/perldl.conf 2716
+MD5 c02b2911c7ccf0e1034e719bf515c9fd files/digest-PDL-2.4.0-r2 62
diff --git a/dev-perl/PDL/PDL-2.3.2-r1.ebuild b/dev-perl/PDL/PDL-2.3.2-r1.ebuild
index cb9f5d7644be..c2c591025c03 100644
--- a/dev-perl/PDL/PDL-2.3.2-r1.ebuild
+++ b/dev-perl/PDL/PDL-2.3.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/PDL/PDL-2.3.2-r1.ebuild,v 1.19 2004/07/14 20:06:26 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/PDL/PDL-2.3.2-r1.ebuild,v 1.20 2004/09/04 16:10:13 mcummings Exp $
 
 IUSE="opengl"
 
@@ -12,7 +12,7 @@ HOMEPAGE="http://cpan.valueclick.com/modules/by-module/PDL/${P}.readme"
 
 SLOT="0"
 LICENSE="Artistic as-is"
-KEYWORDS="x86 amd64 ppc sparc alpha"
+KEYWORDS="x86 ppc sparc alpha"
 
 DEPEND="${DEPEND}
 	>=sys-libs/ncurses-5.2
diff --git a/dev-perl/PDL/PDL-2.3.2-r2.ebuild b/dev-perl/PDL/PDL-2.3.2-r2.ebuild
index e8add843c4ba..1d011dfbf845 100644
--- a/dev-perl/PDL/PDL-2.3.2-r2.ebuild
+++ b/dev-perl/PDL/PDL-2.3.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/PDL/PDL-2.3.2-r2.ebuild,v 1.9 2004/07/14 20:06:26 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/PDL/PDL-2.3.2-r2.ebuild,v 1.10 2004/09/04 16:10:13 mcummings Exp $
 
 IUSE="opengl"
 
@@ -12,7 +12,7 @@ HOMEPAGE="http://cpan.valueclick.com/modules/by-module/PDL/${P}.readme"
 
 SLOT="0"
 LICENSE="Artistic as-is"
-KEYWORDS="x86 amd64 ppc sparc alpha"
+KEYWORDS="x86 ppc sparc alpha"
 
 DEPEND="${DEPEND}
 	>=sys-libs/ncurses-5.2
diff --git a/dev-perl/PDL/PDL-2.3.4.ebuild b/dev-perl/PDL/PDL-2.3.4.ebuild
index 3855b4e9d89e..637fc0170b35 100644
--- a/dev-perl/PDL/PDL-2.3.4.ebuild
+++ b/dev-perl/PDL/PDL-2.3.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/PDL/PDL-2.3.4.ebuild,v 1.6 2004/07/14 20:06:26 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/PDL/PDL-2.3.4.ebuild,v 1.7 2004/09/04 16:10:13 mcummings Exp $
 
 IUSE="opengl"
 
@@ -12,7 +12,7 @@ HOMEPAGE="http://cpan.valueclick.com/modules/by-module/PDL/${P}.readme"
 
 SLOT="0"
 LICENSE="Artistic as-is"
-KEYWORDS="x86 amd64 ~ppc ~sparc ~alpha"
+KEYWORDS="x86 ~ppc ~sparc ~alpha"
 
 DEPEND="${DEPEND}
 	>=sys-libs/ncurses-5.2
diff --git a/dev-perl/PDL/PDL-2.4.0-r1.ebuild b/dev-perl/PDL/PDL-2.4.0-r1.ebuild
index b15fe1237e19..bb97654812d2 100644
--- a/dev-perl/PDL/PDL-2.4.0-r1.ebuild
+++ b/dev-perl/PDL/PDL-2.4.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/PDL/PDL-2.4.0-r1.ebuild,v 1.9 2004/06/25 00:53:37 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/PDL/PDL-2.4.0-r1.ebuild,v 1.10 2004/09/04 16:10:13 mcummings Exp $
 
 IUSE="opengl"
 
@@ -11,7 +11,7 @@ SRC_URI="http://cpan.valueclick.com/modules/by-module/PDL/${P}.tar.gz"
 HOMEPAGE="http://cpan.valueclick.com/modules/by-module/PDL/${P}.readme"
 SLOT="0"
 LICENSE="Artistic as-is"
-KEYWORDS="x86 amd64 ~ppc sparc alpha hppa mips"
+KEYWORDS="x86 ~ppc sparc alpha hppa mips"
 
 DEPEND=">=sys-libs/ncurses-5.2
 	dev-perl/Filter
diff --git a/dev-perl/PDL/PDL-2.4.0-r2.ebuild b/dev-perl/PDL/PDL-2.4.0-r2.ebuild
new file mode 100644
index 000000000000..1e04bbd881e7
--- /dev/null
+++ b/dev-perl/PDL/PDL-2.4.0-r2.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/PDL/PDL-2.4.0-r2.ebuild,v 1.1 2004/09/04 16:10:13 mcummings Exp $
+
+IUSE="opengl"
+
+inherit perl-module eutils
+
+DESCRIPTION="PDL Perl Module"
+SRC_URI="http://cpan.valueclick.com/modules/by-module/PDL/${P}.tar.gz"
+HOMEPAGE="http://cpan.valueclick.com/modules/by-module/PDL/${P}.readme"
+SLOT="0"
+LICENSE="Artistic as-is"
+KEYWORDS="x86 ~ppc ~sparc ~alpha ~hppa ~mips"
+
+DEPEND=">=sys-libs/ncurses-5.2
+	dev-perl/Filter
+	|| ( dev-perl/File-Spec >=dev-lang/perl-5.8.0-r12 )
+	dev-perl/Inline
+	>=dev-perl/ExtUtils-F77-1.13
+	dev-perl/Text-Balanced
+	opengl? ( virtual/opengl virtual/glu )
+	>=sys-apps/sed-4"
+
+mydoc="DEPENDENCIES DEVELOPMENT MANIFEST* COPYING Release_Notes TODO"
+
+
+pkg_setup() {
+	echo ""
+	einfo "If you want GSL library support in PDL,"
+	einfo "you need to emerge dev-libs/gsl first."
+	echo ""
+	sleep 5
+}
+src_unpack() {
+
+	unpack ${A}
+
+	#open gl does not work at the moment
+	if use opengl
+	then
+		echo "OpenGL support is current disabled due to build issues"
+		sed -e "s:WITH_3D => undef:WITH_3D => 0:" \
+			${FILESDIR}/perldl.conf > ${S}/perldl.conf
+	else
+		sed -e "s:WITH_3D => undef:WITH_3D => 0:" \
+			${FILESDIR}/perldl.conf > ${S}/perldl.conf
+	fi
+	if use hppa || use amd64; then
+		cd ${S}/Lib/Slatec
+		sed -i -e "s/mycompiler -c -o/mycompiler -fPIC -c -o/" Makefile.PL
+	fi
+	# The below patch was supplied by Karl Steddom <k-steddom@tamu.edu>
+	# in bug 33936 to correct PDL's inability to detect GSL libraries
+	# correctly. 
+	# -mcummings
+	cd ${S}
+	epatch ${FILESDIR}/gsl.patch || die
+}
+
+src_install () {
+
+	perl-module_src_install
+	dodir /usr/share/doc/${PF}/html
+	eval `perl '-V:version'`
+	PERLVERSION=${version}
+	mv ${D}/usr/lib/perl5/site_perl/${PERLVERSION}/${CHOST%%-*}-linux/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/*
+	do
+		dosed ${i/${D}}
+	done
+
+	dosed /usr/lib/perl5/site_perl/${PERLVERSION}/${CHOST%%-*}-linux/PDL/pdldoc.db
+}
diff --git a/dev-perl/PDL/PDL-2.4.0.ebuild b/dev-perl/PDL/PDL-2.4.0.ebuild
index 7e80a6cba29b..36dfa07a7337 100644
--- a/dev-perl/PDL/PDL-2.4.0.ebuild
+++ b/dev-perl/PDL/PDL-2.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/PDL/PDL-2.4.0.ebuild,v 1.11 2004/08/30 19:20:14 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/PDL/PDL-2.4.0.ebuild,v 1.12 2004/09/04 16:10:13 mcummings Exp $
 
 IUSE="opengl"
 
@@ -12,7 +12,7 @@ HOMEPAGE="http://cpan.valueclick.com/modules/by-module/PDL/${P}.readme"
 
 SLOT="0"
 LICENSE="Artistic as-is"
-KEYWORDS="x86 amd64 ~ppc ~sparc alpha hppa"
+KEYWORDS="x86 ~ppc ~sparc alpha hppa"
 
 DEPEND="${DEPEND}
 	>=sys-libs/ncurses-5.2
diff --git a/dev-perl/PDL/files/digest-PDL-2.4.0-r2 b/dev-perl/PDL/files/digest-PDL-2.4.0-r2
new file mode 100644
index 000000000000..0947c21e7923
--- /dev/null
+++ b/dev-perl/PDL/files/digest-PDL-2.4.0-r2
@@ -0,0 +1 @@
+MD5 4804aedbfdf6eb2574a61ca0134386ae PDL-2.4.0.tar.gz 1758829
diff --git a/dev-perl/PDL/files/gsl.patch b/dev-perl/PDL/files/gsl.patch
new file mode 100644
index 000000000000..87c74446a604
--- /dev/null
+++ b/dev-perl/PDL/files/gsl.patch
@@ -0,0 +1,14 @@
+--- 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