gentoo resync : 24.12.2018

4 files changed, 3 insertions, 92 deletions

diff --git a/app-text/pdftk/Manifest b/app-text/pdftk/Manifest
index 49c978e67f67..a1aa9543ff4f 100644
--- a/app-text/pdftk/Manifest
+++ b/app-text/pdftk/Manifest
@@ -1,7 +1,4 @@
-AUX pdftk-2.02-flags.patch 1922 BLAKE2B fc8be4321b7f39d3814a4da73986d4d81fd9d0eb52941e77f2ebcf85443c418b618584a5d9632979b3c6ed121e2fb4a42d7d694832119ee215a97454139e3d51 SHA512 96d2aceda2c98704ee70e55f84bd831ee131153d21a2b6f094ec111a1475cdc5da01434566d1c9aff2de403e55a81b0ae6baeb5d3017cb979662de895ebbf768
-DIST pdftk-2.02-src.zip 2239008 BLAKE2B 9bb55fb687b85de2ee0f9bec4ff16772646613b1519afb6d432985ad452cd09d04636788cb2deedb9924833cc10a802057c0e8ff146789da29cd4969cd614c39 SHA512 5c73ab3b7b12cfc24a17c2737d224fdde2ae684e1712031a968b83f5b8d91c521d477e932fc47f8b4a8c0ff0ba183678aaa13a1e7b29107c5c47ded8d960ef54
 DIST pdftk-v3.0.0.tar.bz2 546821 BLAKE2B 1d1935322f1468d9e2e8044e748fbb816e399599e445e078866d416d5e99866739134fb794ff42dbfcc37271d66655440f706db46f152722ab7030cba16edf38 SHA512 3b487f7532140366c9ac41222cd366d387b93e67aada845772f60ff20601e25611e34a190a65fbcec9d776a0b5683100fdd54453357bf7c43cebea7dda0c6229
-EBUILD pdftk-2.02.ebuild 958 BLAKE2B b67ae137dcd28f2bfef9ca0fb5b2b718fd14a8d51628995f24090e3c5cf5db69155ffa75f8788137f46669f0d625e544e9fc1f9188ac21589048ac51c55039ce SHA512 25565e5ea0c59b9af269419acab47d7a4d452800494697238a1e9b48d11617a4f46024357a91bf3b25c080a22960177b4249275f571d2bf38d9a492d70d650eb
-EBUILD pdftk-3.0.0.ebuild 891 BLAKE2B f932721020bbd1bc3fa5d1c5df5c109ef4e528d65cdc307ac6c06d0178f5ceb973f985642855fcd4e9e3b668914a4dca658492cbd136cca632c32c4880233624 SHA512 064d9a9673a8659d7e9c1de6fe5d8348701caea7935fb3602a2f72622de0a3ceaf7ab523e0240592b19f8826aab4539b2d6a698417015305608d85f867e42b6b
+EBUILD pdftk-3.0.0.ebuild 887 BLAKE2B 90e3a8fec61768bfb426616e13e3fd1abfba8603ff92fdf3397d4c25c6f9e66745e5130384f143ce1a0eb737d8f1b50ebb28fc061e522e4188c95d28825c2b13 SHA512 568a2467ab3f98e4b69c730ca3ab62f69ece26da3e930635f83181a945a1dc7b855cb8ceec31b9404e2f1aa37bcf0fa03b6f1773826d3d77ea9b430e4da2eb07
 EBUILD pdftk-9999.ebuild 891 BLAKE2B f932721020bbd1bc3fa5d1c5df5c109ef4e528d65cdc307ac6c06d0178f5ceb973f985642855fcd4e9e3b668914a4dca658492cbd136cca632c32c4880233624 SHA512 064d9a9673a8659d7e9c1de6fe5d8348701caea7935fb3602a2f72622de0a3ceaf7ab523e0240592b19f8826aab4539b2d6a698417015305608d85f867e42b6b
 MISC metadata.xml 348 BLAKE2B ef51c768c6964646b5e264d379b5c259134b37df3c9d4368b92c44855ee21fa40005fcf1514e95fba43fb683fbf49c35dc251521d1b63f91449c73ecb527a749 SHA512 f7031388d3d15f091e5e477bbcc7291b1e2362cc41fb485875e8a4ec81c9b86ee4a8b9ee640eeffe7e2bc17cc90ab417945bd6aca52cf13c85d979774e8a3572
diff --git a/app-text/pdftk/files/pdftk-2.02-flags.patch b/app-text/pdftk/files/pdftk-2.02-flags.patch
deleted file mode 100644
index 5b20c9701cc0..000000000000
--- a/app-text/pdftk/files/pdftk-2.02-flags.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-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
deleted file mode 100644
index cd88040b5245..000000000000
--- a/app-text/pdftk/pdftk-2.02.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils
-
-DESCRIPTION="A tool for manipulating PDF documents"
-HOMEPAGE="https://www.pdflabs.com/tools/pdftk-the-pdf-toolkit/"
-SRC_URI="https://www.pdflabs.com/tools/pdftk-the-pdf-toolkit/${P}-src.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux"
-
-RDEPEND="sys-devel/gcc:5.4.0[gcj]"
-DEPEND="${RDEPEND}
-	sys-devel/gcc-config
-"
-
-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
-
-	# We need gcc-5 because of Java
-	export PATH="$(gcc-config -B 5.4.0):${PATH}"
-
-	# 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
-}
diff --git a/app-text/pdftk/pdftk-3.0.0.ebuild b/app-text/pdftk/pdftk-3.0.0.ebuild
index 9fe6b13efc09..013ab53a1b0f 100644
--- a/app-text/pdftk/pdftk-3.0.0.ebuild
+++ b/app-text/pdftk/pdftk-3.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://gitlab.com/pdftk-java/pdftk/"
 else
 	SRC_URI="https://gitlab.com/pdftk-java/pdftk/-/archive/v${PV}/pdftk-v${PV}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 	S="${WORKDIR}/pdftk-v${PV}"
 fi