diff options
author | Petteri Räty <betelgeuse@gentoo.org> | 2007-03-27 20:02:41 +0000 |
---|---|---|
committer | Petteri Räty <betelgeuse@gentoo.org> | 2007-03-27 20:02:41 +0000 |
commit | 1ed5f95bfbfd5f380b47ff1c0c6ca0f7bfc7eb06 (patch) | |
tree | 39315254747ab3ad6dcdeea0899b6a81ea3ba2cb /dev-java/sun-jmx | |
parent | gnome 2.18.0 (diff) | |
download | gentoo-2-1ed5f95bfbfd5f380b47ff1c0c6ca0f7bfc7eb06.tar.gz gentoo-2-1ed5f95bfbfd5f380b47ff1c0c6ca0f7bfc7eb06.tar.bz2 gentoo-2-1ed5f95bfbfd5f380b47ff1c0c6ca0f7bfc7eb06.zip |
Fix to emerge with JAVA_PKG_STRICT and fix documentation installation.
(Portage version: 2.1.2.2)
Diffstat (limited to 'dev-java/sun-jmx')
-rw-r--r-- | dev-java/sun-jmx/ChangeLog | 8 | ||||
-rw-r--r-- | dev-java/sun-jmx/sun-jmx-1.2.1-r2.ebuild | 14 |
2 files changed, 12 insertions, 10 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/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 |