Fixed overzealous rdepends

5 files changed, 12 insertions, 48 deletions

diff --git a/dev-java/struts-legacy/ChangeLog b/dev-java/struts-legacy/ChangeLog
index fe662ca947be..7701b6552b20 100644
--- a/dev-java/struts-legacy/ChangeLog
+++ b/dev-java/struts-legacy/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/struts-legacy
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/struts-legacy/ChangeLog,v 1.5 2004/07/13 17:33:59 sejo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/struts-legacy/ChangeLog,v 1.6 2004/10/03 13:48:55 karltk Exp $
+
+  03 Oct 2004; Karl Trygve Kalleberg <karltk@gentoo.org> struts-legacy-1.0-r1.ebuild:
+  jdbc2-stdext is present in 1.4, and is only needed for 1.3 vms. Removed old 
+  revision.
 
   13 Jul 2004; <SeJo@gentoo.org> struts-legacy-1.0-r1.ebuild,
   struts-legacy-1.0.ebuild:
diff --git a/dev-java/struts-legacy/Manifest b/dev-java/struts-legacy/Manifest
index b876867fe619..abf5e705e564 100644
--- a/dev-java/struts-legacy/Manifest
+++ b/dev-java/struts-legacy/Manifest
@@ -1,6 +1,4 @@
-MD5 bee336f552b9e0089b46ae06eed033ac ChangeLog 856
+MD5 68c07db2b1157db3ebe162e8bdeecddb struts-legacy-1.0-r1.ebuild 1244
+MD5 94659228b4d1cb9f737c3b80038e15f4 ChangeLog 1036
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 b6fbb5ea24bf30b72b7b1a881c046a41 struts-legacy-1.0.ebuild 1207
-MD5 e524e744ef0a2fe62178a898c6b7d86c struts-legacy-1.0-r1.ebuild 1210
-MD5 2459923e54f157c4320980a9c75c49e1 files/digest-struts-legacy-1.0 72
 MD5 2459923e54f157c4320980a9c75c49e1 files/digest-struts-legacy-1.0-r1 72
diff --git a/dev-java/struts-legacy/files/digest-struts-legacy-1.0 b/dev-java/struts-legacy/files/digest-struts-legacy-1.0
deleted file mode 100644
index 6007ab165d0d..000000000000
--- a/dev-java/struts-legacy/files/digest-struts-legacy-1.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 805b7f3e787c1469f57fed9f5eebc3a1 struts-legacy-1.0-src.tar.gz 12767
diff --git a/dev-java/struts-legacy/struts-legacy-1.0-r1.ebuild b/dev-java/struts-legacy/struts-legacy-1.0-r1.ebuild
index 80ed4b2a70bb..d95ea1caa038 100644
--- a/dev-java/struts-legacy/struts-legacy-1.0-r1.ebuild
+++ b/dev-java/struts-legacy/struts-legacy-1.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/struts-legacy/struts-legacy-1.0-r1.ebuild,v 1.3 2004/07/13 17:33:59 sejo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/struts-legacy/struts-legacy-1.0-r1.ebuild,v 1.4 2004/10/03 13:48:55 karltk Exp $
 
 inherit java-pkg
 
@@ -11,8 +11,10 @@ IUSE="doc jikes"
 DEPEND=">=virtual/jdk-1.4
 	dev-java/ant
 	jikes? ( dev-java/jikes )"
-RDEPEND=">=virtual/jdk-1.4
-	>=dev-java/jdbc2-stdext-2.0
+RDEPEND="|| (
+		>=virtual/jdk-1.4
+		( >=virtual/jdk-1.3 >=dev-java/jdbc2-stdext-2.0)
+	)
 	dev-java/commons-logging"
 LICENSE="Apache-1.1"
 SLOT="0"
diff --git a/dev-java/struts-legacy/struts-legacy-1.0.ebuild b/dev-java/struts-legacy/struts-legacy-1.0.ebuild
deleted file mode 100644
index 33a299a59a57..000000000000
--- a/dev-java/struts-legacy/struts-legacy-1.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/struts-legacy/struts-legacy-1.0.ebuild,v 1.5 2004/07/13 17:33:59 sejo Exp $
-
-inherit java-pkg
-
-DESCRIPTION="Jakarta Struts Legacy Library"
-SRC_URI="mirror://apache/jakarta/struts/struts-legacy/${P}-src.tar.gz"
-HOMEPAGE="http://jakarta.apache.org/struts/"
-IUSE="doc jikes"
-DEPEND=">=virtual/jdk-1.4
-	dev-java/ant
-	>=dev-java/jdbc2-stdext-2.0
-	dev-java/commons-logging
-	jikes? ( dev-java/jikes )"
-RDEPEND=">=virtual/jdk-1.4"
-LICENSE="Apache-1.1"
-SLOT="0"
-KEYWORDS="~x86 ~ppc"
-
-S=${WORKDIR}/${P}-src
-
-src_compile() {
-	sed -i 's:compile,docs:compile:' build.xml || die "sed failed"
-	echo "commons-logging.jar=`java-config -p commons-logging | sed 's/.*://'`" > build.properties
-	echo "jdbc20ext.jar=`java-config -p jdbc2-stdext`" >> build.properties
-	echo "jdk.version=1.4" >> build.properties
-
-	local antflags="dist"
-	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
-	use doc && antflags="${antflags} docs"
-	ant ${antflags} || die "compile problem"
-}
-
-src_install () {
-	java-pkg_dojar dist/*.jar
-	dodoc STATUS.txt
-	use doc && dohtml -r dist/docs/
-}