Revision bump, thorough review to use java-pkg-2 and fix up common mistakes; could fix bug #509602, reported by Victor Orozo.

Package-Manager: portage-HEAD/cvs/Linux x86_64
Manifest-Sign-Key: 0x6D34E57D

4 files changed, 287 insertions, 11 deletions

diff --git a/dev-java/jboss-logging/ChangeLog b/dev-java/jboss-logging/ChangeLog
index 3f4c7445023f..2ed4a192c52c 100644
--- a/dev-java/jboss-logging/ChangeLog
+++ b/dev-java/jboss-logging/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/jboss-logging
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jboss-logging/ChangeLog,v 1.1 2013/09/26 17:39:00 ercpe Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jboss-logging/ChangeLog,v 1.2 2014/05/08 14:15:18 tomwij Exp $
+
+*jboss-logging-3.1.3-r1 (08 May 2014)
+
+  08 May 2014; Tom Wijsman <TomWij@gentoo.org>
+  +files/jboss-logging-3.1.3-r1-build.xml, +jboss-logging-3.1.3-r1.ebuild:
+  Revision bump, thorough review to use java-pkg-2 and fix up common mistakes;
+  could fix bug #509602, reported by Victor Orozo.
 
 *jboss-logging-3.1.3 (26 Sep 2013)
 
diff --git a/dev-java/jboss-logging/Manifest b/dev-java/jboss-logging/Manifest
index 9ecfea8ce463..e45dff32289a 100644
--- a/dev-java/jboss-logging/Manifest
+++ b/dev-java/jboss-logging/Manifest
@@ -1,18 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX jboss-logging-3.1.3-r1-build.xml 10497 SHA256 16776bee2a1091cf6b5ae4144a2fa10949953db3e6d388c6280462691f25c9d0 SHA512 8d2e8bdc42f20a28416bdd241f537e6e55af4d29c7c9728452839d2471815560f251e0e8aeb21b67c8f3388a206deba2c86e4618dd0d3572e7bc8e2a897345b8 WHIRLPOOL abed603ac52a124650f491d0bd9241b30fd5a45c7606420dc04030c4eb1505012f33ae95e028da3f92cfc8dd8e707039e338c08acf421334a63a3f25a37e0b3f
 DIST jboss-logging-3.1.3.tar.gz 24989 SHA256 fba22b022984bdaca3c78213957594add4faf7502be157b8dbf2eadccbc23be1 SHA512 9a9b6621d554de2baa23b26c78074063e7c59e05703c2dc710c70167efb581691207b97e4371100802c06a97b149943e098c994d0fb53530a150bf0364b9e63f WHIRLPOOL 8331cfe9f17bb8e6064e9d2d6332b74bba596e953101ec0ce542ffdef8625c46df3363151a952238acbdcae0de1209e162a35a71911b6da4a3784c0980d0cb57
+EBUILD jboss-logging-3.1.3-r1.ebuild 1031 SHA256 fff9cd0105ec18012a3c8e2b45066b429156118b12248076b9626f8cad3f1532 SHA512 cff758ae781430c7c497263d40c82e599aca9cd90bffba3de2d5b4bcecbfc825942a706cf7939656f3553fdf662c6dffc0beda50f78618eb475b169bd123ca9b WHIRLPOOL 4c73829c84ed97c662c4e9c6fdcc916bd4341fa0e52f9988f98036b59016af23f95a62c1412d8ce911ff31ba08aa314af9d88070db583f3ae51025a8bd5e0d43
 EBUILD jboss-logging-3.1.3.ebuild 829 SHA256 c00948862ea5886aca9d097114f1f14b49793c41ef2260629f3c4fdb12346854 SHA512 a07c79cdcbab59c796df990d2fede10bfb9d3aa5d9176410db18f857a648edd97748f61a8ba6c25e2a35703708fc8eb7f3c3d603b07e967a48c8638acb510f21 WHIRLPOOL 67dfa971e011557c6cf1e689a4a416194b9b0a0897c9f377768506614efdd1e83f9718f9f1cfb23aa593f1efa62f04919640b72b692ee21e68817cfcfbb5da5a
-MISC ChangeLog 401 SHA256 add35646b153d860351fb7b68a74021ffa52c33738f03a83ab0c6c35db746e0d SHA512 9a00c221177229741a0c6bf4695b5991f321385c0363d994ec278a9dd67136c0912997853e414c25ae380367ed17320235bae8d72235bab9c1c792c908c59296 WHIRLPOOL c5939faed5292535b7d66915828689553c4d10f324b8115e95982d47accae49ff969a9dee3549009ce625126aa8f5ea68aee680f6bd25b08c798d169136d2619
+MISC ChangeLog 694 SHA256 41508c9ce71d7d4fdfd9743d2fb61d895a5905c872f8d774ea44b5a18c7d3cf0 SHA512 ef256eced59b807aba9d0c8da5ab259ae0eb70386a5ca813797f6dd99f75a45e774f929c1d5dafc60cf2faffd2be46d35b08bb58df8ddd321caa813436332f3a WHIRLPOOL 40e712ff07660015fd5bf18a1367748c1f2de025eaa16bdab5e99b79794a8291af0ee84df31281dbb58eac1523c538d9546a68d4d84022c7f0beff7c88ad1bc8
 MISC metadata.xml 251 SHA256 03f958cb6b42ab8f6cecf2e29d0ab8da3537ee8c6607f0514242b3d032accb5f SHA512 c25376564766dd930ee02421a3f27ccb113c2193d5912d8b4ba6e3e5eacee2f3e5ddb19490bcfe38f7dea4cde6823ef48b8933e3e5bd8cda67cef8eec2666763 WHIRLPOOL ce051936bb7cc6a1588e35471e50d0610b99ca04bf1a08663cd82c147501d4022962704176cbd1f8f9843174e5ae90c101cbeb7ddb6a0b3d2275c90f0313d1ed
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSRHE1AAoJEKCEBkJ3xQHthHAIAIqCpg5IRrrwgg7CfddSXxND
-GV/fEwoZztxjxqTfs08D0qwZzI6YbqQwtJK0bk1vf+uQkIleIjOpZAvxFaYsfrvR
-vB46fKtgOHa/w7vw7VFiqNKpRuo+Ts9W2d4Ckx84lmmZc1w/JlAk1q60RAXsUXLG
-1igp5QYh6oky0T0KaRoTgCztHXk+NiStXCybtusHCNE5Q4p32GLcRntG52Tn8f8N
-+xRvoe+lKYlvN2kGo/z3mZptA78nkGDEyV9XjCfLWAyLLoJv8zQ1Z0LfVU+Uk1Xd
-CLfSWHqf/7NcdjuLIY5FbduUiUzhECwFYRHABFlvd7wVc49/anIz7Gjq9cJzmRQ=
-=tzxL
+iQEcBAEBCAAGBQJTa5F3AAoJEJWyH81tNOV9hfAIAJ5aPbANCTADZkS40ozDZOmN
+4U/tF5gWbUwcBJHh+uPCiI3irA62pIPg11WF2cNPkEgMMjB3UQeXkIikRCuflL1t
+woHoIQuE3+poV1GSZrzXS+zder3Fm+NbLbv6wP3czcwCmsXp04Lowi6wo2y0Qmgu
+zgFb7RpSSYVbNmHEwC4TLcU3gSl3oc0WCrX0IY/DDT0v2+ze32esYPyZiD0heMe6
+ldpfH6dfHMTaayKWOHZ02pjiktkq48o/qnL2CjRPFcH0uzZS7iRq5us4rqLgVoNI
+auLZdeAClVuijNPZk810XrCd9E3Mk/B3B1wPHHp9C1flJ7nliB3dNrkSxRdCPec=
+=ITFM
 -----END PGP SIGNATURE-----
diff --git a/dev-java/jboss-logging/files/jboss-logging-3.1.3-r1-build.xml b/dev-java/jboss-logging/files/jboss-logging-3.1.3-r1-build.xml
new file mode 100644
index 000000000000..f024bcc74854
--- /dev/null
+++ b/dev-java/jboss-logging/files/jboss-logging-3.1.3-r1-build.xml
@@ -0,0 +1,224 @@
+<?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/8/14 3:59 PM                        -->
+<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
+<!--                                                                        -->
+<!-- ====================================================================== -->
+
+<project name="jboss-logging-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="jboss-logging-3.1.3.GA"/>
+  <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">
+    <pathelement location="${maven.repo.local}/org/jboss/logmanager/jboss-logmanager/1.2.0.GA/jboss-logmanager-1.2.0.GA.jar"/>
+    <pathelement location="${maven.repo.local}/log4j/log4j/1.2.16/log4j-1.2.16.jar"/>
+    <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1.jar"/>
+  </path>
+  <path id="build.test.classpath">
+    <pathelement location="${maven.repo.local}/org/jboss/logmanager/jboss-logmanager/1.2.0.GA/jboss-logmanager-1.2.0.GA.jar"/>
+    <pathelement location="${maven.repo.local}/log4j/log4j/1.2.16/log4j-1.2.16.jar"/>
+    <pathelement location="${maven.repo.local}/org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1.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="true" 
+           debug="true" 
+           optimize="false" 
+           deprecation="true" 
+           target="1.1" 
+           verbose="false" 
+           fork="false" 
+           source="1.3">
+      <src>
+        <pathelement location="${maven.build.srcDir.0}"/>
+      </src>
+      <classpath refid="build.classpath"/>
+    </javac>
+    <copy todir="${maven.build.outputDir}">
+      <fileset dir="${maven.build.resourceDir.0}"/>
+    </copy>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Test-compilation target                                                -->
+  <!-- ====================================================================== -->
+
+  <target name="compile-tests" 
+          depends="compile" 
+          description="Compile the test code" 
+          unless="maven.test.skip">
+    <mkdir dir="${maven.build.testOutputDir}"/>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Run all tests                                                          -->
+  <!-- ====================================================================== -->
+
+  <target name="test" 
+          depends="compile-tests, junit-missing" 
+          unless="junit.skipped" 
+          description="Run the test cases"/>
+
+  <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">
+      <doctitle>&lt;![CDATA[JBoss Logging 3.1.3.GA]]&gt;</doctitle>
+      <header>&lt;![CDATA[JBoss Logging 3.1.3.GA]]&gt;</header>
+      <footer>&lt;![CDATA[JBoss Logging 3.1.3.GA]]&gt;</footer>
+      <bottom>&lt;![CDATA[&lt;i&gt;Copyright &amp;#169; 2012 Red Hat, Inc.&lt;/i&gt;]]&gt;</bottom>
+      <link href="http://java.sun.com/javase/6/docs/api/"/>
+      <doclet name="net.gleamynode.apiviz.APIviz" 
+               path="${maven.repo.local}/org/jboss/apiviz/apiviz/1.2.5.GA/apiviz-1.2.5.GA.jar"/>
+    </javadoc>
+  </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="true" 
+         basedir="${maven.build.outputDir}" 
+         excludes="**/package.html">
+    </jar>
+  </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/jboss/logmanager/jboss-logmanager/1.2.0.GA"/>
+    <get src="http://repo.maven.apache.org/maven2/org/jboss/logmanager/jboss-logmanager/1.2.0.GA/jboss-logmanager-1.2.0.GA.jar" 
+         dest="${maven.repo.local}/org/jboss/logmanager/jboss-logmanager/1.2.0.GA/jboss-logmanager-1.2.0.GA.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <mkdir dir="${maven.repo.local}/log4j/log4j/1.2.16"/>
+    <get src="http://repo.maven.apache.org/maven2/log4j/log4j/1.2.16/log4j-1.2.16.jar" 
+         dest="${maven.repo.local}/log4j/log4j/1.2.16/log4j-1.2.16.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+    <mkdir dir="${maven.repo.local}/org/slf4j/slf4j-api/1.6.1"/>
+    <get src="http://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1.jar" 
+         dest="${maven.repo.local}/org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
+  </target>
+
+</project>
diff --git a/dev-java/jboss-logging/jboss-logging-3.1.3-r1.ebuild b/dev-java/jboss-logging/jboss-logging-3.1.3-r1.ebuild
new file mode 100644
index 000000000000..788e19204039
--- /dev/null
+++ b/dev-java/jboss-logging/jboss-logging-3.1.3-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jboss-logging/jboss-logging-3.1.3-r1.ebuild,v 1.1 2014/05/08 14:15:18 tomwij Exp $
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="JBoss logging framework"
+HOMEPAGE="http://www.jboss.org/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.GA.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEPEND="dev-java/jboss-logmanager:0
+	dev-java/slf4j-api:0
+	dev-java/log4j:0"
+
+RDEPEND=">=virtual/jre-1.5
+		${COMMON_DEPEND}"
+
+DEPEND=">=virtual/jdk-1.5
+		${COMMON_DEPEND}"
+
+S="${WORKDIR}/${P}.GA/"
+
+EANT_GENTOO_CLASSPATH="jboss-logmanager,slf4j-api,log4j"
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+java_prepare() {
+	cp "${FILESDIR}"/${PF}-build.xml build.xml || die
+}
+
+src_install() {
+	java-pkg_newjar target/${P}.GA.jar
+
+	use doc && java-pkg_dojavadoc target/site/apidocs
+	use source && java-pkg_dosrc src/main/java/org
+}
\ No newline at end of file