gentoo resync : 19.03.2019

5 files changed, 74 insertions, 63 deletions

diff --git a/dev-java/libreadline-java/Manifest b/dev-java/libreadline-java/Manifest
index a9642f07f8ed..ee184e3fffb4 100644
--- a/dev-java/libreadline-java/Manifest
+++ b/dev-java/libreadline-java/Manifest
@@ -1,6 +1,6 @@
-AUX libreadline-java-0.8.0-gmake.patch 532 BLAKE2B 2bdc0e198b5daf274ec2bce5cef04281793957ed5a9fd3cd182188ef18794a5c96081386ebc4e6031d0366b0d263062bc18e6e986a9455084ea8f5d1591ac3c3 SHA512 079f978e90968a6d04f717e25511320f69e4eea76b64b9ae928eea868433d4cfff2586c2598ff0b73eeb5f6146066d2926e5c6c7ec077a69e0f2abbcabb9c2c7
+AUX libreadline-java-0.8.0-gmake.patch 367 BLAKE2B 149491acf9d5383fe095a8533b6ffcfc966f3aeb2382d8ac1e4d03b1f8388c1d0d5a2475e83cc2c827fdc8e308b3536b98934c6adbe789100fefed4be3797d3e SHA512 2d91eb76dc14e37ea9b7b0a4e3aa87ae22b8fbf6ef4ad958318f6ecc0aaff331f6d5563c11c59fbafa0a1b36f30ed5c41850f4badaf7830ddd64d24d8569fa4c
 AUX libreadline-java-0.8.0-respect-flags.patch 651 BLAKE2B e8c4fe1901fb87b5f8b7fa9faa21e5446385e029aa034a482b883df174c0889c65ca09d7f34a7728d7dc2d8fc90ea3373f8dcb16f740befe5b9183481ed32844 SHA512 b3419484c6732d3396ae90fba0c77bec656bb705d63c8ec2bd999222c8e687d6fbecebfa10bcb91c8780e6ffa922e2d58318978073f382c4b7601cd569ec7abd
-AUX termcap-to-ncurses.patch 498 BLAKE2B 693eddef846b0b4e3f570d0cac46164b0990deeacdea55ad0ef547c3c7eabf7a682d2ac9c3360366d478a00c68703092f0641cdce1cc9ab6e6f464be4c2f8d02 SHA512 43b6494d94da3d8874da34caf3e191e489bdea3e680d76514f3acf7d1c55db784efd8220e9aa914831c8dc753c231a06d5c3980bdd28835a3369f4c1d862a932
-DIST libreadline-java-0.8.0-src.tar.gz 77122 BLAKE2B cd25c3aea6189d0d48a10c26ad2f359e7f22533fd4a22d22b8491fd19c2d12c0fda6c8f1b8908bd66be8094efb374a51c6877eb89835360c4a2be8d9107d1336 SHA512 16bbb01a4852244387d63d8d5a7203e2862f235d8a68b436f33b586c7a6ea5297d1fabfa910c54bc33cfdc43b5dfe80e9eb4828b80196a974410c90387c3d1f2
-EBUILD libreadline-java-0.8.0-r3.ebuild 1282 BLAKE2B ab39d4e9fa4d863a94355a886baca4a94804c52b95483dade22d644daf3fd0137ee5821d93d6089f55458ab40313fa7bb55a5c02aa7635f429616cd5341c828d SHA512 cc71cfc74461c13c190ef135d6a53a3f2704888b77ddb8a9401cdec69dc92fcac9fbe850c8eb079198edb9aec225f492118cc83bb3205be0105ecad313ed6221
+AUX termcap-to-ncurses.patch 502 BLAKE2B 4695fdfcb2329e8f2ba555fc06be7e9b3d1039509e046aa1059e8bd954840f641d1b0f8be7dff04850ef5dd54435a204cfe468e778f4767f1a8c6ddf1391cef1 SHA512 a7d157fe3455b10641ea15285ab610a1ef3d4c8b8906408e9caa483f8453c96143e02dcdd193bb11514a4e4c1e53c810de5346e88ea843ad39166a624c33f8f9
+DIST libreadline-java-0.8.0.tar.gz 77122 BLAKE2B cd25c3aea6189d0d48a10c26ad2f359e7f22533fd4a22d22b8491fd19c2d12c0fda6c8f1b8908bd66be8094efb374a51c6877eb89835360c4a2be8d9107d1336 SHA512 16bbb01a4852244387d63d8d5a7203e2862f235d8a68b436f33b586c7a6ea5297d1fabfa910c54bc33cfdc43b5dfe80e9eb4828b80196a974410c90387c3d1f2
+EBUILD libreadline-java-0.8.0-r4.ebuild 1401 BLAKE2B 181f24049a3a7ab1418d943763317de428dc297869983ab5f8d02ffae7e6fb53f48501ae5eb4029917e110eb53b61d2d683efb64bcfc1d63ba8970ab8f4b42db SHA512 c4ab6c49ee4a19f29365373793d46c4a55d7d3cd94eef1cb4090ec3e6e92cb6638be771257cde9fcf98d46d463ec2fcc817fa24beac95cfdf5370c2c63bf93a9
 MISC metadata.xml 319 BLAKE2B e82b45bce13253c5e40fffb3429166c0613d8841af08a626d6a9d70bfe5f69c036e8fdc4248cfe632ab8ccc54b6901df0ba02ce2faf0ad18b649ef87f92d9bed SHA512 e13714611711ecb54943d5d3ccc5a8ae8f9dcfb6e9a6e6c6e96d04d7d80dec6a07d76225850cb2cdbb6b2d6a99f0c5c5fd0c9c4a9a3c0724c6e8ed7b21a75e8f
diff --git a/dev-java/libreadline-java/files/libreadline-java-0.8.0-gmake.patch b/dev-java/libreadline-java/files/libreadline-java-0.8.0-gmake.patch
index 6de5cde18e89..34a01e48ae55 100644
--- a/dev-java/libreadline-java/files/libreadline-java-0.8.0-gmake.patch
+++ b/dev-java/libreadline-java/files/libreadline-java-0.8.0-gmake.patch
@@ -1,7 +1,5 @@
-Index: libreadline-java-0.8.0/src/native/Makefile
-===================================================================
---- libreadline-java-0.8.0.orig/src/native/Makefile
-+++ libreadline-java-0.8.0/src/native/Makefile
+--- a/src/native/Makefile
++++ b/src/native/Makefile
 @@ -69,13 +69,13 @@ all: $(T_LIBS) 
  lib: $(ROOTDIR)/$(LIB_PRE)$(TG).$(LIB_EXT)
  
diff --git a/dev-java/libreadline-java/files/termcap-to-ncurses.patch b/dev-java/libreadline-java/files/termcap-to-ncurses.patch
index 22921c80ba54..256cf6573da1 100644
--- a/dev-java/libreadline-java/files/termcap-to-ncurses.patch
+++ b/dev-java/libreadline-java/files/termcap-to-ncurses.patch
@@ -1,5 +1,5 @@
---- src/native/Makefile.org	2004-09-07 16:43:16.703100016 +0200
-+++ src/native/Makefile	2004-09-07 16:43:28.804919625 +0200
+--- a/src/native/Makefile.org	2004-09-07 16:43:16.703100016 +0200
++++ b/src/native/Makefile	2004-09-07 16:43:28.804919625 +0200
 @@ -45,8 +45,8 @@
  CFLAGS=-DWIN32=$(WIN32) -D__IBMC__
  else
diff --git a/dev-java/libreadline-java/libreadline-java-0.8.0-r3.ebuild b/dev-java/libreadline-java/libreadline-java-0.8.0-r3.ebuild
deleted file mode 100644
index 3fd6a4df55eb..000000000000
--- a/dev-java/libreadline-java/libreadline-java-0.8.0-r3.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 eutils
-
-DESCRIPTION="A JNI-wrapper to GNU Readline"
-HOMEPAGE="http://java-readline.sourceforge.net/"
-SRC_URI="mirror://sourceforge/java-readline/${P}-src.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-IUSE="elibc_FreeBSD"
-
-COMMON_DEP="sys-libs/ncurses"
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.4
-	${COMMON_DEP}"
-RESTRICT="test"
-
-java_prepare() {
-	epatch "${FILESDIR}/termcap-to-ncurses.patch"
-	# bug #157387, reported upstream
-	epatch "${FILESDIR}/${P}-gmake.patch"
-
-	# bug #157390
-	sed -i "s/^\(JC_FLAGS =\)/\1 $(java-pkg_javac-args)/" Makefile || die
-	if use elibc_FreeBSD; then
-		sed -i -e '/JAVANATINC/s:linux:freebsd:' Makefile || die "sed JAVANATINC failed"
-	fi
-
-	#Respect CC CFLAGS LDFLAGS #336302 #296741
-	epatch "${FILESDIR}"/${P}-respect-flags.patch
-}
-
-src_compile() {
-	emake -j1 || die "failed to compile"
-	if use doc; then
-		emake -j1 apidoc || die "failed to generate docs"
-	fi
-}
-
-src_install() {
-	java-pkg_doso *.so
-	java-pkg_dojar *.jar
-	use source && java-pkg_dosrc src/*
-	use doc && java-pkg_dojavadoc api
-	dodoc ChangeLog NEWS README README.1st TODO || die
-}
diff --git a/dev-java/libreadline-java/libreadline-java-0.8.0-r4.ebuild b/dev-java/libreadline-java/libreadline-java-0.8.0-r4.ebuild
new file mode 100644
index 000000000000..ba0a6235e08f
--- /dev/null
+++ b/dev-java/libreadline-java/libreadline-java-0.8.0-r4.ebuild
@@ -0,0 +1,66 @@
+# 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 eutils
+
+DESCRIPTION="A JNI-wrapper to GNU Readline"
+HOMEPAGE="http://java-readline.sourceforge.net/"
+SRC_URI="mirror://sourceforge/java-readline/${P}-src.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86"
+IUSE="elibc_FreeBSD"
+
+CDEPEND="sys-libs/ncurses:0="
+
+RDEPEND="
+	>=virtual/jre-1.6
+	${CDEPEND}"
+
+DEPEND="
+	>=virtual/jdk-1.6
+	${CDEPEND}"
+
+RESTRICT="test"
+
+# 1: See bug #157387 reported upstream.
+# 2: Respect CC CFLAGS LDFLAGS, see bugs #336302 #296741.
+PATCHES=(
+	"${FILESDIR}/termcap-to-ncurses.patch"
+	"${FILESDIR}/${P}-gmake.patch"
+	"${FILESDIR}/${P}-respect-flags.patch"
+)
+
+DOCS=( ChangeLog NEWS README README.1st TODO )
+
+src_prepare() {
+	default
+
+	# See bug #157390.
+	sed -i "s/^\(JC_FLAGS =\)/\1 $(java-pkg_javac-args)/" Makefile || die
+	if use elibc_FreeBSD; then
+		sed -i -e '/JAVANATINC/s:linux:freebsd:' Makefile || die "sed JAVANATINC failed"
+	fi
+
+}
+
+src_compile() {
+	emake -j1
+	if use doc; then
+		# src/org/gnu/readline/Readline.java is completely bogus and generate a
+		# truckload of errors. Let's call make without catching anything. :(
+		make -j1 apidoc
+	fi
+}
+
+src_install() {
+	java-pkg_doso *.so
+	java-pkg_dojar *.jar
+	use source && java-pkg_dosrc src/*
+	use doc && java-pkg_dojavadoc api
+}