gentoo auto-resync : 16:09:2022 - 23:15:49

3 files changed, 2 insertions, 100 deletions

diff --git a/dev-java/snappy/Manifest b/dev-java/snappy/Manifest
index ac977c76b4b4..5b41a4e84199 100644
--- a/dev-java/snappy/Manifest
+++ b/dev-java/snappy/Manifest
@@ -5,6 +5,5 @@ AUX 1.1.7.8-unbundle-bitshuffle.patch 1006 BLAKE2B 99b88fd2af02ff6d95d90ec2e3025
 AUX 1.1.7.8-unbundle-snappy.patch 1820 BLAKE2B ec2f5724675cef1a796678f5b12ccd4b49c2415fcfd98e2a3f9214bb63477bfd9bed93999c2f12b2f0e8b5aedb705299bf37e52a16833797a745bf4e1eeecdd9 SHA512 408c09f01cb65dcf17b7ecd5542cd622b6296ab6d433be79ff2a8d03dc4e8f8b9c48165d95afa0b865c8ab196c4470e93f5b07e9eeded1f492d1ef2d8d91fa82
 AUX 1.x-build.xml 8496 BLAKE2B 0ab98a4149d0d7b294efec29374c59af8599362fa40d04737d50d1106157d8e604e17ce06c9180c2d9ca2b612cb5d025a111fe620739f7109a0c384ae940d4dc SHA512 ed47379879bab5cbaa4111616c3cca526725e4fa3d8d42da72d19a21738cc42826e37756a181e6d541f27aa4abe7f2353be90c51f4d89d04413501e6ccdb4cb0
 DIST snappy-java-1.1.7.8.tar.gz 3558859 BLAKE2B 871f4190212399c5bd34a72766d7f3abca9a09608d9acddc126905bcdafc723613aa33d0cdb59419e6bfba46ff27e91f5ca5382073dd895d5601f6d84929ef96 SHA512 8129d4ae2abd78f967c07e7f13df8cb9043cc34bd8346be28625a3d2bea06674ce6dd09b521af2b7053b25d0132a0e822b78c06e09bacd0067ba8178bd167691
-EBUILD snappy-1.1.7.8-r1.ebuild 2562 BLAKE2B 3b23b363330f6ef75d5ef9583d622f6557903b0c5d75e9c32b651a9a0c3a64af41be5fc36b846b5390713998c36e357077ce19cfc8f3c77c7b19aa272dc49157 SHA512 d4fc68bb82805a3ccce889acf48f4244f2969422c839360bd2289a42c2173e4ec9615aca55f8a442dc633363b42462beb5c655976c49321bbd23282f59b92434
-EBUILD snappy-1.1.7.8.ebuild 2569 BLAKE2B 5744632d7f2d1931790e0b5ef481444653eb3711e4311688f6cda071b9b2f339d2743e8f0a2cd299ba93164e8c1e135110c315256f3b6b0330ce721dd2964b89 SHA512 f274294167f77a7f9c96868117c4ee75f1e0fa062bbab9027f12bf98333fcb0bf6ae7bb0e5692bfba0193ce423598674bc6b982bbb700e3255ce557d4c7c6572
+EBUILD snappy-1.1.7.8-r1.ebuild 2561 BLAKE2B bb815a3e94b01fe45b89cfb33c2be3119c3fc8035441c04f8dae9ffd071e5dbe37f77ccd94f0b27441c21e4f417d08f713e4b5dba999166cb673c6302b419daa SHA512 ea704df0a8b07a4451cd459f35c774dc758a05c7e89d65ccbda4a620150b58898628bd12249957e86f62d9fa71df4d19ca0931de14dbc227d398ed8af0d44d45
 MISC metadata.xml 320 BLAKE2B 5e3039edeec0b66e6b896158777909fdfed881f06def61b5e3424baeb51ea898cb3cb273e6ddc939b7efea88860a945b5f29da513be22ee6b601551a6e02170a SHA512 c2e9282ce950b419588d080145e85e63e6491500edce141678a4aaae65a43d945694ad992dd4d485c94748e26ac225e58177fcff11db3430035b837741ec45af
diff --git a/dev-java/snappy/snappy-1.1.7.8-r1.ebuild b/dev-java/snappy/snappy-1.1.7.8-r1.ebuild
index a6734953941b..37b8dcf972f5 100644
--- a/dev-java/snappy/snappy-1.1.7.8-r1.ebuild
+++ b/dev-java/snappy/snappy-1.1.7.8-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/xerial/${MY_PN}/archive/${PV}.tar.gz -> ${MY_P}.tar.
 
 LICENSE="Apache-2.0"
 SLOT="1.1"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # Tests require org.apache.hadoop:hadoop-common:2.7.*, which is yet to be
 # packaged.  Some extra steps are required before running the tests:
diff --git a/dev-java/snappy/snappy-1.1.7.8.ebuild b/dev-java/snappy/snappy-1.1.7.8.ebuild
deleted file mode 100644
index bb7a64023a0a..000000000000
--- a/dev-java/snappy/snappy-1.1.7.8.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2022 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:1.1.7.8"
-
-inherit java-pkg-2 java-ant-2 toolchain-funcs
-
-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 -> ${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="1.1"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-# Tests require org.apache.hadoop:hadoop-common:2.7.*, which is yet to be
-# packaged.  Some extra steps are required before running the tests:
-# 1. Download hadoop-common 2.7.x from https://mvnrepository.com/artifact/org.apache.hadoop/hadoop-common
-# 2. Set EANT_GENTOO_CLASSPATH_EXTRA to the path to hadoop-common-2.7.*.jar
-# 3. Set ALLOW_TEST="all"
-RESTRICT="test"
-
-CDEPEND="dev-java/osgi-core-api:0
-	app-arch/snappy
-	dev-libs/bitshuffle"
-
-DEPEND=">=virtual/jdk-1.8:*
-	${CDEPEND}
-	test? (
-		dev-java/ant-junit4:0
-		dev-java/commons-io:1
-		dev-java/commons-lang:2.1
-		dev-java/plexus-classworlds:0
-		dev-java/xerial-core:0
-	)"
-
-RDEPEND=">=virtual/jre-1.8:*
-	${CDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-JAVA_ANT_CLASSPATH_TAGS="javac javadoc"
-EANT_GENTOO_CLASSPATH="osgi-core-api"
-EANT_TEST_GENTOO_CLASSPATH="
-	${EANT_GENTOO_CLASSPATH}
-	commons-io-1
-	commons-lang-2.1
-	plexus-classworlds
-	xerial-core
-"
-
-src_prepare() {
-	cp "${FILESDIR}/1.x-build.xml" build.xml || die
-	rm -r src/main/resources/org/xerial/snappy/native || die
-	eapply "${FILESDIR}/${PV}-java-version-target.patch"
-	eapply "${FILESDIR}/${PV}-remove-perl-usage.patch"
-	eapply "${FILESDIR}/${PV}-unbundle-snappy.patch"
-	eapply "${FILESDIR}/${PV}-unbundle-bitshuffle.patch"
-	eapply "${FILESDIR}/${PV}-gentoo.patch"
-	java-pkg-2_src_prepare
-}
-
-src_compile() {
-	emake \
-		CXX="$(tc-getCXX)" \
-		JAVA_SOURCE="$(java-pkg_get-source)" \
-		JAVA_TARGET="$(java-pkg_get-target)"
-	java-pkg-2_src_compile
-}
-
-src_test() {
-	cp -r src/test/resources/org/xerial/snappy/* \
-		src/test/java/org/xerial/snappy || die
-	java-pkg-2_src_test
-}
-
-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}"
-	java-pkg_dojar "target/${PN}.jar"
-
-	use source && java-pkg_dosrc src/main/java/*
-	use doc && java-pkg_dojavadoc target/site/apidocs
-}