diff options
| -rw-r--r-- | sci-libs/plplot/ChangeLog | 8 | ||||
| -rw-r--r-- | sci-libs/plplot/Manifest | 15 | ||||
| -rw-r--r-- | sci-libs/plplot/files/digest-plplot-5.5.1 | 1 | ||||
| -rw-r--r-- | sci-libs/plplot/files/plplot-5.5.1-gcc-3.4-fix.patch | 24 | ||||
| -rw-r--r-- | sci-libs/plplot/plplot-5.5.1.ebuild | 172 |
5 files changed, 209 insertions, 11 deletions
diff --git a/sci-libs/plplot/ChangeLog b/sci-libs/plplot/ChangeLog index eb4bc9743109..ca93a9c3c011 100644 --- a/sci-libs/plplot/ChangeLog +++ b/sci-libs/plplot/ChangeLog @@ -1,6 +1,12 @@ # 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.1 2005/01/30 00:36:04 cryos Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/plplot/ChangeLog,v 1.2 2005/04/08 19:27:21 cryos Exp $ + +*plplot-5.5.1 (08 Apr 2005) + + 08 Apr 2005; Marcus D. Hanwell <cryos@gentoo.org> + +files/plplot-5.5.1-gcc-3.4-fix.patch, +plplot-5.5.1.ebuild: + Version bump. *plplot-5.3.1 (30 Jan 2005) diff --git a/sci-libs/plplot/Manifest b/sci-libs/plplot/Manifest index 68f8304862ce..26dab3db8b21 100644 --- a/sci-libs/plplot/Manifest +++ b/sci-libs/plplot/Manifest @@ -1,15 +1,10 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - +MD5 063cc71405f1b29f44e8b8a4b6151e1f plplot-5.5.1.ebuild 5549 MD5 063cc71405f1b29f44e8b8a4b6151e1f plplot-5.3.1.ebuild 5549 +MD5 d6e9867fc04fd7d9583df4805c9ae37c .plplot-5.3.1.ebuild.swp 16384 MD5 ba92a64caea6992d2c9b76b4f819f2e2 ChangeLog 622 +MD5 d41d8cd98f00b204e9800998ecf8427e .gmtcommands 0 MD5 c3b6ebfa4bc606e61260dba27014f49a metadata.xml 1063 +MD5 4349869753a76e74f49766463d85d594 files/plplot-5.5.1-gcc-3.4-fix.patch 1524 MD5 5eb32aa5083d7a3d753c95f64e7bc679 files/plplot-5.3.1-gcc-3.4-fix.patch 1554 MD5 7a1afddc57a8d11a2ee37e5dbd8b552e files/digest-plplot-5.3.1 65 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.2.6 (GNU/Linux) - -iD8DBQFB/CwJntT9W3vfTuoRAqYdAKCKBbHjTpUFQEu9Hpa3PBnjPoUhkwCeJgyE -2y5TSDx1UOeX39Zy/Tueu88= -=7kRc ------END PGP SIGNATURE----- +MD5 c345643d391a06e2dd4000f64e2abc14 files/digest-plplot-5.5.1 65 diff --git a/sci-libs/plplot/files/digest-plplot-5.5.1 b/sci-libs/plplot/files/digest-plplot-5.5.1 new file mode 100644 index 000000000000..2232bad49442 --- /dev/null +++ b/sci-libs/plplot/files/digest-plplot-5.5.1 @@ -0,0 +1 @@ +MD5 6fac3e8582769ebb1ce3faebfe5ce2d2 plplot-5.5.1.tar.gz 5874572 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 new file mode 100644 index 000000000000..d7e6acd7ba00 --- /dev/null +++ b/sci-libs/plplot/files/plplot-5.5.1-gcc-3.4-fix.patch @@ -0,0 +1,24 @@ +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 +@@ -75,7 +75,7 @@ + plplot_octave.cc tmp_stub: plplot_octave.h + $(PERL) $(MATWRAP) -language octave -o plplot_octave.cc -stub tmp_stub \ + -cpp_ignore $(srcdir) -cpp_ignore plplot_octave_rej.h -cpp $(CC) \ +- -E -I$(srcdir) -C plplot_octave.h ++ -D__builtin_va_list=void -E -I$(srcdir) -C plplot_octave.h + 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 +@@ -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 \ + @enable_octave_TRUE@ -cpp_ignore $(srcdir) -cpp_ignore plplot_octave_rej.h -cpp $(CC) \ +-@enable_octave_TRUE@ -E -I$(srcdir) -C plplot_octave.h ++@enable_octave_TRUE@ -D__builtin_va_list=void -E -I$(srcdir) -C plplot_octave.h + @enable_octave_TRUE@ mv -f plplot_octave.cc tmp_plplot_octave.cc + @enable_octave_TRUE@ sed 's/ string / std::string /' tmp_plplot_octave.cc > plplot_octave.cc + diff --git a/sci-libs/plplot/plplot-5.5.1.ebuild b/sci-libs/plplot/plplot-5.5.1.ebuild new file mode 100644 index 000000000000..fccf233dbf43 --- /dev/null +++ b/sci-libs/plplot/plplot-5.5.1.ebuild @@ -0,0 +1,172 @@ +# 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 $ + +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} + # 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 +} |