Version bump to 1.2 and 1.3, needed for new junit. Fixes bug #287763, contributed by Daniel Solano Gómez.

(Portage version: 2.1.12.4/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D)

8 files changed, 273 insertions, 1 deletions

diff --git a/dev-java/hamcrest-core/ChangeLog b/dev-java/hamcrest-core/ChangeLog
index f3affceba877..ffcf17ca4ddc 100644
--- a/dev-java/hamcrest-core/ChangeLog
+++ b/dev-java/hamcrest-core/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for dev-java/hamcrest-core
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/hamcrest-core/ChangeLog,v 1.14 2013/06/14 19:48:51 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/hamcrest-core/ChangeLog,v 1.15 2013/06/15 21:00:35 tomwij Exp $
+
+*hamcrest-core-1.2 (15 Jun 2013)
+*hamcrest-core-1.3 (15 Jun 2013)
+
+  15 Jun 2013; Tom Wijsman <TomWij@gentoo.org>
+  +files/hamcrest-1.2-empty_generator.patch,
+  +files/hamcrest-1.2-no_source_in_jar.patch,
+  +files/hamcrest-1.3-empty_generator.patch,
+  +files/hamcrest-core-1.2-fix_javadoc.patch,
+  +files/hamcrest-core-1.3-fix_javadoc.patch, +hamcrest-core-1.2.ebuild,
+  +hamcrest-core-1.3.ebuild:
+  Version bump to 1.2 and 1.3, needed for new junit. Fixes bug #287763,
+  contributed by Daniel Solano Gómez.
 
   14 Jun 2013; Alexis Ballier <aballier@gentoo.org> hamcrest-core-1.1.ebuild:
   keyword ~amd64-fbsd
diff --git a/dev-java/hamcrest-core/files/hamcrest-1.2-empty_generator.patch b/dev-java/hamcrest-core/files/hamcrest-1.2-empty_generator.patch
new file mode 100644
index 000000000000..536f2c26cfc2
--- /dev/null
+++ b/dev-java/hamcrest-core/files/hamcrest-1.2-empty_generator.patch
@@ -0,0 +1,26 @@
+--- build.xml.orig	2009-09-28 06:24:43.000000000 -0500
++++ build.xml	2009-09-28 09:04:33.000000000 -0500
+@@ -23,23 +23,6 @@
+ 
+     <target name="generator"
+             description="Build code generator tool">
+-        <java-to-jar srcdir="hamcrest-generator/src/main/java"
+-                     destjar="build/temp/hamcrest-generator-${version}-nodeps.jar"
+-                     classpath="
+-                       lib/generator/qdox-1.6.1.jar;
+-                     "/>
+-        <taskdef name="jarjar"
+-                 classname="com.tonicsystems.jarjar.JarJarTask"
+-                 classpath="lib/generator/jarjar-1.0rc3.jar"/>
+-        <!-- Bundle QDox classes in hamcrest-generator.jar so user doesn't need to care
+-             about it's existence. Uses JarJar to place classes under a different package
+-             to prevent conflict. -->
+-        <jarjar jarfile="build/hamcrest-generator-${version}.jar">
+-            <zipfileset src="build/temp/hamcrest-generator-${version}-nodeps.jar"/>
+-            <zipfileset src="lib/generator/qdox-1.6.1.jar"/>
+-            <rule pattern="com.thoughtworks.qdox.**"
+-                  result="org.hamcrest.generator.qdox.@1"/>
+-        </jarjar>
+     </target>
+ 
+     <target name="core"
diff --git a/dev-java/hamcrest-core/files/hamcrest-1.2-no_source_in_jar.patch b/dev-java/hamcrest-core/files/hamcrest-1.2-no_source_in_jar.patch
new file mode 100644
index 000000000000..8d8ad9dbc66b
--- /dev/null
+++ b/dev-java/hamcrest-core/files/hamcrest-1.2-no_source_in_jar.patch
@@ -0,0 +1,13 @@
+--- build.xml	2009-09-28 06:16:14.000000000 -0500
++++ build.xml.nosrcinjar	2009-09-28 06:16:03.000000000 -0500
+@@ -236,10 +236,6 @@
+                 </classpath>
+             </javac>
+             <copy file="LICENSE.txt" todir="build/temp/@{destjar}.contents"/>
+-            <!-- Put Java source in Jars for user's convenience. -->
+-            <copy todir="build/temp/@{destjar}.contents">
+-                <fileset dir="@{srcdir}"/>
+-            </copy>
+             <jar jarfile="@{destjar}">
+                 <fileset dir="build/temp/@{destjar}.contents"/>
+             </jar>
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.2-fix_javadoc.patch b/dev-java/hamcrest-core/files/hamcrest-core-1.2-fix_javadoc.patch
new file mode 100644
index 000000000000..93ede3572ba0
--- /dev/null
+++ b/dev-java/hamcrest-core/files/hamcrest-core-1.2-fix_javadoc.patch
@@ -0,0 +1,36 @@
+--- build.xml.orig	2009-09-28 06:24:43.000000000 -0500
++++ build.xml	2009-10-04 13:00:14.000000000 -0500
+@@ -194,29 +194,17 @@
+         </tar>
+     </target>
+ 
+-	<target name="javadoc" depends="library">
++	<target name="javadoc" depends="core">
+ 		<mkdir dir="build/javadoc"/>
+-		<javadoc destdir="build/javadoc" source="1.5" failonerror="yes"
+-			overview="overview.html">
++		<javadoc destdir="build/javadoc" source="1.5" failonerror="yes">
+ 			
+-            <classpath>
+-                <fileset dir="lib/integration">
+-                    <include name="*.jar"/>
+-                </fileset>
+-            </classpath>
+-
+-			<packageset dir="hamcrest-core/src/main/java"/>
+-			<packageset dir="hamcrest-library/src/main/java" excludes="org/hamcrest/internal"/>
+-			<packageset dir="hamcrest-integration/src/main/java"/>
+-			<packageset dir="build/generated-code"/>
++			<packageset dir="hamcrest-core/src/main/java" excludes="org/hamcrest/internal"/>
++			<packageset dir="build/temp/hamcrest-core/generated-code"/>
+ 			
+ 			<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://java.sun.com/j2se/1.5.0/docs/api/"/>
+-			<link offline="false" href="http://www.junit.org/junit/javadoc/3.8.1/"/>
+-			<link offline="false" href="http://junit.sourceforge.net/javadoc_40/"/>
+ 		</javadoc>
+ 	</target>
+ 
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">

diff --git a/dev-java/hamcrest-core/hamcrest-core-1.2.ebuild b/dev-java/hamcrest-core/hamcrest-core-1.2.ebuild
new file mode 100644
index 000000000000..1eb3e7cc5e40
--- /dev/null
+++ b/dev-java/hamcrest-core/hamcrest-core-1.2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/hamcrest-core/hamcrest-core-1.2.ebuild,v 1.1 2013/06/15 21:00:35 tomwij Exp $
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+MY_PN="hamcrest"
+MY_P="${MY_PN}-${PV}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Core library of matchers for building test expressions."
+HOMEPAGE="http://code.google.com/p/${MY_PN}/"
+SRC_URI="http://${MY_PN}.googlecode.com/files/${MY_P}.tgz"
+
+LICENSE="BSD-2"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+DEPEND=">=virtual/jdk-1.5
+	~dev-java/hamcrest-generator-${PV}
+	userland_GNU? ( sys-apps/findutils )"
+
+RDEPEND=">=virtual/jre-1.5"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+JAVA_ANT_CLASSPATH_TAGS="${JAVA_ANT_CLASSPATH_TAGS} java java-to-jar"
+
+EANT_BUILD_TARGET="core"
+
+java_prepare() {
+	# Don't include source in JAR.  If a Gentoo user wants the source the source
+	# USE flag will be enabled.
+	epatch "${FILESDIR}/hamcrest-1.2-no_source_in_jar.patch"
+
+	# Empty out the contents of the generator target; it has already been built.
+	epatch "${FILESDIR}/hamcrest-1.2-empty_generator.patch"
+
+	# Fix problems with Javadoc target.
+	epatch "${FILESDIR}/hamcrest-core-1.2-fix_javadoc.patch"
+
+	find -iname "*.jar" -exec rm -v {} + || die "Unable to clean bundled JAR files"
+
+	local cp="build/${P}.jar"
+	cp="${cp}:$(java-pkg_getjars --build-only --with-dependencies hamcrest-generator-${SLOT})"
+	EANT_EXTRA_ARGS="-Dversion=${PV} -Dgentoo.classpath=${cp}"
+}
+
+src_install() {
+	java-pkg_newjar build/${PN}-${PV}.jar ${PN}.jar
+
+	dodoc README.txt CHANGES.txt
+
+	use doc && java-pkg_dojavadoc build/javadoc/
+	use source && java-pkg_dosrc ${PN}/src/main/java/org
+}
diff --git a/dev-java/hamcrest-core/hamcrest-core-1.3.ebuild b/dev-java/hamcrest-core/hamcrest-core-1.3.ebuild
new file mode 100644
index 000000000000..a4cf7ed7a5d4
--- /dev/null
+++ b/dev-java/hamcrest-core/hamcrest-core-1.3.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/hamcrest-core/hamcrest-core-1.3.ebuild,v 1.1 2013/06/15 21:00:35 tomwij Exp $
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+MY_PN="hamcrest"
+MY_P="${MY_PN}-${PV}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Core library of matchers for building test expressions."
+HOMEPAGE="http://code.google.com/p/${MY_PN}/"
+SRC_URI="http://${MY_PN}.googlecode.com/files/${MY_P}.tgz"
+
+LICENSE="BSD-2"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+DEPEND=">=virtual/jdk-1.5
+	~dev-java/hamcrest-generator-${PV}
+	userland_GNU? ( sys-apps/findutils )"
+
+RDEPEND=">=virtual/jre-1.5"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+JAVA_ANT_CLASSPATH_TAGS="${JAVA_ANT_CLASSPATH_TAGS} java java-to-jar"
+
+EANT_BUILD_TARGET="core"
+
+java_prepare() {
+	# Empty out the contents of the generator target; it has already been built.
+	epatch "${FILESDIR}/hamcrest-1.3-empty_generator.patch"
+
+	# Fix problems with Javadoc target.
+	epatch "${FILESDIR}/hamcrest-core-1.3-fix_javadoc.patch"
+
+	find -iname "*.jar" -exec rm -v {} + || die "Unable to clean bundled JAR files"
+
+	local cp="build/${P}.jar"
+	cp="${cp}:$(java-pkg_getjars --build-only --with-dependencies hamcrest-generator-${SLOT})"
+	EANT_EXTRA_ARGS="-Dversion=${PV} -Dgentoo.classpath=${cp}"
+}
+
+src_install() {
+	java-pkg_newjar build/${PN}-${PV}.jar ${PN}.jar
+
+	dodoc README.txt CHANGES.txt
+
+	use doc && java-pkg_dojavadoc build/temp/hamcrest-all-${PV}-javadoc.jar.contents
+	use source && java-pkg_dosrc ${PN}/src/main/java/org
+}