Splitting jdom's jaxen class to jdom-jaxen to resolve circular dependencies

Package-Manager: portage-2.1.3.9

7 files changed, 196 insertions, 1 deletions

diff --git a/dev-java/jdom/ChangeLog b/dev-java/jdom/ChangeLog
index 93e45afedff1..51d9cc042d00 100644
--- a/dev-java/jdom/ChangeLog
+++ b/dev-java/jdom/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-java/jdom
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdom/ChangeLog,v 1.55 2007/07/22 09:22:07 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdom/ChangeLog,v 1.56 2007/09/16 08:27:50 ali_bush Exp $
+
+*jdom-1.0-r3 (16 Sep 2007)
+*jdom-1.0_beta10-r5 (16 Sep 2007)
+*jdom-1.0_beta9-r4 (16 Sep 2007)
+
+  16 Sep 2007; <alistair@gentoo.org> +jdom-1.0_beta9-r4.ebuild,
+  +jdom-1.0_beta10-r5.ebuild, +jdom-1.0-r3.ebuild:
+  Splitting jdom's jaxen class into package jdom-jaxen to resolve circular
+  dependencies
 
   22 Jul 2007; Petteri Räty <betelgeuse@gentoo.org>
   jdom-1.0_beta9-r2.ebuild, jdom-1.0_beta10-r4.ebuild:
diff --git a/dev-java/jdom/files/digest-jdom-1.0-r3 b/dev-java/jdom/files/digest-jdom-1.0-r3
new file mode 100644
index 000000000000..08fc74befc3c
--- /dev/null
+++ b/dev-java/jdom/files/digest-jdom-1.0-r3
@@ -0,0 +1,3 @@
+MD5 593c7bbbd939eb0513444d2c61e5aca0 jdom-b9.tar.gz 3417274
+RMD160 af44cb104946cc05e1a55a23951c364d08c4cc89 jdom-b9.tar.gz 3417274
+SHA256 00c4ddf640b17768582bba0e8b8a2584fe42b2540a98d1bfa276fa43bef1a676 jdom-b9.tar.gz 3417274
diff --git a/dev-java/jdom/files/digest-jdom-1.0_beta10-r5 b/dev-java/jdom/files/digest-jdom-1.0_beta10-r5
new file mode 100644
index 000000000000..08fc74befc3c
--- /dev/null
+++ b/dev-java/jdom/files/digest-jdom-1.0_beta10-r5
@@ -0,0 +1,3 @@
+MD5 593c7bbbd939eb0513444d2c61e5aca0 jdom-b9.tar.gz 3417274
+RMD160 af44cb104946cc05e1a55a23951c364d08c4cc89 jdom-b9.tar.gz 3417274
+SHA256 00c4ddf640b17768582bba0e8b8a2584fe42b2540a98d1bfa276fa43bef1a676 jdom-b9.tar.gz 3417274
diff --git a/dev-java/jdom/files/digest-jdom-1.0_beta9-r4 b/dev-java/jdom/files/digest-jdom-1.0_beta9-r4
new file mode 100644
index 000000000000..08fc74befc3c
--- /dev/null
+++ b/dev-java/jdom/files/digest-jdom-1.0_beta9-r4
@@ -0,0 +1,3 @@
+MD5 593c7bbbd939eb0513444d2c61e5aca0 jdom-b9.tar.gz 3417274
+RMD160 af44cb104946cc05e1a55a23951c364d08c4cc89 jdom-b9.tar.gz 3417274
+SHA256 00c4ddf640b17768582bba0e8b8a2584fe42b2540a98d1bfa276fa43bef1a676 jdom-b9.tar.gz 3417274
diff --git a/dev-java/jdom/jdom-1.0-r3.ebuild b/dev-java/jdom/jdom-1.0-r3.ebuild
new file mode 100644
index 000000000000..ae6756972f6e
--- /dev/null
+++ b/dev-java/jdom/jdom-1.0-r3.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdom/jdom-1.0-r3.ebuild,v 1.1 2007/09/16 08:27:50 ali_bush Exp $
+
+JAVA_PKG_IUSE="doc examples source"
+
+inherit java-pkg-2 java-ant-2
+
+MY_PN="jdom"
+MY_PV="b9"
+MY_P="${MY_PN}-${MY_PV}"
+
+DESCRIPTION="Java API to manipulate XML data"
+SRC_URI="http://www.jdom.org/dist/source/archive/${MY_P}.tar.gz"
+HOMEPAGE="http://www.jdom.org"
+LICENSE="JDOM"
+SLOT="${PV}"
+KEYWORDS="~amd64"
+
+COMMON_DEP="dev-java/saxpath
+		>=dev-java/xerces-2.7"
+RDEPEND=">=virtual/jre-1.4
+		${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.4
+		${COMMON_DEP}"
+PDEPEND="~dev-java/jdom-jaxen-${PV}"
+IUSE=""
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	rm -v build/*.jar lib/*.jar || die
+	rm -v src/java/org/jdom/xpath/JaxenXPath.java \
+		|| die "Unable to remove Jaxen Binding class."
+	rm -rf build/apidocs || die
+
+	cd ${S}/lib
+	java-pkg_jar-from saxpath,xerces-2
+}
+
+src_compile() {
+	# to prevent a newer jdom from going into cp
+	# (EANT_ANT_TASKS doesn't work with none)
+	ANT_TASKS="none" eant package $(use_doc)
+}
+
+src_install() {
+	java-pkg_dojar build/*.jar
+
+	java-pkg_register-dependency "jdom-jaxen-${SLOT}"
+
+	dodoc CHANGES.txt COMMITTERS.txt README.txt TODO.txt || die
+	use doc && java-pkg_dojavadoc build/apidocs
+	use examples && java-pkg_doexamples samples
+	use source && java-pkg_dosrc src/java/org
+}
diff --git a/dev-java/jdom/jdom-1.0_beta10-r5.ebuild b/dev-java/jdom/jdom-1.0_beta10-r5.ebuild
new file mode 100644
index 000000000000..728980a29944
--- /dev/null
+++ b/dev-java/jdom/jdom-1.0_beta10-r5.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2007 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-r5.ebuild,v 1.1 2007/09/16 08:27:50 ali_bush Exp $
+
+JAVA_PKG_IUSE="doc examples source"
+
+inherit java-pkg-2 java-ant-2
+
+MY_PN="jdom"
+MY_PV="b9"
+MY_P="${MY_PN}-${MY_PV}"
+
+DESCRIPTION="Java API to manipulate XML data"
+SRC_URI="http://www.jdom.org/dist/source/archive/${MY_P}.tar.gz"
+HOMEPAGE="http://www.jdom.org"
+LICENSE="JDOM"
+SLOT="${PV}"
+KEYWORDS="~amd64"
+
+COMMON_DEP="dev-java/saxpath
+		>=dev-java/xerces-2.7"
+RDEPEND=">=virtual/jre-1.4
+		${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.4
+		${COMMON_DEP}"
+PDEPEND="~dev-java/jdom-jaxen-${PV}"
+IUSE=""
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	rm -v build/*.jar lib/*.jar || die
+	rm -v src/java/org/jdom/xpath/JaxenXPath.java \
+		|| die "Unable to remove Jaxen Binding class."
+	rm -rf build/apidocs || die
+
+	cd ${S}/lib
+	java-pkg_jar-from saxpath,xerces-2
+}
+
+src_compile() {
+	# to prevent a newer jdom from going into cp
+	# (EANT_ANT_TASKS doesn't work with none)
+	ANT_TASKS="none" eant package $(use_doc)
+}
+
+src_install() {
+	java-pkg_dojar build/*.jar
+
+	java-pkg_register-dependency "jdom-jaxen-${SLOT}"
+
+	dodoc CHANGES.txt COMMITTERS.txt README.txt TODO.txt || die
+	use doc && java-pkg_dojavadoc build/apidocs
+	use examples && java-pkg_doexamples samples
+	use source && java-pkg_dosrc src/java/org
+}
diff --git a/dev-java/jdom/jdom-1.0_beta9-r4.ebuild b/dev-java/jdom/jdom-1.0_beta9-r4.ebuild
new file mode 100644
index 000000000000..6afa30034e3b
--- /dev/null
+++ b/dev-java/jdom/jdom-1.0_beta9-r4.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2007 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-r4.ebuild,v 1.1 2007/09/16 08:27:50 ali_bush Exp $
+
+JAVA_PKG_IUSE="doc examples source"
+
+inherit java-pkg-2 java-ant-2
+
+MY_PN="jdom"
+MY_PV="b9"
+MY_P="${MY_PN}-${MY_PV}"
+
+DESCRIPTION="Java API to manipulate XML data"
+SRC_URI="http://www.jdom.org/dist/source/archive/${MY_P}.tar.gz"
+HOMEPAGE="http://www.jdom.org"
+LICENSE="JDOM"
+SLOT="${PV}"
+KEYWORDS="~amd64"
+
+COMMON_DEP="dev-java/saxpath
+		>=dev-java/xerces-2.7"
+RDEPEND=">=virtual/jre-1.4
+		${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.4
+		${COMMON_DEP}"
+PDEPEND="~dev-java/jdom-jaxen-${PV}"
+IUSE=""
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	rm -v build/*.jar lib/*.jar || die
+	rm -v src/java/org/jdom/xpath/JaxenXPath.java \
+		|| die "Unable to remove Jaxen Binding class."
+	rm -rf build/apidocs || die
+
+	cd ${S}/lib
+	java-pkg_jar-from saxpath,xerces-2
+}
+
+src_compile() {
+	# to prevent a newer jdom from going into cp
+	# (EANT_ANT_TASKS doesn't work with none)
+	ANT_TASKS="none" eant package $(use_doc)
+}
+
+src_install() {
+	java-pkg_dojar build/*.jar
+
+	java-pkg_register-dependency "jdom-jaxen-${SLOT}"
+
+	dodoc CHANGES.txt COMMITTERS.txt README.txt TODO.txt || die
+	use doc && java-pkg_dojavadoc build/apidocs
+	use examples && java-pkg_doexamples samples
+	use source && java-pkg_dosrc src/java/org
+}