Version bump thnks to Hanno Meyer-Thurow <h.mth@web.de> in bug 213188

(Portage version: 2.1.4.4)

4 files changed, 36 insertions, 92 deletions

diff --git a/media-libs/plotutils/ChangeLog b/media-libs/plotutils/ChangeLog
index 7915e201e08c..b3528b7e8458 100644
--- a/media-libs/plotutils/ChangeLog
+++ b/media-libs/plotutils/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/plotutils
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/plotutils/ChangeLog,v 1.40 2007/07/22 09:33:22 dberkholz Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/plotutils/ChangeLog,v 1.41 2008/04/05 12:47:47 genstef Exp $
+
+*plotutils-2.5 (05 Apr 2008)
+
+  05 Apr 2008; Stefan Schweizer <genstef@gentoo.org>
+  +files/plotutils-2.5-rangecheck.patch, -plotutils-2.4.1-r2.ebuild,
+  -plotutils-2.4.1-r3.ebuild, +plotutils-2.5.ebuild:
+  Version bump thnks to Hanno Meyer-Thurow <h.mth@web.de> in bug 213188
 
   22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
   plotutils-2.4.1-r2.ebuild, plotutils-2.4.1-r3.ebuild,
diff --git a/media-libs/plotutils/files/plotutils-2.5-rangecheck.patch b/media-libs/plotutils/files/plotutils-2.5-rangecheck.patch
new file mode 100644
index 000000000000..16dd2cd07738
--- /dev/null
+++ b/media-libs/plotutils/files/plotutils-2.5-rangecheck.patch
@@ -0,0 +1,19 @@
+*** plotutils-2.4.1/graph/plotter.c.orig	Thu Mar  2 22:05:24 2000

+--- plotutils-2.4.1/graph/plotter.c	Tue Apr 29 01:48:09 2003

+***************

+*** 1045,1051 ****

+    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_max = (double)PLOT_SIZE;

+    multigrapher->y_trans.output_range = multigrapher->y_trans.output_max - multigrapher->y_trans.output_min;

+  

+--- 1045,1051 ----

+    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->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.4.1-r2.ebuild b/media-libs/plotutils/plotutils-2.4.1-r2.ebuild
deleted file mode 100644
index f10b066233a4..000000000000
--- a/media-libs/plotutils/plotutils-2.4.1-r2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/plotutils/plotutils-2.4.1-r2.ebuild,v 1.27 2007/07/22 09:33:22 dberkholz Exp $
-
-IUSE="X"
-
-inherit libtool eutils
-
-#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"
-SRC_URI="mirror://gnu/plotutils/${P}.tar.gz"
-HOMEPAGE="http://www.gnu.org/software/plotutils/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc alpha amd64 ia64"
-
-DEPEND="media-libs/libpng
-	X? ( x11-libs/libXaw
-		x11-proto/xextproto
-	)"
-
-# Filter out k6 from the CFLAGS
-export CFLAGS="${CFLAGS/k6-3/i586}"
-export CFLAGS="${CFLAGS/k6-2/i586}"
-export CFLAGS="${CFLAGS/k6/i586}"
-export CXXFLAGS="${CFLAGS}"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/plotutils-2.4.1-gentoo.patch
-}
-
-src_compile() {
-	elibtoolize
-
-	#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 COPYING 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
-}
diff --git a/media-libs/plotutils/plotutils-2.4.1-r3.ebuild b/media-libs/plotutils/plotutils-2.5.ebuild
index 8cc89ab8428f..b8a87c16dbeb 100644
--- a/media-libs/plotutils/plotutils-2.4.1-r3.ebuild
+++ b/media-libs/plotutils/plotutils-2.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# 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.4.1-r3.ebuild,v 1.20 2007/07/22 09:33:22 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/plotutils/plotutils-2.5.ebuild,v 1.1 2008/04/05 12:47:47 genstef Exp $
 
 inherit libtool eutils flag-o-matic
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://gnu/plotutils/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="X"
 
 DEPEND="media-libs/libpng
@@ -27,13 +27,13 @@ DEPEND="media-libs/libpng
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/plotutils-2.4.1-gentoo.patch
-	epatch ${FILESDIR}/plotutils-2.4.1-rangecheck.patch
+	cd "${S}"
+	epatch "${FILESDIR}/plotutils-2.5-rangecheck.patch"
+
 }
 
 src_compile() {
-	replace-cpu-flags i586 k6 k6-2 k6-3
+	replace-cpu-flags k6 k6-2 k6-3 i586
 	elibtoolize
 
 	#enable build of C++ version
@@ -53,7 +53,7 @@ src_compile() {
 }
 
 src_install() {
-	einstall datadir=${D}/usr/share || die "Installation Failed"
+	einstall datadir="${D}/usr/share" || die "Installation Failed"
 
 	dodoc AUTHORS COMPAT ChangeLog INSTALL* \
 		KNOWN_BUGS NEWS ONEWS PROBLEMS README THANKS TODO