Changed javadocs to install to standard location and add missing app-arch/zip DEPEND for the source use flag.

Package-Manager: portage-2.1.2_rc4-r5

4 files changed, 95 insertions, 5 deletions

diff --git a/dev-java/jdom/ChangeLog b/dev-java/jdom/ChangeLog
index 270b33bbccb8..9b5043a1eb00 100644
--- a/dev-java/jdom/ChangeLog
+++ b/dev-java/jdom/ChangeLog
@@ -1,6 +1,12 @@
 # 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.38 2007/01/05 23:31:51 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdom/ChangeLog,v 1.39 2007/01/07 13:51:43 betelgeuse Exp $
+
+*jdom-1.0-r2 (07 Jan 2007)
+
+  07 Jan 2007; Petteri Räty <betelgeuse@gentoo.org> +jdom-1.0-r2.ebuild:
+  Changed javadocs to install to standard location and add missing
+  app-arch/zip DEPEND for the source use flag.
 
   05 Jan 2007; Vlastimil Babka <caster@gentoo.org> jdom-1.0_beta6.ebuild,
   jdom-1.0_beta6-r1.ebuild, jdom-1.0_beta9-r1.ebuild,
diff --git a/dev-java/jdom/Manifest b/dev-java/jdom/Manifest
index 9e473bb2cc0c..04fd9be5d1d0 100644
--- a/dev-java/jdom/Manifest
+++ b/dev-java/jdom/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST jdom-1.0.tar.gz 3571788 RMD160 3b72316f3282a25bca8e0b03e7a5ac07da2d38e9 SHA1 d3499d71b180cdeeb6b9537bb197751aa7f8e974 SHA256 fdb77a2c9f8f91a9bd898a0d99b941b79137b5ab692e35ca17dcb73a58b15f77
 DIST jdom-b10.tar.gz 3565663 RMD160 9c15b2165180cee7a61b0086c283463dd000d9d9 SHA1 c1be10849432fc766aef7af8cdf90d747f768938 SHA256 be6771052ec6d33a192416a9acd0694f1ee2bb5a8eaf506f927a74f56d648a66
 DIST jdom-b6.tar.gz 1045817 RMD160 86d10cdd3ac6a6a89a87c4af9329539e60cb3997 SHA1 6a9b320dd52078a415e282b780ceb45110f93c6b SHA256 d290c70220f8281471ac2d9bcfd8bf29789553efb9974b0524e121cf80c83a95
@@ -6,6 +9,10 @@ EBUILD jdom-1.0-r1.ebuild 1474 RMD160 7423cbf8f64a94b2a8ae630995d0e6fbde14d9c6 S
 MD5 e637790239e3f93e31564b41deb543d4 jdom-1.0-r1.ebuild 1474
 RMD160 7423cbf8f64a94b2a8ae630995d0e6fbde14d9c6 jdom-1.0-r1.ebuild 1474
 SHA256 89fcdd4aad264e3baa6377c9154ca6471aec08b57bd6a0d9f288fe75aa38d08c jdom-1.0-r1.ebuild 1474
+EBUILD jdom-1.0-r2.ebuild 1433 RMD160 bfe9f207d3411de012fd550759b038ff5004e8e8 SHA1 0f291b45b75b23919f54c87d0eb0992cc98976e5 SHA256 38534277ede8f7d9dcca59da0463811ab5e04c1d2ace20c9506286a708bd01e1
+MD5 5efcd6d8ecbf8fef6764e9789f5ddb66 jdom-1.0-r2.ebuild 1433
+RMD160 bfe9f207d3411de012fd550759b038ff5004e8e8 jdom-1.0-r2.ebuild 1433
+SHA256 38534277ede8f7d9dcca59da0463811ab5e04c1d2ace20c9506286a708bd01e1 jdom-1.0-r2.ebuild 1433
 EBUILD jdom-1.0.ebuild 1574 RMD160 b8572cdcd467066dd850132531e19e9667e0d03d SHA1 b81a0fa25391982d31bb700066eb88c692926c7a SHA256 24585130328171539e4084637d33df11efe6d4d5903e6e81a671f49094bff45e
 MD5 60ca9e0ca406ac80f64ad02ca9ca0af5 jdom-1.0.ebuild 1574
 RMD160 b8572cdcd467066dd850132531e19e9667e0d03d jdom-1.0.ebuild 1574
@@ -34,10 +41,10 @@ EBUILD jdom-1.0_beta9-r2.ebuild 1477 RMD160 48811c4bb68016b7dfad6b7c0e785af713e7
 MD5 094053e8fc411361e4b10353093f63db jdom-1.0_beta9-r2.ebuild 1477
 RMD160 48811c4bb68016b7dfad6b7c0e785af713e7474e jdom-1.0_beta9-r2.ebuild 1477
 SHA256 2c3463bc2f4247b6d1f5b0df788ee0a355b97581fe0f470d2613354514ee0ab4 jdom-1.0_beta9-r2.ebuild 1477
-MISC ChangeLog 6362 RMD160 3b6e05e85e769f9f56972c09787ac3ec97dcb35a SHA1 d396539ae61a384a7710f3f1197f1572c086f3fe SHA256 e6ea686a212654f7a0d94c0e313c93a958427f04359e9b73c65de28569947348
-MD5 c68807c57947fb7a35e1fccd5f9ef737 ChangeLog 6362
-RMD160 3b6e05e85e769f9f56972c09787ac3ec97dcb35a ChangeLog 6362
-SHA256 e6ea686a212654f7a0d94c0e313c93a958427f04359e9b73c65de28569947348 ChangeLog 6362
+MISC ChangeLog 6583 RMD160 4583da0cc316b1ff9d12ce24b9267783b71dac63 SHA1 0c3409c2180fb059bd46daea7efafe6fef1f4842 SHA256 e55325f053ff552223fa8eafc7446d83828cc036b87662fbecb2ae614c446da0
+MD5 1d95c08d0bb13c2566aaef9b6a0fed70 ChangeLog 6583
+RMD160 4583da0cc316b1ff9d12ce24b9267783b71dac63 ChangeLog 6583
+SHA256 e55325f053ff552223fa8eafc7446d83828cc036b87662fbecb2ae614c446da0 ChangeLog 6583
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -48,6 +55,9 @@ SHA256 16591b7f7f171da64528033e0f88e9aa9483d5eebc97ca6cff48d7b7a1352dc2 files/di
 MD5 055e8cb83059e1745ce5dd6d083cb770 files/digest-jdom-1.0-r1 229
 RMD160 5ddc1e61cf63fb2df9d5c973c873319a4c0228d1 files/digest-jdom-1.0-r1 229
 SHA256 16591b7f7f171da64528033e0f88e9aa9483d5eebc97ca6cff48d7b7a1352dc2 files/digest-jdom-1.0-r1 229
+MD5 055e8cb83059e1745ce5dd6d083cb770 files/digest-jdom-1.0-r2 229
+RMD160 5ddc1e61cf63fb2df9d5c973c873319a4c0228d1 files/digest-jdom-1.0-r2 229
+SHA256 16591b7f7f171da64528033e0f88e9aa9483d5eebc97ca6cff48d7b7a1352dc2 files/digest-jdom-1.0-r2 229
 MD5 3c1b11f76a6a09c09d4db4d8c159b3c6 files/digest-jdom-1.0_beta10-r3 229
 RMD160 c8724504851a86a78f995a533998d10dbc98b556 files/digest-jdom-1.0_beta10-r3 229
 SHA256 c0b022f9b9811324082b9bc429ad2ebb6849d2d9f6d2d14e7b6759c55118897d files/digest-jdom-1.0_beta10-r3 229
@@ -66,3 +76,10 @@ SHA256 8cd045277ddcccb04c717363116c1db5e6b336863faa5941dd9ee6a33bfc9570 files/di
 MD5 d26a104d6e08295aa1296456a0a9334d files/digest-jdom-1.0_beta9-r2 226
 RMD160 d30ad45a2ed73ca3377629ecb2e6f8268a60d33b files/digest-jdom-1.0_beta9-r2 226
 SHA256 8cd045277ddcccb04c717363116c1db5e6b336863faa5941dd9ee6a33bfc9570 files/digest-jdom-1.0_beta9-r2 226
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQFFoPsxcxLzpIGCsLQRAmsXAKCJTWBzlVOcKotIvLQq/386YFN6VQCfRvO1
+VqSLNcMLAUe72XX456TCNMc=
+=EqF2
+-----END PGP SIGNATURE-----
diff --git a/dev-java/jdom/files/digest-jdom-1.0-r2 b/dev-java/jdom/files/digest-jdom-1.0-r2
new file mode 100644
index 000000000000..1437e3b7ee84
--- /dev/null
+++ b/dev-java/jdom/files/digest-jdom-1.0-r2
@@ -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/jdom-1.0-r2.ebuild b/dev-java/jdom/jdom-1.0-r2.ebuild
new file mode 100644
index 000000000000..4865e91bf599
--- /dev/null
+++ b/dev-java/jdom/jdom-1.0-r2.ebuild
@@ -0,0 +1,64 @@
+# 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-r2.ebuild,v 1.1 2007/01/07 13:51:43 betelgeuse Exp $
+
+inherit java-pkg-2 java-ant-2
+
+IUSE="doc source"
+
+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 ~ppc ~x86 ~x86-fbsd"
+
+COMMON_DEP="
+		dev-java/saxpath
+		dev-java/xalan
+		>=dev-java/xerces-2.7"
+
+RDEPEND=">=virtual/jre-1.4
+		${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.4
+		dev-java/ant-core
+		source? ( app-arch/zip )
+		${COMMON_DEP}"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	rm -f build/*.jar lib/*.jar
+
+	cd ${S}/lib
+	java-pkg_jar-from saxpath
+	java-pkg_jar-from xerces-2
+
+	if has_version '=dev-java/jaxen-1.1*'; then
+		java-pkg_jar-from jaxen-1.1
+	fi
+}
+
+src_compile() {
+	eant package
+}
+
+src_install() {
+	java-pkg_dojar build/*.jar
+
+	dodoc CHANGES.txt COMMITTERS.txt README.txt TODO.txt
+	use doc && java-pkg_dojavadoc build/apidocs
+	use source && java-pkg_dosrc src/java/*
+}
+
+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
+}