jaxen depends on jdom, jdom has optional jaxen support. thanks to HumpBack.

(Portage version: 2.0.51-r15)

3 files changed, 12 insertions, 30 deletions

diff --git a/dev-java/jaxen/ChangeLog b/dev-java/jaxen/ChangeLog
index 802291309867..025423febfab 100644
--- a/dev-java/jaxen/ChangeLog
+++ b/dev-java/jaxen/ChangeLog
@@ -1,6 +1,10 @@
 # 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.8 2005/02/03 17:16:14 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxen/ChangeLog,v 1.9 2005/02/03 22:58:52 luckyduck Exp $
+
+  03 Feb 2005; Jan Brinkmann <luckyduck@gentoo.org> jaxen-1.0.ebuild,
+  jaxen-1.1_beta2.ebuild:
+  jaxen depends on jdom, jdom has optional jaxen support. thanks to HumpBack.
 
   03 Feb 2005; Jan Brinkmann <luckyduck@gentoo.org> jaxen-1.0.ebuild,
   jaxen-1.1_beta2.ebuild:
diff --git a/dev-java/jaxen/jaxen-1.0.ebuild b/dev-java/jaxen/jaxen-1.0.ebuild
index 042807349f2a..d4a86637f955 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.5 2005/02/03 17:16:14 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxen/jaxen-1.0.ebuild,v 1.6 2005/02/03 22:58:52 luckyduck Exp $
 
 inherit java-pkg eutils
 
@@ -17,6 +17,7 @@ DEPEND=">=virtual/jdk-1.3
 	dev-java/xalan
 	>=dev-java/xerces-2.6.2-r1
 	=dev-java/dom4j-1*
+	~dev-java/jdom-1.0_beta9
 	dev-java/saxpath"
 RDEPEND=">=virtual/jre-1.3"
 
@@ -37,10 +38,7 @@ src_unpack() {
 	java-pkg_jar-from xerces-2
 	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
+	java-pkg_jar-from jdom-1.0_beta9
 }
 
 src_compile() {
@@ -56,12 +54,3 @@ 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 440e5e8b9a1d..d8dac27b31a3 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.5 2005/02/03 17:16:14 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxen/jaxen-1.1_beta2.ebuild,v 1.6 2005/02/03 22:58:52 luckyduck Exp $
 
 inherit java-pkg eutils
 
@@ -20,7 +20,8 @@ DEPEND=">=virtual/jdk-1.3
 
 RDEPEND=">=virtual/jre-1.3
 	>=dev-java/xerces-2.6.2-r1
-	=dev-java/dom4j-1*"
+	=dev-java/dom4j-1*
+	~dev-java/jdom-1.0_beta9"
 
 S=${WORKDIR}/${PN}-1.1-beta-2
 
@@ -35,10 +36,7 @@ src_unpack() {
 	rm -f *.jar
 	java-pkg_jar-from xerces-2
 	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
+	java-pkg_jar-from jdom-1.0_beta9
 
 	cd ${S}
 	sed -i 's/depends="compile,test"/depends="compile"/' build.xml
@@ -57,12 +55,3 @@ 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 ""
-}