updated to reflect the new jdom slots. removed static jdom dependency to avoid circular dependencies

Package-Manager: portage-2.0.51-r15

3 files changed, 41 insertions, 11 deletions

diff --git a/dev-java/jaxen/ChangeLog b/dev-java/jaxen/ChangeLog
index d519756460d0..802291309867 100644
--- a/dev-java/jaxen/ChangeLog
+++ b/dev-java/jaxen/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/jaxen
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxen/ChangeLog,v 1.7 2005/01/09 08:07:40 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxen/ChangeLog,v 1.8 2005/02/03 17:16:14 luckyduck Exp $
+
+  03 Feb 2005; Jan Brinkmann <luckyduck@gentoo.org> jaxen-1.0.ebuild,
+  jaxen-1.1_beta2.ebuild:
+  updated to reflect the new jdom slots. removed static jdom dependency to avoid
+  circular dependencies.
 
   09 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> jaxen-1.1_beta2.ebuild:
   removed junit tests to fix #76924. the code for unit testing is a mess, tried
diff --git a/dev-java/jaxen/jaxen-1.0.ebuild b/dev-java/jaxen/jaxen-1.0.ebuild
index ecf43e06afa8..042807349f2a 100644
--- a/dev-java/jaxen/jaxen-1.0.ebuild
+++ b/dev-java/jaxen/jaxen-1.0.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/jaxen/jaxen-1.0.ebuild,v 1.4 2005/01/09 08:07:40 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxen/jaxen-1.0.ebuild,v 1.5 2005/02/03 17:16:14 luckyduck Exp $
 
 inherit java-pkg eutils
 
@@ -11,14 +11,14 @@ LICENSE="jaxen"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~sparc ~amd64"
 IUSE="doc junit"
-DEPEND="dev-java/ant
+DEPEND=">=virtual/jdk-1.3
+	dev-java/ant
 	junit? ( dev-java/junit )
 	dev-java/xalan
 	>=dev-java/xerces-2.6.2-r1
 	=dev-java/dom4j-1*
-	dev-java/jdom
 	dev-java/saxpath"
-#RDEPEND=""
+RDEPEND=">=virtual/jre-1.3"
 
 S=${WORKDIR}/${P}-FCS
 
@@ -35,9 +35,12 @@ src_unpack() {
 	java-pkg_jar-from saxpath
 	java-pkg_jar-from xalan
 	java-pkg_jar-from xerces-2
-	java-pkg_jar-from jdom
 	java-pkg_jar-from dom4j-1
 	use junit && java-pkg_jar-from junit
+
+	if has_version jdom; then
+		java-pkg_jar-from `best_version dev-java/jdom | sed -e s/"dev-java\/"// | sed -e s/-r.//`
+	fi
 }
 
 src_compile() {
@@ -52,3 +55,13 @@ src_install() {
 
 	use doc && java-pkg_dohtml -r build/doc/*
 }
+
+pkg_postinst() {
+	einfo ""
+	einfo "If you want jdom support for jaxen then "
+	einfo "please emerge dev-java/jdom first and"
+	einfo "re-emerge dev-java/jaxen.  Sorry for the"
+	einfo "inconvenience, this is to break out of the"
+	einfo "circular dependencies."
+	einfo ""
+}
diff --git a/dev-java/jaxen/jaxen-1.1_beta2.ebuild b/dev-java/jaxen/jaxen-1.1_beta2.ebuild
index 13e6598ce360..440e5e8b9a1d 100644
--- a/dev-java/jaxen/jaxen-1.1_beta2.ebuild
+++ b/dev-java/jaxen/jaxen-1.1_beta2.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/jaxen/jaxen-1.1_beta2.ebuild,v 1.4 2005/01/09 08:07:40 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxen/jaxen-1.1_beta2.ebuild,v 1.5 2005/02/03 17:16:14 luckyduck Exp $
 
 inherit java-pkg eutils
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://jaxen.org/"
 SRC_URI="http://www.ibiblio.org/maven/jaxen/distributions/${PN}-1.1-beta-2-src.tar.gz"
 LICENSE="jaxen"
 SLOT="1.1"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64"
+KEYWORDS="x86 ~ppc ~sparc ~amd64"
 IUSE="doc jikes"
 
 DEPEND=">=virtual/jdk-1.3
@@ -20,8 +20,7 @@ DEPEND=">=virtual/jdk-1.3
 
 RDEPEND=">=virtual/jre-1.3
 	>=dev-java/xerces-2.6.2-r1
-	=dev-java/dom4j-1*
-	=dev-java/jdom-1.0_beta9"
+	=dev-java/dom4j-1*"
 
 S=${WORKDIR}/${PN}-1.1-beta-2
 
@@ -35,9 +34,12 @@ src_unpack() {
 	cd target/lib
 	rm -f *.jar
 	java-pkg_jar-from xerces-2
-	java-pkg_jar-from jdom
 	java-pkg_jar-from dom4j-1
 
+	if has_version jdom; then
+		java-pkg_jar-from `best_version dev-java/jdom | sed -e s/"dev-java\/"// | sed -e s/-r.//`
+	fi
+
 	cd ${S}
 	sed -i 's/depends="compile,test"/depends="compile"/' build.xml
 }
@@ -54,3 +56,13 @@ src_install() {
 
 	use doc && java-pkg_dohtml -r dist/docs/*
 }
+
+pkg_postinst() {
+	einfo ""
+	einfo "If you want jdom support for jaxen then "
+	einfo "please emerge dev-java/jdom first and"
+	einfo "re-emerge dev-java/jaxen.  Sorry for the"
+	einfo "inconvenience, this is to break out of the"
+	einfo "circular dependencies."
+	einfo ""
+}