Cleanup

(Portage version: 2.1.10.44/cvs/Linux x86_64)

6 files changed, 6 insertions, 349 deletions

diff --git a/app-text/pdftk/ChangeLog b/app-text/pdftk/ChangeLog
index 086207c9aca8..e1567defc8cb 100644
--- a/app-text/pdftk/ChangeLog
+++ b/app-text/pdftk/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/pdftk
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/pdftk/ChangeLog,v 1.37 2012/01/07 00:41:59 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/pdftk/ChangeLog,v 1.38 2012/01/28 20:58:51 dilfridge Exp $
+
+  28 Jan 2012; Andreas K. Huettel <dilfridge@gentoo.org> -pdftk-1.41-r1.ebuild,
+  -pdftk-1.41-r2.ebuild, -files/pdftk-1.41-gcc-4.3.patch,
+  -files/pdftk-1.41-gcc-4.4.patch, -files/pdftk-1.41-honor-ldflags.patch:
+  Cleanup
 
   07 Jan 2012; Michael Weber <xmw@gentoo.org> pdftk-1.44.ebuild:
   ppc stable (bug 370169)
diff --git a/app-text/pdftk/files/pdftk-1.41-gcc-4.3.patch b/app-text/pdftk/files/pdftk-1.41-gcc-4.3.patch
deleted file mode 100644
index be46b0dcbc63..000000000000
--- a/app-text/pdftk/files/pdftk-1.41-gcc-4.3.patch
+++ /dev/null
@@ -1,203 +0,0 @@
-# posted to bug #251796 by <andrex@mail.ee> from Debian patches
-diff -u -r pdftk-1.41.orig/java_libs/com/lowagie/bc/asn1/Makefile pdftk-1.41/java_libs/com/lowagie/bc/asn1/Makefile
---- pdftk-1.41.orig/java_libs/com/lowagie/bc/asn1/Makefile	2008-12-22 23:43:29.000000000 +0200
-+++ pdftk-1.41/java_libs/com/lowagie/bc/asn1/Makefile	2008-12-23 00:04:52.000000000 +0200
-@@ -25,8 +25,7 @@
- # the "$*" automatic variable, here
- #
- %.h : %.class
--	$(GCJH) --classpath="." $*;
--	$(RM) $<
-+	$(GCJH) --classpath="$(java_libs_root):." $*;
- 
- ##
- # targets
-diff -u -r pdftk-1.41.orig/java_libs/com/lowagie/text/Makefile pdftk-1.41/java_libs/com/lowagie/text/Makefile
---- pdftk-1.41.orig/java_libs/com/lowagie/text/Makefile	2008-12-22 23:43:29.000000000 +0200
-+++ pdftk-1.41/java_libs/com/lowagie/text/Makefile	2008-12-22 23:58:52.000000000 +0200
-@@ -25,13 +25,12 @@
- # the "$*" automatic variable, here
- #
- %.h : %.class
--	$(GCJH) --classpath="." $*;
--	$(RM) $<
-+	$(GCJH) --classpath="$(java_libs_root):." $*;
- 
- ##
- # targets
- 
--all : $(library) $(headers)
-+all : $(library) $(headers) $(classes)
- 
- $(library) : $(objects)
- 	$(AR) $(ARFLAGS) $(library) $(objects);
-diff -u -r pdftk-1.41.orig/java_libs/com/lowagie/text/markup/Makefile pdftk-1.41/java_libs/com/lowagie/text/markup/Makefile
---- pdftk-1.41.orig/java_libs/com/lowagie/text/markup/Makefile	2008-12-22 23:43:29.000000000 +0200
-+++ pdftk-1.41/java_libs/com/lowagie/text/markup/Makefile	2008-12-23 00:04:28.000000000 +0200
-@@ -25,8 +25,7 @@
- # the "$*" automatic variable, here
- #
- %.h : %.class
--	$(GCJH) --classpath="." $*;
--	$(RM) $<
-+	$(GCJH) --classpath="$(java_libs_root):." $*;
- 
- ##
- # targets
-diff -u -r pdftk-1.41.orig/java_libs/com/lowagie/text/pdf/codec/Makefile pdftk-1.41/java_libs/com/lowagie/text/pdf/codec/Makefile
---- pdftk-1.41.orig/java_libs/com/lowagie/text/pdf/codec/Makefile	2008-12-22 23:43:29.000000000 +0200
-+++ pdftk-1.41/java_libs/com/lowagie/text/pdf/codec/Makefile	2008-12-23 00:04:11.000000000 +0200
-@@ -25,8 +25,7 @@
- # the "$*" automatic variable, here

- #

- %.h : %.class

--	$(GCJH) --classpath="." $*;

--	$(RM) $<

-+	$(GCJH) --classpath="$(java_libs_root):." $*;

- 

- ##

- # targets

-diff -u -r pdftk-1.41.orig/java_libs/com/lowagie/text/pdf/codec/postscript/Makefile pdftk-1.41/java_libs/com/lowagie/text/pdf/codec/postscript/Makefile
---- pdftk-1.41.orig/java_libs/com/lowagie/text/pdf/codec/postscript/Makefile	2008-12-22 23:43:29.000000000 +0200
-+++ pdftk-1.41/java_libs/com/lowagie/text/pdf/codec/postscript/Makefile	2008-12-23 00:03:05.000000000 +0200
-@@ -25,8 +25,7 @@
- # the "$*" automatic variable, here

- #

- %.h : %.class

--	$(GCJH) --classpath="." $*;

--	$(RM) $<

-+	$(GCJH) --classpath="$(java_libs_root):." $*;

- 

- ##

- # targets

-diff -u -r pdftk-1.41.orig/java_libs/com/lowagie/text/pdf/codec/wmf/Makefile pdftk-1.41/java_libs/com/lowagie/text/pdf/codec/wmf/Makefile
---- pdftk-1.41.orig/java_libs/com/lowagie/text/pdf/codec/wmf/Makefile	2008-12-22 23:43:29.000000000 +0200
-+++ pdftk-1.41/java_libs/com/lowagie/text/pdf/codec/wmf/Makefile	2008-12-23 00:03:29.000000000 +0200
-@@ -25,8 +25,7 @@
- # the "$*" automatic variable, here

- #

- %.h : %.class

--	$(GCJH) --classpath="." $*;

--	$(RM) $<

-+	$(GCJH) --classpath="$(java_libs_root):." $*;

- 

- ##

- # targets

-diff -u -r pdftk-1.41.orig/java_libs/com/lowagie/text/pdf/fonts/Makefile pdftk-1.41/java_libs/com/lowagie/text/pdf/fonts/Makefile
---- pdftk-1.41.orig/java_libs/com/lowagie/text/pdf/fonts/Makefile	2008-12-22 23:43:29.000000000 +0200
-+++ pdftk-1.41/java_libs/com/lowagie/text/pdf/fonts/Makefile	2008-12-23 00:01:33.000000000 +0200
-@@ -34,8 +34,7 @@
- # the "$*" automatic variable, here
- #
- %.h : %.class
--	$(GCJH) --classpath="." $*;
--	$(RM) $<
-+	$(GCJH) --classpath="$(java_libs_root):." $*;
- 
- ##
- # targets
-diff -u -r pdftk-1.41.orig/java_libs/com/lowagie/text/pdf/Makefile pdftk-1.41/java_libs/com/lowagie/text/pdf/Makefile
---- pdftk-1.41.orig/java_libs/com/lowagie/text/pdf/Makefile	2008-12-22 23:43:29.000000000 +0200
-+++ pdftk-1.41/java_libs/com/lowagie/text/pdf/Makefile	2008-12-23 00:00:25.000000000 +0200
-@@ -25,8 +25,7 @@
- # the "$*" automatic variable, here
- #
- %.h : %.class
--	$(GCJH) --classpath="." $*;
--	$(RM) $<
-+	$(GCJH) --classpath="$(java_libs_root):." $*;
- 
- ##
- # targets
-diff -u -r pdftk-1.41.orig/java_libs/com/lowagie/text/pdf/PdfEncryption.java pdftk-1.41/java_libs/com/lowagie/text/pdf/PdfEncryption.java
---- pdftk-1.41.orig/java_libs/com/lowagie/text/pdf/PdfEncryption.java	2008-12-22 23:43:29.000000000 +0200
-+++ pdftk-1.41/java_libs/com/lowagie/text/pdf/PdfEncryption.java	2008-12-22 23:46:21.000000000 +0200
-@@ -50,7 +50,7 @@
- 

- package com.lowagie.text.pdf;

- 

--import java_local.security.MessageDigest; // ssteward

-+import java.security.MessageDigest;

- import com.lowagie.text.ExceptionConverter;

- 

- /**

-diff -u -r pdftk-1.41.orig/java_libs/com/lowagie/text/xml/xmp/Makefile pdftk-1.41/java_libs/com/lowagie/text/xml/xmp/Makefile
---- pdftk-1.41.orig/java_libs/com/lowagie/text/xml/xmp/Makefile	2008-12-22 23:43:29.000000000 +0200
-+++ pdftk-1.41/java_libs/com/lowagie/text/xml/xmp/Makefile	2008-12-22 23:59:42.000000000 +0200
-@@ -25,8 +25,7 @@
- # the "$*" automatic variable, here
- #
- %.h : %.class
--	$(GCJH) --classpath="." $*;
--	$(RM) $<
-+	$(GCJH) --classpath="$(java_libs_root):." $*;
- 
- ##
- # targets
-diff -u -r pdftk-1.41.orig/java_libs/Makefile pdftk-1.41/java_libs/Makefile
---- pdftk-1.41.orig/java_libs/Makefile	2008-12-22 23:43:29.000000000 +0200
-+++ pdftk-1.41/java_libs/Makefile	2008-12-22 23:47:10.000000000 +0200
-@@ -13,13 +13,7 @@
- # append gcj flags
- export GCJFLAGS+= --encoding=UTF-8 --classpath="$(java_libs_root)"
- 
--all : libgcj_local itext
--
--libgcj_local :
--	$(MAKE) -C "$(java_libs_root)/gnu_local/java/security";
--	$(MAKE) -C "$(java_libs_root)/gnu_local/java/security/provider";
--	$(MAKE) -C "$(java_libs_root)/gnu/gcj/convert";
--	$(MAKE) -C "$(java_libs_root)/java_local/security";
-+all : itext
- 
- itext :
- 	$(MAKE) -C "$(java_libs_root)/com/lowagie/text";
-@@ -35,13 +29,7 @@
- 	$(MAKE) -C "$(java_libs_root)/com/lowagie/bc/asn1";
- 	$(MAKE) -C "$(java_libs_root)/com/lowagie/text/pdf/codec/postscript";
- 
--clean : libgcj_local_clean itext_clean
--
--libgcj_local_clean :
--	$(MAKE) -iC "$(java_libs_root)/gnu_local/java/security" clean;
--	$(MAKE) -iC "$(java_libs_root)/gnu_local/java/security/provider" clean;
--	$(MAKE) -iC "$(java_libs_root)/gnu/gcj/convert" clean;
--	$(MAKE) -iC "$(java_libs_root)/java_local/security" clean;
-+clean : itext_clean
- 
- itext_clean :
- 	$(MAKE) -iC "$(java_libs_root)/com/lowagie/text" clean;
-diff -u -r pdftk-1.41.orig/pdftk/Makefile.Base pdftk-1.41/pdftk/Makefile.Base
---- pdftk-1.41.orig/pdftk/Makefile.Base	2008-12-22 23:43:29.000000000 +0200
-+++ pdftk-1.41/pdftk/Makefile.Base	2008-12-22 23:44:33.000000000 +0200
-@@ -31,18 +31,6 @@
- afms= $(wildcard $(java_libs_root)/com/lowagie/text/pdf/fonts/*.afm)
- afm_objects= $(patsubst %.afm, %.o, $(afms))
- 
--# older versions of libgcj might not have the MD5 algorithm,
--# so I added it here; these *_local java files were grabbed from
--# libgcj CVS on March 7, 2004; diffed September 5, 2006 w/ gcc 4.1.1
--#
--# gnu/gcj/convert/Input_UnicodeBig.java was grabbed March 26, 2004; diffed September 5, 2006 w/ gcc 4.1.1
--#
--libgcj_local_libs = \
--$(java_libs_root)/java_local/security/security.a \
--$(java_libs_root)/gnu_local/java/security/provider/provider.a \
--$(java_libs_root)/gnu_local/java/security/security.a \
--$(java_libs_root)/gnu/gcj/convert/convert.a
--
- # this must already be set according to your platform Makefile;
- # we're just appending to it, here
- #
-diff -u -r pdftk-1.41.orig/pdftk/Makefile.Generic pdftk-1.41/pdftk/Makefile.Generic
---- pdftk-1.41.orig/pdftk/Makefile.Generic	2008-12-22 23:43:29.000000000 +0200
-+++ pdftk-1.41/pdftk/Makefile.Generic	2008-12-23 00:06:24.000000000 +0200
-@@ -28,7 +28,7 @@
- 
- # itext compiler flags
- # -O3 might cause pdftk to segfault on cat operation (gcc 3.4.4)
--export GCJFLAGS= -O2
-+export GCJFLAGS= -O2 -w
- 
- #
- export ARFLAGS= rs
diff --git a/app-text/pdftk/files/pdftk-1.41-gcc-4.4.patch b/app-text/pdftk/files/pdftk-1.41-gcc-4.4.patch
deleted file mode 100644
index e3efbe0f23f2..000000000000
--- a/app-text/pdftk/files/pdftk-1.41-gcc-4.4.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -NrU5 pdftk-1.41.orig/java_libs/com/lowagie/text/pdf/PdfDate.java pdftk-1.41/java_libs/com/lowagie/text/pdf/PdfDate.java
---- pdftk-1.41.orig/java_libs/com/lowagie/text/pdf/PdfDate.java	2009-05-18 20:49:13.000000000 -0600
-+++ pdftk-1.41/java_libs/com/lowagie/text/pdf/PdfDate.java	2009-05-18 20:51:36.000000000 -0600
-@@ -74,11 +74,11 @@
- public class PdfDate extends PdfString {

-     

-     // ssteward; static builds of pdftk (Windows, gcc 3.3.1) would

-     // omit this class because of its reference by reflection;

-     // this treatment ensures that ld will include it

--    private static Class c1= gnu.java.locale.Calendar.class;

-+    private static Class c1= java.util.Calendar.class;

- 

-     private static final int dateSpace[] = {Calendar.YEAR, 4, 0, Calendar.MONTH, 2, -1, Calendar.DAY_OF_MONTH, 2, 0,

-         Calendar.HOUR_OF_DAY, 2, 0, Calendar.MINUTE, 2, 0, Calendar.SECOND, 2, 0};

-     

-     // constructors

diff --git a/app-text/pdftk/files/pdftk-1.41-honor-ldflags.patch b/app-text/pdftk/files/pdftk-1.41-honor-ldflags.patch
deleted file mode 100644
index 402382557ab0..000000000000
--- a/app-text/pdftk/files/pdftk-1.41-honor-ldflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- pdftk-1.41/pdftk/Makefile.Base.orig	2006-10-25 01:44:06.000000000 +0200
-+++ pdftk-1.41/pdftk/Makefile.Base	2008-08-15 17:21:18.073275624 +0200
-@@ -63,7 +63,7 @@
- 	$(CXX) pdftk.cc -I$(java_libs_root) $(CPPFLAGS) -c
- 
- pdftk : pdftk.o attachments.o report.o $(itext_libs) $(libgcj_local_libs) $(afm_objects)
--	$(CXX) pdftk.o attachments.o report.o $(itext_libs) $(libgcj_local_libs) $(afm_objects) -I$(java_libs_root) $(CPPFLAGS) $(CXXFLAGS) -o pdftk
-+	$(CXX) pdftk.o attachments.o report.o $(itext_libs) $(libgcj_local_libs) $(afm_objects) -I$(java_libs_root) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -o pdftk
- 
- install:
- 	/usr/bin/install pdftk /usr/local/bin 
diff --git a/app-text/pdftk/pdftk-1.41-r1.ebuild b/app-text/pdftk/pdftk-1.41-r1.ebuild
deleted file mode 100644
index aefb09051c7b..000000000000
--- a/app-text/pdftk/pdftk-1.41-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/pdftk/pdftk-1.41-r1.ebuild,v 1.8 2010/10/05 22:48:26 ssuominen Exp $
-
-EAPI="2"
-
-inherit eutils
-
-DESCRIPTION="A tool for manipulating PDF documents"
-HOMEPAGE="http://www.pdflabs.com/tools/pdftk-the-pdf-toolkit/"
-SRC_URI="http://www.pdfhacks.com/pdftk/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="nodrm"
-
-DEPEND=">=sys-devel/gcc-4.3.1[gcj]"
-
-S=${WORKDIR}/${P}/${PN}
-
-src_unpack() {
-	unpack ${A}
-
-	#bug #225709 and #251796
-	epatch "${FILESDIR}/${P}-gcc-4.3.patch"
-	#bug #269312
-	epatch "${FILESDIR}/${P}-gcc-4.4.patch"
-	#bug #209802
-	epatch "${FILESDIR}/${P}-honor-ldflags.patch"
-	# force usage of custom CFLAGS.
-	sed -iorig 's:-O2:\$(CFLAGS):g' "${S}"/Makefile.Generic
-	# nodrm patch, bug 296455
-	if use nodrm; then
-		sed -i 's:passwordIsOwner= false:passwordIsOwner= true:' "${WORKDIR}/${P}"/java_libs/com/lowagie/text/pdf/PdfReader.java || die
-	fi
-}
-
-src_compile() {
-	# java-config settings break compilation by gcj.
-	unset CLASSPATH
-	unset JAVA_HOME
-	# parallel make fails
-	emake -j1 -f Makefile.Generic || die "Compilation failed."
-}
-
-src_install() {
-	dobin pdftk
-	newman ../debian/pdftk.1 pdftk.1
-	dohtml ../pdftk.1.html
-}
diff --git a/app-text/pdftk/pdftk-1.41-r2.ebuild b/app-text/pdftk/pdftk-1.41-r2.ebuild
deleted file mode 100644
index 3a2a09dcfb9b..000000000000
--- a/app-text/pdftk/pdftk-1.41-r2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/pdftk/pdftk-1.41-r2.ebuild,v 1.1 2010/11/27 22:16:39 xmw Exp $
-
-EAPI="2"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="A tool for manipulating PDF documents"
-HOMEPAGE="http://www.pdflabs.com/tools/pdftk-the-pdf-toolkit/"
-SRC_URI="http://www.pdfhacks.com/pdftk/${P}.tar.gz
-	http://aur.archlinux.org/packages/pdftk/pdftk/makefile.patch -> ${P}-makefile.patch"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="nodrm"
-
-DEPEND=">=sys-devel/gcc-4.3.1[gcj]"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${P}/${PN}
-
-src_prepare() {
-	cd "${WORKDIR}" || die
-
-	#bug #225709 and #251796
-	epatch "${FILESDIR}/${P}-gcc-4.3.patch"
-
-	#bug #269312
-	epatch "${FILESDIR}/${P}-gcc-4.4.patch"
-
-	#bug #209802
-	epatch "${FILESDIR}/${P}-honor-ldflags.patch"
-
-	cd "${S}"/.. || die
-	#bug 339345
-	epatch "${DISTDIR}/${P}-makefile.patch"
-
-	# force usage of custom CFLAGS.
-	sed -iorig 's:-O2:\$(CFLAGS):g' "${S}"/Makefile.Generic
-	# nodrm patch, bug 296455
-	if use nodrm; then
-		sed -i 's:passwordIsOwner= false:passwordIsOwner= true:' "${WORKDIR}/${P}"/java_libs/com/lowagie/text/pdf/PdfReader.java || die
-	fi
-
-	sed -e '/^export GCJ=/d' -e '/^export GCJH=/d' \
-		-i "${WORKDIR}"/${P}/${PN}/Makefile.Generic || die
-}
-
-src_compile() {
-	# java-config settings break compilation by gcj.
-	unset CLASSPATH
-	unset JAVA_HOME
-
-	tc-export GCJ
-	export GCJH="${GCJ}"h
-
-	# parallel make fails
-	emake -j1 -f Makefile.Generic || die "Compilation failed."
-}
-
-src_install() {
-	dobin pdftk || die
-	newman ../debian/pdftk.1 pdftk.1 || die
-	dohtml ../pdftk.1.html || die
-}