gentoo resync : 16.09.2020

3 files changed, 51 insertions, 19 deletions

diff --git a/games-board/sjeng/Manifest b/games-board/sjeng/Manifest
index ab5f678b75e2..93f5861efb86 100644
--- a/games-board/sjeng/Manifest
+++ b/games-board/sjeng/Manifest
@@ -1,3 +1,4 @@
 DIST Sjeng-Free-11.2.tar.gz 174019 BLAKE2B c50f312ce4f569b17cf7f240fe27e9d6d27e83e260c7549ba13ee612a357700b1642c2b274637af3e0e0f45c35e46f088cdcd5dce6bb62591ef600b97d8c6d6b SHA512 cda3409d732ac1b07e83ccc0d3063d24497651097c633500dfca66fbb3021532053082ac57a5e23909dd1016a2bae07f166e56b82c4ce834749a101c9ee444b8
-EBUILD sjeng-11.2-r2.ebuild 398 BLAKE2B b829535981175878c2631fe03a542dbc8706530d4006550de55386a5440a186a5b7db47db0c99290d5d4b21cf16de68a5cf7a9c1271a9cf31b6926f3741d3ea5 SHA512 cff266a31310acb99335d459820715987bbf763a4941addeaa75c709c03ec872fe25a10d1321f4609cc5147407d89cd9106ad44237078e14aa2d96d86ffee45e
+DIST sjeng_11.2-8.1.diff.gz 13341 BLAKE2B 187cb85e504511504ee9ed8bc2c6d6c19815e3e267099f1e98ea8964145e81074e2dd6b298dba76e91e2824dec1b4c6ac3d43b24f1ab970362c3bf07da87541d SHA512 2d470e0bee12a5f06808653ab3607301622d8e4f802295c04853b973c553074850c1fed278fe4696a652773af71dcac461d428d7f776d5a967256c4f39c627c9
+EBUILD sjeng-11.2_p8_p1.ebuild 1047 BLAKE2B 3d147b61058bbeabd7d7aba02b8959307a30b875cf5adf44dd52f90c64b1cbef0c61978611da31ae598594894a2cd88be7e5c610a69787131314c201a63f4bc3 SHA512 90fcc07244978779a71b8dd682bab317afa4f4ed5694fc2976ebfbc9017a4961ecddfd713840c6e608b9aba8c08a3d03e978c845d305075351af11ab5e1254c4
 MISC metadata.xml 328 BLAKE2B a01f3dc1b89d082ffb3e813bbadc30aec1d774322215d6aac79934e8e6e4b139beeeea052d46e075c7694a5fe2c3de80a418671fd339eb24afa51331051c41f3 SHA512 54f4f8c4089f82b019be4e1cc7f8ce10221142ff020c992f37cbcd3a9e87a43e4b61a1c5dca23edfcc1e5060fe0db19292d4f63319414d4994b91f517153c68d
diff --git a/games-board/sjeng/sjeng-11.2-r2.ebuild b/games-board/sjeng/sjeng-11.2-r2.ebuild
deleted file mode 100644
index 9cf968e7d406..000000000000
--- a/games-board/sjeng/sjeng-11.2-r2.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Console based chess interface"
-HOMEPAGE="http://sjeng.sourceforge.net/"
-SRC_URI="mirror://sourceforge/sjeng/Sjeng-Free-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE=""
-
-RDEPEND="sys-libs/gdbm:0="
-DEPEND=${RDEPEND}
-
-S="${WORKDIR}/Sjeng-Free-${PV}"
diff --git a/games-board/sjeng/sjeng-11.2_p8_p1.ebuild b/games-board/sjeng/sjeng-11.2_p8_p1.ebuild
new file mode 100644
index 000000000000..dc0f65449a07
--- /dev/null
+++ b/games-board/sjeng/sjeng-11.2_p8_p1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools prefix
+
+MY_PV=$(ver_cut 1-2)
+# 11.2_p8_p1 -> 11.2-8.1
+MY_DEB_PV="${MY_PV}-$(ver_cut 4).$(ver_cut 6)"
+
+DESCRIPTION="Console based chess interface"
+HOMEPAGE="http://sjeng.sourceforge.net/"
+SRC_URI="
+	mirror://sourceforge/sjeng/Sjeng-Free-${MY_PV}.tar.gz
+	http://deb.debian.org/debian/pool/main/s/sjeng/sjeng_${MY_DEB_PV}.diff.gz
+"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+RDEPEND="sys-libs/gdbm:0="
+DEPEND="${RDEPEND}"
+BDEPEND="dev-util/quilt"
+
+S="${WORKDIR}/Sjeng-Free-${MY_PV}"
+
+src_prepare() {
+	default
+
+	eapply "${WORKDIR}/sjeng_${MY_DEB_PV}.diff"
+	QUILT_PATCHES="debian/patches" QUILT_SERIES="debian/patches/series" quilt push -a || die
+	hprefixify book.c rcfile.c
+
+	# Files generated with ancient autotools, regenerate to respect CC.
+	mv configure.{in,ac} || die
+	eautoreconf
+}
+
+src_install() {
+	default
+
+	insinto /etc
+	doins sjeng.rc
+	insinto /usr/share/games/sjeng
+	doins books/*.opn || die
+}