Merge updates from master

17 files changed, 161 insertions, 283 deletions

diff --git a/dev-java/ant/ant-1.10.14.ebuild b/dev-java/ant/ant-1.10.14-r1.ebuild
index 57167d57a761..a18ee50e36b4 100644
--- a/dev-java/ant/ant-1.10.14.ebuild
+++ b/dev-java/ant/ant-1.10.14-r1.ebuild
@@ -69,7 +69,10 @@ DEPEND="
 	xz? ( dev-java/xz-java:0 )
 "
 PDEPEND="~dev-java/ant-core-${PV}:0"
-RDEPEND=">=virtual/jre-1.8:*"
+RDEPEND="
+	!<dev-java/ant-core-1.10.14
+	>=virtual/jre-1.8:*
+"
 
 DOCS=( CONTRIBUTORS INSTALL NOTICE README WHATSNEW )
 PATCHES=(
diff --git a/dev-java/ant/files/ant-1.10.14-JavaTest.patch b/dev-java/ant/files/ant-1.10.14-JavaTest.patch
index 1c291c71e5f3..9143cba43ca2 100644
--- a/dev-java/ant/files/ant-1.10.14-JavaTest.patch
+++ b/dev-java/ant/files/ant-1.10.14-JavaTest.patch
@@ -1,272 +1,4 @@
-There were 12 failures:
-1) testExcepting(org.apache.tools.ant.taskdefs.JavaTest)
-java.lang.AssertionError: 
-Expected: a string containing "Exception raised inside called program"
-     but: was "Could not find org.apache.tools.ant.taskdefs.JavaTest$ExceptingEntryPoint. Make sure you have it in your classpath
-	at org.apache.tools.ant.taskdefs.ExecuteJava.execute(ExecuteJava.java:141)
-	at org.apache.tools.ant.taskdefs.Java.run(Java.java:892)
-	at org.apache.tools.ant.taskdefs.Java.executeJava(Java.java:232)
-	at org.apache.tools.ant.taskdefs.Java.executeJava(Java.java:136)
-	at org.apache.tools.ant.taskdefs.Java.execute(Java.java:109)
-	at org.apache.tools.ant.UnknownElement.execute(UnknownElement.java:299)
-	at java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:103)
-	at java.base/java.lang.reflect.Method.invoke(Method.java:580)
-	at org.apache.tools.ant.dispatch.DispatchUtils.execute(DispatchUtils.java:99)
-	at org.apache.tools.ant.Task.perform(Task.java:350)
-	at org.apache.tools.ant.Target.execute(Target.java:449)
-	at org.apache.tools.ant.Target.performTasks(Target.java:470)
-	at org.apache.tools.ant.Project.executeSortedTargets(Project.java:1401)
-	at org.apache.tools.ant.Project.executeTarget(Project.java:1374)
-	at org.apache.tools.ant.BuildFileRule.executeTarget(BuildFileRule.java:197)
-	at org.apache.tools.ant.taskdefs.JavaTest.testExcepting(JavaTest.java:246)
-	at java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:103)
-	at java.base/java.lang.reflect.Method.invoke(Method.java:580)
-	at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:59)
-	at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)
-	at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:61)
-	at org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:17)
-	at org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:26)
-	at org.junit.rules.ExternalResource$1.evaluate(ExternalResource.java:54)
-	at org.junit.rules.ExpectedException$ExpectedExceptionStatement.evaluate(ExpectedException.java:258)
-	at org.junit.runners.ParentRunner$3.evaluate(ParentRunner.java:306)
-	at org.junit.runners.BlockJUnit4ClassRunner$1.evaluate(BlockJUnit4ClassRunner.java:100)
-	at org.junit.runners.ParentRunner.runLeaf(ParentRunner.java:366)
-	at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:103)
-	at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:63)
-	at org.junit.runners.ParentRunner$4.run(ParentRunner.java:331)
-	at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:79)
-	at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:329)
-	at org.junit.runners.ParentRunner.access$100(ParentRunner.java:66)
-	at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:293)
-	at org.junit.runners.ParentRunner$3.evaluate(ParentRunner.java:306)
-	at org.junit.runners.ParentRunner.run(ParentRunner.java:413)
-	at org.junit.runners.Suite.runChild(Suite.java:128)
-	at org.junit.runners.Suite.runChild(Suite.java:27)
-	at org.junit.runners.ParentRunner$4.run(ParentRunner.java:331)
-	at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:79)
-	at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:329)
-	at org.junit.runners.ParentRunner.access$100(ParentRunner.java:66)
-	at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:293)
-	at org.junit.runners.ParentRunner$3.evaluate(ParentRunner.java:306)
-	at org.junit.runners.ParentRunner.run(ParentRunner.java:413)
-	at org.junit.runner.JUnitCore.run(JUnitCore.java:137)
-	at org.junit.runner.JUnitCore.run(JUnitCore.java:115)
-	at org.junit.runner.JUnitCore.runMain(JUnitCore.java:77)
-	at org.junit.runner.JUnitCore.main(JUnitCore.java:36)Java Result: -1"
-	at org.hamcrest.MatcherAssert.assertThat(MatcherAssert.java:20)
-	at org.junit.Assert.assertThat(Assert.java:964)
-	at org.junit.Assert.assertThat(Assert.java:930)
-	at org.apache.tools.ant.taskdefs.JavaTest.testExcepting(JavaTest.java:247)
-2) testRedirect1(org.apache.tools.ant.taskdefs.JavaTest)
-/var/tmp/portage/dev-java/ant-core-1.10.14/work/apache-ant-1.10.14/src/etc/testcases/taskdefs/java.xml:244: /var/tmp/portage/dev-java/ant-core-1.10.14/temp/testoutput_24464_main/ant.tmp.java-test/redirect1046568457.out:
-"${redirect.out.contents}" expected "foo"
-	at org.apache.tools.ant.taskdefs.Exit.execute(Exit.java:162)
-	at org.apache.tools.ant.UnknownElement.execute(UnknownElement.java:299)
-	at java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:103)
-	at java.base/java.lang.reflect.Method.invoke(Method.java:580)
-	at org.apache.tools.ant.dispatch.DispatchUtils.execute(DispatchUtils.java:99)
-	at org.apache.tools.ant.Task.perform(Task.java:350)
-	at org.apache.tools.ant.Target.execute(Target.java:449)
-	at org.apache.tools.ant.Target.performTasks(Target.java:470)
-	at org.apache.tools.ant.Project.executeSortedTargets(Project.java:1401)
-	at org.apache.tools.ant.Project.executeTarget(Project.java:1374)
-	at org.apache.tools.ant.BuildFileRule.executeTarget(BuildFileRule.java:197)
-	at org.apache.tools.ant.taskdefs.JavaTest.testRedirect1(JavaTest.java:331)
-3) testRedirect2(org.apache.tools.ant.taskdefs.JavaTest)
-/var/tmp/portage/dev-java/ant-core-1.10.14/work/apache-ant-1.10.14/src/etc/testcases/taskdefs/java.xml:244: /var/tmp/portage/dev-java/ant-core-1.10.14/temp/testoutput_24464_main/ant.tmp.java-test/redirect1723720155.out:
-"${redirect.out.contents}" expected "foo"
-	at org.apache.tools.ant.taskdefs.Exit.execute(Exit.java:162)
-	at org.apache.tools.ant.UnknownElement.execute(UnknownElement.java:299)
-	at java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:103)
-	at java.base/java.lang.reflect.Method.invoke(Method.java:580)
-	at org.apache.tools.ant.dispatch.DispatchUtils.execute(DispatchUtils.java:99)
-	at org.apache.tools.ant.Task.perform(Task.java:350)
-	at org.apache.tools.ant.Target.execute(Target.java:449)
-	at org.apache.tools.ant.Target.performTasks(Target.java:470)
-	at org.apache.tools.ant.Project.executeSortedTargets(Project.java:1401)
-	at org.apache.tools.ant.Project.executeTarget(Project.java:1374)
-	at org.apache.tools.ant.BuildFileRule.executeTarget(BuildFileRule.java:197)
-	at org.apache.tools.ant.taskdefs.JavaTest.testRedirect2(JavaTest.java:336)
-4) testRedirect3(org.apache.tools.ant.taskdefs.JavaTest)
-/var/tmp/portage/dev-java/ant-core-1.10.14/work/apache-ant-1.10.14/src/etc/testcases/taskdefs/java.xml:324: /var/tmp/portage/dev-java/ant-core-1.10.14/temp/testoutput_24464_main/ant.tmp.java-test/redirect325879668.out:
-"${redirect.out.contents}" expected "foo"
-	at org.apache.tools.ant.taskdefs.Exit.execute(Exit.java:162)
-	at org.apache.tools.ant.UnknownElement.execute(UnknownElement.java:299)
-	at java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:103)
-	at java.base/java.lang.reflect.Method.invoke(Method.java:580)
-	at org.apache.tools.ant.dispatch.DispatchUtils.execute(DispatchUtils.java:99)
-	at org.apache.tools.ant.Task.perform(Task.java:350)
-	at org.apache.tools.ant.Target.execute(Target.java:449)
-	at org.apache.tools.ant.Target.performTasks(Target.java:470)
-	at org.apache.tools.ant.Project.executeSortedTargets(Project.java:1401)
-	at org.apache.tools.ant.Project.executeTarget(Project.java:1374)
-	at org.apache.tools.ant.BuildFileRule.executeTarget(BuildFileRule.java:197)
-	at org.apache.tools.ant.taskdefs.JavaTest.testRedirect3(JavaTest.java:341)
-5) testResultPropertyZero(org.apache.tools.ant.taskdefs.JavaTest)
-org.junit.ComparisonFailure: expected:<[0]> but was:<[1]>
-	at org.junit.Assert.assertEquals(Assert.java:117)
-	at org.junit.Assert.assertEquals(Assert.java:146)
-	at org.apache.tools.ant.taskdefs.JavaTest.testResultPropertyZero(JavaTest.java:273)
-6) testResultPropertyNonZero(org.apache.tools.ant.taskdefs.JavaTest)
-org.junit.ComparisonFailure: expected:<[2]> but was:<[1]>
-	at org.junit.Assert.assertEquals(Assert.java:117)
-	at org.junit.Assert.assertEquals(Assert.java:146)
-	at org.apache.tools.ant.taskdefs.JavaTest.testResultPropertyNonZero(JavaTest.java:279)
-7) testRunSuccessWithFailOnError(org.apache.tools.ant.taskdefs.JavaTest)
-/var/tmp/portage/dev-java/ant-core-1.10.14/work/apache-ant-1.10.14/src/etc/testcases/taskdefs/java.xml:205: Could not find org.apache.tools.ant.taskdefs.JavaTest$EntryPoint. Make sure you have it in your classpath
-	at org.apache.tools.ant.taskdefs.ExecuteJava.execute(ExecuteJava.java:141)
-	at org.apache.tools.ant.taskdefs.Java.run(Java.java:892)
-	at org.apache.tools.ant.taskdefs.Java.executeJava(Java.java:232)
-	at org.apache.tools.ant.taskdefs.Java.executeJava(Java.java:136)
-	at org.apache.tools.ant.taskdefs.Java.execute(Java.java:109)
-	at org.apache.tools.ant.UnknownElement.execute(UnknownElement.java:299)
-	at java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:103)
-	at java.base/java.lang.reflect.Method.invoke(Method.java:580)
-	at org.apache.tools.ant.dispatch.DispatchUtils.execute(DispatchUtils.java:99)
-	at org.apache.tools.ant.Task.perform(Task.java:350)
-	at org.apache.tools.ant.Target.execute(Target.java:449)
-	at org.apache.tools.ant.Target.performTasks(Target.java:470)
-	at org.apache.tools.ant.Project.executeSortedTargets(Project.java:1401)
-	at org.apache.tools.ant.Project.executeTarget(Project.java:1374)
-	at org.apache.tools.ant.BuildFileRule.executeTarget(BuildFileRule.java:197)
-	at org.apache.tools.ant.taskdefs.JavaTest.testRunSuccessWithFailOnError(JavaTest.java:306)
-8) testSpawn(org.apache.tools.ant.taskdefs.JavaTest)
-java.lang.AssertionError: log file exists
-	at org.junit.Assert.fail(Assert.java:89)
-	at org.junit.Assert.assertTrue(Assert.java:42)
-	at org.apache.tools.ant.taskdefs.JavaTest.testSpawn(JavaTest.java:326)
-9) testFlushedInput(org.apache.tools.ant.taskdefs.JavaTest)
-/var/tmp/portage/dev-java/ant-core-1.10.14/work/apache-ant-1.10.14/src/etc/testcases/taskdefs/java.xml:422: Java returned: 1
-	at org.apache.tools.ant.taskdefs.Java.execute(Java.java:114)
-	at org.apache.tools.ant.UnknownElement.execute(UnknownElement.java:299)
-	at java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:103)
-	at java.base/java.lang.reflect.Method.invoke(Method.java:580)
-	at org.apache.tools.ant.dispatch.DispatchUtils.execute(DispatchUtils.java:99)
-	at org.apache.tools.ant.Task.perform(Task.java:350)
-	at org.apache.tools.ant.Target.execute(Target.java:449)
-	at org.apache.tools.ant.Target.performTasks(Target.java:470)
-	at org.apache.tools.ant.Project.executeSortedTargets(Project.java:1401)
-	at org.apache.tools.ant.Project.executeTarget(Project.java:1374)
-	at org.apache.tools.ant.BuildFileRule.executeTarget(BuildFileRule.java:197)
-	at org.apache.tools.ant.taskdefs.JavaTest.testFlushedInput(JavaTest.java:430)
-10) testExceptingFoe(org.apache.tools.ant.taskdefs.JavaTest)
-java.lang.AssertionError: 
-Expected: (an instance of org.apache.tools.ant.BuildException and exception with message a string containing "Exception raised inside called program")
-     but: exception with message a string containing "Exception raised inside called program" message was "Could not find org.apache.tools.ant.taskdefs.JavaTest$ExceptingEntryPoint. Make sure you have it in your classpath"
-Stacktrace was: /var/tmp/portage/dev-java/ant-core-1.10.14/work/apache-ant-1.10.14/src/etc/testcases/taskdefs/java.xml:135: Could not find org.apache.tools.ant.taskdefs.JavaTest$ExceptingEntryPoint. Make sure you have it in your classpath
-	at org.apache.tools.ant.taskdefs.ExecuteJava.execute(ExecuteJava.java:141)
-	at org.apache.tools.ant.taskdefs.Java.run(Java.java:892)
-	at org.apache.tools.ant.taskdefs.Java.executeJava(Java.java:232)
-	at org.apache.tools.ant.taskdefs.Java.executeJava(Java.java:136)
-	at org.apache.tools.ant.taskdefs.Java.execute(Java.java:109)
-	at org.apache.tools.ant.UnknownElement.execute(UnknownElement.java:299)
-	at java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:103)
-	at java.base/java.lang.reflect.Method.invoke(Method.java:580)
-	at org.apache.tools.ant.dispatch.DispatchUtils.execute(DispatchUtils.java:99)
-	at org.apache.tools.ant.Task.perform(Task.java:350)
-	at org.apache.tools.ant.Target.execute(Target.java:449)
-	at org.apache.tools.ant.Target.performTasks(Target.java:470)
-	at org.apache.tools.ant.Project.executeSortedTargets(Project.java:1401)
-	at org.apache.tools.ant.Project.executeTarget(Project.java:1374)
-	at org.apache.tools.ant.BuildFileRule.executeTarget(BuildFileRule.java:197)
-	at org.apache.tools.ant.taskdefs.JavaTest.testExceptingFoe(JavaTest.java:260)
-	at java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:103)
-	at java.base/java.lang.reflect.Method.invoke(Method.java:580)
-	at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:59)
-	at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)
-	at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:61)
-	at org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:17)
-	at org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:26)
-	at org.junit.rules.ExternalResource$1.evaluate(ExternalResource.java:54)
-	at org.junit.rules.ExpectedException$ExpectedExceptionStatement.evaluate(ExpectedException.java:258)
-	at org.junit.runners.ParentRunner$3.evaluate(ParentRunner.java:306)
-	at org.junit.runners.BlockJUnit4ClassRunner$1.evaluate(BlockJUnit4ClassRunner.java:100)
-	at org.junit.runners.ParentRunner.runLeaf(ParentRunner.java:366)
-	at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:103)
-	at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:63)
-	at org.junit.runners.ParentRunner$4.run(ParentRunner.java:331)
-	at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:79)
-	at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:329)
-	at org.junit.runners.ParentRunner.access$100(ParentRunner.java:66)
-	at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:293)
-	at org.junit.runners.ParentRunner$3.evaluate(ParentRunner.java:306)
-	at org.junit.runners.ParentRunner.run(ParentRunner.java:413)
-	at org.junit.runners.Suite.runChild(Suite.java:128)
-	at org.junit.runners.Suite.runChild(Suite.java:27)
-	at org.junit.runners.ParentRunner$4.run(ParentRunner.java:331)
-	at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:79)
-	at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:329)
-	at org.junit.runners.ParentRunner.access$100(ParentRunner.java:66)
-	at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:293)
-	at org.junit.runners.ParentRunner$3.evaluate(ParentRunner.java:306)
-	at org.junit.runners.ParentRunner.run(ParentRunner.java:413)
-	at org.junit.runner.JUnitCore.run(JUnitCore.java:137)
-	at org.junit.runner.JUnitCore.run(JUnitCore.java:115)
-	at org.junit.runner.JUnitCore.runMain(JUnitCore.java:77)
-	at org.junit.runner.JUnitCore.main(JUnitCore.java:36)
-
-	at org.hamcrest.MatcherAssert.assertThat(MatcherAssert.java:20)
-	at org.junit.Assert.assertThat(Assert.java:964)
-	at org.junit.Assert.assertThat(Assert.java:930)
-	at org.junit.rules.ExpectedException.handleException(ExpectedException.java:271)
-	at org.junit.rules.ExpectedException.access$000(ExpectedException.java:111)
-	at org.junit.rules.ExpectedException$ExpectedExceptionStatement.evaluate(ExpectedException.java:260)
-	at org.junit.runners.ParentRunner$3.evaluate(ParentRunner.java:306)
-	at org.junit.runners.BlockJUnit4ClassRunner$1.evaluate(BlockJUnit4ClassRunner.java:100)
-	at org.junit.runners.ParentRunner.runLeaf(ParentRunner.java:366)
-	at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:103)
-	at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:63)
-	at org.junit.runners.ParentRunner$4.run(ParentRunner.java:331)
-	at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:79)
-	at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:329)
-	at org.junit.runners.ParentRunner.access$100(ParentRunner.java:66)
-	at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:293)
-	at org.junit.runners.ParentRunner$3.evaluate(ParentRunner.java:306)
-	at org.junit.runners.ParentRunner.run(ParentRunner.java:413)
-	at org.junit.runners.Suite.runChild(Suite.java:128)
-	at org.junit.runners.Suite.runChild(Suite.java:27)
-	at org.junit.runners.ParentRunner$4.run(ParentRunner.java:331)
-	at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:79)
-	at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:329)
-	at org.junit.runners.ParentRunner.access$100(ParentRunner.java:66)
-	at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:293)
-	at org.junit.runners.ParentRunner$3.evaluate(ParentRunner.java:306)
-	at org.junit.runners.ParentRunner.run(ParentRunner.java:413)
-	at org.junit.runner.JUnitCore.run(JUnitCore.java:137)
-	at org.junit.runner.JUnitCore.run(JUnitCore.java:115)
-	at org.junit.runner.JUnitCore.runMain(JUnitCore.java:77)
-	at org.junit.runner.JUnitCore.main(JUnitCore.java:36)
-11) testRedirector1(org.apache.tools.ant.taskdefs.JavaTest)
-/var/tmp/portage/dev-java/ant-core-1.10.14/work/apache-ant-1.10.14/src/etc/testcases/taskdefs/java.xml:353: /var/tmp/portage/dev-java/ant-core-1.10.14/temp/testoutput_24464_main/ant.tmp.java-test/redirect1692380328.out doesn't exist
-	at org.apache.tools.ant.taskdefs.LoadResource.execute(LoadResource.java:142)
-	at org.apache.tools.ant.UnknownElement.execute(UnknownElement.java:299)
-	at java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:103)
-	at java.base/java.lang.reflect.Method.invoke(Method.java:580)
-	at org.apache.tools.ant.dispatch.DispatchUtils.execute(DispatchUtils.java:99)
-	at org.apache.tools.ant.Task.perform(Task.java:350)
-	at org.apache.tools.ant.Target.execute(Target.java:449)
-	at org.apache.tools.ant.Target.performTasks(Target.java:470)
-	at org.apache.tools.ant.Project.executeSortedTargets(Project.java:1401)
-	at org.apache.tools.ant.Project.executeTarget(Project.java:1374)
-	at org.apache.tools.ant.BuildFileRule.executeTarget(BuildFileRule.java:197)
-	at org.apache.tools.ant.taskdefs.JavaTest.testRedirector1(JavaTest.java:346)
-12) testRedirector2(org.apache.tools.ant.taskdefs.JavaTest)
-/var/tmp/portage/dev-java/ant-core-1.10.14/work/apache-ant-1.10.14/src/etc/testcases/taskdefs/java.xml:353: /var/tmp/portage/dev-java/ant-core-1.10.14/temp/testoutput_24464_main/ant.tmp.java-test/redirect1822175330.out doesn't exist
-	at org.apache.tools.ant.taskdefs.LoadResource.execute(LoadResource.java:142)
-	at org.apache.tools.ant.UnknownElement.execute(UnknownElement.java:299)
-	at java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:103)
-	at java.base/java.lang.reflect.Method.invoke(Method.java:580)
-	at org.apache.tools.ant.dispatch.DispatchUtils.execute(DispatchUtils.java:99)
-	at org.apache.tools.ant.Task.perform(Task.java:350)
-	at org.apache.tools.ant.Target.execute(Target.java:449)
-	at org.apache.tools.ant.Target.performTasks(Target.java:470)
-	at org.apache.tools.ant.Project.executeSortedTargets(Project.java:1401)
-	at org.apache.tools.ant.Project.executeTarget(Project.java:1374)
-	at org.apache.tools.ant.BuildFileRule.executeTarget(BuildFileRule.java:197)
-	at org.apache.tools.ant.taskdefs.JavaTest.testRedirector2(JavaTest.java:351)
-
-FAILURES!!!
-Tests run: 38,  Failures: 12
+bug #922775
 --- a/src/tests/junit/org/apache/tools/ant/taskdefs/JavaTest.java
 +++ b/src/tests/junit/org/apache/tools/ant/taskdefs/JavaTest.java
 @@ -42,6 +42,7 @@ import org.junit.AssumptionViolatedException;
diff --git a/dev-python/aiohappyeyeballs/aiohappyeyeballs-2.3.1.ebuild b/dev-python/aiohappyeyeballs/aiohappyeyeballs-2.3.1.ebuild
index 8d7d572d0719..b17652f34fe0 100644
--- a/dev-python/aiohappyeyeballs/aiohappyeyeballs-2.3.1.ebuild
+++ b/dev-python/aiohappyeyeballs/aiohappyeyeballs-2.3.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 BDEPEND="
 	test? (
diff --git a/games-emulation/mgba/mgba-0.10.3.ebuild b/games-emulation/mgba/mgba-0.10.3.ebuild
index 971e786efadb..894d8f295dcc 100644
--- a/games-emulation/mgba/mgba-0.10.3.ebuild
+++ b/games-emulation/mgba/mgba-0.10.3.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/mgba-emu/mgba.git"
 else
 	SRC_URI="https://github.com/mgba-emu/mgba/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 arm64 ~ppc64 x86"
 fi
 
 DESCRIPTION="Game Boy Advance Emulator"
diff --git a/media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild b/media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild
index b7074d60fdc3..e17af76cfa74 100644
--- a/media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild
+++ b/media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild
@@ -483,7 +483,7 @@ multilib_src_configure() {
 	done
 
 	# LTO support, bug #566282, bug #754654, bug #772854
-	[[ ${ABI} != x86 ]] && is-flagq "-flto*" && myconf+=( "--enable-lto" )
+	[[ ${ABI} != x86 ]] && tc-is-lto && myconf+=( "--enable-lto" )
 	filter-lto
 
 	# Mandatory configuration
diff --git a/media-video/ffmpeg/ffmpeg-5.1.4-r2.ebuild b/media-video/ffmpeg/ffmpeg-5.1.4-r2.ebuild
index 6c34aca8e4cd..9ecde222b8e3 100644
--- a/media-video/ffmpeg/ffmpeg-5.1.4-r2.ebuild
+++ b/media-video/ffmpeg/ffmpeg-5.1.4-r2.ebuild
@@ -473,7 +473,7 @@ multilib_src_configure() {
 	done
 
 	# LTO support, bug #566282, bug #754654, bug #772854
-	[[ ${ABI} != x86 ]] && is-flagq "-flto*" && myconf+=( "--enable-lto" )
+	[[ ${ABI} != x86 ]] && tc-is-lto && myconf+=( "--enable-lto" )
 	filter-lto
 
 	# Mandatory configuration
diff --git a/media-video/ffmpeg/ffmpeg-6.0-r11.ebuild b/media-video/ffmpeg/ffmpeg-6.0-r11.ebuild
index 24dde90568fd..6d75a5d847db 100644
--- a/media-video/ffmpeg/ffmpeg-6.0-r11.ebuild
+++ b/media-video/ffmpeg/ffmpeg-6.0-r11.ebuild
@@ -472,7 +472,7 @@ multilib_src_configure() {
 	done
 
 	# LTO support, bug #566282, bug #754654, bug #772854
-	[[ ${ABI} != x86 ]] && is-flagq "-flto*" && myconf+=( "--enable-lto" )
+	[[ ${ABI} != x86 ]] && tc-is-lto && myconf+=( "--enable-lto" )
 	filter-lto
 
 	# Mandatory configuration
diff --git a/media-video/ffmpeg/ffmpeg-6.0-r9.ebuild b/media-video/ffmpeg/ffmpeg-6.0-r9.ebuild
index 8545e512f44c..9831ab3e47c5 100644
--- a/media-video/ffmpeg/ffmpeg-6.0-r9.ebuild
+++ b/media-video/ffmpeg/ffmpeg-6.0-r9.ebuild
@@ -470,7 +470,7 @@ multilib_src_configure() {
 	done
 
 	# LTO support, bug #566282, bug #754654, bug #772854
-	[[ ${ABI} != x86 ]] && is-flagq "-flto*" && myconf+=( "--enable-lto" )
+	[[ ${ABI} != x86 ]] && tc-is-lto && myconf+=( "--enable-lto" )
 	filter-lto
 
 	# Mandatory configuration
diff --git a/media-video/ffmpeg/ffmpeg-6.0.1-r1.ebuild b/media-video/ffmpeg/ffmpeg-6.0.1-r1.ebuild
index f3fabab58737..bdc0a1471158 100644
--- a/media-video/ffmpeg/ffmpeg-6.0.1-r1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-6.0.1-r1.ebuild
@@ -469,7 +469,7 @@ multilib_src_configure() {
 	done
 
 	# LTO support, bug #566282, bug #754654, bug #772854
-	[[ ${ABI} != x86 ]] && is-flagq "-flto*" && myconf+=( "--enable-lto" )
+	[[ ${ABI} != x86 ]] && tc-is-lto && myconf+=( "--enable-lto" )
 	filter-lto
 
 	# Mandatory configuration
diff --git a/media-video/ffmpeg/ffmpeg-6.1-r4.ebuild b/media-video/ffmpeg/ffmpeg-6.1-r4.ebuild
index 6db23cdd6bfc..d3edaba40eb7 100644
--- a/media-video/ffmpeg/ffmpeg-6.1-r4.ebuild
+++ b/media-video/ffmpeg/ffmpeg-6.1-r4.ebuild
@@ -482,7 +482,7 @@ multilib_src_configure() {
 	done
 
 	# LTO support, bug #566282, bug #754654, bug #772854
-	if [[ ${ABI} != x86 ]] && is-flagq "-flto*"; then
+	if [[ ${ABI} != x86 ]] && tc-is-lto; then
 		# Respect -flto value, e.g -flto=thin
 		local v="$(get-flag flto)"
 		[[ -n ${v} ]] && myconf+=( "--enable-lto=${v}" ) || myconf+=( "--enable-lto" )
diff --git a/media-video/ffmpeg/ffmpeg-6.1.1-r1.ebuild b/media-video/ffmpeg/ffmpeg-6.1.1-r1.ebuild
index 4a9376a14e3e..73cdd4b40c76 100644
--- a/media-video/ffmpeg/ffmpeg-6.1.1-r1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-6.1.1-r1.ebuild
@@ -476,7 +476,7 @@ multilib_src_configure() {
 	done
 
 	# LTO support, bug #566282, bug #754654, bug #772854
-	if [[ ${ABI} != x86 ]] && is-flagq "-flto*"; then
+	if [[ ${ABI} != x86 ]] && tc-is-lto; then
 		# Respect -flto value, e.g -flto=thin
 		local v="$(get-flag flto)"
 		[[ -n ${v} ]] && myconf+=( "--enable-lto=${v}" ) || myconf+=( "--enable-lto" )
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index af17b97264cd..905f9dd7977b 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -475,7 +475,7 @@ multilib_src_configure() {
 	done
 
 	# LTO support, bug #566282, bug #754654, bug #772854
-	if [[ ${ABI} != x86 ]] && is-flagq "-flto*"; then
+	if [[ ${ABI} != x86 ]] && tc-is-lto; then
 		# Respect -flto value, e.g -flto=thin
 		local v="$(get-flag flto)"
 		[[ -n ${v} ]] && myconf+=( "--enable-lto=${v}" ) || myconf+=( "--enable-lto" )
diff --git a/net-analyzer/sslscan/sslscan-2.1.2.ebuild b/net-analyzer/sslscan/sslscan-2.1.2.ebuild
index 5d599980c0fe..b77ee2587f92 100644
--- a/net-analyzer/sslscan/sslscan-2.1.2.ebuild
+++ b/net-analyzer/sslscan/sslscan-2.1.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/rbsec/sslscan/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 # Requires a docker environment
 RESTRICT="test"
diff --git a/net-misc/freerdp/Manifest b/net-misc/freerdp/Manifest
index c96035482eaf..22fecb14c5a5 100644
--- a/net-misc/freerdp/Manifest
+++ b/net-misc/freerdp/Manifest
@@ -1,4 +1,5 @@
 DIST freerdp-2.11.1.tar.gz 7325835 BLAKE2B 2b6e62cd46627c60c3e815216711d3c5c9839d232aa5cb8653d92870bb46d93c40f2f44e0abf7ef6e5f44d92239541ae44d37366f343a1992fdbc8f09452fba0 SHA512 efd9d44bdc15047322600046fdcd17e37f14c84d75badc77e8ea53da6e065f33725be2f3c03e02031867124b62b32ad9deeabf8cc8f79321e7a866f552e63f2d
 DIST freerdp-2.11.2.tar.gz 7326213 BLAKE2B 5d044d660df1e5115ffde13389be79e852711161ad1969017a9ba662e5f278fc98b86efbc59a24c3ea32a137c24ed308ef5c9eb89db1c24f37f1b8b41bfd3c45 SHA512 2e0e74cba22ed0b33fd6453dd76f6a1ffb3107d1868276faf3eea25bd58d3d869c2ce7c6c467896ecc94ca71c0582beb029a0d44f50df38cc26661f85d0822fb
+DIST freerdp-2.11.5.tar.gz 7330372 BLAKE2B 53adf40ca8f6c226f93cbc4599d857170bed2cbbe233860f52b30416b3a5d15c1ef2268c329790553dd1dbbcd93dedd834e5b62f67128029e551083d1053b357 SHA512 152dfef2783283ef703eb28ebe4d32fb02519ee6de9042b124af34395a2a6db36bd4cf1e96200ba3e93acf06c245109413e3e36e6143ed4409bd90ede6c383bd
 DIST freerdp-3.0.0.tar.gz 9032924 BLAKE2B 45e3ee13a664b947e509100824709088091192e89405f48defd3dfe2f4bf16ca359b37d632db49b7d3ce5e764b2ba7de5b2296c7b703c6a25181db245e8b551f SHA512 7868f6d436e65d2b81e42a6b4073e9775d5336c908294d058023e86c4d5d2b86318bc7ba1ad6093d2d4defdbefa278b8202f6da6e450a4264d3f5cb39eaf02c2
 DIST freerdp-3.1.0.tar.gz 8462182 BLAKE2B 5451a0aef525ebb61d457b3c5f05da9f8f05b72ca06b56abac0ac938657100b023ca3ffbd93db357808201736d9c73ac33c5af7898eb03a0509409d3e3f27896 SHA512 e97218656042a065373a54128ec0f9794a4d77313d3f3898be698ca8c1dda17bd707a72d62cdfbc0ada2856f43a1150c7e74f49a9b99bf3aa4002a3cb15fb905
diff --git a/net-misc/freerdp/freerdp-2.11.5.ebuild b/net-misc/freerdp/freerdp-2.11.5.ebuild
new file mode 100644
index 000000000000..c94a19725bf3
--- /dev/null
+++ b/net-misc/freerdp/freerdp-2.11.5.ebuild
@@ -0,0 +1,142 @@
+# Copyright 2011-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/FreeRDP/FreeRDP.git"
+	case ${PV} in
+		2.*) EGIT_BRANCH="stable-2.0";;
+	esac
+else
+	MY_P=${P/_/-}
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+fi
+
+DESCRIPTION="Free implementation of the Remote Desktop Protocol"
+HOMEPAGE="https://www.freerdp.com/"
+
+LICENSE="Apache-2.0"
+SLOT="0/2"
+IUSE="alsa cpu_flags_arm_neon cups debug doc +ffmpeg gstreamer icu jpeg kerberos openh264 pulseaudio server smartcard systemd test usb valgrind wayland X xinerama xv"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/openssl:0=
+	sys-libs/zlib:0
+	alsa? ( media-libs/alsa-lib )
+	cups? ( net-print/cups )
+	usb? (
+		virtual/libudev:0=
+		sys-apps/util-linux:0=
+		dev-libs/dbus-glib:0=
+		virtual/libusb:1=
+	)
+	X? (
+		x11-libs/libXcursor
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXrender
+		xinerama? ( x11-libs/libXinerama )
+		xv? ( x11-libs/libXv )
+	)
+	ffmpeg? ( media-video/ffmpeg:0= )
+	!ffmpeg? (
+		x11-libs/cairo:0=
+	)
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+		x11-libs/libXrandr
+	)
+	icu? ( dev-libs/icu:0= )
+	jpeg? ( media-libs/libjpeg-turbo:0= )
+	kerberos? ( virtual/krb5 )
+	openh264? ( media-libs/openh264:0= )
+	pulseaudio? ( media-libs/libpulse )
+	server? (
+		X? (
+			x11-libs/libXcursor
+			x11-libs/libXdamage
+			x11-libs/libXext
+			x11-libs/libXfixes
+			x11-libs/libXrandr
+			x11-libs/libXtst
+			xinerama? ( x11-libs/libXinerama )
+		)
+	)
+	smartcard? ( sys-apps/pcsc-lite )
+	systemd? ( sys-apps/systemd:0= )
+	wayland? (
+		dev-libs/wayland
+		x11-libs/libxkbcommon
+	)
+	X? (
+		x11-libs/libX11
+		x11-libs/libxkbfile
+	)
+"
+DEPEND="
+	${RDEPEND}
+	valgrind? ( dev-debug/valgrind )
+"
+BDEPEND="
+	virtual/pkgconfig
+	X? ( doc? (
+		app-text/docbook-xml-dtd:4.1.2
+		app-text/xmlto
+	) )
+"
+
+PATCHES=(
+	"${FILESDIR}/freerdp-2.11.2-clang.patch"
+	"${FILESDIR}/freerdp-2.11-Revert-codec-encode-messages-considering-endianness.patch"
+)
+
+src_configure() {
+	# bug #881695
+	filter-lto
+
+	local mycmakeargs=(
+		-Wno-dev
+		-DBUILD_TESTING=$(usex test ON OFF)
+		-DCHANNEL_URBDRC=$(usex usb ON OFF)
+		-DWITH_ALSA=$(usex alsa ON OFF)
+		-DWITH_CCACHE=OFF
+		-DWITH_CUPS=$(usex cups ON OFF)
+		-DWITH_DEBUG_ALL=$(usex debug ON OFF)
+		-DWITH_MANPAGES=$(usex doc ON OFF)
+		-DWITH_FFMPEG=$(usex ffmpeg ON OFF)
+		-DWITH_SWSCALE=$(usex ffmpeg ON OFF)
+		-DWITH_CAIRO=$(usex ffmpeg OFF ON)
+		-DWITH_DSP_FFMPEG=$(usex ffmpeg ON OFF)
+		-DWITH_GSTREAMER_1_0=$(usex gstreamer ON OFF)
+		-DWITH_ICU=$(usex icu ON OFF)
+		-DWITH_JPEG=$(usex jpeg ON OFF)
+		-DWITH_GSSAPI=$(usex kerberos ON OFF)
+		-DWITH_NEON=$(usex cpu_flags_arm_neon ON OFF)
+		-DWITH_OPENH264=$(usex openh264 ON OFF)
+		-DWITH_OSS=OFF
+		-DWITH_PULSE=$(usex pulseaudio ON OFF)
+		-DWITH_SERVER=$(usex server ON OFF)
+		-DWITH_PCSC=$(usex smartcard ON OFF)
+		-DWITH_LIBSYSTEMD=$(usex systemd ON OFF)
+		-DWITH_VALGRIND_MEMCHECK=$(usex valgrind ON OFF)
+		-DWITH_X11=$(usex X ON OFF)
+		-DWITH_XINERAMA=$(usex xinerama ON OFF)
+		-DWITH_XV=$(usex xv ON OFF)
+		-DWITH_WAYLAND=$(usex wayland ON OFF)
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	local myctestargs=()
+	use elibc_musl && myctestargs+=( -E TestBacktrace )
+	cmake_src_test
+}
diff --git a/sys-apps/arch-chroot/arch-chroot-28.ebuild b/sys-apps/arch-chroot/arch-chroot-28.ebuild
index ab075e2c2954..24c4c5db0577 100644
--- a/sys-apps/arch-chroot/arch-chroot-28.ebuild
+++ b/sys-apps/arch-chroot/arch-chroot-28.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/archlinux/arch-install-scripts/archive/refs/tags/v${
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="app-text/asciidoc"
 
diff --git a/sys-fs/genfstab/genfstab-28-r1.ebuild b/sys-fs/genfstab/genfstab-28-r1.ebuild
index c2dc0bfe36d5..83d99d94b075 100644
--- a/sys-fs/genfstab/genfstab-28-r1.ebuild
+++ b/sys-fs/genfstab/genfstab-28-r1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/arch-install-scripts-${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"