gentoo resync : 10.11.2019

4 files changed, 29 insertions, 81 deletions

diff --git a/dev-lang/spark/Manifest b/dev-lang/spark/Manifest
index 9a4e4b0677c9..2dbeee684768 100644
--- a/dev-lang/spark/Manifest
+++ b/dev-lang/spark/Manifest
@@ -1,8 +1,5 @@
-AUX spark-2017-gentoo.patch 379 BLAKE2B 33907d6cd9099071cd04f687b05ab33da89bbd9a1d15e8282ae7791786c5638f977b39d482dfc15d07377ed2b06937a1d3f9ca18a6eb745ac7c3ec4d7cffa5ee SHA512 b4db9b56ab003dff8aec28248ea32af6fb4067c1824b0f6d115d66d1f3c8d180a17a2fa52a5f2ebc3605b549e0b38aafa15e9f238b079d5366d5375d851d84d1
-DIST gnat-gpl-2017-src.tar.gz 8783473 BLAKE2B b0415b42f4d3a5e8675591a5602ff0a96945670104064671a232c0c12271ee141a3a5d148b8507bdab83cb8a0677c57b78e690060088308c51732bad3715964f SHA512 ae7314a2241107ed4d962dce08306eeb34c5f11e26183935bbb1ccf3a5eb011d6457c1b6fcded93dd0ee9ba31d791971ebe2a5a5a0ae04ff80d87a670325a098
+AUX spark-2017-gentoo.patch 923 BLAKE2B 7db222ddf50ffde64c54b308e43c6f74acc4fd4ed6d6ff200e61a04a4ebcb7b61bc013f973708eea9ff1f959a144022f643e22627de15c77038a0cb692b7d180 SHA512 0e3b96e8a31d5c3c5013cddf62d6cebd29d0bfe45ad270b579c7723b21f81a810ae34805e57940f0ab7169ecda2ebb20cddfb0d600b2184910a932daf272544f
 DIST gnat-gpl-2018-src.tar.gz 8706578 BLAKE2B ba245fd91cc5263d5b8c159d9e75caf6bed21dcaa5fa43734af8775a4008ce5f96bfb84a8b5e6e734ff883314ab3219dacec3fe95a5baa33fb712bfb5ff8bce8 SHA512 0ff7e848ef77f7e772e2a1b01905307a91c332f32329456f5238c4b7eb46cc118709e8682a5fc826d98a7d99fd15a92c194f4a278f04bc465165cfa616cc3c2e
-DIST spark-gpl-2017-src.tar.gz 19750595 BLAKE2B 840eb9044b732aad16d2b6be9972e4805caf1e1b521ba40cc2a234871775d0212153ed9e9f84b4a2ddbeefc2b9c7d7556db943153655df6051cf4dc3f1be2e01 SHA512 90e7644daa6a935c839da9799c6dc5fe0a566f29c5f5d0a964ef5c888581f18c11adf6aa0151ae72437b91430fae06604dab8c3f1fd3222d749cfd330293ff6e
 DIST spark-gpl-2018-src.tar.gz 20244517 BLAKE2B efb8120a869eaf79aa513ea3b3393dcefdb548e66a00a630bfb9d28a59785c15362c111df3635423a7312c491c9929a7bcd8e7161607dc4d3acd6d1c27f3ca3e SHA512 83490a95c2d6401bcd077a8ec508eaf18609b5b480ccd9f247f4bb61164b5e52e34473526cd49ebdf5fd15ac422ed4a121dc50cab96241db02af9e32812a4df8
-EBUILD spark-2017.ebuild 1624 BLAKE2B aac6291f8bdae0017541abb1966c87a8f32b7dfdb867a881dca1a0082cff3ee27d5e166daefdc9b847835d1f3dd37241ac050c0c2b4cead91ce9a109cb927dbd SHA512 e9dfb3b97723f69ca6caeeda75f97dcea06ddb6ba72d796b98d314426656620321de531e2c6f6ea3ed0bfe4a44ff8d7d37d7390e171784326a8149c08193f053
-EBUILD spark-2018.ebuild 1651 BLAKE2B 7d40b0c9a3be7b31337d46824d6b48c0cb1775f5ac390a30db2343618234bdf85e2fe2a6bed73ea2dd7f43c7976b892aa84641aa418102aafb3d5f5725ad9b53 SHA512 0f57d4f77f3424a40fdf02367f54b84fdb197a589d2a182a8e6103f371014207cee676a24774f035d2ef52d8624dd76cfddac663f2ad402d5f0c0e40df63848c
+EBUILD spark-2018-r1.ebuild 1604 BLAKE2B 04a70f878ac1cc0b570a5bf5e9498a02f885a47d705dacb024a4fd0f0a386a0fb1e954d2d19d59ae2ab3dde0e0b1e4c7ea89e0fbf1c512e639f29be9ff993a97 SHA512 0095a548f989bb1b6d605b4404f7c6a2c19bf0204debd4ecf6663e5f2ea172f10deb095942ba8b787f6be7c07c8b60180b19d95f51c2d15f16460b4ab619fc5d
 MISC metadata.xml 670 BLAKE2B 16a5a9781edcf7b7caf8134d4bb8b8997d4711daa07392809e055d989aa06e74f28a66d99b279eab9fd97f4444a756ec1de9cf92ebb00d4673ad50e008f51458 SHA512 4c51c93557ea581e109dfc62a602327f1056139a0e11e3c187ba8b1f8a0d4b4089894cb83cc909a922bf0a90f572a0b01f00face3782e861a46edeab1c7d3949
diff --git a/dev-lang/spark/files/spark-2017-gentoo.patch b/dev-lang/spark/files/spark-2017-gentoo.patch
index 479a7ace4dc2..8258c9feab7e 100644
--- a/dev-lang/spark/files/spark-2017-gentoo.patch
+++ b/dev-lang/spark/files/spark-2017-gentoo.patch
@@ -1,5 +1,5 @@
---- spark-gpl-2017-src/gnat2why/gnat2why_c.gpr.old	2017-10-04 21:41:41.613376056 +0200
-+++ spark-gpl-2017-src/gnat2why/gnat2why_c.gpr	2017-10-04 21:42:30.582572536 +0200
+--- a/gnat2why/gnat2why_c.gpr	2017-10-04 21:41:41.613376056 +0200
++++ b/gnat2why/gnat2why_c.gpr	2017-10-04 21:42:30.582572536 +0200
 @@ -1,4 +1,7 @@
  project Gnat2Why_C is
     for Languages use ("C");
@@ -8,3 +8,16 @@
 +      for Driver ("C") use External ("CC", "gcc");
 +   end Compiler;
  end Gnat2Why_C;
+--- a/gnatprove/configuration.adb	2019-11-08 19:20:16.876198539 +0100
++++ b/gnatprove/configuration.adb	2019-11-08 19:21:13.550201663 +0100
+@@ -694,7 +694,9 @@
+          Tree         : Project_Tree;
+ 
+       begin
+-         Set_Path_From_Gnatls (Proj_Env.all, "gnatls", GNAT_Version);
++         Set_Path_From_Gnatls (Proj_Env.all,
++                               "gnatls",
++                               GNAT_Version);
+          Free (GNAT_Version);
+          Set_Object_Subdir (Proj_Env.all, Subdir_Name);
+          Proj_Env.Register_Default_Language_Extension ("C", ".h", ".c");
diff --git a/dev-lang/spark/spark-2017.ebuild b/dev-lang/spark/spark-2017.ebuild
deleted file mode 100644
index be23d86d0c24..000000000000
--- a/dev-lang/spark/spark-2017.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs multiprocessing
-
-MYP=${PN}-gpl-${PV}
-
-DESCRIPTION="Software development for high-reliability applications."
-HOMEPAGE="http://libre.adacore.com"
-SRC_URI="http://mirrors.cdn.adacore.com/art/591c4777c7a447af2deed05e
-	-> ${MYP}-src.tar.gz
-	http://mirrors.cdn.adacore.com/art/591adbb4c7a4473fcc4532a3
-		-> gnat-gpl-2017-src.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE=""
-
-RDEPEND="dev-lang/gnat-gpl:6.3.0
-	>=dev-ada/gnatcoll-2017[gnat_2017,projects,shared]
-	sci-mathematics/alt-ergo
-	sci-mathematics/why3-for-spark"
-DEPEND="${RDEPEND}
-	dev-ada/gprbuild[gnat_2017]"
-
-S="${WORKDIR}"/${MYP}-src
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-src_prepare() {
-	ln -sf "${WORKDIR}"/gnat-gpl-2017-src/src/ada gnat2why/gnat_src || die
-	GCC_PV=6.3.0
-	sed -i \
-		-e "s:gnatmake:gnatmake-${GCC_PV}:g" \
-		-e "s:gnatls:gnatls-${GCC_PV}:g" \
-		Makefile \
-		gnat2why/Makefile || die
-	default
-}
-
-src_compile() {
-	emake GPRARGS="-XLIBRARY_TYPE=relocatable" gnat2why
-	emake PROD="-XLIBRARY_TYPE=relocatable" gnatprove
-}
-
-src_install() {
-	emake INSTALLDIR="${D}"/usr install
-	einstalldocs
-	dosym ../../../lib64/why3/why3server /usr/libexec/spark/bin/why3server
-	dobin install/bin/gnatprove
-	mv install/share/doc/spark/* "${D}"/usr/share/doc/${PF} || die
-	exeinto /usr/libexec/spark/bin
-	doexe install/bin/gnat2why
-	doexe install/bin/spark_memcached_wrapper
-	doexe install/bin/spark_report
-	doexe install/bin/spark_codepeer_wrapper
-	mv "${D}"/usr/bin/target.atp "${D}"/usr/libexec/spark/bin || die
-}
diff --git a/dev-lang/spark/spark-2018.ebuild b/dev-lang/spark/spark-2018-r1.ebuild
index d538aa73fcb2..e49999294ef5 100644
--- a/dev-lang/spark/spark-2018.ebuild
+++ b/dev-lang/spark/spark-2018-r1.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit toolchain-funcs multiprocessing
+ADA_COMPAT=( gnat_2018 )
+inherit ada toolchain-funcs multiprocessing
 
 MYP=${PN}-gpl-${PV}
 
@@ -19,12 +20,14 @@ SLOT="0"
 KEYWORDS="amd64"
 IUSE=""
 
-RDEPEND="dev-lang/gnat-gpl:7.3.1
-	dev-ada/gnatcoll-core[gnat_2018,shared]
+RDEPEND="
+	dev-ada/gnatcoll-core[${ADA_USEDEP},shared]
 	sci-mathematics/alt-ergo
 	sci-mathematics/why3-for-spark"
 DEPEND="${RDEPEND}
-	dev-ada/gprbuild[gnat_2018]"
+	dev-ada/gprbuild[${ADA_USEDEP}]"
+
+REQUIRED_USE="${ADA_REQUIRED_USE}"
 
 S="${WORKDIR}"/${MYP}-src
 
@@ -32,14 +35,10 @@ PATCHES=( "${FILESDIR}"/${PN}-2017-gentoo.patch )
 
 src_prepare() {
 	ln -sf "${WORKDIR}"/gnat-gpl-2018-src/src/ada gnat2why/gnat_src || die
-	GCC_PV=7.3.1
-	sed -i \
-		-e "s:gnatmake:gnatmake-${GCC_PV}:g" \
-		-e "s:gnatls:gnatls-${GCC_PV}:g" \
-		Makefile \
-		gnatprove/configuration.adb \
-		gnat2why/Makefile || die
 	default
+	sed -i \
+		-e "s:gnatls:${GNATLS}:g" \
+		gnatprove/configuration.adb || die
 }
 
 src_compile() {