gentoo resync : 12.05.2022

4 files changed, 2 insertions, 114 deletions

diff --git a/dev-java/snakeyaml/Manifest b/dev-java/snakeyaml/Manifest
index 41d05244861a..5852eead8646 100644
--- a/dev-java/snakeyaml/Manifest
+++ b/dev-java/snakeyaml/Manifest
@@ -1,7 +1,4 @@
-AUX snakeyaml-1.28-fix-test-check.patch 728 BLAKE2B 3c2e1607f03cfb00dba8808fec19b7a705afcc6ad8b1a3c2ee9b2b38e05e0e4e50b00413e5da236827ba4d7ca715b27158d0354dd7ce3950645a2a3bc9057540 SHA512 81bd69b9780e75df4d0964119a0c15684b54533ce2eebc94de3d481b7cf521b26f82f62279eabf3fc0e41eefb9c1648fb2700d6f07ae3b1fd99c6a5f55cbecd8
 AUX snakeyaml-1.30-fix-test-check.patch 664 BLAKE2B add2f85384f819b30e9ee7af02b73b12ba406c24e63eb7408d9eadcc6f11d532dc635f5d6a3aa73bd09a6975941bb56b69a389c2c1b3edd37dbedcffd83a8bc2 SHA512 5f395fa1f79a9801de11a5e81244799511c88e689bf480e6099357dfbd6666ee8f19bb204adac47c1f6014e92f65476e5f0031b73268f8279cf6253cf6a387b1
-DIST asomov-snakeyaml-b28f0b4d87c6.tar.gz 397832 BLAKE2B 054c228cd739e0d7ae89227cba7ae1aba76e5b6a7aae4915a765816d916ab3a47e80d6c2795a5e9bcaee96a70c1751fb9e67523e7faed2db5a6d2123d773d04a SHA512 2d19aee8c3aef2c4c300382451c1241dd2452180fe28c39eb9fe1bbc9d6c615bb8504535d3cf1cf5fe2ad55def8c43b709e8ecd97f760403cfaee7db977f074c
 DIST snakeyaml-1.30.tar.gz 402525 BLAKE2B 1d130ce8c5313b302463df11493a0fa845faf3921cd0b0a47f9db8d31f568f266f14a1543e33d77bf9e1b86c462ae4bba8e140339a6245341bdc05d76a1ccf07 SHA512 9ae09163d933e0899cf48ba0c80b5f01423847f1c18306859fa4c4002f0c909611df7096d494e04bb0f8f7d2bc5d1eb4f656e2f322941ddef642b0c23a351908
-EBUILD snakeyaml-1.28-r1.ebuild 2964 BLAKE2B bf8a1757ad1d41516cc55ac05737d48c6dbc681fe33fd8ead62de25a1fb0006059c778858e945c85bab913a37928869d33281ada50e4c6b8e7afbddb98dd38be SHA512 a70b5a39e84eb98623536a9e3eafee142c1d99f50697680b9f9b6db4415c247a9a7053294cbdbc9dbc6d75a3d2b6e2b22e0c30e1763d8b13584b12bba5a84570
-EBUILD snakeyaml-1.30.ebuild 3147 BLAKE2B 7ecb31f84c2f779f31e5cd3d22ab09a5e54dc77d1d6865adeffd8b59d4fa36614300d27acbf133c184a97c16cbafc81aa67851534549646e5171b16f70715097 SHA512 6784de89821f053ceb8f8164ad58bae8d4c89db74bef105aeb0c4e95839a59b15d6f3a23a4fc8accb8d2fc919cc16ed95ba463710574c84a7fe3b490bf9c1fbf
+EBUILD snakeyaml-1.30.ebuild 3143 BLAKE2B 3168587833152ded025e595d11391ada4fd9ffbca65429b3d59c23034103489190e02a56888372143ac32788c63ce39664c626f2855fd0603c0bdc6d5fce91bb SHA512 89a163deec9c2541d8358400f25d9b6793c2f2f150f4fb5cd7fd0aa90bba57fdb3fb4e359c552ba5c10ffb1d7e59719ff5a99496438b9e4b81dc1410734ff796
 MISC metadata.xml 548 BLAKE2B b9d917044a58addef7e75a2714a1a2f70c6ac4db0b30469b93c034b5aca8cd834652c5446b42c99e6785c222667c523b6325341e8f35be342622ad1486411ba6 SHA512 bfb8134a7351f7d0fe4a6433a4655ad8baa207641cb9939591209d05c3caf2d92593891b4b2dced236bb2186d3e410c54ba28682251c5d5f1d5d590e4e94ee61
diff --git a/dev-java/snakeyaml/files/snakeyaml-1.28-fix-test-check.patch b/dev-java/snakeyaml/files/snakeyaml-1.28-fix-test-check.patch
deleted file mode 100644
index fe903380fd61..000000000000
--- a/dev-java/snakeyaml/files/snakeyaml-1.28-fix-test-check.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/src/test/java/org/yaml/snakeyaml/issues/issue377/BillionLaughsAttackTest.java b/src/test/java/org/yaml/snakeyaml/issues/issue377/BillionLaughsAttackTest.java
-index e87f330..28c836b 100644
---- a/src/test/java/org/yaml/snakeyaml/issues/issue377/BillionLaughsAttackTest.java
-+++ b/src/test/java/org/yaml/snakeyaml/issues/issue377/BillionLaughsAttackTest.java
-@@ -69,7 +69,8 @@ public class BillionLaughsAttackTest {
-             map.toString();
-             fail("Expected overflow");
-         } catch (Throwable e) {
--            assertTrue(e.getMessage().contains("heap"));
-+            final String message = e.getMessage();
-+            assertTrue(message == null || message.contains("heap"));
-         }
-     }
- 
diff --git a/dev-java/snakeyaml/snakeyaml-1.28-r1.ebuild b/dev-java/snakeyaml/snakeyaml-1.28-r1.ebuild
deleted file mode 100644
index 771b05ba5ef1..000000000000
--- a/dev-java/snakeyaml/snakeyaml-1.28-r1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://bitbucket.org/asomov/snakeyaml/get/snakeyaml-1.28.tar.gz --slot 0 --keywords "~amd64 ~x86" --ebuild snakeyaml-1.28-r1.ebuild
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.yaml:snakeyaml:1.28"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_COMMIT="b28f0b4d87c6"
-MY_P="asomov-snakeyaml-${MY_COMMIT}"
-
-DESCRIPTION="YAML 1.1 parser and emitter for Java"
-HOMEPAGE="https://bitbucket.org/asomov/snakeyaml"
-SRC_URI="https://bitbucket.org/asomov/${PN}/get/${P}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-# Compile dependencies
-# POM: pom.xml
-# test? commons-io:commons-io:2.5 -> >=dev-java/commons-io-2.4:1
-# test? joda-time:joda-time:2.10.1 -> >=dev-java/joda-time-2.10.10:0
-# test? junit:junit:4.13.1 -> >=dev-java/junit-4.13.1:4
-# test? org.apache.commons:commons-lang3:3.4 -> >=dev-java/commons-lang-3.4:3.4
-# test? org.apache.velocity:velocity:1.6.2 -> >=dev-java/velocity-1.7:0
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-	test? (
-		>=dev-java/commons-io-2.4:1
-		dev-java/commons-lang:3.6
-		>=dev-java/joda-time-2.10.10:0
-		>=dev-java/velocity-1.7:0
-	)
-"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-test-check.patch"
-)
-
-JAVA_SRC_DIR="src/main/java"
-
-JAVA_TEST_GENTOO_CLASSPATH="commons-io-1,joda-time,junit-4,commons-lang-3.6,velocity"
-JAVA_TEST_SRC_DIR="src/test/java"
-JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-
-JAVA_TEST_EXCLUDES=(
-	"examples.spring.TestEntityDescription"	# Invalid test class
-	"org.yaml.snakeyaml.constructor.TestBean1"	# Invalid test class
-	"org.yaml.snakeyaml.introspector.TestAnnotation"	# Invalid test class
-	"org.yaml.snakeyaml.introspector.TestBean"	# Invalid test class
-	"org.yaml.snakeyaml.ruby.TestObject"	# Invalid test class
-	"org.yaml.snakeyaml.issues.issue154.TestBean"	# Invalid test class
-	"org.yaml.snakeyaml.issues.issue193.TestYaml"	# Invalid test class
-
-	# initializationError(org.yaml.snakeyaml.constructor.TestBean)
-	# java.lang.IllegalArgumentException: Test class can only have one constructor
-	"org.yaml.snakeyaml.constructor.TestBean"
-
-	# testTemplate1(org.yaml.snakeyaml.emitter.template.VelocityTest)
-	# java.lang.NullPointerException
-	"org.yaml.snakeyaml.emitter.template.VelocityTest"
-
-	# yamlClassInYAMLCL(org.yaml.snakeyaml.issues.issue318.ContextClassLoaderTest)
-	# java.lang.ClassNotFoundException: org.yaml.snakeyaml.Yaml
-	"org.yaml.snakeyaml.issues.issue318.ContextClassLoaderTest"
-
-	"examples.spring.TestEntity"	# Invalid test class
-
-	"org.pyyaml.PyImportTest"	# No tests found in org.pyyaml.PyImportTest
-)
-
-src_prepare() {
-	default
-	java-utils-2_src_prepare
-}
-
-src_test() {
-	export EnvironmentKey1="EnvironmentValue1"
-	export EnvironmentEmpty=""
-	java-pkg-simple_src_test
-}
diff --git a/dev-java/snakeyaml/snakeyaml-1.30.ebuild b/dev-java/snakeyaml/snakeyaml-1.30.ebuild
index 6ae8d5e2d63e..9ec4118119dc 100644
--- a/dev-java/snakeyaml/snakeyaml-1.30.ebuild
+++ b/dev-java/snakeyaml/snakeyaml-1.30.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://bitbucket.org/${PN}/${PN}/get/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # Compile dependencies
 # POM: pom.xml