fix paths, closes 49841

6 files changed, 62 insertions, 2 deletions

diff --git a/dev-java/jython/ChangeLog b/dev-java/jython/ChangeLog
index a6a7efe213af..b19345130acc 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.6 2004/06/24 22:37:17 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jython/ChangeLog,v 1.7 2004/07/16 15:58:45 axxo Exp $
+
+  16 Jul 2004; Thomas Matthijs <axxo@gentoo.org> :
+  fix python.home path in files/jython closes 49841
+  fix path in jythonc (although it still doesn't work, looks like it never did
+  if you know how to fix it, please let me know or file a bug on bugzilla)
 
   19 Jun 2004; Jason Wever <weeve@gentoo.org> jython-2.1-r2.ebuild:
   Stable on sparc.
diff --git a/dev-java/jython/Manifest b/dev-java/jython/Manifest
index e3fbaf862cff..caa902c94ee8 100644
--- a/dev-java/jython/Manifest
+++ b/dev-java/jython/Manifest
@@ -1,8 +1,12 @@
 MD5 292d505ec42093b78206a6458ef519d1 jython-2.1-r1.ebuild 917
+MD5 f3b598cbb1219d87d48611d5d41b0612 jython-2.1-r3.ebuild 975
 MD5 29d555bfa95df759a8266104183322c1 jython-2.1-r2.ebuild 866
-MD5 0a7ba0abeec0ca33a88586369ef9a7c7 ChangeLog 990
+MD5 e95e68aab918bfb1163943a039445872 ChangeLog 1117
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 735d15b2adcc2db8fdb6bac62fd847b7 files/jythonc 211
+MD5 371499092d6acc2155a3b21fe4da87df files/2.1-jythonc 217
 MD5 bc766076fc74f87782c093215e1fe1af files/jython 296
 MD5 6b146a799308d0793ac04ee93bebfad2 files/digest-jython-2.1-r1 61
 MD5 6b146a799308d0793ac04ee93bebfad2 files/digest-jython-2.1-r2 61
+MD5 6b146a799308d0793ac04ee93bebfad2 files/digest-jython-2.1-r3 61
+MD5 61d3aae70a79bd4b755cd408ad916037 files/2.1-jython 302
diff --git a/dev-java/jython/files/2.1-jython b/dev-java/jython/files/2.1-jython
new file mode 100644
index 000000000000..585649c9eed5
--- /dev/null
+++ b/dev-java/jython/files/2.1-jython
@@ -0,0 +1,7 @@
+#!/bin/sh
+###############################################################################
+#
+# This file generated by Jython installer
+# Created on XXX by root
+
+`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/2.1-jythonc b/dev-java/jython/files/2.1-jythonc
new file mode 100644
index 000000000000..696bfca33ba4
--- /dev/null
+++ b/dev-java/jython/files/2.1-jythonc
@@ -0,0 +1,7 @@
+#!/bin/sh
+###############################################################################
+#
+# This file generated by Jython installer
+# Created on XXX by root
+
+jython "/usr/share/jython/tools/jythonc/jythonc.py" "$@"
diff --git a/dev-java/jython/files/digest-jython-2.1-r3 b/dev-java/jython/files/digest-jython-2.1-r3
new file mode 100644
index 000000000000..de8e46ef8258
--- /dev/null
+++ b/dev-java/jython/files/digest-jython-2.1-r3
@@ -0,0 +1 @@
+MD5 e3e6be56646fb7cd6d19a6a69bd76e2f jython-21.class 2780547
diff --git a/dev-java/jython/jython-2.1-r3.ebuild b/dev-java/jython/jython-2.1-r3.ebuild
new file mode 100644
index 000000000000..088a6451531f
--- /dev/null
+++ b/dev-java/jython/jython-2.1-r3.ebuild
@@ -0,0 +1,36 @@
+# 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-r3.ebuild,v 1.1 2004/07/16 15:58:45 axxo Exp $
+
+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 ~sparc ~amd64"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.2"
+
+src_unpack() {
+	addwrite .hotspot
+	cd ${DISTDIR}
+	java ${PN}-${MY_PV} -o ${S}/ demo lib source
+
+}
+
+src_install() {
+	dojar jython.jar
+	dodoc {README,LICENSE}.txt NEWS ACKNOWLEDGMENTS
+	dohtml -A .css .jpg .gif -r Doc
+	newbin ${FILESDIR}/${PV}-jython jython
+	newbin ${FILESDIR}/${PV}-jythonc jythonc
+
+	dodir /usr/share/jython/cachedir
+	chmod a+rw ${D}/usr/share/jython/cachedir
+
+	cp -R Lib/* ${D}/usr/share/${PN}/lib/
+	mkdir ${D}/usr/share/${PN}/tools/
+	cp -R Tools/* ${D}/usr/share/${PN}/tools/
+}