Updating liguros repo

6 files changed, 138 insertions, 0 deletions

diff --git a/dev-java/libreadline-java/Manifest b/dev-java/libreadline-java/Manifest
new file mode 100644
index 000000000000..681ab055aa4b
--- /dev/null
+++ b/dev-java/libreadline-java/Manifest
@@ -0,0 +1 @@
+DIST libreadline-java-0.8.0.tar.gz 77122 BLAKE2B cd25c3aea6189d0d48a10c26ad2f359e7f22533fd4a22d22b8491fd19c2d12c0fda6c8f1b8908bd66be8094efb374a51c6877eb89835360c4a2be8d9107d1336 SHA512 16bbb01a4852244387d63d8d5a7203e2862f235d8a68b436f33b586c7a6ea5297d1fabfa910c54bc33cfdc43b5dfe80e9eb4828b80196a974410c90387c3d1f2
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
new file mode 100644
index 000000000000..34a01e48ae55
--- /dev/null
+++ b/dev-java/libreadline-java/files/libreadline-java-0.8.0-gmake.patch
@@ -0,0 +1,19 @@
+--- a/src/native/Makefile
++++ b/src/native/Makefile
+@@ -69,13 +69,13 @@ all: $(T_LIBS) 
+ lib: $(ROOTDIR)/$(LIB_PRE)$(TG).$(LIB_EXT)
+ 
+ JavaReadline:
+-	make TG=$@ lib
++	$(MAKE) TG=$@ lib
+ 
+ JavaEditline:
+-	make TG=$@ lib
++	$(MAKE) TG=$@ lib
+ 
+ JavaGetline:
+-	make TG=$@ lib
++	$(MAKE) TG=$@ lib
+ 
+ $(ROOTDIR)/$(LIB_PRE)$(TG).$(LIB_EXT): $(OBJECTS)
+ ifeq (MSC,$(WIN32))
diff --git a/dev-java/libreadline-java/files/libreadline-java-0.8.0-respect-flags.patch b/dev-java/libreadline-java/files/libreadline-java-0.8.0-respect-flags.patch
new file mode 100644
index 000000000000..9af21ba83d4b
--- /dev/null
+++ b/dev-java/libreadline-java/files/libreadline-java-0.8.0-respect-flags.patch
@@ -0,0 +1,27 @@
+diff --git a/src/native/Makefile b/src/native/Makefile
+index 679adb7..a1f2a6a 100644
+--- a/src/native/Makefile
++++ b/src/native/Makefile
+@@ -51,11 +51,11 @@ JavaEditline_LIBS = -ledit -ltermcap
+ ifeq (cygwin,$(WIN32))
+ JavaGetline_LIBS = -lcygwin
+ endif
+-CC = gcc
++CC ?= gcc
+ OBJ_EXT := o
+ LIB_PRE := lib
+ LIB_EXT := so
+-CFLAGS=-fPIC -DPOSIX
++CFLAGS += -fPIC -DPOSIX
+ endif
+ 
+ 
+@@ -97,7 +97,7 @@ ifeq (CYGWIN,$(WIN32))
+ 	$(CC) -W1,$(ROOTDIR)/lib$(TG).exp -o $@ \
+ 		$(OBJECTS) -W1,-e,_readline_init@12
+ else
+-	$(CC) -shared $(OBJECTS) $(LIBPATH) $($(TG)_LIBS) -o $@
++	$(CC) -shared $(LDFLAGS) $(OBJECTS) $(LIBPATH) $($(TG)_LIBS) -o $@
+ endif
+ endif
+ 
diff --git a/dev-java/libreadline-java/files/termcap-to-ncurses.patch b/dev-java/libreadline-java/files/termcap-to-ncurses.patch
new file mode 100644
index 000000000000..256cf6573da1
--- /dev/null
+++ b/dev-java/libreadline-java/files/termcap-to-ncurses.patch
@@ -0,0 +1,13 @@
+--- 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
+ INCLUDES          = -I $(JAVAINCLUDE) -I $(JAVANATINC)
+-LIBPATH           = -L/usr/lib/termcap 
+-JavaReadline_LIBS = -lreadline -ltermcap -lhistory
++LIBPATH           = 
++JavaReadline_LIBS = -lreadline -lncurses -lhistory
+ JavaEditline_LIBS = -ledit -ltermcap
+ ifeq (cygwin,$(WIN32))
+ JavaGetline_LIBS = -lcygwin
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
+}
diff --git a/dev-java/libreadline-java/metadata.xml b/dev-java/libreadline-java/metadata.xml
new file mode 100644
index 000000000000..efc454a899d0
--- /dev/null
+++ b/dev-java/libreadline-java/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">java-readline</remote-id>
+	</upstream>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>