From ec15c6ba83063c4769675e0454ed2d2786058d0c Mon Sep 17 00:00:00 2001
From: Fabian Köster <koesterreich@fastmail.fm>
Date: Wed, 27 Mar 2013 15:23:18 +0100
Subject: Improve spiffy ebuild after review from Gentoo devs

---
 dev-java/spiffy/Manifest           |  3 ++-
 dev-java/spiffy/metadata.xml       |  8 ++++++
 dev-java/spiffy/spiffy-0.05.ebuild | 54 +++++++++++++-------------------------
 metadata.xml                       |  8 ------
 4 files changed, 28 insertions(+), 45 deletions(-)
 create mode 100644 dev-java/spiffy/metadata.xml
 delete mode 100644 metadata.xml

diff --git a/dev-java/spiffy/Manifest b/dev-java/spiffy/Manifest
index 0db51a8..b6b1d12 100644
--- a/dev-java/spiffy/Manifest
+++ b/dev-java/spiffy/Manifest
@@ -1,2 +1,3 @@
 DIST spiffy-all-0.05.zip 141335 SHA256 773b9c2e1b5fe8904d64ba2984903dd022039826b5e682d103c16a10911a227f SHA512 33d824193bff271e1079d1bf9445d28c69b88acddcd4504f3b0868ae569659f20a3a117c6b9574ff08a26d72fa170b96e5f30e3732db98c36e544f81b8ce747d WHIRLPOOL 55ad653642f0d7b3ece17ce2bd8554ba26343e5aca43137e92ca96bde01de66e67989a777f4a54c10fb62cbd0ce3bf7c3003aaf36e1975671454a3514ada0862
-EBUILD spiffy-0.05.ebuild 1196 SHA256 678a60caa31440fca94609b00fbdc910305be9abd85b4e1d59bd65ead3623fab SHA512 5d71d102965ac2727a06b5e96cf2825155fa9cef9a056ea5e33264a123e5726192869604dddf21b658aff0037aaf945826acaf8f49f24bc9c09f61a7431dae58 WHIRLPOOL dafa3e583434e5060a9c74a4917238bd129bd7c3909da64a11659d7a22898792981ea43cc72fb66c10f7ab38860654aa4eb85f32a91edcbb60e36e122604fab6
+EBUILD spiffy-0.05.ebuild 938 SHA256 7413d12027a6bdbec10a5a5f30515b000e26396a6c610f7c49a1de71d3155951 SHA512 ae56fc7746d48b1a4babf7dc4e99b87fc07a91f2933dc978654376f15cea70e7da990c0c814647593d7358daad578a5dd802edf4303a80fc15cbfd9fc5e872f9 WHIRLPOOL 69f75f4d62497c69e7e9a20dc1aeded9548673d51e4550ad3d6c3d25d33541f97aec6c84d49da5f73b5595edd0bccc211528b21c9113507f8bba0e2871b55ead
+MISC metadata.xml 240 SHA256 7cc305e7e941711fe1eb453d7b6eb7de410cb13e54cb2b8a6de8bc396d19a9d9 SHA512 bf3b773b4a6ef9578c5661b73acc0ae6f979ed82dd082b058a8159e220442156eb6478eac9fbf1199792aaff2345d28ad5070ec0dfab8693c2e0897f53302f71 WHIRLPOOL 157a46bf4bde6ed81a546e3958cc57f2081c19f57c322fe03615c2d23e31cf566f577ac8b54dc305663ce12d5dec504991d005b1d3212967f3f470f9cda527a5
diff --git a/dev-java/spiffy/metadata.xml b/dev-java/spiffy/metadata.xml
new file mode 100644
index 0000000..52a2a6b
--- /dev/null
+++ b/dev-java/spiffy/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>koesterreich@fastmail.fm</email>
+		<name>Fabian Köster</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-java/spiffy/spiffy-0.05.ebuild b/dev-java/spiffy/spiffy-0.05.ebuild
index 8a53476..4d8313a 100644
--- a/dev-java/spiffy/spiffy-0.05.ebuild
+++ b/dev-java/spiffy/spiffy-0.05.ebuild
@@ -1,15 +1,12 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="2"
+EAPI="5"
 
 JAVA_PKG_IUSE="doc source"
 
-MY_PN="SuperCSV"
-MY_P="${MY_PN}-${PV}"
-
-inherit java-pkg-2 eutils
+inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="A collection of often used helper methods and utility classes used in industry"
 HOMEPAGE="http://spiffyframework.sourceforge.net/"
@@ -17,42 +14,27 @@ SRC_URI="mirror://sourceforge/spiffyframework/spiffyframework/v0.xx/${PN}-all-${
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-
 COMMON_DEPS="dev-java/log4j"
 
 DEPEND="${COMMON_DEPS}
 	app-arch/unzip
-	dev-java/junit:0
+	dev-java/junit:4
 	dev-java/struts
-        >=virtual/jdk-1.5"
+	>=virtual/jdk-1.5"
 RDEPEND="${COMMON_DEPS}
-        >=virtual/jre-1.5"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	unzip -o ${PN}-all-${PV}-source.zip 
-        rm -v *.jar *.zip || die
-}
-
-src_compile() {
-	local classpath="$(java-pkg_getjars junit,log4j,struts-1.2)"
-
-	mkdir build
-	find src -name '*.java' > sources.list
-        ejavac -d build -cp "${classpath}" @sources.list
-        jar cf ${PN}.jar -C build/ .
-
-	# TODO javadoc
-}
-
-src_install() {
-        java-pkg_newjar ${PN}.jar
-
-        #use doc && java-pkg_dohtml -r docs/*
-        use source && java-pkg_dosrc src/org
+	>=virtual/jre-1.5"
+
+JAVA_GENTOO_CLASSPATH="junit-4,log4j,struts-1.2"
+
+src_unpack() {
+	unpack ${A}
+	rm -v ${PN}-all-${PV}.jar || die
+	rm -v ${PN}-with_source-all-${PV}.jar || die
+	rm -v ${PN}-all-${PV}-javadoc.zip || die
+	cd "${S}"
+	unzip ${PN}-all-${PV}-source.zip
+	rm ${PN}-all-${PV}-source.zip
 }
-
diff --git a/metadata.xml b/metadata.xml
deleted file mode 100644
index 52a2a6b..0000000
--- a/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer>
-		<email>koesterreich@fastmail.fm</email>
-		<name>Fabian Köster</name>
-	</maintainer>
-</pkgmetadata>
-- 
cgit v1.2.3-65-gdbad