Fixed gcc-4 compilation (bug #126735) and incorrect einfo (bug #125194).

(Portage version: 2.1_pre6-r4)

5 files changed, 53 insertions, 11 deletions

diff --git a/app-text/pdftk/ChangeLog b/app-text/pdftk/ChangeLog
index 5d9670ff9d83..2430fe128dea 100644
--- a/app-text/pdftk/ChangeLog
+++ b/app-text/pdftk/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/pdftk
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/pdftk/ChangeLog,v 1.16 2005/04/24 11:42:09 hansmi Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/pdftk/ChangeLog,v 1.17 2006/03/19 23:11:42 ehmsen Exp $
+
+  19 Mar 2006; Martin Ehmsen <ehmsen@gentoo.org>
+  +files/pdftk-1.12-gcc-4-compilation.patch, pdftk-1.12.ebuild:
+  Fixed incorrect einfo about java compilers, bug #125194.
+  Added patch to fix compilation with gcc-4,
+  thanks to Luca Merolla <luca.merolla@tiscalinet.it>, bug #126735.
 
   24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> pdftk-1.12.ebuild:
   Stable on ppc.
diff --git a/app-text/pdftk/Manifest b/app-text/pdftk/Manifest
index 7dc830da926a..8d1c77e00ae5 100644
--- a/app-text/pdftk/Manifest
+++ b/app-text/pdftk/Manifest
@@ -1,8 +1,27 @@
-MD5 89b5b4bc64aad85ff0079f51ebb639c9 pdftk-1.00.ebuild 1155
-MD5 432db3d006f8518542916591295b2858 pdftk-1.12.ebuild 1160
+MD5 3ff04f9bd14ddb36e9b0bdaab8506d67 ChangeLog 2190
+RMD160 c953f53caf705a877f6df59d2319c4359e32c3d2 ChangeLog 2190
+SHA256 ee492bc79da1dc252ac0644cc34c842f2ebc0d7f8a578f570bf4bdab48f0c420 ChangeLog 2190
+MD5 372043661fddd71d4fcb45e2799dd47c files/digest-pdftk-0.94.1 63
+RMD160 8a7c926facbaa75c559793e75b2ad0c5580c24dd files/digest-pdftk-0.94.1 63
+SHA256 3383dc2d193082fdfa7d18223bc43f710db37976266ec45fdfa93c9f2e95a993 files/digest-pdftk-0.94.1 63
+MD5 2127c3d55a42d67b46fd9c1922fe252e files/digest-pdftk-1.00 62
+RMD160 21846e1f688fc9f7c725ea8773090d80213b392b files/digest-pdftk-1.00 62
+SHA256 ba69eb6991c5a6f5d6f4e6d2c8696bf54562adf15fa5b591b796b8278cd27a18 files/digest-pdftk-1.00 62
+MD5 a6173b9b99c29ea3c536382024e642c1 files/digest-pdftk-1.12 232
+RMD160 d446905c089538a3a6ff2583e1523e54b4b424f4 files/digest-pdftk-1.12 232
+SHA256 7c899f8e0d9b59a81c676bcee7659f51479b70a87dd6ac3d49033168b1ff52aa files/digest-pdftk-1.12 232
+MD5 c2de64556d37ca363405bb78ced88ffc files/pdftk-1.12-gcc-4-compilation.patch 505
+RMD160 176db710256ae3480492f179a1ab6b05a0d8728d files/pdftk-1.12-gcc-4-compilation.patch 505
+SHA256 5d67a7bec888c9efce544fd1b06dd816100e81bf1baca4a40d8005202c01ba9a files/pdftk-1.12-gcc-4-compilation.patch 505
 MD5 619b858577edb26a03cdf700b6997618 metadata.xml 186
-MD5 ff41f2abd4609fb6a850f1cde9a42978 ChangeLog 1904
+RMD160 63f179ce4769614678aaead9beed811e2823cea6 metadata.xml 186
+SHA256 93bebc8ef883f19f5837491055fe68a3a16d3fcb1eb3c0acb89e116685ba62e5 metadata.xml 186
 MD5 bcbd1c2c966d68c61d0fdf3531827c0e pdftk-0.94.1.ebuild 1197
-MD5 2127c3d55a42d67b46fd9c1922fe252e files/digest-pdftk-1.00 62
-MD5 feb6c853c96b6829faad008d0dba16e2 files/digest-pdftk-1.12 62
-MD5 372043661fddd71d4fcb45e2799dd47c files/digest-pdftk-0.94.1 63
+RMD160 53e0e4042504a1c5f564899d3b13ce80d4420944 pdftk-0.94.1.ebuild 1197
+SHA256 e10fa24a3f2930ab49a21cfa2bf90c440811baa5ed9ea0a5633a38fa8ce9d592 pdftk-0.94.1.ebuild 1197
+MD5 89b5b4bc64aad85ff0079f51ebb639c9 pdftk-1.00.ebuild 1155
+RMD160 ea80f453ad84ad48c7b9ea19c3cd9488079ce3a7 pdftk-1.00.ebuild 1155
+SHA256 de3274680465b48a8dc117452dcba00856cbccfacf7a341811aec359959bdfbd pdftk-1.00.ebuild 1155
+MD5 171cde2316357205fdba1a4a36c40b9c pdftk-1.12.ebuild 1166
+RMD160 1812eb116d2294d04fb419ec957e1390eca1fba4 pdftk-1.12.ebuild 1166
+SHA256 84a75d8ee353b2d47ef532427ac45c2c7d9f6883313f40a79c9687b08a139ec1 pdftk-1.12.ebuild 1166
diff --git a/app-text/pdftk/files/digest-pdftk-1.12 b/app-text/pdftk/files/digest-pdftk-1.12
index 57fd700f53a7..1fbd0d090a3e 100644
--- a/app-text/pdftk/files/digest-pdftk-1.12
+++ b/app-text/pdftk/files/digest-pdftk-1.12
@@ -1 +1,3 @@
 MD5 509d21706bbff59c00e063ea16855163 pdftk-1.12.tar.gz 779882
+RMD160 adc4e2c99414c4ebc26bed65a7e4a5c8ddae290c pdftk-1.12.tar.gz 779882
+SHA256 682811d4f54fd87fdf793cdcbe017ee723a176be2bade26d051f84a2d7501d12 pdftk-1.12.tar.gz 779882
diff --git a/app-text/pdftk/files/pdftk-1.12-gcc-4-compilation.patch b/app-text/pdftk/files/pdftk-1.12-gcc-4-compilation.patch
new file mode 100644
index 000000000000..3ef1c0ff515d
--- /dev/null
+++ b/app-text/pdftk/files/pdftk-1.12-gcc-4-compilation.patch
@@ -0,0 +1,11 @@
+--- pdftk-1.12/java_libs/com/lowagie/text/pdf/codec/PngImage.java	2006-03-18 23:55:32.000000000 +0100
++++ pdftk-1.12-patched/java_libs/com/lowagie/text/pdf/codec/PngImage.java	2006-03-18 23:54:34.000000000 +0100
+@@ -93,7 +93,7 @@
+ 
+ import com.lowagie.text.ExceptionConverter;
+ import com.lowagie.text.Image;
+-//SID import com.lowagie.text.ImgRaw;
++import com.lowagie.text.ImgRaw;
+ import com.lowagie.text.pdf.ByteBuffer;
+ import com.lowagie.text.pdf.PdfArray;
+ import com.lowagie.text.pdf.PdfDictionary;
diff --git a/app-text/pdftk/pdftk-1.12.ebuild b/app-text/pdftk/pdftk-1.12.ebuild
index 81a4f32246a1..d5ee4d0ca52c 100644
--- a/app-text/pdftk/pdftk-1.12.ebuild
+++ b/app-text/pdftk/pdftk-1.12.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/pdftk/pdftk-1.12.ebuild,v 1.7 2005/04/24 11:42:09 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/pdftk/pdftk-1.12.ebuild,v 1.8 2006/03/19 23:11:42 ehmsen Exp $
+
+inherit eutils
 
 DESCRIPTION="A tool for manipulating PDF documents"
 HOMEPAGE="http://www.accesspdf.com/pdftk"
@@ -16,7 +18,7 @@ S=${WORKDIR}/${P}/${PN}
 pkg_setup() {
 	if [ -z "$(which gcj 2>/dev/null)" ]; then
 		eerror "It seems that your system doesn't provides a Java compiler."
-		eerror "Re-emerge sys-devel/gcc with \"java\" and \"gcj\" enabled."
+		eerror "Re-emerge sys-devel/gcc with \"gcj\" enabled."
 		die "gcj not found."
 	fi
 }
@@ -27,6 +29,8 @@ src_unpack() {
 	mv ${S}/Makefile.Generic ${T}/Makefile.Generic.orig
 	sed 's:-O2:\$(CFLAGS):g' \
 		< ${T}/Makefile.Generic.orig > ${S}/Makefile.Generic
+	# Fix gcc-4 compilation, bug #126735.
+	epatch "${FILESDIR}/${P}-gcc-4-compilation.patch" || die
 }
 
 src_compile() {