Version bump.

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

3 files changed, 200 insertions, 16 deletions

diff --git a/dev-java/jython/ChangeLog b/dev-java/jython/ChangeLog
index 746704680988..56e615e5f7bc 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.91 2014/04/24 22:55:35 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jython/ChangeLog,v 1.92 2014/06/27 22:27:42 chutzpah Exp $
+
+*jython-2.7_beta2 (27 Jun 2014)
+
+  27 Jun 2014; Patrick McLean <chutzpah@gentoo.org> +jython-2.7_beta2.ebuild:
+  Version bump.
 
   24 Apr 2014; Patrick McLean <chutzpah@gentoo.org> jython-2.5.3-r3.ebuild,
   jython-2.7_beta1.ebuild:
diff --git a/dev-java/jython/Manifest b/dev-java/jython/Manifest
index c69db34deb3f..81e5c0968cdb 100644
--- a/dev-java/jython/Manifest
+++ b/dev-java/jython/Manifest
@@ -23,6 +23,7 @@ DIST Python-2.5.5.tgz 11606370 SHA256 03be1019c4fe93daeb53ba9e4294bf22a8ed4cb854
 DIST jython-2.1.tar.bz2 1301528 SHA256 faa57a55d137268e80221cd628b234ca67de13504b813be1c0499c9f4d5872b2 SHA512 397ad2819eb5bb39e1b0c0673922af7fbb75f680d707a7c344d21f680901a6fd96eddbbed8b464fb91cccd6f38a9f9b1a8f8327a530ac870002b72c38bf75ad3 WHIRLPOOL 00a1e7376b1883fc835dc801d718041a623ab0406393135d452df613fbbb9a87ab6bf4429b07260e93530f04031e531d4e041bacf22491d7ec0db76a41d77061
 DIST jython-2.5.1.tar.bz2 14470421 SHA256 23bc356ac6e1037cc305dc9791a247f4cfffe7b9e3ceb5b2a97449529cf4aa1d SHA512 c56aecf57ff8fc0872c2b10216f19f9f9456cf05e8b09486e5826007f92d99b95c74416f3272556aca3dcc964f411b116f5011122a5be7cd815f54b447f53f1d WHIRLPOOL e2910a0b97b0bc2080a9a7d32c83f22630f11d51b1a8dc9d495a51a2972fc2f5066860e9eb0ae0be89a99b8327ff106d645d773e6dedb65ddf0dd76e15c6f86a
 DIST jython-2.7-b1-sources.jar 10972175 SHA256 969fd3b26975a1bb9c16f36173bff61f40b7104378a5a12dea391ed3801e4ca7 SHA512 661732242a5195cbb4c9d4635d9a5dd7c09ba270b8c6b88200badb0b4987fefe1ce322ed23995e6723e571584e4e63c8d7f603fff450ed9cb5ad0b2cac73f5ad WHIRLPOOL 7dd78af2dd3e8958a23d07b6c96c1f240dcccd3fc04b4edb322108c7d12bdde95e96a6ec477f71c390179615df92209a2de5717aa3988722f537ec524c7571ed
+DIST jython-2.7-b2-sources.jar 10867556 SHA256 aab612ab3fedd5fff32c4444a94e5a3b0884e08cb394d47ff5c1c3d88e899139 SHA512 3ecd87d595d3436fb65888c59a387b725b1768f4dd5551d440da3c6ae38000d7298d92cc149b3a72491138e4f4fd78aa1c3f8db1aaa0cf75a5122887777359e1 WHIRLPOOL 1c472e823abcd614ebafc04a31330bee16c0113350a5c42123d604c813c9d9a466ae83fc1749f04201a83e849ac3a3590a9cd03febabd22426c4c65751068974
 DIST jython-installer-2.5.3.jar 18487200 SHA256 05405966cdfa57abc8e705dd6aab92b8240097ce709fb916c8a0dbcaa491f99e SHA512 92d00cc8d885806749c67d1dc820e7b402c807b9a40277073fc3ea1f3dd10e1e506dc241a342874db8109120e8f0031a8dc7a4db6a88dfdc6c89906eeb9d454d WHIRLPOOL e8e3adf741a35b5e4de6c67b8805582cabc8590afac28c2e4ae3b61c4bd38d41904d7d1e4a23de21e7870d628e33a52f540fc89780a4724403b0bd92e1159768
 DIST jython_installer-2.2.1.jar 4663097 SHA256 586858aa16a8b269eaaec59f5b64031ec504d33da35cba98ebac811b0e838e68 SHA512 d33262dec95dbecfc007a738ed8d8cd4844c215e451b7ab126940f1157079aa846a104f3587ad84c4a009249632e3aaa3c83479ee8f47c30c4b4833bcdd582b3 WHIRLPOOL bae264f67547a975bf648b3de0cc2becb5d51e14b2ca1a977f7c3d45ec96bd3fd4fd99b0ff6912fb38d54d57656225c51c4b8a474c6ca8fe7fc16e12ab4bbec8
 DIST jython_installer-2.5.2.jar 18435770 SHA256 1b7168b961e31ddd89012a36cde611c340dadfd8b60b81c4248b026730ee2f29 SHA512 ea9d1573f1f86aba13554292418be65579e55d695c9ab625402cc9478a1fed56654eb7ef5e750c9ebdcfe388c7f007016d88dedd6e6652d2a61f7681963118c4 WHIRLPOOL 3621162d9cffa2d0312b775af6cd342fdb17a25b965b2b736b1d03fe70512f05a645eb336a5d01135555fb843f6d4498e43530675e306373f98c8184a375e96b
@@ -34,22 +35,23 @@ EBUILD jython-2.5.2-r2.ebuild 4232 SHA256 5e84cee35324d5d1740b2afd5f7d2dfbbe1c77
 EBUILD jython-2.5.3-r2.ebuild 4538 SHA256 9d80344c0ab202bfea7345ec3db54b2d80f5e73161c2107fdbad5ad5ee7458de SHA512 3f3b32523bf04ed893ea1ebd5d2ce16a1e80fa013906454540b4a788aedd488e685fad2f216c342d493d4e04addee2d8c3be7aa7c130a4c8ff0cfcf6efd6dd5b WHIRLPOOL 0060962283e581fafed63862f850e10cd22c332e50305ec9ac26f7c9685aa4c94c2ab895cf5bdc07e9e562662a263719e8b8c68abd23ef127bd373c599940619
 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
+EBUILD jython-2.7_beta2.ebuild 5322 SHA256 97635d6a44c9c48405a566e1164db89e9413b79ce9bb2881853f9289969160ef SHA512 fd0bed41bcb36cc538e48578d449bfbd36918e33dc4ab4f86f13cf61d8ce8ab01b3447ffd3c961a1b6913ee4a043f22527e6961cc6702b8a33bdc7b00328a22b WHIRLPOOL f4bc4d04047598743d80e0563569178892fe9fc1d5c17a6d1d478a602f0e48fee6282677703f93634941f8798f86bb27d995276ca78bcfe81b32ca3551145981
+MISC ChangeLog 14909 SHA256 b2b91a5c1e5b7f9f0caecc0c92c37bf8152736e05f94ca77bb23d4ba17e218a1 SHA512 a3b548c59a93a76d53a30c86205a2d1264878e19aaae4d8b8904f0d39806b2862b0f8c917edf0debfff5abc77613ef80478ff67f33286c5952541435416a558e WHIRLPOOL 3fd10906309009d44f9f4795e26b26a087bd7d14618475fd55c8ecf75ecfe2952bd42abd2ee9635f6cc6f46af3dd0489db39ac36f786c2cf3f11c2029de9cd11
 MISC metadata.xml 315 SHA256 03b5b706f53aa9de54b5296c58699a4ad543ee0b7fb5b8fc6cf2ab89ac487198 SHA512 756be0e6a24eea5544801dd33f0a5fdaf7b28c9bbef05baac97ab304e00879066d19ef5f02370640364df05a91e509992155a13e185b2b7e9806e554aac7c92a WHIRLPOOL 9a5ffdfa34b9ebf36b7392b8bb81f607bc482a267be083c0c765ccf7c1af18e2621370bfdb26b200581a5d3cbb28221a8f275a6f3acd2ec683e31ab59e06a951
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-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
+iQIcBAEBCAAGBQJTre/fAAoJEHy/RO9cNQiDrT0P/jDgPu8neKLyvJfrmyWwYwd+
+NloblOs1OcNaevBaLBvCk3rn87GtvEzJLanpj3ALVIJ93CA2rwB5meReXFzJDgq1
+2M/brNQXhW9H7IUO9H9y/90uYH+FMW1wb6PNDKgDdP4xbC+w0YzKwmx1ZXh1OzLZ
+VP86xS7/MdoFbEpoEDY2GHXm3xRKJ9LicoD1avL96eJLsQ85Sq3VhnuORUY/+lV8
+7Broa8fNQWO0Vyad0eMfH3NoF+rIrJh5BS+sp1JOt3pAvo8fo7muxhRJzSMz/B9t
+t/Km9Qm7ewBgF/HApYlNu83ws0OXLJzGeX8ixvTaa3tlOaV9HoPJomv/8nXo6Cnf
++1Tg+AEla5pUk75DNU5yuNFUZ1mH84MolgR+j4RBOO+/h+2atFui2pbkHqp5dARF
+pq1nMH98pYvUbhxDnPVLwp3eM39LE3YTH+SFtpKaSJgRmDqlQ8m5BfKfEJSjqxvH
+YmRwqg+leFZAjNXAP0bCrh2q4lX7bTslqR1+2kpVMpRAJaIOnBIC91TyYn/soyzj
+JKnLN4wdHtP5ePpgH7Hi1eybv3Y021BAygZpbtjMk62J6UC5r5ZSlYN/S9P5nMOl
+LsoclpW/1Up1mS+PxIBW5plWoAP2m7K9nW7+OJcaQW6ripsGKRf8cg56UFcrEbhL
+lyEZxWTHPAUrnX1V8oPX
+=iwW1
 -----END PGP SIGNATURE-----
diff --git a/dev-java/jython/jython-2.7_beta2.ebuild b/dev-java/jython/jython-2.7_beta2.ebuild
new file mode 100644
index 000000000000..b876622ee764
--- /dev/null
+++ b/dev-java/jython/jython-2.7_beta2.ebuild
@@ -0,0 +1,177 @@
+# 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_beta2.ebuild,v 1.1 2014/06/27 22:27:42 chutzpah Exp $
+
+EAPI=5
+JAVA_PKG_IUSE="doc examples source"
+
+inherit eutils java-pkg-2 java-ant-2 python-utils-r1 flag-o-matic
+
+MY_PV=${PV/_beta/-b}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="An implementation of Python written in Java"
+HOMEPAGE="http://www.jython.org"
+SRC_URI="http://search.maven.org/remotecontent?filepath=org/python/${PN}/${MY_PV}/${MY_P}-sources.jar"
+
+LICENSE="PSF-2"
+SLOT="2.7"
+KEYWORDS="~amd64 ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="+readline test"
+REQUIRED_USE="test? ( readline )"
+
+COMMON_DEP="
+	dev-java/antlr:3
+	dev-java/asm:4
+	dev-java/commons-compress:0
+	dev-java/guava:13
+	>=dev-java/java-config-2.1.11-r3
+	dev-java/jffi:1.2
+	dev-java/jline:0
+	dev-java/icu4j:52
+	dev-java/jnr-constants:0
+	dev-java/jnr-posix:2.1
+	dev-java/stringtemplate:0
+	dev-java/xerces:2
+	java-virtuals/script-api:0
+	java-virtuals/servlet-api:2.5
+	readline? ( >=dev-java/libreadline-java-0.8.0:0 )"
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-1.5"
+DEPEND="${COMMON_DEP}
+	>=virtual/jdk-1.5
+	app-arch/unzip
+	test? (
+		dev-java/junit:4
+		dev-java/ant-junit:0
+	)"
+
+S=${WORKDIR}
+
+RESTRICT="test"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+EANT_GENTOO_CLASSPATH="asm-4,commons-compress,guava-13,jffi-1.2,jline,jnr-constants"
+EANT_GENTOO_CLASSPATH+=",script-api,servlet-api-2.5,stringtemplate,xerces-2,icu4j-52"
+JAVA_ANT_CLASSPATH_TAGS+=" java"
+
+EANT_BUILD_TARGET="developer-build"
+EANT_TEST_EXTRA_ARGS="-Dpython.home=dist"
+
+# jdbc-informix and jdbc-oracle-bin (requires registration) aren't exposed.
+# Uncomment and add to COMMON_DEP if you want either of them
+#EANT_GENTOO_CLASSPATH+=",jdbc-informix"   EANT_EXTRA_ARGS+=" -Dinformix.present"
+#EANT_GENTOO_CLASSPATH+=",jdbc-oracle-bin" EANT_EXTRA_ARGS+=" -Doracle.present"
+
+java_prepare() {
+	find \( -name '*.jar' -o -name '*.class' \
+		-o -name '*.pyc' -o -name '*.exe' \) -delete
+
+	epatch "${FILESDIR}"/${PN}-2.5.2-distutils_scripts_location.patch
+	epatch "${FILESDIR}"/${PN}-2.5.2-respect_PYTHONPATH.patch
+	epatch "${FILESDIR}"/${PN}-2.7_beta1-ant.patch
+	epatch "${FILESDIR}"/${PN}-2.7_beta1-dont-always-recompile-classes.patch
+
+	if ! use readline; then
+		rm -v src/org/python/util/ReadlineConsole.java || die
+	fi
+
+	# needed for launchertest
+	chmod +x tests/shell/test-jython.sh || die
+
+	# apparently this can cause problems
+	append-flags -fno-stack-protector
+}
+
+src_compile() {
+	use readline && EANT_GENTOO_CLASSPATH+=",libreadline-java"
+
+	EANT_GENTOO_CLASSPATH_EXTRA="$(java-pkg_getjars --with-dependencies antlr-3,jnr-posix-2.1)"
+	EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjars --build-only ant-core)"
+
+	sed -i -e "1 a\
+		CLASSPATH=\"$(java-pkg_getjars "${EANT_GENTOO_CLASSPATH}"):${EANT_GENTOO_CLASSPATH_EXTRA}\"" \
+		src/shell/jython || die
+
+	java-pkg-2_src_compile
+}
+
+src_test() {
+	java-pkg-2_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 ${instdir}
+	doins -r dist/{Lib,registry}
+
+	dodoc ACKNOWLEDGMENTS NEWS README.txt
+
+	use doc && java-pkg_dojavadoc dist/Doc/javadoc
+	use source && java-pkg_dosrc src/*
+	use examples && java-pkg_doexamples Demo/*
+
+	local java_args=(
+		-Dpython.home="${EPREFIX}"/usr/share/${PN}-${SLOT}
+		-Dpython.executable="${EPREFIX}"/usr/bin/jython${SLOT}
+		-Dpython.cachedir="\${HOME}/.jythoncachedir"
+	)
+
+	java-pkg_dolauncher jython${SLOT} \
+		--main org.python.util.jython \
+		--java_args "${java_args[*]}"
+
+	if use readline; then
+		sed \
+			-e "s/#\(python.console=org.python.util.ReadlineConsole\)/\1/" \
+			-e "/#python.console.readlinelib=JavaReadline/a python.console.readlinelib=GnuReadline" \
+			-i "${ED}"/usr/share/${PN}-${SLOT}/registry || die
+	fi
+
+	# 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}${instdir}" \
+			-Dpython.cachedir="${T}/.jythoncachedir" \
+			-Duser.home="${T}" \
+			org.python.util.jython "\${@}"
+	EOF
+	chmod +x "${T}"/jython || die
+
+	python_export jython${SLOT} EPYTHON PYTHON_SITEDIR
+	local PYTHON="${T}"/jython
+
+	# 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}${instdir}"/Lib/test &>/dev/null
+
+	# for python-exec
+	echo "EPYTHON='${EPYTHON}'" > epython.py
+	python_domodule epython.py
+
+	# 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}${instdir}"/Lib/ -name '*.class' | xargs touch
+}
+
+pkg_postinst() {
+	if ! has_version dev-java/jython ; then
+		elog
+		elog "readline can be configured in the registry:"
+		elog
+		elog "python.console=org.python.util.ReadlineConsole"
+		elog "python.console.readlinelib=GnuReadline"
+		elog
+		elog "Global registry: '${EROOT}usr/share/${PN}-${SLOT}/registry'"
+		elog "User registry: '~/.jython'"
+		elog "See http://www.jython.org/docs/registry.html for more information."
+		elog
+	fi
+}