Fix to emerge with JAVA_PKG_STRICT and fix documentation installation.

Package-Manager: portage-2.1.2.2

3 files changed, 24 insertions, 22 deletions

diff --git a/dev-java/sun-jmx/ChangeLog b/dev-java/sun-jmx/ChangeLog
index 739b14d98947..0d59102f3ef0 100644
--- a/dev-java/sun-jmx/ChangeLog
+++ b/dev-java/sun-jmx/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/sun-jmx
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jmx/ChangeLog,v 1.4 2006/12/09 09:25:27 flameeyes Exp $
+# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jmx/ChangeLog,v 1.5 2007/03/27 20:02:41 betelgeuse Exp $
+
+  27 Mar 2007; Petteri Räty <betelgeuse@gentoo.org>
+  sun-jmx-1.2.1-r2.ebuild:
+  Fix to emerge with JAVA_PKG_STRICT and fix documentation installation.
 
   09 Dec 2006; Diego Pettenò <flameeyes@gentoo.org>
   sun-jmx-1.2.1-r2.ebuild:
diff --git a/dev-java/sun-jmx/Manifest b/dev-java/sun-jmx/Manifest
index 4ffc2e1a497e..6e907a7413ee 100644
--- a/dev-java/sun-jmx/Manifest
+++ b/dev-java/sun-jmx/Manifest
@@ -6,14 +6,14 @@ EBUILD sun-jmx-1.2.1-r1.ebuild 1722 RMD160 77febb7c1dba8a25d6dad3073cf046a1205be
 MD5 41d75580d7b9223842b5abada4b34762 sun-jmx-1.2.1-r1.ebuild 1722
 RMD160 77febb7c1dba8a25d6dad3073cf046a1205be24d sun-jmx-1.2.1-r1.ebuild 1722
 SHA256 5de1b97c47b3db7ba02168a088a2b1908ac985fdf74f3007d9f9c4e040a012fa sun-jmx-1.2.1-r1.ebuild 1722
-EBUILD sun-jmx-1.2.1-r2.ebuild 1568 RMD160 e579a84408d121d2b3c72980657c3ee356222271 SHA1 7ab56fb64f7712ce5cb461db0d6ede39e359418b SHA256 5ac1c98c6deda22d4987fb6dec44c6f0a364b505e1e7d4519416fc3e1c4e8a0b
-MD5 49f65a1d9f04765140fbe9e5b862a247 sun-jmx-1.2.1-r2.ebuild 1568
-RMD160 e579a84408d121d2b3c72980657c3ee356222271 sun-jmx-1.2.1-r2.ebuild 1568
-SHA256 5ac1c98c6deda22d4987fb6dec44c6f0a364b505e1e7d4519416fc3e1c4e8a0b sun-jmx-1.2.1-r2.ebuild 1568
-MISC ChangeLog 2736 RMD160 2afcee0c895c6948bbeda1aee526c92176394e35 SHA1 dab833e873518bd676451b1f6cf2b977719d64d2 SHA256 13fab89d77806dc385d6608f6c2a89e2860f316499a62ae6a001da24269bf0de
-MD5 3c01787555e696e9eb12b734525b2737 ChangeLog 2736
-RMD160 2afcee0c895c6948bbeda1aee526c92176394e35 ChangeLog 2736
-SHA256 13fab89d77806dc385d6608f6c2a89e2860f316499a62ae6a001da24269bf0de ChangeLog 2736
+EBUILD sun-jmx-1.2.1-r2.ebuild 1560 RMD160 fa7a127dab8fa89ff77d0b4f53a0674bcb3bfa3b SHA1 f927998d8901cf3f7f593810b415a9aefb5402e5 SHA256 812d6601913809c58b55cec2bb1444b17e810cd075d09235a6ec707bc3aa1c93
+MD5 b75d75c09d1cc4ec09f02c38e69530dd sun-jmx-1.2.1-r2.ebuild 1560
+RMD160 fa7a127dab8fa89ff77d0b4f53a0674bcb3bfa3b sun-jmx-1.2.1-r2.ebuild 1560
+SHA256 812d6601913809c58b55cec2bb1444b17e810cd075d09235a6ec707bc3aa1c93 sun-jmx-1.2.1-r2.ebuild 1560
+MISC ChangeLog 2891 RMD160 cb5d47b525c68c140a91584221cb5c55fd13795e SHA1 65878b93435944a96a429b976f64914c6076f5c4 SHA256 ce9ddb8ccc96cdbe3c02818269f4249459967191790c5f486f10134c1884f9cc
+MD5 f4a3f41d29a225ece6069fda5fc75b84 ChangeLog 2891
+RMD160 cb5d47b525c68c140a91584221cb5c55fd13795e ChangeLog 2891
+SHA256 ce9ddb8ccc96cdbe3c02818269f4249459967191790c5f486f10134c1884f9cc ChangeLog 2891
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -25,9 +25,9 @@ MD5 82671aae9d6ea811e7a5d37fe67a6285 files/digest-sun-jmx-1.2.1-r2 238
 RMD160 75867eecf38d4ab644998698e904e2e54bff3401 files/digest-sun-jmx-1.2.1-r2 238
 SHA256 2e4350eee21a32c2705e0bcdb0cc5588672dd8d370c352cae961c6d56276cf60 files/digest-sun-jmx-1.2.1-r2 238
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
+Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFFeoEKAiZjviIA2XgRAo2QAKCC7w93aPEYVvl8hU75WwtCs9WvEACfflV+
-O9hjpnpe7/IoMpT1Q+AYh/w=
-=Eusr
+iD8DBQFGCXhpcxLzpIGCsLQRAkQfAJ4hG++CBGtYa+RTpF37XvdntpHIogCdE5qI
+HKqexwhRTj7xEnrfRUfOTck=
+=UUpq
 -----END PGP SIGNATURE-----
diff --git a/dev-java/sun-jmx/sun-jmx-1.2.1-r2.ebuild b/dev-java/sun-jmx/sun-jmx-1.2.1-r2.ebuild
index fe467da9079e..d5ce2ee2bc88 100644
--- a/dev-java/sun-jmx/sun-jmx-1.2.1-r2.ebuild
+++ b/dev-java/sun-jmx/sun-jmx-1.2.1-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jmx/sun-jmx-1.2.1-r2.ebuild,v 1.3 2006/12/09 09:25:27 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jmx/sun-jmx-1.2.1-r2.ebuild,v 1.4 2007/03/27 20:02:41 betelgeuse Exp $
 
-inherit java-pkg-2 eutils
+inherit java-pkg-2 eutils java-ant-2
 
 MY_PN=${PN//sun-/}
 MY_P=${MY_PN}-${PV//./_}
@@ -26,7 +26,7 @@ DOWNLOADSITE="http://wwws.sun.com/software/communitysource/jmx/download.html"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 	sed -i.orig -r -e 's/="src"/="src\/jmxri"/g' build.xml || die "sed failed"
 }
 
@@ -42,13 +42,11 @@ pkg_nofetch() {
 	einfo
 }
 
-src_compile() {
-	eant jar $(use_doc examples)
-}
+EANT_DOC_TARGET="examples"
 
 src_install() {
 	java-pkg_dojar lib/*.jar
-	use doc && java-pkg_dohtml -r docs/*
+	use doc && java-pkg_dohtml -r doc/*
 	if use examples; then
 		dodir /usr/share/doc/${PF}/examples
 		cp -r examples/* ${D}/usr/share/doc/${PF}/examples