gentoo resync : 05.04.2019

3 files changed, 37 insertions, 49 deletions

diff --git a/dev-java/jgraph/Manifest b/dev-java/jgraph/Manifest
index 2d0fb37f3b8a..7e64a5699c29 100644
--- a/dev-java/jgraph/Manifest
+++ b/dev-java/jgraph/Manifest
@@ -1,3 +1,3 @@
-DIST jgraph-5.12.0.4-lgpl-src.jar 3460750 BLAKE2B 0d2c50673eb652e4335a2d4fe9edcd93745595302c9ce674e8bb05ceab5edcb6b4a190e4d4da14bdb552ca7d35421473d0931addb02c2d1326d81eb442c372d1 SHA512 0832afeb28c4d5abb9288de4e1b74eefc432bb98f622e71f0d192bf9f01741feb406ba0473b923e0cb93401120c1456a00eec4653355c37bff7e9e1863e81b5d
-EBUILD jgraph-5.12.0.4.ebuild 996 BLAKE2B d8b8587dfd1b4a81b274494351887cad8471eabfc41339b0ae32f96e0a910d488d58c83da76b08e356fa42fc9a2fffcc9358453c5abd0c2c34cfc6c94febd3dd SHA512 84f4bacaf5e8bebd32e09d213da2d43174581307fbc63f41737165d7d4043ad2e88f1729f4676a11642fd60aaca9bfc3f10eb215e644738bdaa924968418ce47
+DIST jgraph-5.12.0.4.jar 3460750 BLAKE2B 0d2c50673eb652e4335a2d4fe9edcd93745595302c9ce674e8bb05ceab5edcb6b4a190e4d4da14bdb552ca7d35421473d0931addb02c2d1326d81eb442c372d1 SHA512 0832afeb28c4d5abb9288de4e1b74eefc432bb98f622e71f0d192bf9f01741feb406ba0473b923e0cb93401120c1456a00eec4653355c37bff7e9e1863e81b5d
+EBUILD jgraph-5.12.0.4-r1.ebuild 581 BLAKE2B 561ab9086a6f9352cfec05bc7674c08e3cab82b2d6a810fe35d19e07aa02dd4d40d3e8f59dd8b7957e68e06b96903bab931ecae28315ae6507f9c963dfeb5252 SHA512 c31f8030fdeeba060f53b1fe78e4c23aedd600dda6f3d6279373f31458ba2041c5aeffcfe5ce3f366140fedf542bdfbea60d4d4f8b743a6d319ad63ef4b592ff
 MISC metadata.xml 312 BLAKE2B 4226249366dff5db47d56cbdba95d9a07bd19347720d5990adf17d24a3fec0dae9a133fd44f9ebc4990b21b8c1cc5ee959b2ba8f3421fb2bef779487243504a1 SHA512 270716861776916f2d7a6ab6671b6dcf220ce6b3cce5397b3994c19f83a91c110a5eb3a783ba6277d098b6382481d98cc610397c836e4a9166d857db92da0b56
diff --git a/dev-java/jgraph/jgraph-5.12.0.4-r1.ebuild b/dev-java/jgraph/jgraph-5.12.0.4-r1.ebuild
new file mode 100644
index 000000000000..eba4ad003f8c
--- /dev/null
+++ b/dev-java/jgraph/jgraph-5.12.0.4-r1.ebuild
@@ -0,0 +1,35 @@
+# 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="Open-source graph component for Java"
+SRC_URI="mirror://gentoo/${P}-lgpl-src.jar -> ${P}.jar"
+HOMEPAGE="https://www.jgraph.com"
+IUSE="doc examples source"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+DEPEND="
+	>=virtual/jdk-1.8"
+
+RDEPEND="
+	>=virtual/jre-1.8"
+
+DOCS=( README WHATSNEW LICENSE ChangeLog )
+
+S="${WORKDIR}"
+
+JAVA_SRC_DIR="src"
+
+src_prepare() {
+	default
+
+	java-pkg_clean
+}
diff --git a/dev-java/jgraph/jgraph-5.12.0.4.ebuild b/dev-java/jgraph/jgraph-5.12.0.4.ebuild
deleted file mode 100644
index fdd3e3ec6688..000000000000
--- a/dev-java/jgraph/jgraph-5.12.0.4.ebuild
+++ /dev/null
@@ -1,47 +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="Open-source graph component for Java"
-SRC_URI="mirror://sourceforge/${PN}/${P}-lgpl-src.jar"
-HOMEPAGE="https://www.jgraph.com"
-IUSE="doc examples source"
-DEPEND=">=virtual/jdk-1.4
-	app-arch/unzip"
-RDEPEND=">=virtual/jre-1.4"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-JAVA_PKG_FILTER_COMPILER="jikes"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	rm -v *.class || die
-
-	# don't do javadoc always
-	sed -i -e 's/depends="compile, doc"/depends="compile"/' build.xml || \
-		die "sed failed"
-
-	rm -rf doc/api || die
-	rm lib/jgraph.jar || die
-}
-
-EANT_DOC_TARGET="apidoc"
-
-src_install() {
-	java-pkg_dojar build/lib/${PN}.jar
-
-	dodoc README WHATSNEW ChangeLog || die
-	use doc && java-pkg_dojavadoc build/doc/api
-	use source && java-pkg_dosrc src/org
-	use examples && java-pkg_doexamples examples
-}