4 files changed, 27 insertions, 14 deletions
diff --git a/app-text/pdftk/ChangeLog b/app-text/pdftk/ChangeLog
index fa983f2243ce..264070bef643 100644
--- a/app-text/pdftk/ChangeLog
+++ b/app-text/pdftk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/pdftk
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/pdftk/ChangeLog,v 1.28 2009/06/11 03:47:09 serkan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/pdftk/ChangeLog,v 1.29 2009/07/23 21:01:52 ssuominen Exp $
+
+  23 Jul 2009; Samuli Suominen <ssuominen@gentoo.org> pdftk-1.41-r1.ebuild,
+  +files/pdftk-1.41-gcc-4.4.patch:
+  Fix building with GCC 4.4 wrt #269312.
 
   11 Jun 2009; Serkan Kaba <serkan@gentoo.org> pdftk-1.41-r1.ebuild:
   Fix lines that should have been commented. Fixes bug #273624 reported by
diff --git a/app-text/pdftk/Manifest b/app-text/pdftk/Manifest
index 521aaa432d1b..eee4ff6e39ee 100644
--- a/app-text/pdftk/Manifest
+++ b/app-text/pdftk/Manifest
@@ -1,21 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX pdftk-1.12-user-pw.patch 827 RMD160 1bb66deef9aa157bb1a8fb51e5851ef164128f42 SHA1 7a5fc0d5ac9c2eec18f056b18e29f3b0e9afa33b SHA256 9cdfc3adce420b4a4940444926ed03988425f16cdf0cbcf2ca1264440f7ae2d9
 AUX pdftk-1.41-gcc-4.3.patch 7984 RMD160 524c2ac4bca6e9b35bbd8996dd106287170798a9 SHA1 7ddfae7c71434f5bd537d71525e66e36aacc3052 SHA256 4c8fcbd831a5a42427a100fb59a74afb5577b21b6148940f6f7587c60c33c7f1
+AUX pdftk-1.41-gcc-4.4.patch 937 RMD160 0ef846693ee1a53a70ff6ca2eede5443897121f7 SHA1 9051c1afcbf2df30c0a5edfa38accf4b2a7f88be SHA256 4703a490dea737a11aeb430985e5a8fc6eb2fcb22796f05cacba03d0f3d82f9a
 AUX pdftk-1.41-honor-ldflags.patch 660 RMD160 5e5c97f31571bbe5cab255f6048ba345224a3d7a SHA1 661ee53349007b03268fac94b2bb9cd0f5406c0b SHA256 79735bb877a361d213eb88c4d83b63c6815a5b87370b98c9548ed029785c9ba7
 DIST pdftk-1.12.tar.gz 779882 RMD160 adc4e2c99414c4ebc26bed65a7e4a5c8ddae290c SHA1 b4d54302cf3d53c137acb5b995b03c4f7dab7f41 SHA256 682811d4f54fd87fdf793cdcbe017ee723a176be2bade26d051f84a2d7501d12
 DIST pdftk-1.41.tar.gz 1011368 RMD160 09394a3d772556fa2c053bcef843b1e593feab1d SHA1 256583800c213419a845b28fe9ad5baccceddf80 SHA256 6b0ff22297b50600083bb8f6b4c507c68144b2d70738d31e0e19ab4091df5164
 DIST pdftk_1.12-11.diff.gz 8732 RMD160 de0e53c6e8907e1198691eed106590d21e57a3dd SHA1 4ed0feb198657cef9ad07349e8d63733204f688a SHA256 dd480456af7c48ff3a958bc13f91fd421250b87e3b7dacbc95d7200c7aa54c08
 EBUILD pdftk-1.12.ebuild 1358 RMD160 63bf87352b9bdffc366d15147c9fe89c855ff97e SHA1 0d46d34a0e4192df1f9fbbc7ef08fb5847daaabc SHA256 52edbdf98d1fd67a825c47e3f6a2f2e8c2a6572b4142477076f4b7986d7dd123
-EBUILD pdftk-1.41-r1.ebuild 1046 RMD160 b5ec2903fe04a89e5bddc0953fdbb49fe957d6fb SHA1 fcab634cb7fbfb7192e354bdc1f4891af969c2f2 SHA256 f4026aa03fb43696c2d880f0ea9e1ce34c241877cd05f23a915f8647b06567ac
+EBUILD pdftk-1.41-r1.ebuild 1104 RMD160 8ac1499ae9733056f28a82e272228692b2fbc714 SHA1 e773eccc66dbfa9062c764112c7ab252fb1c8ad2 SHA256 f9aff7cf3262c0181efe593ea429715b556e6662e071742bce0d61f9f072b0a7
 EBUILD pdftk-1.41.ebuild 1138 RMD160 e6cb73ae3b1b79275ed2b7933af95449664ff5b7 SHA1 09f185a78bb1f992cd7e52175dd4c7501fe18070 SHA256 24e1e984972e52a05c3f0f3c5a600a9eacaca97821f9de11b1544596b359fb97
-MISC ChangeLog 4251 RMD160 21a2d6d74173dcdada42fa91155c119dde46c783 SHA1 18b054a6e35039a158a826bf1e5ad94a0ae8316a SHA256 f01f34abd031f59e5f0bd5309908115c69e3833be8c97ed75eb5c3b3bfa552c0
+MISC ChangeLog 4407 RMD160 a35d9724f5d6cb9ff47f6f9cf19c7a02fa7446cd SHA1 472fbc265060ece580a7a3f92b3079db2ff7981c SHA256 6bf41242e027cada0405406a95c1f862146ba89c090b672689471d653becddbf
 MISC metadata.xml 291 RMD160 5314a482db7f9fd2dc8b31125050f07ddf084e1f SHA1 f47471c90a356647a2439f2b5686e980fae0c853 SHA256 0fc05920cf4bc755946f9e137397e80f8c65bc50d111a1ab8bc849bfc7cb2747
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkowfkQACgkQRh6X64ivZaIfHwCcC+jfBEeamYBA+Y5uIBZrIVth
-vysAnAuLGYGnzVmiL2dHNyX9tQXp2u5r
-=rrQN
------END PGP SIGNATURE-----
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
new file mode 100644
index 000000000000..e3efbe0f23f2
--- /dev/null
+++ b/app-text/pdftk/files/pdftk-1.41-gcc-4.4.patch
@@ -0,0 +1,16 @@
+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/pdftk-1.41-r1.ebuild b/app-text/pdftk/pdftk-1.41-r1.ebuild
index 20e3181938d6..7e1f04aaec7c 100644
--- a/app-text/pdftk/pdftk-1.41-r1.ebuild
+++ b/app-text/pdftk/pdftk-1.41-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 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.2 2009/06/11 03:47:09 serkan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/pdftk/pdftk-1.41-r1.ebuild,v 1.3 2009/07/23 21:01:52 ssuominen Exp $
 
 EAPI="2"
 
@@ -22,6 +22,8 @@ src_unpack() {
 
 	#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.