gentoo resync : 22.05.2021

4 files changed, 2 insertions, 38 deletions

diff --git a/dev-lisp/Manifest.gz b/dev-lisp/Manifest.gz
index 642e27cbcfec..edd5ab28a07e 100644
--- a/dev-lisp/Manifest.gz
+++ b/dev-lisp/Manifest.gz
diff --git a/dev-lisp/abcl/Manifest b/dev-lisp/abcl/Manifest
index 6eaa41325db6..65fe4e91e04b 100644
--- a/dev-lisp/abcl/Manifest
+++ b/dev-lisp/abcl/Manifest
@@ -1,5 +1,3 @@
-DIST abcl-src-1.5.0.tar.gz 1187678 BLAKE2B 4c6993ab90d6fe12e93bf185ecdc16dd5c69ff5c65881e74db51ba9a8167e3a3de4b25ff9971084e92499f654aacec2a07757d100a5977944076476d47c17438 SHA512 d56c23a82103dfebb3361903af096f923738008e551f3b5e07e00f0423c8ade0b07a388b7834b5d79d9191863b38db2c17fa27bffd848d7cba88d6bb67e32db3
 DIST abcl-src-1.8.0.tar.gz 2613411 BLAKE2B cd50e5df0b7e48c902bc904ca4ea0e9c293241e04cfda154cb388c5f58da921645333fca8e0a95768a550fcb2a5b6346b3e8958745138ea6826f5c5a62ef0faf SHA512 90cc2d1e52a4dc83a0159a5763d2c7eb344952786a805a82180e0000a0cae26d89ae5a9293b629b7b5131eac05668fe21711abca32aebe05d7400187b0b3793b
-EBUILD abcl-1.5.0.ebuild 776 BLAKE2B 250efab7dcc8b9432b50b3357836d6607c25a0d5619ddfbac40911c7696912f3c8deb3cc13754eef621d2bec6f32408b2542ce314e14a16826e829bcd1ce8f09 SHA512 f00d197117e7ed956099ebde760b22271f0e96c3bcbc4fdeb3e391dc7ae28c4ea2109918f0e99129de06ff7ef636d51dc544230634d5ac023f42eb14bafc6dd5
-EBUILD abcl-1.8.0.ebuild 777 BLAKE2B de4a87474e5ebcd3868a4be36967414fe6abdf9e25862e872d701b5ac60a2043f010b5e5fc7e7c96048e516fa9312fd0347b8c2893588ac3fca4fc2c34620978 SHA512 3804a9b680fdeb0bcd470bc9f04c666c9b2e0b1f8f2bf810a2f9f8046bb5a316087736a44a53d88e79ab36d62fb12ba159e66dee74b050a1f23862d7757b1c38
+EBUILD abcl-1.8.0.ebuild 775 BLAKE2B a4672cdbe372616c76c270ce498a96e604667cf4e8420fe4753877bee70ff4284443a11c0873a89b988c6c60aacd94dec8c35459ab9c73ceaf8e4fc950fd0662 SHA512 f2f52762bd57100522c16a7ee912128497f8a62d6cda5cbf235a9723904fa0790e7d006dda42aa98ca3580fb08b0599a367bce37e51b9452146fc282933ddde4
 MISC metadata.xml 509 BLAKE2B 484256eac69bd0c0bf0bffadc8513a1f9f7c90e22db8a45d3008517936aad0f00d028ab97987c954c3cd086c0e0824bba3969a24d1c544be47c2221f817bd5cc SHA512 7216031e2c4c73c0d0bcf4b454cfa7d859dc21cd6d1000792357dcda973e6ea78917d06077b283d0ed19bda53c01917fcccd562fab5770499b9cfae4dace1ef5
diff --git a/dev-lisp/abcl/abcl-1.5.0.ebuild b/dev-lisp/abcl/abcl-1.5.0.ebuild
deleted file mode 100644
index c12516635a33..000000000000
--- a/dev-lisp/abcl/abcl-1.5.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit java-pkg-2 java-ant-2
-
-MY_P=${PN}-src-${PV}
-
-DESCRIPTION="Armed Bear Common Lisp is a Common Lisp implementation for the JVM."
-HOMEPAGE="http://common-lisp.net/project/armedbear/"
-SRC_URI="http://abcl.org/releases/${PV}/${MY_P}.tar.gz"
-RESTRICT="mirror"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.5"
-RDEPEND=">=virtual/jre-1.5"
-
-S="${WORKDIR}"/${MY_P}
-
-src_compile() {
-	eant abcl.compile || die "Can't compile ABCL"
-	eant abcl.jar || die "Can't make ABCL jar archive"
-}
-
-src_install() {
-	java-pkg_dojar dist/abcl.jar
-	java-pkg_dolauncher ${PN} --java_args "-server -Xrs" --main org.armedbear.lisp.Main
-	dodoc README
-}
diff --git a/dev-lisp/abcl/abcl-1.8.0.ebuild b/dev-lisp/abcl/abcl-1.8.0.ebuild
index fdf7e5a4c742..ed631f697127 100644
--- a/dev-lisp/abcl/abcl-1.8.0.ebuild
+++ b/dev-lisp/abcl/abcl-1.8.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://abcl.org/releases/${PV}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2-with-classpath-exception"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND=">=virtual/jdk-1.8"
 RDEPEND=">=virtual/jre-1.8"