gentoo auto-resync : 04:01:2024 - 01:57:56

16 files changed, 0 insertions, 607 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 2954e4d885f6..f158ad45742a 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/emma/Manifest b/dev-java/emma/Manifest
index 465100556177..52f4cb2e6eda 100644
--- a/dev-java/emma/Manifest
+++ b/dev-java/emma/Manifest
@@ -1,5 +1,4 @@
 AUX emma-2.0.5312-java15api.patch 841 BLAKE2B b3a03a2f309303e0966703204a66980081778ca261b7ed82d8471ce3a295e4b5f8af0d6a8547f01150930a7c3378f8472ccef3ccb9382b74d9782e246530bc93 SHA512 cd485a0bd9bb157f9a0e420bd3bd8863ae5b1127401b8ff8944459c04fa2f5a7e6b008d9f86affe25cb24cf007d9dfe780f843745c6fcdfcfe1f734e9bb8fd23
 DIST emma-2.0.5312-src.zip 421109 BLAKE2B bca287d7cdd61902fd156eac80596db07801e8dabd342d7cc68d3e0b4c0ff7b4de2b14d8b01d3521a291f7401ddc0ead67db6f9c601b26669ce9265bc28e0209 SHA512 d99b7ff1c4682a97f714f74cc6142bb766cde47bcb33932dc466f1e505e836883f01faa0a959dad77c0837fca3ae744754e0fcdc34d7a8d14720b0b7ce90ee4b
-EBUILD emma-2.0.5312-r4.ebuild 1077 BLAKE2B b6d34c9723b82b2b3ec0a3627e66f956a3b176b1d5b7d8a76ded455e5a9dea9f5d5679c7cca9fb4a53965f51e5b1fdb6d39227c1f143695f3dd8a428c03fca1c SHA512 e9521a424929f3039a60ad1b700d80b48944d2ba5a4997d45fb7c4e942c571262564f75de80dbcd5a8329c92d8434cb5a30aa1d5905a74628e09b7a11468c4f4
 EBUILD emma-2.0.5312-r5.ebuild 1823 BLAKE2B 9f776ee22beab70bf495eb0afbd8f3136626af1a8dfbb4d863986f871540965203c7bf674424dfba29a5984259c9520acb69d292fac1dedee5dab4e5373fb2b3 SHA512 3e2b53b333a97f0d6c79ba27ee132c33e36ef12ebc6893c80dfa2d3ad7055dfee7347a33d858c1435d48812ba4a0731b46c8ad7a928dbded07cb1949981f8aa0
 MISC metadata.xml 860 BLAKE2B 9e3723bdb2d6d82a4b6882e6e495367b94717dcc6b62154fa76a275bb39bd8418d0a748c990b28e9c21ef7a7c4703d6a80374cbeae69f7655e36f57110433d7f SHA512 2de0835234df8151fc96f57a6662357589eed19f6b528f4e9084633a79c60bc0e82dfb0447e5398f0f810fe481c278e75220f14fce5a26c65aeb6e0dbe43883a
diff --git a/dev-java/emma/emma-2.0.5312-r4.ebuild b/dev-java/emma/emma-2.0.5312-r4.ebuild
deleted file mode 100644
index 0ea013aa1a3e..000000000000
--- a/dev-java/emma/emma-2.0.5312-r4.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Free Java code coverage tool"
-HOMEPAGE="http://emma.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.zip"
-
-LICENSE="CPL-1.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-IUSE="+launcher"
-
-CDEPEND="
-	dev-java/ant-core
-	launcher? ( !sci-biology/emboss )"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.8:*"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.8:*"
-
-BDEPEND="app-arch/unzip"
-
-EANT_BUILD_TARGET="build"
-
-src_prepare() {
-	default
-	eapply "${FILESDIR}/${P}-java15api.patch"
-	# bcp mangling unneccessary for 1.4+ and breaks with IBM 1.6 - bug #220463
-	sed -e '/bootclasspathref/d' -e '/extdirs/d' -i build.xml || die
-}
-
-src_install() {
-	java-pkg_dojar "dist/${PN}.jar"
-	java-pkg_dojar "dist/${PN}_ant.jar"
-	java-pkg_register-ant-task
-
-	use launcher && java-pkg_dolauncher ${PN} --main emmarun
-
-	# One of these does not have java sources
-	use source && java-pkg_dosrc */*/com 2> /dev/null
-}
diff --git a/dev-java/lz4-java/Manifest b/dev-java/lz4-java/Manifest
index 33e3b78a0351..0de1b1c55682 100644
--- a/dev-java/lz4-java/Manifest
+++ b/dev-java/lz4-java/Manifest
@@ -1,9 +1,4 @@
 AUX lz4-java-1.8.0-fix-load.patch 894 BLAKE2B 30e0dfc301a4926d1cb8846c4391dacb20d07f2e33f0e36c48efb220acf994c916f9f592f645352102448e4f69652a55eda739faac8f7ba0378abdd3e9c5fc10 SHA512 d7d40e091ee45bb11bcb95f251707d9b1678ff658d02369def9e92114b16b4b21d55953719d35570d78faec561e6eca571d54e7bf9074ac7147b9578ab5e90db
-AUX lz4-java-1.8.0-gentoo-classpath.xml 179 BLAKE2B 78a1d2615b0ceca3990b58891fa560ed2eeabb8dff397cef99b9f3281cb3d70a563257639051f2f96fa574fe5edefe3bae231a6553a6c1daf96df5e97a44aaee SHA512 b815a4f876a9d8fc30b1c68ec4b8c2fbee5e544247d5272af033d04ffb60fe018713b15f04740348306411c69775bcbc339e30df35bb147a208d119e1c11c017
-AUX lz4-java-1.8.0-print-os-props.patch 880 BLAKE2B 53256984d5afc08d85bee460f6f7ce4a333ea5960fbe3a6a6322338477d701582ee33bf52b05ec3105147fca3ea58424f82b742f965b6d638e56b5cf7e0f3135 SHA512 9c5dedab3cfa09014f9235d4a20dc9a7136b6925d53840e0721c7a58d7a2d2faa3e066440a7e23be60e79c1817813a683a9e76c9947d23ac168882421a498f5b
-AUX lz4-java-1.8.0-r1-Makefile 1528 BLAKE2B e3f8825785c329fc2c9a480dc5e7dbb00268a87d0fa84fb09c70af5259f7a108970c9abbbd9276218d7ae3500ae28d5b4a782e1e9e80046af0e394d8a677944d SHA512 1b391cf872cfdc30e7b7b3f74b7cf4b6f1d9c8268be2556cfce4b9f51fe8bd5c1bf717bdfd2c7a5b05db63231ccb5b315fd34de7aa96e4eb418124bf4c47d3dd
-AUX lz4-java-1.8.0-skip-ivy.patch 3236 BLAKE2B cae70a2600d8bc6f3e89e901728261d23102ec61ae35dfe678542953ecd5467f33d724154903dae3e7214c4c5bfcbf5b6956ae70f7806e270a9cb747b3661d47 SHA512 fd24db414b0944cac78e0b39014d9de38d694e958352d9dc4b83560c84c16790844f197a80bb4f90f084bb882406992ed72da5e54dc774122a347c2df2c76301
 DIST lz4-java-1.8.0.tar.gz 1069398 BLAKE2B 02ee363fc42eeeade01f04649416dd874513f4517264c6e1b6474d64e8b81e2ee9ff1f55e51b508608929e8d78cb30e98d929cc4a118c03f86b0e69bae237e8a SHA512 ae78748d984d2ede18018d5e9ae6aee0d5fe6ac8b56d717f863968cfad6e9f85b62305692345ba16002bee68278e87a0364aa98aeb92e2af6dc169e5d5b612d4
-EBUILD lz4-java-1.8.0-r1.ebuild 3162 BLAKE2B af48a8774cc7e0c67fbeea0b48383fc48b909d90cc05f03217846f082741416253dd215b073cb41cf1508b2b42eb7b22b45ba9191b8a739ce0276de078b40209 SHA512 0fd583fcfba0fb4760c263aec6a2d4cb3334c7c780c47ebee392ce3c78e4b6a1f0bc181a9d7470e49ce48e9bc72166bb785a522a29e4842fe640629fd5ed00e9
 EBUILD lz4-java-1.8.0-r4.ebuild 2536 BLAKE2B 20f328d317b8563eb94c4a9c8570227f022695244341b17556d40c16a54efbba229c5bc6ff2f1bca59cce30966972c82542a7cd37093b36fe237b81119a98c72 SHA512 c9f0dbd27d2585b6976ef76d1a9b187e1d977a1a3e6d9e3b704f3cd24163342a3a6ecda0edbecc1b70edd62fc0fe640b140edad8e2699f47b3f67eb35570daa6
 MISC metadata.xml 314 BLAKE2B 029f69d900ca078525f401c897f9ebc3eb63d5fdbc201f8d42cadec684a66d1797fe4217ae4c8e874974fcfe74a2a1c024d7bf8bb165c8a9ec22ea103b11e5d7 SHA512 6a8817e187e78b1f175b35a07c9fa498f4b8af167a971320845148409ba352e5aa560cd907fb7e94336ebda07b7c7b5db407f0e9bdc94356e5d2090ee5f2fc9c
diff --git a/dev-java/lz4-java/files/lz4-java-1.8.0-gentoo-classpath.xml b/dev-java/lz4-java/files/lz4-java-1.8.0-gentoo-classpath.xml
deleted file mode 100644
index 2392679c4a69..000000000000
--- a/dev-java/lz4-java/files/lz4-java-1.8.0-gentoo-classpath.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<project name="gentoo-classpath">
-    <path id="mvel.classpath">
-        <pathelement path="${gentoo.classpath}" />
-    </path>
-</project>
diff --git a/dev-java/lz4-java/files/lz4-java-1.8.0-print-os-props.patch b/dev-java/lz4-java/files/lz4-java-1.8.0-print-os-props.patch
deleted file mode 100644
index d4363b6853e4..000000000000
--- a/dev-java/lz4-java/files/lz4-java-1.8.0-print-os-props.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From b8d50d44ba1c0e4b5bf297f7499ad0fb5b82706e Mon Sep 17 00:00:00 2001
-From: Yuan Liao <liaoyuan@gmail.com>
-Date: Wed, 19 Jan 2022 10:09:14 -0800
-Subject: [PATCH] build.xml: Add target that prints JVM system properties os.*
-
-The Gentoo custom JNI Makefile needs some of those properties.
-
-Signed-off-by: Yuan Liao <liaoyuan@gmail.com>
----
- build.xml | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/build.xml b/build.xml
-index b7940ab..96e52ea 100644
---- a/build.xml
-+++ b/build.xml
-@@ -62,6 +62,11 @@
-     <javaversion atleast="10"/>
-   </condition>
- 
-+  <target name="os-props"
-+    description="echo values of JVM system properties os.* to file os.properties">
-+    <echoproperties prefix="os." destfile="os.properties" />
-+  </target>
-+
-   <target name="clean" description="clean working copy">
-     <delete dir="${build}" />
-     <delete dir="${dist}" />
--- 
-2.34.1
-
diff --git a/dev-java/lz4-java/files/lz4-java-1.8.0-r1-Makefile b/dev-java/lz4-java/files/lz4-java-1.8.0-r1-Makefile
deleted file mode 100644
index 4a766552c65e..000000000000
--- a/dev-java/lz4-java/files/lz4-java-1.8.0-r1-Makefile
+++ /dev/null
@@ -1,47 +0,0 @@
-# Gentoo custom Makefile for the JNI portion of lz4-java
-#
-# Adapted from the logic for target "compile-jni" in build.xml,
-# but uses lz4 installed on the system.  This Makefile respects
-# custom CFLAGS and LDFLAGS settings, whereas build.xml does not.
-
-# Java system properties read by build.xml
-PLATFORM ?= linux
-SRC ?= src
-BUILD ?= build
-JAVA_HOME ?=
-# Requires lz4-java-*-print-os-props.patch
-OS_ARCH := $(shell ant os-props 2>&1 > /dev/null && \
-		grep 'os\.arch=' os.properties | sed -e 's/os\.arch=//')
-
-MKDIR_P = mkdir -p
-
-SRC_DIR := $(SRC)/jni
-OBJS_DIR_PREFIX := $(BUILD)/objects
-OBJS_DIR := $(OBJS_DIR_PREFIX)/$(SRC_DIR)
-OUT_DIR := $(BUILD)/jni/net/jpountz/util/$(PLATFORM)/$(OS_ARCH)
-
-SRC_FILES := $(wildcard $(SRC_DIR)/*.c)
-OBJS := $(addprefix $(OBJS_DIR_PREFIX)/,$(SRC_FILES:.c=.o))
-SONAME = liblz4-java.so
-
-# C compiler arguments may be obtained by running 'ant -v compile-jni',
-# as long as dev-java/cpptasks is in the classpath
-CFLAGS := -fPIC $(CFLAGS)
-
-$(OUT_DIR)/$(SONAME): $(OBJS) | $(OUT_DIR)
-	# '-llz4' must be listed after this package's objects
-	# https://wiki.gentoo.org/wiki/Project:Quality_Assurance/As-needed#Importance_of_linking_order
-	$(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname,$(SONAME) -o $@ $^ -llz4
-
-$(OBJS_DIR_PREFIX)/%.o: %.c | $(OBJS_DIR)
-	$(CC) $(CFLAGS) -c -o $@ \
-		-I$(JAVA_HOME)/../include -I$(JAVA_HOME)/../include/$(PLATFORM) \
-		-I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/$(PLATFORM) \
-		-I$(BUILD)/jni-headers \
-		$<
-
-$(OUT_DIR):
-	$(MKDIR_P) $@
-
-$(OBJS_DIR):
-	$(MKDIR_P) $@
diff --git a/dev-java/lz4-java/files/lz4-java-1.8.0-skip-ivy.patch b/dev-java/lz4-java/files/lz4-java-1.8.0-skip-ivy.patch
deleted file mode 100644
index 26c09e147072..000000000000
--- a/dev-java/lz4-java/files/lz4-java-1.8.0-skip-ivy.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From 95ae85542f39cecd1af6a3e661ad6120195d2304 Mon Sep 17 00:00:00 2001
-From: Yuan Liao <liaoyuan@gmail.com>
-Date: Mon, 20 Dec 2021 09:57:31 -0800
-Subject: [PATCH] build.xml: Skip Ivy logic and use Gentoo classpath
-
-Signed-off-by: Yuan Liao <liaoyuan@gmail.com>
----
- build.xml | 22 +++++++---------------
- 1 file changed, 7 insertions(+), 15 deletions(-)
-
-diff --git a/build.xml b/build.xml
-index b7940ab..ff321c6 100644
---- a/build.xml
-+++ b/build.xml
-@@ -20,6 +20,8 @@
-     xmlns:junit4="antlib:com.carrotsearch.junit4"
-     xmlns:mvn="antlib:org.apache.maven.artifact.ant">
- 
-+  <import file="gentoo-classpath.xml" />
-+
-   <property name="src" location="src"/>
-   <property name="build" location="build"/>
-   <property name="dist"  location="dist"/>
-@@ -81,8 +83,6 @@
-   </target>
- 
-   <target name="install-cpptasks" unless="cpptasks.available">
--    <ivy:cachepath organisation="ant-contrib" module="cpptasks" revision="1.0b5"
--      inline="true" conf="default" transitive="true" pathid="cpptasks.classpath"/>
-     <taskdef uri="antlib:net.sf.antcontrib.cpptasks" resource="net/sf/antcontrib/cpptasks/antlib.xml" classpathref="cpptasks.classpath"/>
-     <property name="cpptasks.available" value="true"/>
-   </target>
-@@ -117,22 +117,14 @@
- 
-   <target name="init">
-     <tstamp />
--    <ivy:resolve file="${ivy.xml.name}" conf="test" />
--    <ivy:retrieve />
-   </target>
- 
-   <target name="install-junit4" depends="init" unless="junit4.available">
--    <taskdef uri="antlib:com.carrotsearch.junit4">
--      <classpath>
--        <fileset dir="${lib}" includes="*.jar" />
--      </classpath>
--    </taskdef>
-+    <taskdef uri="antlib:com.carrotsearch.junit4" resource="com/carrotsearch/junit4/antlib.xml" classpath="${gentoo.classpath}"/>
-     <property name="junit4.available" value="true" />
-   </target>
- 
-   <target name="generate-sources" depends="init">
--    <ivy:cachepath organisation="org.mvel" module="mvel2" revision="2.3.2.Final"
--      inline="true" conf="default" transitive="true" pathid="mvel.classpath"/>
-     <mkdir dir="${build}/java" />
-     <java
-       fork="true"
-@@ -244,12 +236,12 @@
-     <pathelement path="${build}/classes" />
-     <pathelement path="${build}/unsafe-classes" />
-     <pathelement path="${build}/generated-classes" />
--    <fileset dir="lib" includes="*.jar" />
-+    <pathelement path="${gentoo.classpath}" />
-   </path>
- 
-   <path id="compile.tests.classpath.with.jar">
-     <pathelement path="${lz4-java.jar}" />
--    <fileset dir="lib" includes="*.jar" />
-+    <pathelement path="${gentoo.classpath}" />
-   </path>
- 
-   <path id="test.classpath">
-@@ -260,14 +252,14 @@
-     <pathelement path="${build}/unsafe-classes" />
-     <pathelement path="${build}/generated-classes" />
-     <pathelement path="${build}/test-classes" />
--    <fileset dir="${lib}" includes="*.jar" />
-+    <pathelement path="${gentoo.classpath}" />
-   </path>
- 
-   <path id="test.classpath.with.jar">
-     <pathelement path="${lz4-java.jar}" />
-     <pathelement path="${src}/test-resources" />
-     <pathelement path="${build}/test-classes" />
--    <fileset dir="${lib}" includes="*.jar" />
-+    <pathelement path="${gentoo.classpath}" />
-   </path>
- 
-   <target name="test" description="run tests">
--- 
-2.32.0
-
diff --git a/dev-java/lz4-java/lz4-java-1.8.0-r1.ebuild b/dev-java/lz4-java/lz4-java-1.8.0-r1.ebuild
deleted file mode 100644
index 993a8803f183..000000000000
--- a/dev-java/lz4-java/lz4-java-1.8.0-r1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.lz4:lz4-java:1.8.0"
-
-inherit java-pkg-2 java-ant-2 toolchain-funcs
-
-DESCRIPTION="LZ4 compression for Java"
-HOMEPAGE="https://github.com/lz4/lz4-java"
-SRC_URI="https://github.com/lz4/lz4-java/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-# Tests require com.carrotsearch.randomizedtesting:junit4-ant, which is yet to
-# be packaged.  Some extra steps are required before running the tests:
-# 1. Download junit4-ant 2.7.x from https://mvnrepository.com/artifact/com.carrotsearch.randomizedtesting/junit4-ant
-# 2. Set EANT_GENTOO_CLASSPATH_EXTRA to the path to junit4-ant-2.7.*.jar
-# 3. ppc64 only: Install test dependencies that are unkeyworded
-# 4. Set ALLOW_TEST="all"
-RESTRICT="test"
-
-CDEPEND="
-	app-arch/lz4:=
-"
-
-# The version requirement on mvel is strict; mvel-2.4.* generates source files
-# incorrectly, which causes build failure of this package
-DEPEND="
-	>=virtual/jdk-1.8:*
-	dev-java/mvel:2.3
-	dev-libs/xxhash
-	test? (
-		dev-java/junit:4
-		!ppc64? (
-			dev-java/randomized-runner:0
-		)
-	)
-	${CDEPEND}
-"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-	${CDEPEND}
-"
-
-# Ant is only needed to generate JNI headers;
-# the JNI shared object will be built by the custom Makefile
-EANT_BUILD_TARGET="compile-java generate-headers"
-EANT_DOC_TARGET="docs"
-EANT_EXTRA_ARGS="-Djava.io.tmpdir=${T}"
-EANT_TEST_GENTOO_CLASSPATH="randomized-runner"
-
-pkg_setup() {
-	java-pkg-2_pkg_setup
-	local build_only_cp="$(java-pkg_getjars --build-only mvel-2.3)"
-	if [[ -z "${EANT_GENTOO_CLASSPATH_EXTRA}" ]]; then
-		EANT_GENTOO_CLASSPATH_EXTRA="${build_only_cp}"
-	else
-		EANT_GENTOO_CLASSPATH_EXTRA+=":${build_only_cp}"
-	fi
-}
-
-src_prepare() {
-	eapply "${FILESDIR}/${P}-print-os-props.patch"
-	eapply "${FILESDIR}/${P}-skip-ivy.patch"
-	cp "${FILESDIR}/${P}-r1-Makefile" Makefile || die "Failed to copy Makefile"
-	cp "${FILESDIR}/${P}-gentoo-classpath.xml" gentoo-classpath.xml ||
-		die "Failed to copy Gentoo classpath injection XML"
-	java-pkg-2_src_prepare
-	rm -r src/resources || die "Failed to remove pre-built shared libraries"
-}
-
-src_compile() {
-	java-pkg-2_src_compile
-	emake CC="$(tc-getCC)" JAVA_HOME="${JAVA_HOME}"
-	# JNI has already been built by the Makefile at this point
-	# Also pretend cpptasks is available, which is required by build.xml
-	EANT_EXTRA_ARGS+=" -Dcpptasks.available=true -Dskip.jni=true"
-	# Manually call 'ant jar' to include the JNI shared object in JAR
-	eant jar -f "${EANT_BUILD_XML}" ${EANT_EXTRA_ARGS}
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_newjar 'dist/${ivy.module}.jar'
-	java-pkg_doso $(find build/jni -name "*.so")
-	use doc && java-pkg_dojavadoc build/docs
-	# Ant project's 'sources' target generates a source JAR rather than a Zip
-	# archive; we simply let java-utils-2.eclass create the source Zip archive
-	# from the same source directories the 'sources' target would access
-	# https://github.com/lz4/lz4-java/blob/1.8.0/build.xml#L323-L330
-	use source && java-pkg_dosrc src/java/* src/java-unsafe/*
-}
diff --git a/dev-java/maven-bin/Manifest b/dev-java/maven-bin/Manifest
index 8c19afc83517..e2e88a5dee9b 100644
--- a/dev-java/maven-bin/Manifest
+++ b/dev-java/maven-bin/Manifest
@@ -1,7 +1,5 @@
 DIST apache-maven-3.8.8-bin.tar.gz 8296049 BLAKE2B af6353193365ed33e8f2f0a7e4d31933132751f142ebbdb68aab7a74ad2dda6593bf34cef9d8d56d6c93ff93293b75517a10a5c1c048733b8c911f4ac150bdf6 SHA512 332088670d14fa9ff346e6858ca0acca304666596fec86eea89253bd496d3c90deae2be5091be199f48e09d46cec817c6419d5161fb4ee37871503f472765d00
-DIST apache-maven-3.9.5-bin.tar.gz 9359994 BLAKE2B d73d5bc7f5028068492ed7710897b370e4a97592bef0ff055ce2d7dea222bb348f5886b7b5e86ce2787296e90e1a35eab057208c1edbadd5c82447116a14f3f4 SHA512 4810523ba025104106567d8a15a8aa19db35068c8c8be19e30b219a1d7e83bcab96124bf86dc424b1cd3c5edba25d69ec0b31751c136f88975d15406cab3842b
 DIST apache-maven-3.9.6-bin.tar.gz 9410508 BLAKE2B 2a99f002912e6c0fcf9f78f0553553898cf39c17bd7c8b58269c8a7d061c425c62a2f557a686fd2b1f114ef1f47aab6e9b318555235bb436e8c7e5c8b1a0dd9d SHA512 706f01b20dec0305a822ab614d51f32b07ee11d0218175e55450242e49d2156386483b506b3a4e8a03ac8611bae96395fd5eec15f50d3013d5deed6d1ee18224
 EBUILD maven-bin-3.8.8-r1.ebuild 1384 BLAKE2B f07df89e9b3f821f21112a5110c7bce978db18c303e139e939d856d34d1a01cee5fe543943226e64af19d15d45cba4fc605fd228b169f6902d161e04d8cc8fe1 SHA512 02e5fd63a1add7cce804259a3bc6409abdf55eedf458e8c6f909e224a7ae02152b6c82f8afb0775c30f833a101b29d680e0fbb69133df737e6875256d2731fd2
-EBUILD maven-bin-3.9.5-r1.ebuild 1384 BLAKE2B 1070a8fb1c4150031f4889886aefd5dce8418d12f296743f762e552ff5d5d021ed6418adec6bd94dc207340c82ca05ad6a9e19a8006761cb1092a62f3a7daf1b SHA512 c06dc8c9f7a3495b704b37af106520c4eb7c03e4bfd9d53dfeb2361356116525a1070da93fc5343e61c3495f8a501eaabb433e6ec2a0fe094a73a76743ccd0a9
 EBUILD maven-bin-3.9.6.ebuild 1384 BLAKE2B e7e7b39349f9eb1dd725c0cbb1f14836c1bcbafb805c3047b2f8d143f20eb7cffee4a29da471b77b33f8af35c7e2ee30c3ed0bcafeccab3c4a86af9dd567ca19 SHA512 bc9fdda8cb612a29535e42233be846a16307e683d3c449794cd029a4d675966e04da651bb0b20291f1cc385b52f9d7573e013fad2ed3edb044d3bbb7974ee661
 MISC metadata.xml 611 BLAKE2B 5ef6682d362deee6aff000f37dccd97c48e90e3071133a44d9f0ec2a5c6876fdd1a5f44b064eb6992a06cfda27c0c0e599e0bd0474997611aedce017febda203 SHA512 5ba3e55ea839b5e616f37321960021c58846089cb0b51982617f45946ba25747ac10eef70409f9848fbb8267fb2cc0c90c319fb66aeb52ffa5e0e1cd6d5840ff
diff --git a/dev-java/maven-bin/maven-bin-3.9.5-r1.ebuild b/dev-java/maven-bin/maven-bin-3.9.5-r1.ebuild
deleted file mode 100644
index 12476315273c..000000000000
--- a/dev-java/maven-bin/maven-bin-3.9.5-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit java-pkg-2
-
-MY_PN=apache-${PN%%-bin}
-MY_PV=${PV/_alpha/-alpha-}
-MY_P="${MY_PN}-${MY_PV}"
-MY_MV="${PV%%.*}"
-
-DESCRIPTION="Project Management and Comprehension Tool for Java"
-SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.gz"
-HOMEPAGE="https://maven.apache.org/"
-
-LICENSE="Apache-2.0"
-SLOT="3.9"
-KEYWORDS="amd64 x86"
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-	app-eselect/eselect-java"
-
-RDEPEND="
-	>=virtual/jre-1.8:*"
-
-S="${WORKDIR}/${MY_P}"
-
-MAVEN="${PN}-${SLOT}"
-MAVEN_SHARE="/usr/share/${MAVEN}"
-
-QA_FLAGS_IGNORED=(
-	"${MAVEN_SHARE}/lib/jansi-native/linux32/libjansi.so"
-	"${MAVEN_SHARE}/lib/jansi-native/linux64/libjansi.so"
-)
-
-# TODO:
-# We should use jars from packages, instead of what is bundled.
-src_install() {
-	dodir "${MAVEN_SHARE}"
-
-	cp -Rp bin boot conf lib "${ED}/${MAVEN_SHARE}" || die "failed to copy"
-
-	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/boot/*.jar
-	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/lib/*.jar
-
-	dodoc NOTICE README.txt
-
-	dodir /usr/bin
-	dosym "${MAVEN_SHARE}/bin/mvn" "${EPREFIX}/usr/bin/mvn-${SLOT}"
-
-	# See bug #342901.
-	echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die
-	doenvd "${T}/25${MAVEN}"
-}
-
-pkg_postinst() {
-	eselect maven update mvn-${SLOT}
-}
-
-pkg_postrm() {
-	eselect maven update
-}
diff --git a/dev-java/mvel/Manifest b/dev-java/mvel/Manifest
index a95379a520ea..249dda15fb31 100644
--- a/dev-java/mvel/Manifest
+++ b/dev-java/mvel/Manifest
@@ -1,8 +1,3 @@
-AUX mvel-2.3.2-ignore-failing-tests.patch 1722 BLAKE2B 030a8ac91262dda0af70dd73b0a08e61ac050e1667805a2173a0408ab03d8e8fc0b423f10eaeb6feeabc8fb19ed9e35a596120d30f76b73e54c1bcb270b31516 SHA512 6957dde066890fb44d664ffc95029871336a25a4fc92a05f6f2809d35574c06af75909ca2d4abcff7a3f614ebeeadedad3e4da5d3b723b9afd4a23f7f99cc55a
-AUX mvel-2.3.2-update-supported-java-versions.patch 1982 BLAKE2B b32623d0b8bbedf339b34fa7d07b15f3089ea2c1fe52e78852fdf4c82f42eaabae1e29c9d0bf781e28700300a26905379a39767795eecb8bd43a31d8e82c3d0e SHA512 b4441c6dbe721e54e34658d4a04090898ec1a9dcd38638f0fffbfc344889820b3f8138328c05777c5e9b51b4e05e178e9da35a6404fb183b307b9b2742f2ce4b
-AUX mvel-2.3.2-update-version-in-output.patch 1150 BLAKE2B bd69e3a534d62ce7fb822dfd3952490b13986526b2dfc745a1c8d286348dbd4b6554b83b9675de6f497a07ee17f129f98519b41258170df69aa81e2326fc85fe SHA512 762703a7886748a48c10ddc81f25ae545c486a5a00413b1d89e787ce9adebeefa26d9dcc4731c1c8a17957330570a6e6f73e0a1befd6b14db6c97ba150527e5f
-DIST mvel2-2.3.2.Final.tar.gz 2405839 BLAKE2B 5f12652a0f4375f6e24f18313d99a02bb86463cc1acc2f8845b815c9c7afcda410d67c9f1c30544f9ab1cd50a48ce0ab72e9cca94faafab776f3704b1d5fa087 SHA512 9d1c92bfe90aa4cfe5f4bbdd7eef2060bfaec3979c5c07a5baf3ddb4d84a00632dcaec266bab675b31d5b745bfa36a89dd5969ababeb64332069939a4df23dbc
 DIST mvel2-2.5.0.Final.tar.gz 2182715 BLAKE2B 1e8dbde4b75e36ea4d285ab45c0040957b9af7b5819786daf6469ae509c9c1e16ba2b201a05f9f9cf1c694bac816afd2d613226a8eb3b06f9049a898c6586b85 SHA512 29ca1ef8fdc4cbb97b5847f59e7c3118e837022d7292b507869208da1798b55d0445c40214d72c159e610d7094df7002c091296b2b31775a1ad0606f622d12b5
-EBUILD mvel-2.3.2-r1.ebuild 2550 BLAKE2B 165a984f91f61ca6cb13259eee2c7c45e036e3c7fd88bcb985360e09a5b985159e38e0ecd0acec2b85aa9ca9d2a4483a22223907ff48ef277799fe51c1f14fe4 SHA512 2bbf6959afe024366fe52811c1da666d64be14b433af64e146cc5eeaf454ae6c18489c894abde11b53f3cbb634db276f3ded3cd88af235af4e6b11a50c8d853f
 EBUILD mvel-2.5.0.ebuild 1796 BLAKE2B 6f1daa735388426d1483c0d941209ab1ddceadb411a9f262e97928e29a9ff926d2042d966bfd589c2dd4665c36181482a4fbe13fa5a516e14337e2521c855744 SHA512 f5109e97ac6e737a4b9495762da16e45cf717941bde15bcc6e190f201d1ecfc9f1ddd6a78d9805eede83602c5e85213d8a3d13e2c9895a711c6cdeb5436a8846
 MISC metadata.xml 311 BLAKE2B fd4a83fa02a7d87a3b03c3b99b99f0e87b2dbe54b45eb00172999f629712e499aca3dfa631000d92ba51c1303dacea1499cf0394af8aab8ac53610b6bb7c31d7 SHA512 6ecb610dd945d4cba9764e55ffe05e896536d1deec4cdaa18949943fdb2e7e953f167f87599b4d6ebb16ee85c19e23da63217c4063b8553fa45ecf0680589ed1
diff --git a/dev-java/mvel/files/mvel-2.3.2-ignore-failing-tests.patch b/dev-java/mvel/files/mvel-2.3.2-ignore-failing-tests.patch
deleted file mode 100644
index 1cfd9e8abc36..000000000000
--- a/dev-java/mvel/files/mvel-2.3.2-ignore-failing-tests.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From fcf12bd0322556b4396a72a5402124d9543781d9 Mon Sep 17 00:00:00 2001
-From: Yuan Liao <liaoyuan@gmail.com>
-Date: Sun, 16 Jan 2022 09:48:48 -0800
-Subject: [PATCH] Ignore tests that fail even when run by Maven on JUnit 4.13.2
-
-To reproduce the failure, make sure to edit line 249 of pom.xml to use
-JUnit 4.13.2.  Note that the failed tests are JUnit 3 tests, which
-cannot be ignored with the @org.junit.Ignore annotation.
-
-When no tests are ignored, only testMapAccessWithNestedMethodCall() will
-fail.  However, ignoring that test will cause
-testMapAccessWithNestedProperty() to fail afterwards.
-
-Signed-off-by: Yuan Liao <liaoyuan@gmail.com>
----
- src/test/java/org/mvel2/tests/core/CoreConfidenceTests.java | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/test/java/org/mvel2/tests/core/CoreConfidenceTests.java b/src/test/java/org/mvel2/tests/core/CoreConfidenceTests.java
-index ea7661bb..1c92c327 100644
---- a/src/test/java/org/mvel2/tests/core/CoreConfidenceTests.java
-+++ b/src/test/java/org/mvel2/tests/core/CoreConfidenceTests.java
-@@ -3431,7 +3431,7 @@ public class CoreConfidenceTests extends AbstractTest {
-     assertTrue(result);
-   }
- 
--  public void testMapAccessWithNestedMethodCall() {
-+  public void noTestMapAccessWithNestedMethodCall() {
-     String str = "map[aMethod(1)] == \"one\"";
- 
-     ParserConfiguration pconf = new ParserConfiguration();
-@@ -3446,7 +3446,7 @@ public class CoreConfidenceTests extends AbstractTest {
-     assertTrue(result);
-   }
- 
--  public void testMapAccessWithNestedProperty() {
-+  public void noTestMapAccessWithNestedProperty() {
-     String str = "map[key] == \"one\"";
- 
-     ParserConfiguration pconf = new ParserConfiguration();
--- 
-2.34.1
-
diff --git a/dev-java/mvel/files/mvel-2.3.2-update-supported-java-versions.patch b/dev-java/mvel/files/mvel-2.3.2-update-supported-java-versions.patch
deleted file mode 100644
index d019002cda1f..000000000000
--- a/dev-java/mvel/files/mvel-2.3.2-update-supported-java-versions.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 04f476bbc3768d9052ae9c8a1b0aa53340a993b3 Mon Sep 17 00:00:00 2001
-From: Yuan Liao <liaoyuan@gmail.com>
-Date: Sun, 16 Jan 2022 08:01:46 -0800
-Subject: [PATCH] ASMAccessorOptimizer: Update supported Java versions as of
- 2.4.14
-
-Squashed patch of the following commits:
-
-From: deaddowney <spamcontrol@mac.com>
-Date: Fri, 22 Jun 2018 09:38:24 -0400
-Subject: [PATCH 1/4] Mvel not working with Java 10 (11) GH Issue #159
-
-From: dieter sauvillers <dieter.sauvillers@corilus.be>
-Date: Tue, 2 Apr 2019 10:20:31 +0200
-Subject: [PATCH 2/4] mvel does not work with java 12 #185
-
-From: mmelko <mmelko@redhat.com>
-Date: Fri, 26 Jun 2020 08:55:24 +0200
-Subject: [PATCH 3/4] Fix building on java 14
-
-From: mariofusco <mario.fusco@gmail.com>
-Date: Mon, 24 Aug 2020 08:54:22 +0200
-Subject: [PATCH 4/4] drop compatibility with java versions lower than 1.4
-
-Signed-off-by: Yuan Liao <liaoyuan@gmail.com>
----
- .../mvel2/optimizers/impl/asm/ASMAccessorOptimizer.java    | 7 +------
- 1 file changed, 1 insertion(+), 6 deletions(-)
-
-diff --git a/src/main/java/org/mvel2/optimizers/impl/asm/ASMAccessorOptimizer.java b/src/main/java/org/mvel2/optimizers/impl/asm/ASMAccessorOptimizer.java
-index 45520538..4c4c876e 100644
---- a/src/main/java/org/mvel2/optimizers/impl/asm/ASMAccessorOptimizer.java
-+++ b/src/main/java/org/mvel2/optimizers/impl/asm/ASMAccessorOptimizer.java
-@@ -118,13 +118,8 @@ public class ASMAccessorOptimizer extends AbstractOptimizer implements AccessorO
-       OPCODES_VERSION = Opcodes.V1_4;
-     } else if (javaVersion.startsWith("1.5")) {
-       OPCODES_VERSION = Opcodes.V1_5;
--    } else if (javaVersion.startsWith("1.6")
--            || javaVersion.startsWith("1.7")
--            || javaVersion.startsWith("1.8")
--            || javaVersion.startsWith("9")) {
--      OPCODES_VERSION = Opcodes.V1_6;
-     } else {
--      OPCODES_VERSION = Opcodes.V1_2;
-+      OPCODES_VERSION = Opcodes.V1_6;
-     }
- 
-     String defaultNameSapce = getProperty("mvel2.namespace");
--- 
-2.34.1
-
diff --git a/dev-java/mvel/files/mvel-2.3.2-update-version-in-output.patch b/dev-java/mvel/files/mvel-2.3.2-update-version-in-output.patch
deleted file mode 100644
index 8b7250540b05..000000000000
--- a/dev-java/mvel/files/mvel-2.3.2-update-version-in-output.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 0a316a5cb0d889220fb3e730ea1471c1b4052736 Mon Sep 17 00:00:00 2001
-From: Yuan Liao <liaoyuan@gmail.com>
-Date: Sun, 16 Jan 2022 10:21:47 -0800
-Subject: [PATCH] Update program version shown in program output
-
-Signed-off-by: Yuan Liao <liaoyuan@gmail.com>
----
- src/main/java/org/mvel2/MVEL.java | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/main/java/org/mvel2/MVEL.java b/src/main/java/org/mvel2/MVEL.java
-index eafe17fc..6bbf5f06 100644
---- a/src/main/java/org/mvel2/MVEL.java
-+++ b/src/main/java/org/mvel2/MVEL.java
-@@ -45,7 +45,7 @@ import static org.mvel2.util.ParseTools.optimizeTree;
- public class MVEL {
-   public static final String NAME = "MVEL (MVFLEX Expression Language)";
-   public static final String VERSION = "2.3";
--  public static final String VERSION_SUB = "0";
-+  public static final String VERSION_SUB = "2";
-   public static final String CODENAME = "liberty";
-   static boolean DEBUG_FILE = getBoolean("mvel2.debug.fileoutput");
-   static String ADVANCED_DEBUGGING_FILE = System.getProperty("mvel2.debugging.file") == null ? "mvel_debug.txt" : System.getProperty("mvel2.debugging.file");
--- 
-2.34.1
-
diff --git a/dev-java/mvel/mvel-2.3.2-r1.ebuild b/dev-java/mvel/mvel-2.3.2-r1.ebuild
deleted file mode 100644
index 2fc29e17956e..000000000000
--- a/dev-java/mvel/mvel-2.3.2-r1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.mvel:mvel2:2.3.2.Final"
-
-# Note: This package has a mixture of JUnit 3 and JUnit 4 tests, all of which
-# can be run with JUnit 4.  As of January 2022, JUnit 3 test launcher will only
-# run 2 tests out of nearly 1100 JUnit 3 tests in total, whereas JUnit 4 test
-# launcher can run all of them
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="MVFLEX Expression Language"
-HOMEPAGE="https://github.com/mvel/mvel"
-SRC_URI="https://github.com/mvel/mvel/archive/refs/tags/mvel2-${PV}.Final.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="2.3"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-"
-
-S="${WORKDIR}/${PN}-${PN}2-${PV}.Final"
-
-JAVA_SRC_DIR="src/main/java"
-# Required due to use of '_' as identifiers in source files
-JAVADOC_ARGS="-source 8"
-# https://github.com/mvel/mvel/blob/mvel2-2.3.2.Final/pom.xml#L131
-JAVA_MAIN_CLASS="org.mvel2.sh.Main"
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_SRC_DIR="src/test/java"
-JAVA_TEST_RESOURCE_DIRS=( "src/test/resources" )
-JAVA_TEST_EXCLUDES=(
-	# No runnable methods
-	org.mvel2.tests.perftests.CompiledPerformanceTests
-	org.mvel2.tests.perftests.SimpleTests
-	org.mvel2.tests.core.MVELThreadTest
-	org.mvel2.tests.core.res.TestClass
-	org.mvel2.tests.core.res.TestInterface
-	org.mvel2.tests.core.res.TestMVEL197
-	org.mvel2.tests.templates.tests.res.TestPluginNode
-)
-# Significantly speed up test execution
-# https://github.com/mvel/mvel/blob/mvel2-2.3.2.Final/pom.xml#L158-L171
-JAVA_TEST_EXTRA_ARGS=(
-	-Dfile.encoding=UTF-8
-	-Dmvel.disable.jit=true
-	-Dmvel.tests.quick=true
-)
-
-pkg_setup() {
-	java-pkg-2_pkg_setup
-	# Fix org.mvel2.tests.core.PropertyAccessTests.testMVEL308 failure
-	# on Java 17, caused by java.lang.reflect.InaccessibleObjectException:
-	# module java.base does not "opens java.util" to unnamed module
-	# https://github.com/mvel/mvel/issues/282
-	ver_test "$(java-config -g PROVIDES_VERSION)" -ge 17 && \
-		JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.util=ALL-UNNAMED )
-}
-
-src_prepare() {
-	# Clean up bundled JARs "manually" to prevent
-	# removal of JARs under JAVA_TEST_RESOURCE_DIRS
-	rm -r lib/ || die "Failed to remove bundled JARs"
-
-	eapply "${FILESDIR}/${P}-update-supported-java-versions.patch"
-	eapply "${FILESDIR}/${P}-update-version-in-output.patch"
-	use test && eapply "${FILESDIR}/${P}-ignore-failing-tests.patch"
-	java-pkg-2_src_prepare
-}