From 4778dde8a96c20ec04e370b7435e4f67c3de470e Mon Sep 17 00:00:00 2001 From: Vlastimil Babka Date: Fri, 26 Dec 2008 21:44:37 +0000 Subject: Revbump fixing build with gcc 4.3 (bug #225709 and #235645 and #251796) thanks to patch adapted from Debian submitted by . Fixes LDFLAGS and man page (bug #209802 and #234832) thanks to Stephan Springer . Uses EAPI2 use deps for gcc[gcj] dep. Package-Manager: portage-2.2_rc17/cvs/Linux 2.6.27-gentoo-r1-perfctr x86_64 --- app-text/pdftk/ChangeLog | 12 +- app-text/pdftk/Manifest | 15 +- app-text/pdftk/files/pdftk-1.41-gcc-4.3.patch | 203 +++++++++++++++++++++ .../pdftk/files/pdftk-1.41-honor-ldflags.patch | 11 ++ app-text/pdftk/pdftk-1.41-r1.ebuild | 43 +++++ 5 files changed, 272 insertions(+), 12 deletions(-) create mode 100644 app-text/pdftk/files/pdftk-1.41-gcc-4.3.patch create mode 100644 app-text/pdftk/files/pdftk-1.41-honor-ldflags.patch create mode 100644 app-text/pdftk/pdftk-1.41-r1.ebuild (limited to 'app-text') diff --git a/app-text/pdftk/ChangeLog b/app-text/pdftk/ChangeLog index 2d0dc72dba77..a2ddd6f23770 100644 --- a/app-text/pdftk/ChangeLog +++ b/app-text/pdftk/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for app-text/pdftk # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/pdftk/ChangeLog,v 1.26 2008/08/02 07:21:17 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/pdftk/ChangeLog,v 1.27 2008/12/26 21:44:37 caster Exp $ + +*pdftk-1.41-r1 (26 Dec 2008) + + 26 Dec 2008; Vlastimil Babka + +files/pdftk-1.41-gcc-4.3.patch, +files/pdftk-1.41-honor-ldflags.patch, + +pdftk-1.41-r1.ebuild: + Revbump fixing build with gcc 4.3 (bug #225709 and #235645 and #251796) + thanks to patch adapted from Debian submitted by . Fixes + LDFLAGS and man page (bug #209802 and #234832) thanks to Stephan Springer + . Uses EAPI2 use deps for gcc[gcj] dep. 02 Aug 2008; Ulrich Mueller metadata.xml: Add USE flag description to metadata wrt GLEP 56. diff --git a/app-text/pdftk/Manifest b/app-text/pdftk/Manifest index d77be7ca9630..56e882c86c73 100644 --- a/app-text/pdftk/Manifest +++ b/app-text/pdftk/Manifest @@ -1,18 +1,11 @@ ------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-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 1044 RMD160 12893f81f81c1e5103e4285807396cfdb02e28c3 SHA1 2eb54df9a058fe6402df10d5f96ec9f26d4598a6 SHA256 badd126dc34ec08d886c50b5f074e26c27a2c6f5112c419cc0f786911672bbc8 EBUILD pdftk-1.41.ebuild 1138 RMD160 e6cb73ae3b1b79275ed2b7933af95449664ff5b7 SHA1 09f185a78bb1f992cd7e52175dd4c7501fe18070 SHA256 24e1e984972e52a05c3f0f3c5a600a9eacaca97821f9de11b1544596b359fb97 -MISC ChangeLog 3584 RMD160 3f9d790d2f1ad89154142e7990d62d1d6920211c SHA1 fa0fee613b819979a561f64b2f787e08708e3ac9 SHA256 da4901cbbca0f6ab000d41e62ad5966e5cae4aeebe7a77bd86e90aad763ab190 +MISC ChangeLog 4056 RMD160 137c0fc0816e8e56900171940e3f8719f07b55f6 SHA1 921aa0d759f87f451db893ca4ecd737857f7f770 SHA256 18b40474e89128b4d640f0b8527aeaed63f6065a34d63aa91f18ade8ff689fd2 MISC metadata.xml 291 RMD160 5314a482db7f9fd2dc8b31125050f07ddf084e1f SHA1 f47471c90a356647a2439f2b5686e980fae0c853 SHA256 0fc05920cf4bc755946f9e137397e80f8c65bc50d111a1ab8bc849bfc7cb2747 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.9 (GNU/Linux) - -iEYEARECAAYFAkiUCvoACgkQOeoy/oIi7uzqWQCffal79ll38lO4F+hjfzs6HTu4 -fTkAn23pIuZ3G+ykoBNj+DSNsL4rVm1y -=YMfI ------END PGP SIGNATURE----- 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 new file mode 100644 index 000000000000..be46b0dcbc63 --- /dev/null +++ b/app-text/pdftk/files/pdftk-1.41-gcc-4.3.patch @@ -0,0 +1,203 @@ +# posted to bug #251796 by 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-honor-ldflags.patch b/app-text/pdftk/files/pdftk-1.41-honor-ldflags.patch new file mode 100644 index 000000000000..402382557ab0 --- /dev/null +++ b/app-text/pdftk/files/pdftk-1.41-honor-ldflags.patch @@ -0,0 +1,11 @@ +--- 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 new file mode 100644 index 000000000000..fe4118daaa67 --- /dev/null +++ b/app-text/pdftk/pdftk-1.41-r1.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2008 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.1 2008/12/26 21:44:37 caster Exp $ + +EAPI="2" + +inherit eutils + +DESCRIPTION="A tool for manipulating PDF documents" +HOMEPAGE="http://www.pdfhacks.com/pdftk" +SRC_URI="http://www.pdfhacks.com/pdftk/${P}.tar.gz" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +IUSE="" +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 #209802 + epatch "${FILESDIR}/${P}-honor-ldflags.patch" + # force usage of custom CFLAGS. + sed -iorig 's:-O2:\$(CFLAGS):g' "${S}"/Makefile.Generic +} + +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 +} -- cgit v1.2.3-65-gdbad