gentoo resync : 14.04.2018

5 files changed, 14 insertions, 98 deletions

diff --git a/dev-lisp/abcl/Manifest b/dev-lisp/abcl/Manifest
index cb429cf07093..f14c638abf77 100644
--- a/dev-lisp/abcl/Manifest
+++ b/dev-lisp/abcl/Manifest
@@ -1,6 +1,5 @@
-DIST abcl-0.0.9.tar.gz 592410 BLAKE2B 7c8a2f4b03d251785f49b62965eb1e0906871080c29ff1bf41db3e2c45ded42adf4a131a833b347f3d3eac17b228b0e575985ec7f2cd02e4691085f645b05b11 SHA512 d822f099ab73f1f62f14bfa3991b88573587d90a8c31e97933549bd19fabaa4d9337963ba33f6ef59f65c259f374bbabb5263c2c3fda3d99a19a645756f80a1c
 DIST abcl-src-0.20.0.tar.gz 735614 BLAKE2B a4052bdbdd7de00d4232b63df29b281b48825d219cca8754f7ffff8c8e42cb22ee321f449ef0d72b6dc62d6e857e406d5d56236f61066adf5026975cfd31e4d9 SHA512 73b033883149b1083a03d87ed5c41b5b6e790cb02978a82f1b57274e6744b66c7b05c5a708077f354ee46ce0780327dfc728bbd9cd9c4f87bd69b730ead8e81b
-EBUILD abcl-0.0.9-r1.ebuild 2004 BLAKE2B 622307f7abf84a0a8edd35dbc4ff60aa174b358b19cab6aa5632814886ca45b7500b2de486e1ca3d8cc278f71c5525c83c3e044509cac45bd6d257624baecd9c SHA512 07d39aaa6f35ebcfa454b8a28527bd79a10693fb111afb45683f7ae04b5e8b38d4ab65426b45df3c99fe194f53c528d40a547a91fe689b96d24701e8ecc1527d
-EBUILD abcl-0.20.0-r1.ebuild 1058 BLAKE2B a68c43363c108615807f4c04732efc551987b9a3725c0efcfa878680d3f2f5d046a4c086d88aaaeda7c0e1ddf1dddfe1071582f1d0a0be4be1e1dbdd6ef9028c SHA512 138a8b20be9486a32c0b511765dda76bb496eecb9e67fd82e2eed24b4aad4fb690b65575242ffd4871928c2b9de50dc7fc0f5fdb61afd9eedc0e9d2a0b4ad3a7
-EBUILD abcl-0.20.0.ebuild 841 BLAKE2B 0fba72965705bba04e28d2e4674fd1e2dc644a097de9d7feb26210b1fb8d823ae8b2b5e01f1ecc7e253940c748f813ba3d43bf6a2367f90c6ccc1821d57ea3d3 SHA512 4d9ec141c654c4bc08fb40028dd1bf3b95eb77a8bbf879a32b47ae7fda9e2b8825f16355c268321280c2fd07d16cdd4f4142b0db85e8fd84dc1769805ecd7870
-MISC metadata.xml 756 BLAKE2B 89eebda38b1d87b775be700f8b6308d7184bcd1d5cfbcb8aed108eabeb4999b97561ac70fbfb30fa7eab72696eddca4fc532bb81d78b7b9e87cfe40ad17eb49c SHA512 5b04db4f6e680850b17493db2973bff0b260194fc7f4e9252c4250b58bfe7eea1398df2fe703a49106e5c7c8b5c1bb31bd8b18296767b164566b02f6673ab860
+DIST abcl-src-1.5.0.tar.gz 1187678 BLAKE2B 4c6993ab90d6fe12e93bf185ecdc16dd5c69ff5c65881e74db51ba9a8167e3a3de4b25ff9971084e92499f654aacec2a07757d100a5977944076476d47c17438 SHA512 d56c23a82103dfebb3361903af096f923738008e551f3b5e07e00f0423c8ade0b07a388b7834b5d79d9191863b38db2c17fa27bffd848d7cba88d6bb67e32db3
+EBUILD abcl-0.20.0-r1.ebuild 1057 BLAKE2B 653c264f3375e604f18ae5a3e8b31faba909d72b97aaa9c03b31e556a22d7bcb793c0d0c000007de0059d6cc4087c0d4275c4c0a604a3f64bc4a550747f70707 SHA512 0ce1f73624109a48d8cf95a23e1a4de0a01d8aa9ccbda4945d8c2d34b1f6683fee66590960b57a26cf38098a98b1f3abbf2d156e6499bcbacfb46c0625cd3728
+EBUILD abcl-1.5.0.ebuild 818 BLAKE2B df8defbde6fef4c27aac699a3261904f7ef2b3effa678f9fd7fa66554d58fc5c75c382d2977eeb1ab3da891c3768b20adb827a653019d68147d17a80a46c6efb SHA512 02bddff2a5f3dd0c9895d6a741b662edcfd5ba3879484f9193912468b212b0283f446f26eaf4057a08406b6e81c83a100d468e9c6e00471fdeec7f4087eb6323
+MISC metadata.xml 509 BLAKE2B 484256eac69bd0c0bf0bffadc8513a1f9f7c90e22db8a45d3008517936aad0f00d028ab97987c954c3cd086c0e0824bba3969a24d1c544be47c2221f817bd5cc SHA512 7216031e2c4c73c0d0bcf4b454cfa7d859dc21cd6d1000792357dcda973e6ea78917d06077b283d0ed19bda53c01917fcccd562fab5770499b9cfae4dace1ef5
diff --git a/dev-lisp/abcl/abcl-0.0.9-r1.ebuild b/dev-lisp/abcl/abcl-0.0.9-r1.ebuild
deleted file mode 100644
index 6698eaa4a04e..000000000000
--- a/dev-lisp/abcl/abcl-0.0.9-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit eutils java-pkg-2
-
-DESCRIPTION="ABCL is an implementation of ANSI Common Lisp that runs in a Java VM"
-HOMEPAGE="http://armedbear.org/abcl.html"
-SRC_URI="http://armedbear.org/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="jad clisp cmucl"
-
-RDEPEND=">=virtual/jre-1.4
-	jad? ( dev-java/jad-bin )"
-
-DEPEND=">=virtual/jdk-1.4
-	dev-lang/python
-	!cmucl? ( !clisp? ( dev-lisp/sbcl ) )
-	cmucl? ( dev-lisp/cmucl )
-	clisp? ( dev-lisp/clisp )"
-
-src_unpack() {
-	unpack ${A}
-	cat > "${S}/customizations.lisp" <<EOF
-(in-package #:build-abcl)
-(setf
-*javac-options* "-g $(java-pkg_javac-args)"
-*jikes-options* "+D -g $(java-pkg_javac-args)"
-*jdk* "${JAVA_HOME}/"
-*java-compiler* "${JAVAC}"
-*jar* "jar")
-EOF
-	einfo "Building with the following customizations.lisp:"
-	cat "${S}/customizations.lisp"
-	cat >"${S}/build.lisp" <<'EOF'
-(progn (load "build-abcl") (funcall (intern "BUILD-ABCL" "BUILD-ABCL") :clean t :full t) #+sbcl (sb-ext:quit) #+clisp (ext:quit) #+cmu (extensions:quit))
-EOF
-}
-
-getutfvars() {
-python << EOF
-import os
-for key,value in os.environ.iteritems():
-	try:
-		value.encode()
-	except UnicodeDecodeError:
-		print key
-EOF
-}
-
-src_compile() {
-	local lisp_compiler lisp_compiler_args
-	if use clisp; then
-		lisp_compiler="clisp"
-		lisp_compiler_args="-ansi build.lisp"
-	elif use cmucl; then
-		lisp_compiler="lisp"
-		lisp_compiler_args="-noinit -nositeinit -batch -load build.lisp"
-	else
-		lisp_compiler="sbcl"
-		lisp_compiler_args="--sysinit /dev/null --userinit /dev/null --disable-debugger --load build.lisp"
-	fi
-
-	einfo "Filtering non ASCII environment variables"
-	for var in $(getutfvars); do
-		einfo "	${var}"
-		unset ${var}
-	done
-	$lisp_compiler $lisp_compiler_args || die
-}
-
-src_install() {
-	java-pkg_dolauncher ${PN} --java_args "-Xmx256M -Xrs" --main org.armedbear.lisp.Main
-	java-pkg_doso src/org/armedbear/lisp/libabcl.so
-	java-pkg_dojar abcl.jar
-	dodoc README || die
-}
diff --git a/dev-lisp/abcl/abcl-0.20.0-r1.ebuild b/dev-lisp/abcl/abcl-0.20.0-r1.ebuild
index a181bebc531c..16b71c942057 100644
--- a/dev-lisp/abcl/abcl-0.20.0-r1.ebuild
+++ b/dev-lisp/abcl/abcl-0.20.0-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://common-lisp.net/project/armedbear/releases/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND=">=virtual/jdk-1.6"
 RDEPEND=">=virtual/jre-1.6"
diff --git a/dev-lisp/abcl/abcl-0.20.0.ebuild b/dev-lisp/abcl/abcl-1.5.0.ebuild
index cd9abcd39b0c..6a476d2e6b06 100644
--- a/dev-lisp/abcl/abcl-0.20.0.ebuild
+++ b/dev-lisp/abcl/abcl-1.5.0.ebuild
@@ -1,24 +1,24 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="2"
+EAPI=6
 
-inherit java-pkg-2 java-ant-2
+inherit eutils java-pkg-2 java-ant-2
 
 MY_P=${PN}-src-${PV}
 
-DESCRIPTION="Armed Bear Common Lisp is a Common Lisp implementation for the JVM"
+DESCRIPTION="Armed Bear Common Lisp is a Common Lisp implementation for the JVM."
 HOMEPAGE="http://common-lisp.net/project/armedbear/"
-SRC_URI="http://common-lisp.net/project/armedbear/releases/${MY_P}.tar.gz"
+SRC_URI="http://abcl.org/releases/${PV}/${MY_P}.tar.gz"
+RESTRICT="mirror"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="jad"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
 
 DEPEND=">=virtual/jdk-1.5"
-RDEPEND=">=virtual/jre-1.5
-	jad? ( dev-java/jad-bin )"
+RDEPEND=">=virtual/jre-1.5"
 
 S="${WORKDIR}"/${MY_P}
 
diff --git a/dev-lisp/abcl/metadata.xml b/dev-lisp/abcl/metadata.xml
index 47cec66cb9a1..0687231d2b7d 100644
--- a/dev-lisp/abcl/metadata.xml
+++ b/dev-lisp/abcl/metadata.xml
@@ -13,9 +13,4 @@
 		Armed Bear Common Lisp (ABCL) is an implementation of ANSI Common
 		Lisp that runs in a Java virtual machine.
 	</longdescription>
-	<use>
-	<flag name="clisp">Build Armed Bear Common Lisp using GNU CLISP</flag>
-	<flag name="cmucl">Build Armed Bear Common Lisp using CMU Common Lisp</flag>
-	<flag name="jad">Enable support for disassembling compiled code using JAD</flag>
-	</use>
 </pkgmetadata>