gentoo resync : 24.06.2021

6 files changed, 109 insertions, 172 deletions

diff --git a/dev-lang/spark/Manifest b/dev-lang/spark/Manifest
index 69da32b0009e..d323de2fd3ec 100644
--- a/dev-lang/spark/Manifest
+++ b/dev-lang/spark/Manifest
@@ -1,9 +1,5 @@
-AUX spark-2017-gentoo.patch 923 BLAKE2B 7db222ddf50ffde64c54b308e43c6f74acc4fd4ed6d6ff200e61a04a4ebcb7b61bc013f973708eea9ff1f959a144022f643e22627de15c77038a0cb692b7d180 SHA512 0e3b96e8a31d5c3c5013cddf62d6cebd29d0bfe45ad270b579c7723b21f81a810ae34805e57940f0ab7169ecda2ebb20cddfb0d600b2184910a932daf272544f
-AUX spark-2019-gentoo.patch 852 BLAKE2B 128873e85d432057323a2d246a932915e67da0f10d4bdfebbeccc70edeee1f7d09740475772797fc672057e3fa07bb89b358653882770a063beb548ac7020f93 SHA512 4f595563e1684eb5093dc9f4835b2c7365d2ac2cc286eb7a977cef984fbf13257746a44d2d8553eed08dd015ae0e73a7239a2c3a0e1990f81bbf04937b4e1768
-DIST gnat-2019-20190517-18C94-src.tar.gz 8950160 BLAKE2B ce6b8ca0687b3d345db72a8b3216e67ba706cfd7f6ca98f45ec2ae356d9c5b3a42a4b3aac5e89285871157ddaca3aff1b970934de88f8190d84aff060bf1fc4b SHA512 4d57c97fc1f3d5274e0c4ffa536ec056e7c3f1619010affff008cd07a0bfa638d18fee1705a5dd76f12d168baef85677cc34ef40f5e52fd5292ac886c0d4c5ee
-DIST gnat-gpl-2018-src.tar.gz 8706578 BLAKE2B ba245fd91cc5263d5b8c159d9e75caf6bed21dcaa5fa43734af8775a4008ce5f96bfb84a8b5e6e734ff883314ab3219dacec3fe95a5baa33fb712bfb5ff8bce8 SHA512 0ff7e848ef77f7e772e2a1b01905307a91c332f32329456f5238c4b7eb46cc118709e8682a5fc826d98a7d99fd15a92c194f4a278f04bc465165cfa616cc3c2e
-DIST spark-2019-20190517-19665-src.tar.gz 22778220 BLAKE2B b0e2141c4b8aa603ee51fe984654c502d214cc5461cf7afba90926b4f3393772bc755a4ec8ef307496f5c052d3c478312f987b79d8b31bec3e9dba962cedd419 SHA512 9ee15e1ae80720a0295ec8a59e1b414f82a4044ebd47f81f8daea7a155720bb151714d9e9c2830612f5530d906f6c393e84ffde16982afef547f1c8edc27e97a
-DIST spark-gpl-2018-src.tar.gz 20244517 BLAKE2B efb8120a869eaf79aa513ea3b3393dcefdb548e66a00a630bfb9d28a59785c15362c111df3635423a7312c491c9929a7bcd8e7161607dc4d3acd6d1c27f3ca3e SHA512 83490a95c2d6401bcd077a8ec508eaf18609b5b480ccd9f247f4bb61164b5e52e34473526cd49ebdf5fd15ac422ed4a121dc50cab96241db02af9e32812a4df8
-EBUILD spark-2018-r1.ebuild 1604 BLAKE2B 04a70f878ac1cc0b570a5bf5e9498a02f885a47d705dacb024a4fd0f0a386a0fb1e954d2d19d59ae2ab3dde0e0b1e4c7ea89e0fbf1c512e639f29be9ff993a97 SHA512 0095a548f989bb1b6d605b4404f7c6a2c19bf0204debd4ecf6663e5f2ea172f10deb095942ba8b787f6be7c07c8b60180b19d95f51c2d15f16460b4ab619fc5d
-EBUILD spark-2019.ebuild 1759 BLAKE2B f9a9ba8d25c322f0e171c9724d809a54be28bc3291a57b3f19d5cb9793e1768339e4d8a5df4bb75ba1078068cd628d5fe77183c90699f34ecc01c21285f88209 SHA512 bf945749d9657b938cd9c94aadf51f32e44fd4289337bd8cda435b673fcc230381abf96797112b5fb676246bbf595c958ec8230924243f12f514ca4a13b24912
+AUX spark-2021-gentoo.patch 860 BLAKE2B 6eb65c19b604a8d9370bf4da87899c1b8471c52763c17b97322856ddb701e46f6d5c5de03df204c287c728413e5ab8de2f320c75d9c3acb049abad62360037da SHA512 ac636251eb45868430e46d0f5566ab655dc5a223bd44fa4b76bd75c679779cc037bf6ef376f9f4ec22a90b1347bf302d382e1d540b448acb6308c1b3e33036ec
+DIST gnat-2021-20210519-19A70-src.tar.gz 8765762 BLAKE2B ef48f54c6109566e37bfa5dee9262305d0529b3dfd333ee28bc4e66f4709a0673f673d742bc04deb15dc145404f7618d350dbdf3f2a7ab37c861e57d011946fa SHA512 3cb79be024fdd9b738d99ffc8e224d32bb382b5da2d02b97b2061a5ea58456f33d4564c92e224af2713ce15fd5481edd715e5b9a52abc74fdc142f27e103c201
+DIST spark-2021-2021-20210519-19A1A-src.tar.gz 11361491 BLAKE2B 67f8d27ae68ef4929aafaf96c470394e093883619c5c778e804f1ff62c297d5a3f628e04e987fb06741cb824710599928a7ec3b94fa6d7af029cff35be0898c3 SHA512 b595516892f6054d3c856c30c4296be9cd61adca3ea2cffe3c9060fbab249d36ce1b8fff6f80e1e8173ef6e232dd9c2da8a581ae9964845120c03d09896b635c
+EBUILD spark-2021.ebuild 2430 BLAKE2B 405ce0dc9fc1caa0d3a076ee8af0bf683a72025cdd51babc72387e6e1ab9e7c0e7808b0df80d2202a773ba3009d62c7e11a134a8149c53442aee62e68b0599e2 SHA512 f31cbf1bc0ad150a9edf44c01888ad51d960cb15fe950f4a9b860141e1f7e3c3362f1b574129f840152bca850fe4408ee246096952674c1d0eeefde6ac21e0ef
 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
deleted file mode 100644
index 8258c9feab7e..000000000000
--- a/dev-lang/spark/files/spark-2017-gentoo.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- 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");
-    for Object_Dir use "obj";
-+   package Compiler is
-+      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/files/spark-2019-gentoo.patch b/dev-lang/spark/files/spark-2021-gentoo.patch
index d940471dfcf8..e2f44d237962 100644
--- a/dev-lang/spark/files/spark-2019-gentoo.patch
+++ b/dev-lang/spark/files/spark-2021-gentoo.patch
@@ -1,16 +1,6 @@
---- 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");
-    for Object_Dir use "obj";
-+   package Compiler is
-+      for Driver ("C") use External ("CC", "gcc");
-+   end Compiler;
- end Gnat2Why_C;
---- a/gnatprove/configuration.adb	2019-11-28 08:13:36.857402405 +0100
-+++ b/gnatprove/configuration.adb	2019-11-28 08:14:23.777570096 +0100
-@@ -1161,7 +1161,9 @@
+--- a/src/gnatprove/configuration.adb	2021-06-21 22:30:18.962850246 +0200
++++ b/src/gnatprove/configuration.adb	2021-06-21 22:31:03.621210570 +0200
+@@ -1269,7 +1269,9 @@
  
           end if;
  
@@ -21,3 +11,13 @@
           Free (GNAT_Version);
           Set_Object_Subdir (Proj_Env.all,
                              Filesystem_String
+--- 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");
+    for Object_Dir use "obj";
++   package Compiler is
++      for Driver ("C") use External ("CC", "gcc");
++   end Compiler;
+ end Gnat2Why_C;
diff --git a/dev-lang/spark/spark-2018-r1.ebuild b/dev-lang/spark/spark-2018-r1.ebuild
deleted file mode 100644
index e49999294ef5..000000000000
--- a/dev-lang/spark/spark-2018-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ADA_COMPAT=( gnat_2018 )
-inherit ada 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/5b0819dec7a447df26c27a47
-	-> ${MYP}-src.tar.gz
-	http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27aa5
-		-> gnat-gpl-2018-src.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE=""
-
-RDEPEND="
-	dev-ada/gnatcoll-core[${ADA_USEDEP},shared]
-	sci-mathematics/alt-ergo
-	sci-mathematics/why3-for-spark"
-DEPEND="${RDEPEND}
-	dev-ada/gprbuild[${ADA_USEDEP}]"
-
-REQUIRED_USE="${ADA_REQUIRED_USE}"
-
-S="${WORKDIR}"/${MYP}-src
-
-PATCHES=( "${FILESDIR}"/${PN}-2017-gentoo.patch )
-
-src_prepare() {
-	ln -sf "${WORKDIR}"/gnat-gpl-2018-src/src/ada gnat2why/gnat_src || die
-	default
-	sed -i \
-		-e "s:gnatls:${GNATLS}:g" \
-		gnatprove/configuration.adb || die
-}
-
-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-2019.ebuild b/dev-lang/spark/spark-2019.ebuild
deleted file mode 100644
index 0a0f4fd0550c..000000000000
--- a/dev-lang/spark/spark-2019.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ADA_COMPAT=( gnat_2019 )
-PYTHON_COMPAT=( python2_7 )
-
-inherit ada python-any-r1 toolchain-funcs multiprocessing
-
-DESCRIPTION="Software development for high-reliability applications."
-HOMEPAGE="http://libre.adacore.com"
-SRC_URI="http://mirrors.cdn.adacore.com/art/5cdf912431e87a8f1c967d51
-	-> ${P}-20190517-19665-src.tar.gz
-	http://mirrors.cdn.adacore.com/art/5cdf865331e87aa2cdf16b49
-		-> gnat-2019-20190517-18C94-src.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="
-	dev-ada/gnatcoll-core[${ADA_USEDEP},shared]
-	sci-mathematics/alt-ergo
-	sci-mathematics/why3-for-spark"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-ada/gprbuild[${ADA_USEDEP}]"
-
-REQUIRED_USE="${ADA_REQUIRED_USE}"
-
-S="${WORKDIR}"/${P}-2019-20190517-19665-src
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-pkg_setup() {
-	ada_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	ln -sf "${WORKDIR}"/gnat-2019-20190517-18C94-src/src/ada gnat2why/gnat_src || die
-	default
-	sed -i \
-		-e "s:gnatls:${GNATLS}:g" \
-		gnatprove/configuration.adb || die
-}
-
-src_compile() {
-	emake -C gnat2why GPRARGS="-XLIBRARY_TYPE=relocatable -v"
-	emake -C gnatprove PROD="-XLIBRARY_TYPE=relocatable -v"
-}
-
-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-2021.ebuild b/dev-lang/spark/spark-2021.ebuild
new file mode 100644
index 000000000000..9c090883d172
--- /dev/null
+++ b/dev-lang/spark/spark-2021.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ADA_COMPAT=( gnat_2021 )
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit ada python-any-r1 toolchain-funcs multiprocessing
+
+ADA_MIRROR=https://community.download.adacore.com/v1
+ID=969ce28e217bd5aa4db549a544d20846408a5229
+MYP=${P}-2021-20210519-19A1A-src
+GNATID=005d2b2eff627177986d2517eb31e1959bec6f3a
+GNATDIR=gnat-${PV}-20210519-19A70-src
+
+DESCRIPTION="Software development for high-reliability applications."
+HOMEPAGE="http://libre.adacore.com"
+SRC_URI="${ADA_MIRROR}/${ID}?filename=${MYP}.tar.gz -> ${MYP}.tar.gz
+	${ADA_MIRROR}/${GNATID}?filename=${GNATDIR}.tar.gz -> ${GNATDIR}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+	dev-ada/gnatcoll-core[${ADA_USEDEP},shared]
+	sci-mathematics/alt-ergo
+	sci-mathematics/why3-for-spark"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	dev-ada/gprbuild[${ADA_USEDEP}]"
+
+REQUIRED_USE="${ADA_REQUIRED_USE}"
+
+S="${WORKDIR}"/${MYP}
+
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
+pkg_setup() {
+	ada_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	ln -sf "${WORKDIR}"/${GNATDIR}/src/ada gnat2why/gnat_src || die
+	default
+	sed -i \
+		-e "s:gnatls:${GNATLS}:g" \
+		src/gnatprove/configuration.adb || die
+}
+
+src_compile() {
+	emake -C gnat2why GPRARGS="-XLIBRARY_TYPE=relocatable -v"
+	gprbuild -p -XLIBRARY_TYPE=relocatable -v -P gnatprove.gpr || die
+	emake -C include generate
+}
+
+src_install() {
+	# Create the fake prover scripts to help extract benchmarks.
+	insinto /usr/libexec/spark/bin/
+	doins benchmark_script/fake_*
+
+	gprbuild -q -c -u -gnats spark2014vsn.ads \
+		-XLIBRARY_TYPE=relocatable -v \
+		-gnatet="${D}"/usr/libexec/spark/bin/target.atp || die
+	insinto /usr/share/spark
+	doins share/spark/help.txt
+	doins -r share/spark/config
+	insinto /usr/share/spark/theories
+	doins share/spark/theories/*why
+	doins share/spark/theories/*mlw
+	insinto /usr/share/spark/runtimes
+	doins share/spark/runtimes/README
+	insinto /usr/include/spark
+	doins include/*.ad?
+	insinto /usr/lib/gnat
+	doins include/*.gpr
+	doins -r include/proof
+
+	dosym ../../../lib64/why3/why3server /usr/libexec/spark/bin/why3server
+	dobin install/bin/gnatprove
+	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
+	doexe install/bin/spark_semaphore_wrapper
+
+	einstalldocs
+}