Fixed gd-external issues, closes bug 98065. A few small cleanups too.

(Portage version: 2.0.51.22-r2)

6 files changed, 17 insertions, 197 deletions

diff --git a/sci-libs/plplot/ChangeLog b/sci-libs/plplot/ChangeLog
index 523ed45a3d45..f8e65cf80fa5 100644
--- a/sci-libs/plplot/ChangeLog
+++ b/sci-libs/plplot/ChangeLog
@@ -1,6 +1,10 @@
 # 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.3 2005/05/03 15:59:00 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/plplot/ChangeLog,v 1.4 2005/08/20 20:06:46 cryos Exp $
+
+  20 Aug 2005; Marcus D. Hanwell <marcus@gentoo.org> plplot-5.3.1.ebuild,
+  -plplot-5.5.1.ebuild, plplot-5.5.2.ebuild:
+  Fixed gd-external issues, closes bug 98065. A few small cleanups too.
 
 *plplot-5.5.2 (03 May 2005)
 
diff --git a/sci-libs/plplot/Manifest b/sci-libs/plplot/Manifest
index 345210f93cbe..3f016e41d90c 100644
--- a/sci-libs/plplot/Manifest
+++ b/sci-libs/plplot/Manifest
@@ -1,20 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 7a5ca986d182a3b55d25c0121050fafe plplot-5.5.1.ebuild 5561
-MD5 5409744b0f1bb11fd1bfdead8a8ca2d1 plplot-5.3.1.ebuild 5552
-MD5 0be1a967fcdc6ba750c4d9e659c0d85f plplot-5.5.2.ebuild 5568
+MD5 c1d4109c044992e025b4c8aecd383dd3 plplot-5.3.1.ebuild 5557
+MD5 e074c3e4539faec8b0644207d37682b1 plplot-5.5.2.ebuild 5573
 MD5 89bbb5f45df19bcd6b9305046c4d34da ChangeLog 1018
 MD5 c3b6ebfa4bc606e61260dba27014f49a metadata.xml 1063
 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
 MD5 b6e5603460b46e4264006f08a3a66d27 files/digest-plplot-5.5.2 65
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC1mWzBXaUFmZvwyMRAsnMAKCY9/BRJm+EBdASAxTT1fSLFIqO+QCfdujw
-0z9cnoY2ZGoLD4G9eMHIzQs=
-=vH3w
------END PGP SIGNATURE-----
diff --git a/sci-libs/plplot/files/digest-plplot-5.5.1 b/sci-libs/plplot/files/digest-plplot-5.5.1
deleted file mode 100644
index 2232bad49442..000000000000
--- a/sci-libs/plplot/files/digest-plplot-5.5.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6fac3e8582769ebb1ce3faebfe5ce2d2 plplot-5.5.1.tar.gz 5874572
diff --git a/sci-libs/plplot/plplot-5.3.1.ebuild b/sci-libs/plplot/plplot-5.3.1.ebuild
index 3dd996b95af6..15aa703dea98 100644
--- a/sci-libs/plplot/plplot-5.3.1.ebuild
+++ b/sci-libs/plplot/plplot-5.3.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.3.1.ebuild,v 1.2 2005/07/14 13:16:16 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/plplot/plplot-5.3.1.ebuild,v 1.3 2005/08/20 20:06:46 cryos Exp $
 
 inherit eutils
 
@@ -15,7 +15,7 @@ LICENSE="LGPL-2"
 
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="X debug doc gd-external fortran gnome ifc itcl java jpeg octave png python tcltk tetex truetype"
+IUSE="X debug doc fortran gnome ifc itcl java jpeg octave png python tcltk tetex truetype"
 
 DEPEND="dev-util/pkgconfig
 	ifc? ( dev-lang/ifc )
@@ -27,7 +27,8 @@ DEPEND="dev-util/pkgconfig
 	java? ( virtual/jre )
 	tetex? ( app-text/jadetex )
 	octave? ( sci-mathematics/octave )
-	gd-external? ( media-libs/gd )
+	jpeg? ( media-libs/gd )
+	png? ( media-libs/gd )
 	truetype? ( media-libs/freetype )
 	X? ( virtual/x11
 		tcltk? ( dev-lang/tcl
@@ -167,6 +168,6 @@ src_install() {
 		dohtml *.html
 		doinfo plplotdoc.info
 		insinto /usr/share/doc/${PF}
-		doins plplot-5.3.1.pdf
+		doins ${P}.pdf
 	fi
 }
diff --git a/sci-libs/plplot/plplot-5.5.1.ebuild b/sci-libs/plplot/plplot-5.5.1.ebuild
deleted file mode 100644
index 14cab1a8a477..000000000000
--- a/sci-libs/plplot/plplot-5.5.1.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# 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.3 2005/07/14 13:16:16 agriffis 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="X debug doc gd-external fortran gnome ifc itcl java jpeg octave png python tcltk tetex truetype"
-
-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 )
-	gd-external? ( 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}/${P}-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
-}
diff --git a/sci-libs/plplot/plplot-5.5.2.ebuild b/sci-libs/plplot/plplot-5.5.2.ebuild
index 3415458ef5a1..7f15af385c52 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-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.2 2005/07/14 13:16:16 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/plplot/plplot-5.5.2.ebuild,v 1.3 2005/08/20 20:06:46 cryos Exp $
 
 inherit eutils
 
@@ -15,7 +15,7 @@ LICENSE="LGPL-2"
 
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="X debug doc gd-external fortran gnome ifc itcl java jpeg octave png python tcltk tetex truetype"
+IUSE="X debug doc fortran gnome ifc itcl java jpeg octave png python tcltk tetex truetype"
 
 DEPEND="dev-util/pkgconfig
 	ifc? ( dev-lang/ifc )
@@ -27,7 +27,8 @@ DEPEND="dev-util/pkgconfig
 	java? ( virtual/jre )
 	tetex? ( app-text/jadetex )
 	octave? ( sci-mathematics/octave )
-	gd-external? ( media-libs/gd )
+	jpeg? ( media-libs/gd )
+	png? ( media-libs/gd )
 	truetype? ( media-libs/freetype )
 	X? ( virtual/x11
 		tcltk? ( dev-lang/tcl
@@ -168,6 +169,6 @@ src_install() {
 		dohtml *.html
 		doinfo plplotdoc.info
 		insinto /usr/share/doc/${PF}
-		doins plplot-5.3.1.pdf
+		doins ${P}.pdf
 	fi
 }