Version bump to 2.5.3

Package-Manager: portage-2.2.0_alpha121/cvs/Linux x86_64

3 files changed, 154 insertions, 16 deletions

diff --git a/dev-java/jython/ChangeLog b/dev-java/jython/ChangeLog
index 6624b319f625..f81de420da86 100644
--- a/dev-java/jython/ChangeLog
+++ b/dev-java/jython/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/jython
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jython/ChangeLog,v 1.77 2012/08/20 02:44:35 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jython/ChangeLog,v 1.78 2012/08/25 19:57:23 thev00d00 Exp $
+
+*jython-2.5.3 (25 Aug 2012)
+
+  25 Aug 2012; <iwhyman@gentoo.org> +jython-2.5.3.ebuild:
+  Version bump to 2.5.3
 
   20 Aug 2012; Christoph Junghans <ottxor@gentoo.org> jython-2.5.2-r1.ebuild:
   added prefix keywords
diff --git a/dev-java/jython/Manifest b/dev-java/jython/Manifest
index 006e0d75082d..d39f1f79213b 100644
--- a/dev-java/jython/Manifest
+++ b/dev-java/jython/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX 2.1-assert-SimpleCompiler.py.patch 504 SHA256 bc7c86f2e0355c33cf3dee92be54b8174c3c69a468c59766d6706980ba9ad00f SHA512 340c91c27b148c9f9d005f944ecfbb07293d7ccc80398e803d910ce6dfa5aa044db54ca72ae2ed5f3714a6208de65d5209746bdc5caf0e534461a3d6b314df5d WHIRLPOOL eb638436908a84aa062c06eca96aeb46921fc43fbdaf14ecbac9f732252f15e275201a856908d1d130d6599cc55cac3631402e302a12ebcf14a9cd95a5393dee
 AUX 2.1-assert.patch 2052 SHA256 b7f491be967853107f47a7b7da489a66ae7c8acedc9d51261b3999ba4f877567 SHA512 56c1bb7cc6785a51951eb34923670a59d621998605fddcdd42f136055b094c5c42d9287370eccc2c39dfa3b3414d7f345b47daefa533a017cdb01d7d1364a47d WHIRLPOOL ac2bcb5057e53d9ee38bd371cb937fddb15753549a6572ad080d914c08158332d0063e86711f61ceb60e4bdc984866f1d7d49f57ac6969a684de681b657c0955
 AUX jython-2.2.1-build.patch 3285 SHA256 3078b381ac9a4ef0edf03b6c3253cbe436497b9f843aa45e43194e8b36f2d7e4 SHA512 e0936cd6fdca71f4df7c77959c343bcf74af496b048bbd2d285eb961700d0dd875c386d4efd85a61f89dcb67e55bfcff5f9e480e1e85bdfcbcd26aebefcb0397 WHIRLPOOL 2b3997555b38d3f5b8c7f75955a25eba66ef5a1a870a10e86ac6426e38bb9d28b0b3129437a13325290ea6bd943dc16cbd624b5cb6e4849ec8e756e58a8cc299
@@ -18,6 +15,7 @@ DIST Python-2.2.3.tgz 6709556 SHA256 a8f92e6b89d47359fff0d1fbfe47f104afc77fd1cd5
 DIST Python-2.5.5.tgz 11606370 SHA256 03be1019c4fe93daeb53ba9e4294bf22a8ed4cb854cbd57e24e16f6bf63e2392 SHA512 787b3e99386e3b52bca63c3191ccb90418e8c5eb5eef3f4c4d8bda76cc5dd558aa28d8146a610ee66e58c1e3967516d073986b073df326685170143f191c152c WHIRLPOOL ac504a4afe70b706b5f3bf19314d97f1ecdb49067feb0137455dfc02c010cb99a145fd4afeef230bb9e2991309499b68e81a91b4e6da588af3fe40bfdb29a60c
 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-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
 EBUILD jython-2.1-r11.ebuild 2934 SHA256 9ce1e028309ecc0d8f804fad81ce80f9ed81ef9f089aa01c26c17a47b79baf3f SHA512 73056839842a49593083e5d22babe1fd4aaa2ed64305208129e5b7c981f3f6a5782627ac7ab819fa1305250b3bd23e7da3fb7c3bac262bb3dd8e5692b5c24a62 WHIRLPOOL 11e1f46dbbbb80058ae1a059782c5e0fa9cef25d39b5320742c5eff220e209b11b818d7429a7af8a83f8726e58e83c17cc85518cf9e949b930d09cffbb37e102
@@ -25,16 +23,6 @@ EBUILD jython-2.2.1-r1.ebuild 3769 SHA256 936d381297b273398a608fc879331f147f555e
 EBUILD jython-2.5.1-r2.ebuild 5606 SHA256 a6c0b84a70d266616ffe73062986615502e60ed39426d517f6089640fdc689ec SHA512 5eaa7bb9c03e947945be8248c1db5e1024654c1d11e61471a1b7686845719da21544369d40cabf31240f6beecab6e9eae169f29c05dcf9846ecec51b8f269356 WHIRLPOOL 55d0bceda9d789ceba4ab54b63bc976e319e8a30307f53e0754b4d6b8bae93845368012bb8b06033ea1ebdfc4ce6831ad0552457c8d6d535ef5e10c7b74823ad
 EBUILD jython-2.5.2-r1.ebuild 4158 SHA256 01e4cc57e54c78e52f149bcfc591bc4c903b9d2bc4d4472427063173cd46a0ae SHA512 59a31a88f31becf078106f0b494e657098e546323e80cc2b94990d6b3648191b81e36e269472feac5cf58adb421d6ff2c13f7cbb01089b338f2875daf5616b3a WHIRLPOOL c2c4700231f3222972e256f85ecf6bdcf6bbbd5607b4a4800b73c7e6fd50b5a8221ee092f056c421334e842978629190a3818d2770e2ab5752f98e55d12c3ece
 EBUILD jython-2.5.2.ebuild 3994 SHA256 02c73bb9608f0df1062be34efc1a64c10f85ba9a1a7281aaaa002951d35af457 SHA512 4c733f032f346bd70741baf1d95f961a900c6f80c9397de8e78d34d8ccfe4a709a9f8c2f38588abb4769feb81ca418e3c07ddd6ad3dc56356184f418a22036c8 WHIRLPOOL 3df09b4f18fc1f896c507cdf9f7ec4ae0b7fccd2441857d031d7bad445eb76fbdf197e0c89c8e655d8ba411b5a1ec947755c20354c84aec946541746531179c8
-MISC ChangeLog 12418 SHA256 ec0eea3e1caa9d06e35eadc512dfdfdb8ef4219fc4c564656ae2cdd9097c335c SHA512 714295188d72d7ec345db71a73f6bc61e813f13c652252b432a6af5b5ed51e6215b79d099a816033f3bd76a1a031f4318af1266286e64b30661927aa99737ceb WHIRLPOOL c9172912ba3e290fc0fd3fdd7a72f6b94cd10cc8baa4b014de6bdf058ffcc6b49cd53afda425b530b2777e175f041bd76ac90a19a80b14052ca7d4b9c984786d
+EBUILD jython-2.5.3.ebuild 4128 SHA256 1294fa046a097fef7fbe9a8ddf789ef6c636d1c6cfee961421019ce1f2e84542 SHA512 177aa20141c06da31e1a19ee67e32996a06d208529033c58f94b955c3f3a6b9cf68d6beb47a05651a13f62cbedcd6c360b8539cdb4076f5ff8029a005dcd178b WHIRLPOOL d598c921b02618cf1ac248b2fdbb18fa208234a7126e4e6057ca1e3077c9ade383708e3d5cc66327c749cbdb108d96e805375759db274d4f2ff8d90b871d6634
+MISC ChangeLog 12533 SHA256 b09b5bb6cbc4f82cfa09563eee547eb324bd825ca902b9339cef4a66eb190a53 SHA512 6612d674a7a472db5617f22f34989cf1e2a765451363b09dcf974cf28223215f5f49a3e22d3739ecc9a163329b453410d71e582fbe7a4d442d3fe7a359b3e2da WHIRLPOOL 4143d34e5f1842bd671d627c35ced268a6fab05564e2f766c9857fa3a24b7584cf7236ade4225af59db3f218dc0b695943773a3f66ae3c6a4a93b240e6a7f652
 MISC metadata.xml 315 SHA256 03b5b706f53aa9de54b5296c58699a4ad543ee0b7fb5b8fc6cf2ab89ac487198 SHA512 756be0e6a24eea5544801dd33f0a5fdaf7b28c9bbef05baac97ab304e00879066d19ef5f02370640364df05a91e509992155a13e185b2b7e9806e554aac7c92a WHIRLPOOL 9a5ffdfa34b9ebf36b7392b8bb81f607bc482a267be083c0c765ccf7c1af18e2621370bfdb26b200581a5d3cbb28221a8f275a6f3acd2ec683e31ab59e06a951
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQEcBAEBCAAGBQJQMaSZAAoJEOeBhlrCAAWGqDYIAJ8d+Cyp0tJMarvcbj0B9nZe
-BwpPDd9pONps2W6RL0D4de2VjjTsKomrGHfRHzW+Zdv6K9fBUwbJjK5jk2kgwvDp
-m2KieF3GrA8l5xeQw/u59uWu7CfC2Usp4Q6MkY6GTlxLegtStjxxU2PVEsnjlvZT
-2KfzlMcklNixo1lGbdGfxaOTNNsDfHfoJ+DJgmH2Gr7lGEIfZO0uBLXqJQfzBKP+
-zHYofgGnwCauN6TRlNcgNRzxFUxzaiHC4VfLbXL9hzusw+JuG5i1mfn8GjxBsxbv
-LsOfqLqXPpq/qGLQQOk+Vdv8hte9n0fiz+ieAPbgupC1dupDtYQY5PX6UX/LqNs=
-=QvHb
------END PGP SIGNATURE-----
diff --git a/dev-java/jython/jython-2.5.3.ebuild b/dev-java/jython/jython-2.5.3.ebuild
new file mode 100644
index 000000000000..2f2cf58690a4
--- /dev/null
+++ b/dev-java/jython/jython-2.5.3.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2012 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.ebuild,v 1.1 2012/08/25 19:57:23 thev00d00 Exp $
+
+EAPI="4"
+
+JAVA_PKG_IUSE="doc examples source"
+
+inherit eutils java-pkg-2 java-ant-2 python
+
+PYTHON_ABI="${SLOT}-jython"
+
+DESCRIPTION="An implementation of Python written in Java"
+HOMEPAGE="http://www.jython.org"
+SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${PN}_installer-${PV}.jar"
+SRC_URI="http://central.maven.org/maven2/org/python/${PN}-installer/${PV}/${PN}-installer-${PV}.jar"
+
+LICENSE="PSF-2"
+SLOT="2.5"
+KEYWORDS="~amd64 ~x86"
+IUSE="readline"
+
+# Missing in installer jar.
+RESTRICT="test"
+
+COMMON_DEP="
+	!<=dev-java/freemarker-2.3.10
+	dev-java/antlr:3
+	dev-java/asm:3
+	dev-java/guava:0
+	>=dev-java/java-config-2.1.11-r3
+	dev-java/jffi:1.0
+	dev-java/jline:0
+	dev-java/jnr-constants:0
+	dev-java/jnr-posix:1.1
+	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"
+
+S="${WORKDIR}"
+
+pkg_setup() {
+	java-pkg-2_pkg_setup
+	python_pkg_setup
+}
+
+java_prepare() {
+	# src/META-INF/services missing - taking from prebuilt jar
+	pushd src > /dev/null || die
+		jar -xf ../${PN}.jar META-INF/services || die
+	popd > /dev/null
+
+	find \( -name '*.jar' -o -name '*.class' -o -name '*.pyc' -o -name '*.exe' \) -exec rm -v {} + || die
+
+	epatch "${FILESDIR}/${PN}-2.5.2-build.xml.patch"
+
+	epatch "${FILESDIR}/${PN}-2.5.2-distutils_byte_compilation.patch"
+	epatch "${FILESDIR}/${PN}-2.5.2-distutils_scripts_location.patch"
+	epatch "${FILESDIR}/${PN}-2.5.2-respect_PYTHONPATH.patch"
+
+	use readline || rm -v src/org/python/util/ReadlineConsole.java || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+JAVA_ANT_CLASSPATH_TAGS+=" java"
+
+EANT_BUILD_TARGET="developer-build"
+EANT_GENTOO_CLASSPATH="asm-3,guava,jffi-1.0,jline,jnr-constants,script-api,servlet-api-2.5"
+
+# 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"
+
+src_compile() {
+	use readline && EANT_GENTOO_CLASSPATH+=",libreadline-java"
+
+	EANT_GENTOO_CLASSPATH_EXTRA="$(java-pkg_getjars --with-dependencies antlr-3,jnr-posix-1.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}\"" \
+		bin/jython || die
+
+	java-pkg-2_src_compile
+}
+
+EANT_TEST_EXTRA_ARGS="-Dpython.home=dist"
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	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}
+	doins -r dist/{Lib,registry}
+	python_clean_installation_image -q
+
+	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/*
+
+	cat > "${T}"/pre <<-EOF
+		if [[ -n "\${JYTHON_SYSTEM_CACHEDIR}" ]]; then
+			jython_cache_dir="${EPREFIX}/var/cache/${PN}/${SLOT}-\${EUID}"
+		else
+			jython_cache_dir="\${HOME}/.jythoncachedir"
+		fi
+	EOF
+	local java_args=(
+		-Dpython.home="${EPREFIX}"/usr/share/${PN}-${SLOT}
+		-Dpython.executable="${EPREFIX}"/usr/bin/jython${SLOT}
+		-Dpython.cachedir="\${jython_cache_dir}"
+	)
+	java-pkg_dolauncher jython${SLOT} \
+		--main org.python.util.jython \
+		--java_args "${java_args[*]}" \
+		-pre "${T}"/pre
+
+	if use readline; then
+		sed -i -e "/#python.console.readlinelib=JavaReadline/a \
+			python.console=org.python.util.ReadlineConsole\npython.console.readlinelib=GnuReadline" \
+			"${ED}"/usr/share/${PN}-${SLOT}/registry || die
+	fi
+}
+
+pkg_postinst() {
+	python_mod_optimize -f -x "/(site-packages|test|tests)/" $(python_get_libdir)
+}
+
+pkg_postrm() {
+	python_mod_cleanup $(python_get_libdir)
+}