Version bump thanks to Tobias Minich. bug #85907

(Portage version: 2.0.51.22-r1)

5 files changed, 337 insertions, 12 deletions

diff --git a/media-libs/ploticus/ChangeLog b/media-libs/ploticus/ChangeLog
index fefa45a8d848..9710d8251fb4 100644
--- a/media-libs/ploticus/ChangeLog
+++ b/media-libs/ploticus/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/ploticus
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/ploticus/ChangeLog,v 1.1 2005/01/24 09:08:58 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/ploticus/ChangeLog,v 1.2 2005/07/16 05:50:21 dragonheart Exp $
+
+*ploticus-2.31 (16 Jul 2005)
+
+  16 Jul 2005; Daniel Black <dragonheart@gentoo.org> +files/pl231src.patch,
+  +ploticus-2.31.ebuild:
+  Version bump thanks to Tobias Minich. bug #85907
 
 *ploticus-2.30 (24 Jan 2005)
 
diff --git a/media-libs/ploticus/Manifest b/media-libs/ploticus/Manifest
index 473b8d13d99a..ce3d8fa252f8 100644
--- a/media-libs/ploticus/Manifest
+++ b/media-libs/ploticus/Manifest
@@ -1,16 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 92797bcb47c13ca4661d0ed2de6de765 metadata.xml 832
 MD5 8149fece39504036eda5e55f8b1331f7 ploticus-2.30.ebuild 3868
-MD5 8a20e2463f1740b034bc6b1fc3af208a ChangeLog 479
+MD5 bd6e6e207f33552c87ec9b698bc4c8c8 ChangeLog 662
+MD5 04c952e27c7567bfb25492b291e2f241 ploticus-2.31.ebuild 4061
 MD5 bfc66e7cb49aceece8fe2c25a022b7c6 files/11ploticus 47
 MD5 7e62aeab46857cc9d3f9b4678476dc98 files/digest-ploticus-2.30 60
 MD5 24f51384258b69ce8e94bd28c9814370 files/pl230src.patch 5532
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFB9LtVmdTrptrqvGERAvXQAJ9W/GKUtc7Kr34I42c3NMfsI/4IpwCeIRpM
-/Ed6pdCxDCJC4AafaX0U32g=
-=o7VE
------END PGP SIGNATURE-----
+MD5 4a69c9d66d8e90c187efe21f77bcb494 files/pl231src.patch 6185
+MD5 dad8b1e68cbc5385a3f936a2d96083e8 files/digest-ploticus-2.31 124
diff --git a/media-libs/ploticus/files/digest-ploticus-2.31 b/media-libs/ploticus/files/digest-ploticus-2.31
new file mode 100644
index 000000000000..223a317097e4
--- /dev/null
+++ b/media-libs/ploticus/files/digest-ploticus-2.31
@@ -0,0 +1,2 @@
+MD5 70712f7f41484db3bfd9210ae7742762 pl231src.tar.gz 443596
+MD5 4f1619a1f3a13202c8fba3835bfaf7a1 pl231src-09.patch.bz2 6022
diff --git a/media-libs/ploticus/files/pl231src.patch b/media-libs/ploticus/files/pl231src.patch
new file mode 100644
index 000000000000..f44d429bd71e
--- /dev/null
+++ b/media-libs/ploticus/files/pl231src.patch
@@ -0,0 +1,171 @@
+diff -ru pl231src.orig/src/Makefile pl231src/src/Makefile
+--- pl231src.orig/src/Makefile	2005-02-03 22:17:43.000000000 +0100
++++ pl231src/src/Makefile	2005-06-01 14:58:22.000000000 +0200
+@@ -123,11 +123,11 @@
+ #### For PNG (only) uncomment the following.. (this will use a version of GD that comes
+ #### bundled with ploticus; you need to have libpng and zlib ).  Set GD16H if your
+ #### png.h or other header files are in a nonstandard place, eg GD16H = -I/home/scg/lib
+-ploticus: plpng 
+-PLPNG = pl 
+-GD16LIBS = -lpng -lz
+-GD16H = 
+-ZFLAG = -DWZ
++# ploticus: plpng 
++# PLPNG = pl 
++# GD16LIBS = -lpng -lz
++# GD16H = 
++# ZFLAG = -DWZ
+ 
+ 
+ #### For pseudo-GIF (only) uncomment the following..  (this will use a version of GD that
+@@ -149,18 +149,18 @@
+ ####  uncomment the following.. (gd 1.84+, libpng, zlib, libjpeg required).  Set GD18H if your 
+ #### png.h or other header files are in a nonstandard place, eg GD18H = -I/home/scg/lib
+ 
+-# ploticus: plgd18 
+-# GD18LIBS = -lgd -lpng -lz -ljpeg 
+-# GD18H = 
++#ploticus: plgd18
++#GD18LIBS = -lgd -lpng -lz -ljpeg -lfreetype 
++#GD18H = 
+ # GDFREETYPE = 
+-# ZFLAG = -DWZ
++#ZFLAG = -DWZ
+ 
+ 
+ #### For JPEG, WBMP, PNG, and FreeType2, using your copy of GD 1.84+,          ######
+ #### uncomment the following..  (gd 1.84+, libpng, zlib, libjpeg, libfreetype  ######
+ #### are all required).  Set GDFONTPATH to directory containing .ttf files     ######
+-# ploticus: plgd18 
+-# GD18LIBS = -lgd -lpng -lz -ljpeg -lfreetype
++#ploticus: plgd18
++# GD18LIBS = -lgd -lpng -lz -ljpeg -lfreetype -lfreetype
+ # GD18H = 
+ # GDFREETYPE = -DGDFREETYPE
+ # ZFLAG = -DWZ
+@@ -170,6 +170,10 @@
+ # ploticus: plnogd 
+ # NOGDFLAG = -DNOGD
+ 
++EXE=pl
++ploticus: $(EXE)
++
++
+ 
+ 
+ ################################################################
+@@ -186,11 +190,11 @@
+ # MINGH = -I/home/scg/lib
+ ####
+ #### Otherwise, for no SWF capability, uncomment the following line..
+-NOSWFFLAG = -DNOSWF 
++# NOSWFFLAG = -DNOSWF 
+ 
+ 
+ #### If you plan to do a "make install", where do you want the executable(s) to be moved to?
+-BIN = /usr/local/bin
++BIN = /usr/bin
+ 
+ 
+ #### To set a hard-coded directory for prefabs files, uncomment & edit the following.. 
+@@ -260,8 +264,8 @@
+ 
+ LIBS = $(XLIBS) -lm $(ADDLIBS) 
+ 
+-CFLAGS = $(WALL) -DPLOTICUS -D$(PLATFORM) -DTDH_NOREC $(ZFLAG) $(FLAGS) $(LOCALE_FLAG) \
+-  $(NOGDFLAG) $(NOXFLAG) $(NOPSFLAG) $(NOSVGFLAG) $(NOSWFFLAG) $(INCLUDEDIRS) \
++CFLAGS += $(WALL) -DPLOTICUS -D$(PLATFORM) -DTDH_NOREC $(ZFLAG) $(FLAGS) $(LOCALE_FLAG) \
++  $(GDLEVEL) $(NOGDFLAG) $(NOXFLAG) $(NOPSFLAG) $(NOSVGFLAG) $(NOSWFFLAG) $(INCLUDEDIRS) \
+   $(MINGH) $(NORLIMFLAG) -DPREFABS_DIR=\"$(PREFABS_DIR)\"
+ 
+ OBJ = proc_annotate.o proc_areadef.o proc_axis.o proc_bars.o proc_rect.o proc_breakaxis.o \
+@@ -277,39 +281,39 @@
+   $(LOCALEOBJ)
+ 
+ pl: pl.o $(OBJ) $(XOBJ) gd00files gd13files
+-	$(CC) pl.o $(FLAGS) $(OBJ) $(GD13) $(GD) $(XOBJ) $(LIBS) $(ZLIB) $(MING) -o $(PL)
++	$(CC) pl.o $(CFLAGS) $(OBJ) $(GD13) $(GD) $(XOBJ) $(LIBS) $(ZLIB) $(MING) -o $(PL)
+ 
+ plpng: pl.o $(OBJ) $(XOBJ) gd00files gd16files
+-	$(CC) pl.o $(FLAGS) $(OBJ) $(GD16) $(GD) $(XOBJ) $(GD16LIBS) $(LIBS) $(MING) -o $(PLPNG)
++	$(CC) pl.o $(CFLAGS) $(OBJ) $(GD16) $(GD) $(XOBJ) $(GD16LIBS) $(LIBS) $(MING) -o $(PLPNG)
+ 
+ gd00files: 
+-	$(CC) -I./gd13 -I./ -c gdfontg.c gdfontl.c gdfontmb.c gdfonts.c gdfontt.c
++	$(CC) $(CFLAGS) -I./gd13 -I./ -c gdfontg.c gdfontl.c gdfontmb.c gdfonts.c gdfontt.c
+ 	echo "done with gd00files" > gd00files
+ 
+ gd13files: 
+-	$(CC) -c $(WALL) grgd.c -DGD13 -DPLOTICUS -I./gd13 -o grgd13.o
++	$(CC) -c $(CFLAGS) $(WALL) grgd.c -DGD13 -DPLOTICUS -I./gd13 -o grgd13.o
+ 	$(CC) -c $(CFLAGS) devstuff.c -DGD13 -o devstuff13.o
+-	$(CC) -c gd13.c -I./gd13 
++	$(CC) -c $(CFLAGS) gd13.c -I./gd13 
+ 	echo "done with gd13files" > gd13files
+ 
+ gd16files: 
+-	$(CC) -c $(WALL) grgd.c -DGD16 -DPLOTICUS -I./ -I./gd16 -o grgd16.o
++	$(CC) -c $(CFLAGS) $(WALL) grgd.c -DGD16 -DPLOTICUS -I./ -I./gd16 -o grgd16.o
+ 	$(CC) -c $(CFLAGS) devstuff.c -DGD16 -o devstuff16.o
+-	$(CC) -c -I./gd16 -I./ $(GD16H) gd16.c gd_io.c gd_io_dp.c gd_io_file.c gd_png.c
++	$(CC) -c $(CFLAGS) -I./gd16 -I./ $(GD16H) gd16.c gd_io.c gd_io_dp.c gd_io_file.c gd_png.c
+ 	echo "done with gd16files" > gd16files
+ 
+ # GD18: 
+ plgd18: pl.o $(OBJ) $(XOBJ) gd18files
+-	$(CC) $(FLAGS) pl.o grgd.o devstuff.o $(OBJ) $(XOBJ) $(GD18LIBS) $(LIBS) $(MING) -o $(PL)
++	$(CC) $(CFLAGS) pl.o grgd.o devstuff.o $(OBJ) $(XOBJ) $(GD18LIBS) $(LIBS) $(MING) -o $(PL)
+ 
+ gd18files:
+-	$(CC) -c $(WALL) grgd.c devstuff.c -DGD18 $(GDFREETYPE) $(GD18H) $(CFLAGS)
++	$(CC) -c $(CFLAGS) $(WALL) grgd.c devstuff.c -DGD18 $(GDFREETYPE) $(GD18H)
+ 
+ 
+ 
+ # NOGD: 
+ plnogd: pl.o $(OBJ) $(XOBJ) nogdfiles
+-	$(CC) $(FLAGS) pl.o devstuff.o $(OBJ) $(XOBJ) $(LIBS) $(ZLIB) $(MING) -o $(PL)
++	$(CC) $(CFLAGS) pl.o devstuff.o $(OBJ) $(XOBJ) $(LIBS) $(ZLIB) $(MING) -o $(PL)
+ 
+ nogdfiles:
+ 	$(CC) -c $(WALL) devstuff.c $(CFLAGS)
+@@ -317,7 +321,7 @@
+ 
+ 
+ install:
+-	mv $(EXE) $(BIN)
++	mv $(EXE) $(DESTDIR)$(BIN)
+ 
+ clean:
+ 	$(RMCOM) *.o gd??files 
+diff -ru pl231src.orig/src/functions.c pl231src/src/functions.c
+--- pl231src.orig/src/functions.c	2005-01-12 21:25:45.000000000 +0100
++++ pl231src/src/functions.c	2005-06-01 15:11:22.000000000 +0200
+@@ -636,7 +636,7 @@
+ 
+ 	if( hash == 1708 ) { /* $htmldisplay( var1, .. varN ) - convert embedded HTML problem chars (<,>,&) 
+ 			      * to their html esc sequences for all variables given */
+-		char *strchr();
++		//char *strchr();
+ 		for( i = 0; i < nargs; i++ ) {
+         		stat = TDH_getvalue( tok, arg[i], TDH_dat, TDH_recid );
+ 			if( strchr( tok, '&' ) != NULL ) GL_substitute( "&", "&amp;", tok );
+diff -ru pl231src.orig/src/interact.c pl231src/src/interact.c
+--- pl231src.orig/src/interact.c	2005-01-12 21:28:57.000000000 +0100
++++ pl231src/src/interact.c	2005-06-01 14:58:22.000000000 +0200
+@@ -71,6 +71,7 @@
+ /* =================================== */
+ /* GETCLICK wait until a key or button is hit.. */
+ /* when using postscript, this will do a showpage and return. */
++#ifndef NOX11
+ int
+ PLG_getclick()
+ {
+@@ -87,6 +88,7 @@
+ 
+ return( Egetkey( &x, &y, &e ) );
+ }
++#endif
+ 
+ /* ================================ */
+ /* HE This gets called by the X11 driver when we are waiting for an event 
diff --git a/media-libs/ploticus/ploticus-2.31.ebuild b/media-libs/ploticus/ploticus-2.31.ebuild
new file mode 100644
index 000000000000..b5252e07f694
--- /dev/null
+++ b/media-libs/ploticus/ploticus-2.31.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/ploticus/ploticus-2.31.ebuild,v 1.1 2005/07/16 05:50:21 dragonheart Exp $
+
+inherit eutils toolchain-funcs
+
+MY_P=pl${PV/./}src
+
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="A command line application for producing graphs and charts"
+HOMEPAGE="http://ploticus.sourceforge.net"
+SRC_URI="http://ploticus.sourceforge.net/download/${MY_P}.tar.gz
+	mirror://gentoo/${MY_P}-09.patch.bz2"
+LICENSE="GPL-2"
+SLOT=0
+KEYWORDS="~x86"
+IUSE="gd flash nls cpulimit svg svgz truetype X"
+DEPEND="media-libs/libpng
+	gd? ( >=media-libs/gd-1.84 media-libs/jpeg )
+	flash? ( =media-libs/ming-0.2a )
+	truetype? ( =media-libs/freetype-2* )
+	X? ( virtual/x11 )"
+
+src_unpack() {
+	unpack ${A}
+	# Fixes a problem with NOX11.
+	# Changes the install directory and comments all flash and gd-related
+	# options. (These options will be selectively uncommented later.)
+	epatch ${FILESDIR}/${MY_P}.patch
+
+	# Patch to posrelease 09
+	epatch ${MY_P}-09.patch
+
+	# I need more vars ^^'
+	cd ${MY_P}/src
+	sed -i "s/#define MAXVAR 200/#define MAXVAR 2000/" tdhkit.h
+}
+
+src_compile() {
+	cd src
+	# ploticus may be compiled using the external libgd, a libgd provided with
+	# the package, or no gd support at all.
+
+	local MO=""
+	if useq gd; then
+		# PNG and JPEG are supported by default.
+		GD18LIBS="-lgd -lpng -lz -ljpeg"
+		# Note that truetype works only with the external gd lib.
+		if useq truetype; then
+			GD18LIBS="${GD18LIBS} -lfreetype"
+			MO="${MO} GDFREETYPE=-DGDFREETYPE"
+		fi
+		# Set the graphics formats support.
+		# Use the external libgd.
+		MO="${MO} ZFLAG=-DWZ GD18H= GD16H= GDLEVEL=-DGD18=1 plgd18"
+		EXE="plpng"
+		GD16LIBS="${GD18LIBS}"
+		GD18LIBS="${GD18LIBS}"
+
+	else
+		# No support for libgd at all.
+		# Note that gif and truetype do not work without gd.
+		EXE=plnogd
+		MO="${MO} NOGDFLAG=-DNOGD"
+		GD16LIBS=
+		GD18LIBS=
+	fi
+
+	# Support for non-roman alphabets and collation.
+	if useq nls; then
+		MO="${MO} LOCALEOBJ=localef.o LOCALE_FLAG=-DLOCALE"
+	fi
+
+	# Support for compressed or uncompressed svg. svgz implies svg. If the 
+	# external gd library is used, the svgz format will always be available if
+	# ploticus was compiled with support for svg (even if the svgz flag was not
+	# specified and even if the -svgz flag was used).
+	if useq svgz; then
+		MO="${MO} ZLIB=-lz ZFLAG=-DWZ"
+	elif ! useq svg; then
+		MO="${MO} NOSVGFLAG=-DNOSVG"
+	fi
+
+	# Support for X11 output.
+	if ! useq X; then
+		MO="${MO} NOXFLAG=-DNOX11 XLIBS= XOBJ="
+	fi
+
+	# Support for Flash output.
+	if useq flash; then
+		MO="${MO} MING=-lming"
+	else
+		MO="${MO} NOSWFFLAG=-DNOSWF"
+	fi
+
+	# Support for limiting CPU utilization. (Enabled by default.)
+	if ! useq cpulimit; then
+		MO="${MO} NORLIMFLAG=-DNORLIMIT"
+	fi
+	emake "CC=$(tc-getCC)" ${MO} EXE="${EXE}" GD18LIBS="${GD18LIBS}" \
+		GD16LIBS="${GD16LIBS}" \
+		PREFABS_DIR=/usr/share/ploticus/prefabs ploticus || die
+}
+
+src_test() {
+	cd ${S}/pltestsuite
+	export PATH="${S}/src:${PATH}"
+	#sed -i -e "s:PL=.*:PL=${S}/src/pl:" run_script_test
+	local TESTS="gif png jpeg eps"
+	useq svg && TESTS="${TESTS} svg"
+	useq svgz && TESTS="${TESTS} svgz"
+	for TEST in ${TESTS};
+	do
+		echo "Testing ${TEST}"
+		echo -e "${TEST}\n" | ./run_script_test
+		cat Diag.out
+	done
+}
+
+src_install() {
+	dodoc README
+	cd ${S}/src
+	mkdir -p ${D}usr/bin
+	if useq gd; then
+		EXE="pl plpng"
+	else
+		EXE=pl
+	fi
+	emake DESTDIR=${D} EXE="${EXE}" install || die
+
+	PL_TARGET=/usr/share/${PN}
+	insinto ${PL_TARGET}/prefabs
+	doins ${S}/prefabs/*
+	insinto ${PL_TARGET}/testsuite
+	doins ${S}/pltestsuite/*
+
+	# Add the PLOTICUS_PREFABS environment variable
+	#dodir /etc/env.d
+	#echo -e "PLOTICUS_PREFABS=${PL_TARGET}/prefabs" > ${D}/etc/env.d/11ploticus
+
+}
+
+#pkg_postinst() {
+#	einfo "The environment has been set up for Ploticus to find the prefab files."
+#	einfo "In order to immediately activate these settings please do:"
+#	einfo ""
+#	einfo " env-update"
+#	einfo " source /etc/profile"
+#	einfo ""
+#	einfo "Otherwise the setting will become active at next login."
+#
+#}
+