fix deps, remove old

Package-Manager: portage-2.0.51.22-r1

5 files changed, 23 insertions, 84 deletions

diff --git a/dev-java/xalan/ChangeLog b/dev-java/xalan/ChangeLog
index fd2033cd47e5..c02f9d645f34 100644
--- a/dev-java/xalan/ChangeLog
+++ b/dev-java/xalan/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/xalan
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xalan/ChangeLog,v 1.38 2005/04/26 01:44:27 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xalan/ChangeLog,v 1.39 2005/07/09 16:08:47 axxo Exp $
+
+  09 Jul 2005; Thomas Matthijs <axxo@gentoo.org> -xalan-2.5.2.ebuild,
+  xalan-2.6.0-r2.ebuild:
+  fix deps, remove old
 
   26 Apr 2005; Gustavo Zacarias <gustavoz@gentoo.org> xalan-2.6.0-r2.ebuild:
   Stable on sparc
diff --git a/dev-java/xalan/Manifest b/dev-java/xalan/Manifest
index 4dafcad4dccd..f58a14a27168 100644
--- a/dev-java/xalan/Manifest
+++ b/dev-java/xalan/Manifest
@@ -1,6 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 798c765a082924fd75da2b49d50ed4a7 xalan-2.6.0.ebuild 2262
 MD5 2174e1e03ca1a277de2497793432c483 xalan-2.6.0-r2.ebuild 1505
 MD5 c7a865c8fb3b71f600df4343d3b9fcbe ChangeLog 6475
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 4e5176945458e93da34c78fbce55c507 files/digest-xalan-2.6.0-r2 140
 MD5 ca9dbddcc7a22d6ed904c86ac9409317 files/digest-xalan-2.6.0 70
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCz/aq/rLF9B432nYRArMFAJ0YnEAiCRrZRTunUkHwYZGaJnH/OACgvnJn
+GtMHuMyMNeQT5iAkaQd6tmY=
+=jAUe
+-----END PGP SIGNATURE-----
diff --git a/dev-java/xalan/files/digest-xalan-2.5.2 b/dev-java/xalan/files/digest-xalan-2.5.2
deleted file mode 100644
index 817a4e345460..000000000000
--- a/dev-java/xalan/files/digest-xalan-2.5.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 97dcc0514df7f791e28b5c744a55068c xalan-j_2_5_2-src.tar.gz 5738033
diff --git a/dev-java/xalan/xalan-2.5.2.ebuild b/dev-java/xalan/xalan-2.5.2.ebuild
deleted file mode 100644
index ca675029cabe..000000000000
--- a/dev-java/xalan/xalan-2.5.2.ebuild
+++ /dev/null
@@ -1,73 +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/xalan/xalan-2.5.2.ebuild,v 1.9 2005/01/26 21:50:17 corsair Exp $
-
-inherit java-pkg eutils
-
-IUSE="doc"
-
-MY_P=${PN}-j_${PV//./_}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="XSLT processor"
-HOMEPAGE="http://xml.apache.org/xalan-j/index.html"
-SRC_URI="mirror://apache/xml/xalan-j/source/${MY_P}-src.tar.gz"
-LICENSE="Apache-1.1"
-SLOT="0"
-KEYWORDS="x86 sparc ppc amd64"
-DEPEND=">=virtual/jdk-1.3
-	>=dev-java/ant-core-1.5.2
-	>=dev-java/xerces-2.6.0"
-RDEPEND=">=virtual/jdk-1.3
-	>=dev-java/xerces-2.6.0"
-
-
-can_build_doc() {
-	if [ `java-config --java-version 2>&1 | grep "1\.4\."  | wc -l` -lt 1 ]  ; then
-		return 0
-	else
-		return 1
-	fi
-}
-
-src_compile() {
-	CLASSPATH=$CLASSPATH:`pwd`/bin/xercesImpl.jar:`pwd`/bin/bsf.jar:`pwd`/src\
-	ant jar ${myc} || die "build failed"
-
-	if use doc ; then
-		if can_build_doc ; then
-			ant javadocs || die "Build Javadocs Failed"
-		else
-			einfo "                                                          "
-			einfo " 1.4.x JDKs are unable to compile Javadocs at this time.  "
-			einfo "                                                          "
-		fi
-	fi
-}
-
-src_install () {
-	java-pkg_dojar build/*.jar
-	dohtml readme.html
-
-	if use doc ; then
-		dodir /usr/share/doc/${P}
-		dodoc TODO STATUS README LICENSE ISSUES
-		java-pkg_dohtml -r build/docs/*
-	fi
-}
-
-pkg_postinst() {
-	if use doc && can_build_doc ; then
-		einfo "                                                          "
-		einfo " API Documentation is in /usr/share/doc/${PN}-${PV}.      "
-		einfo "                                                          "
-		einfo " Design documentation can be found online at:             "
-		einfo "     http://xml.apache.org/xalan-j/design/design2_0_0.html"
-		einfo "                                                          "
-	else
-		einfo "                                                          "
-		einfo " Online Documentation:                                    "
-		einfo "     http://xml.apache.org/xalan-j/design/design2_0_0.html"
-		einfo "     http://xml.apache.org/xalan-j/apidocs/index.html     "
-		einfo "                                                          "
-	fi
-}
diff --git a/dev-java/xalan/xalan-2.6.0-r2.ebuild b/dev-java/xalan/xalan-2.6.0-r2.ebuild
index 8e027f00aa58..e70d6fec3ea8 100644
--- a/dev-java/xalan/xalan-2.6.0-r2.ebuild
+++ b/dev-java/xalan/xalan-2.6.0-r2.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xalan/xalan-2.6.0-r2.ebuild,v 1.6 2005/04/26 01:44:27 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xalan/xalan-2.6.0-r2.ebuild,v 1.7 2005/07/09 16:08:47 axxo Exp $
 
 inherit java-pkg eutils
 
-
 MY_P=${PN}-j_${PV//./_}
 DESCRIPTION="XSLT processor"
 HOMEPAGE="http://xml.apache.org/xalan-j/index.html"
@@ -12,18 +11,19 @@ SRC_URI="mirror://apache/xml/xalan-j/source/${MY_P}-src.tar.gz
 		doc? ( mirror://gentoo/${P}-docs.tar.bz2 )"
 LICENSE="Apache-1.1"
 SLOT="0"
-KEYWORDS="x86 sparc ppc64 amd64"
+KEYWORDS="x86 ~ppc sparc ppc64 amd64"
 IUSE="doc jikes source"
-DEPEND=">=virtual/jdk-1.3
-	>=dev-java/ant-core-1.5.2
-	jikes? ( dev-java/jikes )
-	source? ( app-arch/zip )"
-RDEPEND=">=virtual/jdk-1.3
+RDEPEND="=virtual/jdk-1.4*
 	dev-java/javacup
 	dev-java/bcel
 	>=dev-java/jakarta-regexp-1.3-r2
 	=dev-java/bsf-2.3*
 	>=dev-java/xerces-2.6.2-r1"
+DEPEND="=virtual/jdk-1.4*
+	>=dev-java/ant-core-1.5.2
+	jikes? ( dev-java/jikes )
+	source? ( app-arch/zip )
+	${RDEPEND}"
 
 S=${WORKDIR}/${MY_P}
 
@@ -39,7 +39,6 @@ src_unpack() {
 	java-pkg_jar-from bsf-2.3
 	#java-pkg_jar-from jtidy
 	#java-pkg_jar-from jlex jlex.jar JLex.jar
-	cd ${S}
 }
 
 src_compile() {