Various fixes; closes #13652.

7 files changed, 75 insertions, 56 deletions

diff --git a/dev-java/makeme/ChangeLog b/dev-java/makeme/ChangeLog
index e308cb89228e..8ad497da305b 100644
--- a/dev-java/makeme/ChangeLog
+++ b/dev-java/makeme/ChangeLog
@@ -1,6 +1,15 @@
 # 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.3 2003/02/12 05:54:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/makeme/ChangeLog,v 1.4 2003/05/24 04:21:00 absinthe Exp $
+
+*makeme-0.02-r2 (24 May 2003)
+
+  24 May 2003; Dylan Carlson <absinthe@gentoo.org> makeme-0.02-r2.ebuild,
+  files/makeme-0.02-r2-gentoo.diff, files/makeme.sh:
+
+  Many fixes... Should close #13652, but have no real-world test 
+  scenarios for this. Please reopen that bug should there be 
+  continued problems.
 
 *makeme-0.02-r1 (1 Feb 2002)
 
diff --git a/dev-java/makeme/Manifest b/dev-java/makeme/Manifest
index a97374ded928..0cb2a4470ae8 100644
--- a/dev-java/makeme/Manifest
+++ b/dev-java/makeme/Manifest
@@ -1,8 +1,5 @@
-MD5 07758d0f496daae6cedc61b02828c931 makeme-0.02-r2.ebuild 902
-MD5 6a6ee57c9f99ded6acb271968bc2a0f9 ChangeLog 815
-MD5 ca941a421dc05f8ae9382af4e40be0e2 makeme-0.02-r1.ebuild 968
-MD5 521e2b1ac0447ca483a9fab4f4e42aaf files/makeme.sh 734
-MD5 ca96d8806318e98767f9637b1720bb11 files/digest-makeme-0.02-r1 62
+MD5 e0254f8ff35475d5c61a8ade3e64ac2a makeme-0.02-r2.ebuild 904
+MD5 39b7b45872157c2d65f97dec6d9b22f8 ChangeLog 1127
+MD5 daf51d865c22c406d6069ca8980a42aa files/makeme.sh 830
 MD5 ca96d8806318e98767f9637b1720bb11 files/digest-makeme-0.02-r2 62
-MD5 ffb77a3fb38c4599392006237721c9a7 files/makeme-0.02-r1-gentoo.diff 957
 MD5 a737fb4370c5313cf1e58c0a8ddd80c7 files/makeme-0.02-r2-gentoo.diff 899
diff --git a/dev-java/makeme/files/digest-makeme-0.02-r1 b/dev-java/makeme/files/digest-makeme-0.02-r2
index 6b6f8f679133..6b6f8f679133 100644
--- a/dev-java/makeme/files/digest-makeme-0.02-r1
+++ b/dev-java/makeme/files/digest-makeme-0.02-r2
diff --git a/dev-java/makeme/files/makeme-0.02-r1-gentoo.diff b/dev-java/makeme/files/makeme-0.02-r1-gentoo.diff
deleted file mode 100644
index 8c2e104c3c5f..000000000000
--- a/dev-java/makeme/files/makeme-0.02-r1-gentoo.diff
+++ /dev/null
@@ -1,22 +0,0 @@
---- Makefile.orig	Wed Sep 26 19:53:12 2001
-+++ Makefile	Wed Sep 26 19:53:16 2001
-@@ -7,14 +7,14 @@
- 
- build:
- 	#first run antlr.Tool
--	CLASSPATH=/usr/share/java/antlrall.jar kaffe antlr.Tool -o gnu/makeme/parser gnu/makeme/parser/makeme.g
--	CLASSPATH=/usr/share/kaffe/Klasses.jar:/usr/share/java/antlrall.jar:. jikes -d . $(JAVA_SOURCES)
-+	CLASSPATH=$(CLASSPATH):/usr/share/antlr/antlrall.jar $(JAVA_HOME)/bin/java antlr.Tool -o gnu/makeme/parser gnu/makeme/parser/makeme.g
-+	CLASSPATH=$(CLASSPATH):/usr/share/antlr/antlrall.jar:. jikes -d . $(JAVA_SOURCES)
- 
- install:
- #	cp -Rv $(JAVA_CLASSES) $(DESTDIR)/usr/share/java/repository
--	fastjar cvf makeme.jar $(JAVA_CLASSES)
--	fastjar xvf makeme.jar $(DESTDIR)/usr/share/java/repository
--	install teaseme $(DESTDIR)/usr/bin/
-+	jar cvf makeme.jar $(JAVA_CLASSES)
-+	jar xvf makeme.jar $(DESTDIR)/usr/share/java/repository
-+	install makeme $(DESTDIR)/usr/bin/
- clean:
- 	rm -f $(JAVA_CLASSES)
- 	rm -f makeme.jar
diff --git a/dev-java/makeme/files/makeme-0.02-r2-gentoo.diff b/dev-java/makeme/files/makeme-0.02-r2-gentoo.diff
new file mode 100644
index 000000000000..00418765e134
--- /dev/null
+++ b/dev-java/makeme/files/makeme-0.02-r2-gentoo.diff
@@ -0,0 +1,24 @@
+--- Makefile.orig	2003-05-24 00:08:09.000000000 -0400
++++ Makefile	2003-05-24 00:08:33.000000000 -0400
+@@ -7,18 +7,8 @@
+ 
+ build:
+ 	#first run antlr.Tool
+-	CLASSPATH=/usr/share/java/antlrall.jar kaffe antlr.Tool -o gnu/makeme/parser gnu/makeme/parser/makeme.g
+-	CLASSPATH=/usr/share/kaffe/Klasses.jar:/usr/share/java/antlrall.jar:. jikes -d . $(JAVA_SOURCES)
++	CLASSPATH=$(CLASSPATH):/usr/share/antlr/lib/antlrall.jar $(JAVA_HOME)/bin/java antlr.Tool -o gnu/makeme/parser gnu/makeme/parser/makeme.g
++	CLASSPATH=$(CLASSPATH):/usr/share/antlr/lib/antlrall.jar:. jikes -d . $(JAVA_SOURCES)
+ 
+ install:
+-#	cp -Rv $(JAVA_CLASSES) $(DESTDIR)/usr/share/java/repository
+-	fastjar cvf makeme.jar $(JAVA_CLASSES)
+-	fastjar xvf makeme.jar $(DESTDIR)/usr/share/java/repository
+-	install teaseme $(DESTDIR)/usr/bin/
+-clean:
+-	rm -f $(JAVA_CLASSES)
+-	rm -f makeme.jar
+-
+-
+-
+-
++	jar cvf makeme.jar $(JAVA_CLASSES)
diff --git a/dev-java/makeme/files/makeme.sh b/dev-java/makeme/files/makeme.sh
index da2cf25942a3..624f92a7e1b2 100644
--- a/dev-java/makeme/files/makeme.sh
+++ b/dev-java/makeme/files/makeme.sh
@@ -1,15 +1,31 @@
-#! /bin/sh
+#!/bin/sh
+# makeme Launch Script
+# Author: Dylan Carlson
+# May 2003
+# $Header: /var/cvsroot/gentoo-x86/dev-java/makeme/files/makeme.sh,v 1.3 2003/05/24 04:21:00 absinthe Exp $
 
-if [ -z "$JAVA_HOME" ] ; then
-	echo "!!! JAVA_HOME not set"
-	exit -1
+JAVA_HOME=`/usr/bin/java-config --jdk-home`
+if [ -z "${JAVA_HOME}" ] ; then
+	JAVA_HOME=`/usr/bin/java-config --jre-home`
 fi
+CLASSPATH="${CLASSPATH}:`/usr/bin/java-config --classpath=antlr,makeme`"
 
-newcp=""
-for i in antlr makeme ; do
-	newcp=`cat < /usr/share/$i/classpath.env`:${newcp}
-done
-
-CLASSPATH=${newcp}:${CLASSPATH}
+if [ ! -f ${JAVA_HOME}/bin/java ] ; then
+	echo " "
+	echo "I tried using the following Java Runtime:"
+	echo "${JAVA_HOME}/bin/java" 
+	echo " "
+	echo "Java Runtime missing.  Please run java-config(1) and ensure"
+	echo "your environment is configured properly."
+	exit 1
+else
+	echo " "
+	echo "Using Java Runtime:"
+	echo "${JAVA_HOME}/bin/java" 
+	echo " "
+	echo "Using CLASSPATH:"
+	echo "${CLASSPATH}"
+	echo " "
+fi
 
-${JAVA_HOME}/bin/java -cp ${CLASSPATH} gnu.makeme.MakeMe $*
+${JAVA_HOME}/bin/java gnu.makeme.MakeMe $*
diff --git a/dev-java/makeme/makeme-0.02-r1.ebuild b/dev-java/makeme/makeme-0.02-r2.ebuild
index 465a366c9cce..06747f8ea073 100644
--- a/dev-java/makeme/makeme-0.02-r1.ebuild
+++ b/dev-java/makeme/makeme-0.02-r2.ebuild
@@ -1,40 +1,35 @@
 # 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-r1.ebuild,v 1.9 2003/02/13 10:22:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/makeme/makeme-0.02-r2.ebuild,v 1.1 2003/05/24 04:21:00 absinthe Exp $
+
+inherit java-pkg
 
 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=">=virtual/jdk-1.2
-        >=dev-java/jikes-1.13
+DEPEND=">=dev-java/jikes-1.13
         >=dev-java/antlr-2.7.1-r1"
 RDEPEND=">=virtual/jdk-1.2
-	>=dev-java/antlr-2.7.1-r1"
+		>=dev-java/antlr-2.7.1-r1"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="x86 ~ppc ~sparc ~alpha"
 
 src_unpack() {
 	unpack makeme-0.02.tar.gz
-    
 	cd ${S}
 	patch -p0 < ${FILESDIR}/${PF}-gentoo.diff
 }
         
 src_compile() {
-	make build || die
+	make build || die "Compile failed"
+	make install || die "Create Jar failed"
 }
 
 src_install () {
-	dodir usr/share/makeme
-	dodir usr/bin
-	insinto usr/share/makeme
-	doins makeme.jar
-	exeinto /usr/bin
-	newexe ${FILESDIR}/makeme.sh makeme
+	java-pkg_dojar makeme.jar
+	cp ${FILESDIR}/makeme.sh ${S}/makeme
+	dobin ${S}/makeme
 	doman doc/makeme.1
-	echo "/usr/share/makeme/makeme.jar" > ${D}/usr/share/makeme/classpath.env
 }
-