Version bump to 2.02. Fixes bug #450080, reported by Adam Randall, 7v5w7go9ub0o and Jeroen Roovers; applied patch by Ondrej Grover with small fixes to make it work with 2.02 instead of 2.01 as well as to not turn warnings into errors to avoid breakage without purpose.

(Portage version: 2.1.13.7/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D)

3 files changed, 92 insertions, 1 deletions

diff --git a/app-text/pdftk/ChangeLog b/app-text/pdftk/ChangeLog
index 8b638f27411a..622d1adf10f2 100644
--- a/app-text/pdftk/ChangeLog
+++ b/app-text/pdftk/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-text/pdftk
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/pdftk/ChangeLog,v 1.42 2013/07/03 16:32:31 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/pdftk/ChangeLog,v 1.43 2013/08/10 17:24:20 tomwij Exp $
+
+*pdftk-2.02 (10 Aug 2013)
+
+  10 Aug 2013; Tom Wijsman <TomWij@gentoo.org> +files/pdftk-2.02-flags.patch,
+  +pdftk-2.02.ebuild:
+  Version bump to 2.02. Fixes bug #450080, reported by Adam Randall,
+  7v5w7go9ub0o and Jeroen Roovers; applied patch by Ondrej Grover with small
+  fixes to make it work with 2.02 instead of 2.01 as well as to not turn
+  warnings into errors to avoid breakage without purpose.
 
   03 Jul 2013; Christoph Junghans <ottxor@gentoo.org> pdftk-1.45.ebuild:
   Added ~amd64-linux (tested by me)
diff --git a/app-text/pdftk/files/pdftk-2.02-flags.patch b/app-text/pdftk/files/pdftk-2.02-flags.patch
new file mode 100644
index 000000000000..5b20c9701cc0
--- /dev/null
+++ b/app-text/pdftk/files/pdftk-2.02-flags.patch
@@ -0,0 +1,43 @@
+Based on Debian patch, see http://patch-tracker.debian.org/patch/series/view/pdftk/2.01-1/customise_build_parameters
+
+diff -ruN pdftk-2.01-dist/pdftk/Makefile.Base pdftk-2.01-dist/pdftk/Makefile.Base
+--- pdftk-2.01-dist/pdftk/Makefile.Base	2012-12-06 19:57:36.000000000 +0100
++++ pdftk-2.01-dist/pdftk/Makefile.Base	2013-03-24 18:32:52.669492230 +0100
+@@ -43,7 +43,7 @@
+ 	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -I$(JAVALIBPATH) pdftk.cc -c
+ 
+ pdftk : pdftk.o attachments.o report.o passwords.o $(JAVALIB) $(LIBGCJ_SUPPLEMENT_FULL_O)
+-	$(CXX) $(CXXFLAGS) attachments.o report.o passwords.o pdftk.o $(JAVALIB) $(LIBGCJ_SUPPLEMENT_FULL_O) $(LDLIBS) -o pdftk
++	$(CXX) $(LDFLAGS) $(CXXFLAGS) attachments.o report.o passwords.o pdftk.o $(JAVALIB) $(LIBGCJ_SUPPLEMENT_FULL_O) $(LDLIBS) -o pdftk
+ 
+ install:
+ 	/usr/bin/install pdftk /usr/local/bin 
+diff -ruN pdftk-2.01-dist/pdftk/Makefile.Debian pdftk-2.01-dist/pdftk/Makefile.Debian
+--- pdftk-2.01-dist/pdftk/Makefile.Debian	2012-12-06 19:58:44.000000000 +0100
++++ pdftk-2.01-dist/pdftk/Makefile.Debian	2013-03-24 18:34:39.034540850 +0100
+@@ -21,7 +21,7 @@
+ # tools
+ # need direct path to libgcj for gcjh (starting in gcj 4.1.2 per Aurélien GÉRÔME)
+ TOOLPATH=
+-export VERSUFF=-4.6
++export VERSUFF=
+ export CPP= $(TOOLPATH)cpp$(VERSUFF)
+ export CXX= $(TOOLPATH)g++$(VERSUFF)
+ export GCJ= $(TOOLPATH)gcj$(VERSUFF)
+@@ -64,13 +64,12 @@
+ # only effects libraries following option on the command line
+ #
+ #  
+-export CPPFLAGS= -DPATH_DELIM=0x2f -DASK_ABOUT_WARNINGS=false -DUNBLOCK_SIGNALS -fdollars-in-identifiers
+-export CXXFLAGS= -Wall -Wextra -Weffc++ -O2
+-export GCJFLAGS= -fsource=1.3 -O2
+-export GCJHFLAGS= -force
++export CPPFLAGS+= -DPATH_DELIM=0x2f -DASK_ABOUT_WARNINGS=false -DUNBLOCK_SIGNALS -fdollars-in-identifiers
++export GCJFLAGS+= -fsource=1.3
++export GCJHFLAGS+= -force
+ export LDLIBS= -lgcj
+ 
+ include Makefile.Base
+ 
+ # required packages (xubuntu 12.04)
+ # gcj-jdk, g++
diff --git a/app-text/pdftk/pdftk-2.02.ebuild b/app-text/pdftk/pdftk-2.02.ebuild
new file mode 100644
index 000000000000..75361b465c1a
--- /dev/null
+++ b/app-text/pdftk/pdftk-2.02.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/pdftk/pdftk-2.02.ebuild,v 1.1 2013/08/10 17:24:20 tomwij Exp $
+
+EAPI="5"
+
+inherit eutils
+
+DESCRIPTION="A tool for manipulating PDF documents"
+HOMEPAGE="http://www.pdflabs.com/tools/pdftk-the-pdf-toolkit/"
+SRC_URI="http://www.pdflabs.com/tools/pdftk-the-pdf-toolkit/${P}-src.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux"
+
+DEPEND="sys-devel/gcc[gcj]"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${P}-dist/${PN}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-flags.patch
+}
+
+src_compile() {
+	# Settings by java-config break compilation by gcj.
+	unset CLASSPATH
+	unset JAVA_HOME
+
+	# Parallel make fails; confirmed, still not fixed in version 2.02.
+	emake -j1 -f "${S}"/Makefile.Debian || die "Compilation failed."
+}
+
+src_install() {
+	dobin pdftk
+	doman ../pdftk.1
+	dohtml ../pdftk.1.html
+}