Updating liguros repo21.1.2

9 files changed, 74 insertions, 25 deletions

diff --git a/games-puzzle/fish-fillets/fish-fillets-1.0.1-r100.ebuild b/games-puzzle/fish-fillets/fish-fillets-1.0.1-r100.ebuild
index 468df7aea7c4..956dc7868b45 100644
--- a/games-puzzle/fish-fillets/fish-fillets-1.0.1-r100.ebuild
+++ b/games-puzzle/fish-fillets/fish-fillets-1.0.1-r100.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-LUA_COMPAT=( lua5-1 )
+LUA_COMPAT=( lua5-{1..4} luajit )
 
 inherit autotools desktop lua-single
 
diff --git a/games-puzzle/flobopuyo/flobopuyo-0.20-r2.ebuild b/games-puzzle/flobopuyo/flobopuyo-0.20-r2.ebuild
index 41b6422364af..8d8d4ed2b8cd 100644
--- a/games-puzzle/flobopuyo/flobopuyo-0.20-r2.ebuild
+++ b/games-puzzle/flobopuyo/flobopuyo-0.20-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/games-puzzle/ksokoban/ksokoban-0.5.0_pre20190225.ebuild b/games-puzzle/ksokoban/ksokoban-0.5.0_pre20190225.ebuild
index 1a86e9edd467..08ededa85199 100644
--- a/games-puzzle/ksokoban/ksokoban-0.5.0_pre20190225.ebuild
+++ b/games-puzzle/ksokoban/ksokoban-0.5.0_pre20190225.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 COMMIT="317b1e70a87224c94cac85955a3d666a43527812"
-ECM_HANDBOOK="optional"
+ECM_HANDBOOK="forceoptional"
 KFMIN=5.60.0
 QTMIN=5.12.3
 inherit ecm kde.org
diff --git a/games-puzzle/meandmyshadow/files/meandmyshadow-0.4-cmake.patch b/games-puzzle/meandmyshadow/files/meandmyshadow-0.4-cmake.patch
index 504f6c0987a6..0bd66d5d284a 100644
--- a/games-puzzle/meandmyshadow/files/meandmyshadow-0.4-cmake.patch
+++ b/games-puzzle/meandmyshadow/files/meandmyshadow-0.4-cmake.patch
@@ -1,6 +1,6 @@
---- a/CMakeLists.txt

-+++ b/CMakeLists.txt

-@@ -15,13 +15,12 @@

+--- meandmyshadow-0.4.orig/CMakeLists.txt
++++ meandmyshadow-0.4/CMakeLists.txt
+@@ -15,13 +15,12 @@
  Find_Package(CURL REQUIRED)

  Find_Package(LibArchive REQUIRED)

  Find_Package(OpenSSL REQUIRED)

diff --git a/games-puzzle/meandmyshadow/meandmyshadow-0.4-r1.ebuild b/games-puzzle/meandmyshadow/meandmyshadow-0.4-r1.ebuild
index 15ba16a98274..809adb120794 100644
--- a/games-puzzle/meandmyshadow/meandmyshadow-0.4-r1.ebuild
+++ b/games-puzzle/meandmyshadow/meandmyshadow-0.4-r1.ebuild
@@ -1,12 +1,13 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils gnome2-utils
+inherit cmake xdg-utils
 
-DESCRIPTION="A puzzle/platform game with a player and its shadow"
-HOMEPAGE="https://sourceforge.net/projects/meandmyshadow/"
+DESCRIPTION="Puzzle/platform game with a player and its shadow"
+HOMEPAGE="https://acmepjz.github.io/meandmyshadow/
+https://github.com/acmepjz/meandmyshadow/"
 SRC_URI="mirror://sourceforge/meandmyshadow/${PV}/${P}-src.tar.gz"
 
 LICENSE="GPL-3 OFL-1.1 CC-BY-SA-2.5"
@@ -41,13 +42,13 @@ src_configure() {
 		-DDESKTOPDIR=/usr/share/applications
 		-DHARDWARE_ACCELERATION=$(usex opengl)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
diff --git a/games-puzzle/monsterz/monsterz-0.7.1_p11.ebuild b/games-puzzle/monsterz/monsterz-0.7.1_p11.ebuild
index 99f275e1505e..08f155c1baec 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,9,10} )
 
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
 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 91eb0ee78503..62c4b2763e6d 100644
--- a/games-puzzle/nudoku/Manifest
+++ b/games-puzzle/nudoku/Manifest
@@ -1 +1 @@
-DIST nudoku-1.0.0.tar.gz 20442 BLAKE2B b258362012b889a0756bc8cdbfbcdc9aba09e1162f6dc8a593061689e81d02935111bac8561648e89e7287af4702f110ea86fb20ae4e18bfba09f3578f0909cb SHA512 f29a698eec076729ce065633bb05e0146e229774ff1eb3f2bd5cd5733698e30b91085b55d871657d42f2d3d8bcf7bb45918f4a127d6a0464ebc8b90ccc384ec3
+DIST nudoku-2.1.0.tar.gz 31592 BLAKE2B 997ae3931fec3b6605858a35cdf6bc88296138c01a9138d229ed43a5262fdd5d15eb8a96dfdcf02e8eb6f7f416b84e4752edbb57319be50bfdae6c952217446b SHA512 dde16d1dccc1cae8d156f57fccf8b112f3fee7d23b912b5cd7ecc092ecbf04a8e85f469e53fa02e6bd2d0b9498e4a65a219e1aad8091f82638dceab32f320670
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)
 }