[gentoo-commits] repo/gentoo:master commit in: dev-lang/spark/files/, dev-lang/spark/

[Alfredo Tupone]

commit:     96d71541ba688bdf0a86d857b78ad7902b3862a0
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 22 07:07:00 2021 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Tue Jun 22 07:07:00 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96d71541

dev-lang/spark: remove old version

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>

 dev-lang/spark/Manifest                      |  4 --
 dev-lang/spark/files/spark-2017-gentoo.patch | 23 ----------
 dev-lang/spark/files/spark-2019-gentoo.patch | 23 ----------
 dev-lang/spark/files/spark-2021-gentoo.patch | 10 +++++
 dev-lang/spark/spark-2018-r1.ebuild          | 61 -------------------------
 dev-lang/spark/spark-2019.ebuild             | 67 ----------------------------
 6 files changed, 10 insertions(+), 178 deletions(-)

diff --git a/dev-lang/spark/Manifest b/dev-lang/spark/Manifest
index 853dd1faf69..69576300de1 100644
--- a/dev-lang/spark/Manifest
+++ b/dev-lang/spark/Manifest
@@ -1,6 +1,2 @@
-DIST gnat-2019-20190517-18C94-src.tar.gz 8950160 BLAKE2B ce6b8ca0687b3d345db72a8b3216e67ba706cfd7f6ca98f45ec2ae356d9c5b3a42a4b3aac5e89285871157ddaca3aff1b970934de88f8190d84aff060bf1fc4b SHA512 4d57c97fc1f3d5274e0c4ffa536ec056e7c3f1619010affff008cd07a0bfa638d18fee1705a5dd76f12d168baef85677cc34ef40f5e52fd5292ac886c0d4c5ee
 DIST gnat-2021-20210519-19A70-src.tar.gz 8765762 BLAKE2B ef48f54c6109566e37bfa5dee9262305d0529b3dfd333ee28bc4e66f4709a0673f673d742bc04deb15dc145404f7618d350dbdf3f2a7ab37c861e57d011946fa SHA512 3cb79be024fdd9b738d99ffc8e224d32bb382b5da2d02b97b2061a5ea58456f33d4564c92e224af2713ce15fd5481edd715e5b9a52abc74fdc142f27e103c201
-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-2021-2021-20210519-19A1A-src.tar.gz 11361491 BLAKE2B 67f8d27ae68ef4929aafaf96c470394e093883619c5c778e804f1ff62c297d5a3f628e04e987fb06741cb824710599928a7ec3b94fa6d7af029cff35be0898c3 SHA512 b595516892f6054d3c856c30c4296be9cd61adca3ea2cffe3c9060fbab249d36ce1b8fff6f80e1e8173ef6e232dd9c2da8a581ae9964845120c03d09896b635c
-DIST spark-gpl-2018-src.tar.gz 20244517 BLAKE2B efb8120a869eaf79aa513ea3b3393dcefdb548e66a00a630bfb9d28a59785c15362c111df3635423a7312c491c9929a7bcd8e7161607dc4d3acd6d1c27f3ca3e SHA512 83490a95c2d6401bcd077a8ec508eaf18609b5b480ccd9f247f4bb61164b5e52e34473526cd49ebdf5fd15ac422ed4a121dc50cab96241db02af9e32812a4df8

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 8258c9feab7..00000000000
--- 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-2019-gentoo.patch
deleted file mode 100644
index d940471dfcf..00000000000
--- a/dev-lang/spark/files/spark-2019-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-28 08:13:36.857402405 +0100
-+++ b/gnatprove/configuration.adb	2019-11-28 08:14:23.777570096 +0100
-@@ -1161,7 +1161,9 @@
- 
-          end if;
- 
--         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,
-                             Filesystem_String

diff --git a/dev-lang/spark/files/spark-2021-gentoo.patch b/dev-lang/spark/files/spark-2021-gentoo.patch
index d79a5af9e38..e2f44d23796 100644
--- a/dev-lang/spark/files/spark-2021-gentoo.patch
+++ b/dev-lang/spark/files/spark-2021-gentoo.patch
@@ -11,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 e49999294ef..00000000000
--- 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 0a0f4fd0550..00000000000
--- 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
-}