Version bump.

(Portage version: 2.0.51.21)

6 files changed, 194 insertions, 20 deletions

diff --git a/sci-libs/plplot/ChangeLog b/sci-libs/plplot/ChangeLog
index ca93a9c3c011..523ed45a3d45 100644
--- a/sci-libs/plplot/ChangeLog
+++ b/sci-libs/plplot/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-libs/plplot
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/plplot/ChangeLog,v 1.2 2005/04/08 19:27:21 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/plplot/ChangeLog,v 1.3 2005/05/03 15:59:00 cryos Exp $
+
+*plplot-5.5.2 (03 May 2005)
+
+  03 May 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  files/plplot-5.5.1-gcc-3.4-fix.patch, plplot-5.5.1.ebuild,
+  +plplot-5.5.2.ebuild:
+  Version bump. Changed the octave patch to apply more generically.
 
 *plplot-5.5.1 (08 Apr 2005)
 
diff --git a/sci-libs/plplot/Manifest b/sci-libs/plplot/Manifest
index b8b3d3f6fcb2..29a3cd368103 100644
--- a/sci-libs/plplot/Manifest
+++ b/sci-libs/plplot/Manifest
@@ -1,18 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 b8a0bc27321b04e4ed08f9b2d893b6e5 plplot-5.5.1.ebuild 5549
+MD5 39b240b692fa599cc9bfcc69163cbde4 plplot-5.5.1.ebuild 5558
 MD5 063cc71405f1b29f44e8b8a4b6151e1f plplot-5.3.1.ebuild 5549
+MD5 4efacca22d41d175cf6a81a1ddd0e825 plplot-5.5.2.ebuild 5565
 MD5 c114a531338bbe6f4b89171c99ebc2d5 ChangeLog 783
 MD5 c3b6ebfa4bc606e61260dba27014f49a metadata.xml 1063
-MD5 4349869753a76e74f49766463d85d594 files/plplot-5.5.1-gcc-3.4-fix.patch 1524
+MD5 41a5eade36ce8c6f875dc087ba1fc40a files/plplot-5.5.1-gcc-3.4-fix.patch 1396
 MD5 5eb32aa5083d7a3d753c95f64e7bc679 files/plplot-5.3.1-gcc-3.4-fix.patch 1554
 MD5 7a1afddc57a8d11a2ee37e5dbd8b552e files/digest-plplot-5.3.1 65
 MD5 c345643d391a06e2dd4000f64e2abc14 files/digest-plplot-5.5.1 65
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCVts7ntT9W3vfTuoRAioJAKCJDm1Q/c1U0U68hNcwMxm6n51U5ACfUaU1
-hjSiWo8QUuHXurzBPkvkLNg=
-=xttI
------END PGP SIGNATURE-----
+MD5 b6e5603460b46e4264006f08a3a66d27 files/digest-plplot-5.5.2 65
diff --git a/sci-libs/plplot/files/digest-plplot-5.5.2 b/sci-libs/plplot/files/digest-plplot-5.5.2
new file mode 100644
index 000000000000..2bec37572d05
--- /dev/null
+++ b/sci-libs/plplot/files/digest-plplot-5.5.2
@@ -0,0 +1 @@
+MD5 bef62f05b317005fbf36c2fc3c191338 plplot-5.5.2.tar.gz 5891255
diff --git a/sci-libs/plplot/files/plplot-5.5.1-gcc-3.4-fix.patch b/sci-libs/plplot/files/plplot-5.5.1-gcc-3.4-fix.patch
index d7e6acd7ba00..9f3af76e35a6 100644
--- a/sci-libs/plplot/files/plplot-5.5.1-gcc-3.4-fix.patch
+++ b/sci-libs/plplot/files/plplot-5.5.1-gcc-3.4-fix.patch
@@ -1,6 +1,6 @@
-diff -ruN plplot-5.5.1/bindings/octave/Makefile.am plplot-5.5.1-cryos/bindings/octave/Makefile.am
---- plplot-5.5.1/bindings/octave/Makefile.am	2004-09-07 17:00:47.000000000 +0100
-+++ plplot-5.5.1-cryos/bindings/octave/Makefile.am	2005-04-08 20:17:02.000000000 +0100
+diff -ruN bindings/octave/Makefile.am bindings/octave/Makefile.am
+--- bindings/octave/Makefile.am	2004-09-07 17:00:47.000000000 +0100
++++ bindings/octave/Makefile.am	2005-04-08 20:17:02.000000000 +0100
 @@ -75,7 +75,7 @@
  plplot_octave.cc tmp_stub: plplot_octave.h
  	$(PERL) $(MATWRAP) -language octave -o plplot_octave.cc	-stub tmp_stub \
@@ -10,9 +10,9 @@ diff -ruN plplot-5.5.1/bindings/octave/Makefile.am plplot-5.5.1-cryos/bindings/o
  	mv -f plplot_octave.cc tmp_plplot_octave.cc
  	sed 's/ string / std::string /' tmp_plplot_octave.cc > plplot_octave.cc
  
-diff -ruN plplot-5.5.1/bindings/octave/Makefile.in plplot-5.5.1-cryos/bindings/octave/Makefile.in
---- plplot-5.5.1/bindings/octave/Makefile.in	2005-04-04 15:54:31.000000000 +0100
-+++ plplot-5.5.1-cryos/bindings/octave/Makefile.in	2005-04-08 20:17:24.000000000 +0100
+diff -ruN bindings/octave/Makefile.in bindings/octave/Makefile.in
+--- bindings/octave/Makefile.in	2005-04-04 15:54:31.000000000 +0100
++++ bindings/octave/Makefile.in	2005-04-08 20:17:24.000000000 +0100
 @@ -920,7 +920,7 @@
  @enable_octave_TRUE@plplot_octave.cc tmp_stub: plplot_octave.h
  @enable_octave_TRUE@	$(PERL) $(MATWRAP) -language octave -o plplot_octave.cc	-stub tmp_stub \
diff --git a/sci-libs/plplot/plplot-5.5.1.ebuild b/sci-libs/plplot/plplot-5.5.1.ebuild
index fccf233dbf43..86432e837792 100644
--- a/sci-libs/plplot/plplot-5.5.1.ebuild
+++ b/sci-libs/plplot/plplot-5.5.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/plplot/plplot-5.5.1.ebuild,v 1.1 2005/04/08 19:27:21 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/plplot/plplot-5.5.1.ebuild,v 1.2 2005/05/03 15:59:00 cryos Exp $
 
 inherit eutils
 
@@ -53,6 +53,7 @@ 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.
 	epatch ${FILESDIR}/${P}-gcc-3.4-fix.patch
diff --git a/sci-libs/plplot/plplot-5.5.2.ebuild b/sci-libs/plplot/plplot-5.5.2.ebuild
new file mode 100644
index 000000000000..1a553915038a
--- /dev/null
+++ b/sci-libs/plplot/plplot-5.5.2.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2005 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.1 2005/05/03 15:59:00 cryos Exp $
+
+inherit eutils
+
+# Known problems with this ebuild:
+# - No support for libqhull.
+# - No documentation building - although prebuilt docs are in the tarball.
+
+DESCRIPTION="A Scientific Plotting Library"
+HOMEPAGE="http://plplot.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+LICENSE="LGPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc fortran gd-external gnome ifc java jpeg png python tcltk tetex truetype X itcl octave"
+
+DEPEND="dev-util/pkgconfig
+	ifc? ( dev-lang/ifc )
+	virtual/libc
+	sys-apps/man
+	dev-lang/perl
+	app-text/opensp
+	python? ( dev-python/numeric )
+	java? ( virtual/jre )
+	tetex? ( app-text/jadetex )
+	octave? ( sci-mathematics/octave )
+	external-gd? ( media-libs/gd )
+	truetype? ( media-libs/freetype )
+	X? ( virtual/x11
+		tcltk? ( dev-lang/tcl
+			dev-lang/tk
+			itcl? ( dev-tcltk/itcl )
+		)
+		gnome? ( gnome-base/gnome-libs )
+	)
+	doc? ( sys-apps/texinfo )"
+	# Optional support for libqhull (currently doesn't work).
+	# qhull? ( media-libs/qhull )
+
+pkg_setup() {
+	# If the fortran interface is wanted, the gnu f77 compiler
+	# is needed unless ifc is used (which is taken care of in
+	# the dependencies).
+	use fortran && ! use ifc || if [ -z 'which g77' ]; then
+		eerror "GNU fortran 77 compiler not found on the system."
+		eerror "Please add fortran to your USE flags and reemerge gcc."
+		die
+	fi
+}
+
+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.
+	epatch ${FILESDIR}/${PN}-5.5.1-gcc-3.4-fix.patch
+}
+
+src_compile() {
+	# Doesn't compile with j > 1.
+	MAKEOPTS="${MAKEOPTS} -e -j1"
+
+	local EXTRA_CONF
+
+	# Export DATA_DIR and DOC_DIR so that configure uses correct install path
+	EXTRA_CONF="${EXTRA_CONF} DATA_DIR=\"/usr/share/${PN}\""
+	EXTRA_CONF="${EXTRA_CONF} DOC_DIR=\"/usr/share/doc/${PF}\""
+
+	# Use pkg-config
+	EXTRA_CONF="${EXTRA_CONF} --with-pkg-config"
+
+	# Compilation options (debug, documentation).
+	EXTRA_CONF="${EXTRA_CONF} $(use_with debug)"
+	# Documentation building doesn't work.
+	# The xml catalogs are not found.
+#	 if use doc; then
+#	 	EXTRA_CONF="${EXTRA_CONF} --enable-builddoc \
+#	 	--with-xml-declaration=/usr/share/sgml/xml.dcl \
+#		--with-sgml-catalogs=/etc/sgml/catalog:/usr/share/sgml/docbook/sgml-dtd-4.2/catalog:/usr/share/sgml/docbook/sgml-dtd-4.2/docbook.dtd:/usr/share/sgml/docbook/sgml-dtd-4.2/docbookx.dtd"
+#		EXTRA_CONF="${EXTRA_CONF} --with-db2x_texixml=/usr/bin/db2x_texixml.pl --with-db2x_xsltproc=/usr/bin/db2x_xsltproc.pl"
+#	 else
+#	 	EXTRA_CONF="${EXTRA_CONF} --disable-builddoc"
+#	 fi
+	EXTRA_CONF="${EXTRA_CONF} --disable-builddoc"
+
+	# Language bindings.
+	EXTRA_CONF="${EXTRA_CONF} $(use_enable python)"
+	EXTRA_CONF="${EXTRA_CONF} $(use_enable java)"
+	EXTRA_CONF="${EXTRA_CONF} $(use_enable octave)"
+	if use ifc; then
+		EXTRA_CONF="${EXTRA_CONF} --enable-f77 F77=/opt/intel/compiler70/ia32/bin/ifc"
+	elif use fortran; then
+		EXTRA_CONF="${EXTRA_CONF} --enable-f77"
+	else
+		EXTRA_CONF="${EXTRA_CONF} --disable-f77"
+	fi
+
+	# Device drivers.
+	EXTRA_CONF="${EXTRA_CONF} $(use_enable jpeg)"
+	EXTRA_CONF="${EXTRA_CONF} $(use_enable png)"
+	EXTRA_CONF="${EXTRA_CONF} $(use_enable tetex pstex)"
+	# Dynamic driver loading causes segfaults.
+	EXTRA_CONF="${EXTRA_CONF} --disable-dyndrivers"
+	# The linuxvga driver doesn't compile.
+	EXTRA_CONF="${EXTRA_CONF} --disable-linuxvga"
+
+	# Support for optional libraries.
+	EXTRA_CONF="${EXTRA_CONF} $(use_with truetype freetype)"
+	# Support for libqhull doesn't work. The configure script
+	# doesn't find the lib.
+	# EXTRA_CONF="${EXTRA_CONF} $(use_with qhull)"
+	EXTRA_CONF="${EXTRA_CONF} --without-qhull"
+
+	# Additional X-dependent language bindings and device drivers.
+	if use X; then
+		EXTRA_CONF="${EXTRA_CONF} --with-x"
+		if use tcltk; then
+			EXTRA_CONF="${EXTRA_CONF} --enable-tcl"
+			EXTRA_CONF="${EXTRA_CONF} $(use_enable itcl)"
+		else
+			EXTRA_CONF="${EXTRA_CONF} --disable-tcl"
+			EXTRA_CONF="${EXTRA_CONF} --disable-tk"
+			EXTRA_CONF="${EXTRA_CONF} --disable-itcl"
+		fi
+		EXTRA_CONF="${EXTRA_CONF} $(use_enable gnome)"
+	else
+		EXTRA_CONF="${EXTRA_CONF} --without-x"
+		EXTRA_CONF="${EXTRA_CONF} --disable-tcl"
+		EXTRA_CONF="${EXTRA_CONF} --disable-itcl"
+		EXTRA_CONF="${EXTRA_CONF} --disable-gnome"
+	fi
+
+	econf ${EXTRA_CONF} || die
+	emake || die "make step failed."
+}
+
+src_install() {
+
+	# A little sed magic to make some of the docs install to the right place
+	sed -i -e "s|\$(datadir)/doc/plplot|/usr/share/doc/${PF}|" Makefile || \
+		die "sed replacement of docs dir failed."
+
+	make install DESTDIR=${D} || die "make install step failed."
+
+	# To match the Gentoo FSH.
+	if use java; then
+		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}/*
+	gzip ${D}/usr/share/doc/${PF}/*
+	# Install prebuilt documentation.
+	if use doc; then
+		cd doc/docbook/src/
+		dohtml *.html
+		doinfo plplotdoc.info
+		insinto /usr/share/doc/${PF}
+		doins plplot-5.3.1.pdf
+	fi
+}