dep/style fixes

(Portage version: 2.0.51.22-r1)

3 files changed, 5 insertions, 34 deletions

diff --git a/dev-java/telnetd/files/digest-telnetd-1.0 b/dev-java/telnetd/files/digest-telnetd-1.0
deleted file mode 100644
index e59eb1925bf2..000000000000
--- a/dev-java/telnetd/files/digest-telnetd-1.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1b10cac35b03f7a20350c3dfff8a6448 telnetd-1.0.zip 1786068
diff --git a/dev-java/telnetd/telnetd-1.0-r1.ebuild b/dev-java/telnetd/telnetd-1.0-r1.ebuild
index 7794502ef74d..4adfe6a6a034 100644
--- a/dev-java/telnetd/telnetd-1.0-r1.ebuild
+++ b/dev-java/telnetd/telnetd-1.0-r1.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/telnetd/telnetd-1.0-r1.ebuild,v 1.6 2005/05/19 21:51:04 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/telnetd/telnetd-1.0-r1.ebuild,v 1.7 2005/07/15 14:31:43 axxo Exp $
 
 inherit java-pkg
 
@@ -13,11 +13,12 @@ SLOT="0"
 KEYWORDS="x86 ppc amd64"
 IUSE="doc jikes"
 
+RDEPEND=">=virtual/jre-1.4
+		>=dev-java/xerces-2.6.2-r1"
 DEPEND=">=virtual/jdk-1.4
+		${RDEPEND}
 		app-arch/unzip
-		>=dev-java/xerces-2.6.2-r1
 		jikes? ( dev-java/jikes )"
-RDEPEND=">=virtual/jdk-1.4"
 
 src_unpack() {
 	unpack ${A}
@@ -27,7 +28,7 @@ src_unpack() {
 }
 
 src_compile() {
-	antflags="jar"
+	local antflags="jar"
 	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
 	use doc && antflags="${antflags} javadocs"
 	ant ${antflags} || die "compile problem"
diff --git a/dev-java/telnetd/telnetd-1.0.ebuild b/dev-java/telnetd/telnetd-1.0.ebuild
deleted file mode 100644
index 7cb198caeacf..000000000000
--- a/dev-java/telnetd/telnetd-1.0.ebuild
+++ /dev/null
@@ -1,29 +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/telnetd/telnetd-1.0.ebuild,v 1.7 2005/05/19 21:51:04 luckyduck Exp $
-
-inherit java-pkg
-
-DESCRIPTION="A telnet daemon for use in java applications"
-HOMEPAGE="http://telnetd.sourceforge.net/"
-SRC_URI="mirror://sourceforge/telnetd/${P}.zip"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
-IUSE="doc jikes"
-DEPEND=">=virtual/jdk-1.4
-		app-arch/unzip
-		jikes? ( dev-java/jikes )"
-RDEPEND=">=virtual/jdk-1.4"
-
-src_compile() {
-	antflags="jar"
-	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
-	use doc && antflags="${antflags} javadocs"
-	ant ${antflags} || die "compile problem"
-}
-
-src_install() {
-	java-pkg_dojar build/telnetd.jar
-	use doc && java-pkg_dohtml -r build/site/api/*
-}