From b7e1082518d60cbb5a0ace3bb8ffda5eaa0223aa Mon Sep 17 00:00:00 2001
From: Jan Brinkmann <luckyduck@gentoo.org>
Date: Thu, 3 Feb 2005 23:01:35 +0000
Subject: jaxen depends on jdom, jdom has optional jaxen support. thanks to
 HumpBack. Package-Manager: portage-2.0.51-r15

---
 dev-java/jaxen/ChangeLog                |  6 +++++-
 dev-java/jaxen/jaxen-1.0.ebuild         | 17 +++--------------
 dev-java/jaxen/jaxen-1.1_beta2.ebuild   | 19 ++++---------------
 dev-java/jdom/ChangeLog                 |  6 +++++-
 dev-java/jdom/jdom-1.0.ebuild           | 21 ++++++++++++++-------
 dev-java/jdom/jdom-1.0_beta10-r3.ebuild | 21 ++++++++++++++-------
 dev-java/jdom/jdom-1.0_beta6.ebuild     | 21 ++++++++++++++++++---
 dev-java/jdom/jdom-1.0_beta9-r1.ebuild  | 23 +++++++++++++++--------
 8 files changed, 78 insertions(+), 56 deletions(-)

(limited to 'dev-java')

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 ""
-}
diff --git a/dev-java/jdom/ChangeLog b/dev-java/jdom/ChangeLog
index 2a36cd4c9397..38e24f928f3f 100644
--- a/dev-java/jdom/ChangeLog
+++ b/dev-java/jdom/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/jdom
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdom/ChangeLog,v 1.18 2005/02/03 17:14:26 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdom/ChangeLog,v 1.19 2005/02/03 23:01:35 luckyduck Exp $
+
+  03 Feb 2005; Jan Brinkmann <luckyduck@gentoo.org> jdom-1.0.ebuild,
+  jdom-1.0_beta10-r3.ebuild, jdom-1.0_beta6.ebuild, jdom-1.0_beta9-r1.ebuild:
+  jaxen depends on jdom, jdom has optional jaxen support. thanks to HumpBack.
 
 *jdom-1.0_beta9-r1 (03 Feb 2005)
 
diff --git a/dev-java/jdom/jdom-1.0.ebuild b/dev-java/jdom/jdom-1.0.ebuild
index 68a8cc0fd7b5..51e8c08506da 100644
--- a/dev-java/jdom/jdom-1.0.ebuild
+++ b/dev-java/jdom/jdom-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/jdom/jdom-1.0.ebuild,v 1.1 2005/02/03 17:14:26 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdom/jdom-1.0.ebuild,v 1.2 2005/02/03 23:01:35 luckyduck Exp $
 
 inherit java-pkg
 
@@ -20,7 +20,6 @@ RDEPEND=">=virtual/jdk-1.3"
 DEPEND=">=dev-java/ant-1.4.1
 		dev-java/saxpath
 		dev-java/xalan
-		=dev-java/jaxen-1.1*
 		>=dev-java/xerces-2.6.2-r1
 		jikes? ( >=dev-java/jikes-1.15 )"
 
@@ -32,9 +31,12 @@ src_unpack() {
 	rm -f build/*.jar lib/*.jar
 
 	cd ${S}/lib
-	java-pkg_jar-from jaxen-1.1
 	java-pkg_jar-from saxpath
 	java-pkg_jar-from xerces-2
+
+	if has_version jaxen; then
+		java-pkg_jar-from `best_version dev-java/jaxen | sed -s s/"dev-java\/"//| sed -e s/_beta.//`
+	fi
 }
 
 src_compile() {
@@ -52,8 +54,13 @@ src_install() {
 }
 
 pkg_postinst() {
-	einfo
-	einfo "Online Documentation:"
-	einfo "     http://www.jdom.org/downloads/docs.html"
-	einfo
+	if ! has_version jaxen; then
+		einfo ""
+		einfo "If you want jaxen support for jdom then"
+		einfo "please emerge dev-java/jaxen first and"
+		einfo "re-emerge jdom.  Sorry for the"
+		einfo "inconvenience, this is to break out of the"
+		einfo "circular dependencies."
+		einfo ""
+	fi
 }
diff --git a/dev-java/jdom/jdom-1.0_beta10-r3.ebuild b/dev-java/jdom/jdom-1.0_beta10-r3.ebuild
index 4159870d0734..e468eef91800 100644
--- a/dev-java/jdom/jdom-1.0_beta10-r3.ebuild
+++ b/dev-java/jdom/jdom-1.0_beta10-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/jdom/jdom-1.0_beta10-r3.ebuild,v 1.1 2005/02/03 17:14:26 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdom/jdom-1.0_beta10-r3.ebuild,v 1.2 2005/02/03 23:01:35 luckyduck Exp $
 
 inherit java-pkg
 
@@ -18,7 +18,6 @@ SLOT="${PV}"
 KEYWORDS="x86 ~sparc ~ppc ~amd64"
 RDEPEND=">=virtual/jdk-1.3"
 DEPEND=">=dev-java/ant-1.4.1
-		dev-java/jaxen
 		dev-java/saxpath
 		dev-java/xalan
 		>=dev-java/xerces-2.6.2-r1
@@ -32,9 +31,12 @@ src_unpack() {
 	rm -f build/*.jar lib/*.jar
 
 	cd ${S}/lib
-	java-pkg_jar-from jaxen
 	java-pkg_jar-from saxpath
 	java-pkg_jar-from xerces-2
+
+	if has_version jaxen; then
+		java-pkg_jar-from `best_version dev-java/jaxen | sed -s s/"dev-java\/"// | sed -e s/_beta.//`
+	fi
 }
 
 src_compile() {
@@ -52,8 +54,13 @@ src_install() {
 }
 
 pkg_postinst() {
-	einfo
-	einfo "Online Documentation:"
-	einfo "     http://www.jdom.org/downloads/docs.html"
-	einfo
+	if ! has_version jaxen; then
+		einfo ""
+		einfo "If you want jaxen support for jdom then"
+		einfo "please emerge dev-java/jaxen first and"
+		einfo "re-emerge jdom.  Sorry for the"
+		einfo "inconvenience, this is to break out of the"
+		einfo "circular dependencies."
+		einfo ""
+	fi
 }
diff --git a/dev-java/jdom/jdom-1.0_beta6.ebuild b/dev-java/jdom/jdom-1.0_beta6.ebuild
index 365b8c69b601..5a7f0b71f750 100644
--- a/dev-java/jdom/jdom-1.0_beta6.ebuild
+++ b/dev-java/jdom/jdom-1.0_beta6.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/jdom/jdom-1.0_beta6.ebuild,v 1.1 2005/02/03 17:14:26 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdom/jdom-1.0_beta6.ebuild,v 1.2 2005/02/03 23:01:35 luckyduck Exp $
 
 inherit java-pkg
 
@@ -23,7 +23,6 @@ DEPEND=">=dev-java/ant-1.4.1
 RDEPEND=">=virtual/jre-1.3
 		=dev-java/xerces-2.6.2*
 		dev-java/saxpath
-		=dev-java/jaxen-1.1*
 		dev-java/xalan"
 
 S="${WORKDIR}/${MY_P}"
@@ -34,9 +33,12 @@ src_unpack() {
 	rm -f build/*.jar lib/*.jar
 
 	cd ${S}/lib
-	java-pkg_jar-from jaxen-1.1
 	java-pkg_jar-from saxpath
 	java-pkg_jar-from xerces-2
+
+	if has_version jaxen; then
+		java-pkg_jar-from `best_version dev-java/jaxen | sed -s s/"dev-java\/"// | sed -e s/_beta.//`
+	fi
 }
 
 src_compile() {
@@ -51,3 +53,16 @@ src_install() {
 	dodoc CHANGES.txt COMMITTERS.txt LICENSE.txt README.txt TODO.txt
 	use doc && java-pkg_dohtml -r build/apidocs/*
 }
+
+pkg_postinst() {
+	if ! has_version jaxen; then
+		einfo ""
+		einfo "If you want jaxen support for jdom then"
+		einfo "please emerge dev-java/jaxen first and"
+		einfo "re-emerge jdom.  Sorry for the"
+		einfo "inconvenience, this is to break out of the"
+		einfo "circular dependencies."
+		einfo ""
+	fi
+}
+
diff --git a/dev-java/jdom/jdom-1.0_beta9-r1.ebuild b/dev-java/jdom/jdom-1.0_beta9-r1.ebuild
index ddb20f600dea..abf5a60a3699 100644
--- a/dev-java/jdom/jdom-1.0_beta9-r1.ebuild
+++ b/dev-java/jdom/jdom-1.0_beta9-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/jdom/jdom-1.0_beta9-r1.ebuild,v 1.1 2005/02/03 17:14:26 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdom/jdom-1.0_beta9-r1.ebuild,v 1.2 2005/02/03 23:01:35 luckyduck Exp $
 
 inherit java-pkg
 
@@ -20,7 +20,6 @@ RDEPEND=">=virtual/jdk-1.3"
 DEPEND=">=dev-java/ant-1.4.1
 		dev-java/xalan
 		=dev-java/xerces-2.6.2*
-		=dev-java/jaxen-1.1*
 		jikes? ( >=dev-java/jikes-1.15 )"
 
 S="${WORKDIR}/${MY_P}"
@@ -29,10 +28,13 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}/lib
 
-	rm -f *
+	rm -f *.jar
 	java-pkg_jar-from xerces-2
 	java-pkg_jar-from xalan
-	java-pkg_jar-from jaxen-1.1
+
+	if has_version jaxen; then
+		java-pkg_jar-from `best_version dev-java/jaxen | sed -s s/"dev-java\/"// | sed -e s/_beta.//`
+	fi
 }
 
 src_compile() {
@@ -50,8 +52,13 @@ src_install() {
 }
 
 pkg_postinst() {
-	einfo
-	einfo "Online Documentation:"
-	einfo "     http://www.jdom.org/downloads/docs.html"
-	einfo
+	if ! has_version jaxen; then
+		einfo ""
+		einfo "If you want jaxen support for jdom then"
+		einfo "please emerge dev-java/jaxen first and"
+		einfo "re-emerge jdom.  Sorry for the"
+		einfo "inconvenience, this is to break out of the"
+		einfo "circular dependencies."
+		einfo ""
+	fi
 }
-- 
cgit v1.2.3-65-gdbad