diff options
| author | Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> | 2025-08-06 07:02:57 +0000 |
|---|---|---|
| committer | Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> | 2025-08-06 07:02:57 +0000 |
| commit | 20f0b54e2d7710a03c17bdf936e3f1c81a4c2aca (patch) | |
| tree | 14e0d5c8013827edcbbaaaffe3223548a4eb2864 /dev-java | |
| parent | 509e6c551a619cca02520a6671827dc8a31a9399 (diff) | |
| download | baldeagleos-repo-20f0b54e2d7710a03c17bdf936e3f1c81a4c2aca.tar.gz baldeagleos-repo-20f0b54e2d7710a03c17bdf936e3f1c81a4c2aca.tar.xz baldeagleos-repo-20f0b54e2d7710a03c17bdf936e3f1c81a4c2aca.zip | |
Adding metadata
Diffstat (limited to 'dev-java')
| -rw-r--r-- | dev-java/commons-codec/Manifest | 2 | ||||
| -rw-r--r-- | dev-java/commons-codec/commons-codec-1.17.1-r1.ebuild | 58 | ||||
| -rw-r--r-- | dev-java/commons-collections/Manifest | 2 | ||||
| -rw-r--r-- | dev-java/commons-collections/commons-collections-4.4-r2.ebuild | 59 | ||||
| -rw-r--r-- | dev-java/commons-csv/Manifest | 2 | ||||
| -rw-r--r-- | dev-java/commons-csv/commons-csv-1.12.0-r1.ebuild | 96 | ||||
| -rw-r--r-- | dev-java/snappy-java/files/1.1.7.8-gentoo.patch | 28 | ||||
| -rw-r--r-- | dev-java/snappy-java/files/1.1.7.8-java-version-target.patch | 47 | ||||
| -rw-r--r-- | dev-java/snappy-java/files/1.1.7.8-unbundle-bitshuffle.patch | 26 | ||||
| -rw-r--r-- | dev-java/snappy-java/files/snappy-1.1.10.1-unbundle-snappy.patch | 51 | ||||
| -rw-r--r-- | dev-java/snappy-java/snappy-java-1.1.10.7.ebuild | 124 |
11 files changed, 0 insertions, 495 deletions
diff --git a/dev-java/commons-codec/Manifest b/dev-java/commons-codec/Manifest index faddf404a7f4..eb06a28f8534 100644 --- a/dev-java/commons-codec/Manifest +++ b/dev-java/commons-codec/Manifest @@ -1,4 +1,2 @@ -DIST commons-codec-1.17.1-src.tar.gz 456746 BLAKE2B 9bf33c183d4344bdccdffa1c573f9b2cfe34db227cbcffa66a7baed85778a516339a736ddade637859989055e2ab86abb5464ab9bc57782e3c972cc8ed2c4dbd SHA512 c98456664396d4d9cb794c185a479e6bb4a5055ed1f526a8e358fe3a59409c057dbb16f59c251bb52976995dbca14d8f15857074c9d19fbc7bdfed625a13abf0 -DIST commons-codec-1.17.1-src.tar.gz.asc 488 BLAKE2B 63bd00bcf69ab41e58e1eb2b2e56749211aa044e769a16fe2eea6acdeeac85d59c7465597aaec671b6efe22c68b05cd64c2e7a4bd2dc2f7f2b235dd27a125153 SHA512 6e9475773162193ce005635a5af926e0c7bfbaaca4c801a66bdabe73de0a2d17ec489a77d904d7d69e5749bc2af07d5b0b97d5aef2a319c614a3f1db632d424c DIST commons-codec-1.18.0-src.tar.gz 462698 BLAKE2B 821ee8086f24e04390aa7b933f263313a63ee12a7b1b38147782af235ed79919f2f5679d679380f8de7e70c5264ce5314312e45517388e231b6e02804fd274ac SHA512 a14ce4498905fa0de67b7ba65faf75c770e7cdad4860ea14205781372c8777669fb562aab15c682385196a895895a6751b81d893ba4af6e01efb713970449227 DIST commons-codec-1.18.0-src.tar.gz.asc 488 BLAKE2B 11cb515ca17b05a7a6f7fae89b4bc78d77a06d66285a9624b442af49fb720cb5436d9f9f4a219d48b153fb3f65e2da9241470b65d111c5935f5834a516350777 SHA512 43f6803096a6d434663fee85bc586fc41781d7d2120d219408749f743aae87f31a7c104f7567374bd0f62205eabac52d86689bbdd1a988fd79dce2433df8f2c4 diff --git a/dev-java/commons-codec/commons-codec-1.17.1-r1.ebuild b/dev-java/commons-codec/commons-codec-1.17.1-r1.ebuild deleted file mode 100644 index a9e949658aa7..000000000000 --- a/dev-java/commons-codec/commons-codec-1.17.1-r1.ebuild +++ /dev/null @@ -1,58 +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="commons-codec:commons-codec:${PV}" -JAVA_TESTING_FRAMEWORKS="junit-4" - -inherit java-pkg-2 java-pkg-simple verify-sig - -DESCRIPTION="Implementations of common encoders and decoders in Java" -HOMEPAGE="https://commons.apache.org/proper/commons-codec/" -SRC_URI="mirror://apache/commons/codec/source/${P}-src.tar.gz - verify-sig? ( https://downloads.apache.org/commons/codec/source/${P}-src.tar.gz.asc )" -S="${WORKDIR}/${P}-src" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x86-linux" -RESTRICT="test" #839681 - -VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc" -BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )" -DEPEND=" - >=virtual/jdk-11:* - test? ( - dev-java/commons-lang:3.6 - dev-java/hamcrest:0 - dev-java/junit:5[migration-support] - ) -" -RDEPEND=">=virtual/jre-1.8:*" - -JAVA_RESOURCE_DIRS="src/main/resources" -JAVA_SRC_DIR="src/main/java" - -JAVA_TEST_GENTOO_CLASSPATH=" - junit-4 - junit-5 - commons-lang-3.6 - hamcrest -" -JAVA_TEST_RESOURCE_DIRS="src/test/resources" -JAVA_TEST_SRC_DIR="src/test/java" - -src_compile() { - JAVA_JAR_FILENAME="org.apache.${PN}.jar" - java-pkg-simple_src_compile # creates a legacy jar file without module-info - - jdeps --generate-module-info \ - src/main/java \ - --multi-release 9 \ - "${JAVA_JAR_FILENAME}" || die - - JAVA_JAR_FILENAME="${PN}.jar" - java-pkg-simple_src_compile # creates the final jar file including module-info -} diff --git a/dev-java/commons-collections/Manifest b/dev-java/commons-collections/Manifest index 7572bbaf1090..a6f4192af739 100644 --- a/dev-java/commons-collections/Manifest +++ b/dev-java/commons-collections/Manifest @@ -1,6 +1,4 @@ DIST commons-collections-3.2.2-src.tar.gz 630693 BLAKE2B a70cebe9526291d5207db7edd7c9b50060413880d41dcb28c01cf05f7e00a9f5e1560012c3c3c763162412282db9512bc2b64a5788f210c5c8866943d912dafb SHA512 2e8ef638f07515b028a3e7e97851fcf1d9023a2c188e211bd1e936f35d3d91c2885adf3b1103ad17dfb7aeea6e7a67ce7826ee346a8a29c1aa7c6b0cf14e9230 DIST commons-collections-3.2.2-src.tar.gz.asc 819 BLAKE2B a7d170b03613cddddc284908d95287fc092c01b125c5adffebfc493daf9119e0c9d82fdc7d8ce1865ef45a1e015072f5a09181abcba5b17c9c48d7c6333279da SHA512 c5d33518ed5343b38c10e317f677266858bd9614eff7fdc13a2e0131fe71836c3694f49898843e6978496d7dd2f976b82922230a44cde1eac5f6cdfdb822dcd0 -DIST commons-collections4-4.4-src.tar.gz 703008 BLAKE2B f4a0e858eb7412bdd431894f923a4731685ceb2463bee002401d8048cc40534f002ec0291aa67297e061a50b624d3de8f64e227f513ab1f3620e38d1d6858255 SHA512 2110e73eda97ca52a886cb708f21d8609a83655861594f3b6eb7a15b777d42eeeefc5d3b28ffc6ecc5e4f0b3fd5407f80019c2ce006f970f55455ef33eee47ee -DIST commons-collections4-4.4-src.tar.gz.asc 499 BLAKE2B 8217d8c8714d2c07a66eca22069b40e2d1012881385172bedd29d52f14ae5c6e287ce2f097f1bde77af06677c776e45c3e67dc6c885709f6c97f61155252131c SHA512 533c47ad2cb6b6926ea8e4aaf9072b6c7a0c9d4a6becb31163a33a6cba8a9888534b74701935a0f0e797c10cbc688331d9abefc3d4085edcd9a7d29260f735ae DIST commons-collections4-4.5.0-src.tar.gz 856548 BLAKE2B 0bbc21ce9e5481d9bde43fbe77c4e4f701b958b402530cb3366a345be483c79774a9cd50d5116ed793fffbb591bd3408f09a89a7392b713f523a4763da24bc4d SHA512 2a52a6b01cbef34185d9ff8df872db4a6a6b84d7be9982b331cfb6ff5d1b55f501e19e02930f904408048f5657d98aaa33d32e27faa66abe9dd9cc6213318984 DIST commons-collections4-4.5.0-src.tar.gz.asc 488 BLAKE2B d33796e6567147a23b7ee3b76a5a119ce5cd2f6c04be75a82fd876a0be941a276a4fef6203636cb716d5a10cf5f700c9c6b1925133603969e6092e59c26f6b44 SHA512 d6f9eb19c73d31d6db1f682b827593518c389709cfc183e42e64ab1f2e60e33517db102007531d6091e77e290747c7b7b5eedc66cc08dd1bf0a5bdcb762f760d diff --git a/dev-java/commons-collections/commons-collections-4.4-r2.ebuild b/dev-java/commons-collections/commons-collections-4.4-r2.ebuild deleted file mode 100644 index 17ec6923d5ff..000000000000 --- a/dev-java/commons-collections/commons-collections-4.4-r2.ebuild +++ /dev/null @@ -1,59 +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.apache.commons:commons-collections4:${PV}" -JAVA_TESTING_FRAMEWORKS="junit-4" - -inherit java-pkg-2 java-pkg-simple verify-sig - -DESCRIPTION="Extends the JCF classes with new interfaces, implementations and utilities" -HOMEPAGE="https://commons.apache.org/proper/commons-collections/" -SRC_URI="mirror://apache/commons/collections/source/${PN}4-${PV}-src.tar.gz - verify-sig? ( https://downloads.apache.org/commons/collections/source/${PN}4-${PV}-src.tar.gz.asc )" -S="${WORKDIR}/commons-collections4-${PV}-src" - -LICENSE="Apache-2.0" -SLOT="4" -KEYWORDS="amd64 arm64 ppc64" - -VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/commons.apache.org.asc" -BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )" -# broken with jdk:21 - https://bugs.gentoo.org/916445 -DEPEND=" - <=virtual/jdk-17:* - test? ( - dev-java/easymock:3.2 - dev-java/commons-lang:3.6 - ) -" -RDEPEND=">=virtual/jre-1.8:*" - -DOCS=( {CONTRIBUTING,README}.md {NOTICE,RELEASE-NOTES}.txt ) -HTML_DOCS=( {DEVELOPERS-GUIDE,PROPOSAL}.html ) - -JAVA_AUTOMATIC_MODULE_NAME="org.apache.commons.collections4" -JAVA_SRC_DIR="src/main/java" -JAVA_TEST_GENTOO_CLASSPATH=" - commons-lang-3.6 - easymock-3.2 - junit-4 -" -JAVA_TEST_RESOURCE_DIRS="src/test/resources" -JAVA_TEST_SRC_DIR="src/test/java" - -src_test() { - # https://github.com/apache/commons-collections/blob/commons-commons-collections-4.4/pom.xml#L542-L550 - pushd src/test/java || die - local JAVA_TEST_RUN_ONLY=$(find * \ - -name "*Test.java" \ - ! -name "TestUtils.java" \ - ! -name "Abstract*.java" \ - ! -name "BulkTest.java") - JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}" - JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}" - popd - java-pkg-simple_src_test -} diff --git a/dev-java/commons-csv/Manifest b/dev-java/commons-csv/Manifest index f82ff26330fc..78c876a4ec28 100644 --- a/dev-java/commons-csv/Manifest +++ b/dev-java/commons-csv/Manifest @@ -1,4 +1,2 @@ -DIST commons-csv-1.12.0-src.tar.gz 36993963 BLAKE2B ae6e207906efa3265ba92e1919356c77fa75616eaae0b095d9795100df2c5eb514c73a855ab4fc7a77c7958aff2eacaac860775b514e705e010e6cd3e5fb9e8c SHA512 67d8fd651a9785825b2f13c5f6bd95e0f2649ef9f65ec6889a2f9fcb34bd7a2a8c2b2df06e71eb0bcb1d0063953696daadbe06cf87624714682f0c3235fe7d11 -DIST commons-csv-1.12.0-src.tar.gz.asc 488 BLAKE2B a8185e5625b87fa6040b989f3c5d768c6cd689a63ddcec871b4a38ac1b4b8ae053f03d2a5f1a8e209205c1203f3514e8ef352e7c61eef009508cc0271a3944ad SHA512 0a74375a57a585cb7182cbd1935850b456ad33c119111eff8bac9c39470ed522ad64527b759eb1df5563ca12ca7dab983b7bf6eec3565970969e8d94ba357d4b DIST commons-csv-1.14.0-src.tar.gz 37002418 BLAKE2B ff55dece5cb415a46bf410e26237b385427a5d3cb0fe170f6bd8c8d53d885f271df0dcb3cf84230a77b92fa310a49f396e8add09b0ed0bebe3c7461b2271bb4d SHA512 8eba311711b40e4b34aa37becc8ff2b18158d14fe4b032c23c59ae6a1c7b5be7c36ee3b9071ec30ae305a9f2cc4167017438b1ee8adde0a4f7f30e54fc9d5ff9 DIST commons-csv-1.14.0-src.tar.gz.asc 488 BLAKE2B 3e1f58fe4e831a13459101be14057760bf6c7ed093c7d7ec83f362888ae1d7300a07830ac7e98451f5af2e4bf11007aa664d514b8426f3f9fe92c750464a24dc SHA512 1415c2e286904c5b093d40702c705c2551fa0ba3a2463238c00825594bc751cdbcf76fc8fa98a782598dededc280aebb85f4a05c26b73a9f386273b60cbafc8e diff --git a/dev-java/commons-csv/commons-csv-1.12.0-r1.ebuild b/dev-java/commons-csv/commons-csv-1.12.0-r1.ebuild deleted file mode 100644 index 8a158bf83062..000000000000 --- a/dev-java/commons-csv/commons-csv-1.12.0-r1.ebuild +++ /dev/null @@ -1,96 +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.apache.commons:commons-csv:1.12.0" -JAVA_TESTING_FRAMEWORKS="junit-4" - -inherit java-pkg-2 java-pkg-simple verify-sig - -DESCRIPTION="Simple interface for reading and writing CSV files of various types" -HOMEPAGE="https://commons.apache.org/proper/commons-csv/" -SRC_URI="mirror://apache/commons/csv/source/${P}-src.tar.gz - verify-sig? ( https://archive.apache.org/dist/commons/csv/source/${P}-src.tar.gz.asc )" -S="${WORKDIR}/${P}-src" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 arm64 ppc64" - -RESTRICT="test" #839681 - -VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/commons.apache.org.asc" - -BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-commons )" - -DEPEND=" - >=virtual/jdk-11:* - dev-java/commons-codec:0 - >=dev-java/commons-io-2.17.0:1 - test? ( - >=dev-java/commons-lang-3.12.0:3.6 - dev-java/junit:5 - dev-java/mockito:4 - ) -" - -RDEPEND=">=virtual/jre-1.8:*" - -DOCS=( LICENSE.txt NOTICE.txt RELEASE-NOTES.txt ) - -JAVA_CLASSPATH_EXTRA=" - commons-codec - commons-io-1 -" - -JAVA_SRC_DIR="src/main/java" - -JAVA_TEST_GENTOO_CLASSPATH=" - commons-io-1 - commons-lang-3.6 - junit-5 - mockito-4 -" - -JAVA_TEST_RESOURCE_DIRS="src/test/resources" -JAVA_TEST_SRC_DIR="src/test/java" - -src_compile() { - # getting dependencies into the modulepath - DEPENDENCIES=( - commons-codec - commons-io-1 - ) - local modulepath - for dependency in ${DEPENDENCIES[@]}; do - modulepath="${modulepath}:$(java-pkg_getjars --build-only ${dependency})" - done - - local JAVA_MODULE_NAME="org.apache.${PN/-/.}" - JAVA_JAR_FILENAME="${JAVA_MODULE_NAME}.jar" - java-pkg-simple_src_compile # creates a legacy jar file without module-info - - # generate module-info.java - jdeps \ - --module-path "${modulepath}" \ - --add-modules=ALL-MODULE-PATH \ - --generate-module-info src/main \ - --multi-release 9 \ - "${JAVA_MODULE_NAME}.jar" || die - - # compile module-info.java - ejavac \ - -source 9 -target 9 \ - --module-path "${modulepath}" \ - --patch-module "${JAVA_MODULE_NAME}"="${JAVA_MODULE_NAME}.jar" \ - -d target/versions/9 \ - src/main/"${JAVA_MODULE_NAME}"/versions/9/module-info.java - - # package - JAVA_JAR_FILENAME="${PN}.jar" - jar cvf "${JAVA_JAR_FILENAME}" \ - -C target/classes . \ - --release 9 -C target/versions/9 . || die -} 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 <liaoyuan@gmail.com> -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 <liaoyuan@gmail.com> ---- - 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}" -} |
