commit: bb6e655e73019e2ed506903e4609dc212bcf6eaf
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 26 22:46:04 2021 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Fri Nov 26 22:48:20 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb6e655e
sci-mathematics/spin: add 6.5.1, remove 6.4.5
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
sci-mathematics/spin/Manifest | 2 +-
.../spin/files/spin-6.4.5-makefile.patch | 20 --------
.../spin/files/spin-6.5.1-makefile.patch | 11 +++++
sci-mathematics/spin/spin-6.4.5.ebuild | 47 -------------------
sci-mathematics/spin/spin-6.5.1.ebuild | 54 ++++++++++++++++++++++
5 files changed, 66 insertions(+), 68 deletions(-)
diff --git a/sci-mathematics/spin/Manifest b/sci-mathematics/spin/Manifest
index c1bdf87e9cba..7d7819414878 100644
--- a/sci-mathematics/spin/Manifest
+++ b/sci-mathematics/spin/Manifest
@@ -1 +1 @@
-DIST spin645.tar.gz 672549 BLAKE2B
5b0f7d5ef8fbec84a4423938c10272f804084d05d470a69ef954ee261752b238b16643054d934617861fb02ef4a318c708a8464102572d34b71c883cb84fe450
SHA512
77bc35bb852c0448915c655bf11910d0b226d30d66abaa63311e6227de03f920ca026e7399cbeebdae631368fd8091f1e8330bd3094bd4febdf7d5c7a81834ad
+DIST spin-6.5.1.tar.gz 6084723 BLAKE2B
d7aa384b1cd06aafafd67908d55a96edf312181ca85f656d4ce3e4d0384f73ef7b36279b22f836bd59e2c3421edbc4e397d651d194cdaa5b3b56a5d1b53c414b
SHA512
e852d4a5ba92d58350dc1624e6d204e918e31dd22ce4bf15275390d56a679fee29f0fb662de0a00f7c303b7287357c5a4c11a01ebd178712a9229aa830393a93
diff --git a/sci-mathematics/spin/files/spin-6.4.5-makefile.patch
b/sci-mathematics/spin/files/spin-6.4.5-makefile.patch
deleted file mode 100644
index 64b76ec484f0..000000000000
--- a/sci-mathematics/spin/files/spin-6.4.5-makefile.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- makefile.orig 2016-01-09 12:51:10.260008241 +0100
-+++ makefile 2016-01-09 12:52:04.666673549 +0100
-@@ -7,8 +7,6 @@
- # see also ./make_pc for a simpler script not requiring make
- # for 32-bit compilation, use ./make32
-
--CC=gcc
--CFLAGS=-O2 -DNXT # on some systems add: -I/usr/include
- # on a PC: add -DPC
- # on Solaris: add -DSOLARIS
- # on a Mac: add -DMAC
-@@ -37,7 +35,7 @@
- tl_mem.o tl_rewrt.o tl_cache.o
-
- spin: $(SPIN_OS) $(TL_OS) spin.o
-- $(CC) $(CFLAGS) -o spin spin.o $(SPIN_OS) $(TL_OS)
-+ $(CC) $(CFLAGS) $(LDFLAGS) -o spin spin.o $(SPIN_OS) $(TL_OS)
-
- install: spin
- cp spin /usr/local/bin
diff --git a/sci-mathematics/spin/files/spin-6.5.1-makefile.patch
b/sci-mathematics/spin/files/spin-6.5.1-makefile.patch
new file mode 100644
index 000000000000..545f6d10f973
--- /dev/null
+++ b/sci-mathematics/spin/files/spin-6.5.1-makefile.patch
@@ -0,0 +1,11 @@
+--- a/makefile
++++ b/makefile
+@@ -36,7 +36,7 @@
+ tl_mem.o tl_rewrt.o tl_cache.o
+
+ spin: makefile $(SPIN_OS) $(TL_OS) spin.o
+- $(CC) $(CFLAGS) -o spin spin.o $(SPIN_OS) $(TL_OS) $(LDFLAGS)
++ $(CC) $(CFLAGS) $(LDFLAGS) -o spin spin.o $(SPIN_OS) $(TL_OS) $(LDFLAGS)
+
+ install: spin
+ $(INSTALL) spin $(DESTDIR)/bin/spin
diff --git a/sci-mathematics/spin/spin-6.4.5.ebuild
b/sci-mathematics/spin/spin-6.4.5.ebuild
deleted file mode 100644
index 27e6d71ece09..000000000000
--- a/sci-mathematics/spin/spin-6.4.5.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit desktop epatch toolchain-funcs versionator
-
-MY_PV=$(replace_all_version_separators '')
-MY_P="${PN}${MY_PV}"
-
-DESCRIPTION="Tool for formal verification of distributed software systems"
-HOMEPAGE="http://spinroot.com/";
-SRC_URI="http://spinroot.com/spin/Src/${MY_P}.tar.gz";
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
-IUSE="graphviz tk"
-
-DEPEND="sys-devel/bison"
-RDEPEND="sys-devel/gcc
- sys-process/time
- tk? (
- dev-lang/tk
- graphviz? ( media-gfx/graphviz )
- )"
-
-S="${WORKDIR}/Spin/Src${PV}"
-
-src_prepare() {
- epatch "${FILESDIR}/${PN}-6.4.5-makefile.patch"
-}
-
-src_compile() {
- tc-export CC
- default
-}
-
-src_install() {
- dobin spin
- doman ../Man/spin.1
- dodoc ../Doc/*
- if use tk; then
- newbin "${WORKDIR}/Spin/iSpin/ispin.tcl" ispin
- make_desktop_entry ispin
- fi
-}
diff --git a/sci-mathematics/spin/spin-6.5.1.ebuild
b/sci-mathematics/spin/spin-6.5.1.ebuild
new file mode 100644
index 000000000000..1206c808b0f5
--- /dev/null
+++ b/sci-mathematics/spin/spin-6.5.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop toolchain-funcs
+
+MY_PN="${PN^}"
+MY_PV="version-${PV}"
+MY_P="${MY_PN}-${MY_PV}"
+
+DESCRIPTION="An efficient logic-model checker for the verification of
multi-threaded code"
+HOMEPAGE="https://spinroot.com/ https://github.com/nimble-code/Spin";
+SRC_URI="https://github.com/nimble-code/${MY_PN}/archive/refs/tags/${MY_PV}.tar.gz
-> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+IUSE="doc examples graphviz tk"
+
+RDEPEND="sys-devel/gcc
+ tk? (
+ dev-lang/tk
+ graphviz? ( media-gfx/graphviz )
+ )"
+BDEPEND="virtual/yacc"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-6.5.1-makefile.patch
+)
+
+S="${WORKDIR}"/${MY_P}/Src
+
+src_compile() {
+ tc-export CC
+ default
+}
+
+src_install() {
+ dobin ${PN}
+ dodoc ../Man/README.md
+ doman ../Man/${PN}.1
+
+ use doc && dodoc ../Doc/*
+ if use examples; then
+ docinto examples
+ dodoc -r ../Examples/*
+ fi
+
+ if use tk; then
+ newbin ../optional_gui/i${PN}.tcl i${PN}
+ make_desktop_entry ispin
+ fi
+}
