gentoo resync : 22.01.2021

6 files changed, 61 insertions, 12 deletions

diff --git a/games-puzzle/Manifest.gz b/games-puzzle/Manifest.gz
index 91f1234ee4f0..d8c83ef7e384 100644
--- a/games-puzzle/Manifest.gz
+++ b/games-puzzle/Manifest.gz
diff --git a/games-puzzle/monsterz/Manifest b/games-puzzle/monsterz/Manifest
index d92fd32b5f84..672aa2ae5268 100644
--- a/games-puzzle/monsterz/Manifest
+++ b/games-puzzle/monsterz/Manifest
@@ -1,5 +1,5 @@
 AUX monsterz-0.7.1-gentoo-r1.patch 390 BLAKE2B 4cd80a3b5ff0d0c67326a811e92637b5006d37b5a00e87ae8dbb9432060ca65e3754b5e75bca023e8822854613bad9fbec0aa3dc7a1040a804bdab0f1204b135 SHA512 6b8eb58d5610d0e15c9598b6bd92a98690b4fdfa663f9d84be0c77c727a8ad8c48caa946f8ea4060e895984d9e28b5cd4caa9acb6385c2c4f045fa5987a6b8da
 DIST monsterz-0.7.1.tar.gz 1879537 BLAKE2B e1ad9f17a64bcbb07005eb61d951dbf756997a6e6bd76c48d88bb634c9b3167c9fd41ef32032925b219153eb607dc238af76b44c3ef6c47aab753d59c61958e1 SHA512 62de125251a74e7ff237c90ad88e10a4953b8841251dfec45cc6b77f416677ef6d68cf4308c3190f65896b5bb1312934abd5e438f0341f08c02884585f0e4787
 DIST monsterz_0.7.1-11.debian.tar.xz 13688 BLAKE2B 2274b6d18b2f03200e09468243bae7ede94b81bd7595f65a73fd33bc9ccc7302fbea3a4876b5bbf6cf98735652742b1cf76b3c288fc6c005f9566c04b4a4f277 SHA512 c172355667db29de949de07745469552d62dc226120f38ff76a288b14018424338f27b6a562de215b7194b8b09c6346d29e9088c8a0edb0fe915f915b8577a4b
-EBUILD monsterz-0.7.1_p11.ebuild 1296 BLAKE2B c16b30283729d7cdad6e9ae39108b9e97c6ea0ceb39bd509ed5cbcc52ddc1f4464ad427dd390fc4f8f0db8dca03aa21676b8ebd1c5f63c028478167bb9b64e3a SHA512 d569ab350f9a11875aaf36cd67793bb9d9607fb13cb951004ff41dff016e2ab63971c9cc808006fb343e7adbeb8d4b439a3f2d44dd88725d7b0dcc2280254c11
+EBUILD monsterz-0.7.1_p11.ebuild 1289 BLAKE2B 6903b0104379da62506332f6d5aeb545336a5bbf3f536772476a575b3cc9f740edb66049bcdcb5854db5d3f52e0a1abe82bf9d0cb228f14c68244ff758df9935 SHA512 1ad80ed21db26567ca1bb022e6989bb9173ac279cb7cc2cd2bd2726e081b87eedb79d5c4535a2c75c4f515f9259423c34af996ef87d72b330079994ed53edaa0
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/monsterz/monsterz-0.7.1_p11.ebuild b/games-puzzle/monsterz/monsterz-0.7.1_p11.ebuild
index 87cecf30833e..1b700232e1ac 100644
--- a/games-puzzle/monsterz/monsterz-0.7.1_p11.ebuild
+++ b/games-puzzle/monsterz/monsterz-0.7.1_p11.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
 
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit desktop python-r1
 
 DESCRIPTION="A little puzzle game, similar to the famous Bejeweled or Zookeeper"
@@ -40,7 +40,7 @@ src_prepare() {
 
 	eapply "${FILESDIR}"/${PN}-0.7.1-gentoo-r1.patch
 	sed -i \
-        	-e "s:GENTOO_DATADIR:/usr/share/${PN}:" \
+		-e "s:GENTOO_DATADIR:/usr/share/${PN}:" \
 		monsterz.py || die "sed failed"
 
 	rm Makefile || die
diff --git a/games-puzzle/nudoku/Manifest b/games-puzzle/nudoku/Manifest
index 4500adc65b89..54015f423885 100644
--- a/games-puzzle/nudoku/Manifest
+++ b/games-puzzle/nudoku/Manifest
@@ -1,3 +1,4 @@
-DIST nudoku-1.0.0.tar.gz 20442 BLAKE2B b258362012b889a0756bc8cdbfbcdc9aba09e1162f6dc8a593061689e81d02935111bac8561648e89e7287af4702f110ea86fb20ae4e18bfba09f3578f0909cb SHA512 f29a698eec076729ce065633bb05e0146e229774ff1eb3f2bd5cd5733698e30b91085b55d871657d42f2d3d8bcf7bb45918f4a127d6a0464ebc8b90ccc384ec3
-EBUILD nudoku-1.0.0.ebuild 485 BLAKE2B 02f2a94050b3be4b5c76df209b536855752492fa5b484961f5e6446aa9f4b6472822313a285af551a24fbc8d76aa792d268bf0bbd53cc425fdeaea173f623f99 SHA512 0dd5d960c1d2314c7eed00fdd82c6d3e209ef4bb95f2bfb50a24959fd91171751ce7dd47c4ed501bc504f2604dc6f112c209d3abbecd3d9aed68bf36f98c2649
+AUX nudoku-2.1.0-ncurses-link.patch 927 BLAKE2B 6a1a5c40a5d3730684eefcc5298eb6ce676c1b5df380d6d9c6453aec9a2066d89ad876a39f95678d27e00281776a3d7e81cb4b9b2719c7f82e1f2f4fd357a3bc SHA512 a93051295845a7abd7a61b74c7f718f8c59f1b7bbb70015ec3db72d1b6bb08370ab63428611ccea1d9396321e54447d8117dedb3c411e4912e801efbc1921746
+DIST nudoku-2.1.0.tar.gz 31592 BLAKE2B 997ae3931fec3b6605858a35cdf6bc88296138c01a9138d229ed43a5262fdd5d15eb8a96dfdcf02e8eb6f7f416b84e4752edbb57319be50bfdae6c952217446b SHA512 dde16d1dccc1cae8d156f57fccf8b112f3fee7d23b912b5cd7ecc092ecbf04a8e85f469e53fa02e6bd2d0b9498e4a65a219e1aad8091f82638dceab32f320670
+EBUILD nudoku-2.1.0.ebuild 666 BLAKE2B 3bf79bf9a9a79c82a1290917f2c41fd710e1952f866d2691034b2b859ff4140d15f7c1b6f1e34c596ac7b601dce24d7b2907f306c015d2a761e4555128bf52dc SHA512 16623d1a4ef0d45b9c45d66f0bb5503fc71abad51b1a5286c13022717ddb2311aa5dae866f227b074bf7cfc6ab7c979dcc28d81a03015500e608bba65e59793e
 MISC metadata.xml 245 BLAKE2B 8fb3a3f2774de770fb66ef326ffa556ccb999f87ee12603b1491c67ac6576d70894f70122c1ebacf82338d8908884aee6b8a908487f742aee61281096ce8f06c SHA512 c085edc6403259d8375f348dbb0f80c6a7cfc49e05e6266c458d0dd9e9e4c680583f73f8dda5badfd5be648640956dc4fa55d4dff39447582edd7d30a487cc4b
diff --git a/games-puzzle/nudoku/files/nudoku-2.1.0-ncurses-link.patch b/games-puzzle/nudoku/files/nudoku-2.1.0-ncurses-link.patch
new file mode 100644
index 000000000000..396dbccddccf
--- /dev/null
+++ b/games-puzzle/nudoku/files/nudoku-2.1.0-ncurses-link.patch
@@ -0,0 +1,37 @@
+Ensure we link against the correct ncurses libraries.
+https://bugs.gentoo.org/764470
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -1,11 +1,7 @@
+ #AM_CFLAGS = --pedantic -Wall
+ #-DDEBUG
+ 
+-if HAVE_WIDE_NCURSES
+-nudoku_LDADD = -lncursesw
+-else
+-nudoku_LDADD = -lncurses
+-endif
++nudoku_LDADD = ${ncurses_LIBS}
+ bin_PROGRAMS = nudoku
+ nudoku_SOURCES = main.c sudoku.c sudoku.h
+ 
+--- a/configure.ac
++++ b/configure.ac
+@@ -34,15 +34,7 @@ the cairo development libraries, or compile without support (--disable-cairo)
+ 
+ fi
+ 
+-have_wide_ncurses=no
+-AC_CHECK_LIB(ncursesw, initscr, [have_wide_ncurses=yes])
+-if test $have_wide_ncurses = no; then
+-   AC_CHECK_LIB(ncurses, initscr, [], [
+-   echo "nudoku requires ncurses"
+-   exit 1
+-   ])
+-fi
+-AM_CONDITIONAL([HAVE_WIDE_NCURSES], [test $have_wide_ncurses = yes])
++PKG_CHECK_MODULES([ncurses], [ncurses])
+ 
+ # Checks for header files.
+ AC_CHECK_HEADERS([stdlib.h string.h unistd.h])
+
diff --git a/games-puzzle/nudoku/nudoku-1.0.0.ebuild b/games-puzzle/nudoku/nudoku-2.1.0.ebuild
index 3277e1193f18..199f09b2bb1b 100644
--- a/games-puzzle/nudoku/nudoku-1.0.0.ebuild
+++ b/games-puzzle/nudoku/nudoku-2.1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit autotools
+inherit autotools flag-o-matic
 
 DESCRIPTION="ncurses based sudoku game"
 HOMEPAGE="https://jubalh.github.io/nudoku"
@@ -12,15 +12,26 @@ SRC_URI="https://github.com/jubalh/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
+IUSE="cairo"
 
-DEPEND="sys-libs/ncurses:0="
+BDEPEND="virtual/pkgconfig"
+DEPEND="
+	cairo? ( x11-libs/cairo )
+	>=sys-devel/gettext-0.20
+	sys-libs/ncurses:=
+	virtual/libintl
+"
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-2.1.0-ncurses-link.patch"
+)
+
 src_prepare() {
 	default
 	eautoreconf
 }
 
-src_install() {
-	emake DESTDIR="${D}" install
+src_configure() {
+	econf $(use_enable cairo)
 }