Bump to 2.5.1 (bug #238818) and fix test suite (bug #220251).

(Portage version: 2.2_rc14/cvs/Linux 2.6.27-gentoo-r2 x86_64)

4 files changed, 128 insertions, 1 deletions

diff --git a/media-libs/plotutils/ChangeLog b/media-libs/plotutils/ChangeLog
index 2fb9b72dfe09..bec480095adf 100644
--- a/media-libs/plotutils/ChangeLog
+++ b/media-libs/plotutils/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/plotutils
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/plotutils/ChangeLog,v 1.42 2008/10/15 13:13:23 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/plotutils/ChangeLog,v 1.43 2008/11/15 18:51:52 coldwind Exp $
+
+*plotutils-2.5.1 (15 Nov 2008)
+
+  15 Nov 2008; Santiago M. Mola <coldwind@gentoo.org>
+  +files/plotutils-2.5.1-fix-tests.patch,
+  +files/plotutils-2.5.1-rangecheck.patch, +plotutils-2.5.1.ebuild:
+  Bump to 2.5.1 (bug #238818) and fix test suite (bug #220251).
 
   15 Oct 2008; Alexis Ballier <aballier@gentoo.org> plotutils-2.5.ebuild:
   keyword ~x86-fbsd
diff --git a/media-libs/plotutils/files/plotutils-2.5.1-fix-tests.patch b/media-libs/plotutils/files/plotutils-2.5.1-fix-tests.patch
new file mode 100644
index 000000000000..889c2b2b374c
--- /dev/null
+++ b/media-libs/plotutils/files/plotutils-2.5.1-fix-tests.patch
@@ -0,0 +1,29 @@
+Source: Santiago M. Mola <coldwind@gentoo.org>
+Upstream: Sent.
+Reason: Reference test results are outdated.(Gentoo bug #238818).
+--- plotutils-2.5.1.orig/test/plot2ps.xout	2008-09-26 23:48:15.000000000 +0200
++++ plotutils-2.5.1/test/plot2ps.xout	2008-09-26 23:48:35.000000000 +0200
+@@ -1,5 +1,5 @@
+ %!PS-Adobe-3.0 EPSF-3.0
+-%%Creator: GNU libplot drawing library 4.2
++%%Creator: GNU libplot drawing library 4.3
+ %%Title: PostScript plot
+ %%CreationDate: Fri Dec  9 13:09:44 2005
+ %%DocumentData: Clean7Bit
+diff -ur plotutils-2.5.1.orig/test/plot2svg.xout plotutils-2.5.1/test/plot2svg.xout
+--- plotutils-2.5.1.orig/test/plot2svg.xout	2008-09-26 23:48:15.000000000 +0200
++++ plotutils-2.5.1/test/plot2svg.xout	2008-09-26 23:57:27.000000000 +0200
+@@ -2,10 +2,10 @@
+ <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+ <svg version="1.1" baseProfile="full" id="body" width="8in" height="8in" viewBox="0 0 1 1" preserveAspectRatio="none" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events">
+ <title>SVG drawing</title>
+-<desc>This was produced by version 4.2 of GNU libplot, a free library for exporting 2-D vector graphics.</desc>
++<desc>This was produced by version 4.3 of GNU libplot, a free library for exporting 2-D vector graphics.</desc>
+ <rect id="background" x="0" y="0" width="1" height="1" stroke="none" fill="white"/>
+-<g id="content" transform="translate(0,1) scale(1,-1) scale(0.00024414) " xml:space="preserve" stroke="black" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10.433" stroke-dasharray="none" stroke-dashoffset="0" stroke-opacity="1" fill="none" fill-rule="even-odd" fill-opacity="1" font-style="normal" font-variant="normal" font-weight="normal" font-stretch="normal" font-size-adjust="none" letter-spacing="normal" word-spacing="normal" text-anchor="start">
+-<text transform="translate(2048,3222.5) scale(1,-1) " font-family="Times-Roman,Times,serif" font-size="184.32px" text-anchor="middle" alignment-baseline="text-after-edge" stroke="none" fill="black" >A Sample Plot</text>
++<g id="content" transform="translate(0,1) scale(1,-1) scale(0.00024414) " xml:space="preserve" stroke="black" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10.433" stroke-dasharray="none" stroke-dashoffset="0" stroke-opacity="1" fill="none" fill-rule="evenodd" fill-opacity="1" font-style="normal" font-variant="normal" font-weight="normal" font-stretch="normal" font-size-adjust="none" letter-spacing="normal" word-spacing="normal" text-anchor="start">
++<text transform="translate(2048,3262.7) scale(1,-1) scale(9.216) " font-family="Times-Roman,Times,serif" font-size="20px" text-anchor="middle" stroke="none" fill="black" >A Sample Plot</text>
+ <rect x="1024" y="1024" width="2048" height="2048" stroke-width="4.8188" />
+ <polyline points="1001.7,946.04 1001.7,886.46 994.21,882.73 " stroke-width="5.2876" stroke-linecap="round" stroke-linejoin="round" />
+ <polyline points="1005.4,942.31 1005.4,886.46 1016.6,879.01 " stroke-width="5.2876" stroke-linecap="round" stroke-linejoin="round" />
diff --git a/media-libs/plotutils/files/plotutils-2.5.1-rangecheck.patch b/media-libs/plotutils/files/plotutils-2.5.1-rangecheck.patch
new file mode 100644
index 000000000000..84b295913556
--- /dev/null
+++ b/media-libs/plotutils/files/plotutils-2.5.1-rangecheck.patch
@@ -0,0 +1,14 @@
+Source: Steve Tell (http://lists.gnu.org/archive/html/bug-gnu-utils/2003-12/msg00023.html)
+Upstream: Sent in 2003, not applied yet.
+Reason: Gentoo bug #47688
+--- plotutils-2.5.1.orig/graph/plotter.c	2008-09-26 23:48:15.000000000 +0200
++++ plotutils-2.5.1/graph/plotter.c	2008-11-08 13:10:14.000000000 +0100
+@@ -1011,7 +1011,7 @@
+   multigrapher->x_trans.output_min = 0.0;
+   multigrapher->x_trans.output_max = (double)PLOT_SIZE;
+   multigrapher->x_trans.output_range = multigrapher->x_trans.output_max - multigrapher->x_trans.output_min;
+-  multigrapher->x_trans.output_min = 0.0;
++  multigrapher->y_trans.output_min = 0.0;
+   multigrapher->y_trans.output_max = (double)PLOT_SIZE;
+   multigrapher->y_trans.output_range = multigrapher->y_trans.output_max - multigrapher->y_trans.output_min;
+ 
diff --git a/media-libs/plotutils/plotutils-2.5.1.ebuild b/media-libs/plotutils/plotutils-2.5.1.ebuild
new file mode 100644
index 000000000000..90eb5bef3537
--- /dev/null
+++ b/media-libs/plotutils/plotutils-2.5.1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/plotutils/plotutils-2.5.1.ebuild,v 1.1 2008/11/15 18:51:52 coldwind Exp $
+
+inherit libtool eutils flag-o-matic
+
+#The plotutils package contains extra X fonts.	These fonts are not installed
+#in the current ebuild.	 The commented out ebuild lines below are for future
+#reference when this ebuild may be updated to install the fonts.
+#NOTE: The current method does not play nice with X and sandbox.  Most of the
+#font installation procedures should probably be moved to pkg_postinst.
+#See Bug# 30 at http://bugs.gentoo.org/show_bug.cgi?id=30
+
+DESCRIPTION="a powerful C/C++ function library for exporting 2-D vector graphics"
+HOMEPAGE="http://www.gnu.org/software/plotutils/"
+SRC_URI="mirror://gnu/plotutils/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd"
+IUSE="X"
+
+DEPEND="media-libs/libpng
+	X? ( x11-libs/libXaw
+		x11-proto/xextproto
+	)"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-rangecheck.patch"
+	epatch "${FILESDIR}/${P}-fix-tests.patch"
+	elibtoolize
+}
+
+src_compile() {
+	# bug #14488
+	replace-cpu-flags k6 k6-2 k6-3 i586
+
+	#enable build of C++ version
+	local myconf="--enable-libplotter"
+
+	#The following two additional configure options may be of interest
+	#to users with specific printers, i.e. HP LaserJets with PCL 5 or HP-GL/2.
+	#Not sure if enabling screws the pooch for those without these printers.
+	#--enable-ps-fonts-in-pcl --enable-lj-fonts-in-ps
+
+	use X \
+		&& myconf="${myconf} --with-x --enable-libxmi" \
+		|| myconf="${myconf} --without-x"
+
+	econf ${myconf} || die "./configure failed"
+	emake || die "Parallel Make Failed"
+}
+
+src_install() {
+	einstall datadir="${D}/usr/share" || die "Installation Failed"
+
+	dodoc AUTHORS COMPAT ChangeLog INSTALL* \
+		KNOWN_BUGS NEWS ONEWS PROBLEMS README THANKS TODO
+}
+
+pkg_postinst() {
+	if use X; then
+		elog "There are extra fonts available in plotutils package."
+		elog "The current ebuild does not install them for you."
+		elog "You may want to do so, but you will have to do it"
+		elog "manually. You are on your own for now."
+		elog "See /usr/share/doc/${P}/INSTALL.fonts"
+		elog ""
+		elog "If you manually install the extra fonts and use the"
+		elog "program xfig, you might want to recompile to take"
+		elog "advantage of the additional ps fonts."
+		elog "Also, it is possible to enable ghostscript and possibly"
+		elog "your printer to use the HP fonts."
+	fi
+}