gentoo auto-resync : 01:10:2023 - 11:42:49

3 files changed, 16 insertions, 3 deletions

diff --git a/dev-java/snappy/Manifest b/dev-java/snappy/Manifest
index dc870532d7ae..2a9fff9f0abf 100644
--- a/dev-java/snappy/Manifest
+++ b/dev-java/snappy/Manifest
@@ -5,10 +5,11 @@ 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
 AUX snappy-1.1.10.1-SnappyOutputStreamTest.patch 1148 BLAKE2B 38fd8aa64068351a6296c2abd1835b8106d22bffc418dae29ac806d472809fb924f7c3a909d7d7dfd1687c0c62be50968d0a9a864d65c522f78b15f644a077c4 SHA512 d9b72e0b7ca85d0ee907d36ffb63e33b26408ce2619f99e3fde9c0f06f25d492be7f7b20c7bb3c00038da8ef40a73492f65d15eb51261d8466d2e855b152ccfa
+AUX snappy-1.1.10.1-commons-lang3.patch 507 BLAKE2B 17a9219e4e9fbcf8900dff8ce06762262d5d40ac07861d895ba29da8a2583ce37c011b04892382359a86c79ffff77ceac36d0f8fcca420fc20011d3411f9078a SHA512 2c08bbf6fe408778233a1194df72182a5cf4083b8647f9baea740b9fb403f31e001e1671913992624465d2e7d7197142ea47cc4891d64124fc54ac95a9d9accb
 AUX snappy-1.1.10.1-unbundle-snappy.patch 1928 BLAKE2B cc67a38e53dcd08d208b33796a003d7ca73f79a54a8d0a4411de9f15aae1e09e079bc55c9230964e990f8a27e4be3872e9d5092fe7abb5af760ce91641b753c1 SHA512 78cef705a76c379ec7cc59e4f4c6012bbba5f54b4a24172b7ab2ef0ccd7a8e22cf3e469938c9dca5933e066990c3e973893c0c93368fecd90486010f9b8ad69f
 DIST hadoop-common-3.3.5.jar 4535144 BLAKE2B 66582661a1832cc54493fc9dcea9076eb0e3f4e974a7d24d593e8fff2b9e2a3a82ed6eb4587f23523473aecc35d2a15de2ad81b2617c1bdac50847149cdeb6a8 SHA512 f1fb439a5853b04e9e771ec4e80e1ed078494ecfaa741abe065936fc1c26b5369fdd4e8082f4da59c1a3a7a5c025beaa14a68c38dc772e81499f83a3cb91717b
 DIST snappy-1.1.10.1.tar.gz 3386807 BLAKE2B 977bd6c0aee2708952e3e4a434c819d7cc1ae3ac9320639b5bf5fc80551905ada85a001d3aa2d6384cc78839615335acb7378d50f60a5c3e86345b8e28aa6911 SHA512 8226a3e3a6ec9e0f4fae2d4b8ebf276e5225db8c8f0619a02db7490d3425260693afdc20c48e6e17a37621116067b47972cbcb02bd6617cb9face07d28fe5061
 DIST snappy-java-1.1.7.8.tar.gz 3558859 BLAKE2B 871f4190212399c5bd34a72766d7f3abca9a09608d9acddc126905bcdafc723613aa33d0cdb59419e6bfba46ff27e91f5ca5382073dd895d5601f6d84929ef96 SHA512 8129d4ae2abd78f967c07e7f13df8cb9043cc34bd8346be28625a3d2bea06674ce6dd09b521af2b7053b25d0132a0e822b78c06e09bacd0067ba8178bd167691
-EBUILD snappy-1.1.10.1.ebuild 2868 BLAKE2B cc6e77e10490f1f73a361a277122f7b15f5a61b1a3b1b56240e57093ebae8c30002f20f1abd4861c6793d81705248be738b98fc2773baf894ddc061d4cf3d1ed SHA512 787045a4cdaede5dd27028ae20256e963a746cd1c8495408a7571c9dcaadf025affcf8949314476a18881fc97111cecfe8279fb1c2dc136d70c14ebe0f53c713
+EBUILD snappy-1.1.10.1-r1.ebuild 2919 BLAKE2B 7fe6414f4ca42971a18d62b71898a663939f3dfce107f067125fce5c2fa379c9706a45ef768667eb8d8b59e2f846499d0cf799c04125064b60ff540abf071d78 SHA512 66128f1facc7e029838e4c631fc3179a464669e95df8dd6e359f00364c5e5a137c268ab9e73ca4f34bd211c1ddbc5a166f32f0adbb5be94e4ed062d911cd9bc1
 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/files/snappy-1.1.10.1-commons-lang3.patch b/dev-java/snappy/files/snappy-1.1.10.1-commons-lang3.patch
new file mode 100644
index 000000000000..064482eabb7f
--- /dev/null
+++ b/dev-java/snappy/files/snappy-1.1.10.1-commons-lang3.patch
@@ -0,0 +1,11 @@
+--- a/src/test/java/org/xerial/snappy/SnappyHadoopCompatibleOutputStreamTest.java
++++ b/src/test/java/org/xerial/snappy/SnappyHadoopCompatibleOutputStreamTest.java
+@@ -2,7 +2,7 @@ package org.xerial.snappy;
+ 
+ import org.apache.commons.io.FileUtils;
+ import org.apache.commons.io.IOUtils;
+-import org.apache.commons.lang.SystemUtils;
++import org.apache.commons.lang3.SystemUtils;
+ import org.apache.hadoop.conf.Configuration;
+ import org.apache.hadoop.io.compress.SnappyCodec;
+ import org.junit.AfterClass;
diff --git a/dev-java/snappy/snappy-1.1.10.1.ebuild b/dev-java/snappy/snappy-1.1.10.1-r1.ebuild
index 2813bcdd4901..9097dcb28f01 100644
--- a/dev-java/snappy/snappy-1.1.10.1.ebuild
+++ b/dev-java/snappy/snappy-1.1.10.1-r1.ebuild
@@ -35,7 +35,7 @@ DEPEND=">=virtual/jdk-1.8:*
 	test? (
 		dev-java/ant-junit4:0
 		dev-java/commons-io:1
-		dev-java/commons-lang:2.1
+		dev-java/commons-lang:3.6
 		dev-java/plexus-classworlds:0
 		dev-java/xerial-core:0
 	)"
@@ -50,6 +50,7 @@ PATCHES=(
 	"${FILESDIR}/1.1.7.8-unbundle-bitshuffle.patch"
 	"${FILESDIR}/1.1.7.8-gentoo.patch"
 	"${FILESDIR}/snappy-1.1.10.1-SnappyOutputStreamTest.patch"
+	"${FILESDIR}/snappy-1.1.10.1-commons-lang3.patch"
 )
 
 JAVA_RESOURCE_DIRS="src/main/resources"
@@ -57,7 +58,7 @@ JAVA_SRC_DIR="src/main/java"
 
 JAVA_TEST_GENTOO_CLASSPATH="
 	commons-io-1
-	commons-lang-2.1
+	commons-lang-3.6
 	junit-4
 	plexus-classworlds
 	xerial-core