games-puzzle/numptyphysics: add 0.3.8

ebuild fixes:
* -user-levels was broken due to main SRC_URI being behind user-levels?
* +user-levels was pointless due to main tarball already including
  them in the required new format -- and downloaded levels weren't
  being installed either way
* tc-export AR RANLIB also needed, and new patch adds PKG_CONFIG
* fix icon cache (gnome2_icon_cache_update called in EAPI-7)

Signed-off-by: Ionen Wolkens <ionen@gentoo.org>

4 files changed, 81 insertions, 0 deletions

diff --git a/games-puzzle/numptyphysics/Manifest b/games-puzzle/numptyphysics/Manifest
index ce3a6fe46bae..815ed487b847 100644
--- a/games-puzzle/numptyphysics/Manifest
+++ b/games-puzzle/numptyphysics/Manifest
@@ -12,6 +12,7 @@ DIST leonet.npz 4885 BLAKE2B 94355b22e995ba91c2c57afa6572d5a669f600d7a21b890a111
 DIST melvin.npz 18147 BLAKE2B 285580aa6561e4842aee385f349c77fc8bc05ffb645f623a3fd586ad9737e6248c6a742835c2d17eca4a467f3933b16fc9278315f4d04e98f07b0532762016bf SHA512 391a82b4c42cd2597dd06b299f15cf41302ec593658929d320b66caa69cd73e7cbe3128a18c811017c3b73c435a6f42b763c6e531c8fd193715bc41f85a6b5c2
 DIST noodleman.npz 46574 BLAKE2B 408ec52adc0b65965858e54c9b281e418cdfce46fd125d30736719fd181fc0a2543f5bb486868b949db740c4a08d07b3f8abf7f3525daff2348e2eb0d24d7080 SHA512 a088c2c86303985e7d8beec34809f09fcf8e510f7c2af2530620774d1f6579ac1e5ac73989b8e423079c1171a79c92a0cb6e6e01dca950fc519007c91b86ea82
 DIST numptyphysics-0.3.5.tar.gz 1647220 BLAKE2B 90a82f05b7a725a88ddf40b7369341319ce999f6a167a1c817e53614a9cc57bbd15d4ea6a251e5d389c4e9516d319ccee046bbb5a78606be4263ffd5223372e6 SHA512 d80eb929fc5af7b4a241169e833858f1436ec86818f6c6d8d9280254a4c5f113ec9123adda319b22410a4ac259732e95ca1af057b542bc3e9d6b784668435fd0
+DIST numptyphysics-0.3.8.tar.gz 1647661 BLAKE2B 07cd5fa77e48517bf7cd2b11d8bcd4a0878cf02860f4165d29a562191e529babcf9637b293d3670bd37f8dfb9db4423546f6eede405fa0ecf97187e0f408dbae SHA512 6f5c7783e9e09efda19ff00d369dca76e0dc8f574b1e8c9268459accf83e48a29f7caec7a4ec3a28da4fac3007d2137f0bf5426494118927cd7b944646c7c24e
 DIST papky.npz 2075 BLAKE2B f638dfae861027a7c89fdfdb305b273cc07aef26ae16e1e2b11bac467d0b13a663d700ca0c6aa1c3630c0b20eb453c27c87b700182e701754f25b0be3b3c16e5 SHA512 69733167ef00f64c19e4f8805e1a881332698e26950f996fc5d41e9e5580f5578b2b9d3f9781bacc9293519e139b7d531891b91f36c45031ac06da6e8e78fbfa
 DIST perli.npz 15452 BLAKE2B 9c57af22a31eead27a3e48605c362a4018a3bc9e6227ac1e9e813a9ca2f8c3e2f771d6bbfc7fe1f7415989a14852105802ea054d12ddb5c6ce2697b47dadec03 SHA512 cee513ed0e728334f0e60571e38dc68e476681bad8a22497ac01f790c6975bbffba727ede054bfc6f594f289c9bf6346c3e9b3537145707c3ed6f4d6c21136c8
 DIST qole.npz 6533 BLAKE2B 35b24ea2a5462c079099ed511abbca8abf6e7362646574726027187166cac817509ff6c1bce3ef0e57d5e086adf9585edf9e00421a0a4954e755a8b056f718da SHA512 dc624c5ffdcb0f9f18c20db7a08d7e9d9d4fa5314e3fabfa730e21bb0a27d4b415432ec66eab64d8252c7fe4793a2cff231e856ca06d85c61558a867bf2fb03b
diff --git a/games-puzzle/numptyphysics/files/numptyphysics-0.3.8-empty-tr.patch b/games-puzzle/numptyphysics/files/numptyphysics-0.3.8-empty-tr.patch
new file mode 100644
index 000000000000..847092190d35
--- /dev/null
+++ b/games-puzzle/numptyphysics/files/numptyphysics-0.3.8-empty-tr.patch
@@ -0,0 +1,10 @@
+On unrecognized LC_MESSAGES (e.g. C.utf8) the .empty() check
+fails and loads empty translations leading to constant:
+[ 1536ms] [I18n.cpp:34 WARNING] Untranslated: 'Gameplay paused'
+--- a/src/Os.cpp
++++ b/src/Os.cpp
+@@ -279,3 +279,3 @@
+         auto fn = thp::format("i18n/%s", lang);
+-        if (!Config::readFile(fn).empty()) {
++        if (!access(Config::findFile(fn).c_str(),F_OK)) {
+             Tr::load(fn);
diff --git a/games-puzzle/numptyphysics/files/numptyphysics-0.3.8-respect-flags.patch b/games-puzzle/numptyphysics/files/numptyphysics-0.3.8-respect-flags.patch
new file mode 100644
index 000000000000..09b54e6ac739
--- /dev/null
+++ b/games-puzzle/numptyphysics/files/numptyphysics-0.3.8-respect-flags.patch
@@ -0,0 +1,30 @@
+diff '--color=auto' -NarU 2 a/external/Box2D/Source/Makefile b/external/Box2D/Source/Makefile
+--- a/external/Box2D/Source/Makefile	2021-06-18 07:19:06.000000000 -0400
++++ b/external/Box2D/Source/Makefile	2021-07-16 17:01:57.254825075 -0400
+@@ -7,5 +7,5 @@
+ endif

+ 

+-CXXFLAGS=	-g -O2

++CXXFLAGS ?=	-g -O2

+ 

+ SOURCES = \

+diff '--color=auto' -NarU 2 a/makefile b/makefile
+--- a/makefile	2021-06-18 07:19:06.000000000 -0400
++++ b/makefile	2021-07-16 17:00:51.421009113 -0400
+@@ -38,5 +38,5 @@
+ $(TARGET): $(OBJECTS) $(LOCAL_LIBS)
+ 	$(SILENTMSG) "\tLD\t$@\n"
+-	$(SILENTCMD) $(CXX) -o $@ $^ $(LIBS)
++	$(SILENTCMD) $(CXX) -o $@ $^ $(LDFLAGS) $(LIBS)
+ 
+ clean: $(ADDITIONAL_CLEAN_TARGETS)
+diff '--color=auto' -NarU 2 a/mk/pkgs.mk b/mk/pkgs.mk
+--- a/mk/pkgs.mk	2021-06-18 07:19:06.000000000 -0400
++++ b/mk/pkgs.mk	2021-07-16 17:10:28.636268435 -0400
+@@ -1,4 +1,4 @@
+ ifneq ($(PKGS),)
+-CXXFLAGS += $(shell $(CROSS_COMPILE)pkg-config --cflags $(PKGS))
+-LIBS += $(shell $(CROSS_COMPILE)pkg-config --libs $(PKGS))
++CXXFLAGS += $(shell $(PKG_CONFIG) --cflags $(PKGS))
++LIBS += $(shell $(PKG_CONFIG) --libs $(PKGS))
+ endif
diff --git a/games-puzzle/numptyphysics/numptyphysics-0.3.8.ebuild b/games-puzzle/numptyphysics/numptyphysics-0.3.8.ebuild
new file mode 100644
index 000000000000..9ff5318033cc
--- /dev/null
+++ b/games-puzzle/numptyphysics/numptyphysics-0.3.8.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs xdg
+
+DESCRIPTION="Crayon Physics-like drawing puzzle game using the same excellent Box2D engine"
+HOMEPAGE="https://github.com/thp/numptyphysics"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/thp/numptyphysics.git"
+else
+	SRC_URI="https://github.com/thp/numptyphysics/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="BSD GPL-3+ ZLIB"
+SLOT="0"
+
+RDEPEND="
+	dev-libs/glib:2
+	media-libs/libsdl2[opengl,video]
+	media-libs/sdl2-image[png]
+	media-libs/sdl2-ttf
+	virtual/opengl"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-empty-tr.patch
+	"${FILESDIR}"/${P}-respect-flags.patch
+)
+
+src_compile() {
+	tc-export AR CC CXX PKG_CONFIG RANLIB
+
+	emake V=1
+}