Bumped to lastest packge version. Removed older version

(Portage version: 2.1.2.1)

5 files changed, 57 insertions, 41 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/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