summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Trygve Kalleberg <karltk@gentoo.org>2004-07-31 16:01:14 +0000
committerKarl Trygve Kalleberg <karltk@gentoo.org>2004-07-31 16:01:14 +0000
commit4910babe4890b94a004f0f499d422200bd27a9ef (patch)
treeb218b8f6855121d5bb8c44a89d7fa511aa51e2a6 /dev-java
parentadd virtual/xemacs (diff)
downloadhistorical-4910babe4890b94a004f0f499d422200bd27a9ef.tar.gz
historical-4910babe4890b94a004f0f499d422200bd27a9ef.tar.bz2
historical-4910babe4890b94a004f0f499d422200bd27a9ef.zip
Hello all idlers in #gentoo-commits
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/jython/Manifest2
-rw-r--r--dev-java/jython/jython-2.1-r4.ebuild42
2 files changed, 23 insertions, 21 deletions
diff --git a/dev-java/jython/Manifest b/dev-java/jython/Manifest
index 8866973a4a7b..68c753c7fa2c 100644
--- a/dev-java/jython/Manifest
+++ b/dev-java/jython/Manifest
@@ -1,4 +1,4 @@
-MD5 4e205898d5b834d331e96694fea15351 jython-2.1-r4.ebuild 2033
+MD5 9a6efc0af44671228baee6f62bec53e5 jython-2.1-r4.ebuild 2133
MD5 10853891dbd291f3a09155c2cb2eb8e0 ChangeLog 1416
MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
MD5 735d15b2adcc2db8fdb6bac62fd847b7 files/jythonc 211
diff --git a/dev-java/jython/jython-2.1-r4.ebuild b/dev-java/jython/jython-2.1-r4.ebuild
index d7c0d4edd27e..c4f0b0597613 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.1 2004/07/31 15:51:57 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jython/jython-2.1-r4.ebuild,v 1.2 2004/07/31 16:01:14 karltk Exp $
DESCRIPTION="An implementation of Python written in Java"
HOMEPAGE="http://www.jython.org"
@@ -9,12 +9,13 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.class"
LICENSE="JPython"
SLOT="0"
KEYWORDS="~x86 ~ppc"
-IUSE="readline"
+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 )
@@ -28,9 +29,9 @@ compile_set() {
for x in $* ; do
if [ -d $x ] ; then
- find $* -name "*.java" | xargs ${javac} -source 1.3 -nowarn
+ find $* -name "*.java" | xargs ${javac} -source 1.3 -nowarn || die "Failed to compile"
else
- ${javac} -source 1.3 -nowarn $x
+ ${javac} -source 1.3 -nowarn $x || die "Failed to compile"
fi
done
}
@@ -44,27 +45,28 @@ src_compile() {
# 2004-07-31: karltk
# Hack to not clutter up the CLASSPATH env var globally
- (
- export CLASSPATH="/opt/sun-jdk-1.4.2.04/jre/lib/rt.jar"
+ oldCLASSPATH=${CLASSPATH}
- compile_set org/python/core org/python/rmi org/python/parser
+ export CLASSPATH=${CLASSPATH}:.
- compile_set org/python/util/jython.java
+ compile_set org/python/core org/python/rmi org/python/parser
+ compile_set org/python/util/jython.java
- if use readline ; then
- export CLASSPATH="${CLASSPATH}:$(java-config -p libreadline-java)"
- compile_set org/python/util/ReadlineConsole.java
- fi
+ if use readline ; then
+ export CLASSPATH="${CLASSPATH}:$(java-config -p libreadline-java)"
+ compile_set org/python/util/ReadlineConsole.java
+ fi
+
+ # 2004-07-31: karltk
+ # Need to add back in most of org/python/modules/
+# if use servlet ; then
+# CLASSPATH="${CLASSPATH}:$(java-config -p servlet)"
+# compile_set org/python/util/PyServlet.java
+# fi
- # 2004-07-31: karltk
- # Need to add back in most of org/python/modules/
-# if use servlet ; then
-# CLASSPATH="${CLASSPATH}:$(java-config -p servlet)"
-# compile_set org/python/util/PyServlet.java
-# fi
+ find org -name "*.class" | xargs jar cf jython-${PV}.jar
- find org -name "*.class" | xargs jar cf jython-${PV}.jar
- )
+ export CLASSPATH=${oldCLASSPATH}
}
src_install() {