gentoo auto-resync : 13:09:2024 - 12:31:45

4 files changed, 4 insertions, 74 deletions

diff --git a/games-puzzle/nudoku/Manifest b/games-puzzle/nudoku/Manifest
index 4c240d604cbc..42563529f8d6 100644
--- a/games-puzzle/nudoku/Manifest
+++ b/games-puzzle/nudoku/Manifest
@@ -1,7 +1,5 @@
-AUX nudoku-2.1.0-include-locale.patch 732 BLAKE2B e2b88fe53d10bb16a6660d1f6cad7640b0a183dd243212c51dd4a22a6bb991b24d14f3ee5c89174bf78d707d54b241c72255f78b25067d269eeed4fb7fb474c4 SHA512 1877ec6f93c1a552009747e785639ce80dfb37a7b61d1d28f84aa46adffcb03db47cdba29aa55cc7c0e0cc452c1ebe178d50a32a2ab3d2a54dbda2d3e706a775
-AUX nudoku-2.1.0-ncurses-link.patch 1077 BLAKE2B b03e0cd67bb2bdbab2849252802dd792757c099dab7e9b3279f9feb4811b8b129a4c6d99490af325533779d02a2fa5f50e4f1a3e67b8003888e02aa2c47018e6 SHA512 0911ea872374654f43f246ea2208f06b02ec951945038851236b82122eb0a318cf5e9ffe9ad86dbdf84bd431a2907f744c0452aa406d13da807ae2da21f928eb
-DIST nudoku-2.1.0.tar.gz 31592 BLAKE2B 997ae3931fec3b6605858a35cdf6bc88296138c01a9138d229ed43a5262fdd5d15eb8a96dfdcf02e8eb6f7f416b84e4752edbb57319be50bfdae6c952217446b SHA512 dde16d1dccc1cae8d156f57fccf8b112f3fee7d23b912b5cd7ecc092ecbf04a8e85f469e53fa02e6bd2d0b9498e4a65a219e1aad8091f82638dceab32f320670
 DIST nudoku-3.0.0.tar.gz 31578 BLAKE2B ff75b02e87b231c2ae3f1109e5f6c39efd37b5f9bc6cf11247dfc1098399e8dc647b144a186b3b9f62ffcb1e7c9dd37ba1a1ce4fa917829e8498e2eed48f80ea SHA512 7a87bb73d2a440b361544681c7924c62284fc3d6ac0122ddda51f5539a837ceb89fc7fcef06b134599cd7a11e2ba37fa49df0f89d5d8ab4cd454551492cb6d6e
-EBUILD nudoku-2.1.0.ebuild 703 BLAKE2B 79fb503f54559440c888427d629f03d41565a14ec757ecaa0634660b0d3688086ecaa7e9f40f5c777854cfe36903492fc667831ed795f2b8d6d88451bf828187 SHA512 f126ac7a2c4826e9ab3137171c18f7fd14aa9f1b03f6658211a25148db09d9be60496c02009516dbe9dca414f2cf3e633709db59a13b4f644b3827681142ecec
+DIST nudoku-5.0.0.tar.gz 35809 BLAKE2B 3bf0385e685a76e07d3110a566cfd7544655f5b1f6423659956220c81cb1c5d114bd5521c7853a365ec65a373725c7ba8b465b3da1452cd820201e95a033192d SHA512 2c104d43e84ba53a5177f4f4b7fa351db5ec45223ea2f238db5ecc07724d7677fa2e4d78ed66718e5a23f94e40f7e78180cc76e559d9e34bd9f184c419f2492d
 EBUILD nudoku-3.0.0.ebuild 596 BLAKE2B 29f6aeee1c956316255dc3eb039ea1181c7952a1bdf677fac3ff060f38970df94954cbc659e86bfa9e69b15fb525808982fc9552be764ec0045f9c04fa67bed4 SHA512 5e7ba3df7759e982c55764890b8c0bb8232aeaf381cd9dfd831f2d53eaeb5e6029a3308d141175cd05a041514d5e1e8f1c640fd12d001c29030ad72fdea03562
+EBUILD nudoku-5.0.0.ebuild 596 BLAKE2B a8aacb83e097c6ff56671adfbfd23774b15cc72636348912d9b51910456066b4b2bc016f5f4fae2abef902fdaaf9d57a41f0ba71185a5253cd1c5a2e707cd748 SHA512 6b6cc88a0b821300227742036006f6264d0015522249e835e0c3529988eef92d768cde72a6e2b49d271d14166d28e82fa5856d66ceeababa3b1500408293fd3e
 MISC metadata.xml 473 BLAKE2B 291ca8a22ebc8c8d6ae997fd4cf7e036312d24c0ecdd55bf7aa444e901fae4b92f7c2393bb6211aa85cf9f79b2a006ab14f40c7c706e9d7d0f0743149c5f6cd5 SHA512 ccb510531c72a7165302e0fb76641248791895b806dae51c7733170d94143e673e4033694e9c9f3b090ffffcf0385ac5ec2548742208392a7ae3eaf4e9d09f46
diff --git a/games-puzzle/nudoku/files/nudoku-2.1.0-include-locale.patch b/games-puzzle/nudoku/files/nudoku-2.1.0-include-locale.patch
deleted file mode 100644
index d4d1c89bd104..000000000000
--- a/games-puzzle/nudoku/files/nudoku-2.1.0-include-locale.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From ffe61c8cb6dcf6032960fa75ac2b66b5f1906e37 Mon Sep 17 00:00:00 2001
-From: Michael Vetter <jubalh@iodoru.org>
-Date: Thu, 23 Feb 2023 10:58:43 +0100
-Subject: [PATCH] Include locale.h
-
-See https://bugs.gentoo.org/895990
----
- src/main.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/main.c b/src/main.c
-index 74d6a0e..77a0a03 100644
---- a/src/main.c
-+++ b/src/main.c
-@@ -25,6 +25,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
- #include <ncurses.h>			/* ncurses */
- #include <time.h>				/* time */
- #include <string.h>				/* strcmp, strlen */
-+#include <locale.h>				/* setlocale */
- #include "sudoku.h"				/* sudoku functions */
- #ifdef ENABLE_CAIRO
- #include "outp.h"				/* output functions */
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
deleted file mode 100644
index 0a4b2a13a0c4..000000000000
--- a/games-puzzle/nudoku/files/nudoku-2.1.0-ncurses-link.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Ensure we link against the correct ncurses libraries.
-https://bugs.gentoo.org/764470
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -2,9 +2,9 @@
- #-DDEBUG
- 
- if HAVE_WIDE_NCURSES
--nudoku_LDADD = -lncursesw
-+nudoku_LDADD = ${ncursesw_LIBS}
- else
--nudoku_LDADD = -lncurses
-+nudoku_LDADD = ${ncurses_LIBS}
- endif
- bin_PROGRAMS = nudoku
- nudoku_SOURCES = main.c sudoku.c sudoku.h
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -6,6 +6,9 @@ AC_INIT([nudoku], [2.1.0], [jubalh@iodoru.org])
- AC_CONFIG_SRCDIR([src/main.c])
- AM_INIT_AUTOMAKE([foreign])
- 
-+# Check for pkg-config
-+PKG_PROG_PKG_CONFIG()
-+
- # Checks for programs.
- AC_PROG_CC
- # Use C99.
-@@ -35,9 +38,9 @@ the cairo development libraries, or compile without support (--disable-cairo)
- fi
- 
- have_wide_ncurses=no
--AC_CHECK_LIB(ncursesw, initscr, [have_wide_ncurses=yes])
-+PKG_CHECK_MODULES([ncursesw], [ncursesw], [have_wide_ncurses=yes], [])
- if test $have_wide_ncurses = no; then
--   AC_CHECK_LIB(ncurses, initscr, [], [
-+   PKG_CHECK_MODULES([ncurses], [ncurses], [], [ 
-    echo "nudoku requires ncurses"
-    exit 1
-    ])
diff --git a/games-puzzle/nudoku/nudoku-2.1.0.ebuild b/games-puzzle/nudoku/nudoku-5.0.0.ebuild
index f4a69b9fc4c7..b744c36aba90 100644
--- a/games-puzzle/nudoku/nudoku-2.1.0.ebuild
+++ b/games-puzzle/nudoku/nudoku-5.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,18 +16,13 @@ IUSE="cairo"
 
 BDEPEND="virtual/pkgconfig"
 DEPEND="
-	cairo? ( x11-libs/cairo )
 	>=sys-devel/gettext-0.20
 	sys-libs/ncurses:=
 	virtual/libintl
+	cairo? ( x11-libs/cairo )
 "
 RDEPEND="${DEPEND}"
 
-PATCHES=(
-	"${FILESDIR}/${PN}-2.1.0-ncurses-link.patch"
-	"${FILESDIR}/${PN}-2.1.0-include-locale.patch"
-)
-
 src_prepare() {
 	default
 	eautoreconf