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

6 files changed, 0 insertions, 282 deletions

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/*
-}