Dep fixes

(Portage version: 2.0.51.22-r1)

5 files changed, 19 insertions, 67 deletions

diff --git a/dev-java/fop/ChangeLog b/dev-java/fop/ChangeLog
index f7dff5d085d9..ba76853a794c 100644
--- a/dev-java/fop/ChangeLog
+++ b/dev-java/fop/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/fop
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/fop/ChangeLog,v 1.17 2005/05/30 19:09:53 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/fop/ChangeLog,v 1.18 2005/07/12 20:14:15 axxo Exp $
+
+  12 Jul 2005; Thomas Matthijs <axxo@gentoo.org> -fop-0.20.5.ebuild,
+  fop-0.20.5-r1.ebuild, fop-0.20.5-r3.ebuild:
+  Dep fixes
 
   30 May 2005; Gustavo Zacarias <gustavoz@gentoo.org> fop-0.20.5-r1.ebuild:
   Stable on sparc
diff --git a/dev-java/fop/files/digest-fop-0.20.5 b/dev-java/fop/files/digest-fop-0.20.5
deleted file mode 100644
index 97307f640a5d..000000000000
--- a/dev-java/fop/files/digest-fop-0.20.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1a31eb1357e5d4b8d32d4cb3edae2da2 fop-0.20.5-src.tar.gz 7885256
diff --git a/dev-java/fop/fop-0.20.5-r1.ebuild b/dev-java/fop/fop-0.20.5-r1.ebuild
index e98fc6c8eee8..38375297c0cf 100644
--- a/dev-java/fop/fop-0.20.5-r1.ebuild
+++ b/dev-java/fop/fop-0.20.5-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/fop/fop-0.20.5-r1.ebuild,v 1.4 2005/05/30 19:09:53 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/fop/fop-0.20.5-r1.ebuild,v 1.5 2005/07/12 20:14:15 axxo Exp $
 
 inherit java-pkg
 
@@ -12,9 +12,11 @@ LICENSE="Apache-1.1"
 SLOT="0"
 KEYWORDS="x86 amd64 ~ppc sparc"
 IUSE="doc jai jimi"
-DEPEND=">=virtual/jdk-1.4
+RDEPEND=">=virtual/jre-1.4
 	jai? ( dev-java/sun-jai-bin )
-	jimi? ( dev-java/sun-jimi )
+	jimi? ( dev-java/sun-jimi )"
+DEPEND=">=virtual/jdk-1.4
+	${RDEPEND}
 	>=dev-java/ant-1.5.4
 	!dev-java/fop-bin"
 
@@ -35,16 +37,15 @@ src_compile() {
 	fi
 }
 
-src_install () {
+src_install() {
 	sed '2itest "$FOP_HOME" || FOP_HOME=/usr/share/fop/' fop.sh > fop
 	java-pkg_dojar build/*.jar
-	java-pkg_dojar lib/*.jar
 
 	exeinto /usr/bin
 	doexe fop
 
 	if use doc; then
-		dodoc CHANGES STATUS README LICENSE
+		dodoc CHANGES STATUS README
 		dohtml ReleaseNotes.html
 		dodir /usr/share/doc/${P}
 		cp -a examples ${D}/usr/share/doc/${P}
diff --git a/dev-java/fop/fop-0.20.5-r3.ebuild b/dev-java/fop/fop-0.20.5-r3.ebuild
index 7037820d082b..d38f392ae80b 100644
--- a/dev-java/fop/fop-0.20.5-r3.ebuild
+++ b/dev-java/fop/fop-0.20.5-r3.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/fop/fop-0.20.5-r3.ebuild,v 1.1 2005/04/09 14:12:13 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/fop/fop-0.20.5-r3.ebuild,v 1.2 2005/07/12 20:14:15 axxo Exp $
 
 inherit eutils java-pkg
 
@@ -12,9 +12,6 @@ LICENSE="Apache-1.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc examples jai jimi" # jikes support currently not possible :/
-DEPEND=">=virtual/jdk-1.4
-	>=dev-java/ant-1.5.4
-	!dev-java/fop-bin"
 RDEPEND=">=virtual/jre-1.4
 	jai? ( dev-java/sun-jai-bin )
 	jimi? ( dev-java/sun-jimi )
@@ -22,6 +19,10 @@ RDEPEND=">=virtual/jre-1.4
 	~dev-java/batik-1.5
 	dev-java/xalan
 	~dev-java/xerces-2.6.2"
+DEPEND=">=virtual/jdk-1.4
+	${RDEPEND}
+	>=dev-java/ant-1.5.4
+	!dev-java/fop-bin"
 
 S=${WORKDIR}/${P/_/}
 
@@ -48,13 +49,13 @@ src_compile() {
 	ant ${antflags} || die "compile failed"
 }
 
-src_install () {
+src_install() {
 	java-pkg_dojar build/fop.jar
 
 	newbin fop.sh fop
 
 	if use doc; then
-		dodoc CHANGES STATUS README LICENSE
+		dodoc CHANGES STATUS README
 		java-pkg_dohtml -r ReleaseNotes.html build/javadocs/*
 	fi
 
diff --git a/dev-java/fop/fop-0.20.5.ebuild b/dev-java/fop/fop-0.20.5.ebuild
deleted file mode 100644
index cf60642c6d7b..000000000000
--- a/dev-java/fop/fop-0.20.5.ebuild
+++ /dev/null
@@ -1,53 +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/fop/fop-0.20.5.ebuild,v 1.14 2005/01/01 18:24:49 eradicator Exp $
-
-inherit java-pkg
-
-MY_V=${PV/_/}
-DESCRIPTION="Formatting Objects Processor is a print formatter driven by XSL"
-SRC_URI="mirror://apache/xml/fop/fop-${MY_V}-src.tar.gz"
-HOMEPAGE="http://xml.apache.org/fop/"
-LICENSE="Apache-1.1"
-SLOT="0"
-KEYWORDS="x86 amd64 ~ppc ~sparc"
-IUSE="doc jai jimi"
-DEPEND=">=virtual/jdk-1.4
-	jai? ( dev-java/jai-bin )
-	jimi? ( dev-java/jimi )
-	>=dev-java/ant-1.5.4
-	!dev-java/fop-bin"
-
-S=${WORKDIR}/${P/_/}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}/lib
-	use jai && java-pkg_jar-from jai-bin
-	use jimi && java-pkg_jar-from jimi
-}
-
-src_compile() {
-	ant package || die "Failed building classes"
-
-	if use doc; then
-		ant javadocs || die "Failed building javadocs"
-	fi
-}
-
-src_install () {
-	sed '2itest "$FOP_HOME" || FOP_HOME=/usr/share/fop/' fop.sh > fop
-	java-pkg_dojar build/*.jar
-	java-pkg_dojar lib/*.jar
-
-	exeinto /usr/bin
-	doexe fop
-
-	if use doc; then
-		dodoc CHANGES STATUS README LICENSE
-		dohtml ReleaseNotes.html
-		dodir /usr/share/doc/${P}
-		cp -a examples ${D}/usr/share/doc/${P}
-		java-pkg_dohtml -r build/javadocs
-	fi
-}