chutzpah 14/04/24 22:55:35
Modified: jython-2.5.3-r3.ebuild ChangeLog
jython-2.7_beta1.ebuild
Log:
Fix sandbox errors related to new versions of jline trying to write a history
file (bug #508636).
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key
0xE3F69979BB4B8928DA78E3D17CBF44EF)
Revision Changes Path
1.2 dev-java/jython/jython-2.5.3-r3.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jython/jython-2.5.3-r3.ebuild?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jython/jython-2.5.3-r3.ebuild?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jython/jython-2.5.3-r3.ebuild?r1=1.1&r2=1.2
Index: jython-2.5.3-r3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/jython/jython-2.5.3-r3.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jython-2.5.3-r3.ebuild 21 Sep 2013 13:58:29 -0000 1.1
+++ jython-2.5.3-r3.ebuild 24 Apr 2014 22:55:35 -0000 1.2
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jython/jython-2.5.3-r3.ebuild,v
1.1 2013/09/21 13:58:29 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jython/jython-2.5.3-r3.ebuild,v
1.2 2014/04/24 22:55:35 chutzpah Exp $
EAPI="4"
@@ -130,6 +130,7 @@
exec java -cp "$(java-pkg_getjars
"${EANT_GENTOO_CLASSPATH}"):${EANT_GENTOO_CLASSPATH_EXTRA}:dist/${PN}-dev.jar" \
-Dpython.home="${ED}"/usr/share/${PN}-${SLOT} \
-Dpython.cachedir="${T}/.jythoncachedir" \
+ -Duser.home="${T}" \
org.python.util.jython "\${@}"
_EOF_
chmod +x "${T}"/jython || die
1.91 dev-java/jython/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jython/ChangeLog?rev=1.91&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jython/ChangeLog?rev=1.91&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jython/ChangeLog?r1=1.90&r2=1.91
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/jython/ChangeLog,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- ChangeLog 10 Mar 2014 16:57:18 -0000 1.90
+++ ChangeLog 24 Apr 2014 22:55:35 -0000 1.91
@@ -1,6 +1,11 @@
# ChangeLog for dev-java/jython
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jython/ChangeLog,v 1.90 2014/03/10
16:57:18 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jython/ChangeLog,v 1.91 2014/04/24
22:55:35 chutzpah Exp $
+
+ 24 Apr 2014; Patrick McLean <[email protected]> jython-2.5.3-r3.ebuild,
+ jython-2.7_beta1.ebuild:
+ Fix sandbox errors related to new versions of jline trying to write a history
+ file (bug #508636).
10 Mar 2014; Johannes Huber <[email protected]> jython-2.2.1-r2.ebuild:
x86 stable, bug #315557
1.3 dev-java/jython/jython-2.7_beta1.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jython/jython-2.7_beta1.ebuild?rev=1.3&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jython/jython-2.7_beta1.ebuild?rev=1.3&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jython/jython-2.7_beta1.ebuild?r1=1.2&r2=1.3
Index: jython-2.7_beta1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/jython/jython-2.7_beta1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- jython-2.7_beta1.ebuild 26 Mar 2013 03:51:47 -0000 1.2
+++ jython-2.7_beta1.ebuild 24 Apr 2014 22:55:35 -0000 1.3
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jython/jython-2.7_beta1.ebuild,v
1.2 2013/03/26 03:51:47 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jython/jython-2.7_beta1.ebuild,v
1.3 2014/04/24 22:55:35 chutzpah Exp $
EAPI=5
JAVA_PKG_IUSE="doc examples source"
@@ -96,12 +96,14 @@
}
src_install() {
+ local instdir=/usr/share/${PN}-${SLOT}
+
java-pkg_newjar dist/${PN}-dev.jar
java-pkg_register-optional-dependency jdbc-mysql
java-pkg_register-optional-dependency jdbc-postgresql
- insinto /usr/share/${PN}-${SLOT}
+ insinto ${instdir}
doins -r dist/{Lib,registry}
dodoc ACKNOWLEDGMENTS NEWS README.txt
@@ -130,8 +132,9 @@
# we need a wrapper to help python_optimize
cat <<-EOF > "${T}"/jython
exec java -cp "$(java-pkg_getjars
"${EANT_GENTOO_CLASSPATH}"):${EANT_GENTOO_CLASSPATH_EXTRA}:dist/${PN}-dev.jar" \
- -Dpython.home="${ED}"/usr/share/${PN}-${SLOT} \
+ -Dpython.home="${ED}${instdir}" \
-Dpython.cachedir="${T}/.jythoncachedir" \
+ -Duser.home="${T}" \
org.python.util.jython "\${@}"
EOF
chmod +x "${T}"/jython || die
@@ -142,7 +145,7 @@
# compile tests (everything else is compiled already)
# we're keeping it quiet since jython reports errors verbosely
# and some of the tests are supposed to trigger compile errors
- python_optimize "${ED}"/usr/share/jython-${SLOT}/Lib/test &>/dev/null
+ python_optimize "${ED}${instdir}"/Lib/test &>/dev/null
# for python-exec
echo "EPYTHON='${EPYTHON}'" > epython.py
@@ -150,7 +153,7 @@
# some of the class files end up with newer timestamps than the files
they
# were generated from, make sure this doesn't happen
- find "${ED}"/usr/share/jython-${SLOT}/Lib/ -name '*.class' | xargs touch
+ find "${ED}${instdir}"/Lib/ -name '*.class' | xargs touch
}
pkg_postinst() {
