12 files changed, 3 insertions, 201 deletions
diff --git a/dev-java/c3p0/c3p0-0.9.5.5.ebuild b/dev-java/c3p0/c3p0-0.9.5.5.ebuild
index 811960203a42..fd97f8c6e6d3 100644
--- a/dev-java/c3p0/c3p0-0.9.5.5.ebuild
+++ b/dev-java/c3p0/c3p0-0.9.5.5.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://www.mchange.com/projects/c3p0/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.src.tgz"
 LICENSE="|| ( EPL-1.0 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 
 CP_DEPEND="
 	dev-java/log4j:0
diff --git a/dev-java/gnu-jaf/gnu-jaf-1.1.2.ebuild b/dev-java/gnu-jaf/gnu-jaf-1.1.2.ebuild
index a51b85e9f953..6d6fbdfc459a 100644
--- a/dev-java/gnu-jaf/gnu-jaf-1.1.2.ebuild
+++ b/dev-java/gnu-jaf/gnu-jaf-1.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/classpathx/activation-${PV}.tar.gz"
 
 LICENSE="GPL-2-with-linking-exception"
 SLOT="1"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 x86"
 
 DEPEND=">=virtual/jdk-1.8"
 RDEPEND=">=virtual/jre-1.8"
diff --git a/dev-java/jrrd/Manifest b/dev-java/jrrd/Manifest
deleted file mode 100644
index 6704e0aaaa3f..000000000000
--- a/dev-java/jrrd/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST jrrd-1.0.1.tar.gz 320476 BLAKE2B c8f2a16bd9e3d1dc53e6523e7b936ea65e23852feb69af917df9fcb40fe63a69335faf0bb476779f1e618ad44dabfec52f890232a8d85d8d5aa5c901c739bb6f SHA512 f794f052af32544e17d5aef58c7acb068f442c85e991d7f11c25119d94edb4aebb75f744df53caa64f4fd1e9f900f9018a82790a77dcac48e071b13833a8cced
diff --git a/dev-java/jrrd/files/jrrd-1.0.1-javacflags.patch b/dev-java/jrrd/files/jrrd-1.0.1-javacflags.patch
deleted file mode 100644
index b211ec1f3cbe..000000000000
--- a/dev-java/jrrd/files/jrrd-1.0.1-javacflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile.am	(revision 7413)
-+++ b/Makefile.am	(working copy)
-@@ -15,7 +15,7 @@
- 
- .java.class:
- 	-mkdir -p $(classdir)
--	$(JAVAC) -d $(classdir) $<
-+	$(JAVAC) $(JAVACFLAGS) -d $(classdir) $<
- 
- rrd_jinterface.c: org_opennms_netmgt_rrd_rrdtool_Interface.h
- 
diff --git a/dev-java/jrrd/jrrd-1.0.1-r2.ebuild b/dev-java/jrrd/jrrd-1.0.1-r2.ebuild
deleted file mode 100644
index 286cb6ffdc32..000000000000
--- a/dev-java/jrrd/jrrd-1.0.1-r2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source"
-
-inherit autotools java-pkg-2
-
-DESCRIPTION="Java Interface to Tobias Oetiker's RRDtool"
-
-SRC_URI="mirror://sourceforge/opennms/${P}.tar.gz"
-HOMEPAGE="http://www.opennms.org/"
-KEYWORDS="amd64 x86"
-LICENSE="GPL-2"
-
-SLOT="0"
-
-CDEPEND="net-analyzer/rrdtool"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.6"
-
-PATCHES=( "${FILESDIR}/${P}-javacflags.patch" )
-
-src_configure() {
-	econf
-}
-
-src_compile() {
-	emake -j1
-	use doc && ejavadoc -d javadoc $(find org -name "*.java")
-}
-
-src_install() {
-	java-pkg_newjar "${S}/${PN}.jar"
-	java-pkg_doso .libs/*.so
-	use source && java-pkg_dosrc org
-	use doc && java-pkg_dojavadoc javadoc
-}
diff --git a/dev-java/jrrd/metadata.xml b/dev-java/jrrd/metadata.xml
deleted file mode 100644
index e25b5c52aab3..000000000000
--- a/dev-java/jrrd/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
-  <email>java@gentoo.org</email>
-  <name>Java</name>
- </maintainer>
- 
- <origin>gentoo-staging</origin>
-</pkgmetadata>
-\ No newline at end of file
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 e25b5c52aab3..000000000000
--- a/dev-java/libreadline-java/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
-  <email>java@gentoo.org</email>
-  <name>Java</name>
- </maintainer>
- 
- <origin>gentoo-staging</origin>
-</pkgmetadata>
-\ No newline at end of file