gentoo resync : 29.06.2021

8 files changed, 80 insertions, 53 deletions

diff --git a/games-board/Manifest.gz b/games-board/Manifest.gz
index 786ce5dce99f..db7f71ba6c95 100644
--- a/games-board/Manifest.gz
+++ b/games-board/Manifest.gz
diff --git a/games-board/awale/Manifest b/games-board/awale/Manifest
index ab94898987b7..f7a811f5fcbf 100644
--- a/games-board/awale/Manifest
+++ b/games-board/awale/Manifest
@@ -1,5 +1,7 @@
 AUX awale-1.5-build.patch 3323 BLAKE2B 7f2a2451b214466aba032891df9209d9b3bd1a458d59068a5a1771e0c76fd5360fda6e92cab4f71a4ced684c2616305333732d67e59412e93ca821b626097200 SHA512 7dccdb24469238d36d7ea0a9d9b27ca2e4b4472ae4918b0361f78e84933db1ebd948197af32c40ec48d014f3baefc4adf1e48f0e277af8b6b8b53e780c9c613e
 DIST awale-1.5-no-autoreconf2.patch.xz 37268 BLAKE2B cec173e9b0be75c5d3d037a171fd796dccca5689e53f2e08d832e15a63d96502b4277f2ca6dbcbe817949cda8243aaacf7d7ede281fa32a34ffbf5f3031042f1 SHA512 857814c6ffe828bb0c3b82c214932ddf95162b7abaac6720db987f2af31a3b144543773a607edc70e0fceb8433f2aa519d3cfaca7474750cb45074aef0c37cb1
 DIST awale-1.5.tar.gz 489357 BLAKE2B d9f5efd10018b1e5f9964abf25189df5186159c7826c23b85f794999c5bc8d8ea93792e83dbde2ae010489a7d90258651e7ab7115e0fc361ce682968c438aed6 SHA512 b3f33068d7d6cfd964051e15cfd84e7f2c8483c30f2ccea35e2dddb34353ea984561fdf28c0d668404d80cda89c6d5fcd0004a1a86d92325e5f6fc2f88197c61
+DIST awale-1.6.tar.gz 490881 BLAKE2B 721b8dfdc6dd7a558e43e00616372b2b1a89acf1cc79cb051650809b54605d4d0c2fbc91168ad940356748c0632fba7bd016db7afee2f977f8d52f64bdd08400 SHA512 0b9e4f18d6fbd5e8acdf8e5ecbbcebad4d732993cb61b8d84787fa2a9dad5b73eee62462fddc9296c050019de76a73b1e6d8d29d3ef57148ab086e49b1016f0d
 EBUILD awale-1.5-r1.ebuild 1218 BLAKE2B 673791d5db74798c8ebaa9f715bc335fa928c2ca3da9579fa45474016a1ca20257c6cc1469f7ee5f3e73cd564cd11acd0af797a154c1ef6dab246e861388e332 SHA512 db5025261ef6f307867a574c6e933c65e1f43819c7b6916245ab1b836a398f227e8b0ba32c48c0fb06b4afedab2d8ce022a9534b010f2d19f389bcc38b853083
+EBUILD awale-1.6.ebuild 665 BLAKE2B 1f07a24082eb6239546c6c3d44772d1efdbf754299437c1d686e4066769a251096e204571c91cb1bfd1783a6256b51041bcac6656e5340708ca32882f8c3f720 SHA512 191429e369d3fe150a0d947da2ed08c676482420e2f808d944bd8f95da296d678871b76425280cece046b40ec48f3f4e757cf4aabf630239a5687809b1a21bde
 MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-board/awale/awale-1.6.ebuild b/games-board/awale/awale-1.6.ebuild
new file mode 100644
index 000000000000..45ed1e481f42
--- /dev/null
+++ b/games-board/awale/awale-1.6.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop
+
+DESCRIPTION="Free Awale - The game of all Africa"
+HOMEPAGE="https://www.nongnu.org/awale/"
+SRC_URI="mirror://nongnu/awale/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gui"
+
+RDEPEND="gui? ( dev-lang/tk )"
+
+src_install() {
+	if use gui; then
+		emake -j1 DESTDIR="${D}" install #799107
+
+		fperms +x /usr/share/${PN}/xawale.tcl
+
+		doicon src/awale.png
+		make_desktop_entry xawale "Free Awale"
+
+		rm "${ED}"/usr/share/applications/awale.desktop || die
+	else
+		dobin src/awale
+		doman man/awale.6
+	fi
+
+	einstalldocs
+}
diff --git a/games-board/camato/Manifest b/games-board/camato/Manifest
index 0beaafd90a0a..116e7f067af9 100644
--- a/games-board/camato/Manifest
+++ b/games-board/camato/Manifest
@@ -1,3 +1,3 @@
 DIST camato-0_7_4.tar.gz 39395 BLAKE2B 673c312f90210e7f1882f821da2c751118052594f537d2a9c1a04ceea4d0ba948487da576b5f3b274c889db48e59dd95228ecfb6d9ec03ebf04a5fb16e13822a SHA512 b355dbaf35716f719ffe5469ec73db791b2b516dc1fc7a36efa735babcd7d16b79d6d0ceea2f1308f79ca98fe7e0a3dfd3e4b3a7a15eb64abbd144aac2c3720d
-EBUILD camato-0.7.4-r1.ebuild 628 BLAKE2B a87978b7c7fcc2729d1bd874e39eeaa570621cd46b520287dfd532e0d625f9d4f5648d1ccc34f81b4ae63b25eec0bc561959d84371f95b527be222c8dd2116ae SHA512 054fcc4e42a3acd454461f19e5abdc7219856ea13bc8cda2e0298c8799e6819612ecd272b59047a93a81101f1bbb1746f8bd5682d3750ec400abcc8befa53991
+EBUILD camato-0.7.4-r1.ebuild 786 BLAKE2B c51f47625549dd5fb372b733dbc45abff477714987d9f9a964aa578ad52f91dcf45877ed70e1f2776a743d908748d567b6ea76ff88808c9a7fcbc65e56327abc SHA512 26cf1212c3e56b49a52f47c8aee620096d136626f6c53bf241790cdc843989d5735822364890c6bb5b6dd684b211171938d895b22a41764e211e081dd559050c
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-board/camato/camato-0.7.4-r1.ebuild b/games-board/camato/camato-0.7.4-r1.ebuild
index 4a062b440be1..a927932ef7cf 100644
--- a/games-board/camato/camato-0.7.4-r1.ebuild
+++ b/games-board/camato/camato-0.7.4-r1.ebuild
@@ -1,31 +1,36 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit versionator
+EAPI=7
 
-MY_PV=$(replace_all_version_separators _)
-DESCRIPTION="A map editor for the game gnocatan"
-HOMEPAGE="http://yusei.ragondux.com/loisirs_jdp_catane_camato-en.html"
-SRC_URI="http://yusei.ragondux.com/files/gnocatan/${PN}-${MY_PV}.tar.gz"
+USE_RUBY="ruby25 ruby26 ruby27"
+inherit desktop ruby-ng
 
-LICENSE="GPL-2"
+DESCRIPTION="Map editor for the game gnocatan"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="mirror://gentoo/${PN}-$(ver_rs 1- _).tar.gz"
+
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-DEPEND="dev-ruby/ruby-gtk2"
-RDEPEND=${DEPEND}
+ruby_add_rdepend dev-ruby/ruby-gtk2
 
-src_prepare() {
-	default
+all_ruby_prepare() {
+	# this is really single target, but ruby-single is too limited
+	local ruby=$(ruby_get_use_implementations)
+	sed -i "1c\\#!$(ruby_implementation_command ${ruby##* })" ${PN} || die
 
-	rm -f Makefile || die
+	rm Makefile || die
 }
 
-src_install() {
+all_ruby_install() {
 	dobin ${PN}
+
 	insinto /usr/share/${PN}
 	doins -r *.rb img
-	dodoc ChangeLog README
+
+	einstalldocs
+
+	make_desktop_entry ${PN} Camato applications-games
 }
diff --git a/games-board/fruit/Manifest b/games-board/fruit/Manifest
index 2bd6cf6af081..ac1599d10e1f 100644
--- a/games-board/fruit/Manifest
+++ b/games-board/fruit/Manifest
@@ -1,4 +1,3 @@
-AUX fruit-2.1-gentoo.patch 590 BLAKE2B 0ff77b71537b8b2062413e1fe888014d69371c8cb29260e02cae8e3789b572c9175750be31abd5dfaebbdf517bc2c8f98b3132c8526beaa1cf1ebcbd35c77f79 SHA512 db32e30dcd60df1c0dabcab4589cdfb779ef619d2bdfdb35b77b5b6b224adb0b9826c310b2f3fd97c0591e4c63931dfec733578429c749b691a5dafbc8a954b4
 DIST fruit_21_linux.zip 716762 BLAKE2B ffdc38ca4a3021b69e95c876c419bc85102412ef6632cfc5d8d1370b59fdc6e1bb5e10e5066fd39197d16042286e0cac07ae76a39eb1ed3d96bfe804225a9948 SHA512 80d80141ca3c2a4521b241a750bd237e0971b531bc4e8e89ae3bdcdbb1436b99b35e64f505b9a61413726744646b6b4ce126bcdb53b90adc727f88a50adee889
-EBUILD fruit-2.1-r1.ebuild 795 BLAKE2B 669fa5a30b6173ad0dc3c92e78b8e87ef4b87b037caf4248b6928cb670e9b05e50410495b730b2f67290a683c593922748f06d43df02c9f06109d33a085d1af4 SHA512 655f8e1b74330fb41d4609a72bda62383fc492b7ef04c94edfca6310e95b50bb3f6980cba50452ce3669b824bd4342ba7379f3cd6baff005e543d8b2be48e9fc
+EBUILD fruit-2.1-r1.ebuild 738 BLAKE2B 075a8d76b73fb0be566402de116bf60f6be877854a64e06c183410b29af11503c1b1a114503952a3c58bf2eceba72d605e72ce4d48bf5e6efe10c61aa9f014a6 SHA512 00bc3659afea07f8db753e5ad146fd887023b781bcf36ff3fe54eb2ab5c291aed697078740cd850f2c38373b1c1200f11d916825ad2f82c65edbf160214861f7
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-board/fruit/files/fruit-2.1-gentoo.patch b/games-board/fruit/files/fruit-2.1-gentoo.patch
deleted file mode 100644
index 815b184d9dc2..000000000000
--- a/games-board/fruit/files/fruit-2.1-gentoo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/option.cpp.old	2007-02-07 23:32:25.000000000 +0100
-+++ b/option.cpp	2007-02-07 23:32:51.000000000 +0100
-@@ -29,7 +29,7 @@
-    { "Ponder", true, "false", "check", "", NULL },

- 

-    { "OwnBook",  true, "true",           "check",  "", NULL },

--   { "BookFile", true, "book_small.bin", "string", "", NULL },

-+   { "BookFile", true, "@GENTOO_DATADIR@/book_small.bin", "string", "", NULL },

- 

-    { "NullMove Pruning",       true, "Fail High", "combo", "var Always var Fail High var Never", NULL },

-    { "NullMove Reduction",     true, "3",         "spin",  "min 1 max 3", NULL },

diff --git a/games-board/fruit/fruit-2.1-r1.ebuild b/games-board/fruit/fruit-2.1-r1.ebuild
index bb8f7635cf15..4794f6bf817f 100644
--- a/games-board/fruit/fruit-2.1-r1.ebuild
+++ b/games-board/fruit/fruit-2.1-r1.ebuild
@@ -1,41 +1,38 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit versionator
+EAPI=8
 
-MY_PV="$(replace_all_version_separators '')"
-MY_P="${PN}_${MY_PV}_linux"
+inherit toolchain-funcs
+
+MY_P="${PN}_$(ver_rs 1- '')_linux"
 
 DESCRIPTION="UCI-only chess engine"
-HOMEPAGE="http://arctrix.com/nas/fruit/"
-SRC_URI="http://arctrix.com/nas/${PN}/${MY_P}.zip"
+HOMEPAGE="https://arctrix.com/nas/fruit/"
+SRC_URI="https://arctrix.com/nas/${PN}/${MY_P}.zip"
+S="${WORKDIR}/${MY_P}/src"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-RDEPEND=""
-DEPEND="app-arch/unzip"
-
-S="${WORKDIR}/${MY_P}/src"
+BDEPEND="app-arch/unzip"
 
 src_prepare() {
 	default
-	eapply "${FILESDIR}/${P}"-gentoo.patch
-	sed -i \
-		-e "s:@GENTOO_DATADIR@:/usr/share/${PN}:" \
-		option.cpp || die
-	sed -i \
-		-e '/^CXX/d' \
-		-e '/^LDFLAGS/d' \
-		Makefile || die
+
+	sed -i "s|book_small|${EPREFIX}/usr/share/${PN}/book_small|" option.cpp || die
+}
+
+src_compile() {
+	emake CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS} ${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 }
 
 src_install() {
 	dobin ${PN}
-	insinto "/usr/share/${PN}"
+
+	insinto /usr/share/${PN}
 	doins ../book_small.bin
-	dodoc ../readme.txt ../technical_10.txt
+
+	dodoc ../{readme,technical_10}.txt
 }