Get rid of src_unpack() and wrap the prep logic in java_prepare(). Update and fix test dependencies.

Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x93491BB8

3 files changed, 62 insertions, 19 deletions

diff --git a/dev-java/blowfishj/ChangeLog b/dev-java/blowfishj/ChangeLog
index df180f55dbe6..cdad59e21198 100644
--- a/dev-java/blowfishj/ChangeLog
+++ b/dev-java/blowfishj/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/blowfishj
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/blowfishj/ChangeLog,v 1.19 2015/06/09 13:30:27 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blowfishj/ChangeLog,v 1.20 2015/08/01 22:33:00 monsieurp Exp $
+
+*blowfishj-2.14-r3 (01 Aug 2015)
+
+  01 Aug 2015; Patrice Clement <monsieurp@gentoo.org> +blowfishj-2.14-r3.ebuild:
+  Get rid of src_unpack() and wrap the prep logic in java_prepare(). Update and
+  fix test dependencies.
 
   09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Updating remote-id in metadata.xml
diff --git a/dev-java/blowfishj/Manifest b/dev-java/blowfishj/Manifest
index da8dfc1029ba..87c87fb4471b 100644
--- a/dev-java/blowfishj/Manifest
+++ b/dev-java/blowfishj/Manifest
@@ -1,27 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 DIST blowfishj-2.14-src.tar.gz 33726 SHA256 d49ff16dbf320f8988886507c0065312b4660d4dfdbffb894db7ff7d6f5bfaa9 SHA512 3f508be61b494eddf6f276e21c7979d1f6a46dac19e8256f7451f3a434cd1d7df34c268aa2c13b7370129c84f289f331f47456c400ac31a9f0996fefeae12aec WHIRLPOOL 04cc5516fab856f45269bbbd7b0cce31331f9e6586023f14442228aa7f9bd5b39c731dd73c34460eaf60d995312cf7b118fb38c10d7ae2f7c4a27574fabd1260
 EBUILD blowfishj-2.14-r1.ebuild 1000 SHA256 f3949fe06f64f932a290c1f2b3a20d6e5f0b7b7842d41301ad009090b803e098 SHA512 35775abe0cc6b69564fe72e0c1ce94cdb9a8f667436ee76215c58d2d54a40dd17fbf294c7ca19b936bfe25a71798afaade56b46fb18c1a419ce9ecb482b4bcfc WHIRLPOOL 119f41bbe26fdb19282eb895c45b4229c3179a84633ff67d747347efd1dd69b55cd9f6bf8b2398acda2a6bea5842bbf9555ad0c65f67b58d7f67e614bf7496b7
 EBUILD blowfishj-2.14-r2.ebuild 1015 SHA256 f683b5f05f989a443a3f1c57a8dda7807ef9f97d25a293dbe28451c39206684b SHA512 07f22b9ecf8a45aea3503b8ed23e3ee9c6cc56d0056965ffbbf3bd62083a4d34313504e27a0dc78217d5c1cf7aec080f6911786393da312552d73fbd7ba13e00 WHIRLPOOL a2187382765fefdf6f7b20505adfbc2aa02e3b5a54e1d05d396cc3bf02cf8b574501fb8d62ab23022ace5ec08061a761dd576f4328fdc353ed58ca031cfcefa7
-MISC ChangeLog 2519 SHA256 fcc1f178ea009ec68cd5b1c274cb74decf5974b230b45024a70281fd232c293b SHA512 b5fc8bff037620e498940eaab887b040801a9a88b889488653e2e9544a2c11068c00b9e96f1856197554073676f75dcef9e0389dbb7bd7ea626f527a9a02a116 WHIRLPOOL 74fe0e9a39f0bbaaaa4a096e840a35602ac1805b064e1952dd5cd26da1390792a9428bf3f35cc79d151b3d71332971265c687ced58b2810dcd7f70c52d6abda7
+EBUILD blowfishj-2.14-r3.ebuild 995 SHA256 d6097293f952d14c690491729ffc94b639ae00711e57ad4a4e013ab7c0d3e80c SHA512 5e8dce97bb895637ae3317f2c69daa558882cf23f08780cdca808559326fd1b909793ee0ff0c8f1bc999ea403f55852a34465b26eb8eeca7e75f5488b036e8ec WHIRLPOOL de37654a6e5a9f3bdc333d0efde8d906e2f7578abc68bb11b1c3ba9f0d2c5e854971bc884f50f445e6c76fb428ac247d68a5bc384d62fe91323a5e41a3211f62
+MISC ChangeLog 2745 SHA256 b60413345ceb42442af22db5efb6f52f86359dd7d8957619ba072136fb8eebe8 SHA512 13e0e6940805050ba5cefcc4683fbe5afad71db1314b526837585dc8303159b73ad8769233e33c9ecd75dfd8b857a030ca39415b776f80e162a8c2e7588fc4bf WHIRLPOOL 5a4fd74f03ab28dc9609e71f854a1e481925a0f74dbb187f4abfcdcb548088e1883742e2b0901d63abeab1ebbb4a043ff633958ec8a898ef70ec7ae9d3d9fa8f
 MISC metadata.xml 607 SHA256 b8de52d412c73cf6cf51caf084565995fed968109a04bae96a95eaed50446898 SHA512 f48cd3204bb2bd84cdaef3d09c804c930e109b4e9a75f964298ba3191c84d4fe89415b86605c9f717bd9949db9fa62205caaa388f8707635ab69ebd211936710 WHIRLPOOL 8c854c0421afab85112e924df5b6b14d5796b206ef976f4246bbbdac4559e32791d10e5dd556ac1dce31e9c36e6321063dd02dc171af086b3148532f2b4beaa2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCgBmBQJVdup0XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiClcP/jBPa1sSBdhimS/G7mRh0wtg
-IhZGMreqeP4aCMjVZYvUVlxn+p1y4NXPCHXUD4KnTWN3f6IN68gGsxuVd+U58D4u
-qAOzn5lbQ22xsdI+5oGSR+rGCS3dst+typ6hkW2WtOOpmOA6gmT0cedFN9gbEwTZ
-WRZ78Tf706t+PwHvuEvMxFHDckbQ7iCDNMndrTuePUzhZBtC1CjmznJJOqIDrRrn
-VZx61GYrY7AIvrWqYb5pTkI4LXCyzVSkGgXchp5TxzIeWW2ZrrEljza3PR13jj1I
-yMaXwDCX8ieEKu5sYkwTeWjPzN2NamQtwC5kgA+goODEJ0eyYv2z1/pAMLYJcbsX
-0BTeq2jQWqLK198wuzjmDWJEmQf+LfYkd0/ttzdjRIApN98rpl5dNyE92LpxIp2L
-rgmDadKLOCVl5CqUzmzAGkoTJ/jWixKh7PpOi5urfP1no1YloWdu5rWEC1+jPYhq
-S+Y4wwaKDjDgNPh6vbVLu4+U87nu94KJoiV9VY1guCSjWoVMH5D8RDak9go4xfTB
-iqomKBmLoaQKl61lx1uwYXO48zI19KhK29IdqjMS7FNAnsc6JJwmXsS1Z6QkjyT4
-+Qb+mS+NRWWB6/jcuY+6xsJ5QscdcM5zSjZh0C1Im3fojOUHHPMtgh2kmM32A79s
-+hS1hSvLw4eesFXCRJ6i
-=4m5y
+iQEcBAEBCAAGBQJVvVdVAAoJEJGRpfGTSRu4i24IALZ0NXaPJYONjrAatKuXFjj8
+iyuxy1thcr6N5almoM17DAG9OEZM5wP4r3lYvLFZ3PpmTCCbdYL+l0+F7ibJM36h
+sXGZQD6x3FKVwr7+ewa65WgeRlS1CvwxtRivXosZZzWs9iYQrkv9+zSdJ6FIrsmA
+3mBW+2bKWe/DkcBKUf+SIQLI14gRx4qcNGm8Z0S1zko/j9f0pXp0QhlPpuN/sdHx
+yZakAet2NNYvXNulRuduj28Imky1r78p6H6bPbgCMa9dfPXzfi59w5A/PO2i484n
+Dv5XRI5uDEbJ3CBo8UZdS9xcWOlOgxuyUxY2CPaUczuaP0yuILmcjXo577aWLik=
+=ygvX
 -----END PGP SIGNATURE-----
diff --git a/dev-java/blowfishj/blowfishj-2.14-r3.ebuild b/dev-java/blowfishj/blowfishj-2.14-r3.ebuild
new file mode 100644
index 000000000000..514e5c6b7155
--- /dev/null
+++ b/dev-java/blowfishj/blowfishj-2.14-r3.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blowfishj/blowfishj-2.14-r3.ebuild,v 1.1 2015/08/01 22:33:00 monsieurp Exp $
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Blowfish implementation in Java"
+SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
+HOMEPAGE="http://blowfishj.sourceforge.net/index.html"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.6
+	test? (
+		dev-java/ant-junit:0
+	)"
+
+RDEPEND=">=virtual/jre-1.6"
+
+java_prepare() {
+	cd "${S}" || die
+	java-ant_ignore-system-classes
+	mkdir -p target/lib || die
+	cd target/lib || die
+	use test && java-pkg_jar-from --build-only junit
+}
+
+src_test() {
+	ANT_TASKS="ant-junit" eant test -DJunit.present=true
+}
+
+src_install() {
+	java-pkg_newjar target/${P}.jar
+
+	use doc && java-pkg_dojavadoc dist/docs/api
+	use source && java-pkg_dosrc src/java/net
+}