gentoo resync : 05.04.2019

3 files changed, 18 insertions, 78 deletions

diff --git a/dev-java/jgoodies-animation/Manifest b/dev-java/jgoodies-animation/Manifest
index 3b540ec0b021..0d6bd20f0820 100644
--- a/dev-java/jgoodies-animation/Manifest
+++ b/dev-java/jgoodies-animation/Manifest
@@ -1,4 +1,3 @@
-DIST animation-1_2_0.zip 728028 BLAKE2B 591b63b6a2799bfe6020c4e81b834807fba3e72a039dbd9954846b6c5a5c2445493e2d8814b1897b9465ec39c2b62c2f027c1e05ef7db5e9439acc236dbf9078 SHA512 2220630d7fd70a98b6d9605de7a1d6fc3470cc19b39815b9777e6bc8cf7db74ce77338861dde45aafbe336ce8b48ee00bcd8149af701a7001869cd3da3cf6a72
-EBUILD jgoodies-animation-1.2.0-r1.ebuild 1087 BLAKE2B 7560901fa5fbb57482829d751de1f8c9a6568d43390b2550e5cde1fbfeb2fd77e85a698b2691bd9c2715c6cba6614874f937df5889b95221961ee20fa446d96a SHA512 aeb3018c5e45def60b6a19a9045310a74d121eb5d3a2b0022236fba55b76d2af5e14caf06e7e658c166aa5fbd2b5a76ca3454835ee481c33e440a58d868a5532
-EBUILD jgoodies-animation-1.2.0.ebuild 1377 BLAKE2B b640f57c4bed08ff4f1cef7b36c24dfc88eb9d4bc6c72c0eca1b3cbfadce3ba20f2931ca75d6adec54bae9635f146244416fe8347d0a3096c33fb36b87cea62f SHA512 ce83da9da0fd2b36ea8de684b323a96b3140733e04dfbe5a629fbd80d7245b776283e0d4c5ccb358edd7b18b10ae102eec9c0f6466db89082dcbd7953f205867
+DIST jgoodies-animation-1.2.0.zip 728028 BLAKE2B 591b63b6a2799bfe6020c4e81b834807fba3e72a039dbd9954846b6c5a5c2445493e2d8814b1897b9465ec39c2b62c2f027c1e05ef7db5e9439acc236dbf9078 SHA512 2220630d7fd70a98b6d9605de7a1d6fc3470cc19b39815b9777e6bc8cf7db74ce77338861dde45aafbe336ce8b48ee00bcd8149af701a7001869cd3da3cf6a72
+EBUILD jgoodies-animation-1.2.0-r2.ebuild 1049 BLAKE2B 1e7d7ce3135568d8a345d87c8b15b58603a39fbe31d1e01eba11ff076137556c912646c61e4748119939f65d37d429d1b930672feb35aac0415cd55c994e2827 SHA512 3943eda8f291a8fae24c64c02ec4491e438de0ad278212885f3cf38381c7d9b0e39248f5760e6719a3cfaadadf102bf0fae76f3a1740e4e8ae0e48999f706c3a
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/jgoodies-animation/jgoodies-animation-1.2.0-r1.ebuild b/dev-java/jgoodies-animation/jgoodies-animation-1.2.0-r2.ebuild
index 3a8392129d3e..2ad90150c273 100644
--- a/dev-java/jgoodies-animation/jgoodies-animation-1.2.0-r1.ebuild
+++ b/dev-java/jgoodies-animation/jgoodies-animation-1.2.0-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 JAVA_PKG_IUSE="doc examples source test"
 
@@ -11,18 +11,19 @@ MY_V=${PV//./_}
 
 DESCRIPTION="JGoodies Animation Library"
 HOMEPAGE="http://www.jgoodies.com/"
-SRC_URI="http://www.jgoodies.com/download/libraries/animation-${MY_V}.zip"
+SRC_URI="mirror://gentoo/animation-${MY_V}.zip -> ${P}.zip"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
+KEYWORDS="amd64 x86"
 
-DEPEND=">=virtual/jdk-1.4
+DEPEND="
 	app-arch/unzip
-	test? ( dev-java/ant-junit )"
+	>=virtual/jdk-1.6
+	test? ( dev-java/ant-junit:0 )"
 
-RDEPEND=">=virtual/jre-1.4
+RDEPEND="
+	>=virtual/jre-1.6
 	examples? (
 		>=dev-java/jgoodies-binding-1.1:1.0
 		>=dev-java/jgoodies-forms-1.0:0
@@ -33,8 +34,12 @@ S="${WORKDIR}/animation-${PV}"
 EANT_FILTER_COMPILER="jikes"
 EANT_DOC_TARGET=""
 
-java_prepare() {
-	find -name "*.jar" -delete || die
+DOCS=( RELEASE-NOTES.txt README.html )
+
+src_prepare() {
+	default
+
+	java-pkg_clean
 }
 
 src_test() {
@@ -44,9 +49,7 @@ src_test() {
 
 src_install() {
 	java-pkg_dojar build/animation.jar
-
-	dodoc RELEASE-NOTES.txt || die
-	dohtml README.html || die
+	einstalldocs
 	use doc && java-pkg_dohtml -r docs/*
 	use source && java-pkg_dosrc src/core/*
 	use examples && java-pkg_doexamples src/tutorial
diff --git a/dev-java/jgoodies-animation/jgoodies-animation-1.2.0.ebuild b/dev-java/jgoodies-animation/jgoodies-animation-1.2.0.ebuild
deleted file mode 100644
index 6e12c6377096..000000000000
--- a/dev-java/jgoodies-animation/jgoodies-animation-1.2.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-JAVA_PKG_IUSE="doc examples source test"
-
-inherit java-pkg-2 java-ant-2
-
-MY_V=${PV//./_}
-DESCRIPTION="JGoodies Animation Library"
-HOMEPAGE="http://www.jgoodies.com/"
-SRC_URI="http://www.jgoodies.com/download/libraries/animation-${MY_V}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.4
-	app-arch/unzip
-	test? ( dev-java/ant-junit )"
-# Remove x86 when https://bugs.gentoo.org/show_bug.cgi?id=186081
-# is done
-RDEPEND=">=virtual/jre-1.4
-	examples? ( x86? (
-		>=dev-java/jgoodies-binding-1.1
-		>=dev-java/jgoodies-forms-1.0
-	) )"
-
-S="${WORKDIR}/animation-${PV}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Remove the packaged jar
-	rm -v lib/*.jar *.jar || die
-
-	# cp ${FILESDIR}/build-${PV}.xml ${S}
-	java-ant_xml-rewrite -f build.xml -d -e javac -a bootclasspath \
-		|| die "Failed to fix bootclasspath"
-	java-pkg_filter-compiler jikes
-}
-
-# precompiled javadocs
-EANT_DOC_TARGET=""
-
-src_test() {
-	eant test -Djunit.jar.present=true \
-		-Djunit.jar=$(java-pkg_getjar junit junit.jar)
-}
-
-src_install() {
-	java-pkg_dojar build/animation.jar
-
-	dodoc RELEASE-NOTES.txt || die
-	dohtml README.html || die
-	use doc && java-pkg_dohtml -r docs/*
-	use source && java-pkg_dosrc src/core/*
-	use examples && java-pkg_doexamples src/tutorial
-}