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.

Package-Manager: portage-2.1.13.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x6D34E57D

4 files changed, 103 insertions, 9 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/Manifest b/app-text/pdftk/Manifest
index 21ecbc2806a2..81e065572d29 100644
--- a/app-text/pdftk/Manifest
+++ b/app-text/pdftk/Manifest
@@ -4,20 +4,23 @@ Hash: SHA256
 AUX pdftk-1.44-LDFLAGS.patch 507 SHA256 4ea5b0f05c67f76872007ba07256ed5483fb4a31566b47486c18c193c1c966f3 SHA512 f0f05e90bcd231805c94645fee24ed54716f6a65110b1f05046f2e53c1d6c957b2feb3909f8cb500dfd4b35801310c2a9cefa1dc347974247ddb5adc9f4b317f WHIRLPOOL 8e82ef6998963226a4f271fef995a914f196ecb53504483a8e226e35cf2af6d54c3106c8e74c6acd0c11cc5acb87eddb6a95efd961f116d7cd433fa9a6a67142
 AUX pdftk-1.44-Makefile.patch 937 SHA256 0a150371aca4152ba53ac1671d445a235cb614596cbd32f9271f1470c591da42 SHA512 5ffe6d3bdbc4e92323ba33ff779973a317e74e9ac79d218daffdd2603b912fd47fc98af161a48c267a8d6bb468a9d3725e7ad4bc0139eb5dd012eb0bc6527419 WHIRLPOOL 75e88a3819959ab5d90f6ddf9b259a111c18e42120636de8f29d545ac44ce0f84e6935dde7db295fd53f515877b062b1c18f11a0ec315d26455fec4cdab139c5
 AUX pdftk-1.45-flags.patch 1997 SHA256 3e06e6621c7ab1873391a7d7d378f87848ecb285d48f67ecf2802458baab86ae SHA512 a2a1ab2eac287d43954e14c64f1f0f561cd23ae91b86d21241e1eba846f4bb9adf364735d9ca1337f522b3627888a9a5280742243542b511b170f3f4a68f9d37 WHIRLPOOL 8660e3ce1d3fb969ccf2d42848f975595467c2af51ea0dd1515b17a0df31be1e606c7bc1802ea22d01ae0068746d19cb4a91d3ffe0bcd2945dfb5b60e5bc822e
+AUX pdftk-2.02-flags.patch 1922 SHA256 6ba0d9943ac4c1b1dfe623db3eed9555661ffa66ff33446fd00642355cb3413a SHA512 96d2aceda2c98704ee70e55f84bd831ee131153d21a2b6f094ec111a1475cdc5da01434566d1c9aff2de403e55a81b0ae6baeb5d3017cb979662de895ebbf768 WHIRLPOOL ad58aea7d9bfb62d183de0a6747725f8589ba6e87ce6ebfaa4f7528e5514c477f31f517da4985c4eacf2d217821bd564dd9b683ad049fb67891f3a9d510d5920
 DIST pdftk-1.44-src.zip 1137086 SHA256 d70cb3faf2af849c2bee6c35e4e829277a5090cbb595321f04b59c94d784aa24 SHA512 b19392cb3e28ba6bb8e550df6fbffd05743bb95ffa4e1ac4b3935ef5456f7def275f1177b50e6e6aae45a16d6639ea3b731adee684a37f0445f2a64a9d1cebdf WHIRLPOOL bead1b44b2415aca57d0e35daecee1dab2c0ef2b8c30a651647ace09e82b1f91c26b70df4924662b1d134688a13032653a6d55098803b8a5e67c2b0de08e5ffe
 DIST pdftk-1.45-src.zip 1159411 SHA256 f4e1a50a9ae748dc71883182b797c80c497884fb3071e564361af57354378fcf SHA512 c14b0d411ec26e59bb54b21e10615b4d8e78c0e300f78e46e84ee634b122ded08b3fb45c2b534e60fb45fe3994b782d3b3dbea759da61cef470de89e29689e5c WHIRLPOOL cdfa25cda0167cf4920515689c56813efed821fdcf1599c754fbefacc7968518bc18d7756dc3432cf7f4a23f75c8bbc1dfcf540d93f242082c96cbe1abac3510
+DIST pdftk-2.02-src.zip 2239008 SHA256 118f6a25fd3acaafb58824dce6f97cdc07e56050e666b90e4c4ef426ea37b8c1 SHA512 5c73ab3b7b12cfc24a17c2737d224fdde2ae684e1712031a968b83f5b8d91c521d477e932fc47f8b4a8c0ff0ba183678aaa13a1e7b29107c5c47ded8d960ef54 WHIRLPOOL 910ee5f755e7ea46043cece0bd9a6645dc8a503280fd7d86eb2f77d303af0031b5e428cc7222cee23995e6fe5aefd142a610c77ec9969142e841e0f18153e082
 EBUILD pdftk-1.44.ebuild 971 SHA256 6b563a86c6d94b0c5598177e4fbf2cd2553aae9be36cda2bb6eb2adeabd675a5 SHA512 2c7560bc076219106e10e9bf3874c32ea4f1c4125ac497da547c955c2535112ba3cbe3a21e17dbcb627ae160d2b848db55d4587d113ca73bd37809dc865b0fa8 WHIRLPOOL 272a69ac1ec6338d7c8d1f986ddc2b335c6db914e1eb594c128d77fe840737016bf968dafa25026d684256ee2f334d9cfc9e59e4d8117f5fa6e1946d6def2cee
 EBUILD pdftk-1.45.ebuild 931 SHA256 d255757e0a97241f294951c7de3fae7adbf5e780d40a2f80e77c69b839264682 SHA512 36d3d376840de1fbfef013831a94b7e1c5b65f45ee46435fafb34798bc1c8b79d409793f7fa3a75a4fb096c9271b3b58057a5eeed3d89cecb72ef6a11e780dc2 WHIRLPOOL daa08816e4b9b52e5bf843fd7ce65cff471d79ffd050fe8444ffcf48e6eda0e192039e9641c8b8fcbdf99eb2190977d67e90fb29fe0c9145626778e6b68a1628
-MISC ChangeLog 6331 SHA256 9d93e2975ece6b906574410f99385650afdef3687e9fa9eb14d1324000edd3ac SHA512 9a9d4cb6f04e2cd2f3fda85754a115507966e2263c493c11e30e2fa9d831ed9961aa11ffa1b607737c99c1711c8a172362d7ce4a33711a5438a1e0a9c3bf8191 WHIRLPOOL f37ae1d56a916c21715f4ab1c1d296acb04491003f78577d4ba6b40f7a50277099762e6fad45a3a7ceefa6387849adf3e3a1cd7af88b35ca6df3d92c1f18e075
+EBUILD pdftk-2.02.ebuild 956 SHA256 ff407144f1b1a4e1fe95796b7c2d1fb3e3848646d042aa79481ee07f9afdfffb SHA512 754f598aaaac53ac3fad8d1f94856e1a73375ec5cc8c10a129a207b3164a2a86d455a60c311b5583f662bad525b019dbff227e1a13f67c6823b28a324b6abe4b WHIRLPOOL 45d07955e0e8d933a957ce96789d6205d2c8540725d0d8b8306b6d46994c606e3f737e709772d17ec40188aa943fa420c408bdc6c7461f00e8f37921ea2e8d8a
+MISC ChangeLog 6736 SHA256 612a9f42c35d87c3de4375d88c5d49dbcd4b82772c9a29bc2f414c8eee9f4515 SHA512 6bcf3b8e024a54b1f38d55572dba2020953098d6c5b51116bf5cee4dd2d64d77eae6e5642dafa7557b0342ab3ea4ba239edfc75668b08320b86c4905c463b496 WHIRLPOOL f2af300070476c5b7a3606790421c5f65b3053d36080d74b9a2ee3dce448d6f9a944b7a1aaa32ce3dc51530e374495eb64959720f662c6640aab28dece2d2362
 MISC metadata.xml 179 SHA256 50eed75422d647880b04974ac25a9c3849a2ce20366d508e778d04d4724f9779 SHA512 813c6534cd107ef1a1517e71fe2cdaf9beccbb5c5378aa83b29d1ba5474d4aec2684b47c13beb38dc6b65199e326792b04a2cc90c7de2655f4894f49b8f8a9bd WHIRLPOOL f098ad81b5fc1050f6f924e85b46fef1f45dda717cf335b2dbefbbaaf2481fcbfc961fad5be0c10fdac16e93cc881ec3d8d3b13902a3159357436f446d379bda
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJR1FIgAAoJEOeBhlrCAAWGimwH/iJMyDwxL/t+ybgBlno45m2i
-9J/AfMDqOmN5ULPYOPgcWK+V1sR6B0saRZ91maxB1l4K0lo2Atzj/lW+n+cSGm5Q
-TTGRUohicZO83qfm68jmNVvGZLI7rsvX2LvEaCgorv7tTRPWPMy4wMo0YRw48oTx
-QL4b4wOfXcPo5pbGP8iQnLe73v7i6ovFh0EVhV99th9C0LjQ3op3n3AukSDjVax3
-vre+MnlyrKSb1WHd7FYdrhPJmtJogV2s0PGb4yQ0aF/iOIitO5g3tJ5d6UGRmHUf
-68SGBnJN30c2WNldo33d47CUpPdOxLmy5At0fFqwo78dUDClRgKjq5XooRPbuGk=
-=TBjV
+iQEcBAEBCAAGBQJSBnZqAAoJEJWyH81tNOV9PSwIAKyjt3Yj3TCAs8TXwH8cctHM
+mbGb8KH/j//cKh0k+aK91wlw5k3R/lI2MP12ZkaZpf1TODrLwEo7YLkQBHQZo5wK
+GItO0wWEXqua5jKOCxeEU3syzf2B85Np6WHW7S7ge4qfLRQXML0HBbydYKNKMRS/
+vQBaPhgJ38Q9G7p5ufJAVlzGwfIiA+423reQvoZqDseEww3kzAY46LsuDKfGFadB
+8ypJqPUUsm+6dX27ZetawL6WlJzBHKRVbgkGVQewFXQZnPTOmpx9TNWfPiNz1fNs
+8wx0kjPNU/E1KxD+PVricIatHSkIyNDQchriMhoajcoxXm2+ZfsQwgX1q6IIxh8=
+=JOfy
 -----END PGP SIGNATURE-----
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
+}