gentoo resync : 28.04.2021

3 files changed, 112 insertions, 0 deletions

diff --git a/dev-java/snakeyaml/Manifest b/dev-java/snakeyaml/Manifest
index 54e5970060bb..589c8a95c95f 100644
--- a/dev-java/snakeyaml/Manifest
+++ b/dev-java/snakeyaml/Manifest
@@ -1,3 +1,6 @@
+AUX snakeyaml-1.28-fix-test-check.patch 728 BLAKE2B 3c2e1607f03cfb00dba8808fec19b7a705afcc6ad8b1a3c2ee9b2b38e05e0e4e50b00413e5da236827ba4d7ca715b27158d0354dd7ce3950645a2a3bc9057540 SHA512 81bd69b9780e75df4d0964119a0c15684b54533ce2eebc94de3d481b7cf521b26f82f62279eabf3fc0e41eefb9c1648fb2700d6f07ae3b1fd99c6a5f55cbecd8
+DIST asomov-snakeyaml-b28f0b4d87c6.tar.gz 397832 BLAKE2B 054c228cd739e0d7ae89227cba7ae1aba76e5b6a7aae4915a765816d916ab3a47e80d6c2795a5e9bcaee96a70c1751fb9e67523e7faed2db5a6d2123d773d04a SHA512 2d19aee8c3aef2c4c300382451c1241dd2452180fe28c39eb9fe1bbc9d6c615bb8504535d3cf1cf5fe2ad55def8c43b709e8ecd97f760403cfaee7db977f074c
 DIST snakeyaml-1.16.tar.bz2 234954 BLAKE2B dea06c3501ceab4e92b4d125dc882ce7b7773d67ac5526fdf39fafb421f339fe892cfd3f8e80e413aa080fecbc94425842ccabd099d97e1c705eab7025c489e9 SHA512 77ef0b1fa2ebe7ab1618745c407436ac6965159e29e1271b0d571006b967bcd94658eb3a8047180ea7c3160eb66ecbac1f24414537a24a81c11fb735ce65e3a4
 EBUILD snakeyaml-1.16.ebuild 1330 BLAKE2B bc4ec2b97f5e12b611340669485f71e44fe56905c554761dd9628f14bfb8d501e57d2f322b8d0ef8bc8159720e05d643f7cc5626358ec71e029bd4fb73497608 SHA512 65553fab3d53a9feba2dbf1a5754a68710d796b8d5f182696869aa2c6224291b81156753c8cce6807c9c622b214bf9ab4dba70cdffdfdf36ecc6a0ffe7bf32a5
+EBUILD snakeyaml-1.28-r1.ebuild 2949 BLAKE2B 1d7e3c60472fe80e9d5b2a2bc8f22da593aac2c9fd395e48934a51f3aaa06aea6a06dfb7a90d6d8333387469f2e044ab2546ac7e717d1824a979fd2e2294abd8 SHA512 5baa8e3330d69f29d59f3f7fee4813955968b32c817d095333de39933ecbfc929da1ec4848ed7503d881a09bf77f1c31506564a34dd32e874ba17642a4f73bb9
 MISC metadata.xml 320 BLAKE2B f5e0df5b735f9728165a2b8a6cd9c5f6d0142878f75ace80705d73e6948654f4761ef4fa4715b23ae4f5d97ed25e2ab6aa72582a80790a3f7a13d8c59f73ad40 SHA512 149372d821a11d3dfce7ec38ddb98c9b5b5e64c513fdd1e27b74dce17f398eec6d24b5a61ad62fb5e6e0ee31f206f1ed005db953f5f2358177f1a1d56420d5cc
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
new file mode 100644
index 000000000000..fe903380fd61
--- /dev/null
+++ b/dev-java/snakeyaml/files/snakeyaml-1.28-fix-test-check.patch
@@ -0,0 +1,14 @@
+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
new file mode 100644
index 000000000000..f7a00cefc146
--- /dev/null
+++ b/dev-java/snakeyaml/snakeyaml-1.28-r1.ebuild
@@ -0,0 +1,95 @@
+# 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 ~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
+}