Bumped to lastest packge version. Removed older version

Package-Manager: portage-2.1.2.1

6 files changed, 69 insertions, 53 deletions

diff --git a/dev-java/edtftpj/ChangeLog b/dev-java/edtftpj/ChangeLog
index ce4a55f7fab9..2249f0a0b23e 100644
--- a/dev-java/edtftpj/ChangeLog
+++ b/dev-java/edtftpj/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/edtftpj
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/edtftpj/ChangeLog,v 1.20 2007/03/02 18:06:52 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/edtftpj/ChangeLog,v 1.21 2007/03/08 21:54:16 wltjr Exp $
+
+*edtftpj-1.5.4 (08 Mar 2007)
+
+  08 Mar 2007; William L. Thomson Jr. <wltjr@gentoo.org>
+  -edtftpj-1.4.8.ebuild, +edtftpj-1.5.4.ebuild:
+  Bumped to lastest packge version. Removed older version
 
   02 Mar 2007; nixnut <nixnut@gentoo.org> edtftpj-1.5.3-r1.ebuild:
   Stable on ppc wrt bug 168286
diff --git a/dev-java/edtftpj/Manifest b/dev-java/edtftpj/Manifest
index cfed01bf07d2..5c7395720f37 100644
--- a/dev-java/edtftpj/Manifest
+++ b/dev-java/edtftpj/Manifest
@@ -1,9 +1,5 @@
-DIST edtftpj-1.4.8.tar.gz 683544 RMD160 e348bd017e37e2256d1e7a1e100b46e530f0ee9d SHA1 ff6b0a14254c007bf38c971cc76bd3dd316827c8 SHA256 bd990e11cfd8c9a2392a369eab6699e4a8a6a4257a2d1a6e86549a4bb15c09b3
 DIST edtftpj-1.5.3.zip 974094 RMD160 15d3e60a2f75f9284c19520a3bf8e38ed1c5a1a2 SHA1 856b501186287db190aa02dbad47aef73a38aa81 SHA256 c7d12fdb001448f5968743acc195672ec6c4833168a974437d3a08922ddef4d5
-EBUILD edtftpj-1.4.8.ebuild 964 RMD160 f975d13e2fdd535b103cc13e6eeb930bd96f9987 SHA1 8bfbc68c8b60277b2611eb97aea42bb97308efa7 SHA256 9c569464bfde141e89c2c538f2eac96a03412a60f348c54dae6acf23a5e4cac9
-MD5 b16d7bdeed079cd8ba358d6bf4928494 edtftpj-1.4.8.ebuild 964
-RMD160 f975d13e2fdd535b103cc13e6eeb930bd96f9987 edtftpj-1.4.8.ebuild 964
-SHA256 9c569464bfde141e89c2c538f2eac96a03412a60f348c54dae6acf23a5e4cac9 edtftpj-1.4.8.ebuild 964
+DIST edtftpj-1.5.4.zip 1057098 RMD160 4ac301fd3075b9ab451f1049f6758665668f2a05 SHA1 f2c6e9f074abbb94c1326bc3389802f6dd92116a SHA256 3f4efe5de1e9b3e7e159fd100d9cf02aa7f2fcbe59164a3d35c2814d7330dafd
 EBUILD edtftpj-1.5.3-r1.ebuild 1178 RMD160 b4b2e2f31b22381869a6b36978fb3f36af11675e SHA1 eefb0a449c074f669204f21f1a9bd5257ea15976 SHA256 0fd9ca132310dfcb76d7bf26b6e00b341f1741f2070c0dfd1d9661f5489b934f
 MD5 ce2b60b4f8affa8b1f0472e14ea711e6 edtftpj-1.5.3-r1.ebuild 1178
 RMD160 b4b2e2f31b22381869a6b36978fb3f36af11675e edtftpj-1.5.3-r1.ebuild 1178
@@ -12,20 +8,24 @@ EBUILD edtftpj-1.5.3.ebuild 1315 RMD160 a5fde011bac13744957afa3a7b9e28308e350d33
 MD5 ffc3bd084c8f79102b0cca783c3b657c edtftpj-1.5.3.ebuild 1315
 RMD160 a5fde011bac13744957afa3a7b9e28308e350d33 edtftpj-1.5.3.ebuild 1315
 SHA256 6b463c41df713e0fa3beacb8b36e6ef971a85b3ea5f701fdb4a47757eadb9bc8 edtftpj-1.5.3.ebuild 1315
-MISC ChangeLog 2764 RMD160 d3f64e311b438dc495e5ca8a60daf91f18f8b062 SHA1 f5b83eadd05576b6190fac087aad6797d138cd9f SHA256 1748d9f9cf29c49b8f54908e6e468ffae2e05dd6137fd1bb514abbd8ddb570a5
-MD5 c2be063d5b1adab03450b9681ac8f603 ChangeLog 2764
-RMD160 d3f64e311b438dc495e5ca8a60daf91f18f8b062 ChangeLog 2764
-SHA256 1748d9f9cf29c49b8f54908e6e468ffae2e05dd6137fd1bb514abbd8ddb570a5 ChangeLog 2764
+EBUILD edtftpj-1.5.4.ebuild 1146 RMD160 95a69cd48c83582b560e240e681697f5187494d1 SHA1 90626756c3e317ac8515a84bbc83afc54e7108af SHA256 9ca6b56fdb5a202c93f827ae66a91850aa5cc78e9590bd2f8467138fe61771ac
+MD5 ef608bdeb7f3fdc48b2a0dd89d634202 edtftpj-1.5.4.ebuild 1146
+RMD160 95a69cd48c83582b560e240e681697f5187494d1 edtftpj-1.5.4.ebuild 1146
+SHA256 9ca6b56fdb5a202c93f827ae66a91850aa5cc78e9590bd2f8467138fe61771ac edtftpj-1.5.4.ebuild 1146
+MISC ChangeLog 2957 RMD160 aa6c2bfae3bba71d202af08798ae3dd4627e47e7 SHA1 49042edb76bc49fabd9efa4c9e9de4b1fbe35529 SHA256 2f1ae36c9ac7ed81b5ffb940cf4151295732acc8e3196b500405637cfe4f3184
+MD5 2ca131ff2038e596c38ae9f0796f0279 ChangeLog 2957
+RMD160 aa6c2bfae3bba71d202af08798ae3dd4627e47e7 ChangeLog 2957
+SHA256 2f1ae36c9ac7ed81b5ffb940cf4151295732acc8e3196b500405637cfe4f3184 ChangeLog 2957
 MISC metadata.xml 842 RMD160 4cbcfdf079b635b1abfd1584a97608e006736c6a SHA1 2a7d1860bbce486fdc25d316d6b2b759830f8c1c SHA256 29d65ef23f98b1de91dd2b2e4ce913392fa19ef29fde6a47564785ae8a357c9f
 MD5 d4ee311b25f21a8ebb3be799521dcafc metadata.xml 842
 RMD160 4cbcfdf079b635b1abfd1584a97608e006736c6a metadata.xml 842
 SHA256 29d65ef23f98b1de91dd2b2e4ce913392fa19ef29fde6a47564785ae8a357c9f metadata.xml 842
-MD5 190ec16fe18fa05ba315c3da37d98e43 files/digest-edtftpj-1.4.8 241
-RMD160 ed45791295bf4c5a40e6dcbc0541c5e8b1531869 files/digest-edtftpj-1.4.8 241
-SHA256 06dabbf47bd0de600fd73659586e527e91e6fc27dac3034c7c534a4d609ae08e files/digest-edtftpj-1.4.8 241
 MD5 905b5a83af975a49f1b5ed688c06f9a4 files/digest-edtftpj-1.5.3 232
 RMD160 c58405680d03f3513b1d899ae3116160daf561d2 files/digest-edtftpj-1.5.3 232
 SHA256 4d8e168dfdee2200d23173302eeb532c6aa96ba34f12fae1a52c314a5f5eb97b files/digest-edtftpj-1.5.3 232
 MD5 905b5a83af975a49f1b5ed688c06f9a4 files/digest-edtftpj-1.5.3-r1 232
 RMD160 c58405680d03f3513b1d899ae3116160daf561d2 files/digest-edtftpj-1.5.3-r1 232
 SHA256 4d8e168dfdee2200d23173302eeb532c6aa96ba34f12fae1a52c314a5f5eb97b files/digest-edtftpj-1.5.3-r1 232
+MD5 d17789107f3ea2024ea19cc14b7c7571 files/digest-edtftpj-1.5.4 235
+RMD160 79f3b2a22635fd20e2a151074245a70842e0f25b files/digest-edtftpj-1.5.4 235
+SHA256 5d27260676c23774e92b0c97adaa574ab869eca65c328f4f602310e00e223423 files/digest-edtftpj-1.5.4 235
diff --git a/dev-java/edtftpj/edtftpj-1.4.8.ebuild b/dev-java/edtftpj/edtftpj-1.4.8.ebuild
deleted file mode 100644
index fd4f38f3444c..000000000000
--- a/dev-java/edtftpj/edtftpj-1.4.8.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/edtftpj/edtftpj-1.4.8.ebuild,v 1.4 2006/10/05 15:38:33 gustavoz Exp $
-
-inherit java-pkg
-
-DESCRIPTION="FTP client library written in Java"
-SRC_URI="http://www.enterprisedt.com/products/edtftpj/download/${P}.tar.gz"
-HOMEPAGE="http://www.enterprisedt.com"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ppc x86"
-IUSE="jikes doc"
-
-DEPEND=">=virtual/jdk-1.4
-	dev-java/ant-core
-	jikes? ( dev-java/jikes )"
-RDEPEND=">=virtual/jre-1.4"
-
-src_compile() {
-	cd ${S}/src
-	local antflags="jar"
-	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
-	use doc && antflags="${antflags} javadocs"
-	ant ${antflags} || die "compilation failed"
-}
-
-src_install() {
-	cd ${S}
-	use doc && java-pkg_dohtml -r build/doc/api
-	dodoc doc/*.TXT
-	insinto /usr/share/doc/${PF}
-	doins doc/*.pdf
-
-	java-pkg_newjar ${S}/build/${P}.jar ${PN}.jar
-}
diff --git a/dev-java/edtftpj/edtftpj-1.5.4.ebuild b/dev-java/edtftpj/edtftpj-1.5.4.ebuild
new file mode 100644
index 000000000000..156283d2f956
--- /dev/null
+++ b/dev-java/edtftpj/edtftpj-1.5.4.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/edtftpj/edtftpj-1.5.4.ebuild,v 1.1 2007/03/08 21:54:16 wltjr Exp $
+
+JAVA_PKG_IUSE="doc examples source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="FTP client library written in Java"
+SRC_URI="http://www.enterprisedt.com/products/edtftpj/download/${P}.zip"
+HOMEPAGE="http://www.enterprisedt.com"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND=">=virtual/jre-1.4
+	dev-java/junit"
+
+DEPEND=">=virtual/jdk-1.4
+	${RDEPEND}
+	source? ( app-arch/zip )"
+
+src_unpack() {
+	unpack "${A}"
+	find "${S}" -name "*.jar" | xargs rm -fr
+	rm "${S}/doc/LICENSE.TXT" || die "Failed to remove LICENSE.TXT"
+}
+
+src_compile() {
+	cd ${S}/src
+	eant jar -Dftp.classpath=$(java-pkg_getjars junit) $(use_doc javadocs)
+}
+
+src_install() {
+	java-pkg_dojar lib/*.jar
+
+	use doc && java-pkg_dohtml -r build/doc/api
+	use source && java-pkg_dosrc src/com
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins demo/*.{java,txt} || die "Failed to install examples."
+	fi
+
+	dodoc doc/*.TXT doc/*.pdf
+}
diff --git a/dev-java/edtftpj/files/digest-edtftpj-1.4.8 b/dev-java/edtftpj/files/digest-edtftpj-1.4.8
deleted file mode 100644
index 6140187bdc9e..000000000000
--- a/dev-java/edtftpj/files/digest-edtftpj-1.4.8
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 019cf7b931abc3c918e2899a12076e91 edtftpj-1.4.8.tar.gz 683544
-RMD160 e348bd017e37e2256d1e7a1e100b46e530f0ee9d edtftpj-1.4.8.tar.gz 683544
-SHA256 bd990e11cfd8c9a2392a369eab6699e4a8a6a4257a2d1a6e86549a4bb15c09b3 edtftpj-1.4.8.tar.gz 683544
diff --git a/dev-java/edtftpj/files/digest-edtftpj-1.5.4 b/dev-java/edtftpj/files/digest-edtftpj-1.5.4
new file mode 100644
index 000000000000..f669ca9aae95
--- /dev/null
+++ b/dev-java/edtftpj/files/digest-edtftpj-1.5.4
@@ -0,0 +1,3 @@
+MD5 7fbfd458b1a424aea673f4d2829aa3fe edtftpj-1.5.4.zip 1057098
+RMD160 4ac301fd3075b9ab451f1049f6758665668f2a05 edtftpj-1.5.4.zip 1057098
+SHA256 3f4efe5de1e9b3e7e159fd100d9cf02aa7f2fcbe59164a3d35c2814d7330dafd edtftpj-1.5.4.zip 1057098