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

Package-Manager: portage-2.1.4.4

5 files changed, 40 insertions, 95 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/Manifest b/media-libs/plotutils/Manifest
index e9c3e7efcd40..3f3c0fa5b03a 100644
--- a/media-libs/plotutils/Manifest
+++ b/media-libs/plotutils/Manifest
@@ -1,9 +1,10 @@
 AUX plotutils-2.4.1-correct_test.patch 693 RMD160 1453686e3e776af2365621e18278fd741a58cfa3 SHA1 d7d2c958fefa31acffd79c43eb22628b4f58758d SHA256 028915dabef6c2885c344c9707815cdaef43d7522eb9844f8d7b403116ef91b9
 AUX plotutils-2.4.1-gentoo.patch 2619 RMD160 369fe57883906de848cc4dbf3ce87658ec5fa12a SHA1 eaa92cc7a0d83e61b2db4bdcf20dfb6f68a67e7c SHA256 c736cc1e56c2b0e87bd2974288d2da7b1f235ca161a4bf638e7c5fdaae752534
 AUX plotutils-2.4.1-rangecheck.patch 1858 RMD160 bd7e70840a7031fe85419be38d6d77dfde585f1b SHA1 d00a9d7067d3c22ae444213312e8f313923d8801 SHA256 79db278a29e1332bd2c1025d916906766032e30d9cf43a91ff6018a81f9a629c
+AUX plotutils-2.5-rangecheck.patch 1054 RMD160 55403e9c62f5a4e7b501c2a2edf3bc53bd6fa6e6 SHA1 03ab4724638e1201824dc24e069aecd6ee59e1f3 SHA256 f500b59d3262c54dcae740617a9c8b4fc3d1c64393f3735eb33feb6f1b08fd94
 DIST plotutils-2.4.1.tar.gz 3316030 RMD160 02dd8d914cc769e10beb2e556efb7fe76350370d SHA1 e39ce89048a578683ad76f3284bb79adfb0adc22 SHA256 117638fb606a2ab56147f7e72bc872f6a65eee492ff2430e1f9d614acae50668
-EBUILD plotutils-2.4.1-r2.ebuild 2611 RMD160 9cf577b363a21c05b830fa6bf65ecd729ce9389a SHA1 52f4bd4cb5a7003a08d2df3db88988ba4ee9c1dd SHA256 204f47173e18101f4a95d938ede516dc3f297e33d8e170d527924c5ab5b2c462
-EBUILD plotutils-2.4.1-r3.ebuild 2550 RMD160 1e02d58354d799ee99d09ad7c4a7505e9b6c135a SHA1 6f7fa483a70b4b6f141ae80f19cf33c7957d72aa SHA256 aec8e97a7cf07eb25858b39b322882bfa638430706c78209d6834439feedaf02
+DIST plotutils-2.5.tar.gz 3686955 RMD160 106ee9c827fc6eef99762f88afb0f85a42e2e300 SHA1 156c2a4d3a950d627ff2fb50dffe9a098cbc50a1 SHA256 b402546feb34f6762faf26aa7c621c6261f79d2eb4d9a2b26824855203c26826
 EBUILD plotutils-2.4.1-r4.ebuild 2615 RMD160 0f67113c6edee1119755d24a354c18cd2c79e4ad SHA1 4b8029b7076ee513400ffbf1f0eac13787e8e64c SHA256 1f8f22145369683bedc7bf04b7d2669bd1d02b9017b78a3a89a7ae99fe8e8bc2
-MISC ChangeLog 4898 RMD160 3c66410075765af60e63f7338b40bd94d47730c8 SHA1 c1bc510b0a67451376700b0c5db25468261bd140 SHA256 48659e4cb9fd78c4005d26090ce7f25506348264cff7c0b7bf7667f59f3a5a04
+EBUILD plotutils-2.5.ebuild 2506 RMD160 3a4aa4472286dade814ee2bfc34a61741517d2d4 SHA1 340b928625f895752fcc1028e7eb457d3c6bf828 SHA256 b97e86acd9fb30f9c7620ae509f145e6760583df499f9120b4f40c437c8f9703
+MISC ChangeLog 5174 RMD160 abb0b711443f74c89253d5d1c42cb6dab07b642c SHA1 012a5e1fd83b2c8f0b29c09b1a94b8c50ece035a SHA256 4fb4c4e6f262932a2428b4185da26e1ce32ba11bde77080384c0e1ff3f86ef14
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
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