fix test failures and added some quotes; stable x86, bug 115242

(Portage version: 2.1.2.2)

3 files changed, 34 insertions, 9 deletions

diff --git a/media-libs/plotutils/ChangeLog b/media-libs/plotutils/ChangeLog
index fe7fcddcbd50..83f4bd6bee92 100644
--- a/media-libs/plotutils/ChangeLog
+++ b/media-libs/plotutils/ChangeLog
@@ -1,6 +1,10 @@
 # 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.29 2007/02/05 20:13:57 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/plotutils/ChangeLog,v 1.30 2007/03/13 06:56:52 opfer Exp $
+
+  13 Mar 2007; Christian Faulhammer <opfer@gentoo.org>
+  +files/plotutils-2.4.1-correct_test.patch, plotutils-2.4.1-r4.ebuild:
+  fix test failures and added some quotes; stable x86, bug 115242
 
   05 Feb 2007; Jeroen Roovers <jer@gentoo.org> plotutils-2.4.1-r4.ebuild:
   Stable for HPPA (inkscape).
diff --git a/media-libs/plotutils/files/plotutils-2.4.1-correct_test.patch b/media-libs/plotutils/files/plotutils-2.4.1-correct_test.patch
new file mode 100644
index 000000000000..9dac9fba1ccb
--- /dev/null
+++ b/media-libs/plotutils/files/plotutils-2.4.1-correct_test.patch
@@ -0,0 +1,19 @@
+--- test/plot2ps.xout	2007-03-13 07:23:11.000000000 +0100
++++ /tmp/test/plot2ps.xout	2007-03-13 07:23:46.000000000 +0100
+@@ -1,7 +1,6 @@
+ %!PS-Adobe-3.0 EPSF-3.0
+ %%Creator: GNU libplot drawing library 4.1
+ %%Title: PostScript plot
+-%%CreationDate: Fri Jun 16 21:08:33 2000
+ %%DocumentData: Clean7Bit
+ %%LanguageLevel: 1
+ %%Pages: 1
+@@ -294,7 +293,7 @@
+ gsave
+ fgred fggreen fgblue setrgbcolor
+ /fontDict printFont findfont printSize scalefont dup setfont def
+-/descender fontDict begin 0 [FontBBox] 1 get FontMatrix end
++/descender fontDict begin 0 fontDict /FontBBox get 1 get FontMatrix end
+ transform exch pop def
+ /vertoffset 1 printSize sub descender sub def {
+ 0 vertoffset moveto show
diff --git a/media-libs/plotutils/plotutils-2.4.1-r4.ebuild b/media-libs/plotutils/plotutils-2.4.1-r4.ebuild
index 0605fa13b1fb..e3aeeb01b301 100644
--- a/media-libs/plotutils/plotutils-2.4.1-r4.ebuild
+++ b/media-libs/plotutils/plotutils-2.4.1-r4.ebuild
@@ -1,11 +1,11 @@
 # 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-r4.ebuild,v 1.2 2007/02/05 20:13:57 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/plotutils/plotutils-2.4.1-r4.ebuild,v 1.3 2007/03/13 06:56:52 opfer 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
+#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.
@@ -17,7 +17,7 @@ SRC_URI="ftp://ftp.gnu.org/gnu/plotutils/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 hppa ~ia64 ~ppc ~ppc-macos ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 hppa ~ia64 ~ppc ~ppc-macos ~ppc64 ~s390 ~sparc x86"
 IUSE="X"
 
 DEPEND="media-libs/libpng
@@ -30,9 +30,11 @@ 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.4.1-gentoo.patch"
+	epatch "${FILESDIR}/plotutils-2.4.1-rangecheck.patch"
+	epatch "${FILESDIR}/plotutils-2.4.1-correct_test.patch"
+
 }
 
 src_compile() {
@@ -56,7 +58,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