Version bump (bug #515854), dropped code for the failing tests, cleaned things up (in 4.0.19 too)

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

6 files changed, 317 insertions, 42 deletions

diff --git a/dev-java/netty-common/ChangeLog b/dev-java/netty-common/ChangeLog
index 0269f9618702..299a3feb5ccd 100644
--- a/dev-java/netty-common/ChangeLog
+++ b/dev-java/netty-common/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-java/netty-common
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/netty-common/ChangeLog,v 1.1 2014/05/19 12:35:12 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/netty-common/ChangeLog,v 1.2 2014/07/15 07:50:55 ercpe Exp $
+
+*netty-common-4.0.21 (15 Jul 2014)
+
+  15 Jul 2014; Johann Schmitz <ercpe@gentoo.org>
+  +files/netty-common-4.0.21-build.xml, +netty-common-4.0.21.ebuild,
+  files/netty-common-4.0.19-build.xml, netty-common-4.0.19.ebuild:
+  Version bump (bug #515854), dropped code for the failing tests, cleaned things
+  up (in 4.0.19 too)
 
 *netty-common-4.0.19 (19 May 2014)
 
diff --git a/dev-java/netty-common/Manifest b/dev-java/netty-common/Manifest
index 8f85e519fc08..2043fdc7a67d 100644
--- a/dev-java/netty-common/Manifest
+++ b/dev-java/netty-common/Manifest
@@ -1,19 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX netty-common-4.0.19-build.xml 9769 SHA256 1ee8e9a6f22695b155c6890ae94f8b1dc519a39fc08f91795f12c2a32f103a5d SHA512 269dbe1fcfae95103b62319a3c9f5fbfd746b9bf093ad59f1dfcb141b6b45528d89c13f90279be8e9d74df457e0a2ab177eb7c4589ccf8462801dafb12d61941 WHIRLPOOL 0af72feef86827a66dff170c13d7af7eae6aad972c6f4f22bfd07a8f12bef05bf33e6c392fe50cfde6d83937ae0e76b61786033d58aaafcbd85327b26f2942e8
+AUX netty-common-4.0.19-build.xml 9693 SHA256 d9343b04e1f9003f7e9f5963e0fa09e81938f8dabbdbed83cb7d5ef71bf00e86 SHA512 99ad272c614a29f99018a7acbe670bed238c87d87882b3deea32d74bc2eef864efa5b0d5675421c3b255e342a16a369d9d0562746055af940167e02c08f3effe WHIRLPOOL 5c438fc3f251caf930a5203a2a4a6259cf95df060dfb26ad757c9241c6db7d37d2539593bc3e135042ba587c77c3dbe7ed6b5b60a250afccc0b2c68c7ba02057
+AUX netty-common-4.0.21-build.xml 9693 SHA256 c26f2e717ebb453cebd1b6ae3e458f326fa5eadcb01f17d027cf80d5a377ae93 SHA512 473cddc8bad9dbf294ebaff52b4f8ebf152eb414fc528209973c804c0c1f82c86e89232f5c7e90126de6f350854355dc1722f188b398a65687e6b9a7bb59aaaf WHIRLPOOL b994cf96b94d9e6877828c9c7ca91af64712689bd8f42ae68b0c0e56f3e2a7b8d0d5214388c9cffb9c6729deb7bd73a9e0f49c79a15b2298421b21eedf45388f
 DIST netty-4.0.19.Final.tar.gz 929126 SHA256 065980d0232179a02dc52d55e9017f485c2cbcf14597172cac3bfd2db5dce9ac SHA512 031a251c93b2c475bbf12610f297ed47eacc430ba19e05fd33c12ab768b1d14556cb59d0f9e2a19f87c325b516323cd2ec13a341522825a19d76c27abb13a4cf WHIRLPOOL 8a2c026c62de3a26ef0c432af37b193b10bc826429399dc8fb8016d50cb22359e50087a10edecd69924861bf1f29da02b39810f37db514ba260a1ea9ef2692d0
-EBUILD netty-common-4.0.19.ebuild 1868 SHA256 6e31e17f84c1504639fea8285eb4e5f3ae3ba18e2bb436615598989199cdb571 SHA512 69ccc3a185787fb66ea5f7c02a07584337bb072f2708043f73ac551371fb353fbcf4ca973f2ce6aec97b79de4ab8aca9ed4987dd2415140fb1c97fcd02758325 WHIRLPOOL 0525c28d3743ee00d252612ac5606ca9e1104baacf3bff801845ad045e44344b92be9747fe908abb109209bca029ee47ad2248345f8f04094e530b59e82ad438
-MISC ChangeLog 576 SHA256 baf407c5b1ddc76cc77cf4cd7c20a5a744d0842dc1ebcab8d472c5f74a653bbd SHA512 045ae42cd8ed1bd5a244a883f16696e7abadda7c383d69014876b63d1fe20af80bdca61e12c898acfd9cb98fa911b5e2f2b1696ee78f87e50d5596238f089cb0 WHIRLPOOL 756fe885cf1e55f4298311ab74511d61ef6e49487ed40aa15d10593b83a54786ef99825bcb2a7ded91ec77674dd9828e2732bc87f7185cb10411d86974898591
+DIST netty-4.0.21.Final.tar.gz 960489 SHA256 e1b5572defaa760dcd8ded4d7691e9daf242b2e1885115b722f2f790d9ef9f75 SHA512 5d432e9e433c22b82e67ed3463c6982ca95c2ad823165e1ca9a5046e598878f06aac4221be235f2bda15edfdb22028f2a4f74fb37d431f24a2636e4ec60fae74 WHIRLPOOL 92e96986def775f26286958a9e2c7fe55ab571ad373f9cc25357db71f85f170d7aba7d7854c130c5788f7332665000cd10f666fff06abd0ce57cf4f95008958a
+EBUILD netty-common-4.0.19.ebuild 1447 SHA256 d220dfd375793b5a064c52262b5c50c7954e183b54a161db272b4fa8ae9ea1de SHA512 36b37a359bcc223a469dc8f070642d56ea754adf8916f678c292e21bdfb7ff76558511bf5939433c834e41cf38181336086b97cd694c1247ca11fcb4539c2e43 WHIRLPOOL b036cfb970a3581441417fb975ea3d7c0a1ed53972b19ec0f41abf2b3eac03b7eec14f9943f44278ab8acabfd69590622a39a3a89b1f3a3409c619b1136882c9
+EBUILD netty-common-4.0.21.ebuild 1563 SHA256 5b4d6fefc8ee8528f7dd62027d17fe85b40c1edab50d261e6bc278376f2984e6 SHA512 ed08cef8da73f79bcc54f624bdbf31aca020f2706c27e39547ba34124d95312109c61d46ce2e89769dc53ac280215b28fcc3cd8bcad610551a8d5c7e913019ff WHIRLPOOL a4f758787d6232e971978688bc96bac14d5578f0d5ba92146015a1ec63be178080b5f48034ceb16ac048f8d4b8b5fe8236dca91694a0dc01ce9ca3e9f3fe1554
+MISC ChangeLog 899 SHA256 750aedfd3e158eb43e054c68bc72a320c7c4c5903958094cb89b90bd36d16e09 SHA512 c725671a671542f617051fd022a78065981e2ceb50c872a3091e5544962b20a6d8c8f6c8528d379177b429b14a73f23a805ae5b007bbf78465e729c61733a9d9 WHIRLPOOL d3a4f3836ff8bb702696b5d8b49136b8cc1738f07a7869901160e8d223fc4a4c9a68d78ec85eac8e96efe92526a0f272c5cfea9c2cf24572e3e7e1da6259bbcd
 MISC metadata.xml 157 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 SHA512 bbae663e26f48fdc5e272adc2b06c14f77f34c53caf84acb53908ff036e7c12a3edbbc0929d2db56bee861a453381d979c7e0983a23716f629ed2135c22ffece WHIRLPOOL 887e153e2481e7d76f0f1b67a395f10f0328b93930185ecdb8fcb5fe3c50f839086a18831d61cf45b34657aaffca6c3b7900cf3c04b712846a05027a84602448
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQEcBAEBCAAGBQJTefpxAAoJEJWyH81tNOV92IMIAIfx75pXDuvUYow10NpGcEhf
-nye0H8ig2cISOJgYvDD4o0Qe2U5B/gtxzGOQlwU6eE3l2AIKruihi8u5kyfr5JR7
-bG1NzHRZU0bz2pcqPn/fK6C8YtZZKpZ3bDqcf5d59OQ2s3xknnpokDF8us2SVcVd
-oVl7c1ZoHC0sSKeuMJgJQh+ZfOOYO5fsy7XKWA+V0vKdd9Y7eQxLD3ABlZRt23G1
-8HgGNkwYBJKU1j3/SsICo+y17UayrH/FpGYsaZ5Rer076L8CPXb2QWWGEUZfEwXC
-J2O4Ki7sW9hnjMKlnNfNzi6JiZj0+5us8+myEi8XA/SQ/mj1NC6H2Y9C2R6Cit0=
-=yXOf
+iQEcBAEBCAAGBQJTxN1lAAoJEKCEBkJ3xQHtlJcH/i3juM93RZv8Ze5/fDbBtRDm
+nv0U9lQUElxzpBPIdkwXlT8CGsRWAh0MUHtMt7ahXz64J2GdriRN5+5zlAIDMRrM
+mtwXe2wiYJMTByziBpsVRQNLO8T67Q9cSc1GtTuqfFWkXt+q1J5eiyFhFlrFwKgm
+iQY91uTcCXLrFjMhG7kw/9NLDdO7oLuHe6LOozBl2GH11B3BG7J7e4k+CvuMK6pq
+1jegimOBO4oA2pdvBDpJwhi0ylRjxaPNlQKD6ZonoOjk6Plo7yPGseaXhLK4yG9M
+/4j3LThUcI4kE7Kkjye7y8VgnaDPAhRT8HzVnWd170CnQdsnyDA/lv29+lsbpJ0=
+=JpYn
 -----END PGP SIGNATURE-----
diff --git a/dev-java/netty-common/files/netty-common-4.0.19-build.xml b/dev-java/netty-common/files/netty-common-4.0.19-build.xml
index 5b25fa9970a4..29e56ede46a2 100644
--- a/dev-java/netty-common/files/netty-common-4.0.19-build.xml
+++ b/dev-java/netty-common/files/netty-common-4.0.19-build.xml
@@ -70,8 +70,7 @@
            target="1.6" 
            verbose="false" 
            fork="true" 
-           memoryMaximumSize="256m" 
-           memoryInitialSize="1024m" 
+           memoryInitialSize="1024m"
            source="1.6">
       <src>
         <pathelement location="${maven.build.srcDir.0}"/>
@@ -97,8 +96,7 @@
            target="1.6" 
            verbose="false" 
            fork="true" 
-           memoryMaximumSize="256m" 
-           memoryInitialSize="1024m" 
+           memoryInitialSize="1024m"
            source="1.6">
       <src>
         <pathelement location="${maven.build.testDir.0}"/>
diff --git a/dev-java/netty-common/files/netty-common-4.0.21-build.xml b/dev-java/netty-common/files/netty-common-4.0.21-build.xml
new file mode 100644
index 000000000000..b83a8bda55b8
--- /dev/null
+++ b/dev-java/netty-common/files/netty-common-4.0.21-build.xml
@@ -0,0 +1,229 @@
+<?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 5/15/14 7:11 PM                       -->
+<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
+<!--                                                                        -->
+<!-- ====================================================================== -->
+
+<project name="netty-common-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="netty-common-4.0.21.Final"/>
+  <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/main/java"/>
+  <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="src/test/java"/>
+  <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">
+  </path>
+  <path id="build.test.classpath">
+  </path>
+
+  <!-- ====================================================================== -->
+  <!-- Cleaning up target                                                     -->
+  <!-- ====================================================================== -->
+
+  <target name="clean" description="Clean the output directory">
+    <delete dir="${maven.build.dir}"/>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Compilation target                                                     -->
+  <!-- ====================================================================== -->
+
+  <target name="compile" description="Compile the code">
+    <mkdir dir="${maven.build.outputDir}"/>
+    <javac destdir="${maven.build.outputDir}" 
+           nowarn="true" 
+           debug="true" 
+           optimize="true" 
+           deprecation="true" 
+           target="1.6" 
+           verbose="false" 
+           fork="true" 
+           memoryInitialSize="1024m"
+           source="1.6">
+      <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="true" 
+           debug="true" 
+           optimize="true" 
+           deprecation="true" 
+           target="1.6" 
+           verbose="false" 
+           fork="true" 
+           memoryInitialSize="1024m"
+           source="1.6">
+      <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="**/*Benchmark*.java"/>
+          <exclude name="**/Abstract*"/>
+          <exclude name="**/TestUtil*"/>
+        </fileset>
+      </batchtest>
+      <batchtest todir="${maven.test.reports}" if="test">
+        <fileset dir="${maven.build.testDir.0}">
+          <include name="**/${test}.java"/>
+          <exclude name="**/Abstract*"/>
+          <exclude name="**/TestUtil*"/>
+        </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="false" 
+             use="true" 
+             author="false" 
+             splitindex="false" 
+             nodeprecated="false" 
+             nodeprecatedlist="false" 
+             notree="false" 
+             noindex="false" 
+             nohelp="false" 
+             nonavbar="false" 
+             serialwarn="false" 
+             charset="ISO-8859-1" 
+             linksource="false" 
+             breakiterator="true"/>
+  </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>
+</project>
diff --git a/dev-java/netty-common/netty-common-4.0.19.ebuild b/dev-java/netty-common/netty-common-4.0.19.ebuild
index 29947d34bc4e..3ab4aacdd8de 100644
--- a/dev-java/netty-common/netty-common-4.0.19.ebuild
+++ b/dev-java/netty-common/netty-common-4.0.19.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/netty-common/netty-common-4.0.19.ebuild,v 1.1 2014/05/19 12:35:12 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/netty-common/netty-common-4.0.19.ebuild,v 1.2 2014/07/15 07:50:55 ercpe Exp $
 
 EAPI="5"
 
-JAVA_PKG_IUSE="doc source test"
+JAVA_PKG_IUSE="doc source"
 
 inherit java-pkg-2 java-ant-2
 
@@ -16,26 +16,22 @@ SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/${MY_P}.Final.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 
-RDEPEND=">=virtual/jre-1.6"
-
-DEPEND=">=virtual/jdk-1.6
-	dev-java/commons-logging:0
+CDEPEND="dev-java/commons-logging:0
 	dev-java/javassist:3
 	dev-java/log4j:0
-	dev-java/slf4j-api:0
-	test? (
-		dev-java/ant-core:0
-		dev-java/easymock:3.2
-		dev-java/junit:4
-	)"
+	dev-java/slf4j-api:0"
+RDEPEND=">=virtual/jre-1.6
+		${CDEPEND}"
+DEPEND=">=virtual/jdk-1.6
+		${CDEPEND}"
 
 S="${WORKDIR}/${MY_PN}-${MY_P}.Final/${PN/${MY_PN}-}"
 
 EANT_BUILD_TARGET="package"
 JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_TEST_EXTRA_ARGS+=" -Djunit.present=true"
+EANT_GENTOO_CLASSPATH="commons-logging,log4j,javassist-3,slf4j-api"
 
 # Tests fail as they might need logging to be properly set up and/or compatible.
 #
@@ -44,23 +40,12 @@ EANT_TEST_EXTRA_ARGS+=" -Djunit.present=true"
 RESTRICT="test"
 
 java_prepare() {
-	EANT_EXTRA_ARGS="-Dgentoo.classpath=$(java-pkg_getjars --build-only commons-logging,log4j,javassist-3,slf4j-api)"
-
 	cp "${FILESDIR}"/${P}-build.xml build.xml || die
-
-	# Remove the odd memory restriction in the generated build files.
-	sed -i 's/memoryMaximumSize="256m"//' build.xml || die
-}
-
-src_test() {
-	EANT_EXTRA_ARGS="${EANT_EXTRA_ARGS}:$(java-pkg_getjars --build-only ant-core,easymock-3.2,junit-4)"
-
-	ANT_TASKS="ant-junit" java-pkg-2_src_test
 }
 
 src_install() {
 	java-pkg_newjar target/${MY_PN}-*.jar ${PN}.jar
 
 	use doc && java-pkg_dojavadoc target/site/apidocs
-	use source && java-pkg_dosrc src/main/java
+	use source && java-pkg_dosrc src/main/java/*
 }
diff --git a/dev-java/netty-common/netty-common-4.0.21.ebuild b/dev-java/netty-common/netty-common-4.0.21.ebuild
new file mode 100644
index 000000000000..ce6794c5b0a8
--- /dev/null
+++ b/dev-java/netty-common/netty-common-4.0.21.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/netty-common/netty-common-4.0.21.ebuild,v 1.1 2014/07/15 07:50:55 ercpe Exp $
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+MY_PN="netty"
+MY_P="${MY_PN}-${PV}"
+DESCRIPTION="Async event-driven framework for rapid development of high performance network applications"
+HOMEPAGE="http://netty.io/"
+SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/${MY_P}.Final.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+CDEPEND="dev-java/commons-logging:0
+	dev-java/javassist:3
+	dev-java/log4j:0
+	dev-java/slf4j-api:0"
+RDEPEND=">=virtual/jre-1.6
+		${CDEPEND}"
+DEPEND=">=virtual/jdk-1.6
+		${CDEPEND}"
+
+S="${WORKDIR}/${MY_PN}-${MY_P}.Final/${PN/${MY_PN}-}"
+
+EANT_BUILD_TARGET="package"
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_GENTOO_CLASSPATH="commons-logging,log4j,javassist-3,slf4j-api"
+
+# Tests fail as they might need logging to be properly set up and/or compatible.
+#
+# junit.framework.AssertionFailedError: expected:<[foo]> but was:<[NOP]>
+# at io.netty.util.internal.logging.Slf4JLoggerFactoryTest.testCreation
+RESTRICT="test"
+
+java_prepare() {
+	#EANT_EXTRA_ARGS="-Dgentoo.classpath=$(java-pkg_getjars --build-only commons-logging,log4j,javassist-3,slf4j-api)"
+	cp "${FILESDIR}"/${P}-build.xml build.xml || die
+}
+
+src_install() {
+	java-pkg_newjar target/${MY_PN}-*.jar ${PN}.jar
+
+	use doc && java-pkg_dojavadoc target/site/apidocs
+	use source && java-pkg_dosrc src/main/java/*
+}