From 1798c4aeca70ac8d0a243684d6a798fbc65735f8 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 20:57:42 +0100 Subject: gentoo resync : 14.07.2018 --- dev-java/libreadline-java/Manifest | 6 --- .../files/libreadline-java-0.8.0-gmake.patch | 21 --------- .../libreadline-java-0.8.0-respect-flags.patch | 27 ----------- .../files/termcap-to-ncurses.patch | 13 ------ .../libreadline-java-0.8.0-r3.ebuild | 53 ---------------------- dev-java/libreadline-java/metadata.xml | 11 ----- 6 files changed, 131 deletions(-) delete mode 100644 dev-java/libreadline-java/Manifest delete mode 100644 dev-java/libreadline-java/files/libreadline-java-0.8.0-gmake.patch delete mode 100644 dev-java/libreadline-java/files/libreadline-java-0.8.0-respect-flags.patch delete mode 100644 dev-java/libreadline-java/files/termcap-to-ncurses.patch delete mode 100644 dev-java/libreadline-java/libreadline-java-0.8.0-r3.ebuild delete mode 100644 dev-java/libreadline-java/metadata.xml (limited to 'dev-java/libreadline-java') diff --git a/dev-java/libreadline-java/Manifest b/dev-java/libreadline-java/Manifest deleted file mode 100644 index a9642f07f8ed..000000000000 --- a/dev-java/libreadline-java/Manifest +++ /dev/null @@ -1,6 +0,0 @@ -AUX libreadline-java-0.8.0-gmake.patch 532 BLAKE2B 2bdc0e198b5daf274ec2bce5cef04281793957ed5a9fd3cd182188ef18794a5c96081386ebc4e6031d0366b0d263062bc18e6e986a9455084ea8f5d1591ac3c3 SHA512 079f978e90968a6d04f717e25511320f69e4eea76b64b9ae928eea868433d4cfff2586c2598ff0b73eeb5f6146066d2926e5c6c7ec077a69e0f2abbcabb9c2c7 -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 -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 deleted file mode 100644 index 6de5cde18e89..000000000000 --- a/dev-java/libreadline-java/files/libreadline-java-0.8.0-gmake.patch +++ /dev/null @@ -1,21 +0,0 @@ -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 -@@ -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 deleted file mode 100644 index 9af21ba83d4b..000000000000 --- a/dev-java/libreadline-java/files/libreadline-java-0.8.0-respect-flags.patch +++ /dev/null @@ -1,27 +0,0 @@ -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 deleted file mode 100644 index 22921c80ba54..000000000000 --- a/dev-java/libreadline-java/files/termcap-to-ncurses.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- src/native/Makefile.org 2004-09-07 16:43:16.703100016 +0200 -+++ 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-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/metadata.xml b/dev-java/libreadline-java/metadata.xml deleted file mode 100644 index ee80557bb2d5..000000000000 --- a/dev-java/libreadline-java/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - java@gentoo.org - Java - - - java-readline - - -- cgit v1.2.3