dep/style fixes

(Portage version: 2.0.51.22-r1)

4 files changed, 8 insertions, 47 deletions

diff --git a/dev-java/edtftpj/edtftpj-1.4.2.ebuild b/dev-java/edtftpj/edtftpj-1.4.2.ebuild
deleted file mode 100644
index 112cde9946e6..000000000000
--- a/dev-java/edtftpj/edtftpj-1.4.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/edtftpj/edtftpj-1.4.2.ebuild,v 1.6 2005/01/20 18:07:37 luckyduck 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"
-KEYWORDS="~x86 ~sparc ~ppc ~amd64"
-IUSE="jikes doc"
-DEPEND=">=virtual/jdk-1.4
-	>=dev-java/ant-1.5
-	jikes? ( dev-java/jikes )"
-RDEPEND=">=virtual/jdk-1.4"
-SLOT="0"
-
-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
-
-	mv ${S}/build/${P}.jar ${S}/build/${PN}.jar
-	java-pkg_dojar build/${PN}.jar
-}
diff --git a/dev-java/edtftpj/edtftpj-1.4.4.ebuild b/dev-java/edtftpj/edtftpj-1.4.4.ebuild
index fa2813e0d2a9..962c97376172 100644
--- a/dev-java/edtftpj/edtftpj-1.4.4.ebuild
+++ b/dev-java/edtftpj/edtftpj-1.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/edtftpj/edtftpj-1.4.4.ebuild,v 1.5 2005/05/05 13:38:05 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/edtftpj/edtftpj-1.4.4.ebuild,v 1.6 2005/07/16 13:52:06 axxo Exp $
 
 inherit java-pkg
 
@@ -10,13 +10,13 @@ HOMEPAGE="http://www.enterprisedt.com"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="x86 ~sparc ppc amd64"
+KEYWORDS="amd64 ppc ~sparc x86"
 IUSE="jikes doc"
 
 DEPEND=">=virtual/jdk-1.4
 	dev-java/ant-core
 	jikes? ( dev-java/jikes )"
-RDEPEND=">=virtual/jdk-1.4"
+RDEPEND=">=virtual/jre-1.4"
 
 src_compile() {
 	cd ${S}/src
@@ -33,6 +33,5 @@ src_install() {
 	insinto /usr/share/doc/${PF}
 	doins doc/*.pdf
 
-	mv ${S}/build/${P}.jar ${S}/build/${PN}.jar
-	java-pkg_dojar build/${PN}.jar
+	java-pkg_newjar ${S}/build/${P}.jar ${PN}.jar
 }
diff --git a/dev-java/edtftpj/edtftpj-1.4.8.ebuild b/dev-java/edtftpj/edtftpj-1.4.8.ebuild
index ecb87d95469a..25e079c8f508 100644
--- a/dev-java/edtftpj/edtftpj-1.4.8.ebuild
+++ b/dev-java/edtftpj/edtftpj-1.4.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.1 2005/05/05 13:38:05 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/edtftpj/edtftpj-1.4.8.ebuild,v 1.2 2005/07/16 13:52:06 axxo Exp $
 
 inherit java-pkg
 
@@ -10,13 +10,13 @@ HOMEPAGE="http://www.enterprisedt.com"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~ppc ~amd64"
+KEYWORDS="~amd64 ~ppc ~sparc x86"
 IUSE="jikes doc"
 
 DEPEND=">=virtual/jdk-1.4
 	dev-java/ant-core
 	jikes? ( dev-java/jikes )"
-RDEPEND=">=virtual/jdk-1.4"
+RDEPEND=">=virtual/jre-1.4"
 
 src_compile() {
 	cd ${S}/src
@@ -33,6 +33,5 @@ src_install() {
 	insinto /usr/share/doc/${PF}
 	doins doc/*.pdf
 
-	mv ${S}/build/${P}.jar ${S}/build/${PN}.jar
-	java-pkg_dojar build/${PN}.jar
+	java-pkg_newjar ${S}/build/${P}.jar ${PN}.jar
 }
diff --git a/dev-java/edtftpj/files/digest-edtftpj-1.4.2 b/dev-java/edtftpj/files/digest-edtftpj-1.4.2
deleted file mode 100644
index 20363ed435ca..000000000000
--- a/dev-java/edtftpj/files/digest-edtftpj-1.4.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e3d77a9803bbf69d1fd90d2e8c6917c5 edtftpj-1.4.2.tar.gz 627903