public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/spark/files/, dev-lang/spark/
@ 2017-10-21 18:20 Alfredo Tupone
  0 siblings, 0 replies; 5+ messages in thread
From: Alfredo Tupone @ 2017-10-21 18:20 UTC (permalink / raw
  To: gentoo-commits

commit:     f406928d9d838acf1e6052aa6a056c87af77952d
Author:     Tupone Alfredo <tupone <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 21 18:20:11 2017 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Sat Oct 21 18:20:11 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f406928d

dev-lang/spark: Add dev-lang/spark

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 dev-lang/spark/Manifest                      |  2 +
 dev-lang/spark/files/spark-2017-gentoo.patch | 10 +++++
 dev-lang/spark/metadata.xml                  | 16 ++++++++
 dev-lang/spark/spark-2017.ebuild             | 60 ++++++++++++++++++++++++++++
 4 files changed, 88 insertions(+)

diff --git a/dev-lang/spark/Manifest b/dev-lang/spark/Manifest
new file mode 100644
index 00000000000..72f350b3621
--- /dev/null
+++ b/dev-lang/spark/Manifest
@@ -0,0 +1,2 @@
+DIST gnat-gpl-2017-src.tar.gz 8783473 SHA256 91c9733fb8f8ca4c42fbcab3bc8a54fc83083126f6e6b630c9a36f3654537c29 SHA512 ae7314a2241107ed4d962dce08306eeb34c5f11e26183935bbb1ccf3a5eb011d6457c1b6fcded93dd0ee9ba31d791971ebe2a5a5a0ae04ff80d87a670325a098 WHIRLPOOL cf98ed36553ddfb54502f10898016017e387920bea074395c3a84047c2ec707734a9299de8c5f2f1931a53e04c24e67f8ab017437fbee7b7a658a6c0bca46e35
+DIST spark-gpl-2017-src.tar.gz 19750595 SHA256 39f12849e0c537fe29b874ddc8f6949956894eb4b8e8f5451cbcea6bd3552622 SHA512 90e7644daa6a935c839da9799c6dc5fe0a566f29c5f5d0a964ef5c888581f18c11adf6aa0151ae72437b91430fae06604dab8c3f1fd3222d749cfd330293ff6e WHIRLPOOL f476fd03e1c30f2bc9e92719bf7b3724699586e3c030096dac5c4042e44b6f2cbf28e410bd918e2f4c25ac930229e7b42d6ed6a0b18be65d6a234b8cedd6f5c7

diff --git a/dev-lang/spark/files/spark-2017-gentoo.patch b/dev-lang/spark/files/spark-2017-gentoo.patch
new file mode 100644
index 00000000000..479a7ace4dc
--- /dev/null
+++ b/dev-lang/spark/files/spark-2017-gentoo.patch
@@ -0,0 +1,10 @@
+--- 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
+@@ -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/metadata.xml b/dev-lang/spark/metadata.xml
new file mode 100644
index 00000000000..ca4e653c68e
--- /dev/null
+++ b/dev-lang/spark/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>tupone@gentoo.org</email>
+		<name>Tupone Alfredo</name>
+	</maintainer>
+	<longdescription lang="en">
+		SPARK is a software development technology specifically designed for
+		engineering high-reliability applications. It consists of a programming
+		language, a verification toolset and a design method which, taken
+		together, ensure that ultra-low defect software can be deployed in
+		application domains where high-reliability must be assured, for example
+		where safety and security are key requirements.
+	</longdescription>
+</pkgmetadata>

diff --git a/dev-lang/spark/spark-2017.ebuild b/dev-lang/spark/spark-2017.ebuild
new file mode 100644
index 00000000000..9f1b5646a0e
--- /dev/null
+++ b/dev-lang/spark/spark-2017.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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]
+	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 gnat2why 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
+}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-lang/spark/files/, dev-lang/spark/
@ 2019-11-08 19:00 Alfredo Tupone
  0 siblings, 0 replies; 5+ messages in thread
From: Alfredo Tupone @ 2019-11-08 19:00 UTC (permalink / raw
  To: gentoo-commits

commit:     22f1d8b3762029116adf9d5ebd3b5db422b89e31
Author:     Tupone Alfredo <tupone <AT> gentoo <DOT> org>
AuthorDate: Fri Nov  8 19:00:28 2019 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Fri Nov  8 19:00:28 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22f1d8b3

dev-lang/spark: fix compile

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

 dev-lang/spark/files/spark-2017-gentoo.patch | 17 +++++++++++++++--
 dev-lang/spark/spark-2018-r1.ebuild          |  2 +-
 dev-lang/spark/spark-2018.ebuild             |  4 ++--
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/dev-lang/spark/files/spark-2017-gentoo.patch b/dev-lang/spark/files/spark-2017-gentoo.patch
index 479a7ace4dc..8258c9feab7 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-2018-r1.ebuild b/dev-lang/spark/spark-2018-r1.ebuild
index 3bdf63d22f4..62f2959951d 100644
--- a/dev-lang/spark/spark-2018-r1.ebuild
+++ b/dev-lang/spark/spark-2018-r1.ebuild
@@ -35,10 +35,10 @@ 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
-	default
 }
 
 src_compile() {

diff --git a/dev-lang/spark/spark-2018.ebuild b/dev-lang/spark/spark-2018.ebuild
index d538aa73fcb..c6d8008d3a2 100644
--- a/dev-lang/spark/spark-2018.ebuild
+++ b/dev-lang/spark/spark-2018.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -32,6 +32,7 @@ PATCHES=( "${FILESDIR}"/${PN}-2017-gentoo.patch )
 
 src_prepare() {
 	ln -sf "${WORKDIR}"/gnat-gpl-2018-src/src/ada gnat2why/gnat_src || die
+	default
 	GCC_PV=7.3.1
 	sed -i \
 		-e "s:gnatmake:gnatmake-${GCC_PV}:g" \
@@ -39,7 +40,6 @@ src_prepare() {
 		Makefile \
 		gnatprove/configuration.adb \
 		gnat2why/Makefile || die
-	default
 }
 
 src_compile() {


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-lang/spark/files/, dev-lang/spark/
@ 2019-12-01 17:36 Alfredo Tupone
  0 siblings, 0 replies; 5+ messages in thread
From: Alfredo Tupone @ 2019-12-01 17:36 UTC (permalink / raw
  To: gentoo-commits

commit:     ed28a08c44b7e0d4cd6a8ab3c662549a4ffafc40
Author:     Tupone Alfredo <tupone <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  1 17:35:39 2019 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Sun Dec  1 17:35:39 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed28a08c

dev-lang/spark: version bump

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

 dev-lang/spark/Manifest                      |  2 +
 dev-lang/spark/files/spark-2019-gentoo.patch | 23 ++++++++++
 dev-lang/spark/spark-2019.ebuild             | 67 ++++++++++++++++++++++++++++
 3 files changed, 92 insertions(+)

diff --git a/dev-lang/spark/Manifest b/dev-lang/spark/Manifest
index 8b779205964..ae89247fb3a 100644
--- a/dev-lang/spark/Manifest
+++ b/dev-lang/spark/Manifest
@@ -1,2 +1,4 @@
+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

diff --git a/dev-lang/spark/files/spark-2019-gentoo.patch b/dev-lang/spark/files/spark-2019-gentoo.patch
new file mode 100644
index 00000000000..d940471dfcf
--- /dev/null
+++ b/dev-lang/spark/files/spark-2019-gentoo.patch
@@ -0,0 +1,23 @@
+--- 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/spark-2019.ebuild b/dev-lang/spark/spark-2019.ebuild
new file mode 100644
index 00000000000..0a0f4fd0550
--- /dev/null
+++ b/dev-lang/spark/spark-2019.ebuild
@@ -0,0 +1,67 @@
+# 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
+}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-lang/spark/files/, dev-lang/spark/
@ 2021-06-21 20:34 Alfredo Tupone
  0 siblings, 0 replies; 5+ messages in thread
From: Alfredo Tupone @ 2021-06-21 20:34 UTC (permalink / raw
  To: gentoo-commits

commit:     dd85fc72ef380a6bd87457d16a2fa9e562366f1f
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 21 20:34:37 2021 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Mon Jun 21 20:34:37 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd85fc72

dev-lang/spark: patch gnatls command

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

 dev-lang/spark/files/spark-2021-gentoo.patch | 13 +++++++++++++
 dev-lang/spark/spark-2021.ebuild             |  5 +++++
 2 files changed, 18 insertions(+)

diff --git a/dev-lang/spark/files/spark-2021-gentoo.patch b/dev-lang/spark/files/spark-2021-gentoo.patch
new file mode 100644
index 00000000000..d79a5af9e38
--- /dev/null
+++ b/dev-lang/spark/files/spark-2021-gentoo.patch
@@ -0,0 +1,13 @@
+--- 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;
+ 
+-         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/spark-2021.ebuild b/dev-lang/spark/spark-2021.ebuild
index 01b83053481..9c090883d17 100644
--- a/dev-lang/spark/spark-2021.ebuild
+++ b/dev-lang/spark/spark-2021.ebuild
@@ -36,6 +36,8 @@ REQUIRED_USE="${ADA_REQUIRED_USE}"
 
 S="${WORKDIR}"/${MYP}
 
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
 pkg_setup() {
 	ada_pkg_setup
 	python-any-r1_pkg_setup
@@ -44,6 +46,9 @@ 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() {


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-lang/spark/files/, dev-lang/spark/
@ 2021-06-22  7:07 Alfredo Tupone
  0 siblings, 0 replies; 5+ messages in thread
From: Alfredo Tupone @ 2021-06-22  7:07 UTC (permalink / raw
  To: gentoo-commits

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
-}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2021-06-22  7:07 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-12-01 17:36 [gentoo-commits] repo/gentoo:master commit in: dev-lang/spark/files/, dev-lang/spark/ Alfredo Tupone
  -- strict thread matches above, loose matches on Subject: below --
2021-06-22  7:07 Alfredo Tupone
2021-06-21 20:34 Alfredo Tupone
2019-11-08 19:00 Alfredo Tupone
2017-10-21 18:20 Alfredo Tupone

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox