gentoo resync : 20.03.2021

1 files changed, 42 insertions, 0 deletions

diff --git a/dev-java/hamcrest-core/files/hamcrest-core-1.1-java-11.patch b/dev-java/hamcrest-core/files/hamcrest-core-1.1-java-11.patch
new file mode 100644
index 000000000000..1e3805eb1755
--- /dev/null
+++ b/dev-java/hamcrest-core/files/hamcrest-core-1.1-java-11.patch
@@ -0,0 +1,42 @@
+diff --git a/hamcrest-core/src/main/java/org/hamcrest/core/AllOf.java b/hamcrest-core/src/main/java/org/hamcrest/core/AllOf.java
+index d435303..962c945 100644
+--- a/hamcrest-core/src/main/java/org/hamcrest/core/AllOf.java
++++ b/hamcrest-core/src/main/java/org/hamcrest/core/AllOf.java
+@@ -1,6 +1,7 @@
+ package org.hamcrest.core;
+ 
+ import java.util.Arrays;
++import java.util.List;
+ 
+ import org.hamcrest.Description;
+ import org.hamcrest.Factory;
+@@ -32,7 +33,7 @@ public class AllOf<T> extends ShortcutCombination<T> {
+      */
+     @Factory
+     public static <T> Matcher<T> allOf(Matcher<? super T>... matchers) {
+-        return allOf(Arrays.asList(matchers));
++        return allOf((List<Matcher<? super T>>) Arrays.asList(matchers));
+     }
+ 
+     /**
+diff --git a/hamcrest-core/src/main/java/org/hamcrest/core/AnyOf.java b/hamcrest-core/src/main/java/org/hamcrest/core/AnyOf.java
+index e003a7f..4ed9030 100644
+--- a/hamcrest-core/src/main/java/org/hamcrest/core/AnyOf.java
++++ b/hamcrest-core/src/main/java/org/hamcrest/core/AnyOf.java
+@@ -1,6 +1,7 @@
+ package org.hamcrest.core;
+ 
+ import java.util.Arrays;
++import java.util.List;
+ 
+ import org.hamcrest.Description;
+ import org.hamcrest.Factory;
+@@ -33,7 +34,7 @@ public class AnyOf<T> extends ShortcutCombination<T> {
+      */
+     @Factory
+     public static <T> Matcher<T> anyOf(Matcher<? super T>... matchers) {
+-        return anyOf(Arrays.asList(matchers));
++        return anyOf((List<Matcher<? super T>>) Arrays.asList(matchers));
+     }
+ 
+     /**