Version bump

5 files changed, 27 insertions, 23 deletions

diff --git a/app-office/hibiscus/hibiscus-2.6.8.ebuild b/app-office/hibiscus/hibiscus-2.6.9.ebuild
index e23f85b..e23f85b 100644
--- a/app-office/hibiscus/hibiscus-2.6.8.ebuild
+++ b/app-office/hibiscus/hibiscus-2.6.9.ebuild
diff --git a/dev-java/spiffy/Manifest b/dev-java/spiffy/Manifest
index 69d0648..c601dff 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 1256 SHA256 eef2e5b0980be4f8a56592db6a8b6eb6822ddad256c24e471228c24e102a2649 SHA512 284e4870ad1520a7b92b33e628ed3e489791fb8846d0acb75aaef9c08ea7bf319ca53ba0794c478f1625bd1920e3158d434fc9b5624411462bdda7dba4da9dcd WHIRLPOOL 09c711e59f88aeda95465801f0770239a4bde896e99bb046ca4fd106b0592f427ea379b7cd1aa504d7d6ef39a2176a155f1300088e228ff18b38694655ef5850
+EBUILD spiffy-0.05.ebuild 1274 SHA256 da0f6c5941b48c2c4d0160bbd64e281b04a06f57a7c8a244f5e14f0d962b65d0 SHA512 de8486a21fc483f32a915e33cb2585132e7b5601eb98f7112b8ada5f1583c8b200dd4b8535debe585461a52d1a07f0873a27b080d9b5a029b4a82c21ca6d773f WHIRLPOOL 85dd70c5bb1431d8529c53e71ae925b66383b56692c0dc1bb4f40d7d3e2bfb9fd44534544d9fe63fe2f17b05ea204d5705b34206da9e2f20589c84f7d1a0b665
 MISC metadata.xml 214 SHA256 c1f09dc7d5313cd2da7b82259c7846ed23144d62b15e59680ada90e2b6b4d154 SHA512 aeb2fb354a9ddf41c45a071091a58b91eaf8b25d6d2c49e3e3daa547b591a54530144de4533573160b48dc356289c909612c4e3c80e387f081f88cb39263e130 WHIRLPOOL 54d8861daedd18ca38e4ada0fb71026c612b63946d47a9b34de90d1d6d85c8ce05c0a4b97730f554ea637d73ccce8ed207d33e707c2b8c1dd28af24cf44dd186
diff --git a/dev-java/spiffy/spiffy-0.05.ebuild b/dev-java/spiffy/spiffy-0.05.ebuild
index 03fd9e3..cf5c351 100644
--- a/dev-java/spiffy/spiffy-0.05.ebuild
+++ b/dev-java/spiffy/spiffy-0.05.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="5"
 
-JAVA_PKG_IUSE="doc source"
+JAVA_PKG_IUSE="doc source test"
 
 inherit eutils java-pkg-2 java-pkg-simple
 
@@ -21,14 +21,16 @@ COMMON_DEPS="dev-java/log4j"
 
 DEPEND="${COMMON_DEPS}
 	app-arch/unzip
-	dev-java/junit:4
+	test? (
+		dev-java/junit:4
+	)
 	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"
+JAVA_GENTOO_CLASSPATH="log4j,struts-1.2,junit-4"
 
 src_unpack() {
 	unpack ${A}
diff --git a/dev-java/super-csv/Manifest b/dev-java/super-csv/Manifest
index de5614c..dc28b88 100644
--- a/dev-java/super-csv/Manifest
+++ b/dev-java/super-csv/Manifest
@@ -1,5 +1,5 @@
 DIST SuperCSV-1.52.zip 640962 SHA256 e11679f50225bd21e8ad752e8b88e0d4e0f16d6ac90c48a2da7cbc6f8145ebb8 SHA512 ffcd22e735d367ddaf41af43fae73a645ec3fd60baa4efb62a08b7dda33624c885fb140e7b5c73dfd0d49d9ea61d9d7f303ce8abfb549d6ab6c108a29fa9e175 WHIRLPOOL 7f3b65ec2726553f53dfb08b2aea8dbb4fe8685635f36b4347a80e460393b7effa0069164ade77f64998f31e82cb5bebc5c06861c683ab2b1f5e8a09ff790dc9
 DIST super-csv-2.0.1-sources.jar 104596 SHA256 e6314e4bce6adf7a1630f6828066a805e1559fec33c48fae3546df3bd2626659 SHA512 4068bc36cfeb5235624ba92b50997c3d735880e589bc4cb24014485ef2d5ae1e8d18095e12cfb85d58c0ee04f885e2671ce1eacbd99d7667394c5fd9cfad9779 WHIRLPOOL 9b22cda08afc87981d886df5dfd74b7dd86c2193d4429835308cf7dda0b58fb5f1272c2ee15a0817ffadeb6090c9b3d4fd5c93e0350c5cd462b27b8752889505
-EBUILD super-csv-1.52.ebuild 1101 SHA256 f94abacaaf65e74b2a1078cb00e5baf590c0c674af142a1af2aaa1f3229a11f5 SHA512 0e732ba07a207c24d78e5c0c278f951b2ece3dd57f0c46bca1d8359b5ecfc0215fe985a66c90396822564b612619ae5057285882f91947172adb57030f92e6ff WHIRLPOOL 8785ae902ef0cea44c19fa11cc073d0990ef5a5f242ee5ff2249e28e90500c0d1daae58632472ead7e9898e0c4492c87a6518ed58fdbbd6071ea807f64a5467f
+EBUILD super-csv-1.52.ebuild 1121 SHA256 f20386af70834becbbc78623d574eb9a722b7b79d832260096eb267d75ac61d0 SHA512 0bfd739524df3eed196e6e01cb150a4617a937c29c5da4e69e694ce73273c163a904a5e1f7d012a70a097632d4310c8c5e401f8857b6872ab7c804a4adc2a965 WHIRLPOOL 459526cdb642ba5ebc220d7ac88a1fa9bc553e7729bc57ab996cb9be99c277a77aea8d0449e9d72fa55cc4593cacae1f65fb85f4d498fd9ee4ce74d7f1873e6d
 EBUILD super-csv-2.0.1.ebuild 433 SHA256 a9d0ed396e01d51e94b52f780a960337ae50e2b5586f863578dc1920eacb7ab5 SHA512 f914acfa4497950c06cd3ac93ad7208b6252ee48dec134e84fcfa232bb0058e3a44304da5cbcf476fb04275753d6eb59278a097727395dc641ebfe9dffd60b71 WHIRLPOOL ea7421cb60459708cb32753aadb784481541811436d263b4f31d09ab96a61195f0aee891925410a02730a1919fe3d2f7ec0390824ee73f35fa1ad3aa76a608fc
 MISC metadata.xml 235 SHA256 c947f6510999c8ad24cab8fc9115f6d3c97a0d5ad45a07721e88ea08302d3a06 SHA512 3675a2546febb2782ac8089cb87bc0a67a12e8585bcab67a1daea7be5df5cbd3fac6eedc7af069001b31582b7920c7a75fb096f6456df74fef4e20c58a839f55 WHIRLPOOL f6496ac10ab36309fc873fb249eed67bc4afcdf5adf5feb03ca44654bfd269fda1f335131fcd96fbf0669f0d809d63a2e264d606c9e575e529b9bfcd811b098b
diff --git a/dev-java/super-csv/super-csv-1.52.ebuild b/dev-java/super-csv/super-csv-1.52.ebuild
index 67e5b25..3178aa2 100644
--- a/dev-java/super-csv/super-csv-1.52.ebuild
+++ b/dev-java/super-csv/super-csv-1.52.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="5"
 
-JAVA_PKG_IUSE="doc source"
+JAVA_PKG_IUSE="doc source test"
 
 MY_PN="SuperCSV"
 MY_P="${MY_PN}-${PV}"
@@ -20,17 +20,20 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-COMMON_DEPS="dev-java/spiffy"
+CDEPEND="dev-java/spiffy"
 
-DEPEND="${COMMON_DEPS}
+DEPEND="${CDEPEND}
 	app-arch/unzip
 	>=virtual/jdk-1.5
-	dev-java/junit:4"
-RDEPEND="${COMMON_DEPS}
+	test? (
+		dev-java/junit:4
+		dev-java/hamcrest-core
+	)"
+RDEPEND="${CDEPEND}
 	>=virtual/jre-1.5"
 
 JAVA_SRC_DIR="src"
-JAVA_GENTOO_CLASSPATH="spiffy,junit-4"
+JAVA_GENTOO_CLASSPATH="spiffy,junit-4,hamcrest-core"
 
 src_unpack() {
 	unpack ${A}
@@ -38,15 +41,14 @@ src_unpack() {
 	rm -v *.jar *.zip || die
 }
 
-# Not working
-#src_test() {
-#	JAVA_SRC_DIR="test" \
-#	JAVA_CLASSPATH_EXTRA="${PN}.jar" \
-#	PN="${PN}-test" \
-#	java-pkg-simple_src_compile
-#
-#	local tests
-#	tests=$(find test -name '*.java' | sed -e 's/\//./g;s/^test.//;s/.java$//' || die)
-#	
-#	ejunit4 -cp "${PN}.jar:${PN}-test.jar:$(java-pkg_getjars ${JAVA_GENTOO_CLASSPATH})" $tests
-#}
+src_test() {
+	JAVA_SRC_DIR="test" \
+	JAVA_CLASSPATH_EXTRA="${PN}.jar" \
+	PN="${PN}-test" \
+	java-pkg-simple_src_compile
+
+	local tests
+	tests=$(find test -name '*.java' | sed -e 's/\//./g;s/^test.//;s/.java$//' || die)
+	
+	ejunit4 -cp "${PN}.jar:${PN}-test.jar:$(java-pkg_getjars ${JAVA_GENTOO_CLASSPATH})" $tests
+}