Revision bump to fix gcc:4.5 problems (bug 339345).

(Portage version: 2.1.9.24/cvs/Linux x86_64)

5 files changed, 160 insertions, 1 deletions

diff --git a/app-text/pdftk/ChangeLog b/app-text/pdftk/ChangeLog
index 21a680e942dc..11c2664ececc 100644
--- a/app-text/pdftk/ChangeLog
+++ b/app-text/pdftk/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for app-text/pdftk
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/pdftk/ChangeLog,v 1.33 2010/07/09 09:25:37 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/pdftk/ChangeLog,v 1.34 2010/11/27 22:16:39 xmw Exp $
+
+*pdftk-1.41-r2 (27 Nov 2010)
+
+  27 Nov 2010; Michael Weber <xmw@gentoo.org> +pdftk-1.41-r2.ebuild,
+  +pdftk-1.44.ebuild, +files/pdftk-1.44-LDFLAGS.patch,
+  +files/pdftk-1.44-Makefile.patch:
+  Revision bump to fix gcc:4.5 problems (bug 339345).
+
+*pdftk-1.44 (27 Nov 2010)
+
+  27 Nov 2010; Michael Weber <xmw@gentoo.org> +pdftk-1.44.ebuild,
+  +files/pdftk-1.44-LDFLAGS.patch, +files/pdftk-1.44-Makefile.patch:
+  Version bump, thanks to dabbot for the ebuild/patches on bug 343361.
 
   09 Jul 2010; Samuli Suominen <ssuominen@gentoo.org> pdftk-1.41-r1.ebuild:
   Drop ppc64 wrt #196361, Comment #4
diff --git a/app-text/pdftk/files/pdftk-1.44-LDFLAGS.patch b/app-text/pdftk/files/pdftk-1.44-LDFLAGS.patch
new file mode 100644
index 000000000000..f06f9cd677d2
--- /dev/null
+++ b/app-text/pdftk/files/pdftk-1.44-LDFLAGS.patch
@@ -0,0 +1,11 @@
+--- pdftk-1.44-dist/pdftk/Makefile.Base
++++ pdftk-1.44-dist/pdftk/Makefile.Base
+@@ -44,7 +44,7 @@
+ 	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -I$(JAVALIBPATH) pdftk.cc -c
+ 
+ pdftk : pdftk.o attachments.o report.o $(JAVALIB) $(GCJ_LOCAL_LIB_FULL)
+-	$(CXX) $(CXXFLAGS) attachments.o report.o pdftk.o $(JAVALIB) $(GCJ_LOCAL_LIB_FULL) $(LDLIBS) -o pdftk
++	$(CXX) $(CXXFLAGS) attachments.o report.o pdftk.o $(JAVALIB) $(GCJ_LOCAL_LIB_FULL) $(LDLIBS) $(LDFLAGS) -o pdftk
+ 
+ install:
+ 	/usr/bin/install pdftk /usr/local/bin 
diff --git a/app-text/pdftk/files/pdftk-1.44-Makefile.patch b/app-text/pdftk/files/pdftk-1.44-Makefile.patch
new file mode 100644
index 000000000000..e551af834eb7
--- /dev/null
+++ b/app-text/pdftk/files/pdftk-1.44-Makefile.patch
@@ -0,0 +1,29 @@
+--- pdftk-1.44-dist/pdftk/Makefile.Debian
++++ pdftk-1.44-dist/pdftk/Makefile.Debian
+@@ -29,12 +29,11 @@
+ # tools
+ # need direct path to libgcj for gcjh (starting in gcj 4.1.2 per Aurélien GÉRÔME)
+ TOOLPATH=
+-export VERSUFF=-4.4
+-export CXX= $(TOOLPATH)g++$(VERSUFF)
+-export GCJ= $(TOOLPATH)gcj$(VERSUFF)
+-export GCJH= $(TOOLPATH)gcjh$(VERSUFF)
+-export GJAR= $(TOOLPATH)gjar$(VERSUFF)
+-export LIBGCJ= /usr/share/java/libgcj$(VERSUFF).jar
++export VERSUFF=
++export CXX= $(TOOLPATH)g++
++export GCJ= $(TOOLPATH)gcj
++export GCJH= $(TOOLPATH)gcjh
++export GJAR= $(TOOLPATH)gjar
+ export AR= ar
+ export RM= rm
+ export ARFLAGS= rs
+@@ -73,7 +72,7 @@
+ #  
+ export CPPFLAGS= -DPATH_DELIM=0x2f -DASK_ABOUT_WARNINGS=false -DUNBLOCK_SIGNALS -fdollars-in-identifiers
+ export CXXFLAGS= -Wall -Wextra -Weffc++ -O2
+-export GCJFLAGS= -Wall -Wextra -fsource=1.3 -O2
++export GCJFLAGS= -Wall -fsource=1.3 -O2
+ export GCJHFLAGS= -force
+ export LDLIBS= -lgcj
+ 
diff --git a/app-text/pdftk/pdftk-1.41-r2.ebuild b/app-text/pdftk/pdftk-1.41-r2.ebuild
new file mode 100644
index 000000000000..3a2a09dcfb9b
--- /dev/null
+++ b/app-text/pdftk/pdftk-1.41-r2.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/pdftk/pdftk-1.41-r2.ebuild,v 1.1 2010/11/27 22:16:39 xmw Exp $
+
+EAPI="2"
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A tool for manipulating PDF documents"
+HOMEPAGE="http://www.pdflabs.com/tools/pdftk-the-pdf-toolkit/"
+SRC_URI="http://www.pdfhacks.com/pdftk/${P}.tar.gz
+	http://aur.archlinux.org/packages/pdftk/pdftk/makefile.patch -> ${P}-makefile.patch"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="nodrm"
+
+DEPEND=">=sys-devel/gcc-4.3.1[gcj]"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${P}/${PN}
+
+src_prepare() {
+	cd "${WORKDIR}" || die
+
+	#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"
+
+	cd "${S}"/.. || die
+	#bug 339345
+	epatch "${DISTDIR}/${P}-makefile.patch"
+
+	# force usage of custom CFLAGS.
+	sed -iorig 's:-O2:\$(CFLAGS):g' "${S}"/Makefile.Generic
+	# nodrm patch, bug 296455
+	if use nodrm; then
+		sed -i 's:passwordIsOwner= false:passwordIsOwner= true:' "${WORKDIR}/${P}"/java_libs/com/lowagie/text/pdf/PdfReader.java || die
+	fi
+
+	sed -e '/^export GCJ=/d' -e '/^export GCJH=/d' \
+		-i "${WORKDIR}"/${P}/${PN}/Makefile.Generic || die
+}
+
+src_compile() {
+	# java-config settings break compilation by gcj.
+	unset CLASSPATH
+	unset JAVA_HOME
+
+	tc-export GCJ
+	export GCJH="${GCJ}"h
+
+	# parallel make fails
+	emake -j1 -f Makefile.Generic || die "Compilation failed."
+}
+
+src_install() {
+	dobin pdftk || die
+	newman ../debian/pdftk.1 pdftk.1 || die
+	dohtml ../pdftk.1.html || die
+}
diff --git a/app-text/pdftk/pdftk-1.44.ebuild b/app-text/pdftk/pdftk-1.44.ebuild
new file mode 100644
index 000000000000..c6923f49051f
--- /dev/null
+++ b/app-text/pdftk/pdftk-1.44.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/pdftk/pdftk-1.44.ebuild,v 1.1 2010/11/27 22:16:39 xmw Exp $
+
+EAPI="2"
+
+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 ~ppc ~x86"
+IUSE=""
+DEPEND=">=sys-devel/gcc-4.3.1[gcj]"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${P}-dist/${PN}
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-Makefile.patch"
+	epatch "${FILESDIR}/${P}-LDFLAGS.patch"
+}
+
+src_compile() {
+	# java-config settings break compilation by gcj.
+	unset CLASSPATH
+	unset JAVA_HOME
+	# parallel make fails
+	emake -j1 -f "${S}"/Makefile.Debian || die "Compilation failed."
+}
+
+src_install() {
+	dobin pdftk || die
+	doman ../pdftk.1 || die
+	dohtml ../pdftk.1.html || die
+}