Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-puzzle/nudoku/, games-puzzle/nudoku/files/
Date: Fri, 08 Jan 2021 15:09:43
Message-Id: 1610118574.4720158264396a3ffbe291018c5a8d81fa2fc31b.sam@gentoo
1 commit: 4720158264396a3ffbe291018c5a8d81fa2fc31b
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jan 8 15:08:50 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Fri Jan 8 15:09:34 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47201582
7
8 games-puzzle/nudoku: bump to 2.1.0
9
10 Closes: https://bugs.gentoo.org/764470
11 Package-Manager: Portage-3.0.12, Repoman-3.0.2
12 Signed-off-by: Sam James <sam <AT> gentoo.org>
13
14 games-puzzle/nudoku/Manifest | 1 +
15 .../nudoku/files/nudoku-2.1.0-ncurses-link.patch | 37 ++++++++++++++++++++++
16 games-puzzle/nudoku/nudoku-2.1.0.ebuild | 34 ++++++++++++++++++++
17 3 files changed, 72 insertions(+)
18
19 diff --git a/games-puzzle/nudoku/Manifest b/games-puzzle/nudoku/Manifest
20 index 91eb0ee7850..b27ad60ac35 100644
21 --- a/games-puzzle/nudoku/Manifest
22 +++ b/games-puzzle/nudoku/Manifest
23 @@ -1 +1,2 @@
24 DIST nudoku-1.0.0.tar.gz 20442 BLAKE2B b258362012b889a0756bc8cdbfbcdc9aba09e1162f6dc8a593061689e81d02935111bac8561648e89e7287af4702f110ea86fb20ae4e18bfba09f3578f0909cb SHA512 f29a698eec076729ce065633bb05e0146e229774ff1eb3f2bd5cd5733698e30b91085b55d871657d42f2d3d8bcf7bb45918f4a127d6a0464ebc8b90ccc384ec3
25 +DIST nudoku-2.1.0.tar.gz 31592 BLAKE2B 997ae3931fec3b6605858a35cdf6bc88296138c01a9138d229ed43a5262fdd5d15eb8a96dfdcf02e8eb6f7f416b84e4752edbb57319be50bfdae6c952217446b SHA512 dde16d1dccc1cae8d156f57fccf8b112f3fee7d23b912b5cd7ecc092ecbf04a8e85f469e53fa02e6bd2d0b9498e4a65a219e1aad8091f82638dceab32f320670
26
27 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
28 new file mode 100644
29 index 00000000000..396dbccddcc
30 --- /dev/null
31 +++ b/games-puzzle/nudoku/files/nudoku-2.1.0-ncurses-link.patch
32 @@ -0,0 +1,37 @@
33 +Ensure we link against the correct ncurses libraries.
34 +https://bugs.gentoo.org/764470
35 +--- a/src/Makefile.am
36 ++++ b/src/Makefile.am
37 +@@ -1,11 +1,7 @@
38 + #AM_CFLAGS = --pedantic -Wall
39 + #-DDEBUG
40 +
41 +-if HAVE_WIDE_NCURSES
42 +-nudoku_LDADD = -lncursesw
43 +-else
44 +-nudoku_LDADD = -lncurses
45 +-endif
46 ++nudoku_LDADD = ${ncurses_LIBS}
47 + bin_PROGRAMS = nudoku
48 + nudoku_SOURCES = main.c sudoku.c sudoku.h
49 +
50 +--- a/configure.ac
51 ++++ b/configure.ac
52 +@@ -34,15 +34,7 @@ the cairo development libraries, or compile without support (--disable-cairo)
53 +
54 + fi
55 +
56 +-have_wide_ncurses=no
57 +-AC_CHECK_LIB(ncursesw, initscr, [have_wide_ncurses=yes])
58 +-if test $have_wide_ncurses = no; then
59 +- AC_CHECK_LIB(ncurses, initscr, [], [
60 +- echo "nudoku requires ncurses"
61 +- exit 1
62 +- ])
63 +-fi
64 +-AM_CONDITIONAL([HAVE_WIDE_NCURSES], [test $have_wide_ncurses = yes])
65 ++PKG_CHECK_MODULES([ncurses], [ncurses])
66 +
67 + # Checks for header files.
68 + AC_CHECK_HEADERS([stdlib.h string.h unistd.h])
69 +
70
71 diff --git a/games-puzzle/nudoku/nudoku-2.1.0.ebuild b/games-puzzle/nudoku/nudoku-2.1.0.ebuild
72 new file mode 100644
73 index 00000000000..9c8b8766b69
74 --- /dev/null
75 +++ b/games-puzzle/nudoku/nudoku-2.1.0.ebuild
76 @@ -0,0 +1,34 @@
77 +# Copyright 1999-2021 Gentoo Authors
78 +# Distributed under the terms of the GNU General Public License v2
79 +
80 +EAPI=7
81 +
82 +inherit autotools flag-o-matic
83 +
84 +DESCRIPTION="ncurses based sudoku game"
85 +HOMEPAGE="https://jubalh.github.io/nudoku"
86 +SRC_URI="https://github.com/jubalh/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
87 +
88 +LICENSE="GPL-3"
89 +SLOT="0"
90 +KEYWORDS="~amd64 ~x86"
91 +IUSE="cairo"
92 +
93 +DEPEND="
94 + cairo? ( x11-libs/cairo )
95 + sys-libs/ncurses:=
96 +"
97 +RDEPEND="${DEPEND}"
98 +
99 +PATCHES=(
100 + "${FILESDIR}/${PN}-2.1.0-ncurses-link.patch"
101 +)
102 +
103 +src_prepare() {
104 + default
105 + eautoreconf
106 +}
107 +
108 +src_configure() {
109 + econf $(use_enable cairo)
110 +}