Version bump, use ant build instead of simple build, and update relevant metadata for upstream move to github.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3

6 files changed, 337 insertions, 14 deletions

diff --git a/dev-java/reflectasm/ChangeLog b/dev-java/reflectasm/ChangeLog
index 57687daf563d..2014df72997d 100644
--- a/dev-java/reflectasm/ChangeLog
+++ b/dev-java/reflectasm/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-java/reflectasm
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/reflectasm/ChangeLog,v 1.1 2013/09/11 17:37:01 ercpe Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/reflectasm/ChangeLog,v 1.2 2014/02/04 02:11:26 radhermit Exp $
+
+*reflectasm-1.09 (04 Feb 2014)
+
+  04 Feb 2014; Tim Harder <radhermit@gentoo.org> +reflectasm-1.09.ebuild,
+  +files/reflectasm-1.09-maven-build.xml,
+  +files/reflectasm-1.09-parallel-tests.patch, metadata.xml:
+  Version bump, use ant build instead of simple build, and update relevant
+  metadata for upstream move to github.
 
 *reflectasm-1.05 (11 Sep 2013)
 
diff --git a/dev-java/reflectasm/Manifest b/dev-java/reflectasm/Manifest
index d974c9df36a6..024fc93b791b 100644
--- a/dev-java/reflectasm/Manifest
+++ b/dev-java/reflectasm/Manifest
@@ -1,18 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX reflectasm-1.09-maven-build.xml 10591 SHA256 bcb24a3c3b14b27c694d9f54d3fed75fdb07c6c560ac04d5bde15e424697978e SHA512 c30af31685e737282bb1e66211c2ba076465539a8269443d8edb00b301fc5b8c9dd339f1a38ad352dc5d45abf2f7b07c477e2fabf268c637a9cfe28af57a7548 WHIRLPOOL e823c94dc7119484418d833bc8f92f1ecb70f29ba7679da074f61e0001452247a7ceef725bc5f0080abaa91e704482f646acb28ac6d842ed18726e1e9acdb1f7
+AUX reflectasm-1.09-parallel-tests.patch 847 SHA256 7e01a217b5f928f700c88f934cdb0cba3ab991240f7edccaa8b49062a1de2901 SHA512 5ea4ed92861db739bdb43db5e664d293d0c7dea6e3f810a11fddbf193a0d401c0aea437e818f8ffbfac3fcef92abe8cad527296da5ed2b856e6685f1223e157a WHIRLPOOL a0544dd629eea661cb7daf725fe57c65e38bc160cc1f7463bec7d922483573f8b1d032331862465dd30070a2723748bdb996d7bed1b407438aeaf019b91e0d08
 DIST reflectasm-1.05.zip 490426 SHA256 758ae79e429c18523eab1dbef3dcdbb2caf401a7b984251d949dbd1488a959c1 SHA512 256632ad1049394d021919784554b9bdf353a329fb32566922978a35a4345bad73f67aa27b3e459facc1f6e2309c0afb2fea2b1e73050bcdee2a5a47c275f9f5 WHIRLPOOL 852348adc18918c51da323e7a1ddffea97fbbbd2ceeb2b5abeebe763e8dbfbce76413e74829601f01c3895641ac35b234df2e849ab2b9b88998d2f2147369f83
+DIST reflectasm-1.09.tar.gz 252335 SHA256 622246d7a686cd8ba7ff3ab2037063f5f32329efa13758c2c3681988a428eab6 SHA512 ca4347a67ad408c8bd273eda2557e1686ddf3780439682d5ce9072b72a7e1b8ad35374b8600d5665a6c473c6ee16870a6ab27bb103fe41a27d00b2f222d75f61 WHIRLPOOL c58594400270911b009874e9253e59d0a71393458106e52a5d925a6d128366eaf18035dd59f8cb2c5549b8c8a4539b76bff6686de775f3621629452ab3fdef10
 EBUILD reflectasm-1.05.ebuild 1141 SHA256 e97aa9915fe5461b7c9fd1bcd0571fed0b5a7e6d2220fad14a88f83fffc31f1b SHA512 0eb7f21b13d06945e338cd50e75cc2c99decda19309a2d637192f751d570a0acc970ce55775500395ec1c74b32243387af6e9e67ff9a07bb2135e4974797fa31 WHIRLPOOL 87382c1a0f69919538e82dfd6098a3886b8c5df72bd1fe8afe59dbc4a92218c2f4c76b78519daa72c1ae80b2697f286baac14af79c295ae84878e84a013c57e2
-MISC ChangeLog 403 SHA256 f697dcd6551c0ff5643b8b3d4e29ca1a86a2afc3922b98876578a785eccb533e SHA512 5f46240ffbb985aadd433be6e80b125173f3e929281325fc68355242c109df405e112b155a4de14f2e04a6dd98bf49231d90dfb56895dc8e38a4cdfd15462351 WHIRLPOOL 485cbae719598e3c5ac282f7a88c67cf62de5c86faefb0059d208f14809bfdfa713ef05c81a97dbad587a0de8a8d6698786cea4337ad7c61f2feca87ba0a4a02
-MISC metadata.xml 239 SHA256 e03c02d8712c91d6429d29477f896379f196cd16b4ce9f6489f23afca09fc1d3 SHA512 317ed2fa0f32619f768e8bcc8281da40343ad69174f2db4f737fe879383ac9894ac701fc84894f55c587266b0cb14144f5fc2a03a40a0da4f5bcc739383918e1 WHIRLPOOL 83f461d06d9627d53554633a6cffe4fa23991b3045795092d1c89d681604d2ac31355e68ca5981d5e0d40bb9770cce1586f86da8b0abf01759a31581067c0c44
+EBUILD reflectasm-1.09.ebuild 1238 SHA256 c84159f74fc9564b9541b844fff8214e1beafb28385c7369d28f6fac18b9be70 SHA512 3c69f155b88005fa075625dbf4a7995bd169fff5d3c48e7469ec760c7811e41a35f73fb4a39396afdd37c373cd37bcf5dbf0bb2930ed1cdb0562c31275d48e85 WHIRLPOOL f90e6768b2697dce0fee7bdb2d6baf3bb810bdf55da3a4a423ea8c6ea5f6b76c1e1035e9338026cdbe85697e7b64abf2f673b3ed7280814a320f0b748955946f
+MISC ChangeLog 732 SHA256 69347146c400a888f04c58ad90cbcc4f91f47099201ddddf331b159df314994f SHA512 99db791425ea0ee8e9b2830b24074ea0dcc86a9f870b2903cb314d7c0054c296424e520531404696647a29818bc2db51887063e98c3b856127374fec22716904 WHIRLPOOL 3693a8c61f050b87113913e956d9906667075c0d954eda441eb6b5245bf5594bc6144aaed4a9e956568ed9284d844d0c928b62e0763e3dbd083f65c321f9b5de
+MISC metadata.xml 250 SHA256 f1753e4a40e11dc0c3dc57ea0f53f7fb0f7d1fe722e4dfd1aa83b5cc1f3c0108 SHA512 892bf4029cdc5b14ec77cc559b482490bb08f1a8e42a174ec3f2300aae04004253daf945923dbf0d52584b1a0c60bbe56ce621de938b37d5ed3034246f8a5e1f WHIRLPOOL 65e0cf2e4e7851cb37434533ed940939082153004a9b8c4897173b4ce56d6960a10783636c4032a3623d751a76c94a1b98d8c96e8822a34dac5952cf8ecef34e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSMKo+AAoJEKCEBkJ3xQHtQ8gH+wfdXK39qGW4iDzT7Ym3t10Z
-2GyIeB978Q4e4/h4o71oLhgaBJisBF+PptWFq0IivpD52mhnPwKF4fJ1eqAsCdgE
-q7/m6OFHst6wb9zr9/gpeeAwJa+xMwlo5E0g2Ttqz/NtPSL8Zg2TyogaDTRd12hE
-/YlTpnYqy64tulqCIbW1vYyOOk9td+q/shmnC6Sy7i0dPYfuvfW07ecMiAS44+LD
-zsWF2Sjk2ilWD3D6Rw0RVfte7+X3GLf7X1mPSZ5devJdVsD+HO6CXhI8vpP7JGKG
-010suzoAo2w+X4tD2fE7U4XREJ1xvJNRAgmev9aUKvb2oHQM3Y2dkXUC+MwNOUo=
-=xMsG
+iQEcBAEBCAAGBQJS8ExWAAoJEEqz6FtPBkyjIBYH+wQ+gUVAn6AXpbnoeJ03uxvA
+SG0bu2mHrNJpFY1DZnHZW2OrTg2t+jfWzOUTw365OnUfu2BO+YwjFQZee/X06EJ2
+NfSZr3FRlckvG1RStAexvyxb4KHsJbjmERB1K/TYmmHmm7YODDOhj9aRS+BzdVsb
+VfzzeQ4MwiZz6S0Zjxys7NOfz62jSMnH0Nv4z4FXYi8L/7AlJGEPwywt7nIbomfZ
+Ti/lhei8CT+ZbNe2vR3SQHNT6BX5XYU3yZGPzZ29Up1LNC77aiB9xMT9ez4ztg4k
+jjQb/rOntZq/ivmRRsQETAPr6F8Rmtm/iimbzeiHlEeNC0OFhQi5s8xSHdsx9zM=
+=sYVv
 -----END PGP SIGNATURE-----
diff --git a/dev-java/reflectasm/files/reflectasm-1.09-maven-build.xml b/dev-java/reflectasm/files/reflectasm-1.09-maven-build.xml
new file mode 100644
index 000000000000..41984daee5d1
--- /dev/null
+++ b/dev-java/reflectasm/files/reflectasm-1.09-maven-build.xml
@@ -0,0 +1,247 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above.        -->
+<!-- ====================================================================== -->
+
+<!-- ====================================================================== -->
+<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
+<!-- ====================================================================== -->
+<!--                                                                        -->
+<!-- Any modifications will be overwritten.                                 -->
+<!--                                                                        -->
+<!-- Generated by Maven Ant Plugin on 2/4/14 12:38 AM                       -->
+<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
+<!--                                                                        -->
+<!-- ====================================================================== -->
+
+<project name="reflectasm-from-maven" default="package" basedir=".">
+
+  <!-- ====================================================================== -->
+  <!-- Build environment properties                                           -->
+  <!-- ====================================================================== -->
+
+  <property file="${user.home}/.m2/maven.properties"/>
+  <property file="maven-build.properties"/>
+
+  <property name="maven.build.finalName" value="reflectasm-1.09"/>
+  <property name="maven.build.dir" value="target"/>
+  <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
+  <property name="maven.build.srcDir.0" value="src"/>
+  <property name="maven.build.resourceDir.0" value="src/main/resources"/>
+  <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
+  <property name="maven.build.testDir.0" value="test"/>
+  <property name="maven.build.testResourceDir.0" value="src/test/resources"/>
+  <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
+  <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
+
+  <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
+  <property name="maven.settings.offline" value="false"/>
+  <property name="maven.settings.interactiveMode" value="true"/>
+
+  <!-- ====================================================================== -->
+  <!-- Defining classpaths                                                    -->
+  <!-- ====================================================================== -->
+
+  <path id="build.classpath">
+    <pathelement location="${maven.repo.local}/org/ow2/asm/asm/4.0/asm-4.0.jar"/>
+  </path>
+  <path id="build.test.classpath">
+    <pathelement location="${maven.repo.local}/org/ow2/asm/asm/4.0/asm-4.0.jar"/>
+    <pathelement location="${maven.repo.local}/junit/junit/4.8.2/junit-4.8.2.jar"/>
+  </path>
+
+  <!-- ====================================================================== -->
+  <!-- Cleaning up target                                                     -->
+  <!-- ====================================================================== -->
+
+  <target name="clean" description="Clean the output directory">
+    <delete dir="${maven.build.dir}"/>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Compilation target                                                     -->
+  <!-- ====================================================================== -->
+
+  <target name="compile" depends="get-deps" description="Compile the code">
+    <mkdir dir="${maven.build.outputDir}"/>
+    <javac destdir="${maven.build.outputDir}" 
+           nowarn="false" 
+           debug="true" 
+           optimize="false" 
+           deprecation="true" 
+           target="1.5" 
+           verbose="false" 
+           fork="false" 
+           source="1.5">
+      <src>
+        <pathelement location="${maven.build.srcDir.0}"/>
+      </src>
+      <classpath refid="build.classpath"/>
+    </javac>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Test-compilation target                                                -->
+  <!-- ====================================================================== -->
+
+  <target name="compile-tests" 
+          depends="compile" 
+          description="Compile the test code" 
+          unless="maven.test.skip">
+    <mkdir dir="${maven.build.testOutputDir}"/>
+    <javac destdir="${maven.build.testOutputDir}" 
+           nowarn="false" 
+           debug="true" 
+           optimize="false" 
+           deprecation="true" 
+           target="1.5" 
+           verbose="false" 
+           fork="false" 
+           source="1.5">
+      <src>
+        <pathelement location="${maven.build.testDir.0}"/>
+      </src>
+      <classpath>
+        <path refid="build.test.classpath"/>
+        <pathelement location="${maven.build.outputDir}"/>
+      </classpath>
+    </javac>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Run all tests                                                          -->
+  <!-- ====================================================================== -->
+
+  <target name="test" 
+          depends="compile-tests, junit-missing" 
+          unless="junit.skipped" 
+          description="Run the test cases">
+    <mkdir dir="${maven.test.reports}"/>
+    <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
+      <sysproperty key="basedir" value="."/>
+      <formatter type="xml"/>
+      <formatter type="plain" usefile="false"/>
+      <classpath>
+        <path refid="build.test.classpath"/>
+        <pathelement location="${maven.build.outputDir}"/>
+        <pathelement location="${maven.build.testOutputDir}"/>
+      </classpath>
+      <batchtest todir="${maven.test.reports}" unless="test">
+        <fileset dir="${maven.build.testDir.0}">
+          <include name="**/Test*.java"/>
+          <include name="**/*Test.java"/>
+          <include name="**/*TestCase.java"/>
+          <exclude name="**/*Abstract*Test.java"/>
+        </fileset>
+      </batchtest>
+      <batchtest todir="${maven.test.reports}" if="test">
+        <fileset dir="${maven.build.testDir.0}">
+          <include name="**/${test}.java"/>
+          <exclude name="**/*Abstract*Test.java"/>
+        </fileset>
+      </batchtest>
+    </junit>
+  </target>
+
+  <target name="test-junit-present">
+    <available classname="junit.framework.Test" property="junit.present"/>
+  </target>
+
+  <target name="test-junit-status" 
+          depends="test-junit-present">
+    <condition property="junit.missing">
+      <and>
+        <isfalse value="${junit.present}"/>
+        <isfalse value="${maven.test.skip}"/>
+      </and>
+    </condition>
+    <condition property="junit.skipped">
+      <or>
+        <isfalse value="${junit.present}"/>
+        <istrue value="${maven.test.skip}"/>
+      </or>
+    </condition>
+  </target>
+
+  <target name="junit-missing" 
+          depends="test-junit-status" 
+          if="junit.missing">
+    <echo>=================================== WARNING ===================================</echo>
+    <echo> JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.</echo>
+    <echo>===============================================================================</echo>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Javadoc target                                                         -->
+  <!-- ====================================================================== -->
+
+  <target name="javadoc" description="Generates the Javadoc of the application">
+    <javadoc sourcepath="${maven.build.srcDir.0}" 
+             packagenames="*" 
+             destdir="${maven.reporting.outputDirectory}/apidocs" 
+             access="protected" 
+             old="false" 
+             verbose="false" 
+             version="true" 
+             use="true" 
+             author="true" 
+             splitindex="false" 
+             nodeprecated="false" 
+             nodeprecatedlist="false" 
+             notree="false" 
+             noindex="false" 
+             nohelp="false" 
+             nonavbar="false" 
+             serialwarn="false" 
+             charset="ISO-8859-1" 
+             linksource="false" 
+             breakiterator="false"/>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Package target                                                         -->
+  <!-- ====================================================================== -->
+
+  <target name="package" depends="compile,test" description="Package the application">
+    <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
+         compress="true" 
+         index="false" 
+         basedir="${maven.build.outputDir}" 
+         excludes="**/package.html"/>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- A dummy target for the package named after the type it creates         -->
+  <!-- ====================================================================== -->
+
+  <target name="jar" depends="package" description="Builds the jar for the application"/>
+
+  <!-- ====================================================================== -->
+  <!-- Download dependencies target                                           -->
+  <!-- ====================================================================== -->
+
+  <target name="test-offline">
+    <condition property="maven.mode.offline">
+      <equals arg1="${maven.settings.offline}" arg2="true"/>
+    </condition>
+  </target>
+
+  <target name="get-deps" 
+          depends="test-offline" 
+          description="Download all dependencies" 
+          unless="maven.mode.offline">
+    <mkdir dir="${maven.repo.local}"/>
+    <mkdir dir="${maven.repo.local}/org/ow2/asm/asm/4.0"/>
+    <get src="http://repo.maven.apache.org/maven2/org/ow2/asm/asm/4.0/asm-4.0.jar" 
+         dest="${maven.repo.local}/org/ow2/asm/asm/4.0/asm-4.0.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <mkdir dir="${maven.repo.local}/junit/junit/4.8.2"/>
+    <get src="http://repo.maven.apache.org/maven2/junit/junit/4.8.2/junit-4.8.2.jar" 
+         dest="${maven.repo.local}/junit/junit/4.8.2/junit-4.8.2.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+  </target>
+
+</project>
diff --git a/dev-java/reflectasm/files/reflectasm-1.09-parallel-tests.patch b/dev-java/reflectasm/files/reflectasm-1.09-parallel-tests.patch
new file mode 100644
index 000000000000..aa6a53ca4040
--- /dev/null
+++ b/dev-java/reflectasm/files/reflectasm-1.09-parallel-tests.patch
@@ -0,0 +1,16 @@
+Remove test that unloads the current class loader. If this is enabled, the
+testAutoUnloadClassloaders testcase will fail if it's run after
+testRemoveClassloaders. Since junit generally runs tests in an arbitrary order
+this causes random testsuite failures.
+
+--- reflectasm-1.09/test/com/esotericsoftware/reflectasm/ClassLoaderTest.java
++++ reflectasm-1.09/test/com/esotericsoftware/reflectasm/ClassLoaderTest.java
+@@ -104,8 +104,6 @@
+ 		assertEquals(initialCount+1, AccessClassLoader.activeAccessClassLoaders());

+ 		AccessClassLoader.remove(testObject2.getClass().getClassLoader());

+ 		assertEquals(initialCount+0, AccessClassLoader.activeAccessClassLoaders());

+-		AccessClassLoader.remove(this.getClass().getClassLoader());

+-		assertEquals(initialCount-1, AccessClassLoader.activeAccessClassLoaders());

+ 	}

+ 

+ 	static public class Test {

diff --git a/dev-java/reflectasm/metadata.xml b/dev-java/reflectasm/metadata.xml
index 6d3bf2f22557..3388b15fec74 100644
--- a/dev-java/reflectasm/metadata.xml
+++ b/dev-java/reflectasm/metadata.xml
@@ -3,7 +3,6 @@
 <pkgmetadata>
 	<herd>java</herd>
 	<upstream>
-		<remote-id type="google-code">reflectasm</remote-id>
+		<remote-id type="github">EsotericSoftware/reflectasm</remote-id>
 	</upstream>
 </pkgmetadata>
-
diff --git a/dev-java/reflectasm/reflectasm-1.09.ebuild b/dev-java/reflectasm/reflectasm-1.09.ebuild
new file mode 100644
index 000000000000..4829fae4fe50
--- /dev/null
+++ b/dev-java/reflectasm/reflectasm-1.09.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/reflectasm/reflectasm-1.09.ebuild,v 1.1 2014/02/04 02:11:26 radhermit Exp $
+
+EAPI=5
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2 eutils
+
+DESCRIPTION="High performance Java reflection"
+HOMEPAGE="https://github.com/EsotericSoftware/reflectasm/"
+SRC_URI="https://github.com/EsotericSoftware/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+COMMON_DEPEND="dev-java/asm:4"
+RDEPEND="${COMMON_DEPEND}
+	>=virtual/jre-1.5"
+DEPEND="${COMMON_DEPEND}
+	>=virtual/jdk-1.5
+	test? (
+		dev-java/junit:4
+		dev-java/ant-junit4:0
+	)"
+
+EANT_GENTOO_CLASSPATH="asm-4"
+EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}"
+
+java_prepare() {
+	cp "${FILESDIR}"/${P}-maven-build.xml build.xml || die
+	find . -name '*.jar' -delete
+
+	epatch "${FILESDIR}"/${P}-parallel-tests.patch
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_dojar target/${PN}.jar
+	use doc && java-pkg_dojavadoc target/site/apidocs
+	use source && java-pkg_dosrc src
+}