gentoo resync : 15.12.2019

5 files changed, 5 insertions, 96 deletions

diff --git a/dev-java/jempbox/Manifest b/dev-java/jempbox/Manifest
index 4ba23b14bafb..902b7920795c 100644
--- a/dev-java/jempbox/Manifest
+++ b/dev-java/jempbox/Manifest
@@ -1,8 +1,6 @@
 AUX jempbox-1.7.1_maven-build.xml 10502 BLAKE2B 041be81aaf3b81969ad26926a3f2eac7b4655c17b3ba925b6ec2b16ddf49bcf7d87fc32655e3e357f274acc16a052afbc8010c6e0fc06f8e51770d68478e2efd SHA512 230436b03ddd8146f6aca41b26f54c0beba208eed9836aaf12e1326de75f226572e473e28c3d313c49a53266d3a827ee62097a49849d1782c546fe9e8bc1d269
 DIST pdfbox-1.7.1-src.zip 9167805 BLAKE2B f9e02d1540eaf7e4bb748906e56887494d81eecc88685fa9d758cb50712a530528573f4a7e5f816b4ff57d664a416b35444517d840c9b37239ec1e2b5a62b5a1 SHA512 8b2af3d8f431626c106e4f6e9e1d59d14abcd58cfdc9553f20c5057eef9f9cfbd0287e14e58e4d34472ad81198eb3f4d0a2fd6e88bd1fa5cbcf01e4befbf77d0
 DIST pdfbox-1.8.11-src.zip 11026359 BLAKE2B b3eb1add38e9bd0e5a1fcb116263fdbc372d6adb77132aeb0647a6c5d2c2b735345220f0a5c22caa97d04f78ad6517df388327aaa625677bd8c99d2051329a9c SHA512 05c8e5075379ed5ebb09555b39434dd936fce9dd24445871d24ea7f0f6afa49e74242bf0c9eba2d1a847b505143789b687dd039ca51ce76851132f2f18d434d1
-EBUILD jempbox-1.7.1-r1.ebuild 881 BLAKE2B e03e4cb634e7c50e26578a3bd74c9f54a416cf78c56b006c9a37a17aaefb94f1d0450add7671473a8383bd2196c5fe3599f447a77b7c07d93c977afacc048753 SHA512 9897a716e490a2575deadcff887dd4e24978f971c979ffc5781daf10d8cd1ad5ddf09b96123b7d4b1fed54ba19298d2a86adde72bd3cf91a86a544922255076c
-EBUILD jempbox-1.7.1.ebuild 874 BLAKE2B 28f129024f2e1d52d3120857ae09c24857ab5743a047ff454a575ae2a7c9fb4a043735efa0ece97aaa35e30d46e08dad0d8cbaa3a5ba46dbfd2907f40d0fa534 SHA512 543459515df66a6315938c6a5fb7a9c4dfdbd7ab56de552bb84da1bb6f6ec5aa59dee390e3afb479b477cb79d2e011b9fe1787b16329fd7a283d1f3463d29857
-EBUILD jempbox-1.8.11-r1.ebuild 1018 BLAKE2B a09a44de912031bd41f2aceeac9f45ca7c8ab0f523f4a60e67202051819c14feeb6689d4932608e470000e245a50c75a14dcfbc3ddcf1e1f000df232bfd97257 SHA512 c14263b1c11445af89046acb29b0144a7991a525043e31f60663fd048ac7546a106dc77b705b35fce27cfedb74b0bac34e69d70f6a866f3b486f87ac92b75694
-EBUILD jempbox-1.8.11.ebuild 1017 BLAKE2B 3b08bb9827e2ff319f3885c24defb4456b13c391bbcb97787d7a5f45fed2edb494ec8b1ddf41fbba9f4a47115386d3dd82ea2231cf2915951d6a086ac74e8499 SHA512 7d31ea467b558f892ed798df1dd87bcd4d0f1a8869a3a8655162036bcafc8641c7f797edabffdf3be0d2382e6a96bac8a0d67f7e09dcfacb95f9a4a239081754
+EBUILD jempbox-1.7.1-r1.ebuild 879 BLAKE2B cc8af982e8a9870cc9c5dd18be0d497caefbdc99b65eeeffbfe767f4dfd210eb2708e2a23059c8b9da1762a5fc0dba30de5e7cf410c22ce1f3fe50514531c596 SHA512 de17be28ded6bec6b87500a3a67be02787261208330d7e08548b420ea5e6d0b43177102b54bfacbcb47d0adf599ed38fa03e2070dc2fcc88668f8fd8749150c9
+EBUILD jempbox-1.8.11-r1.ebuild 1041 BLAKE2B 970c1a252a5dd5cb60cb41def4018c851e572088c830b5bd9ee5c5f736dceb8fa7b045c86aaaea730c73599acedee9b25486f26fb68c9b8131690a87a302b62e SHA512 bea46801de76d6b5a9b32f8b1ec8970bda0365834b7042c7e462cd7cf95e4249d9e2d3e8146ab8f5d26e96d420bf5aa911a59dea49dac227796e2b3dd3784aee
 MISC metadata.xml 314 BLAKE2B 4b4abd03c1f6ec6ebdacfd3f11f8365a9a867f9a4ad809998242c822dee13b75e35dcb44603c51f4b9f57828f71e0d8b09bfef83c3a9ad01111c2bd9410a1695 SHA512 3b771fec64eb63ed8b1de377745aa069c22e8cae003bf4155729ab8cb5c6a1ed5ca70cb977de152bfc926c2c4f6e94db6efc6498091736e0aa5304675b5019e7
diff --git a/dev-java/jempbox/jempbox-1.7.1-r1.ebuild b/dev-java/jempbox/jempbox-1.7.1-r1.ebuild
index 74126da57f9a..12e0360d573b 100644
--- a/dev-java/jempbox/jempbox-1.7.1-r1.ebuild
+++ b/dev-java/jempbox/jempbox-1.7.1-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/${MY_PN}/${PV}/${MY_PN}-${PV}-src.zip"
 
 LICENSE="BSD"
 SLOT="1.7"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-java/jempbox/jempbox-1.7.1.ebuild b/dev-java/jempbox/jempbox-1.7.1.ebuild
deleted file mode 100644
index d5f8087253ab..000000000000
--- a/dev-java/jempbox/jempbox-1.7.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-MY_PN=pdfbox
-
-DESCRIPTION="An open source Java library for parsing font files"
-HOMEPAGE="http://pdfbox.apache.org/"
-SRC_URI="mirror://apache/${MY_PN}/${PV}/${MY_PN}-${PV}-src.zip"
-
-LICENSE="BSD"
-SLOT="1.7"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	>=virtual/jre-1.5"
-DEPEND="
-	>=virtual/jdk-1.5
-	app-arch/unzip
-	test? ( dev-java/ant-junit:0 )"
-
-S="${WORKDIR}/${MY_PN}-${PV}/${PN}"
-
-java_prepare() {
-	cp -v "${FILESDIR}"/${P}_maven-build.xml build.xml || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_newjar target/${P}.jar ${PN}.jar
-
-	use doc && java-pkg_dojavadoc target/site/apidocs
-	use source && java-pkg_dosrc src/main/java/org
-}
diff --git a/dev-java/jempbox/jempbox-1.8.11-r1.ebuild b/dev-java/jempbox/jempbox-1.8.11-r1.ebuild
index 65c154444a2f..47984f37aa4d 100644
--- a/dev-java/jempbox/jempbox-1.8.11-r1.ebuild
+++ b/dev-java/jempbox/jempbox-1.8.11-r1.ebuild
@@ -15,8 +15,9 @@ HOMEPAGE="https://pdfbox.apache.org/"
 SRC_URI="mirror://apache/${MY_PN}/${PV}/${MY_P}-src.zip"
 LICENSE="Apache-2.0"
 SLOT="1.8"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=virtual/jre-1.8"
 
diff --git a/dev-java/jempbox/jempbox-1.8.11.ebuild b/dev-java/jempbox/jempbox-1.8.11.ebuild
deleted file mode 100644
index 7653bdb73e99..000000000000
--- a/dev-java/jempbox/jempbox-1.8.11.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_PN="pdfbox"
-MY_P="${MY_PN}-${PV}"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="An open source Java library for working with XMP metadata"
-HOMEPAGE="http://pdfbox.apache.org/"
-SRC_URI="mirror://apache/${MY_PN}/${PV}/${MY_P}-src.zip"
-LICENSE="Apache-2.0"
-SLOT="1.8"
-KEYWORDS="amd64 ~arm64 ppc64 x86"
-IUSE="test"
-
-RDEPEND=">=virtual/jre-1.6"
-
-DEPEND=">=virtual/jdk-1.6
-	app-arch/unzip
-	test? ( dev-java/junit:4 )"
-
-S="${WORKDIR}/${MY_P}/${PN}"
-JAVA_SRC_DIR="src/main/java"
-
-src_install() {
-	java-pkg-simple_src_install
-	dodoc README.txt
-}
-
-src_test() {
-	local DIR=src/test/java
-	local CP="${DIR}:${PN}.jar:$(java-pkg_getjars junit-4)"
-	local TESTS=$(find ${DIR} -name "*Test.java")
-	TESTS="${TESTS//src\/test\/java\/}"
-	TESTS="${TESTS//.java}"
-	TESTS="${TESTS//\//.}"
-
-	ejavac -cp "${CP}" -d ${DIR} $(find ${DIR} -name "*.java")
-	ejunit4 -classpath "${CP}" ${TESTS}
-}