upstream patch closes bug 66977,66840
authorThomas Matthijs <axxo@gentoo.org>
Tue, 12 Oct 2004 19:21:14 +0000 (19:21 +0000)
committerThomas Matthijs <axxo@gentoo.org>
Tue, 12 Oct 2004 19:21:14 +0000 (19:21 +0000)
dev-java/commons-httpclient/Manifest
dev-java/jikes/ChangeLog
dev-java/jikes/files/deprecated.patch [new file with mode: 0644]
dev-java/jikes/files/digest-jikes-1.22-r1 [new file with mode: 0644]
dev-java/jikes/jikes-1.22-r1.ebuild [new file with mode: 0644]

index 087541a88e3b42267210d4b0437b62d9a1824dcd..7d6614bd7ad0ff6199f2b364091b05a50313e13f 100644 (file)
@@ -2,7 +2,7 @@
 Hash: SHA1
 
 MD5 ab33374dfff86c590745d0d56a66b709 commons-httpclient-2.0-r1.ebuild 1277
-MD5 938023b9de8503ab37da34ca49675a8d commons-httpclient-2.0.1.ebuild 1527
+MD5 2727bb4213e85a6a6ba87e40351a5ae0 commons-httpclient-2.0.1.ebuild 1543
 MD5 56e4a0a544bb367ce3a07ad69fd84576 ChangeLog 1309
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 22c430c6bf50bc578f8095df5fd64cc4 files/digest-commons-httpclient-2.0.1 81
@@ -11,7 +11,7 @@ MD5 70dbd7a345c0a9f6a17998de0191f13e files/digest-commons-httpclient-2.0-r1 79
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBbC5t/rLF9B432nYRAh7fAJsE9MjWMT8NyoZUHob4uNfGQYzrpACgw5Pu
-9fiNKF86jP5k3ewJDXPE1AI=
-=rgYA
+iD8DBQFBbC8i/rLF9B432nYRAjmTAJ9BvUmNKhKTVkEbsep+QspFr0JoFwCfbvqh
+FBamzjxXbrqPSe/VN6XsEY8=
+=V0OF
 -----END PGP SIGNATURE-----
index 96600dd431c74c3f78da08de8828696f7654c1e9..64eeb563247f234858135d5598b30c2c39cd926f 100644 (file)
@@ -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/files/deprecated.patch b/dev-java/jikes/files/deprecated.patch
new file mode 100644 (file)
index 0000000..1eee5be
--- /dev/null
@@ -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 (file)
index 0000000..cee0fd1
--- /dev/null
@@ -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 (file)
index 0000000..12697e3
--- /dev/null
@@ -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
+}