fixes on ebuild and added ~amd64

Package-Manager: portage-2.1.2-r9

6 files changed, 166 insertions, 13 deletions

diff --git a/sci-libs/pgplot/ChangeLog b/sci-libs/pgplot/ChangeLog
index a2a24121ae05..2a8e6b0abc43 100644
--- a/sci-libs/pgplot/ChangeLog
+++ b/sci-libs/pgplot/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sci-libs/pgplot
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/pgplot/ChangeLog,v 1.5 2007/02/22 01:24:26 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/pgplot/ChangeLog,v 1.6 2007/03/05 18:58:23 bicatali Exp $
+
+*pgplot-5.2.2-r1 (05 Mar 2007)
+
+  05 Mar 2007; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/pgplot-path.patch, metadata.xml, +pgplot-5.2.2-r1.ebuild:
+  General cleaning, added patches, a src_test, now does full 
+  installation, and a longdescrption in metadata.xml. Also tested on 
+  amd64.
 
   22 Feb 2007; Markus Ullmann <jokey@gentoo.org> ChangeLog:
   Redigest for Manifest2
diff --git a/sci-libs/pgplot/Manifest b/sci-libs/pgplot/Manifest
index d422dec6f5a8..30e5d836c893 100644
--- a/sci-libs/pgplot/Manifest
+++ b/sci-libs/pgplot/Manifest
@@ -13,26 +13,37 @@ AUX pgplot-makemake.patch 1040 RMD160 2181f8c8a5347a41ac78aae0c6a3ac3392fe4342 S
 MD5 1e3d99da0d638ce62b08ca0958eb66fb files/pgplot-makemake.patch 1040
 RMD160 2181f8c8a5347a41ac78aae0c6a3ac3392fe4342 files/pgplot-makemake.patch 1040
 SHA256 ef819809db1cfcdd89c8756d157fa6c3283697a5d54607074c7f9c2ee493cc77 files/pgplot-makemake.patch 1040
+AUX pgplot-path.patch 604 RMD160 e256b6af9f110fcf96fd86d1d8035d0cb0c895a1 SHA1 21af489f237f78e949f8c9fbd49cc6de21455aa8 SHA256 11046b2fbb258ff767ee545f542888f99feb7169669712883abfaf37637ca1e3
+MD5 0cb095a0d125a87be8913a52fba1d346 files/pgplot-path.patch 604
+RMD160 e256b6af9f110fcf96fd86d1d8035d0cb0c895a1 files/pgplot-path.patch 604
+SHA256 11046b2fbb258ff767ee545f542888f99feb7169669712883abfaf37637ca1e3 files/pgplot-path.patch 604
 DIST pgplot522.tar.gz 1197397 RMD160 4c21cad6613772f4104c65ac3d8d9a42e3c4afe1 SHA1 1f1c9aa17eeec9a2fb23fd15a0e4a91dcc49ddc1 SHA256 a5799ff719a510d84d26df4ae7409ae61fe66477e3f1e8820422a9a4727a5be4
+EBUILD pgplot-5.2.2-r1.ebuild 2675 RMD160 46872e1529f960a15da3cd5af22cd756c8bb814f SHA1 e39121bbb662822fc8854abb8351a951d1bb1b56 SHA256 adb40f700186435029be74a0b4674421fd3239617bbc479515141daba02cffe5
+MD5 d4f417f61f31ae7a963291b2d55fdc2b pgplot-5.2.2-r1.ebuild 2675
+RMD160 46872e1529f960a15da3cd5af22cd756c8bb814f pgplot-5.2.2-r1.ebuild 2675
+SHA256 adb40f700186435029be74a0b4674421fd3239617bbc479515141daba02cffe5 pgplot-5.2.2-r1.ebuild 2675
 EBUILD pgplot-5.2.2.ebuild 1495 RMD160 a4f1a5938ebbe907420bd8713d52f23563c28425 SHA1 ca5fc475e64814139cbdf4459a11c6f95ed42f13 SHA256 6cd622f38a4d14fb2c99e48fe083236d3b3ee032e3fb857f2226ce51d621f8fd
 MD5 fafa78d339765591a2a587af00c58fd3 pgplot-5.2.2.ebuild 1495
 RMD160 a4f1a5938ebbe907420bd8713d52f23563c28425 pgplot-5.2.2.ebuild 1495
 SHA256 6cd622f38a4d14fb2c99e48fe083236d3b3ee032e3fb857f2226ce51d621f8fd pgplot-5.2.2.ebuild 1495
-MISC ChangeLog 984 RMD160 0f2e3ed3b580052302eafe531b7c5aa11a0e5bdf SHA1 473e064ac2569fd8a1450bdfb8bd99885966e12f SHA256 6234d1c2833b6c82b9ed246639686be0faf998f1149579f695500fd96aac12bc
-MD5 c6f9a0540c3c802dd2f82c356ed6f290 ChangeLog 984
-RMD160 0f2e3ed3b580052302eafe531b7c5aa11a0e5bdf ChangeLog 984
-SHA256 6234d1c2833b6c82b9ed246639686be0faf998f1149579f695500fd96aac12bc ChangeLog 984
-MISC metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 SHA1 da2b240a255820145b7c83a5c48e45b96b7e9ee6 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900
-MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
-RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 metadata.xml 156
-SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900 metadata.xml 156
+MISC ChangeLog 1283 RMD160 372215e8069401dee05700be1b4c541b146aac7f SHA1 e2e788c3b67263cfe115044df30c22a837322c96 SHA256 4abe557dfaf8f748c8463de8a8e96d74b1ab0063d24d7ea0b692e555f8862536
+MD5 38e837ce4e3fced94d7aac8b438c50b1 ChangeLog 1283
+RMD160 372215e8069401dee05700be1b4c541b146aac7f ChangeLog 1283
+SHA256 4abe557dfaf8f748c8463de8a8e96d74b1ab0063d24d7ea0b692e555f8862536 ChangeLog 1283
+MISC metadata.xml 507 RMD160 8f89aef225b3c7fa4b817bd88ebfa5e73c9f1f4f SHA1 93061e1e4b6fa0967fec2829db49dbcaa74b6410 SHA256 44c0abf74199b2c4780cd7bf4bbc9b7c235ccc5e74e262985517ec8ade97189c
+MD5 0b77527426ef4e61d561d28de9662c34 metadata.xml 507
+RMD160 8f89aef225b3c7fa4b817bd88ebfa5e73c9f1f4f metadata.xml 507
+SHA256 44c0abf74199b2c4780cd7bf4bbc9b7c235ccc5e74e262985517ec8ade97189c metadata.xml 507
 MD5 381ff8dd7151ce6c864ea589a0e500f7 files/digest-pgplot-5.2.2 232
 RMD160 837a8454b49f25495e1776c9fb3ad4022b611b5a files/digest-pgplot-5.2.2 232
 SHA256 ee8e209202357347a9e6685f0f2930998edef0897d7496557c32fa767210e182 files/digest-pgplot-5.2.2 232
+MD5 381ff8dd7151ce6c864ea589a0e500f7 files/digest-pgplot-5.2.2-r1 232
+RMD160 837a8454b49f25495e1776c9fb3ad4022b611b5a files/digest-pgplot-5.2.2-r1 232
+SHA256 ee8e209202357347a9e6685f0f2930998edef0897d7496557c32fa767210e182 files/digest-pgplot-5.2.2-r1 232
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
+Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFF3PBdz974XjDVpbkRAuikAKCekihsbtfpIo5MtFm/Xj+ojVurkACgvoGQ
-kwvpLM7vjfLyDJwwHFzX5qs=
-=xNmC
+iD8DBQFF7GhZWc/Ciu+QQGkRAu8VAJwNCsyTGtmP6ao5htSRsV3/7BXrjgCcDvf8
+33+AZOJ2CevhAb1nNBVsMkk=
+=fUUB
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/pgplot/files/digest-pgplot-5.2.2-r1 b/sci-libs/pgplot/files/digest-pgplot-5.2.2-r1
new file mode 100644
index 000000000000..a08d5a4ce344
--- /dev/null
+++ b/sci-libs/pgplot/files/digest-pgplot-5.2.2-r1
@@ -0,0 +1,3 @@
+MD5 e8a6e8d0d5ef9d1709dfb567724525ae pgplot522.tar.gz 1197397
+RMD160 4c21cad6613772f4104c65ac3d8d9a42e3c4afe1 pgplot522.tar.gz 1197397
+SHA256 a5799ff719a510d84d26df4ae7409ae61fe66477e3f1e8820422a9a4727a5be4 pgplot522.tar.gz 1197397
diff --git a/sci-libs/pgplot/files/pgplot-path.patch b/sci-libs/pgplot/files/pgplot-path.patch
new file mode 100644
index 000000000000..990d9104c181
--- /dev/null
+++ b/sci-libs/pgplot/files/pgplot-path.patch
@@ -0,0 +1,18 @@
+diff -Nur pgplot/makehtml pgplot.new/makehtml
+--- pgplot/makehtml	1997-02-26 21:54:09.000000000 +0000
++++ pgplot.new/makehtml	2006-06-04 16:21:34.000000000 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl
++#!/usr/bin/perl
+ 
+ $, = ' ';		# set output field separator
+ $\ = "\n";		# set output record separator
+diff -Nur pgplot/maketex pgplot.new/maketex
+--- pgplot/maketex	1996-04-16 22:51:24.000000000 +0100
++++ pgplot.new/maketex	2006-06-04 16:21:47.000000000 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl
++#!/usr/bin/perl
+ 
+ $, = ' ';		# set output field separator
+ $\ = "\n";		# set output record separator
diff --git a/sci-libs/pgplot/metadata.xml b/sci-libs/pgplot/metadata.xml
index b229aec85b8f..f3e88639d650 100644
--- a/sci-libs/pgplot/metadata.xml
+++ b/sci-libs/pgplot/metadata.xml
@@ -2,4 +2,11 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>sci</herd>
+<longdescription lang="en">
+PGPLOT is a Fortran subroutine package for drawing graphs on a variety
+of display devices. The CPGPLOT library adds an intermediate level of
+wrapper functions between C programs and the PGPLOT library. These
+functions hide the system dependencies of calling PGPLOT behind a
+system independent interface.
+</longdescription>
 </pkgmetadata>
diff --git a/sci-libs/pgplot/pgplot-5.2.2-r1.ebuild b/sci-libs/pgplot/pgplot-5.2.2-r1.ebuild
new file mode 100644
index 000000000000..d66412a0ed9b
--- /dev/null
+++ b/sci-libs/pgplot/pgplot-5.2.2-r1.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/pgplot/pgplot-5.2.2-r1.ebuild,v 1.1 2007/03/05 18:58:23 bicatali Exp $
+
+inherit eutils toolchain-funcs fortran
+
+FORTRAN="g77"
+MY_P="${PN}${PV//.}"
+DESCRIPTION="A C/FORTRAN device-independent graphics library for making simple scientific graphs"
+HOMEPAGE="http://www.astro.caltech.edu/~tjp/pgplot/"
+SRC_URI="ftp://ftp.astro.caltech.edu/pub/pgplot/${MY_P}.tar.gz"
+LICENSE="free-noncomm"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~x86"
+IUSE="doc"
+RDEPEND="x11-libs/libX11
+	media-libs/libpng"
+DEPEND="${RDEPEND}"
+S="${WORKDIR}/${PN}"
+
+src_unpack() {
+	fortran_src_unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${PN}-drivers.patch
+	epatch "${FILESDIR}"/${PN}-makemake.patch
+	epatch "${FILESDIR}"/${PN}-compile-setup.patch
+
+	if use amd64 -o use ia64; then
+		sed -i \
+			-e 's/INTEGER PIXMAP/INTEGER*8 PIXMAP/g' \
+			drivers/{gi,pp,wd}driv.f || die "sed 64bits failed"
+	fi
+
+	cp sys_linux/g77_gcc.conf local.conf
+
+	sed -i \
+		-e "s:FCOMPL=.*:FCOMPL=\"${FORTRANC}\":g" \
+		-e "s:FFLAGOPT=.*:FFLAGOPT=\"${FFLAGS:- -O2}\":g" \
+		-e "s:CCOMPL=.*:CCOMPL=\"$(tc-getCC)\":g" \
+		-e "s:CFLAGOPT=.*:CFLAGOPT=\"${CFLAGS}\":g" \
+		local.conf || die "sed flags failed"
+
+	sed -i \
+		-e "s:/usr/local/pgplot:/usr/$(get_libdir)/pgplot:" \
+		src/grgfil.f || die "sed path failed"
+}
+
+src_compile() {
+	./makemake "${S}" linux
+
+	emake -j1 || die "emake failed"
+
+	# Build C portion
+	make cpg || die "make cpg failed"
+
+	# this just cleans out unneeded files
+	make clean
+}
+
+src_test() {
+	einfo "Testing various demo programs"
+	# i can go to 16
+	for i in 1 2 3; do
+		make pgdemo${i}
+		# j can also be LATEX CPS...
+		for j in GIF PNG PS; do
+			local testexe=./test_${j}_${i}
+			echo "./pgdemo${i} <<EOF" > ${testexe}
+			echo "/${j}" >> ${testexe}
+			echo "EOF" >> ${testexe}
+			sh ${testexe} || die "test ${i} failed"
+		done
+	done
+}
+
+src_install() {
+	insinto /usr/$(get_libdir)/pgplot
+	doins grfont.dat grexec.f grpckg1.inc rgb.txt
+
+	# FORTRAN libs
+	dolib.a libpgplot.a
+	dolib.so libpgplot.so
+	dosym libpgplot.so.5 /usr/$(get_libdir)/libpgplot.so
+	dobin pgxwin_server
+
+	# C binding
+	insinto /usr/include
+	doins cpgplot.h
+	dolib.a libcpgplot.a
+	# shared lib: todo eventually in a patch
+	# dolib.so libcpgplot.so
+	# dosym libcpgplot.so.5 /usr/$(get_libdir)/libcpgplot.so
+
+	# minimal doc
+	dodoc aaaread.me pgplot.doc
+
+	if use doc; then
+		dodoc cpg/cpgplot.doc applications/curvefit/curvefit.doc
+		dohtml pgplot.html
+		insinto /usr/share/doc/${PF}/examples
+		doins examples/* cpg/cpgdemo.c
+		insinto /usr/share/doc/${PF}/pgm
+		doins pgmf/* drivers/xmotif/pgmdemo.c
+	fi
+}