Say goodbye to pdflib and respective pdf useflag.

(Portage version: 2.2.0_alpha24/cvs/Linux x86_64)

4 files changed, 19 insertions, 30 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/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}
 }