From a2a5f2b8d69d2b9b73f12de88eb1972641a97046 Mon Sep 17 00:00:00 2001 From: Fabian Köster Date: Wed, 27 Mar 2013 15:24:13 +0100 Subject: Improve spiffy ebuild after review from Gentoo devs --- dev-java/spiffy/Manifest | 4 ++-- dev-java/spiffy/metadata.xml | 3 +-- dev-java/spiffy/spiffy-0.05.ebuild | 30 ++++++++++++++++++++++-------- 3 files changed, 25 insertions(+), 12 deletions(-) diff --git a/dev-java/spiffy/Manifest b/dev-java/spiffy/Manifest index b6b1d12..4939168 100644 --- a/dev-java/spiffy/Manifest +++ b/dev-java/spiffy/Manifest @@ -1,3 +1,3 @@ DIST spiffy-all-0.05.zip 141335 SHA256 773b9c2e1b5fe8904d64ba2984903dd022039826b5e682d103c16a10911a227f SHA512 33d824193bff271e1079d1bf9445d28c69b88acddcd4504f3b0868ae569659f20a3a117c6b9574ff08a26d72fa170b96e5f30e3732db98c36e544f81b8ce747d WHIRLPOOL 55ad653642f0d7b3ece17ce2bd8554ba26343e5aca43137e92ca96bde01de66e67989a777f4a54c10fb62cbd0ce3bf7c3003aaf36e1975671454a3514ada0862 -EBUILD spiffy-0.05.ebuild 938 SHA256 7413d12027a6bdbec10a5a5f30515b000e26396a6c610f7c49a1de71d3155951 SHA512 ae56fc7746d48b1a4babf7dc4e99b87fc07a91f2933dc978654376f15cea70e7da990c0c814647593d7358daad578a5dd802edf4303a80fc15cbfd9fc5e872f9 WHIRLPOOL 69f75f4d62497c69e7e9a20dc1aeded9548673d51e4550ad3d6c3d25d33541f97aec6c84d49da5f73b5595edd0bccc211528b21c9113507f8bba0e2871b55ead -MISC metadata.xml 240 SHA256 7cc305e7e941711fe1eb453d7b6eb7de410cb13e54cb2b8a6de8bc396d19a9d9 SHA512 bf3b773b4a6ef9578c5661b73acc0ae6f979ed82dd082b058a8159e220442156eb6478eac9fbf1199792aaff2345d28ad5070ec0dfab8693c2e0897f53302f71 WHIRLPOOL 157a46bf4bde6ed81a546e3958cc57f2081c19f57c322fe03615c2d23e31cf566f577ac8b54dc305663ce12d5dec504991d005b1d3212967f3f470f9cda527a5 +EBUILD spiffy-0.05.ebuild 1416 SHA256 5cc73569bb4fa4ae9e3b846da68dbafc169a60b81bff9421ca7341363a4069c3 SHA512 fb96deadebfb407790423dfc8e35f042fe7969ca69afa150c41184b21b5dbf85154623512a9b5e7aab7d244aeb1d388a2ebe8a3d89c6060a5102dc83cc1728b6 WHIRLPOOL 71660c437fff73ca9e1b068daac78b1af91f3eeba36dc40ccc064f9220936bd9b985e7586404ffd84bcb88f040405b21596770bced55976d229e04005e4650e8 +MISC metadata.xml 214 SHA256 c1f09dc7d5313cd2da7b82259c7846ed23144d62b15e59680ada90e2b6b4d154 SHA512 aeb2fb354a9ddf41c45a071091a58b91eaf8b25d6d2c49e3e3daa547b591a54530144de4533573160b48dc356289c909612c4e3c80e387f081f88cb39263e130 WHIRLPOOL 54d8861daedd18ca38e4ada0fb71026c612b63946d47a9b34de90d1d6d85c8ce05c0a4b97730f554ea637d73ccce8ed207d33e707c2b8c1dd28af24cf44dd186 diff --git a/dev-java/spiffy/metadata.xml b/dev-java/spiffy/metadata.xml index 52a2a6b..cc3fe24 100644 --- a/dev-java/spiffy/metadata.xml +++ b/dev-java/spiffy/metadata.xml @@ -2,7 +2,6 @@ - koesterreich@fastmail.fm - Fabian Köster + maintainer-wanted@gentoo.org diff --git a/dev-java/spiffy/spiffy-0.05.ebuild b/dev-java/spiffy/spiffy-0.05.ebuild index 4d8313a..90fc9e1 100644 --- a/dev-java/spiffy/spiffy-0.05.ebuild +++ b/dev-java/spiffy/spiffy-0.05.ebuild @@ -6,7 +6,7 @@ EAPI="5" JAVA_PKG_IUSE="doc source" -inherit java-pkg-2 java-pkg-simple +inherit eutils 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/" @@ -22,19 +22,33 @@ COMMON_DEPS="dev-java/log4j" DEPEND="${COMMON_DEPS} app-arch/unzip dev-java/junit:4 - dev-java/struts + dev-java/struts:1.2 >=virtual/jdk-1.5" RDEPEND="${COMMON_DEPS} >=virtual/jre-1.5" +JAVA_SRC_DIR="src" 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 + rm -v ${PN}-all-${PV}.jar ${PN}-with_source-all-${PV}.jar ${PN}-all-${PV}-javadoc.zip || die + unpack ./${PN}-all-${PV}-source.zip + rm -v ${PN}-all-${PV}-source.zip || die +} + +src_test() { + JAVA_SRC_DIR="test" \ + JAVA_CLASSPATH_EXTRA="${PN}.jar" \ + PN="${PN}-test" \ + java-pkg-simple_src_compile + + ejunit4 -cp "${PN}.jar:${PN}-test.jar:$(java-pkg_getjars ${JAVA_GENTOO_CLASSPATH})" \ + spiffy.core.lang.StringHelperTest \ + spiffy.core.util.CollectionHelperTest \ + spiffy.core.util.HashMapBuilderTest \ + spiffy.core.util.PushBackIteratorTest \ + spiffy.core.util.ThreeDHashMapTest \ + spiffy.core.util.TwoDHashMapTest \ + spiffy.junit.AssertHelperTest } -- cgit v1.2.3-65-gdbad