fix paths in wrapper script. fix installion path(depends on being in Lib). changed the way everything gets compiled so we don't have to export the classpath and made it compile everythong

7 files changed, 87 insertions, 14 deletions

diff --git a/dev-java/jython/ChangeLog b/dev-java/jython/ChangeLog
index b37df2437359..5f78e00acc5a 100644
--- a/dev-java/jython/ChangeLog
+++ b/dev-java/jython/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/jython
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jython/ChangeLog,v 1.12 2004/08/27 19:46:31 sejo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jython/ChangeLog,v 1.13 2004/09/03 15:20:35 axxo Exp $
+
+  03 Sep 2004; Thomas Matthijs <axxo@gentoo.org> files/jython, files/jythonc:
+  fix paths in wrapper script. fix installion path(depends on being in Lib).
+  changed the way everything gets compiled so we don't have to export the
+  classpath and made it compile everythong
 
   27 Aug 2004; <SeJo@gentoo.org> jython-2.1-r4.ebuild:
   stable on ppc
diff --git a/dev-java/jython/Manifest b/dev-java/jython/Manifest
index 6ffee1a00ded..b814a5f7014f 100644
--- a/dev-java/jython/Manifest
+++ b/dev-java/jython/Manifest
@@ -1,6 +1,8 @@
-MD5 59de5005fe84515830cb1ed11567c25c ChangeLog 1496
-MD5 3e76c6936bda21c76da7f5e2f5eadb23 jython-2.1-r4.ebuild 2126
+MD5 0cc7f18b9ff13518794ee6dd291a18a7 jython-2.1-r5.ebuild 1750
+MD5 2c3be70b73898926cfab9e64d2592c77 jython-2.1-r4.ebuild 2126
+MD5 ae4e3f2b6ca4472b289a35e96bea4ccd ChangeLog 1570
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
+MD5 17272ca5f12bd9bb307210c12606d526 files/jythonc 67
+MD5 61d3aae70a79bd4b755cd408ad916037 files/jython 302
 MD5 6b146a799308d0793ac04ee93bebfad2 files/digest-jython-2.1-r4 61
-MD5 bc766076fc74f87782c093215e1fe1af files/jython 296
-MD5 735d15b2adcc2db8fdb6bac62fd847b7 files/jythonc 211
+MD5 6b146a799308d0793ac04ee93bebfad2 files/digest-jython-2.1-r5 61
diff --git a/dev-java/jython/files/digest-jython-2.1-r5 b/dev-java/jython/files/digest-jython-2.1-r5
new file mode 100644
index 000000000000..de8e46ef8258
--- /dev/null
+++ b/dev-java/jython/files/digest-jython-2.1-r5
@@ -0,0 +1 @@
+MD5 e3e6be56646fb7cd6d19a6a69bd76e2f jython-21.class 2780547
diff --git a/dev-java/jython/files/jython b/dev-java/jython/files/jython
index 551b764606f5..585649c9eed5 100644
--- a/dev-java/jython/files/jython
+++ b/dev-java/jython/files/jython
@@ -4,4 +4,4 @@
 # This file generated by Jython installer
 # Created on XXX by root
 
-`java-config --java` -Dpython.home="/var/jython" -classpath "`java-config --classpath=jython`:$CLASSPATH" "org.python.util.jython" "$@"
+`java-config --java` -Dpython.home="/usr/share/jython" -classpath "`java-config --classpath=jython`:$CLASSPATH" "org.python.util.jython" "$@"
diff --git a/dev-java/jython/files/jythonc b/dev-java/jython/files/jythonc
index 21adc6bca570..39efd0611dc4 100644
--- a/dev-java/jython/files/jythonc
+++ b/dev-java/jython/files/jythonc
@@ -1,7 +1,2 @@
 #!/bin/sh
-###############################################################################
-#
-# This file generated by Jython installer
-# Created on XXX by root
-
-jython "/var/jython/Tools/jythonc/jythonc.py" "$@"
+jython "/usr/share/jython/tools/jythonc/jythonc.py" "$@"
diff --git a/dev-java/jython/jython-2.1-r4.ebuild b/dev-java/jython/jython-2.1-r4.ebuild
index 2e815ad1d36e..86d8a6df69dc 100644
--- a/dev-java/jython/jython-2.1-r4.ebuild
+++ b/dev-java/jython/jython-2.1-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jython/jython-2.1-r4.ebuild,v 1.4 2004/08/27 19:46:31 sejo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jython/jython-2.1-r4.ebuild,v 1.5 2004/09/03 15:20:35 axxo Exp $
 
 DESCRIPTION="An implementation of Python written in Java"
 HOMEPAGE="http://www.jython.org"
@@ -25,7 +25,6 @@ src_unpack() {
 }
 
 compile_set() {
-
 	for x in $* ; do
 		if [ -d $x ] ; then
 			find $* -name "*.java"  | xargs ${javac} -source 1.3 -nowarn || die "Failed to compile"
diff --git a/dev-java/jython/jython-2.1-r5.ebuild b/dev-java/jython/jython-2.1-r5.ebuild
new file mode 100644
index 000000000000..331a9d6adf9b
--- /dev/null
+++ b/dev-java/jython/jython-2.1-r5.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jython/jython-2.1-r5.ebuild,v 1.1 2004/09/03 15:20:35 axxo Exp $
+
+inherit java-pkg
+
+DESCRIPTION="An implementation of Python written in Java"
+HOMEPAGE="http://www.jython.org"
+MY_PV="21"
+SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.class"
+LICENSE="JPython"
+SLOT="0"
+KEYWORDS="x86 ppc"
+IUSE="readline jikes"
+# servlet
+
+DEPEND=">=virtual/jdk-1.2
+	readline? ( >=dev-java/libreadline-java-0.8.0 )
+	jikes? ( >=dev-java/jikes-1.18 )
+	!dev-java/jython-bin"
+#	servlet? ( >=net-www/tomcat-5.0 )
+
+src_unpack() {
+	addwrite .hotspot
+	cd ${DISTDIR}
+	java ${PN}-${MY_PV} -o ${S}/ demo lib source
+}
+
+src_compile() {
+	javac=$(java-config -c)
+	if use jikes ; then
+		java=$(which jikes)
+	fi
+
+	local cp=".:${CLASSPATH}"
+	local exclude=""
+
+	if use readline ; then
+		cp=${cp}:$(java-config -p libreadline-java)
+	else
+		exclude="${exclude} ! -name ReadlineConsole.java"
+	fi
+
+	#if use servlet; then
+	#	cp=${cp}:$(java-config -p servlet)
+	#else
+		exclude="${exclude} ! -name PyServlet.java"
+	#fi
+
+	find org -name "*.java" ${exclude} | xargs ${javac} -cp ${cp} -source 1.3 -nowarn || die "Failed to compile"
+
+	find org -name "*.class" | xargs jar cf jython-${PV}.jar
+}
+
+src_install() {
+	java-pkg_dojar jython-${PV}.jar || die "install failed"
+
+	dodoc {README,LICENSE}.txt NEWS ACKNOWLEDGMENTS
+	dohtml -A .css .jpg .gif -r Doc
+	newbin ${FILESDIR}/jython jython
+	newbin ${FILESDIR}/jythonc jythonc
+
+	dodir /usr/share/jython/cachedir
+	chmod a+rw ${D}/usr/share/jython/cachedir
+
+	cp -R Lib ${D}/usr/share/${PN}/
+	cp -R Demo ${D}/usr/share/${PN}/
+
+	dodir /usr/share/${PN}/tools/
+	cp -R Tools/* ${D}/usr/share/${PN}/tools/
+}