upstream patch closes bug 66977,66840

5 files changed, 88 insertions, 12 deletions

diff --git a/dev-java/jikes/ChangeLog b/dev-java/jikes/ChangeLog
index 96600dd431c7..64eeb563247f 100644
--- a/dev-java/jikes/ChangeLog
+++ b/dev-java/jikes/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-java/jikes
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jikes/ChangeLog,v 1.27 2004/10/06 14:43:56 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jikes/ChangeLog,v 1.28 2004/10/12 19:21:14 axxo Exp $
+
+*jikes-1.22-r1 (12 Oct 2004)
+
+  12 Oct 2004; Thomas Matthijs <axxo@gentoo.org> +files/deprecated.patch,
+  +jikes-1.22-r1.ebuild:
+  upstream patch for
+  (http://oss.software.ibm.com/developerworks/bugs/?func=detailbug&bug_id=4058
+  &group_id=10) closes bug 66977,66840 (partly)
 
 *jikes-1.22 (06 Oct 2004)
 
diff --git a/dev-java/jikes/Manifest b/dev-java/jikes/Manifest
index e7eb16ba4a34..89e5a561e8c2 100644
--- a/dev-java/jikes/Manifest
+++ b/dev-java/jikes/Manifest
@@ -1,16 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 22d5bb5b9e5100f090d8f6dda2af2872 jikes-1.21.ebuild 941
+MD5 b91f21a5c0083a0cb241e5352c931981 jikes-1.22-r1.ebuild 954
 MD5 3d436b62e655f8648c866d239f09b962 jikes-1.22.ebuild 877
-MD5 fdb8086bbfa42d2f6292f7b6442a189f ChangeLog 3226
+MD5 9cd1a2f30af273b287038f71f7ef4b44 ChangeLog 3495
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
+MD5 65e4a254ca3c3a3a504bcd1fe67effa3 files/deprecated.patch 1537
+MD5 69804c19e69a70f1d6c9bf2b837fbd8d files/digest-jikes-1.22-r1 63
 MD5 bbe4f7862346b14d9cc597f108b07db6 files/digest-jikes-1.21 63
 MD5 69804c19e69a70f1d6c9bf2b837fbd8d files/digest-jikes-1.22 63
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBZATc/rLF9B432nYRAo/zAKC++L1Ud+lNJ19bEvC1uf+Fq/+o3gCaApyU
-DGdLAa8nr3eD9j6E1R3zEmM=
-=1DJl
------END PGP SIGNATURE-----
diff --git a/dev-java/jikes/files/deprecated.patch b/dev-java/jikes/files/deprecated.patch
new file mode 100644
index 000000000000..1eee5be86db6
--- /dev/null
+++ b/dev-java/jikes/files/deprecated.patch
@@ -0,0 +1,37 @@
+--- src/decl.cpp 2004/09/26 22:40:411.144
++++ src/decl.cpp 2004/10/09 18:04:501.145
+@@ -1,4 +1,4 @@
+-// $Id: deprecated.patch,v 1.1 2004/10/12 19:21:14 axxo Exp $
++// $Id: deprecated.patch,v 1.1 2004/10/12 19:21:14 axxo Exp $
+ //
+ // This software is subject to the terms of the IBM Jikes Compiler
+ // License Agreement available at the following URL:
+@@ -2596,7 +2596,9 @@
+     //
+     if (control.option.deprecation &&
+         hidden_method -> IsDeprecated() &&
+-        ! method -> containing_type -> file_symbol -> IsClassOnly())
++        ! method -> containing_type -> file_symbol -> IsClassOnly() &&
++        ! method -> IsDeprecated() &&
++        ! InDeprecatedContext())
+     {
+         ReportSemError(SemanticError::DEPRECATED_METHOD_OVERRIDE,
+                        left_tok, right_tok, method -> Header(),
+
+diff -u -r1.159 -r1.160
+--- src/error.cpp 2004/09/26 22:40:411.159
++++ src/error.cpp 2004/10/10 02:59:401.160
+@@ -1,4 +1,4 @@
+-// $Id: deprecated.patch,v 1.1 2004/10/12 19:21:14 axxo Exp $
++// $Id: deprecated.patch,v 1.1 2004/10/12 19:21:14 axxo Exp $
+ //
+ // This software is subject to the terms of the IBM Jikes Compiler
+ // License Agreement available at the following URL:
+@@ -513,6 +513,7 @@
+     warning[DEPRECATED_FIELD] = WEAK_WARNING;
+     warning[DEPRECATED_METHOD] = WEAK_WARNING;
+     warning[DEPRECATED_CONSTRUCTOR] = WEAK_WARNING;
++    warning[DEPRECATED_METHOD_OVERRIDE] = WEAK_WARNING;
+ 
+     warning[UNNECESSARY_TYPE_IMPORT] = WEAK_WARNING;
+     warning[MULTIPLE_PUBLIC_TYPES] = WEAK_WARNING;
diff --git a/dev-java/jikes/files/digest-jikes-1.22-r1 b/dev-java/jikes/files/digest-jikes-1.22-r1
new file mode 100644
index 000000000000..cee0fd1c2e51
--- /dev/null
+++ b/dev-java/jikes/files/digest-jikes-1.22-r1
@@ -0,0 +1 @@
+MD5 cda958c7fef6b43b803e1d1ef9afcb85 jikes-1.22.tar.bz2 616655
diff --git a/dev-java/jikes/jikes-1.22-r1.ebuild b/dev-java/jikes/jikes-1.22-r1.ebuild
new file mode 100644
index 000000000000..12697e334dab
--- /dev/null
+++ b/dev-java/jikes/jikes-1.22-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jikes/jikes-1.22-r1.ebuild,v 1.1 2004/10/12 19:21:14 axxo Exp $
+
+inherit flag-o-matic
+
+DESCRIPTION="IBM's open source, high performance Java compiler"
+HOMEPAGE="http://oss.software.ibm.com/developerworks/opensource/jikes/"
+SRC_URI="ftp://www-126.ibm.com/pub/jikes/${PV}/${P}.tar.bz2"
+LICENSE="IBM"
+SLOT="0"
+KEYWORDS="~x86 ~sparc ~ppc ~amd64 ~alpha ~ia64 ~hppa"
+IUSE=""
+DEPEND="virtual/libc"
+DEPEND=""
+RESTRICT="nomirror"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/deprecated.patch
+}
+
+src_compile() {
+	filter-flags "-fno-rtti"
+	./configure \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+		--host=${CHOST} \
+	|| die "configure problem"
+	emake || die "compile problem"
+}
+
+src_install () {
+	make DESTDIR=${D} install || die "install problem"
+	dodoc ChangeLog COPYING AUTHORS README TODO NEWS
+}