gentoo resync : 14.07.2018

2 files changed, 70 insertions, 0 deletions

diff --git a/dev-java/hamcrest-core/files/hamcrest-1.3-empty_generator.patch b/dev-java/hamcrest-core/files/hamcrest-1.3-empty_generator.patch
new file mode 100644
index 000000000000..709bca62c02d
--- /dev/null
+++ b/dev-java/hamcrest-core/files/hamcrest-1.3-empty_generator.patch
@@ -0,0 +1,21 @@
+--- a/build.xml	2012-07-02 21:14:09.000000000 +0200
++++ b/build.xml	2013-06-15 22:00:19.919038284 +0200
+@@ -12,18 +12,6 @@
+     </target>

+ 

+     <target name="generator" description="Build code generator tool">

+-        <java-to-jar srcdir="hamcrest-generator/src/main/java"

+-                     modulename="hamcrest-generator-nodeps"

+-                     classpath="lib/generator/qdox-1.12.jar"/>

+-

+-        <!-- Bundle QDox classes in hamcrest-generator.jar using JarJar to place classes under a different package -->

+-        <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="lib/generator/jarjar-1.3.jar"/>

+-        <jarjar jarfile="build/hamcrest-generator-${version}.jar">

+-            <zipfileset src="build/hamcrest-generator-nodeps-${version}.jar"/>

+-            <zipfileset src="lib/generator/qdox-1.12.jar"/>

+-            <rule pattern="com.thoughtworks.qdox.**" result="org.hamcrest.generator.qdox.@1"/>

+-        </jarjar>

+-        <copy file="build/hamcrest-generator-nodeps-${version}-sources.jar" tofile="build/hamcrest-generator-${version}-sources.jar"/>

+     </target>

+ 

+     <target name="core" depends="generator" description="Build core Hamcrest library">

diff --git a/dev-java/hamcrest-core/files/hamcrest-core-1.3-fix_javadoc.patch b/dev-java/hamcrest-core/files/hamcrest-core-1.3-fix_javadoc.patch
new file mode 100644
index 000000000000..4f210ca3380a
--- /dev/null
+++ b/dev-java/hamcrest-core/files/hamcrest-core-1.3-fix_javadoc.patch
@@ -0,0 +1,49 @@
+--- a/build.xml	2013-06-15 22:29:44.445548674 +0200
+++- b/build.xml	2013-06-15 22:30:45.098876635 +0200
+@@ -132,30 +132,15 @@
+     </target>

+ 

+     <target name="javadoc" description="build javadoc jars">

+-        <java-to-javadoc-jar modulename="hamcrest-generator-nodeps"/>

+         <java-to-javadoc-jar modulename="hamcrest-core"/>

+-        <java-to-javadoc-jar modulename="hamcrest-library"/>

+-        <java-to-javadoc-jar modulename="hamcrest-integration"/>

+-        <copy file="build/hamcrest-generator-nodeps-${version}-javadoc.jar" tofile="build/hamcrest-generator-${version}-javadoc.jar"/>

+ 

+         <javadoc packagenames="org.hamcrest.*" defaultexcludes="yes"

+                  destdir="build/temp/hamcrest-all-${version}-javadoc.jar.contents" author="true" version="true" use="true"

+-                 windowtitle="Hamcrest" source="1.6" failonerror="yes" overview="overview.html">

++                 windowtitle="Hamcrest" source="1.6" failonerror="yes">

+-            <classpath>

+-                <fileset dir="lib/integration">

+-                    <include name="*.jar"/>

+-                </fileset>

+-            </classpath>

+             <packageset dir="build/temp/hamcrest-core-${version}-sources.jar.contents"/>

+-            <packageset dir="build/temp/hamcrest-library-${version}-sources.jar.contents" excludes="org/hamcrest/internal"/>

+-            <packageset dir="build/temp/hamcrest-integration-${version}-sources.jar.contents"/>

+             

+             <group title="Hamcrest API and Utility Classes" packages="org.hamcrest"/>

+             <group title="Matcher Library" packages="org.hamcrest.*"/>

+-            <group title="Integration" packages="org.hamcrest.integration, org.hamcrest.integration.*"/>

+-            

+-            <link offline="false" href="http://www.junit.org/junit/javadoc/3.8.1/"/>

+-            <link offline="false" href="http://kentbeck.github.com/junit/javadoc/latest/"/>

+         </javadoc>

+         <jar jarfile="build/hamcrest-all-${version}-javadoc.jar">

+             <fileset dir="build/temp/hamcrest-all-${version}-javadoc.jar.contents"/>

+@@ -302,14 +287,7 @@
+                      destdir="build/temp/@{modulename}-${version}-javadoc.jar.contents" author="true" version="true" use="true"

+                      windowtitle="Hamcrest" source="1.6" failonerror="yes">

+                 <classpath>

+-                    <fileset dir="lib/integration">

+-                        <include name="*.jar"/>

+-                    </fileset>

+-                    <fileset file="lib/generator/qdox-1.12.jar"/>

+                     <fileset file="build/hamcrest-core-${version}.jar"/>

+-                    <fileset file="build/hamcrest-library-${version}.jar"/>

+-                    <fileset file="build/hamcrest-generator-${version}.jar"/>

+-                    <fileset file="build/hamcrest-integration-${version}.jar"/>

+                 </classpath>

+             </javadoc>

+             <jar jarfile="build/@{modulename}-${version}-javadoc.jar">