From 430e9c7e446c9b58fbc4f6a31733ef8377f914a7 Mon Sep 17 00:00:00 2001 From: Christian Faulhammer Date: Tue, 13 Mar 2007 06:56:52 +0000 Subject: [PATCH] fix test failures and added some quotes; stable x86, bug 115242 Package-Manager: portage-2.1.2.2 --- media-libs/plotutils/ChangeLog | 6 +++- media-libs/plotutils/Manifest | 30 ++++++++++++++----- .../files/plotutils-2.4.1-correct_test.patch | 19 ++++++++++++ .../plotutils/plotutils-2.4.1-r4.ebuild | 18 ++++++----- 4 files changed, 56 insertions(+), 17 deletions(-) create mode 100644 media-libs/plotutils/files/plotutils-2.4.1-correct_test.patch 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 + +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 plotutils-2.4.1-r4.ebuild: Stable for HPPA (inkscape). diff --git a/media-libs/plotutils/Manifest b/media-libs/plotutils/Manifest index e5f866e72c8f..fbde9037df62 100644 --- a/media-libs/plotutils/Manifest +++ b/media-libs/plotutils/Manifest @@ -1,3 +1,10 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +AUX plotutils-2.4.1-correct_test.patch 693 RMD160 1453686e3e776af2365621e18278fd741a58cfa3 SHA1 d7d2c958fefa31acffd79c43eb22628b4f58758d SHA256 028915dabef6c2885c344c9707815cdaef43d7522eb9844f8d7b403116ef91b9 +MD5 0007d04a762cd9e580a62909d7e8be15 files/plotutils-2.4.1-correct_test.patch 693 +RMD160 1453686e3e776af2365621e18278fd741a58cfa3 files/plotutils-2.4.1-correct_test.patch 693 +SHA256 028915dabef6c2885c344c9707815cdaef43d7522eb9844f8d7b403116ef91b9 files/plotutils-2.4.1-correct_test.patch 693 AUX plotutils-2.4.1-gentoo.patch 2619 RMD160 369fe57883906de848cc4dbf3ce87658ec5fa12a SHA1 eaa92cc7a0d83e61b2db4bdcf20dfb6f68a67e7c SHA256 c736cc1e56c2b0e87bd2974288d2da7b1f235ca161a4bf638e7c5fdaae752534 MD5 37137ec05ee56b449d60098e9dd9c6e9 files/plotutils-2.4.1-gentoo.patch 2619 RMD160 369fe57883906de848cc4dbf3ce87658ec5fa12a files/plotutils-2.4.1-gentoo.patch 2619 @@ -15,14 +22,14 @@ EBUILD plotutils-2.4.1-r3.ebuild 2618 RMD160 3c4ad5853610c83bc1f92fd05417fc2b178 MD5 3dbd9b9fda75cb50f912f5649be545c8 plotutils-2.4.1-r3.ebuild 2618 RMD160 3c4ad5853610c83bc1f92fd05417fc2b17837ca1 plotutils-2.4.1-r3.ebuild 2618 SHA256 5dfd0a74bc6ef5d57b421be519ee02eeee7db68e8a5b78d97925a397b8c2c2b5 plotutils-2.4.1-r3.ebuild 2618 -EBUILD plotutils-2.4.1-r4.ebuild 2622 RMD160 04e79ba8a58c4492ca36a4c365e0702d48dd0b9c SHA1 f59da0d0c239640e22761c0bfea7c72a41b0ee24 SHA256 ac09a98bd9b53f2100473e5b3410f1430a71db9a6e5b3d6f962f0e7a12c88992 -MD5 b8bf4a415b3c9fe3b911d1cd41a6a260 plotutils-2.4.1-r4.ebuild 2622 -RMD160 04e79ba8a58c4492ca36a4c365e0702d48dd0b9c plotutils-2.4.1-r4.ebuild 2622 -SHA256 ac09a98bd9b53f2100473e5b3410f1430a71db9a6e5b3d6f962f0e7a12c88992 plotutils-2.4.1-r4.ebuild 2622 -MISC ChangeLog 3373 RMD160 cf58a151c9f96d2957849ae15e98dcc37bee7b1e SHA1 7a5ac0664bf270f01db11f635cb2bb82573240c5 SHA256 db3e48089d6a568b601cdce10414f87546188e125b8f2d7c9b0042134bc1918e -MD5 21d6669602a215ed8e2b191440c3396c ChangeLog 3373 -RMD160 cf58a151c9f96d2957849ae15e98dcc37bee7b1e ChangeLog 3373 -SHA256 db3e48089d6a568b601cdce10414f87546188e125b8f2d7c9b0042134bc1918e ChangeLog 3373 +EBUILD plotutils-2.4.1-r4.ebuild 2688 RMD160 d7025954561e13394844acc73a097aef7433f60b SHA1 214f7f53600ab45459ba6f5b407d8bfdffc823ab SHA256 5cd656950fadcd311b6221b02079884ed109f254faaf3fa5dc1879bcfd394e5e +MD5 71f29107fb98b204ae01bbaa58276a16 plotutils-2.4.1-r4.ebuild 2688 +RMD160 d7025954561e13394844acc73a097aef7433f60b plotutils-2.4.1-r4.ebuild 2688 +SHA256 5cd656950fadcd311b6221b02079884ed109f254faaf3fa5dc1879bcfd394e5e plotutils-2.4.1-r4.ebuild 2688 +MISC ChangeLog 3569 RMD160 71890bec5b096765818ac4b644b2a7ec124aa164 SHA1 6c80ca4a49a1c163ca602e40535ebe84b8865b9a SHA256 02fda3ae03f9cc4f6f4afaba6156e53954f78b069bfa7f6d96c5113f3eae7e0b +MD5 864a6e8db31dabb8ec595aaf24aa3114 ChangeLog 3569 +RMD160 71890bec5b096765818ac4b644b2a7ec124aa164 ChangeLog 3569 +SHA256 02fda3ae03f9cc4f6f4afaba6156e53954f78b069bfa7f6d96c5113f3eae7e0b ChangeLog 3569 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 metadata.xml 161 @@ -36,3 +43,10 @@ SHA256 f8688d6dd4a246630752d089d7c22fe2568be933ab8118550d4d204acc628647 files/di MD5 3c77ae9789892b51d2747fa06593c7fc files/digest-plotutils-2.4.1-r4 250 RMD160 82e940dff2bde6e6553ea58ec6529c5058d01c43 files/digest-plotutils-2.4.1-r4 250 SHA256 f8688d6dd4a246630752d089d7c22fe2568be933ab8118550d4d204acc628647 files/digest-plotutils-2.4.1-r4 250 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.6 (GNU/Linux) + +iD8DBQFF9kr8NQqtfCuFneMRAtBEAJ9J0ug85lk5LMfrVeQ/XcBUn+WMvgCeK9Hu +w0XjgzxaITCRtFPPqbT2jnI= +=s1ze +-----END PGP SIGNATURE----- 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 -- 2.26.2