Incorporate fixes from 2.5.2-r1 into 2.5.3-r1

(Portage version: 2.2.0_alpha121/cvs/Linux x86_64)

3 files changed, 20 insertions, 165 deletions

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/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
 }