Major cleanup and add compiling live ebuilds

4 files changed, 13 insertions, 97 deletions

diff --git a/dev-java/willuhn-util/Manifest b/dev-java/willuhn-util/Manifest
index 0472ed6..f48f8d0 100644
--- a/dev-java/willuhn-util/Manifest
+++ b/dev-java/willuhn-util/Manifest
@@ -1,6 +1 @@
-DIST willuhn-util-2.2.zip 94106 SHA256 adc07636d8a40b41ab04196dff86fd86693dcc703a3e3309e26a16c134d46ee4 SHA512 63ff32c797049339238716b2139e2b1a9064a878628d1feceef8f1630b00d7b135df7b6fea5efaa67e56a75232d2cc00477bd4a0540e15443987c3f5541f417a WHIRLPOOL c4ca822f51240914d61a584c81299f81fee8024b355a46e1c13000bc216d3e5b83990aefcb20200e5865e01690130347899a13f612e5657fc048f57dea7131e5
-DIST willuhn-util-2.4.zip 94251 SHA256 12b9c128c9b9a9512cdc0df42ee538fd7852700e2dafe9c61fd3cbba917a5c00 SHA512 d7ae4b1b0067182ae51d314a551ea7202fcc42b6f7d249ba06d457a6f7129e2f36fb5bbd1f68f7fe60e9ebf69ef5c63fc83dd5829e94b81c352c958641b0ebbc WHIRLPOOL ad0d96e518a3e294789bcc2a752c4913e4d0c0cac37107d2ffab6aa16c4acc6ac888f13fc75510c759d85106ef48b4bb89f306f2654e3ccaf1e89312112caca0
-DIST willuhn-util-2.6.zip 94443 SHA256 f865300c533641a4bea5563594a7f9e16b550e95b4f7046aaf5da51d42379601 SHA512 8ad2d8601ed727bd67f09f32cb2fab6e45c150f13d55d0621c7a275091f70a65311767ec25a94425855dbdc66454c7dad5f51f7a3b0f2e918590847ba14f5ed2 WHIRLPOOL 4d1ea0bd1e30a72b2011a4c3f4b960c5c02844fa0a4c99fd2cdf024afd52bc3a590af3dd38487670beac94660b94afb31f25f4224d2764dce3700ed9755dcb2b
-EBUILD willuhn-util-2.2.ebuild 828 SHA256 3808b3e2cdab708257ba29198668e7da788c67990990c9ecfb76bf74ecf1bbb9 SHA512 676dfa1924cdc3b002567d1ed9ed9a3943a3ef4a649f140f7fc5a43840146a717e7d83bf7521bfec629f94dafc6a8b72836db6032514e03baf76a068ba64c8bb WHIRLPOOL 179277cfc406cac40727d522ce25567f11e963832bfcdfc166202d3a5bda1b967395254618d52cd2c1733175ae69c5b0f3b1cc29594610bae5712f592f9a3e88
-EBUILD willuhn-util-2.4.ebuild 828 SHA256 3808b3e2cdab708257ba29198668e7da788c67990990c9ecfb76bf74ecf1bbb9 SHA512 676dfa1924cdc3b002567d1ed9ed9a3943a3ef4a649f140f7fc5a43840146a717e7d83bf7521bfec629f94dafc6a8b72836db6032514e03baf76a068ba64c8bb WHIRLPOOL 179277cfc406cac40727d522ce25567f11e963832bfcdfc166202d3a5bda1b967395254618d52cd2c1733175ae69c5b0f3b1cc29594610bae5712f592f9a3e88
-EBUILD willuhn-util-2.6.ebuild 828 SHA256 3808b3e2cdab708257ba29198668e7da788c67990990c9ecfb76bf74ecf1bbb9 SHA512 676dfa1924cdc3b002567d1ed9ed9a3943a3ef4a649f140f7fc5a43840146a717e7d83bf7521bfec629f94dafc6a8b72836db6032514e03baf76a068ba64c8bb WHIRLPOOL 179277cfc406cac40727d522ce25567f11e963832bfcdfc166202d3a5bda1b967395254618d52cd2c1733175ae69c5b0f3b1cc29594610bae5712f592f9a3e88
+EBUILD willuhn-util-9999.ebuild 973 SHA256 c4a79471ba4527a9f69e74512c44a8b5cb2975bc2a89d61c0cbb337186d802a4 SHA512 3e637bdc13bcddb731fbf50bb36ef8903c208e062b6a3f751556d637aceef86af8ca068da1faffe44d474e862c30e72baa4a17a348b012b08647e5e1385c9e41 WHIRLPOOL 01cb04a51845e462a0274b6d36559f574cb7e1edb762da2458c0e2fc351a7eda498dee83d49545fa55d3f8f1dc5b585c289c799a0a84d8a00f45db65d9599832
diff --git a/dev-java/willuhn-util/willuhn-util-2.4.ebuild b/dev-java/willuhn-util/willuhn-util-2.4.ebuild
deleted file mode 100644
index f0bd12a..0000000
--- a/dev-java/willuhn-util/willuhn-util-2.4.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-EAPI="2"
-JAVA_PKG_IUSE="doc source"
-
-WANT_ANT_TASKS="ant-nodeps"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="A collection of small java helpers"
-HOMEPAGE="http://www.willuhn.de/products/jameica/"
-SRC_URI="http://www.willuhn.de/products/jameica/releases/${PV}/util/de_willuhn_util.src.zip -> ${P}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-COMMON_DEP=""
-
-RDEPEND=">=virtual/jre-1.5
-        ${COMMON_DEP}"
-
-DEPEND=">=virtual/jdk-1.5
-	app-arch/unzip
-        ${COMMON_DEP}"
-
-S=${WORKDIR}
-
-java_prepare() {
-
-	eant -f build/build.xml clean
-}
-
-src_compile() {
-
-	eant -f build/build.xml jar $(use_doc javadoc) || die "compile problem" 
-}
-
-src_install() {
-        java-pkg_dojar releases/${PV}-0/de_willuhn_util.jar
-
-        use doc && java-pkg_dojavadoc dist/api
-        use source && java-pkg_dosrc src/de
-}
diff --git a/dev-java/willuhn-util/willuhn-util-2.6.ebuild b/dev-java/willuhn-util/willuhn-util-2.6.ebuild
deleted file mode 100644
index f0bd12a..0000000
--- a/dev-java/willuhn-util/willuhn-util-2.6.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-EAPI="2"
-JAVA_PKG_IUSE="doc source"
-
-WANT_ANT_TASKS="ant-nodeps"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="A collection of small java helpers"
-HOMEPAGE="http://www.willuhn.de/products/jameica/"
-SRC_URI="http://www.willuhn.de/products/jameica/releases/${PV}/util/de_willuhn_util.src.zip -> ${P}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-COMMON_DEP=""
-
-RDEPEND=">=virtual/jre-1.5
-        ${COMMON_DEP}"
-
-DEPEND=">=virtual/jdk-1.5
-	app-arch/unzip
-        ${COMMON_DEP}"
-
-S=${WORKDIR}
-
-java_prepare() {
-
-	eant -f build/build.xml clean
-}
-
-src_compile() {
-
-	eant -f build/build.xml jar $(use_doc javadoc) || die "compile problem" 
-}
-
-src_install() {
-        java-pkg_dojar releases/${PV}-0/de_willuhn_util.jar
-
-        use doc && java-pkg_dojavadoc dist/api
-        use source && java-pkg_dosrc src/de
-}
diff --git a/dev-java/willuhn-util/willuhn-util-2.2.ebuild b/dev-java/willuhn-util/willuhn-util-9999.ebuild
index f0bd12a..d2d30db 100644
--- a/dev-java/willuhn-util/willuhn-util-2.2.ebuild
+++ b/dev-java/willuhn-util/willuhn-util-9999.ebuild
@@ -1,12 +1,19 @@
-EAPI="2"
+EAPI="5"
 JAVA_PKG_IUSE="doc source"
 
 WANT_ANT_TASKS="ant-nodeps"
 inherit eutils java-pkg-2 java-ant-2
 
+if [[ ${PV} != 9999 ]]; then
+        SRC_URI="http://www.willuhn.de/products/jameica/releases/${PV}/util/de_willuhn_util.src.zip -> ${P}.zip"
+        KEYWORDS="~amd64 ~x86"
+else
+        inherit git-r3
+        EGIT_REPO_URI="https://github.com/willuhn/util.git"
+fi
+
 DESCRIPTION="A collection of small java helpers"
 HOMEPAGE="http://www.willuhn.de/products/jameica/"
-SRC_URI="http://www.willuhn.de/products/jameica/releases/${PV}/util/de_willuhn_util.src.zip -> ${P}.zip"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -19,11 +26,9 @@ RDEPEND=">=virtual/jre-1.5
         ${COMMON_DEP}"
 
 DEPEND=">=virtual/jdk-1.5
-	app-arch/unzip
+	      app-arch/unzip
         ${COMMON_DEP}"
 
-S=${WORKDIR}
-
 java_prepare() {
 
 	eant -f build/build.xml clean
@@ -31,11 +36,11 @@ java_prepare() {
 
 src_compile() {
 
-	eant -f build/build.xml jar $(use_doc javadoc) || die "compile problem" 
+	eant -f build/build.xml jar $(use_doc javadoc) || die "compile problem"
 }
 
 src_install() {
-        java-pkg_dojar releases/${PV}-0/de_willuhn_util.jar
+        java-pkg_dojar releases/*/de_willuhn_util.jar
 
         use doc && java-pkg_dojavadoc dist/api
         use source && java-pkg_dosrc src/de