Fix javadoc compilation for bug 289855

Package-Manager: portage-2.2_rc30/cvs/Linux x86_64

5 files changed, 27 insertions, 11 deletions

diff --git a/dev-java/jebl/ChangeLog b/dev-java/jebl/ChangeLog
index 884bc12e121f..dc2773285f5a 100644
--- a/dev-java/jebl/ChangeLog
+++ b/dev-java/jebl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/jebl
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jebl/ChangeLog,v 1.2 2009/09/22 13:11:04 weaver Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jebl/ChangeLog,v 1.3 2009/10/25 18:39:23 weaver Exp $
+
+  25 Oct 2009; Andrey Kislyuk <weaver@gentoo.org> jebl-0.5.3.ebuild,
+  jebl-2009.09.22.ebuild, jebl-9999.ebuild:
+  Fix javadoc compilation for bug 289855
 
 *jebl-2009.09.22 (22 Sep 2009)
 
diff --git a/dev-java/jebl/Manifest b/dev-java/jebl/Manifest
index b7256d08399b..9f3c8bf2902a 100644
--- a/dev-java/jebl/Manifest
+++ b/dev-java/jebl/Manifest
@@ -1,7 +1,7 @@
 DIST jebl-0.5.3.tar.bz2 478464 RMD160 18ef9b5e215fc3a0de3b20f9b33377b4613dc998 SHA1 0cf0008311685b1c8cd34c2b177e83084508064f SHA256 39f322b2ab15737fa0d156b5352bc997f6c3237a82f8a22b29f5f811a2f40297
 DIST jebl-2009.09.22.tar.bz2 456276 RMD160 9b6de1e28977cb82871939f83e74f35681fdb1d3 SHA1 52be487b2955b167f764631412756c54bd8cf07b SHA256 40c1a149df0a0dddc533cc67c11ea1340445d10a5c20766abadd2b893afaeb06
-EBUILD jebl-0.5.3.ebuild 971 RMD160 d7afeacc387f28afc7a70710be10b81fcad17f8d SHA1 816a72ea8c879303cf395f1c8adb605a3c314a26 SHA256 285bd29440ceba5d1e1721136eb8942782a0ce3e4345f7aa3ca00d9111917427
-EBUILD jebl-2009.09.22.ebuild 972 RMD160 4a0b53f9bf7aeb47d70b57d66927e5dde866efce SHA1 45ce89e8637ff9fe5bd645e383c29539a4f94be8 SHA256 7f2ac14f3eba823f4c72c200eb45b06ad693095a7a0f9e64f1d735454af6b40a
-EBUILD jebl-9999.ebuild 958 RMD160 7809918b820f98cb077692e43440d5371552b27b SHA1 4f490c9bf9980c8d7cac2dae5ae1e6724cef6706 SHA256 1fa623261224f9f42e6f66d02c1bf31ab36c57813c9efdce2eec7534ad153ba7
-MISC ChangeLog 619 RMD160 d34f1319ad11db66921ea3044f289a2e0c6bd952 SHA1 110de9766fa7bb29a5dce18012deedea698db76d SHA256 4f77fc4d1f894f89631cf8d8e9f8ecc70d84373e10ac00ed7e45a5ccc031bed4
+EBUILD jebl-0.5.3.ebuild 1039 RMD160 8d540a7bdc95789513a86f75a77355c883acbc2a SHA1 4898af4b2b00c50b3e921ca2bef9c17595d4b24b SHA256 775052de8643d4d3815fa5bcaa165ccd60feebf5f283da29bf9870232cdb04fd
+EBUILD jebl-2009.09.22.ebuild 1040 RMD160 4e306350c9ed1b9957d4f200be2e83e8b34a631d SHA1 5e08a291bfb617d4b651b9c08a7ef29a3e3d5dfc SHA256 6ab648507865573d893164a2e6009e45710b21f8f0701cfdf22e397bf947ccb7
+EBUILD jebl-9999.ebuild 1026 RMD160 1733af1bc8237779af08dfc239fd7d2e7036aac6 SHA1 739b5b1c7a61e7b116b443d48875f17b2bb5dc4c SHA256 ef52d13894fcfa7b58c187db5958641b5679743ff65f2abc4215aa3b5c3bbbc1
+MISC ChangeLog 774 RMD160 fcba3302d5994227ea8cd1750c2fbf16c7c4b59b SHA1 37e32907c6195fd900278b31bb135106dbcedd38 SHA256 c0389069bbc446d98cd519e0c6c8a7a38eca00961a7be1a4cafacf620cf7e3d0
 MISC metadata.xml 252 RMD160 39b3ff42eb070f3b0ba0602febeb9f3d6ec0daeb SHA1 f15d4fd691d5e9480a0d5f5565ef9febca15682c SHA256 68dd5ed36b7be999ccbcd7ba5f0a5e9174eb3d13bdfc715d93cbc4d2302a9f62
diff --git a/dev-java/jebl/jebl-0.5.3.ebuild b/dev-java/jebl/jebl-0.5.3.ebuild
index a841558a59b1..f02b9bc94fbe 100644
--- a/dev-java/jebl/jebl-0.5.3.ebuild
+++ b/dev-java/jebl/jebl-0.5.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jebl/jebl-0.5.3.ebuild,v 1.1 2009/09/21 00:35:25 weaver Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jebl/jebl-0.5.3.ebuild,v 1.2 2009/10/25 18:39:23 weaver Exp $
 
 EAPI="2"
 
@@ -32,8 +32,12 @@ RDEPEND="${CDEPEND}
 
 S="${WORKDIR}/${P//./_}"
 
+java_prepare() {
+	rm -rf "${S}/src/org/virion/jam/maconly" || die
+}
+
 src_install() {
 	java-pkg_dojar dist/jebl.jar || die
 	java-pkg_dojar dist/jam.jar || die
-#	use doc && java-pkg_dojavadoc doc/api
+	use doc && java-pkg_dojavadoc doc/api
 }
diff --git a/dev-java/jebl/jebl-2009.09.22.ebuild b/dev-java/jebl/jebl-2009.09.22.ebuild
index 41a151959902..08784ef427f6 100644
--- a/dev-java/jebl/jebl-2009.09.22.ebuild
+++ b/dev-java/jebl/jebl-2009.09.22.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jebl/jebl-2009.09.22.ebuild,v 1.1 2009/09/22 13:11:04 weaver Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jebl/jebl-2009.09.22.ebuild,v 1.2 2009/10/25 18:39:23 weaver Exp $
 
 EAPI="2"
 
@@ -32,8 +32,12 @@ RDEPEND="${CDEPEND}
 
 S="${WORKDIR}/${PN}"
 
+java_prepare() {
+	rm -rf "${S}/src/org/virion/jam/maconly" || die
+}
+
 src_install() {
 	java-pkg_dojar dist/jebl.jar || die
 	java-pkg_dojar dist/jam.jar || die
-#	use doc && java-pkg_dojavadoc doc/api
+	use doc && java-pkg_dojavadoc doc/api
 }
diff --git a/dev-java/jebl/jebl-9999.ebuild b/dev-java/jebl/jebl-9999.ebuild
index 560ed6a1e026..58d703efb06d 100644
--- a/dev-java/jebl/jebl-9999.ebuild
+++ b/dev-java/jebl/jebl-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jebl/jebl-9999.ebuild,v 1.1 2009/09/21 00:35:25 weaver Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jebl/jebl-9999.ebuild,v 1.2 2009/10/25 18:39:23 weaver Exp $
 
 EAPI="2"
 
@@ -32,8 +32,12 @@ RDEPEND="${CDEPEND}
 
 S="${WORKDIR}/${P//./_}"
 
+java_prepare() {
+	rm -rf "${S}/src/org/virion/jam/maconly" || die
+}
+
 src_install() {
 	java-pkg_dojar dist/jebl.jar || die
 	java-pkg_dojar dist/jam.jar || die
-#	use doc && java-pkg_dojavadoc doc/api
+	use doc && java-pkg_dojavadoc doc/api
 }