gentoo resync : 16.01.2021

4 files changed, 0 insertions, 135 deletions

diff --git a/dev-java/snappy/Manifest b/dev-java/snappy/Manifest
index 8ab4d1121fc1..98475bac6676 100644
--- a/dev-java/snappy/Manifest
+++ b/dev-java/snappy/Manifest
@@ -1,10 +1,6 @@
-AUX 1.0.3_rc3-gentoo.patch 407 BLAKE2B d49edbd556a7f7645e42b14f2284342a9b2036a6a891d7a9b46068c59d938dd6aa18503357b015de87a92d9ea74898bc2d7e49df91224285b90ca10760923b6e SHA512 026299b83596c93618c92dc5d1b02cd982e179fc9a65ddedcf482fdbd63c9a3a8fbe85e76590fc1dc67183c6dd332226ab7868e777e63dbf930d92b53a444c7e
-AUX 1.0.3_rc3-unbundle-snappy.patch 1823 BLAKE2B 8f412141c8db63fceaf6dec1e2d6dadc57c448a818a73304b0a76d9917f1d7f43d10eaffb8c29ae9b91e14561a701b9f3cb76ad75872db47776861195e7af22a SHA512 ddc823700111bf2f8635c6ec7291ad3665506fd24d9e5263bc46681cfd3d34e604397848a9b78929107d7de3bae0c3802bc8bb642dbac1f4984565d04cb71115
 AUX 1.1.0.1-gentoo.patch 407 BLAKE2B 1ee8af08605bfcf4b61b23784da9fdb7f116536742db4d0a6dda2b04c10115fb989c488632b495496899c2e7547549b997f120b96a7add64311584e0595d4763 SHA512 0e12de9c8b1c86791b43565312a12c50036cd501c5eea5bf45a09408121b99d79f58a1047acd26202afbac246f1264dfa86da785705f83f9db1356d824c9e40f
 AUX 1.1.0.1-unbundle-snappy.patch 1780 BLAKE2B 972bb8ed77fea8de8627bd15c9abc633def05cbcc696ff198ced852584c5dafb6abd89bba73afa7406f1fea008f1098b1ccd4951f0d59c6570583dd6c22c673a SHA512 75553615c0d6c5a24c14820b09021c225c89fcf2c680eabb27957cf45f3796344745f546939d0b98d78aca192c3cd23bfe7836f6f1c7a0b03748f084579b65df
 AUX 1.x-build.xml 8496 BLAKE2B 0ab98a4149d0d7b294efec29374c59af8599362fa40d04737d50d1106157d8e604e17ce06c9180c2d9ca2b612cb5d025a111fe620739f7109a0c384ae940d4dc SHA512 ed47379879bab5cbaa4111616c3cca526725e4fa3d8d42da72d19a21738cc42826e37756a181e6d541f27aa4abe7f2353be90c51f4d89d04413501e6ccdb4cb0
-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
-EBUILD snappy-1.0.3_rc3.ebuild 1451 BLAKE2B 12d41c164386a228231b3483f8dc6024a7430af3f55a4ea34339c7da98d19ce7eb8c57ee7a2171aef7b96e420f86d7d3b29dadfb74ecd9c27b1e054e34308f77 SHA512 268de9c4e6a5edbd07cb48dab62da2120187d359e16496457859a7e2772c1add9236c4b4bec3d64f28153b9a7db0d90594d2d3aac8e871e048c7373e4b09f271
 EBUILD snappy-1.1.0.1.ebuild 1697 BLAKE2B 303375436532cd1e63fb71b70230f072f7678519b39415e11137cd040ab0562e4fa850c980b0c7c9c343e63ef8aedf1da9311f33ffbecbbd72ba725e79b5bf86 SHA512 3f7c40dd83d8a7205640663a14f8ef31f7944000d8011019690a7c37b4fdb32e6c541139cdae2ac67ba02f666d61c98351cc08aeff6816803bdb3c2f7433b86d
 MISC metadata.xml 320 BLAKE2B 5e3039edeec0b66e6b896158777909fdfed881f06def61b5e3424baeb51ea898cb3cb273e6ddc939b7efea88860a945b5f29da513be22ee6b601551a6e02170a SHA512 c2e9282ce950b419588d080145e85e63e6491500edce141678a4aaae65a43d945694ad992dd4d485c94748e26ac225e58177fcff11db3430035b837741ec45af
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
-}