gentoo resync : 19.03.2019

2 files changed, 28 insertions, 15 deletions

diff --git a/dev-java/jline/Manifest b/dev-java/jline/Manifest
index beff0e251d2b..3713b2057255 100644
--- a/dev-java/jline/Manifest
+++ b/dev-java/jline/Manifest
@@ -2,6 +2,6 @@ AUX maven-build.properties 501 BLAKE2B aaaaeb13e4e23588d6fe8c5e990b1e95edade85a7
 AUX maven-build.xml 8634 BLAKE2B 4d1078e1201baf11da35772d0e48304522cad6b606a6d601c449bf1d97b2a43725ddcf703dea154ac923955aac5489d164686fb042fcb7c1753d0e9ef619a283 SHA512 45648b88f3df01e0623483c6c409ce1fb57b6b73e62775064b4bc7762d1dc3a3ead3a4925efe987986081ed34c26195827f3f34a1b631fdf4e7ce227376c2936
 DIST jline-1.0.zip 463082 BLAKE2B 4f4eec5a2674bf97ed9fe83c60d339fce54dcd556aca6e95db74438e87253fd4e36e4eef26b3ac14ed84fff3d2fe1b58ba3a6fe13f33d96fe50a34f7bb34f541 SHA512 2957e19a3536d89aeaf8f27afb1f8eb4eb8bcc99560244c7f1ba14693a84a2f5e677a6c21d5f85ec519674cc4cd6cb3c9e4725cb4797144168d2f6df3954aba9
 DIST jline-2.12.1.tar.gz 97289 BLAKE2B 375711ad78cba26c0b4702dd739a18dd4db2fd1e8b16ce817dd1f567c405b7b0f96c72a6c6b7fabff1520617cf9149a29040e132d0b61e2d57149bb83b404c8d SHA512 368492fa0b28e6aa3827db05d266b332935d9a03c2f6645d039941c61a698e85fd57accfac444503de4cb2f2dae5787496924b8d258faad1c18b6cafe787f99d
-EBUILD jline-1.0.ebuild 1644 BLAKE2B 4069f204bdcd09f156112ca33c12fbdc91da13f6a3ec124104ef54cbabb3b0acd9be65a81fa2e639d3f91f155b21eb8d0afb53abc9d74bcac22a1acedfac761b SHA512 195e08810e2e05ab6c3b2009ae407d3040505dfb12c303164e22110a9695e471d030e513c7cdfeb7bdcf0374e3f2fed3c1330138db0d119ac667e5a25e7ce26b
+EBUILD jline-1.0-r1.ebuild 1667 BLAKE2B 1f394d1712c8f41fd5aff73df0fab877923793c58ac77c2042dd173a58c5097b949bf765e047e9406571479d3659273431650d09a6606cb644034feda54f06e4 SHA512 312aa559051fcaf628a18e95ddc55944fc2fceffe8e5fb16ed92687171c43a62e06cc5cda00777e765364b848dafcacdc681eaa35cdc997af71030232638072b
 EBUILD jline-2.12.1-r1.ebuild 1262 BLAKE2B 21b4efdf0413e9af3693154de0e7259f098b31bda663edb5ca40ba3f7ce46c03f7f98924ef0b4cc40a0ecbcca8ecfe6a7a40065fe81bcb0f0558187d6a3d485a SHA512 47891ca0a85a3e3414bab175e9cfd95b037f855effb069f682335042de102a622e16dc7bb8236481347d5e7493c1186ee9dff690c3ac72cc447b8542288e3ced
 MISC metadata.xml 375 BLAKE2B 6ac502feb83c678011ccf4b923c31184399f1feafdf3dbd8703d0c3c69900c1460da474eeb304d48590cb19ab7d128c8d8c0db48982e1283b527a0dfaf1668c2 SHA512 17a44da075005f0417e99ae638ba547800d799b98375f73c4bf7fc418b12e33e916952812850b63c623234bce98ebfd6eb525f7015e67cdaee16c38ad5f4b684
diff --git a/dev-java/jline/jline-1.0.ebuild b/dev-java/jline/jline-1.0-r1.ebuild
index 5d846154e3f4..60944d342c3e 100644
--- a/dev-java/jline/jline-1.0.ebuild
+++ b/dev-java/jline/jline-1.0-r1.ebuild
@@ -1,40 +1,53 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
+EAPI=6
+
 JAVA_PKG_IUSE="source test"
+
 inherit java-pkg-2 java-ant-2
 
-DESCRIPTION="A Java library for handling console input"
+DESCRIPTION="Handle console input in Java"
 HOMEPAGE="http://jline.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
 
-DEPEND=">=virtual/jdk-1.4
+DEPEND="
+	>=virtual/jdk-1.6
 	app-arch/unzip
-	test? ( dev-java/ant-junit )"
-RDEPEND=">=virtual/jre-1.4"
+	test? (
+		dev-java/ant-junit:0
+		dev-java/junit:0
+	)"
+
+RDEPEND="
+	>=virtual/jre-1.6"
 
 S="${WORKDIR}/${P}/src"
 
-java_prepare() {
-	rm -fv "${WORKDIR}"/${P}/*.jar || die
+src_prepare() {
+	default
+	java-pkg_clean
 
-	# we don't support maven for building yet. this build.xml was generated by:
+	# we don't support maven for building yet.
+	# this build.xml was generated by:
 	# - mvn ant:ant
 	# - tweak build.xml to not load properties from home dir
 	# - tweak the test target to match the test cases
 	# - change maven.repo.local from ~/.maven to "lib" in .properties
 	# - change classpath definitions to "*.jar"
+
 	cp "${FILESDIR}/maven-build.xml" build.xml || die
 	cp "${FILESDIR}/maven-build.properties" . || die
 	java-ant_ignore-system-classes
 
-	mkdir lib && cd lib || die
-	use test && java-pkg_jar-from --build-only junit
+	if use test; then
+	    mkdir lib || die
+	    cd lib || die
+		java-pkg_jar-from --build-only junit
+	fi
 }
 
 src_compile() {
@@ -51,7 +64,7 @@ src_test() {
 
 src_install() {
 	java-pkg_newjar target/${P}.jar
-	#no api docs in this release
-	#use doc && java-pkg_dojavadoc ../apidocs
+	# no api docs in this release
+	# use doc && java-pkg_dojavadoc ../apidocs
 	use source && java-pkg_dosrc src/main/java
 }