commit: 792d74198a8ee14a065f72cf7e5b7ce61c678574 Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> AuthorDate: Sat Jan 15 18:42:35 2022 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Sun Jan 16 08:31:08 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=792d7419
dev-java/snappy: Drop 1.0.3_rc3 Closes: https://bugs.gentoo.org/736960 Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/23810 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> dev-java/snappy/Manifest | 1 - dev-java/snappy/files/1.0.3_rc3-gentoo.patch | 14 ----- .../snappy/files/1.0.3_rc3-unbundle-snappy.patch | 52 ----------------- dev-java/snappy/snappy-1.0.3_rc3.ebuild | 65 ---------------------- 4 files changed, 132 deletions(-) diff --git a/dev-java/snappy/Manifest b/dev-java/snappy/Manifest index f27830f5a911..3b685046ec3a 100644 --- a/dev-java/snappy/Manifest +++ b/dev-java/snappy/Manifest @@ -1,2 +1 @@ -DIST snappy-java-1.0.3_rc3.tar.gz 5466748 BLAKE2B a58847aa56d05659bcf53f0f7a6ba9c52611784bc6a8cc40d5838309e94c72bba8c8a1a27ca5249a223823a8cc1267dabeb12f369dae71999f55d5a64a111948 SHA512 eae4551d929f951be204218926cdea773a337ad584bd6fe49083526430a4e1ea80b395a627ecebc861232d36d2ec9034f2ebccac885da13e93fb74846298ba64 DIST snappy-java-1.1.0.1.tar.gz 4909520 BLAKE2B 65daf3d01f1cb46dd0d51609e2d95fc954d56e41fbb2d22e9eca24fad16a6d4ba16083e633fb13e68dacf6c2fb0d10ec6fb1e6dcdda6dc611b58b172710fcd62 SHA512 32d0afce880ecccd814f7738eb375a13bd533998c73d79908964061337730ad76fb4794f78fd1fcdc4a4562db57cbc4c6f912d9f3351b1d75b12ce3224ec387e diff --git a/dev-java/snappy/files/1.0.3_rc3-gentoo.patch b/dev-java/snappy/files/1.0.3_rc3-gentoo.patch deleted file mode 100644 index 58a17b0dbd04..000000000000 --- a/dev-java/snappy/files/1.0.3_rc3-gentoo.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/Makefile b/Makefile -index a9d5cdc..8026741 100644 ---- a/Makefile -+++ b/Makefile -@@ -44,8 +44,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.0.3_rc3-unbundle-snappy.patch b/dev-java/snappy/files/1.0.3_rc3-unbundle-snappy.patch deleted file mode 100644 index 4885e7b5df80..000000000000 --- a/dev-java/snappy/files/1.0.3_rc3-unbundle-snappy.patch +++ /dev/null @@ -1,52 +0,0 @@ -diff --git a/Makefile b/Makefile -index b67855a..a9d5cdc 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) -@@ -30,7 +31,8 @@ jni-header: $(SRC)/org/xerial/snappy/SnappyNative.h - $(SRC)/org/xerial/snappy/SnappyNative.h: $(SRC)/org/xerial/snappy/SnappyNative.java - $(JAVAH) -classpath $(TARGET)/classes -o $@ org.xerial.snappy.SnappyNative - --$(SNAPPY_SRC): $(SNAPPY_UNPACKED) -+$(SNAPPY_SRC): -+# $(SNAPPY_UNPACKED) - - $(SNAPPY_OUT)/%.o : $(SNAPPY_SRC_DIR)/%.cc - @mkdir -p $(@D) -@@ -42,7 +44,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: -@@ -57,15 +59,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: $(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) - $(MVN) package -Dmaven.test.skip=true diff --git a/dev-java/snappy/snappy-1.0.3_rc3.ebuild b/dev-java/snappy/snappy-1.0.3_rc3.ebuild deleted file mode 100644 index 3d2afabf6e0d..000000000000 --- a/dev-java/snappy/snappy-1.0.3_rc3.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# 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_PV="${PV/_rc/-rc}" -MY_P="${MY_PN}-${MY_PV}" - -DESCRIPTION="Snappy compressor/decompressor for Java" -HOMEPAGE="https://github.com/xerial/snappy-java/"; -SRC_URI="https://github.com/xerial/${MY_PN}/archive/${MY_P}.tar.gz -> ${PN}-java-${PV}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="1.0" -KEYWORDS="~amd64 ~x86" -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 - ) - ${CDEPEND}" - -RDEPEND=">=virtual/jre-1.6 - ${CDEPEND}" - -S="${WORKDIR}/${MY_PN}-${MY_P}" - -JAVA_ANT_REWRITE_CLASSPATH="true" -EANT_GENTOO_CLASSPATH="osgi-core-api" -EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4,xerial-core" -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() { - java-pkg_doso "${S}"/target/libsnappyjava.so - 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 -}
