Version bump. Sources now bundled with findbugs and uses its version

numbers. Latest findbugs is 3.0.1 but jFormatString itself hasn't
changed since 2.0.3.

(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 9C6D7DE4)

5 files changed, 42 insertions, 109 deletions

diff --git a/dev-java/jformatstring/ChangeLog b/dev-java/jformatstring/ChangeLog
index e1941c23266b..e6c7b94641a4 100644
--- a/dev-java/jformatstring/ChangeLog
+++ b/dev-java/jformatstring/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/jformatstring
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jformatstring/ChangeLog,v 1.3 2014/06/17 13:43:24 mrueg Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jformatstring/ChangeLog,v 1.4 2015/03/14 14:58:54 chewi Exp $
+
+*jformatstring-2.0.3 (14 Mar 2015)
+
+  14 Mar 2015; James Le Cuirot <chewi@gentoo.org> +jformatstring-2.0.3.ebuild,
+  -files/build.xml, -jformatstring-0.9-r1.ebuild, metadata.xml:
+  Version bump. Sources now bundled with findbugs and uses its version numbers.
+  Latest findbugs is 3.0.1 but jFormatString itself hasn't changed since 2.0.3.
 
   17 Jun 2014; Manuel Rüger <mrueg@gentoo.org> -jformatstring-0.9.ebuild:
   NM: Cleanup superseded ebuilds.
diff --git a/dev-java/jformatstring/files/build.xml b/dev-java/jformatstring/files/build.xml
deleted file mode 100644
index 68cb8b6b86a5..000000000000
--- a/dev-java/jformatstring/files/build.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- author: Ralph Sennhauser -->
-<project name="jformatstring" default="jar">
-
-  <property name="junit.jar" value="lib/junit.jar"/>
-
-  <target name="clean">
-    <delete dir="build"/>
-  </target>
-
-  <target name="compile">
-    <mkdir dir="build/classes"/>
-    <javac srcdir="src/java"
-        destdir="build/classes"
-        encoding="UTF-8"
-        includeantruntime="false">
-    </javac>
-  </target>
-
-  <target name="jar" depends="compile">
-    <jar destfile="build/${ant.project.name}.jar">
-      <fileset dir="build/classes"/>
-    </jar>
-  </target>
-
-  <target name="javadoc">
-    <mkdir dir="build/javadoc"/>
-    <javadoc destdir="build/javadoc"
-        encoding="UTF-8">
-      <fileset dir="src/java"/>
-    </javadoc>
-  </target>
-
-  <target name="compile-tests" depends="jar">
-    <mkdir dir="build/test-classes"/>
-    <javac srcdir="src/junit"
-        destdir="build/test-classes"
-        encoding="UTF-8"
-        includeantruntime="false">
-      <classpath>
-        <fileset file="build/${ant.project.name}.jar"/>
-        <fileset file="${junit.jar}"/>
-      </classpath>
-    </javac>
-  </target>
-
-  <target name="test" depends="compile-tests">
-    <mkdir dir="build/test-results"/>
-    <junit haltonfailure="true" printsummary="on">
-      <classpath>
-        <fileset file="build/${ant.project.name}.jar"/>
-        <pathelement location="build/test-classes"/>
-      </classpath>
-      <batchtest todir="build/test-results">
-        <fileset dir="build/test-classes"/>
-        <formatter type="xml"/>
-      </batchtest>
-    </junit>
-  </target>
-</project>
diff --git a/dev-java/jformatstring/jformatstring-0.9-r1.ebuild b/dev-java/jformatstring/jformatstring-0.9-r1.ebuild
deleted file mode 100644
index 3048f5dc7a58..000000000000
--- a/dev-java/jformatstring/jformatstring-0.9-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jformatstring/jformatstring-0.9-r1.ebuild,v 1.1 2012/06/17 15:20:15 sera Exp $
-
-EAPI=4
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Compile time checking for Java Format Strings"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-HOMEPAGE="https://jformatstring.dev.java.net/"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.5"
-DEPEND=">=virtual/jdk-1.5
-	app-arch/unzip
-	test? (
-		dev-java/ant-junit:0
-		dev-java/junit:4
-	)"
-
-java_prepare() {
-	# Upstreams is aargh!
-	cp "${FILESDIR}"/build.xml . || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_TEST_GENTOO_CLASSPATH="junit:4"
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	# Rename to match old name it was installed under
-	# should be fixed on slot bump
-	java-pkg_newjar build/${PN}.jar jFormatString.jar
-
-	use source && java-pkg_dosrc src/java/*
-	use doc && java-pkg_dojavadoc build/javadoc
-}
diff --git a/dev-java/jformatstring/jformatstring-2.0.3.ebuild b/dev-java/jformatstring/jformatstring-2.0.3.ebuild
new file mode 100644
index 000000000000..525cd2279ddd
--- /dev/null
+++ b/dev-java/jformatstring/jformatstring-2.0.3.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jformatstring/jformatstring-2.0.3.ebuild,v 1.1 2015/03/14 14:58:54 chewi Exp $
+
+EAPI=5
+
+FINDBUGS_PV="3.0.1"
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Compile time checking for Java format strings"
+SRC_URI="mirror://sourceforge/findbugs/findbugs-${FINDBUGS_PV}-source.zip"
+HOMEPAGE="http://code.google.com/p/j-format-string"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.5"
+DEPEND=">=virtual/jdk-1.5
+	app-arch/unzip"
+
+src_unpack() {
+	unzip -qoj "${DISTDIR}/findbugs-${FINDBUGS_PV}-source.zip" "findbugs-${FINDBUGS_PV}/lib/jFormatString.jar" || die
+	unpack ./jFormatString.jar
+}
+
+java_prepare() {
+	find -name "*.class" -delete || die
+}
diff --git a/dev-java/jformatstring/metadata.xml b/dev-java/jformatstring/metadata.xml
index 7303cef96964..2e1274aa1899 100644
--- a/dev-java/jformatstring/metadata.xml
+++ b/dev-java/jformatstring/metadata.xml
@@ -2,4 +2,5 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>java</herd>
+	<longdescription>This code is designed to allow for compile time checking of Java format strings. It can check that the format string is valid, that the proper number of arguments are supplied and that they are of the correct type.</longdescription>
 </pkgmetadata>