Fix sandbox errors related to new versions of jline trying to write a history file (bug #508636).

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xE3F69979BB4B8928DA78E3D17CBF44EF

4 files changed, 34 insertions, 25 deletions

diff --git a/dev-java/jython/ChangeLog b/dev-java/jython/ChangeLog
index 1284a1b6a913..746704680988 100644
--- a/dev-java/jython/ChangeLog
+++ b/dev-java/jython/ChangeLog
@@ -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 <chutzpah@gentoo.org> 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 <johu@gentoo.org> jython-2.2.1-r2.ebuild:
   x86 stable, bug #315557
diff --git a/dev-java/jython/Manifest b/dev-java/jython/Manifest
index 1ccf7301ac80..c69db34deb3f 100644
--- a/dev-java/jython/Manifest
+++ b/dev-java/jython/Manifest
@@ -32,24 +32,24 @@ EBUILD jython-2.2.1-r2.ebuild 3736 SHA256 1a983a6318274e200dc285e96dcbd01c4f228c
 EBUILD jython-2.5.1-r2.ebuild 5606 SHA256 a6c0b84a70d266616ffe73062986615502e60ed39426d517f6089640fdc689ec SHA512 5eaa7bb9c03e947945be8248c1db5e1024654c1d11e61471a1b7686845719da21544369d40cabf31240f6beecab6e9eae169f29c05dcf9846ecec51b8f269356 WHIRLPOOL 55d0bceda9d789ceba4ab54b63bc976e319e8a30307f53e0754b4d6b8bae93845368012bb8b06033ea1ebdfc4ce6831ad0552457c8d6d535ef5e10c7b74823ad
 EBUILD jython-2.5.2-r2.ebuild 4232 SHA256 5e84cee35324d5d1740b2afd5f7d2dfbbe1c77da97373c6eb9a66a89088a419d SHA512 00cd44609a84ee5bcabba6b9d34bb9ce40424ea0874be5a42ac911ecaa0c5786b5807158eded99ad1c9996992429fa04023571b7038135c5de01151a2d643203 WHIRLPOOL 890c00fb89a4e5dca81c06dd2c7d2ff71b428ac74902cbc7e7537126a8a3d23bff96cda151ff7cf7f8ceebe1f7650177e73e96ec50c8335e6d95532caa180fe4
 EBUILD jython-2.5.3-r2.ebuild 4538 SHA256 9d80344c0ab202bfea7345ec3db54b2d80f5e73161c2107fdbad5ad5ee7458de SHA512 3f3b32523bf04ed893ea1ebd5d2ce16a1e80fa013906454540b4a788aedd488e685fad2f216c342d493d4e04addee2d8c3be7aa7c130a4c8ff0cfcf6efd6dd5b WHIRLPOOL 0060962283e581fafed63862f850e10cd22c332e50305ec9ac26f7c9685aa4c94c2ab895cf5bdc07e9e562662a263719e8b8c68abd23ef127bd373c599940619
-EBUILD jython-2.5.3-r3.ebuild 4551 SHA256 92c5f95f00cfa303b561be80273f0622a92cf9d61d692a77439ed6a5d97c2a59 SHA512 e856f09b36b2bf455bab6c761d36638e3e8b5dfab4b16261764014cbfb269005915b14a3a7f0363fb5dde9feeb2b03fc5c6d4a4249625ada1a7cc374b06fade1 WHIRLPOOL 34dfbd50992f5ff099e540baa599b0ee98cc214d08b41c0220250e9501385fee523ca89b51535ba4155a8805a2a7b0354a1a411cd7f04acc06a167997aaaa4b5
-EBUILD jython-2.7_beta1.ebuild 5153 SHA256 f6539cdc7ec63bd2fc65b1de75bede08596505c0b94fa69eefc3d8116c815ac8 SHA512 b889c739234b30eb4f8aaa66283bb9326ebe2094a642856edbe23ae7febb858284b68a8f9c6dfd7aee22db3b1808e199a3b2402d8bdca76c73f47303b40869eb WHIRLPOOL 6da3e7e8c675ccc03ce83dec52391d6882c2869e121cd1e1795b502bca35f35474cf6d561b85f56126c71fa96177da3dcb8b8b3ae1dc24ec2d5e2c72ae070637
-MISC ChangeLog 14571 SHA256 ed21ea087cedb89e8fca70de4ff19295f6df7b1d1c3c86738256695ed23e83dc SHA512 ea784ad03bc3a39366b367ff91042ddb3403b26b471ab9220adf29989cd5596e3e67281cf49f74b7a248142c1a370d8da9d4ecad1cfc63cb836c4eddde3c3ad6 WHIRLPOOL 24fb785f0a8381680eaf2141c703d4e0bc5b0358a4ba96b7ef1181b16c799d884cda9c410e5fdab36cf891df94f63c35fbd3e18841320e25dd1adf03b4631aaf
+EBUILD jython-2.5.3-r3.ebuild 4575 SHA256 9099c7c2f772afc632c5427cf794256d17ac50efe724176d8dff608e57478f0a SHA512 629c2e8dbcca5ce6e031db3ed9ef26a248f486062fbcfed72e75447fb2082205d7e55dffcefa97b0aa12d1ff72cae0c50c26707c2c00f4df7d683fb3e16e5ce7 WHIRLPOOL a6419959c28e9a6048de7658413a4e8aa25ac7266aafb8703e4753eb7942c0b69aa25ab64d3cca98bc1c9821f4360778b3c1f321b0dae644aeeaed8c77826e60
+EBUILD jython-2.7_beta1.ebuild 5159 SHA256 35bc6560ddac6a382ffa883b191dcc3c38aa5ab1f7905d62068402531d1438d0 SHA512 b148c200b562d566545e14071631da1d91a3151d76cb9a9d18bed5ed1395bccfd96d9bd14bde3bad3fd62eab3787b17421d7d4f6b33cddab688162beafacfd8e WHIRLPOOL 85562296640a43ef85c5d94cf4b6f97c28188f525ec29ec1d28ceebd2f7f5b7281ac708174f34b362c3bc6139d3281fb19790194a06b68f4df4b75a4a99cefa3
+MISC ChangeLog 14781 SHA256 35f8241e0c4844ef057364b39ca69f6b98241b6bcb72b96a40d10e1381082c9c SHA512 aabdb9132425bd7422d16812a1441170e9e2e163b7d962c2bca44ec4d7a207b9b077d70fbda0fc6f455f6e1133eeb52d0c0ee4324d1365c302ac0e034a560d6d WHIRLPOOL 601abe0c1bfac52252b5a401998b0a28f865d092fa15169f0e197a7a853a6dbf33e7e4a45140ee4cd58ff91a864fb7d0650d004abe9641b54e260fad52ea2817
 MISC metadata.xml 315 SHA256 03b5b706f53aa9de54b5296c58699a4ad543ee0b7fb5b8fc6cf2ab89ac487198 SHA512 756be0e6a24eea5544801dd33f0a5fdaf7b28c9bbef05baac97ab304e00879066d19ef5f02370640364df05a91e509992155a13e185b2b7e9806e554aac7c92a WHIRLPOOL 9a5ffdfa34b9ebf36b7392b8bb81f607bc482a267be083c0c765ccf7c1af18e2621370bfdb26b200581a5d3cbb28221a8f275a6f3acd2ec683e31ab59e06a951
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTHe7vAAoJEGVpnaTzz9K9iqUQALSvO/6rnAHJ3zgJok147OSJ
-TPLcfk/HwjlcLMf652EK+bg6anEffdj7vbTuOY040tZ4DIDxsXswKfYUYjBqFoHH
-aD9mzpERAnVBADgh7CEawjz/BH45UxVOInuqdzaBZ68Ng5NCqmiA9flKo4PffeeM
-2ZW7w/Z6tQD3BRO1wt9nupn8OMwNVZR9L4YWN22mEgOz12/ATqtv7KpPb7ef96oq
-7h4dsUPrS7R80pdbbISsh4t5tOnT9+VMUNqfKf/rz8DNNmGRgxUA/uxwu3gew4p0
-sYPnQJp0dG9zL/Sk948M19SMkLPYZTplMcpCdVZgYSwZeCMpKaHbL5m2aPIYnmIQ
-Cv1nhbci/wHIzoIvJEbEWAsRlmq2psNHZybbbB9rcHI+90jfAspa8vz9wSEbr0Tn
-fozsLOJCyIOYesiIuM34XHR0vvFuEddM5Wj9LTsTkPh+v/dOx0Ay8aBZ1CIsszC5
-XIch3gjW14ieoymFs0sAddldwDciQSBibnupVrB0+Y8MXAsN+YZAc/RK163QoDeO
-D0wIwZwa71PtQhbplfNBgIUuu5fXHqDZMf18NhozaSHhQYchGqUkwVqNS2dZrB6z
-RhSu5sJerq4pG72eYRsrUhdmp77tORAuiueFTQO21WV90GnZrxmi7Aq+hj80xt40
-Wcy2N4wO7qlW/B/kGF96
-=+U98
+iQIcBAEBCAAGBQJTWZZ8AAoJEHy/RO9cNQiDSJwP/RC+r6NqaoS7jIWRbM7OWHKR
+MmRuBw0athu73tvLPQ8VCb6ltGVEuf2dnzGVWRhj7W8J2NIwGwVhmzVsXEJppKBZ
+SP9GRKjsEpWYNzUoiSCdZk77+TRgy1/SmlurVLmkjOZQhPsHmq1AkrUsVq24jYJ1
+59W9KYaSRdlbLU7joIh/wfOCGeGKGC5ZTXyaKCq+KYoeTrT4wCbsPpAu3KRNu6D3
+BkIRo1lIrASpT1T/to+XURzrcf/OazXSBcKZ+F0qtyLe8aQV6DZZJpeurOc6L3+R
+cAjHdZKvSjXoaAGLfADrlRE04SDjz242IQffBVc7CJIKRa+NUZY1m25xsHGJ5bzA
+m687iOrnJNUoxaqQ6dJ5HwAffdYqBv09z26Gc5rjuhN58OLHUMM/2JTt/Ha9OI14
+80dp9yqK3QW94wNkiPOFmd1GyQ1fwIVOAMSKVoqb6a55Qa4RCq/PjqAJ/7Q50aeo
+9fldIpmAY4DokieQyvY6yLxRMPfxz1fQCOPIjFqGmZYT5iQnvAth1PSQuUpQ7g/r
+xzqnx2aS1uwIcJlwOjTpS/XyM5ug/MeSUGv7qKPtd87oRxF3PPcs+n0sozlsKrF8
+sCA45kjxypsi36DQ6LpLvGi9mvyrrsVqhrX54yJUjbThE+g9iO/R/0L0DFcDqbVg
+Ei9XQEExDkLYwZEF5Ug2
+=U/bu
 -----END PGP SIGNATURE-----
diff --git a/dev-java/jython/jython-2.5.3-r3.ebuild b/dev-java/jython/jython-2.5.3-r3.ebuild
index 5492b50782ce..b0b3ff98156c 100644
--- a/dev-java/jython/jython-2.5.3-r3.ebuild
+++ b/dev-java/jython/jython-2.5.3-r3.ebuild
@@ -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 @@ src_install() {
 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
diff --git a/dev-java/jython/jython-2.7_beta1.ebuild b/dev-java/jython/jython-2.7_beta1.ebuild
index f0041a39fd2b..95471d7b944b 100644
--- a/dev-java/jython/jython-2.7_beta1.ebuild
+++ b/dev-java/jython/jython-2.7_beta1.ebuild
@@ -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_test() {
 }
 
 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 @@ src_install() {
 	# 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 @@ src_install() {
 	# 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 @@ src_install() {
 
 	# 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() {