Rev bump to fix my stupid SRC_URI errors. grrr!!!

(Portage version: 2.1.3.9)

5 files changed, 138 insertions, 1 deletions

diff --git a/dev-java/jdom/ChangeLog b/dev-java/jdom/ChangeLog
index 51d9cc042d00..3439a29f9a95 100644
--- a/dev-java/jdom/ChangeLog
+++ b/dev-java/jdom/ChangeLog
@@ -1,6 +1,13 @@
 # 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.56 2007/09/16 08:27:50 ali_bush Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdom/ChangeLog,v 1.57 2007/09/18 06:14:56 ali_bush Exp $
+
+*jdom-1.0-r4 (18 Sep 2007)
+*jdom-1.0_beta10-r6 (18 Sep 2007)
+
+  18 Sep 2007; <alistair@gentoo.org> +jdom-1.0_beta10-r6.ebuild,
+  +jdom-1.0-r4.ebuild:
+  Rev bumping jdom to fix SRC_URI error.
 
 *jdom-1.0-r3 (16 Sep 2007)
 *jdom-1.0_beta10-r5 (16 Sep 2007)
diff --git a/dev-java/jdom/files/digest-jdom-1.0-r4 b/dev-java/jdom/files/digest-jdom-1.0-r4
new file mode 100644
index 000000000000..1437e3b7ee84
--- /dev/null
+++ b/dev-java/jdom/files/digest-jdom-1.0-r4
@@ -0,0 +1,3 @@
+MD5 ce29ecc05d63fdb419737fd00c04c281 jdom-1.0.tar.gz 3571788
+RMD160 3b72316f3282a25bca8e0b03e7a5ac07da2d38e9 jdom-1.0.tar.gz 3571788
+SHA256 fdb77a2c9f8f91a9bd898a0d99b941b79137b5ab692e35ca17dcb73a58b15f77 jdom-1.0.tar.gz 3571788
diff --git a/dev-java/jdom/files/digest-jdom-1.0_beta10-r6 b/dev-java/jdom/files/digest-jdom-1.0_beta10-r6
new file mode 100644
index 000000000000..21d79b220461
--- /dev/null
+++ b/dev-java/jdom/files/digest-jdom-1.0_beta10-r6
@@ -0,0 +1,3 @@
+MD5 39323441e0e69fbf2458981b73477098 jdom-b10.tar.gz 3565663
+RMD160 9c15b2165180cee7a61b0086c283463dd000d9d9 jdom-b10.tar.gz 3565663
+SHA256 be6771052ec6d33a192416a9acd0694f1ee2bb5a8eaf506f927a74f56d648a66 jdom-b10.tar.gz 3565663
diff --git a/dev-java/jdom/jdom-1.0-r4.ebuild b/dev-java/jdom/jdom-1.0-r4.ebuild
new file mode 100644
index 000000000000..cda1ae946f8f
--- /dev/null
+++ b/dev-java/jdom/jdom-1.0-r4.ebuild
@@ -0,0 +1,53 @@
+# 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-r4.ebuild,v 1.1 2007/09/18 06:14:56 ali_bush Exp $
+
+JAVA_PKG_IUSE="doc examples source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Java API to manipulate XML data"
+SRC_URI="http://www.jdom.org/dist/source/${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=""
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	rm -v build/*.jar lib/*.jar || die
+	rm -rf build/{apidocs,samples} || die
+
+	rm -v src/java/org/jdom/xpath/JaxenXPath.java \
+		|| die "Unable to remove Jaxen Binding class."
+
+	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-r6.ebuild b/dev-java/jdom/jdom-1.0_beta10-r6.ebuild
new file mode 100644
index 000000000000..6cdfe0c6e737
--- /dev/null
+++ b/dev-java/jdom/jdom-1.0_beta10-r6.ebuild
@@ -0,0 +1,71 @@
+# 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-r6.ebuild,v 1.1 2007/09/18 06:14:56 ali_bush Exp $
+
+JAVA_PKG_IUSE="doc examples source"
+
+inherit java-pkg-2 java-ant-2
+
+MY_PN="jdom"
+MY_PV="b10"
+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 -rf build/{apidocs,samples} || die
+
+	rm -v src/java/org/jdom/xpath/JaxenXPath.java \
+		|| die "Unable to remove Jaxen Binding class."
+
+	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
+}
+
+pkg_postinst() {
+	if ! has_version '=dev-java/jaxen-1.1*'; then
+		elog ""
+		elog "If you want jaxen support for jdom then"
+		elog "please emerge =dev-java/jaxen-1.1* first and"
+		elog "re-emerge jdom.  Sorry for the"
+		elog "inconvenience, this is to break out of the"
+		elog "circular dependencies."
+		elog ""
+	fi
+}