gentoo resync : 22.01.2021

3 files changed, 57 insertions, 8 deletions

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)
 }