gentoo resync : 29.10.2017

4 files changed, 3 insertions, 198 deletions

diff --git a/dev-java/jython/Manifest b/dev-java/jython/Manifest
index fd94924addfa..0ee5a4bcfbd9 100644
--- a/dev-java/jython/Manifest
+++ b/dev-java/jython/Manifest
@@ -6,8 +6,7 @@ AUX jython-2.7_beta1-ant.patch 996 SHA256 4162eb543c70071cac05c4220047296809733f
 AUX jython-2.7_beta1-dont-always-recompile-classes.patch 309 SHA256 323b52653b511d3d4a299d0414716aa3d6e7bfa21094b6090363878f244d7af2 SHA512 75b25d98d8df13d0b9947cbc70a7da59097b89731210504cc26ab18680b93d9ce2cd177480870f985a87d3634d9034b8d9f1bac2c431f4cfe09ab0b54db78b18 WHIRLPOOL 76300b03adaad2d979e4a5a705088ef3410d93643fac0c87b333f88181d4f93c8185630467a272d7fd5f2439784e907814084f5a18f11715d9bc4ce102d03bc5
 AUX jython-2.7_beta2-maxrepeat-import.patch 457 SHA256 0840c1039c0e5821d0ceeb44bdfe1bda52fc2b9da00330c52c2056def2e09a24 SHA512 e06ddb36805e2545f351d9d5df651fa90b0b39d340e4772cbb24910f1e1c999463a21fbe4a62c9cc73f9ccdc0047f8900e6300602cb8d5b70cef7cacf1bd46d0 WHIRLPOOL dc685f8cd5d684a9ea72f3315d9d74b1e51712fb6ef46fb2dec24ec1cb1a1d0094d28c06e32a0089ff659b7a0c402e35b77725e7c971db46bd90767d0eaff3ad
 DIST jython-2.7.0-sources.jar 15371691 SHA256 2b534595d4a08059ebb71b881c58ee830499bb6e9daba7c828a7f1f6c8943f7a SHA512 7583810245d694fd1d99a57ad504fcefdfbc1183def2cbb93ae3660f341104205c73041d846bdcf2b564b3cf4b770b481703c1dcdb1458396812c92d30ee9fa6 WHIRLPOOL e0dbd289c522b41ef2d3f54b01a2f6d44de8755e2eeb7863c8b807d1b179839f20d925e102db324cf85cd82503cd03106b5287ffa7a322a3902d6f24e9cd2a41
-EBUILD jython-2.7.0-r2.ebuild 4299 SHA256 e5d72b08a405a1f69ed621cd9b072102b0900f9cee95fe4fe55a553aaaa1b7d7 SHA512 433cfb7397f96a7e0e7673dab0f788d459d9fa490266d9434c0c0e82f0ecb1d28ed3276276fd3196f865e9a9a456ca75dc259060afddae8ada53700bddfc887e WHIRLPOOL eda646073b481c76fdd96163cfb8549753da2cd02f9a6b1eb8613d8129181db6ba8473d0f977c4359fd231a8673b13ff96d6147c402a85627b91313cfbf1f169
-EBUILD jython-2.7.0.ebuild 5666 SHA256 49b2ac3c6eafee7037c3f6b165f24810d4c0d403e634186be4342f90b728dbf3 SHA512 f8fa49e48f06ac9ecdcba3800d0e9050bd379df36058b0e7ee47a6d978dafdd3aaac8c03db28a80de12b7141259d9297827bc2d7de044a702864a9ed81bdf701 WHIRLPOOL c36b743cad1cc908e4185af8ce12287da9808cc5f56157872d57d906dc0a5bec4969bbd681fd2f013b873f5bcabf1789f0c77f4f06b80872d60b6314729c321e
+EBUILD jython-2.7.0-r2.ebuild 4298 SHA256 5105c65e6b72c315a155c880e231e44d948005fbdec96839cf66b83fb538f69c SHA512 8ff019b22a9a7abac0f96dd4466654333de3f60c72764053f4f26ce995e1200084348aa223edcd3806037cfade26d956f57512d38d733f37652a4cdb590c7e01 WHIRLPOOL 6e3f64a34ffaa5e3d4a952771396f467dcf8a771db61d524727eeff35ba9aade417e2597054cfc53affa56e32ff6737259603b6c82949f81f2db7b49ca7a507d
 MISC ChangeLog 6493 SHA256 db425c5e8ab43a03c932063d59e827148f0a3b48367c77f0a361b8594e515688 SHA512 70d8319bca8e3a4faec942dd16c88ca7a2441ea1b896f17b4559d645abcd62b1d3d78df78621556c6dbfb5b58d18c87ed99240b7dd3ba74c847a79bdd9bbe5f5 WHIRLPOOL 6c3b155f81af4cdf1f18b6290caa248e1a706dc943d730be7693711269b954cf33bd8909aa241890362d2c088f0d5f21610f77c11fcf9eb7dbc3541a86c03952
 MISC ChangeLog-2015 16851 SHA256 19dc522aedb70b79948459e970080a6d8a3a10303079a273586eb2a967b81380 SHA512 5e125a0a005ceb0fdcccd283b4f9dfd310af0e90e4b9be4901e47702a35db5f846373f3a27129020afb1659fe22406c89250bf610a95470d76ff82fe062c8b29 WHIRLPOOL 15b10f7f076cc1eb6d866320c2ffc1159adbba022e006a6ae308cd3ab38603cb81d91debf8950f48e0ee4e6a00736116e9447f8658b377884e093b3d5e06d1fd
-MISC metadata.xml 406 SHA256 aa24488b1d0d7c1227a27148d330f242ddd8c6a65602c8a21a4e3ecf42b5a6b3 SHA512 9f2143723240241788a922cba2adbb5917114bc052b2590eb76777c5db4140ab0360c55cadb17fc5b2006d1947f37e91f5ce88d6abba500e6cb9419854014dac WHIRLPOOL 49104dcd67ccc7794af5b0bb38ce1a5dab51c6bcb40350dfcf4e98d67b2445a05d512184eca3e5f72b7b377bc2ecb6fb6824893fdb3aed6d8f08ba63d790c99c
+MISC metadata.xml 322 SHA256 eb62cf2746f3155986092af544a3be47f79c89ef32d1c7ec8c9e05a3b65cca62 SHA512 e8a44ffb98b2da1c2d60f478d89e45879c3f4516042afed922ee522ded157243381e51b198fd638845e45ceb2255535e25df8a7ce61f267b6222dd94525b2342 WHIRLPOOL 84ae079b74216433e005f2ed2f1abd94e8bad3e067c8fb0c9abbf47ed268dbbdbb96bba531ca7c27466288a3cebd7e380517c2186e7e4608a59feaa73603f4f7
diff --git a/dev-java/jython/jython-2.7.0-r2.ebuild b/dev-java/jython/jython-2.7.0-r2.ebuild
index 852db859cfd4..d8fb023be8a9 100644
--- a/dev-java/jython/jython-2.7.0-r2.ebuild
+++ b/dev-java/jython/jython-2.7.0-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://search.maven.org/remotecontent?filepath=org/python/${PN}/${MY_PV
 
 LICENSE="PSF-2"
 SLOT="2.7"
-KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="examples test"
 
 CP_DEPEND="dev-java/antlr:3
diff --git a/dev-java/jython/jython-2.7.0.ebuild b/dev-java/jython/jython-2.7.0.ebuild
deleted file mode 100644
index 18b533ce3672..000000000000
--- a/dev-java/jython/jython-2.7.0.ebuild
+++ /dev/null
@@ -1,191 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="+readline test"
-REQUIRED_USE="test? ( readline )"
-
-CDEPEND="dev-java/ant-core:0
-	dev-java/antlr:3
-	dev-java/netty-transport:0
-	=dev-java/asm-5.0.3: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:2
-	dev-java/icu4j:52
-	dev-java/jnr-constants:0
-	dev-java/jnr-posix:3.0
-	dev-java/jnr-netdb:1.0
-	dev-java/stringtemplate:0
-	dev-java/xerces:2
-	java-virtuals/script-api:0
-	java-virtuals/servlet-api:3.0
-	readline? ( >=dev-java/libreadline-java-0.8.0:0 )"
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.7"
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.7
-	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-2,"
-EANT_GENTOO_CLASSPATH+="jnr-constants,script-api,servlet-api-3.0,"
-EANT_GENTOO_CLASSPATH+="stringtemplate,xerces-2,icu4j-52,netty-transport,jnr-posix-3.0"
-
-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 CDEPEND 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"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.5.2-distutils_scripts_location.patch
-	"${FILESDIR}"/${PN}-2.5.2-respect_PYTHONPATH.patch
-	"${FILESDIR}"/${PN}-2.7_beta1-ant.patch
-	"${FILESDIR}"/${PN}-2.7_beta1-dont-always-recompile-classes.patch
-	"${FILESDIR}"/${PN}-2.7_beta2-maxrepeat-import.patch
-	"${FILESDIR}"/${PN}-2.7.0-build.xml.patch
-)
-
-java_prepare() {
-	find \( -name '*.jar' -o -name '*.class' \
-		-o -name '*.pyc' -o -name '*.exe' \) -delete
-
-	epatch "${PATCHES[@]}"
-
-	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-3.0)"
-	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
-}
-
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
-
-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_dohtml -r 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
-
-	local -x PYTHON="${T}"/jython
-	# we can't get the path from the interpreter since it does some
-	# magic that fails on non-installed copy...
-	local PYTHON_SITEDIR=${EPREFIX}/usr/share/jython-${SLOT}/Lib/site-packages
-	python_export jython${SLOT} EPYTHON
-
-	# 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 || die
-	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
-}
diff --git a/dev-java/jython/metadata.xml b/dev-java/jython/metadata.xml
index 6034fcc96aab..d20250bf86a6 100644
--- a/dev-java/jython/metadata.xml
+++ b/dev-java/jython/metadata.xml
@@ -5,9 +5,6 @@
     <email>java@gentoo.org</email>
     <name>Java</name>
   </maintainer>
-  <use>
-    <flag name="readline">Use GNU readline instead of jline</flag>
-  </use>
   <upstream>
     <remote-id type="sourceforge">jython</remote-id>
   </upstream>