gentoo resync : 05.04.2019

3 files changed, 34 insertions, 51 deletions

diff --git a/dev-java/qdox/Manifest b/dev-java/qdox/Manifest
index 52724722995d..ac8eb533fc33 100644
--- a/dev-java/qdox/Manifest
+++ b/dev-java/qdox/Manifest
@@ -1,6 +1,6 @@
 AUX jflex-1.6.1.patch 680 BLAKE2B 2dba9bdba8ce77ebe28a608b505891ff49d51e9d7549bb17f21935ad9511fcdf4428a79b5243e5eb8cfb5747eaaaafb97eb6edca980ce337d37ed48772ff5ea5 SHA512 73e8067a31392a1975877470a2a239c9ca0913f807faa3e5c660bc2487dca9a46c1753ab86526e66581111fcded89229a4e9e3a16fa787ce3669ef6c07a28081
 DIST qdox-1.12.1.tar.gz 519833 BLAKE2B 83a732f1582b714cf943ede61bacc5216804c00cfbb642a479afb74739564f4fdbcd923dd7cb84a9626a97c5ad0a0f04895e0ae68252891cb25299e1fe1c9c72 SHA512 17ac933854ebd0560921805ea4339c151a7fd095bf8d50d5d71e656afda77ba30efac7926cfcc7543e4a8420b12d1eb75cdd305c50d1c28ad8cd6b0f4d95f5c5
-DIST qdox-1.6.3-sources.jar 63731 BLAKE2B 77d117f0f76f531f9320b5eb3650db315aab838d5d79a9df8997649b498b375db3fb0c694ea8b5911512097dd2325554d7599bed51a978e38af6fa55600d7c24 SHA512 0b05620809e3830c7e12c289cd4765f96d845adabc1f09497993bd9f39852784f454eb4aff1deecb325608a5773e86fbb1f5863e0f25387805472b59b46cf965
+DIST qdox-1.6.3.jar 63731 BLAKE2B 77d117f0f76f531f9320b5eb3650db315aab838d5d79a9df8997649b498b375db3fb0c694ea8b5911512097dd2325554d7599bed51a978e38af6fa55600d7c24 SHA512 0b05620809e3830c7e12c289cd4765f96d845adabc1f09497993bd9f39852784f454eb4aff1deecb325608a5773e86fbb1f5863e0f25387805472b59b46cf965
 EBUILD qdox-1.12.1-r1.ebuild 2190 BLAKE2B 6ed08cbbbfd4fbc8eb710095e310b8c2a795039db3f3da520dbe2713d043dff08710747e1bee1f6fc10f51bf3a31e0cc7428948c4d6125499c40bbfe79465c98 SHA512 bae61bdf03378a6053c40b3663a8ee4d011520366a115364b02e90b54f55074cd4639201ac0ec46aecaaee1588b8b9894ca1b5544fd74b171f2344aa614e9376
-EBUILD qdox-1.6.3.ebuild 1305 BLAKE2B 9a3ddc56897f942722d9a6e9bd584252e3e631e28dffaf3b44592b16ffbfbde8d8c83923621a93a335970868025f9445319f0c544b4c4054f13a3cfde3ad5a92 SHA512 46edb87f7bf06b26e578194b59e20648b1df6bc616497991650bf6526e8a2c581b778279f4ea47dcb54f63c8d9687eecf3a2300868e32d523b0d0397f4861095
+EBUILD qdox-1.6.3-r1.ebuild 718 BLAKE2B 806682589082bffff8ee32ffc55b9feae2b68750c65f1c683c5818af07c4c7a6763529e9cfae74ae11c02400e947dc23fc68c0e5ea761aaf3faeb2043ec07d98 SHA512 d3b285b8a4bedf556e631a20494998e748e3d066e72a058bd5bf3d0ebea59a28c7368e58bf4965459d17b7fbb17a2fc122e10eeacb2bec37afb0f70232c13b2e
 MISC metadata.xml 489 BLAKE2B 88377b6fe8ec7278767a18b227778e6f5ec320221fc7293090c67ea268b695de6b131a08172031cc08d3baf8bfd347da0d18bc2ae5c632026eccf20b9d958267 SHA512 709f38b7f8bb7fabd77d9c17a15e537b7c5b46d6c3e203f24847377980ad6afe55adede125b703215b3ab00ad6cb02b8994b75a3db2a4b1b556775bb9f00ee8d
diff --git a/dev-java/qdox/qdox-1.6.3-r1.ebuild b/dev-java/qdox/qdox-1.6.3-r1.ebuild
new file mode 100644
index 000000000000..1bed92f903f1
--- /dev/null
+++ b/dev-java/qdox/qdox-1.6.3-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Parser for extracting class/interface/method definitions"
+HOMEPAGE="https://github.com/codehaus/qdox"
+SRC_URI="mirror://gentoo/${P}-sources.jar -> ${P}.jar"
+
+KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+SLOT="1.6"
+LICENSE="Apache-2.0"
+
+DEPEND="
+	>=virtual/jdk-1.6"
+
+RDEPEND="
+	>=virtual/jre-1.6"
+
+S="${WORKDIR}"
+
+JAVA_SRC_DIR="com"
+
+src_prepare() {
+	default
+	rm -v com/thoughtworks/qdox/ant/AbstractQdoxTask.java \
+		com/thoughtworks/qdox/junit/APITestCase.java || die
+}
diff --git a/dev-java/qdox/qdox-1.6.3.ebuild b/dev-java/qdox/qdox-1.6.3.ebuild
deleted file mode 100644
index 8673fd2b4a17..000000000000
--- a/dev-java/qdox/qdox-1.6.3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-JAVA_PKG_IUSE="doc source"
-inherit java-pkg-2 java-ant-2
-DESCRIPTION="Parser for extracting class/interface/method definitions"
-HOMEPAGE="https://github.com/codehaus/qdox"
-SRC_URI="http://repository.codehaus.org/com/thoughtworks/${PN}/${PN}/${PV}/${P}-sources.jar"
-LICENSE="Apache-2.0"
-SLOT="1.6"
-KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
-IUSE=""
-
-CDEPEND="dev-java/ant-core
-	=dev-java/junit-3.8*"
-DEPEND=">=virtual/jdk-1.4
-	app-arch/unzip
-	${CDEPEND}"
-RDEPEND=">=virtual/jre-1.4
-	${CDEPEND}"
-S=${WORKDIR}
-
-src_compile() {
-	# create jar
-	mkdir -p build/classes
-	ejavac -sourcepath . -d build/classes -classpath $(java-pkg_getjars ant-core,junit) \
-		$(find . -name "*.java") || die "Cannot compile sources"
-	mkdir dist
-	cd build/classes
-	jar -cvf "${S}/dist/${PN}.jar" com || die "Cannot create JAR"
-
-	# generate javadoc
-	if use doc ; then
-		cd "${S}"
-		mkdir javadoc
-		javadoc -d javadoc -sourcepath . -subpackages com \
-			-classpath $(java-pkg_getjars ant-core,junit)
-	fi
-}
-
-src_install() {
-	java-pkg_dojar dist/${PN}.jar
-	java-pkg_register-ant-task
-
-	use source && java-pkg_dosrc com
-	use doc && java-pkg_dojavadoc javadoc
-}