bug 101448, hardened patch, plus added hppa patch back into 2.010702 builds

(Portage version: 2.1_pre3-r1)

7 files changed, 72 insertions, 11 deletions

diff --git a/dev-perl/math-pari/ChangeLog b/dev-perl/math-pari/ChangeLog
index a515dd3ad3ce..9209ec0f43c4 100644
--- a/dev-perl/math-pari/ChangeLog
+++ b/dev-perl/math-pari/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-perl/math-pari
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/math-pari/ChangeLog,v 1.19 2006/01/18 12:44:36 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/math-pari/ChangeLog,v 1.20 2006/01/18 22:56:01 mcummings Exp $
+
+*math-pari-2.010702-r1 (18 Jan 2006)
+
+  18 Jan 2006; Michael Cummings <mcummings@gentoo.org>
+  +files/math-pari-2.010702-hppa.patch, files/math-pari-hppa.patch,
+  math-pari-2.010702.ebuild, +math-pari-2.010702-r1.ebuild:
+  bug 101448, hardened patch, plus added hppa patch back into 2.010702 builds
 
   18 Jan 2006; Guy Martin <gmsoft@gentoo.org> math-pari-2.010702.ebuild:
   Stable on hppa.
diff --git a/dev-perl/math-pari/Manifest b/dev-perl/math-pari/Manifest
index f2c3c297dd54..b00a54d3e837 100644
--- a/dev-perl/math-pari/Manifest
+++ b/dev-perl/math-pari/Manifest
@@ -2,8 +2,11 @@ MD5 727b2f7ace83b9d1aa0673778e002644 ChangeLog 2837
 MD5 c2c4ec5a0ec34e3f7744f2f8220fbf86 files/digest-math-pari-2.010500-r1 132
 MD5 2946e7c9e5bbdb5a6d5a592cf5d7c523 files/digest-math-pari-2.010603 130
 MD5 7a28837d7d66fda2cbedacc81aea8916 files/digest-math-pari-2.010702 130
-MD5 0796c30582a5a757aaf98a324261e176 files/math-pari-hppa.patch 637
+MD5 7a28837d7d66fda2cbedacc81aea8916 files/digest-math-pari-2.010702-r1 130
+MD5 8bf4d2be76b7b962d6a7a4bea2bd41e4 files/math-pari-2.010702-hppa.patch 641
+MD5 6e00e9cedff73a1b0100d1a7a0fd8f82 files/math-pari-hppa.patch 641
 MD5 91aad64a08ab5135550d165791a3b1fe math-pari-2.010500-r1.ebuild 899
 MD5 21b533121f8bd25448d011b360ddc95f math-pari-2.010603.ebuild 992
-MD5 d98f509ffc44aab1f5ca22c8dfa930ee math-pari-2.010702.ebuild 920
+MD5 d8bad0a957af14a90dcccdf7262f0f64 math-pari-2.010702-r1.ebuild 885
+MD5 a3179eed85ba84c28bb915c3b6d0bd62 math-pari-2.010702.ebuild 988
 MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
diff --git a/dev-perl/math-pari/files/digest-math-pari-2.010702-r1 b/dev-perl/math-pari/files/digest-math-pari-2.010702-r1
new file mode 100644
index 000000000000..d9ed3eee796c
--- /dev/null
+++ b/dev-perl/math-pari/files/digest-math-pari-2.010702-r1
@@ -0,0 +1,2 @@
+MD5 025c96090ab506eb7c4d499b85ddec33 Math-Pari-2.010702.tar.gz 107266
+MD5 357b7a42e89e2761a5367bbcbfcca5f2 pari-2.1.7.tgz 1542137
diff --git a/dev-perl/math-pari/files/math-pari-2.010702-hppa.patch b/dev-perl/math-pari/files/math-pari-2.010702-hppa.patch
new file mode 100644
index 000000000000..62c5b2aac862
--- /dev/null
+++ b/dev-perl/math-pari/files/math-pari-2.010702-hppa.patch
@@ -0,0 +1,13 @@
+--- Math-Pari-2.010702.orig/utils/Math/PariBuild.pm	2005-11-11 05:49:34.000000000 -0500
++++ Math-Pari-2.010702/utils/Math/PariBuild.pm	2006-01-18 17:45:59.000000000 -0500
+@@ -717,7 +717,9 @@ sub find_machine_architecture () {
+   } elsif ($os eq 'linux') {
+     chomp($machine = `uname -m`);
+     $machine = 'sparcv9' if $machine eq 'sparc64';
+-    if (-e '/proc/cpuinfo') {
++	$machine = 'hppa' if $machine eq 'parisc';
++	$machine = 'hppa' if $machine eq 'parisc64';
++	if (-e '/proc/cpuinfo' && -R '/proc/cpuinfo') {
+       open IN, '/proc/cpuinfo' or die "open /proc/cpuinfo: $!";
+       local $/ = undef;		# Needed?
+       my $info = <IN>;
diff --git a/dev-perl/math-pari/files/math-pari-hppa.patch b/dev-perl/math-pari/files/math-pari-hppa.patch
index acf602c7a50b..85efb2f60d4a 100644
--- a/dev-perl/math-pari/files/math-pari-hppa.patch
+++ b/dev-perl/math-pari/files/math-pari-hppa.patch
@@ -1,12 +1,13 @@
-diff -uNr Math-Pari-2.010603.old/utils/Math/PariBuild.pm Math-Pari-2.010603/utils/Math/PariBuild.pm
---- Math-Pari-2.010603.old/utils/Math/PariBuild.pm	2005-06-01 09:54:01.000000000 +0200
-+++ Math-Pari-2.010603/utils/Math/PariBuild.pm	2005-06-01 09:54:33.000000000 +0200
-@@ -712,6 +712,8 @@
+--- Math-Pari-2.010603/utils/Math/PariBuild.pm.orig	2006-01-18 17:37:03.000000000 -0500
++++ Math-Pari-2.010603/utils/Math/PariBuild.pm	2006-01-18 17:37:38.000000000 -0500
+@@ -712,7 +712,9 @@ sub find_machine_architecture () {
    } elsif ($os eq 'linux') {
      chomp($machine = `uname -m`);
      $machine = 'sparcv9' if $machine eq 'sparc64';
-+    $machine = 'hppa' if $machine eq 'parisc';
-+    $machine = 'hppa' if $machine eq 'parisc64';
-     if (-e '/proc/cpuinfo') {
+-    if (-e '/proc/cpuinfo') {
++	$machine = 'hppa' if $machine eq 'parisc';
++	$machine = 'hppa' if $machine eq 'parisc64';
++	if (-e '/proc/cpuinfo' && -R '/proc/cpuinfo') {
        open IN, '/proc/cpuinfo' or die "open /proc/cpuinfo: $!";
        local $/ = undef;		# Needed?
+       my $info = <IN>;
diff --git a/dev-perl/math-pari/math-pari-2.010702-r1.ebuild b/dev-perl/math-pari/math-pari-2.010702-r1.ebuild
new file mode 100644
index 000000000000..9120c750eb4f
--- /dev/null
+++ b/dev-perl/math-pari/math-pari-2.010702-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/math-pari/math-pari-2.010702-r1.ebuild,v 1.1 2006/01/18 22:56:01 mcummings Exp $
+
+inherit perl-module eutils
+
+MY_P="Math-Pari-${PV}"
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="Perl interface to PARI"
+HOMEPAGE="http://www.cpan.org/authors/id/I/IL/ILYAZ/modules/${MY_P}.readme"
+SRC_URI="mirror://cpan/authors/id/I/IL/ILYAZ/modules/${MY_P}.tar.gz
+		http://pari.math.u-bordeaux.fr/pub/pari/unix/pari-2.1.7.tgz"
+
+LICENSE="|| ( Artistic GPL-2 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86"
+IUSE=""
+
+SRC_TEST="do"
+
+# Math::Pari requires that a copy of the pari source in a parallel
+# directory to where you build it. It does not need to compile it, but
+# it does need to be the same version as is installed, hence the hard
+# DEPEND below
+DEPEND="~sci-mathematics/pari-2.1.7"
+
+src_unpack () {
+	unpack ${A}
+	epatch ${FILESDIR}/${P}-hppa.patch
+}
diff --git a/dev-perl/math-pari/math-pari-2.010702.ebuild b/dev-perl/math-pari/math-pari-2.010702.ebuild
index 9a8e5de62e54..575c844b0f54 100644
--- a/dev-perl/math-pari/math-pari-2.010702.ebuild
+++ b/dev-perl/math-pari/math-pari-2.010702.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/dev-perl/math-pari/math-pari-2.010702.ebuild,v 1.3 2006/01/18 12:44:36 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/math-pari/math-pari-2.010702.ebuild,v 1.4 2006/01/18 22:56:01 mcummings Exp $
 
 inherit perl-module eutils
 
@@ -23,3 +23,8 @@ SRC_TEST="do"
 # it does need to be the same version as is installed, hence the hard
 # DEPEND below
 DEPEND="~sci-mathematics/pari-2.1.7"
+
+src_unpack () {
+	unpack ${A}
+	epatch ${FILESDIR}/${P}-hppa.patch
+}