summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Trygve Kalleberg <karltk@gentoo.org>2004-12-20 17:40:18 +0000
committerKarl Trygve Kalleberg <karltk@gentoo.org>2004-12-20 17:40:18 +0000
commitd1db4f981f5c33294dcc4b563c4cb460f93550c3 (patch)
tree54f86d1bb79872c0fa3eeccaa3944d7ab8e6fb89 /dev-java/jmx
parentia64 KEYWORDS #72897 (Manifest recommit) (diff)
downloadgentoo-2-d1db4f981f5c33294dcc4b563c4cb460f93550c3.tar.gz
gentoo-2-d1db4f981f5c33294dcc4b563c4cb460f93550c3.tar.bz2
gentoo-2-d1db4f981f5c33294dcc4b563c4cb460f93550c3.zip
Fixes #74888.
Diffstat (limited to 'dev-java/jmx')
-rw-r--r--dev-java/jmx/ChangeLog7
-rw-r--r--dev-java/jmx/files/build.xml-jdk1.5.patch12
-rw-r--r--dev-java/jmx/jmx-1.2.1.ebuild6
3 files changed, 22 insertions, 3 deletions
diff --git a/dev-java/jmx/ChangeLog b/dev-java/jmx/ChangeLog
index 82391e5395f4..084b04092c38 100644
--- a/dev-java/jmx/ChangeLog
+++ b/dev-java/jmx/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for dev-java/jmx
# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jmx/ChangeLog,v 1.11 2004/12/18 09:01:54 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jmx/ChangeLog,v 1.12 2004/12/20 17:40:18 karltk Exp $
+
+ 20 Dec 2004; Karl Trygve Kalleberg <karltk@gentoo.org>
+ +files/build.xml-jdk1.5.patch, jmx-1.2.1.ebuild:
+ Patch to allow compilation with JDK 1.5, by Petteri Räty
+ <petteri.raty@welho.com>. Fixes #74888.
18 Dec 2004; Markus Rothe <corsair@gentoo.org> jmx-1.2.1.ebuild:
added ~ppc64 to KEYWORDS
diff --git a/dev-java/jmx/files/build.xml-jdk1.5.patch b/dev-java/jmx/files/build.xml-jdk1.5.patch
new file mode 100644
index 000000000000..4225cfa7f510
--- /dev/null
+++ b/dev-java/jmx/files/build.xml-jdk1.5.patch
@@ -0,0 +1,12 @@
+--- jmx-1_2_1-src/build.xml 2004-12-19 01:02:37.939913673 +0200
++++ jmx-1_2_1-src/build.xml 2004-12-19 01:04:05.362665835 +0200
+@@ -43,7 +43,8 @@
+ debug="on"
+ debuglevel="lines,source"
+ optimize="on"
+- target="1.2"
++ source="1.3"
++ target="1.2"
+ includeAntRuntime="no"
+ includeJavaRuntime="no"
+ />
diff --git a/dev-java/jmx/jmx-1.2.1.ebuild b/dev-java/jmx/jmx-1.2.1.ebuild
index 2ec923e8ce0a..16641ea5bf6b 100644
--- a/dev-java/jmx/jmx-1.2.1.ebuild
+++ b/dev-java/jmx/jmx-1.2.1.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jmx/jmx-1.2.1.ebuild,v 1.10 2004/12/18 09:01:54 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jmx/jmx-1.2.1.ebuild,v 1.11 2004/12/20 17:40:18 karltk Exp $
-inherit java-pkg
+inherit java-pkg eutils
DESCRIPTION="Java Management Extensions for managing and monitoring devices, applications, and services."
HOMEPAGE="http://java.sun.com/products/JavaManagement/index.jsp"
@@ -25,7 +25,9 @@ src_unpack() {
unpack ${A}
cd ${S}
sed -i.orig -r -e 's/="src"/="src\/jmxri"/g' build.xml
+ epatch ${FILESDIR}/build.xml-jdk1.5.patch
}
+
pkg_nofetch() {
einfo
einfo " Due to license restrictions, we cannot fetch the"