gentoo resync : 05.12.2021

6 files changed, 76 insertions, 72 deletions

diff --git a/sci-mathematics/spin/Manifest b/sci-mathematics/spin/Manifest
index 8321e99850d5..f55709e26d98 100644
--- a/sci-mathematics/spin/Manifest
+++ b/sci-mathematics/spin/Manifest
@@ -1,4 +1,4 @@
-AUX spin-6.4.5-makefile.patch 620 BLAKE2B 44fe04e7338e872be7efe6ffc2766c926ad425886bba2dff71972a77a455e2a72b34796f1c7b0618eb3777fdb05f12ba9d63c05fd229eee98fa50cc7830ae468 SHA512 47b72f5cda3275f62a291870e3683fb3f29f3eeab2d251336777d9a2c814b6be436bcbe59a8d98c0f4f32d7b0a9a2961f34c436d6f265d8a2474258fd9c0d6ee
-DIST spin645.tar.gz 672549 BLAKE2B 5b0f7d5ef8fbec84a4423938c10272f804084d05d470a69ef954ee261752b238b16643054d934617861fb02ef4a318c708a8464102572d34b71c883cb84fe450 SHA512 77bc35bb852c0448915c655bf11910d0b226d30d66abaa63311e6227de03f920ca026e7399cbeebdae631368fd8091f1e8330bd3094bd4febdf7d5c7a81834ad
-EBUILD spin-6.4.5.ebuild 891 BLAKE2B d80a6d3b613c4c5e8dd3bf307ecb6b20458a0d3ab15ba71d073e369c1aac2f2c83adc7b2fac0717885d9d9fc3e1e3789518a117da3e1341ae1feb81e1c6ac9af SHA512 5230d024a5629291960c4d665cc015bde9b49b81c3619765940308cd9437a2cadb36509f2278285b1daac147e22bc3032a45bfcf9e6bc16233132ad6538f15aa
-MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
+AUX spin-6.5.2-makefile.patch 320 BLAKE2B d88604300a9a1c7f16339e9c9c0ba96f79e3a0d08f041eba6c623d8e1d62d4a247f0ad6e06e83816a011ba072bfb7bd6afe39df796cfb1b80ad514e6cab33e76 SHA512 89166f068ab54c99c55029c7d936db663335e99c6e884b9885fe0478bb211bc186d32302ce933bd8e597bb78c72f2a0d016c8e661095a58761d437b89914c573
+DIST spin-6.5.2.tar.gz 6084903 BLAKE2B a075043c55609de5860c3a428d356a9618a4062667e06d92797e1fb87cb4c805ac90ac580c7d9dfac1d5be1dda4c7f9c9f72927826b921c23710a858adb3eb4d SHA512 ff1d378076995fa5a8b66dd31d19d8bad6296b968183180251d267c926c20775edda927a31f466199e01231f6233c3a5166fd51ec44b02d570070e857d8ba7f9
+EBUILD spin-6.5.2.ebuild 1055 BLAKE2B 577a87309cad0970b307d592f69a83c187e81ec74e409aa007321a88c57a0740641739a0bc3676241766697d723aa227000ddb86b5cd3a8e7699dd0e43cf0f95 SHA512 0e55d1c692d58e9f9a35ee529d550fab597438215921c0252146541e18f8cfa186943ce656be5a46d043466408746a3ebdd921ecb6f88ebf8ad77272b28ec919
+MISC metadata.xml 327 BLAKE2B 1b6a2bbece4fff801301d1bc5b86ebea4fe32096f1fb76d24831bd299608d73116261733e1318cf76532a336c467b394655157145ba565e256626ca66bf191be SHA512 5baaef50807b13c5a3e63d394a0df2b75ecb7973d1467d918329b55536ff6280da086311ee56bcff9fc156f377f077916d572f3cf8a1756d959b4bdb70b55ae8
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.2-makefile.patch b/sci-mathematics/spin/files/spin-6.5.2-makefile.patch
new file mode 100644
index 000000000000..545f6d10f973
--- /dev/null
+++ b/sci-mathematics/spin/files/spin-6.5.2-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/metadata.xml b/sci-mathematics/spin/metadata.xml
index 115e9d64a669..081ee86ca70e 100644
--- a/sci-mathematics/spin/metadata.xml
+++ b/sci-mathematics/spin/metadata.xml
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">nimble-code/Spin</remote-id>
+	</upstream>
 </pkgmetadata>
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 010f2550a874..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 ~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.2.ebuild b/sci-mathematics/spin/spin-6.5.2.ebuild
new file mode 100644
index 000000000000..5e4110e9abeb
--- /dev/null
+++ b/sci-mathematics/spin/spin-6.5.2.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.2-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
+}