Incorporate fixes from 2.5.2-r1 into 2.5.3-r1

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

5 files changed, 23 insertions, 169 deletions

diff --git a/dev-java/jffi/Manifest b/dev-java/jffi/Manifest
index 4ff96ec30d97..a6d635cfcbd1 100644
--- a/dev-java/jffi/Manifest
+++ b/dev-java/jffi/Manifest
@@ -19,5 +19,5 @@ EBUILD jffi-0.7_pre20100131.ebuild 2611 SHA256 edeef1882353285c5d42a2bc19b1ee323
 EBUILD jffi-1.0.0.ebuild 2274 SHA256 a5fe1144dacf4f666105ef56cec8a8bf7b246a68dbde639ec4a0c9c867a2d4b1 SHA512 35894dc27f8b0d0f672d1d39548af68057f79e252663cf2c9ec8802e7dabb6d721afd3e1d030b37f7c7c37e395c39cbf5cda2a5b4b97f95d17fa3aa9b4d642cc WHIRLPOOL 986db534860b62f5dce5a12667410dfeb7c120a0a3f9e4fc5c57dca37d694204a4ac2b4b3d2b76bc7a961d15a88c7868c2290eab253a46f0f1b64a32d48191b8
 EBUILD jffi-1.0.11.ebuild 2493 SHA256 affcd6d55af34b30b83074a675ccea2cc571df0eaf1b837e6c5e484f80acc021 SHA512 2a3e8ceeeb6dfd7bafe7bc1d53a12ec35b204cc10bb833412076b219fd506275f5e5d8cba8608de2cf80730d6bef1438f184a241dbda50290066420f7646240a WHIRLPOOL 0e5000088b97a8e6e5d1a42a819f80219f6837170a9534115cfe0203cf6706eb5a1d37fcf6fd2e7cab04904452edafda6c4a9254cf07e7de8b4ee917257b5744
 EBUILD jffi-1.2.2.ebuild 2358 SHA256 602ea19a322ce6a1977dc9fa757e8a4037814e7980fa67b12078e8da0ac0d4e5 SHA512 b4b0fae935671963573ad62056fc418b46195f342fb86e58b24bfd8a74f5d7fa232d584abe134f88ef3f11e4e3fd9451b84e81093f6d91faf67b119eb30225e7 WHIRLPOOL 19a5bd2614c4e7711ff29c6263c49c538706a78630c7bb72c222a89f5ff78d22c4a64da13cbb217a2ad5b27a154806c5feb7af44f35f7733038ddda29c148902
-MISC ChangeLog 4044 SHA256 ad159965288ecf0aa82e2dddfc9de90544c7d14153ba859f590490ffdb40c62e SHA512 d6be8f67bae308922c1387b2448a92cc41e9acfa70e0c78a17cbdc7352ad6ef45558b9efb002bca72bff8d2e78f3e9134ea40e253a193b85cce7190d878a4126 WHIRLPOOL 74b970113d85f475be8b51272e5c6e0ec917915d3759293eb735c2f421b8b5cfc3bc457319c7d21c559fb96bc98c78e2458cf3e8d573f1313e7087a073f167a4
+MISC ChangeLog 4057 SHA256 290ad34c3296f6118ad192616781042daf1b0b96f84748def5c9a32ced16dbec SHA512 02256b39f981974b1352a30837b97efe310f1e4e3f459008a0c9043469d12c49ed2c8e681412e268cf4354a5345c6def84a31b55b9f263b46c25f92c493f5857 WHIRLPOOL c4a71b281d3f06df07c072f394b3d5a9d1b5a3122973176bbb8c5709752bc4a22bb373d70ab8a86ea89bd11e591d1747622d1a2546b99693735ecf40fd9e0783
 MISC metadata.xml 159 SHA256 1c070a909e96d9d193f84ad9304d196febbe33b60a724cc4b0d20634bb82255b SHA512 269cf19c37f2d136b926f546ec83ffdbc1374b2b6e26f8a31f21854143380386c31bfc7b2a0b9c47fb1f7c02607ddbdd43e517cb5c3270515e465c4dd7788843 WHIRLPOOL afb402fec04cddb3184b69eb8a8d36b404edd2870fd06c8f5e99be39c341ea6fa7542e0b680fac05529522ed33838e8279381d7a6de9dbc58fe55841229d8a51
diff --git a/dev-java/jython/ChangeLog b/dev-java/jython/ChangeLog
index f81de420da86..67300eb06eeb 100644
--- a/dev-java/jython/ChangeLog
+++ b/dev-java/jython/ChangeLog
@@ -1,10 +1,16 @@
 # 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.78 2012/08/25 19:57:23 thev00d00 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jython/ChangeLog,v 1.79 2012/08/26 13:43:40 thev00d00 Exp $
+
+*jython-2.5.3-r1 (26 Aug 2012)
+
+  26 Aug 2012; Ian Whyman <thev00d00@gentoo.org> -jython-2.5.2.ebuild,
+  -jython-2.5.3.ebuild, +jython-2.5.3-r1.ebuild:
+  Incorporate fixes from 2.5.2-r1 into 2.5.3-r1
 
 *jython-2.5.3 (25 Aug 2012)
 
-  25 Aug 2012; <iwhyman@gentoo.org> +jython-2.5.3.ebuild:
+  25 Aug 2012; Ian Whyman <thev00d00@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:
diff --git a/dev-java/jython/Manifest b/dev-java/jython/Manifest
index d39f1f79213b..23f07c159cca 100644
--- a/dev-java/jython/Manifest
+++ b/dev-java/jython/Manifest
@@ -22,7 +22,6 @@ EBUILD jython-2.1-r11.ebuild 2934 SHA256 9ce1e028309ecc0d8f804fad81ce80f9ed81ef9
 EBUILD jython-2.2.1-r1.ebuild 3769 SHA256 936d381297b273398a608fc879331f147f555ea19174ff12722003c4ec90cd9f SHA512 61d10d83cc2e56818d069ba3d0e0262cb21082b96fdb89e5704912fee4457048c8e390a6eaba55664bf15fe581321da517e7fe70260143cf62e3129a40eacf7f WHIRLPOOL 49705b431243688cac0558fcf87b7b492ceb4d90100d7ff80608b4faeb4d53801a8055bacb6b62f4ddfb5b82279eb9e1973d6ae1d9c21bb716d389add06688bd
 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
-EBUILD jython-2.5.3.ebuild 4128 SHA256 1294fa046a097fef7fbe9a8ddf789ef6c636d1c6cfee961421019ce1f2e84542 SHA512 177aa20141c06da31e1a19ee67e32996a06d208529033c58f94b955c3f3a6b9cf68d6beb47a05651a13f62cbedcd6c360b8539cdb4076f5ff8029a005dcd178b WHIRLPOOL d598c921b02618cf1ac248b2fdbb18fa208234a7126e4e6057ca1e3077c9ade383708e3d5cc66327c749cbdb108d96e805375759db274d4f2ff8d90b871d6634
-MISC ChangeLog 12533 SHA256 b09b5bb6cbc4f82cfa09563eee547eb324bd825ca902b9339cef4a66eb190a53 SHA512 6612d674a7a472db5617f22f34989cf1e2a765451363b09dcf974cf28223215f5f49a3e22d3739ecc9a163329b453410d71e582fbe7a4d442d3fe7a359b3e2da WHIRLPOOL 4143d34e5f1842bd671d627c35ced268a6fab05564e2f766c9857fa3a24b7584cf7236ade4225af59db3f218dc0b695943773a3f66ae3c6a4a93b240e6a7f652
+EBUILD jython-2.5.3-r1.ebuild 4166 SHA256 41495f88447e8b292d51407b2692208330bb3958684538cac3bc501bfc340d9f SHA512 f558c5098cde10e5149e82398949d9e98a183549657d55b6f52ed509b7fa9172cb4621233f515860b08a67bf8ad437ba82b86d4e7a3bcc42c0bf18c1b8012f9f WHIRLPOOL 616e4112494145ab5fafa9418578fef5f45f785c5fd80a6bd0c193e2e8f4bdd1b5245f7345531f6a890b538e15bdcf0f08718b05d855dd368c97f6980148405b
+MISC ChangeLog 12747 SHA256 cf09dc79acd3347bdba64efb40fe622cc78ee171569db849da5e0b11f411a666 SHA512 475480eec870cb2162714acd9da6ef1a4a1eee149fca388f3590d267f7de634d4793daec116d3fe42468f3a2f35142830d4f924917aeeacfd0a8ed2cbfa1c787 WHIRLPOOL 542fbbe0896df78678ca188d7eddc4128c0e7dedf3163296b1e0ad450af1f552300c4fc3a55523d21ca06df076ebc319886dbc9a100fc5074fe2601dae98933b
 MISC metadata.xml 315 SHA256 03b5b706f53aa9de54b5296c58699a4ad543ee0b7fb5b8fc6cf2ab89ac487198 SHA512 756be0e6a24eea5544801dd33f0a5fdaf7b28c9bbef05baac97ab304e00879066d19ef5f02370640364df05a91e509992155a13e185b2b7e9806e554aac7c92a WHIRLPOOL 9a5ffdfa34b9ebf36b7392b8bb81f607bc482a267be083c0c765ccf7c1af18e2621370bfdb26b200581a5d3cbb28221a8f275a6f3acd2ec683e31ab59e06a951
diff --git a/dev-java/jython/jython-2.5.2.ebuild b/dev-java/jython/jython-2.5.2.ebuild
deleted file mode 100644
index c79b6830a462..000000000000
--- a/dev-java/jython/jython-2.5.2.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# 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.2.ebuild,v 1.1 2012/07/18 10:30:29 sera 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"
-
-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}/${P}-build.xml.patch"
-
-	epatch "${FILESDIR}/${P}-distutils_byte_compilation.patch"
-	epatch "${FILESDIR}/${P}-distutils_scripts_location.patch"
-	epatch "${FILESDIR}/${P}-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)
-}
diff --git a/dev-java/jython/jython-2.5.3.ebuild b/dev-java/jython/jython-2.5.3-r1.ebuild
index 2f2cf58690a4..d2d94fb95641 100644
--- a/dev-java/jython/jython-2.5.3.ebuild
+++ b/dev-java/jython/jython-2.5.3-r1.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jython/jython-2.5.3-r1.ebuild,v 1.1 2012/08/26 13:43:40 thev00d00 Exp $
 
 EAPI="4"
 
@@ -12,12 +12,11 @@ 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"
+KEYWORDS="~amd64 ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="readline"
 
 # Missing in installer jar.
@@ -112,34 +111,28 @@ src_install() {
 	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}"
+		-Dpython.cachedir="\${HOME}/.jythoncachedir"
 	)
 	java-pkg_dolauncher jython${SLOT} \
 		--main org.python.util.jython \
-		--java_args "${java_args[*]}" \
-		-pre "${T}"/pre
+		--java_args "${java_args[*]}"
 
 	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)
-}
+	# the jvm opens classfiles rw ...
+	dodir /etc/sandbox.d
+	echo "SANDBOX_PREDICT=/usr/share/${PN}-${SLOT}" > "${ED}/etc/sandbox.d/20${P}-${SLOT}"
 
-pkg_postrm() {
-	python_mod_cleanup $(python_get_libdir)
+	# compile aot
+	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" \
+		org.python.util.jython -m compileall -f -q -x "/test/" "${ED}" || die
 }