gentoo resync : 24.12.2018

4 files changed, 13 insertions, 64 deletions

diff --git a/dev-ada/libadalang/Manifest b/dev-ada/libadalang/Manifest
index 73935cd23e2e..923854bf431b 100644
--- a/dev-ada/libadalang/Manifest
+++ b/dev-ada/libadalang/Manifest
@@ -2,7 +2,6 @@ AUX libadalang-2017-gentoo.patch 927 BLAKE2B 3c0a92df8aee109faa4be73bc1950af46fb
 AUX libadalang-2018-gentoo.patch 678 BLAKE2B ebc0c63b62a0b5c2b53a036de1a71ca33af992dd3774d894f4e0407e291bee15fac5be358c5f2600516ecb15c7b7846c7213b1fdd3c522ecd2f1393247d4b4b4 SHA512 346b561e2db3258e768bc4c4ee92a3ba6977f58de3cdae0ab84df9c31ba178dad3788309db2505c2dc8c8fd4319ef68201499303a6b92d837508a6bd91e49779
 DIST libadalang-2017-src.tar.gz 1862217 BLAKE2B 58f72726285e56a15278e85902fabf988327ea86a08cc6c86271d61075a6b19a0bffa86e5302f5c32e6d35ef95473ad747853b14899a12d09d49d656f4e6559e SHA512 c8663a7214c3c1dd73a6589a6db10d219fcd2db39ba2ce184eea85272c5f206ab0aa8d13b0e19b08a5996906c7fbddd479795363ec22e889dfceda9967c346c7
 DIST libadalang-gpl-2018-src.tar.gz 1990774 BLAKE2B ffad46d4988de7fb8c9bf94d24360a726c59e3c70a2318725a59e0b6b62351e8f5d8dd6501964618607122e3c7cb3bda0e1181818c68324d4067d59ac93e2b1c SHA512 b95196323097065be2996ced767f8f89fb77445f99c249d84043c68d926d61c78b310b4fef0699d08f9112dc423596c076f452745469a75a8467c35b5e10ac2c
-EBUILD libadalang-2017-r1.ebuild 1085 BLAKE2B 2239f79e2282925ee0cccda64f41cbf9bd459de1e04f09bdf5be73bd0f01a86d00fc7249c13e8e06373b5a69268ddd5b623a973162da8551b91027b14b9f496e SHA512 b6513432ff0c96cb159325c47aa2af4fc6ab19437c43c94d213f35eb0c1b89226e182da0f80cfb8935e61d50da82731af7e94cd8193f7c26e3472a7918a57976
-EBUILD libadalang-2017.ebuild 1038 BLAKE2B 728c3c30f2b791e8fc88f49f3726118d24221d7b2dd782b08a866c816cbdc3dc0d156022ae2fa61c6e5c891195e898ee8fd4b696d32ffa030568340530f3e44d SHA512 531f5f84f4685038efa9d1bf742aaff2826b0445216d6c7f5664f35d9642f799ea1d50295ec700d7861f6c74b77024fab68175890b89d5189f418fead58bfd6e
-EBUILD libadalang-2018.ebuild 1341 BLAKE2B 2440d20e69e4991a5e0f28f47658080c6c2a3784e6339ae85f01d053dfa5f93c4c8aeb31cdcac4be5c5e99b6c59ef7f30963281604428ad1d539cf5890f49020 SHA512 53570131296ef159031711c777d9b20dc34cc2171f3aea67608267f775ccc1bfaa2b5318952c318868a6bfdc812425c2e6d1d00bb3fcefaa487bd70ebfe58c54
+EBUILD libadalang-2017-r1.ebuild 1089 BLAKE2B ff0e7e37c2f2cf5f7ce0d38b5d0efc073edaf16aa77d65bcf5edad54d234549c33a105164e417a7dc838300415568d34bd2a1dbf3d5d07df99a5e00b2940c331 SHA512 1673bb70bc3a2f323b8ca3cc00d2213e5b6ee81eb90319776845b2ec797ebfca1709ce264cfbe995a76f5ca5d0dd9d91bc80b812d94fef650cc3f6e98b8c5510
+EBUILD libadalang-2018.ebuild 1328 BLAKE2B 2383fa22a63f725534503d4b70887f68ad807f64290737075b5dc010410006e8c7a2e0ad337f051a887e2982de9096a79a89d2e29252a4f947c5f01fd2fd262b SHA512 2cbb2b9c76b319326a2717be045993d1f465dcfcb4b80b06438a2918d6a3c0dc22c864ffc5a125453ea7fa8159318b36cd63a058f28bc02c17359a83a7c1fe56
 MISC metadata.xml 810 BLAKE2B 89dbced5c050ba4dea4ba0537cda9512bc534bee25aa8260cd7ac30129ada091ced7c37d29efdbf11ceac9e295171e84b248d186cfb11b2072fd2beb7997089a SHA512 6857c4ac7b2cd9de167039889a99d9cdac1ba0235379f36630d51e075f1fbfccab974bbd9f34a1be08cab7869c8dbc5ec14da9ff4ec6225bd89470c350f22ebd
diff --git a/dev-ada/libadalang/libadalang-2017-r1.ebuild b/dev-ada/libadalang/libadalang-2017-r1.ebuild
index b4185f05c645..ef338c304996 100644
--- a/dev-ada/libadalang/libadalang-2017-r1.ebuild
+++ b/dev-ada/libadalang/libadalang-2017-r1.ebuild
@@ -14,14 +14,14 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed042
 
 LICENSE="GPL-3 gcc-runtime-library-exception-3.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="gnat_2016 +gnat_2017"
 
 RDEPEND="dev-python/pyyaml
 	dev-ada/gnatcoll[projects,shared,gnat_2016=,gnat_2017=]
 	${PYTHON_DEPS}"
 DEPEND="${RDEPEND}
-	dev-ada/langkit"
+	~dev-ada/langkit-2017"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 S="${WORKDIR}"/${PN}-gps-src
diff --git a/dev-ada/libadalang/libadalang-2017.ebuild b/dev-ada/libadalang/libadalang-2017.ebuild
deleted file mode 100644
index 3856ef26ccef..000000000000
--- a/dev-ada/libadalang/libadalang-2017.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1
-
-DESCRIPTION="high performance semantic engine for the Ada programming language"
-HOMEPAGE="https://libre.adacore.com/"
-SRC_URI="http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed042
-	-> ${P}-src.tar.gz"
-
-LICENSE="GPL-3 gcc-runtime-library-exception-3.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gnat_2016 +gnat_2017"
-
-RDEPEND="dev-python/pyyaml
-	dev-ada/gnatcoll[projects,shared,gnat_2016=,gnat_2017=]
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	dev-ada/langkit"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-S="${WORKDIR}"/${PN}-gps-src
-
-src_prepare() {
-	default
-	rm -r ada/testsuite/tests/acats_parse || die
-}
-
-src_configure() {
-	ada/manage.py generate || die
-}
-
-src_compile() {
-	ada/manage.py --verbosity=debug build || die
-}
-
-src_test () {
-	ada/manage.py test | grep FAILED && die
-}
-
-src_install () {
-	ada/manage.py install "${D}"usr
-	python_domodule build/python/libadalang.py
-}
diff --git a/dev-ada/libadalang/libadalang-2018.ebuild b/dev-ada/libadalang/libadalang-2018.ebuild
index 7a0db2177830..6ac7ffb8994b 100644
--- a/dev-ada/libadalang/libadalang-2018.ebuild
+++ b/dev-ada/libadalang/libadalang-2018.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,17 +15,12 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/5b0cf9adc7a4475263382c18
 
 LICENSE="GPL-3 gcc-runtime-library-exception-3.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="gnat_2016 gnat_2017 +gnat_2018 +shared static-libs"
 
 RDEPEND="dev-python/pyyaml
-	|| (
-		dev-ada/gnatcoll[projects,shared,gnat_2016=,gnat_2017=]
-		(
-			dev-ada/gnatcoll-bindings[gnat_2016=,gnat_2017=,gnat_2018=]
-			dev-ada/gnatcoll-bindings[iconv,shared=,static-libs=]
-		)
-	)
+	dev-ada/gnatcoll-bindings[gnat_2016=,gnat_2017=,gnat_2018=]
+	dev-ada/gnatcoll-bindings[iconv,shared=,static-libs=]
 	${PYTHON_DEPS}"
 DEPEND="${RDEPEND}
 	>=dev-ada/langkit-2018"
@@ -33,7 +28,10 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 S="${WORKDIR}"/${MYP}
 
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-gentoo.patch
+	"${FILESDIR}"/${PN}-2017-gentoo.patch
+)
 
 src_configure() {
 	ada/manage.py -v debug generate || die
@@ -57,4 +55,5 @@ src_install () {
 		$(use_enable static-libs static) \
 		install "${D}"usr || die
 	python_domodule build/python/libadalang.py
+	rm -r "${D}"usr/python || die
 }