commit: 2f0ca3b79e73e42ae17220fae0e025337425fdf2 Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> AuthorDate: Mon Feb 7 15:19:20 2022 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Tue Feb 8 08:10:22 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f0ca3b7
dev-java/snappy: Drop 1.1.0.1 Closes: https://bugs.gentoo.org/831269 Closes: https://bugs.gentoo.org/741190 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/24114 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> dev-java/snappy/Manifest | 1 - dev-java/snappy/files/1.1.0.1-gentoo.patch | 14 ----- .../snappy/files/1.1.0.1-unbundle-snappy.patch | 51 --------------- dev-java/snappy/snappy-1.1.0.1.ebuild | 72 ---------------------- 4 files changed, 138 deletions(-) diff --git a/dev-java/snappy/Manifest b/dev-java/snappy/Manifest index 7c04b3f1d2a6..26534254a308 100644 --- a/dev-java/snappy/Manifest +++ b/dev-java/snappy/Manifest @@ -1,2 +1 @@ -DIST snappy-java-1.1.0.1.tar.gz 4909520 BLAKE2B 65daf3d01f1cb46dd0d51609e2d95fc954d56e41fbb2d22e9eca24fad16a6d4ba16083e633fb13e68dacf6c2fb0d10ec6fb1e6dcdda6dc611b58b172710fcd62 SHA512 32d0afce880ecccd814f7738eb375a13bd533998c73d79908964061337730ad76fb4794f78fd1fcdc4a4562db57cbc4c6f912d9f3351b1d75b12ce3224ec387e DIST snappy-java-1.1.7.8.tar.gz 3558859 BLAKE2B 871f4190212399c5bd34a72766d7f3abca9a09608d9acddc126905bcdafc723613aa33d0cdb59419e6bfba46ff27e91f5ca5382073dd895d5601f6d84929ef96 SHA512 8129d4ae2abd78f967c07e7f13df8cb9043cc34bd8346be28625a3d2bea06674ce6dd09b521af2b7053b25d0132a0e822b78c06e09bacd0067ba8178bd167691 diff --git a/dev-java/snappy/files/1.1.0.1-gentoo.patch b/dev-java/snappy/files/1.1.0.1-gentoo.patch deleted file mode 100644 index 61403dd9167f..000000000000 --- a/dev-java/snappy/files/1.1.0.1-gentoo.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/Makefile b/Makefile -index 04f0435..0249d09 100644 ---- a/Makefile -+++ b/Makefile -@@ -60,8 +60,7 @@ $(SNAPPY_OUT)/SnappyNative.o : $(SRC)/org/xerial/snappy/SnappyNative.cpp $(SRC)/ - - - $(SNAPPY_OUT)/$(LIBNAME): $(SNAPPY_OBJ) -- $(CXX) $(CXXFLAGS) -o $@ $+ $(LINKFLAGS) -lsnappy -- $(STRIP) $@ -+ $(CXX) $(CXXFLAGS) -o $@ $+ $(LINKFLAGS) -lsnappy $(LDFLAGS) - - clean-native: - rm -rf $(SNAPPY_OUT) diff --git a/dev-java/snappy/files/1.1.0.1-unbundle-snappy.patch b/dev-java/snappy/files/1.1.0.1-unbundle-snappy.patch deleted file mode 100644 index 17fb2e1583ed..000000000000 --- a/dev-java/snappy/files/1.1.0.1-unbundle-snappy.patch +++ /dev/null @@ -1,51 +0,0 @@ -diff --git a/Makefile b/Makefile -index 0821c87..04f0435 100644 ---- a/Makefile -+++ b/Makefile -@@ -7,7 +7,8 @@ all: snappy - - SNAPPY_OUT:=$(TARGET)/$(snappy)-$(os_arch) - SNAPPY_ARCHIVE:=$(TARGET)/snappy-$(VERSION).tar.gz --SNAPPY_CC:=snappy-sinksource.cc snappy-stubs-internal.cc snappy.cc -+#SNAPPY_CC:=snappy-sinksource.cc snappy-stubs-internal.cc snappy.cc -+SNAPPY_CC:= - SNAPPY_SRC_DIR:=$(TARGET)/snappy-$(VERSION) - SNAPPY_SRC:=$(addprefix $(SNAPPY_SRC_DIR)/,$(SNAPPY_CC)) - SNAPPY_OBJ:=$(addprefix $(SNAPPY_OUT)/,$(patsubst %.cc,%.o,$(SNAPPY_CC)) SnappyNative.o) -@@ -46,7 +47,8 @@ src/main/resources/org/xerial/snappy/SnappyNativeLoader.bytecode: src/main/resou - $(JAVAC) -source 1.5 -target 1.5 -d $(TARGET)/temp $< - cp $(TARGET)/temp/org/xerial/snappy/SnappyNativeLoader.class $@ - --$(SNAPPY_SRC): $(SNAPPY_UNPACKED) -+$(SNAPPY_SRC): -+# $(SNAPPY_UNPACKED) - - $(SNAPPY_OUT)/%.o : $(SNAPPY_SRC_DIR)/%.cc - @mkdir -p $(@D) -@@ -58,7 +60,7 @@ $(SNAPPY_OUT)/SnappyNative.o : $(SRC)/org/xerial/snappy/SnappyNative.cpp $(SRC)/ - - - $(SNAPPY_OUT)/$(LIBNAME): $(SNAPPY_OBJ) -- $(CXX) $(CXXFLAGS) -o $@ $+ $(LINKFLAGS) -+ $(CXX) $(CXXFLAGS) -o $@ $+ $(LINKFLAGS) -lsnappy - $(STRIP) $@ - - clean-native: -@@ -73,14 +75,15 @@ NATIVE_DLL:=$(NATIVE_DIR)/$(LIBNAME) - - snappy-jar-version:=snappy-java-$(shell $(JAVA) -jar lib/silk-weaver.jar find 'project(artifactId, version)' pom.xml | grep snappy-java | awk '{ print $$2; }') - --native: $(SNAPPY_UNPACKED) $(NATIVE_DLL) --snappy: native $(TARGET)/$(snappy-jar-version).jar -+native: $(NATIVE_DLL) -+snappy: native - - $(NATIVE_DLL): $(SNAPPY_OUT)/$(LIBNAME) - @mkdir -p $(@D) - cp $< $@ - @mkdir -p $(NATIVE_TARGET_DIR) - cp $< $(NATIVE_TARGET_DIR)/$(LIBNAME) -+ cp $< $(TARGET)/ - - - $(TARGET)/$(snappy-jar-version).jar: native $(NATIVE_DLL) diff --git a/dev-java/snappy/snappy-1.1.0.1.ebuild b/dev-java/snappy/snappy-1.1.0.1.ebuild deleted file mode 100644 index 443002b9ab82..000000000000 --- a/dev-java/snappy/snappy-1.1.0.1.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -JAVA_PKG_IUSE="doc source test" - -inherit java-pkg-2 java-ant-2 - -MY_PN="${PN}-java" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="Snappy compressor/decompressor for Java" -HOMEPAGE="https://github.com/xerial/snappy-java/"; -SRC_URI="https://github.com/xerial/${MY_PN}/archive/${PV}.tar.gz -> ${PN}-java-${PV}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="1.1" -KEYWORDS="~amd64 ~x86 ~x64-macos" -IUSE="" - -CDEPEND="dev-java/osgi-core-api:0 - app-arch/snappy" - -DEPEND=">=virtual/jdk-1.6 - test? ( - dev-java/junit:4 - dev-java/xerial-core:0 - dev-java/plexus-classworlds:0 - ) - ${CDEPEND}" - -RDEPEND=">=virtual/jre-1.6 - ${CDEPEND}" - -S="${WORKDIR}/${MY_P}" - -JAVA_ANT_REWRITE_CLASSPATH="true" -EANT_GENTOO_CLASSPATH="osgi-core-api" -EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4,xerial-core,plexus-classworlds" -EANT_TEST_ANT_TASKS="ant-junit" - -java_prepare() { - cp "${FILESDIR}"/1.x-build.xml "${S}"/build.xml || die - rm -r "${S}"/src/main/resources/org/xerial/snappy/native/ || die - epatch "${FILESDIR}"/${PV}-unbundle-snappy.patch - epatch "${FILESDIR}"/${PV}-gentoo.patch -} - -src_compile() { - emake - java-pkg-2_src_compile -} - -src_install() { - local jniext=.so - if [[ ${CHOST} == *-darwin* ]] ; then - jniext=.jnilib - # avoid install_name check failure - install_name_tool -id @loader_path/libsnappyjava${jniext} \ - "${S}"/target/libsnappyjava${jniext} - fi - java-pkg_doso "${S}"/target/libsnappyjava${jniext} - java-pkg_dojar "${S}/target/${PN}.jar" - - use source && java-pkg_dosrc "${S}"/src/main/java/* - use doc && java-pkg_dojavadoc "${S}"/target/site/apidocs -} - -src_test() { - java-pkg-2_src_test -}
