commit: 0a91ca7e3d8d7be9a4e27ccb55f440178cc5a55a Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> AuthorDate: Fri Nov 4 10:56:05 2022 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Sat Nov 5 05:41:05 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a91ca7e
dev-java/zstd-jni: drop 1.5.0.5 Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/28135 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> dev-java/zstd-jni/Manifest | 1 - .../files/zstd-jni-1.5.0.4-filter-flags.patch | 9 ---- dev-java/zstd-jni/zstd-jni-1.5.0.5.ebuild | 60 ---------------------- 3 files changed, 70 deletions(-) diff --git a/dev-java/zstd-jni/Manifest b/dev-java/zstd-jni/Manifest index 5b766999bc7c..14a650f44f39 100644 --- a/dev-java/zstd-jni/Manifest +++ b/dev-java/zstd-jni/Manifest @@ -1,2 +1 @@ -DIST zstd-jni-1.5.0.5.tar.gz 9297542 BLAKE2B 96b2aa09d62c7a45c352d52358aa47a66c95c1b122bfc61b7e2b3aaa829e011a8ed6f71373130700ecdb7d8541ca6971c2cd7fda01be396053532c4aeeca3cb1 SHA512 b63858d58c7d1b2c9d120f49d1289caa7e5b429d0f8c3c95b7f58a5d432f09d41504c5f5b0934f53be8eadf3c1ab02a1a872e292bac465907fffe2a67108267e DIST zstd-jni-1.5.2.4.tar.gz 9343792 BLAKE2B 8a446b229d49671b3f38d630ecf2c2688210176af95b66c788027de89986ad1f23615582d670f1d7a0b3866572b05c722ad6c71783d208401844287e8149f65c SHA512 bf67fc6573f2b1e45bd4985186814a54fb948a1b7280b5cf2f6d2577626c1f70626a58994291ffb228f097c91d60e3ed52d56ad92830c8f386b96b11fb6cf4a2 diff --git a/dev-java/zstd-jni/files/zstd-jni-1.5.0.4-filter-flags.patch b/dev-java/zstd-jni/files/zstd-jni-1.5.0.4-filter-flags.patch deleted file mode 100644 index 8c880da46623..000000000000 --- a/dev-java/zstd-jni/files/zstd-jni-1.5.0.4-filter-flags.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5d0092f..d0f45b5 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -10,4 +10,3 @@ file(GLOB_RECURSE SOURCES RELATIVE ${CMAKE_SOURCE_DIR} "src/*.c") - add_library(zstd-jni-${NATIVE_VERSION} SHARED ${SOURCES}) - add_definitions("-DZSTD_MULTITHREAD=1") - add_definitions("-DZSTD_LEGACY_SUPPORT=4") --add_definitions("-Oz") diff --git a/dev-java/zstd-jni/zstd-jni-1.5.0.5.ebuild b/dev-java/zstd-jni/zstd-jni-1.5.0.5.ebuild deleted file mode 100644 index 90da21d386e6..000000000000 --- a/dev-java/zstd-jni/zstd-jni-1.5.0.5.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -MAVEN_ID="com.github.luben:zstd-jni:1.5.0-5" -MY_PV="$(ver_rs 3 -)" - -inherit java-pkg-2 java-pkg-simple cmake - -DESCRIPTION="JNI bindings for Zstd native library" - -HOMEPAGE="https://github.com/luben/zstd-jni"; -SRC_URI="https://github.com/luben/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${PN}-${MY_PV}" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" - -RDEPEND=">=virtual/jre-1.8:*" -DEPEND=">=virtual/jdk-1.8:*" - -PATCHES=( - "${FILESDIR}/zstd-jni-1.5.0.4-filter-flags.patch" -) - -JAVA_SRC_DIR="src/main/java" - -src_prepare() { - cmake_src_prepare - - echo -e "package com.github.luben.zstd.util;\n\npublic class ZstdVersion\n{\n\tpublic static final String VERSION = \"${PV}\";\n}\n" \ - >> ${JAVA_SRC_DIR}/com/github/luben/zstd/util/ZstdVersion.java || die "Failed to generate version class" -} - -src_configure() { - local mycmakeargs=( - -DJAVA_HOME="$(java-config -g JAVA_HOME)" - # Resolve bug #776910 - # Reference: https://stackoverflow.com/a/51764145 - -DJAVA_AWT_LIBRARY="NotNeeded" - ) - cmake_src_configure -} - -src_compile() { - cmake_src_compile - - mkdir -p "${S}/target/classes/META-INF" || die "Failed to create META-INF dir" - echo "Manifest-Version: 1.0 -Implementation-Version: ${MY_PV} -Bundle-NativeCode: libzstd-jni.so;osname=Linux" > "${S}/target/classes/META-INF/MANIFEST.MF" || die "Failed to create MANIFEST.MF" - java-pkg-simple_src_compile - java-pkg_addres ${JAVA_JAR_FILENAME} "${BUILD_DIR}" -name libzstd-jni.so || die "Failed to add library to jar" -} - -src_install() { - java-pkg-simple_src_install -}
