Fixed problems with octave files and added a patch to correct a bug in a C macro (see bug #182949).

Package-Manager: portage-2.1.3.5

4 files changed, 40 insertions, 20 deletions

diff --git a/sci-libs/plplot/ChangeLog b/sci-libs/plplot/ChangeLog
index 7b02d28005c3..618b9882fe42 100644
--- a/sci-libs/plplot/ChangeLog
+++ b/sci-libs/plplot/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/plplot
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/plplot/ChangeLog,v 1.11 2007/07/22 07:05:08 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/plplot/ChangeLog,v 1.12 2007/08/14 03:37:21 markusle Exp $
+
+  14 Aug 2007; Markus Dittrich <markusle@gentoo.org>
+  +files/plplot-5.5.2-macro-fix.patch, plplot-5.5.2.ebuild:
+  Fixed problems with octave files and added a patch to correct
+  a bug in a C macro (see bug #182949).
 
   22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; plplot-5.5.2.ebuild:
   Drop virtual/x11 references.
diff --git a/sci-libs/plplot/Manifest b/sci-libs/plplot/Manifest
index 8fd89a9a2bde..f17bdece64af 100644
--- a/sci-libs/plplot/Manifest
+++ b/sci-libs/plplot/Manifest
@@ -2,15 +2,19 @@ AUX plplot-5.5.1-gcc-3.4-fix.patch 1396 RMD160 8854c2f315a5443cc5c29082a949e2ee3
 MD5 41a5eade36ce8c6f875dc087ba1fc40a files/plplot-5.5.1-gcc-3.4-fix.patch 1396
 RMD160 8854c2f315a5443cc5c29082a949e2ee359e6746 files/plplot-5.5.1-gcc-3.4-fix.patch 1396
 SHA256 1142ad469f6cc6dbf6331de9ceac0967e0128bef26e1ece2bb6b4f200f7e638f files/plplot-5.5.1-gcc-3.4-fix.patch 1396
+AUX plplot-5.5.2-macro-fix.patch 534 RMD160 71ffcec74770cab421a4756355f22818032e6e5c SHA1 0c1be25c54c94667371bbe386278960ed6cb4bdb SHA256 4a0d75b9e6d7ffeddfb38dcd58d9e440cde02ec93ce5ee22e48a3379c236874b
+MD5 ece26cf73420dfe3bae7e1c24bf3d3b3 files/plplot-5.5.2-macro-fix.patch 534
+RMD160 71ffcec74770cab421a4756355f22818032e6e5c files/plplot-5.5.2-macro-fix.patch 534
+SHA256 4a0d75b9e6d7ffeddfb38dcd58d9e440cde02ec93ce5ee22e48a3379c236874b files/plplot-5.5.2-macro-fix.patch 534
 DIST plplot-5.5.2.tar.gz 5891255 RMD160 55ea8e7dde5c0542ce8f360228a676049ad7d701 SHA1 72e0830b12d7d50ff9ac5b54e49aa1813a580786 SHA256 267d9c4070b8b6de75590efc24388da670dd5d0039a5dc21ecb803366d14730c
-EBUILD plplot-5.5.2.ebuild 5667 RMD160 ad0f573f1732ca12476e544da1a3f3f3921a0cb8 SHA1 47c875a9792099f76ebf0e26c1bebd20e0eb193d SHA256 fede5f901313e65d79a1e1e8df4a37883b052bd58e5a15f7d58da9c3dc24e0f5
-MD5 779791b222bed90e811e6a09a59461ae plplot-5.5.2.ebuild 5667
-RMD160 ad0f573f1732ca12476e544da1a3f3f3921a0cb8 plplot-5.5.2.ebuild 5667
-SHA256 fede5f901313e65d79a1e1e8df4a37883b052bd58e5a15f7d58da9c3dc24e0f5 plplot-5.5.2.ebuild 5667
-MISC ChangeLog 2029 RMD160 ced459dc60af2c00660c3070e91da83d8e5d7fb9 SHA1 fa50f6ba804d8d01518f7b6e56197132fab5b893 SHA256 1a298f463bbbb6829245ab05d79c70ba7bd17c2c3fdc9e498d966acd9eb75d5a
-MD5 5e084325fdc9f909291295c7cd059fdc ChangeLog 2029
-RMD160 ced459dc60af2c00660c3070e91da83d8e5d7fb9 ChangeLog 2029
-SHA256 1a298f463bbbb6829245ab05d79c70ba7bd17c2c3fdc9e498d966acd9eb75d5a ChangeLog 2029
+EBUILD plplot-5.5.2.ebuild 5538 RMD160 bc4acefeedb40977cfcc191a6f09cfbc9a1d0390 SHA1 f6628167dab0b5ef831632cf131d091b443c18c5 SHA256 1650d0b22b45167a38e2279d35903978d6e6e423315e3e3f44b89a74cdabc5b9
+MD5 889db693937295a8a3daa5faeefd1cd9 plplot-5.5.2.ebuild 5538
+RMD160 bc4acefeedb40977cfcc191a6f09cfbc9a1d0390 plplot-5.5.2.ebuild 5538
+SHA256 1650d0b22b45167a38e2279d35903978d6e6e423315e3e3f44b89a74cdabc5b9 plplot-5.5.2.ebuild 5538
+MISC ChangeLog 2246 RMD160 fc88dda80cafcad1717dfa223cc2893441736bbb SHA1 e6902992764798eec39375f1a947aae04e25c67c SHA256 37ebfc977361e373af6593a6a545125e0fe7eacc5dd75379b17a15ae5fd256f3
+MD5 5db7679e91b299acb03a603f14775948 ChangeLog 2246
+RMD160 fc88dda80cafcad1717dfa223cc2893441736bbb ChangeLog 2246
+SHA256 37ebfc977361e373af6593a6a545125e0fe7eacc5dd75379b17a15ae5fd256f3 ChangeLog 2246
 MISC metadata.xml 1063 RMD160 3af3224cba8a6f6b4fda4a216a9343372ca6f962 SHA1 fe669fef8974ff0705f3fbebf387f3d0efd5fc97 SHA256 45416c40b8f8bbf8d850d976889600a8b90c87a4f43d098866d622acf7fdc381
 MD5 c3b6ebfa4bc606e61260dba27014f49a metadata.xml 1063
 RMD160 3af3224cba8a6f6b4fda4a216a9343372ca6f962 metadata.xml 1063
diff --git a/sci-libs/plplot/files/plplot-5.5.2-macro-fix.patch b/sci-libs/plplot/files/plplot-5.5.2-macro-fix.patch
new file mode 100644
index 000000000000..7e97070a3280
--- /dev/null
+++ b/sci-libs/plplot/files/plplot-5.5.2-macro-fix.patch
@@ -0,0 +1,12 @@
+diff -Naur plplot-5.5.2/drivers/gd.c plplot-5.5.2.new/drivers/gd.c
+--- plplot-5.5.2/drivers/gd.c	2005-03-07 16:33:42.000000000 -0500
++++ plplot-5.5.2.new/drivers/gd.c	2007-08-13 15:30:09.000000000 -0400
+@@ -137,7 +137,7 @@
+                            "png:PNG file:0:gd:39:png\n";
+   #else
+     #if defined(PLD_png) && defined(PLD_gif)
+-      char* plD_DEVICE_INFO_gd = "png:PNG file:0:gd:39:png\n";
++      char* plD_DEVICE_INFO_gd = "png:PNG file:0:gd:39:png\n"
+                              "gif:GIF file:0:gd:47:gif";
+     #else
+ 
diff --git a/sci-libs/plplot/plplot-5.5.2.ebuild b/sci-libs/plplot/plplot-5.5.2.ebuild
index cc715599a60f..9a5b810e0eef 100644
--- a/sci-libs/plplot/plplot-5.5.2.ebuild
+++ b/sci-libs/plplot/plplot-5.5.2.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/sci-libs/plplot/plplot-5.5.2.ebuild,v 1.9 2007/07/22 07:05:08 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/plplot/plplot-5.5.2.ebuild,v 1.10 2007/08/14 03:37:21 markusle Exp $
 
 inherit eutils
 
@@ -59,9 +59,16 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	# Fix compilation problems on GCC 3.4 and the octave bindings, thanks to the
-	# patch from Debian's BTS bug 274359.
+	# Fix compilation problems on GCC 3.4 and the octave 
+	# bindings, thanks to the patch from Debian's BTS bug 274359.
 	epatch ${FILESDIR}/${PN}-5.5.1-gcc-3.4-fix.patch
+	epatch ${FILESDIR}/${P}-macro-fix.patch
+
+	# properly detect octave 2.9.x
+	sed -e "s:filepath:filedir:" \
+		-e "s:plplot_octave$:plplot/octave:" \
+		-i configure \
+		|| die "Failed to make configure octave 2.9.x aware"
 }
 
 src_compile() {
@@ -155,14 +162,6 @@ src_install() {
 		mv ${D}/usr/lib/java/plplot ${D}/usr/share/${PN}/lib
 		rm -r ${D}/usr/lib/java
 	fi
-	if use octave; then
-		# fix the path to plplot's .m files
-		mv ${D}/usr/share/plplot_octave ${D}/usr/share/plplot/octave || die \
-			"Error moving octave files."
-		sed -i -e 's|/usr/share/plplot_octave|/usr/share/plplot/octave|' \
-			${D}/usr/share/octave/site/m/PLplot/plplot_octave_path.m \
-			|| die "sed replacement of octave path failed."
-	fi
 
 	# Fix permissions and gzip the basic documentation.
 	chmod 644 ${D}/usr/share/doc/${PF}/*