Say goodbye to pdflib and respective pdf useflag.

Package-Manager: portage-2.2.0_alpha24/cvs/Linux x86_64

5 files changed, 22 insertions, 44 deletions

diff --git a/sci-visualization/grace/ChangeLog b/sci-visualization/grace/ChangeLog
index f4352c7c6bb4..528c3f112ee6 100644
--- a/sci-visualization/grace/ChangeLog
+++ b/sci-visualization/grace/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-visualization/grace
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/grace/ChangeLog,v 1.46 2010/11/24 20:52:12 bicatali Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/grace/ChangeLog,v 1.47 2011/02/22 17:02:49 scarabeus Exp $
+
+  22 Feb 2011; Tomáš Chvátal <scarabeus@gentoo.org> grace-5.1.22-r1.ebuild,
+  grace-5.1.22-r2.ebuild, -files/grace-5.1.22-pdfdrv.patch:
+  Say goodbye to pdflib and respective pdf useflag.
 
   24 Nov 2010; Sébastien Fabbro <bicatali@gentoo.org> grace-5.1.22-r2.ebuild:
   more prefix fixes, thanks Andrew Davis, bug #342419
diff --git a/sci-visualization/grace/Manifest b/sci-visualization/grace/Manifest
index 76b05147af40..aeb125d9e874 100644
--- a/sci-visualization/grace/Manifest
+++ b/sci-visualization/grace/Manifest
@@ -1,22 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX grace-5.1.21-fortran.patch 650 RMD160 1eb2b9cb37cad4b103f5fe4749e65403a1dffab5 SHA1 50b5a5af6ab802936fcb227ebba46bb69e37bd7b SHA256 5001b3eb4ceb4b408b01a92651162bdf6f3ce1823199ae8f0a62c32a816a5c1e
 AUX grace-5.1.21-netcdf.patch 413 RMD160 dab48c7889042ebe741293da0184c36c00034e32 SHA1 750efdb37af1f1c1eab0f8c28f52df4621964c44 SHA256 57c36bfd320d2a3a61c2f7628ede67f96c4c165969f7162b4d3dbf07d23d5adb
 AUX grace-5.1.22-dlmodule.patch 356 RMD160 1900c1e7a2d964d299408af73f52b32b145d976f SHA1 a06088c543c1c6ae0280af1fdba7a80c55e97a62 SHA256 b8e0b2527a2083b0594756e927f45ad9051711ac370330deb11e299ca849e05a
 AUX grace-5.1.22-ldflags.patch 1161 RMD160 483e599df369dd2bad51c58e5ccaf05540946393 SHA1 5ce5accd804bb611fabfcbee78bfa7ea3d208632 SHA256 955c74169f859bef042601d85be80319c29d7774b62aacceafeb352803d5ea15
 AUX grace-5.1.22-mkstemp.patch 1664 RMD160 5dc6c1b84d33e5848f546b17509ca1c36973d152 SHA1 5221a837385c762ad397dfdf4c733381e9318821 SHA256 6e436fe9c27d4b627a8116ca2a1bea94bd5fc01bc475be6f56a63ec9b5cf2f97
-AUX grace-5.1.22-pdfdrv.patch 353 RMD160 77dbd6af3bac15822f5e2e7e75b8172d8ca67798 SHA1 b7a1ddc3341c0208f538b660b6d8d3705c58caff SHA256 c347802157e90aa56a4fcddaea437ba016f5344354b64d50748171ba52fe27ff
 AUX grace.png 498 RMD160 01c0e1841ca819eafd6c49933e8bcf656ba664d6 SHA1 32d698b82f8b4a6640483a633a5a12808c6124ca SHA256 5853749dccb423411bd2c6b9098e7627c3ce6ea38682b1bab0e5555c095084d2
 DIST grace-5.1.22.tar.gz 2516576 RMD160 ca7b1abe240de7cd3dbdc52d5182020c410b9772 SHA1 3ce88c7c264d2de73b8935f835a1c1f8e368c78f SHA256 4ce8f058b6c1267a842419a3edbf471421dea9cf5744783745b6cb375cdf5f25
-EBUILD grace-5.1.22-r1.ebuild 2803 RMD160 fa341f9d7d2c52971ced200425e5014008f0b5bf SHA1 20981b0010c7dcc16274a0fa477dd5404604e2dd SHA256 1c7c555a25bcfaf3f1f08d45786b6c9fa4532fd532f60dac2a4363f7b5a869b2
-EBUILD grace-5.1.22-r2.ebuild 2837 RMD160 171e54fd88e0ea09dfa85228c6323e711f137623 SHA1 03d696331602d103786c24601033200f0b991895 SHA256 08fbd02c99619df08099711a4164322667480fb4d3f33e4862c92e6fc4271a32
-MISC ChangeLog 14058 RMD160 91a594ebb34bfb7dc92c018b021e2d3a258b9fee SHA1 e88974c2219d25819e15e86569493e11ab679ced SHA256 6d229e980a95cd305b54e357dc84c6ec3b37121318f6fbea4e673a1494401501
+EBUILD grace-5.1.22-r1.ebuild 2707 RMD160 0ab52d75034ca31233339961d49f4d92fad8845f SHA1 dd31109ec9a7e557c44ab5ff060d609de194a97f SHA256 d2d10ead7211a8fad146244eceaf4d23e653d0a9a1d4b64ba10c8aa84266d8ee
+EBUILD grace-5.1.22-r2.ebuild 2743 RMD160 980749baa48084d07d013aa91a08e07dc762a8b0 SHA1 4fa22474bca31a88bd7293a111d264cef91575f7 SHA256 71bb2aaba8511cd6a95f39d3ec1ac74b726dc37a48b5535e59804f9042f749bd
+MISC ChangeLog 14251 RMD160 ccc68a4c005c6f67cfc9b9f3efebfc24ada7f590 SHA1 dc48bae1a7b17199efe1a12245d9d87b2e36fceb SHA256 cd34ddaf99e03866349c53ad5597e07584b7f7b2e6970403c11fc9656568728a
 MISC metadata.xml 645 RMD160 78fdc207c55c585d82c8282ddedf554da9ebbeaf SHA1 f905e31a079fe543bc3f81d0305c11ea3529c605 SHA256 97aa6dae00402081c1d846ef26f8a5283b5bbe62c414bb66febee13bf2d92bfe
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAkztewUACgkQ1ycZbhPLE2BVXwCgkcobirqZrqob/tE1l1aY18F+
-mXEAoJWrdWrekpDngZVSgKWwj5MrofOJ
-=WnZ7
------END PGP SIGNATURE-----
diff --git a/sci-visualization/grace/files/grace-5.1.22-pdfdrv.patch b/sci-visualization/grace/files/grace-5.1.22-pdfdrv.patch
deleted file mode 100644
index 6d6200713bfe..000000000000
--- a/sci-visualization/grace/files/grace-5.1.22-pdfdrv.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/pdfdrv.c.orig	2004-08-05 04:37:47.000000000 +0900
-+++ src/pdfdrv.c	2008-06-16 15:29:00.000000000 +0900
-@@ -57,6 +57,8 @@
- #  include "motifinc.h"
- #endif
- 
-+#define PDF_set_fillrule(handle, rule) PDF_set_parameter(handle, "fillrule", rule)
-+
- static void pdf_error_handler(PDF *p, int type, const char* msg);
- 
- static unsigned long page_scale;
diff --git a/sci-visualization/grace/grace-5.1.22-r1.ebuild b/sci-visualization/grace/grace-5.1.22-r1.ebuild
index f38e5999bfa6..5d38a7102395 100644
--- a/sci-visualization/grace/grace-5.1.22-r1.ebuild
+++ b/sci-visualization/grace/grace-5.1.22-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/grace/grace-5.1.22-r1.ebuild,v 1.10 2010/11/08 17:57:05 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/grace/grace-5.1.22-r1.ebuild,v 1.11 2011/02/22 17:02:50 scarabeus Exp $
 
 EAPI=3
 inherit eutils toolchain-funcs
@@ -12,7 +12,7 @@ SRC_URI="ftp://plasma-gate.weizmann.ac.il/pub/${PN}/src/stable/${P}.tar.gz"
 SLOT="0"
 LICENSE="GPL-2 LGPL-2"
 KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
-IUSE="fortran fftw jpeg netcdf pdf png"
+IUSE="fortran fftw jpeg netcdf png"
 
 DEPEND=">=x11-libs/openmotif-2.3:0
 	sys-libs/zlib
@@ -22,8 +22,7 @@ DEPEND=">=x11-libs/openmotif-2.3:0
 	fftw? ( sci-libs/fftw:2.1 )
 	netcdf? ( sci-libs/netcdf )
 	png? ( media-libs/libpng )
-	jpeg? ( virtual/jpeg )
-	pdf? ( media-libs/pdflib )"
+	jpeg? ( virtual/jpeg )"
 
 RDEPEND="${DEPEND}
 	x11-misc/xdg-utils"
@@ -35,9 +34,8 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-5.1.21-netcdf.patch
 	# fix for missing defines when fortran is disabled
 	epatch "${FILESDIR}"/${PN}-5.1.21-fortran.patch
-	# fix a leak and pdf driver (from freebsd)
+	# fix a leak (from freebsd)
 	epatch "${FILESDIR}"/${P}-dlmodule.patch
-	epatch "${FILESDIR}"/${P}-pdfdrv.patch
 
 	# don't strip if not asked for
 	sed -i \
@@ -68,6 +66,7 @@ src_configure() {
 	# the configure script just produces a basic Make.conf
 	# and a config.h
 	econf \
+		--disable-pdfdrv \
 		--disable-xmhtml \
 		--without-bundled-xbae \
 		--without-bundled-t1lib \
@@ -80,7 +79,6 @@ src_configure() {
 		$(use_enable netcdf) \
 		$(use_enable jpeg jpegdrv) \
 		$(use_enable png pngdrv) \
-		$(use_enable pdf pdfdrv) \
 		${myconf}
 }
 
diff --git a/sci-visualization/grace/grace-5.1.22-r2.ebuild b/sci-visualization/grace/grace-5.1.22-r2.ebuild
index 155f88769f8b..3d4affe6c7d7 100644
--- a/sci-visualization/grace/grace-5.1.22-r2.ebuild
+++ b/sci-visualization/grace/grace-5.1.22-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/grace/grace-5.1.22-r2.ebuild,v 1.4 2010/11/24 20:52:12 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/grace/grace-5.1.22-r2.ebuild,v 1.5 2011/02/22 17:02:49 scarabeus Exp $
 
 EAPI=3
 inherit eutils toolchain-funcs
@@ -12,7 +12,7 @@ SRC_URI="ftp://plasma-gate.weizmann.ac.il/pub/${PN}/src/stable/${P}.tar.gz"
 SLOT="0"
 LICENSE="GPL-2 LGPL-2"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="fortran fftw jpeg netcdf pdf png"
+IUSE="fortran fftw jpeg netcdf png"
 
 DEPEND=">=x11-libs/openmotif-2.3:0
 	sys-libs/zlib
@@ -22,8 +22,7 @@ DEPEND=">=x11-libs/openmotif-2.3:0
 	fftw? ( sci-libs/fftw:2.1 )
 	netcdf? ( sci-libs/netcdf )
 	png? ( media-libs/libpng )
-	jpeg? ( virtual/jpeg )
-	pdf? ( media-libs/pdflib )"
+	jpeg? ( virtual/jpeg )"
 
 RDEPEND="${DEPEND}
 	x11-misc/xdg-utils"
@@ -39,9 +38,8 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-5.1.21-netcdf.patch
 	# fix for missing defines when fortran is disabled
 	epatch "${FILESDIR}"/${PN}-5.1.21-fortran.patch
-	# fix a leak and pdf driver (from freebsd)
-	epatch "${FILESDIR}"/${P}-dlmodule.patch
-	epatch "${FILESDIR}"/${P}-pdfdrv.patch \
+	# fix a leak (from freebsd)
+	epatch "${FILESDIR}"/${P}-dlmodule.patch \
 		"${FILESDIR}"/${P}-ldflags.patch
 
 	# don't strip if not asked for
@@ -73,6 +71,7 @@ src_configure() {
 	# the configure script just produces a basic Make.conf
 	# and a config.h
 	econf \
+		--disable-pdfdrv \
 		--disable-xmhtml \
 		--without-bundled-xbae \
 		--without-bundled-t1lib \
@@ -85,7 +84,6 @@ src_configure() {
 		$(use_enable netcdf) \
 		$(use_enable jpeg jpegdrv) \
 		$(use_enable png pngdrv) \
-		$(use_enable pdf pdfdrv) \
 		${myconf}
 }