summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdrian Almenar <strider@gentoo.org>2003-08-15 06:20:03 +0000
committerAdrian Almenar <strider@gentoo.org>2003-08-15 06:20:03 +0000
commitf0b5570c5796e25916d5630ec6eb69a3c8c8c885 (patch)
treeb2767565a94ec528bc9477f312232254d539b7c3 /dev-java
parentinitial commit (diff)
downloadgentoo-2-f0b5570c5796e25916d5630ec6eb69a3c8c8c885.tar.gz
gentoo-2-f0b5570c5796e25916d5630ec6eb69a3c8c8c885.tar.bz2
gentoo-2-f0b5570c5796e25916d5630ec6eb69a3c8c8c885.zip
Fixes bug 21887
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/makeme/ChangeLog6
-rw-r--r--dev-java/makeme/Manifest4
-rw-r--r--dev-java/makeme/makeme-0.02-r2.ebuild14
3 files changed, 17 insertions, 7 deletions
diff --git a/dev-java/makeme/ChangeLog b/dev-java/makeme/ChangeLog
index 8ad497da305b..1cc20a77f6c3 100644
--- a/dev-java/makeme/ChangeLog
+++ b/dev-java/makeme/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-java/makeme
# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/makeme/ChangeLog,v 1.4 2003/05/24 04:21:00 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/makeme/ChangeLog,v 1.5 2003/08/15 06:19:30 strider Exp $
+
+ 15 Aug 2003; Adrian Almenar <strider@gentoo.org> makeme-0.02-r2.ebuild:
+ Fixes bug 21887, That makes the ebuild to build with jikes java compiler,
+ Thanks to Jonas Berlin <jberlin@cc.hut.fi> for the patch
*makeme-0.02-r2 (24 May 2003)
diff --git a/dev-java/makeme/Manifest b/dev-java/makeme/Manifest
index 96c62f27d971..dcb7ad96a6ee 100644
--- a/dev-java/makeme/Manifest
+++ b/dev-java/makeme/Manifest
@@ -1,5 +1,5 @@
-MD5 e0254f8ff35475d5c61a8ade3e64ac2a makeme-0.02-r2.ebuild 904
-MD5 39b7b45872157c2d65f97dec6d9b22f8 ChangeLog 1127
+MD5 a26681dea1f22925a426af1b4a35e5dd makeme-0.02-r2.ebuild 1072
+MD5 e42972dbe9fa917b2d841f56e3b59292 ChangeLog 1336
MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
MD5 daf51d865c22c406d6069ca8980a42aa files/makeme.sh 830
MD5 ca96d8806318e98767f9637b1720bb11 files/digest-makeme-0.02-r2 62
diff --git a/dev-java/makeme/makeme-0.02-r2.ebuild b/dev-java/makeme/makeme-0.02-r2.ebuild
index 06747f8ea073..145df4cef266 100644
--- a/dev-java/makeme/makeme-0.02-r2.ebuild
+++ b/dev-java/makeme/makeme-0.02-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2003 Gentoo Technologies, Inc.
# 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.1 2003/05/24 04:21:00 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/makeme/makeme-0.02-r2.ebuild,v 1.2 2003/08/15 06:19:30 strider Exp $
inherit java-pkg
@@ -8,13 +8,14 @@ S=${WORKDIR}/${P}
DESCRIPTION="Make utility written in Java"
SRC_URI="mirror://sourceforge/makeme/makeme-0.02.tar.gz"
HOMEPAGE="http://makeme.sf.net"
-DEPEND=">=dev-java/jikes-1.13
+DEPEND="jikes? ( >=dev-java/jikes-1.13 )
>=dev-java/antlr-2.7.1-r1"
-RDEPEND=">=virtual/jdk-1.2
- >=dev-java/antlr-2.7.1-r1"
+RDEPEND="virtual/jdk
+ >=dev-java/antlr-2.7.1-r1"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="x86 ~ppc ~sparc ~alpha"
+IUSE="jikes"
src_unpack() {
unpack makeme-0.02.tar.gz
@@ -23,6 +24,11 @@ src_unpack() {
}
src_compile() {
+ if [ -z "`use jikes`" ] ; then
+ cp Makefile Makefile.orig
+ einfo "Configuring build for Jikes"
+ sed 's!jikes!javac!' < Makefile.orig > Makefile
+ fi
make build || die "Compile failed"
make install || die "Create Jar failed"
}