commit: 01aadb9f553dde6333031f32466f3fa61f8ce013 Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> AuthorDate: Sat Aug 2 15:40:49 2025 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Tue Aug 5 10:41:51 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01aadb9f
dev-java/snappy-java: drop 1.1.10.7 Closes: https://bugs.gentoo.org/953364 Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> Part-of: https://github.com/gentoo/gentoo/pull/43297 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> dev-java/snappy-java/files/1.1.7.8-gentoo.patch | 28 ----- .../files/1.1.7.8-java-version-target.patch | 47 -------- .../files/1.1.7.8-unbundle-bitshuffle.patch | 26 ----- .../files/snappy-1.1.10.1-unbundle-snappy.patch | 51 --------- dev-java/snappy-java/snappy-java-1.1.10.7.ebuild | 124 --------------------- 5 files changed, 276 deletions(-) diff --git a/dev-java/snappy-java/files/1.1.7.8-gentoo.patch b/dev-java/snappy-java/files/1.1.7.8-gentoo.patch deleted file mode 100644 index b4a58e6482be..000000000000 --- a/dev-java/snappy-java/files/1.1.7.8-gentoo.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -124,11 +124,7 @@ - $(CXX) $(CXXFLAGS) -c $< -o $@ - - $(SNAPPY_OUT)/$(LIBNAME): $(SNAPPY_OBJ) -- $(CXX) $(CXXFLAGS) -o $@ $+ $(LINKFLAGS) -lsnappy -lbitshuffle -- # Workaround for strip Protocol error when using VirtualBox on Mac -- cp $@ /tmp/$(@F) -- $(STRIP) /tmp/$(@F) -- cp /tmp/$(@F) $@ -+ $(CXX) $(CXXFLAGS) -o $@ $+ $(LINKFLAGS) -lsnappy -lbitshuffle $(LDFLAGS) - - clean-native: - rm -rf $(SNAPPY_OUT) ---- a/Makefile.common -+++ b/Makefile.common -@@ -274,8 +274,8 @@ - - CXX := $($(os_arch)_CXX) - STRIP := $($(os_arch)_STRIP) --CXXFLAGS := $($(os_arch)_CXXFLAGS) --LINKFLAGS := $($(os_arch)_LINKFLAGS) -+CXXFLAGS := $($(os_arch)_CXXFLAGS) $(CXXFLAGS) -+LINKFLAGS := $($(os_arch)_LINKFLAGS) $(LDFLAGS) - LIBNAME := $($(os_arch)_LIBNAME) - SNAPPY_FLAGS := $($(os_arch)_SNAPPY_FLAGS) - diff --git a/dev-java/snappy-java/files/1.1.7.8-java-version-target.patch b/dev-java/snappy-java/files/1.1.7.8-java-version-target.patch deleted file mode 100644 index a852d0bdb807..000000000000 --- a/dev-java/snappy-java/files/1.1.7.8-java-version-target.patch +++ /dev/null @@ -1,47 +0,0 @@ -From e7d1d0167426790ba9b1d28ffa11e0d0c523f3b5 Mon Sep 17 00:00:00 2001 -From: Yuan Liao <[email protected]> -Date: Sun, 6 Feb 2022 08:29:20 -0800 -Subject: [PATCH] Allow Java version target to be specified using variable - -Signed-off-by: Yuan Liao <[email protected]> ---- - Makefile | 4 ++-- - Makefile.common | 2 ++ - 2 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index 1d82a8a..8eaa319 100644 ---- a/Makefile -+++ b/Makefile -@@ -92,13 +92,13 @@ snappy-header: $(SNAPPY_CMAKE_CACHE) - - $(TARGET)/jni-classes/org/xerial/snappy/SnappyNative.class: $(SRC)/org/xerial/snappy/SnappyNative.java - @mkdir -p $(TARGET)/jni-classes -- $(JAVAC) -source 1.7 -target 1.7 -h $(SRC)/org/xerial/snappy/ -d $(TARGET)/jni-classes -sourcepath $(SRC) $< -+ $(JAVAC) -source $(JAVA_SOURCE) -target $(JAVA_TARGET) -h $(SRC)/org/xerial/snappy/ -d $(TARGET)/jni-classes -sourcepath $(SRC) $< - - $(SRC)/org/xerial/snappy/SnappyNative.h: $(TARGET)/jni-classes/org/xerial/snappy/SnappyNative.class - - $(TARGET)/jni-classes/org/xerial/snappy/BitShuffleNative.class: $(SRC)/org/xerial/snappy/BitShuffleNative.java - @mkdir -p $(TARGET)/jni-classes -- $(JAVAC) -source 1.7 -target 1.7 -h $(SRC)/org/xerial/snappy/ -d $(TARGET)/jni-classes -sourcepath $(SRC) $< -+ $(JAVAC) -source $(JAVA_SOURCE) -target $(JAVA_TARGET) -h $(SRC)/org/xerial/snappy/ -d $(TARGET)/jni-classes -sourcepath $(SRC) $< - - $(SRC)/org/xerial/snappy/BitShuffleNative.h: $(TARGET)/jni-classes/org/xerial/snappy/BitShuffleNative.class - -diff --git a/Makefile.common b/Makefile.common -index 534bc4f..86d839b 100755 ---- a/Makefile.common -+++ b/Makefile.common -@@ -10,6 +10,8 @@ endif - JAVA := "$$JAVA_HOME/bin/java" - JAVAC := "$$JAVA_HOME/bin/javac" - JAVAH := "$$JAVA_HOME/bin/javah" -+JAVA_SOURCE := 1.8 -+JAVA_TARGET := 1.8 - - LITTLE_ENDIAN := "Little Endian" - BIG_ENDIAN := "Big Endian" --- -2.34.1 - diff --git a/dev-java/snappy-java/files/1.1.7.8-unbundle-bitshuffle.patch b/dev-java/snappy-java/files/1.1.7.8-unbundle-bitshuffle.patch deleted file mode 100644 index e4f699ad123e..000000000000 --- a/dev-java/snappy-java/files/1.1.7.8-unbundle-bitshuffle.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -36,11 +36,11 @@ - - $(SNAPPY_OUT)/%.o: $(BITSHUFFLE_SRC_DIR)/%.c - @mkdir -p $(@D) -- $(CXX) $(CXXFLAGS) $(CXXFLAGS_BITSHUFFLE) -c $< -o $@ -+ $(CXX) $(CXXFLAGS) -c $< -o $@ - --SNAPPY_OBJ:=$(addprefix $(SNAPPY_OUT)/,$(patsubst %.cc,%.o,$(SNAPPY_CC)) $(patsubst %.c,%.o,$(BITSHUFFLE_C)) SnappyNative.o BitShuffleNative.o) -+SNAPPY_OBJ:=$(addprefix $(SNAPPY_OUT)/,$(patsubst %.cc,%.o,$(SNAPPY_CC)) SnappyNative.o BitShuffleNative.o) - --CXXFLAGS:=$(CXXFLAGS) -I$(SNAPPY_SRC_DIR) -I$(SNAPPY_OUT) -I$(BITSHUFFLE_SRC_DIR) -+CXXFLAGS:=$(CXXFLAGS) -I$(SNAPPY_SRC_DIR) -I$(SNAPPY_OUT) - - ifndef CXXFLAGS_BITSHUFFLE - ifeq ($(OS_NAME)-$(OS_ARCH),Linux-x86_64) -@@ -124,7 +124,7 @@ - $(CXX) $(CXXFLAGS) -c $< -o $@ - - $(SNAPPY_OUT)/$(LIBNAME): $(SNAPPY_OBJ) -- $(CXX) $(CXXFLAGS) -o $@ $+ $(LINKFLAGS) -lsnappy -+ $(CXX) $(CXXFLAGS) -o $@ $+ $(LINKFLAGS) -lsnappy -lbitshuffle - # Workaround for strip Protocol error when using VirtualBox on Mac - cp $@ /tmp/$(@F) - $(STRIP) /tmp/$(@F) diff --git a/dev-java/snappy-java/files/snappy-1.1.10.1-unbundle-snappy.patch b/dev-java/snappy-java/files/snappy-1.1.10.1-unbundle-snappy.patch deleted file mode 100644 index d516495bb6a7..000000000000 --- a/dev-java/snappy-java/files/snappy-1.1.10.1-unbundle-snappy.patch +++ /dev/null @@ -1,51 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -10,7 +10,7 @@ all: snappy - - SNAPPY_OUT:=$(TARGET)/snappy-$(SNAPPY_VERSION)-$(os_arch) - SNAPPY_ARCHIVE:=$(TARGET)/snappy-$(SNAPPY_VERSION).tar.gz --SNAPPY_CC:=snappy-sinksource.cc snappy-stubs-internal.cc snappy-c.cc snappy.cc -+SNAPPY_CC:= - SNAPPY_SRC_DIR:=$(TARGET)/snappy-$(SNAPPY_VERSION) - SNAPPY_SRC:=$(addprefix $(SNAPPY_SRC_DIR)/,$(SNAPPY_CC)) - SNAPPY_GIT_REPO_URL:=https://github.com/google/snappy -@@ -102,7 +102,8 @@ $(TARGET)/jni-classes/org/xerial/snappy/BitShuffleNative.class: $(SRC)/org/xeria - - $(SRC)/org/xerial/snappy/BitShuffleNative.h: $(TARGET)/jni-classes/org/xerial/snappy/BitShuffleNative.class - --$(SNAPPY_SRC): $(SNAPPY_GIT_UNPACKED) -+$(SNAPPY_SRC): -+# $(SNAPPY_GIT_UNPACKED) - - # aarch64 can use big-endian optimzied code - ifeq ($(OS_ARCH),aarch64) -@@ -124,7 +125,7 @@ $(SNAPPY_OUT)/BitShuffleNative.o: $(SRC)/org/xerial/snappy/BitShuffleNative.cpp - $(CXX) $(CXXFLAGS) -c $< -o $@ - - $(SNAPPY_OUT)/$(LIBNAME): $(SNAPPY_OBJ) -- $(CXX) $(CXXFLAGS) -o $@ $+ $(LINKFLAGS) -+ $(CXX) $(CXXFLAGS) -o $@ $+ $(LINKFLAGS) -lsnappy - # Workaround for strip Protocol error when using VirtualBox on Mac - cp $@ /tmp/$(@F) - $(STRIP) /tmp/$(@F) -@@ -145,9 +146,9 @@ snappy-jar-version:=snappy-java-$(shell ./script/dynver.sh | cut -d'=' -f2 | sed - jar-version: - echo $(snappy-jar-version) - --native: jni-header snappy-header $(NATIVE_DLL) --native-nocmake: jni-header $(NATIVE_DLL) --snappy: native $(TARGET)/$(snappy-jar-version).jar -+native: $(NATIVE_DLL) -+native-nocmake: $(NATIVE_DLL) -+snappy: native - - native-all: native native-arm clean-docker mac64 win32 win64 linux32 linux64 linux-ppc64le linux-riscv64 linux-s390x - -@@ -166,6 +167,7 @@ $(NATIVE_DLL): $(SNAPPY_OUT)/$(LIBNAME) - cp $(SNAPPY_OUT)/$(LIBNAME) $@ - @mkdir -p $(NATIVE_TARGET_DIR) - cp $(SNAPPY_OUT)/$(LIBNAME) $(NATIVE_TARGET_DIR)/$(LIBNAME) -+ cp $< $(TARGET)/ - - package: $(TARGET)/$(snappy-jar-version).jar - diff --git a/dev-java/snappy-java/snappy-java-1.1.10.7.ebuild b/dev-java/snappy-java/snappy-java-1.1.10.7.ebuild deleted file mode 100644 index b5e12601c6f8..000000000000 --- a/dev-java/snappy-java/snappy-java-1.1.10.7.ebuild +++ /dev/null @@ -1,124 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -JAVA_PKG_IUSE="doc source test" -MAVEN_ID="org.xerial.snappy:snappy-java:${PV}" -JAVA_TESTING_FRAMEWORKS="junit-4" - -inherit java-pkg-2 java-pkg-simple toolchain-funcs check-reqs - -DESCRIPTION="Snappy compressor/decompressor for Java" -HOMEPAGE="https://github.com/xerial/snappy-java/"; -# ::gentoo does not have hadoop-common packaged. Currently we bundle the binary version. -# It's used for testing only and does not get installed. -HCV="3.3.5" -SRC_URI="https://github.com/xerial/snappy-java/archive/v${PV}.tar.gz -> ${P}.tar.gz - test? ( https://repo1.maven.org/maven2/org/apache/hadoop/hadoop-common/${HCV}/hadoop-common-${HCV}.jar )" -S="${WORKDIR}/${P}" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 arm64 ppc64" - -CP_DEPEND="dev-java/osgi-core:0" - -CDEPEND=" - app-arch/snappy - >=dev-libs/bitshuffle-0.3.5-r1 -" - -DEPEND=">=virtual/jdk-1.8:* - ${CP_DEPEND} - ${CDEPEND} - test? ( - >=dev-java/ant-1.10.14:0[junit4] - dev-java/commons-io:1 - dev-java/commons-lang:3.6 - dev-java/plexus-classworlds:0 - dev-java/xerial-core:0 - )" - -RDEPEND=">=virtual/jre-1.8:* - ${CP_DEPEND} - ${CDEPEND}" - -PATCHES=( - "${FILESDIR}/1.1.7.8-java-version-target.patch" - "${FILESDIR}/snappy-1.1.10.1-unbundle-snappy.patch" - "${FILESDIR}/1.1.7.8-unbundle-bitshuffle.patch" - "${FILESDIR}/1.1.7.8-gentoo.patch" - "${FILESDIR}/snappy-1.1.10.5-SnappyOutputStreamTest.patch" -) - -JAVA_RESOURCE_DIRS="src/main/resources" -JAVA_SRC_DIR="src/main/java" - -JAVA_TEST_GENTOO_CLASSPATH=" - commons-io-1 - commons-lang-3.6 - junit-4 - plexus-classworlds - xerial-core -" -JAVA_TEST_RESOURCE_DIRS="src/test/resources" -JAVA_TEST_SRC_DIR="src/test/java" - -check_env() { - if use test; then - # this is needed only for tests - CHECKREQS_MEMORY="2560M" - check-reqs_pkg_pretend - fi -} - -pkg_pretend() { - check_env -} - -pkg_setup() { - check_env - java-pkg-2_pkg_setup -} - -src_prepare() { - default - java-pkg-2_src_prepare - # remove pre-compiled sofiles - rm -r src/main/resources/org/xerial/snappy/native || die - rm -r src/test/resources/lib || die -} - -src_compile() { - emake \ - CXX="$(tc-getCXX)" \ - JAVA_SOURCE="$(java-pkg_get-source)" \ - JAVA_TARGET="$(java-pkg_get-target)" - - java-pkg-simple_src_compile -} - -src_test() { - JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/hadoop-common-${HCV}.jar" - JAVA_TEST_EXTRA_ARGS=( -Xmx${CHECKREQS_MEMORY} ) - local vm_version="$(java-config -g PROVIDES_VERSION)" - if ver_test "${vm_version}" -ge 17; then - java-pkg-simple_src_test - else - einfo "Tests need jdk-17 to pass." - fi -} - -src_install() { - java-pkg-simple_src_install - - local jniext=.so - if [[ ${CHOST} == *-darwin* ]] ; then - jniext=.jnilib - # avoid install_name check failure - install_name_tool -id "@loader_path/libsnappyjava${jniext}" \ - "target/libsnappyjava${jniext}" - fi - java-pkg_doso "target/libsnappyjava${jniext}" -}
