commit: d72df5d650171d89cb1efa90a7d79d48038cd701 Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> AuthorDate: Sun Jan 16 17:35:12 2022 +0000 Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> CommitDate: Sun Jan 16 17:35:12 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d72df5d6
dev-java/libreadline-java: treeclean Closes: https://bugs.gentoo.org/829517 Closes: https://bugs.gentoo.org/614480 Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org> dev-java/libreadline-java/Manifest | 1 - .../files/libreadline-java-0.8.0-gmake.patch | 19 ------- .../libreadline-java-0.8.0-respect-flags.patch | 27 ---------- .../files/termcap-to-ncurses.patch | 13 ----- .../libreadline-java-0.8.0-r5.ebuild | 61 ---------------------- dev-java/libreadline-java/metadata.xml | 11 ---- profiles/package.mask | 4 -- 7 files changed, 136 deletions(-) diff --git a/dev-java/libreadline-java/Manifest b/dev-java/libreadline-java/Manifest deleted file mode 100644 index 681ab055aa4b..000000000000 --- a/dev-java/libreadline-java/Manifest +++ /dev/null @@ -1 +0,0 @@ -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 deleted file mode 100644 index 34a01e48ae55..000000000000 --- a/dev-java/libreadline-java/files/libreadline-java-0.8.0-gmake.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- 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 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 256cf6573da1..000000000000 --- a/dev-java/libreadline-java/files/termcap-to-ncurses.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- 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-r5.ebuild b/dev-java/libreadline-java/libreadline-java-0.8.0-r5.ebuild deleted file mode 100644 index 7df017e7b4cf..000000000000 --- a/dev-java/libreadline-java/libreadline-java-0.8.0-r5.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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" - -CDEPEND="sys-libs/ncurses:0=" - -RDEPEND=" - >=virtual/jre-1.8:* - ${CDEPEND}" - -DEPEND=" - virtual/jdk:1.8 - ${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 -} - -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 deleted file mode 100644 index 7b73f81973fb..000000000000 --- a/dev-java/libreadline-java/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="project"> - <email>[email protected]</email> - <name>Java</name> - </maintainer> - <upstream> - <remote-id type="sourceforge">java-readline</remote-id> - </upstream> -</pkgmetadata> diff --git a/profiles/package.mask b/profiles/package.mask index 1883f4af2717..08f143e83260 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -283,10 +283,6 @@ dev-go/go-text =sys-kernel/vanilla-kernel-5.14* =virtual/dist-kernel-5.14* -# Volkmar W. Pogatzki <[email protected]> (2021-12-18) -# Package without consumers. Bug #829517 Bug_#614480. Removal in 30 days. -dev-java/libreadline-java - # Georgy Yakovlev <[email protected]> (2021-12-14) # AT&T decided to roll back community changes in March 2020 # for version 2020.x.x
