Disabled jikes support (bug #10020). Also did some minor cleanup.

Package-Manager: portage-2.0.53_rc7

diff --git a/dev-java/makeme/ChangeLog b/dev-java/makeme/ChangeLog
index ec88791319b6da1435893c8637f506515ba80f94..49afc21cc179a75db28a4ed0d72643f8c10288f0 100644 (file)
--- a/dev-java/makeme/ChangeLog
+++ b/dev-java/makeme/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/makeme
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/makeme/ChangeLog,v 1.12 2005/04/22 08:41:42 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/makeme/ChangeLog,v 1.13 2005/11/26 03:00:04 nichoj Exp $
+
+  26 Nov 2005; Joshua Nichols <nichoj@gentoo.org> makeme-0.02-r2.ebuild:
+  Disabled jikes support (bug #10020). Also did some minor cleanup.
 
   22 Apr 2005; Simon Stelling <blubb@gentoo.org> makeme-0.02-r2.ebuild:
   stable on amd64

diff --git a/dev-java/makeme/Manifest b/dev-java/makeme/Manifest
index 73b8187c5d69986a5c5e1b03de6c767e6f452c7e..657eac661cb13dc0c33a4de274c732377924a246 100644 (file)
--- a/dev-java/makeme/Manifest
+++ b/dev-java/makeme/Manifest
@@ -1,16 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 4bfe256be3378e3d76b5df6acb295ab4 makeme-0.02-r2.ebuild 936
-MD5 fae6df78fc3cd7201af0dc4d162618ad ChangeLog 1930
-MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 42073845f19719593374d19b9e93b70d files/makeme.sh 832
+MD5 06ce9b5ce3aeda847a5f3e2a116bb35d ChangeLog 2073
 MD5 ca96d8806318e98767f9637b1720bb11 files/digest-makeme-0.02-r2 62
 MD5 5e4b953bd1a2fdf03070ac9c38a12e90 files/makeme-0.02-r2-gentoo.diff 893
+MD5 42073845f19719593374d19b9e93b70d files/makeme.sh 832
+MD5 b90fcaeb4395cdc33deef6b84c36ac24 makeme-0.02-r2.ebuild 943
+MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFC2CHu/rLF9B432nYRAjZFAKDMvlgGo3tnAGozF3+qV9N1K5FzXwCdFYFb
-Dy7RMEh8K+IyFnW8qTPh+wY=
-=jS/S
+iD8DBQFDh92gndWRXhKOboURAnTLAJ92PxpAJlyPYyQ+euPcRjalzNkDNwCeNjB+
+OVcqFSJquUL3SD+Hq6y0U4s=
+=DH9p
 -----END PGP SIGNATURE-----

diff --git a/dev-java/makeme/makeme-0.02-r2.ebuild b/dev-java/makeme/makeme-0.02-r2.ebuild
index 0316ac306962804345274525e216989f5df3ea9f..dc7b3ba0d42891fd37c9c758e8760c4770b2b83b 100644 (file)
--- a/dev-java/makeme/makeme-0.02-r2.ebuild
+++ b/dev-java/makeme/makeme-0.02-r2.ebuild
@@ -1,21 +1,24 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/makeme/makeme-0.02-r2.ebuild,v 1.12 2005/07/15 20:51:30 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/makeme/makeme-0.02-r2.ebuild,v 1.13 2005/11/26 03:00:04 nichoj Exp $
 
 inherit java-pkg eutils
 
 DESCRIPTION="Make utility written in Java"
-SRC_URI="mirror://sourceforge/makeme/makeme-0.02.tar.gz"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 HOMEPAGE="http://makeme.sf.net"
 RDEPEND=">=virtual/jre-1.4
        >=dev-java/antlr-2.7.1-r1"
 DEPEND=">=virtual/jdk-1.4
-       ${RDEPEND}
-       jikes? ( >=dev-java/jikes-1.13 )"
+       ${RDEPEND}"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ~ppc ~sparc amd64"
-IUSE="jikes"
+IUSE=""
+
+# jikes support disabled for now.
+# refer to bug #100020 and bug #89711
 
 src_unpack() {
        unpack ${A}
@@ -24,16 +27,15 @@ src_unpack() {
 }
 
 src_compile() {
-       if ! use jikes; then
+       #if ! use jikes; then
                sed -e 's!jikes!javac!' -i Makefile
-       fi
+       #fi
        make build || die "Compile failed"
        make install || die "Create Jar failed"
 }
 
 src_install() {
-       java-pkg_dojar makeme.jar
-       cp ${FILESDIR}/makeme.sh ${S}/makeme
-       dobin ${S}/makeme
-       doman doc/makeme.1
+       java-pkg_dojar ${PN}.jar
+       newbin ${FILESDIR}/${PN}.sh ${PN}
+       doman doc/${PN}.1
 }