gentoo resync : 28.04.2021

5 files changed, 53 insertions, 88 deletions

diff --git a/games-puzzle/numptyphysics/Manifest b/games-puzzle/numptyphysics/Manifest
index b8f1faa7c50a..0c3bd7a619ac 100644
--- a/games-puzzle/numptyphysics/Manifest
+++ b/games-puzzle/numptyphysics/Manifest
@@ -1,4 +1,4 @@
-AUX numptyphysics-0.3.4-gentoo.patch 1087 BLAKE2B 354c6a2e692ba0f75684696c77c6fb170a02cc258d49a248918baf4483754f846aade1eacab7aa879eaf7c53bf914cc1d4a87307f6bcc18b826beaa66b4bcd0d SHA512 84279382cf5f8faf1f77a44d87a49b4d9ef3adf11c3c3fbfe11c77cfd7aa7c4eaf7a6917f09ee4ac67e0e8bf8584406e7afb8ab86db11b2fd269e2cf7c0e6a13
+AUX numptyphysics-0.3.5-gentoo.patch 365 BLAKE2B 1281844bb72c77ddadc9b42f46cb444da4153bab872973ecc845e77bc065d49b7be9024c0b9aaee458cc3cb1a63d6089e7f86552308c6ec5d9c1f0d74e422297 SHA512 7554f725d18d5a800ac47d6c51c585ee05554d32df31be2c911de51c9146059c9090e2de95cc4ebb2a76c24a745c1858e5716485f4a3f7dd97bd76c70164ee34
 DIST butelo.npz 7209 BLAKE2B bfcc1e56d0bde0762db0253ea85d669cbd06295f037357e21d6b192710db36b767cc7932030f37ab18f60d35c1232d32c0c8f2af7a06f5911764acdfa14fc0a7 SHA512 a1f6ce15c0a921969a0e6c96d2e354aa666e760275a86d45b85db833731273e16ac9cdb4975beca71c1abcfe5dd64a0181f74bbc3e3aba1c2bb541c3bbe80090
 DIST catalyst.npz 8778 BLAKE2B e36c1651306af2cf2f43d300f674a665fd13aace71244173537165ddf5cb91bb150fb4370d15ecea28f83a79678626e501874efad30be59928a214781a76080d SHA512 ad2c02721e1b2ded3621a5a5217f78ed1022a86472f4de030c9b3d258f0b7b580e953fc2d017519477cea4df1b482e61fca565a3d98d511e894805e6683e6830
 DIST christeck.npz 4868 BLAKE2B c3a3a9416bea3160cdd16a5184b1923e3daedf369f973d0160b4683ab9c41b297ffea6a1fed025c3e296eb620d99fc30eef8f3978d385dcad2f8647ead9e2036 SHA512 562ed1fe6caa026dcc897aa914c5cad648aa191127714c888f5d1fbf82bbac15477928e49e02a5ab8940a84a085afb6e282e04ac1478a0ace5449541137f89fc
@@ -12,7 +12,7 @@ DIST jhoff80.npz 4612 BLAKE2B 167174fe7e7ed9a765964a4325ac7478d1f60b7e5ea22c55b0
 DIST leonet.npz 4885 BLAKE2B 94355b22e995ba91c2c57afa6572d5a669f600d7a21b890a11150c88145727914595d39fb2ee2a8c1d3f21320ed69b06991bf7db521ff68984fae04600b18487 SHA512 789cdde6313b7cc9e8616c7969d86ed44866baa9ae88befa605d7066ca8134f167aac9490afa3918305929dbbc0acaf46708e02be4353f98ebeb3dbe3b0eefa1
 DIST melvin.npz 18147 BLAKE2B 285580aa6561e4842aee385f349c77fc8bc05ffb645f623a3fd586ad9737e6248c6a742835c2d17eca4a467f3933b16fc9278315f4d04e98f07b0532762016bf SHA512 391a82b4c42cd2597dd06b299f15cf41302ec593658929d320b66caa69cd73e7cbe3128a18c811017c3b73c435a6f42b763c6e531c8fd193715bc41f85a6b5c2
 DIST noodleman.npz 46574 BLAKE2B 408ec52adc0b65965858e54c9b281e418cdfce46fd125d30736719fd181fc0a2543f5bb486868b949db740c4a08d07b3f8abf7f3525daff2348e2eb0d24d7080 SHA512 a088c2c86303985e7d8beec34809f09fcf8e510f7c2af2530620774d1f6579ac1e5ac73989b8e423079c1171a79c92a0cb6e6e01dca950fc519007c91b86ea82
-DIST numptyphysics-0.3.4.tar.gz 1646818 BLAKE2B a78b68437bf446036b227dd9e37bcc3b7e3098f9998aa4a6172e68736b5b840db153538c063a20a02b3a1e7e2d5b0c9b3e976f5ffa8b631a44b8544e9c34bb24 SHA512 2934303737309c058f64ba9dc24a292553e065c7604c8f0964365a9ca2ef68356a68515df5d71b2d3a0f59d115ebcc8b052a17f66ca2cfd5ffa80b68a38ca407
+DIST numptyphysics-0.3.5.tar.gz 1647220 BLAKE2B 90a82f05b7a725a88ddf40b7369341319ce999f6a167a1c817e53614a9cc57bbd15d4ea6a251e5d389c4e9516d319ccee046bbb5a78606be4263ffd5223372e6 SHA512 d80eb929fc5af7b4a241169e833858f1436ec86818f6c6d8d9280254a4c5f113ec9123adda319b22410a4ac259732e95ca1af057b542bc3e9d6b784668435fd0
 DIST papky.npz 2075 BLAKE2B f638dfae861027a7c89fdfdb305b273cc07aef26ae16e1e2b11bac467d0b13a663d700ca0c6aa1c3630c0b20eb453c27c87b700182e701754f25b0be3b3c16e5 SHA512 69733167ef00f64c19e4f8805e1a881332698e26950f996fc5d41e9e5580f5578b2b9d3f9781bacc9293519e139b7d531891b91f36c45031ac06da6e8e78fbfa
 DIST perli.npz 15452 BLAKE2B 9c57af22a31eead27a3e48605c362a4018a3bc9e6227ac1e9e813a9ca2f8c3e2f771d6bbfc7fe1f7415989a14852105802ea054d12ddb5c6ce2697b47dadec03 SHA512 cee513ed0e728334f0e60571e38dc68e476681bad8a22497ac01f790c6975bbffba727ede054bfc6f594f289c9bf6346c3e9b3537145707c3ed6f4d6c21136c8
 DIST qole.npz 6533 BLAKE2B 35b24ea2a5462c079099ed511abbca8abf6e7362646574726027187166cac817509ff6c1bce3ef0e57d5e086adf9585edf9e00421a0a4954e755a8b056f718da SHA512 dc624c5ffdcb0f9f18c20db7a08d7e9d9d4fa5314e3fabfa730e21bb0a27d4b415432ec66eab64d8252c7fe4793a2cff231e856ca06d85c61558a867bf2fb03b
@@ -21,6 +21,6 @@ DIST szymanowski.npz 2577 BLAKE2B 827b5e15d6c1d6003d311cdf58b02b70a0986ab3232d19
 DIST therealbubba.npz 6684 BLAKE2B debdb3a6788425726101a5368d27ade150edd1c0badcbf19903c6e9ae688adfce51c17ce276dd7c477d4d816526fe33541b34d0398563bfd0be6da5ded928c0a SHA512 c71a84345f0c6e0cde87e76b3084d89b2222d33b512458efd98d91c099b54e817b8421ea70001de6e5556c0e28be1c9fc1c19ad1411dd1b2bf194f987cdbdec6
 DIST werre.npz 7739 BLAKE2B 09f6ebfa4ffb3cc39149b39ce70940ba0437fbfd8e6ec1c905096c0d8093874d4caa7bde92b90ab4100472339b068218f75d1b64425d06f6910d1f32c39e0f90 SHA512 1caac7964cc51c6300648fa6be21f7ac3c0d585288ea2e18e725f5575a732b461b77bfd0ddf3118f5d4c922f16a30466e168bb38e81498291214597fd4442bcd
 DIST zeez.npz 8633 BLAKE2B 758382345615f942a095399e15faf8ed98e467e4454e0cc156b55d38f1cf994a23cf4bbe7895b3a276da7516758ea7bc0e7983595f77a784eca078b347590b36 SHA512 8f1945d79dc43e0bc6e2b814640d1587fc38bf8ca19f6b949821d3095eb22e9837a3f82433e452ce851b97e29d90440045866dfc6a28f9f5b31ffcf35f467e41
-EBUILD numptyphysics-0.3.4.ebuild 2294 BLAKE2B 7475c812f49a3799b50ba1568ecfcd9cb4f65aecd64de731e6093edc1be8a71686a73649a8ae87699d875ab82b69624ec8f4658edbae46121ddbad0e7624cfe6 SHA512 16d2b66c143d6f7d8bc78dd4884b4e4c99db07fc77b9581ad9a6503edd2ed8360013eab2f16314bce77936e07778f7ab0a4acd143a693a37ad3cffa26c729268
-EBUILD numptyphysics-9999.ebuild 2582 BLAKE2B 4d72ce01297bb7473f6d1809df05a6b3ca1c3f5ba47bad3c7df1f879a5ebf9063ec4b44c1634014182d834510af67ea17ce9d874fa97ee5ec1c1db2d41c191dd SHA512 4b09987f37bf36dab6d4605860d5f8d73255cdccc52bab37f5724a4a7e8dc9b846d69aa659b1502b984d081169401e2aa4f6e39d294a4099419a506ab205ecbf
+EBUILD numptyphysics-0.3.5.ebuild 2296 BLAKE2B edaab618325ae81d97dac53e662acdc165dbb88121f5c23013ba308b0dba76451a7fc994d6a409374c26db820849e899bde332aa15b812d14ae73bb6a4506e4d SHA512 a66230e1c25bc2d6c84b4b8c00625c718e4f2b38d97b13cc349dad45ce9a64912efae53eb975ab04182329842698846be7cb8671ac50289c4e9c361a0ed948d2
+EBUILD numptyphysics-9999.ebuild 2263 BLAKE2B 89b943d77c93c4208dc4adc16a6feae0a317dd7dadc26aaecc40a45ed36da94ab73b13800c7795a049a34d32b3df04f1d6b57ea519d23bf2d76ed6d3ceff7284 SHA512 98f0af5e679eb7d295f22d40cf010dc64e4e5e4a7651edb5b3b976443d92730a4bc15d07bd8db0630a6f73f702cea804063e9fa56dbd75fcc7f88c0cb4511319
 MISC metadata.xml 339 BLAKE2B 9e41c9460f243a37e945b14949cd7b4d46cde5ac5df468fddb8d3752d47cc19583d1a63d8b6287952f15bdf4cdc24e8bebb328ff0f37b895719f27805dc2d470 SHA512 a007e8ee484f70548c0348d35bf1c616da363968370ccdf30693eacef552d552e7b839e8d32d81aec1c452aeb184f3cc2af79992c2f0cd73c1fdcc010f13d29f
diff --git a/games-puzzle/numptyphysics/files/numptyphysics-0.3.4-gentoo.patch b/games-puzzle/numptyphysics/files/numptyphysics-0.3.4-gentoo.patch
deleted file mode 100644
index e3a7b2ee372f..000000000000
--- a/games-puzzle/numptyphysics/files/numptyphysics-0.3.4-gentoo.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff --git a/external/glaserl/makefile b/external/glaserl/makefile
-index 4120459..f49d9e7 100644
---- a/external/glaserl/makefile
-+++ b/external/glaserl/makefile
-@@ -1,7 +1,5 @@
- TARGET := libglaserl.a
- 
--CFLAGS += -g -O2
--
- SOURCES := $(wildcard *.c)
- OBJECTS := $(SOURCES:.c=.o)
- 
-diff --git a/makefile b/makefile
-index 0f9a9b6..292b759 100644
---- a/makefile
-+++ b/makefile
-@@ -1,7 +1,6 @@
- APP := numptyphysics
- 
- SOURCES := $(wildcard src/*.cpp)
--CXXFLAGS += -std=c++11 -Isrc -Wall -Wno-sign-compare
- 
- all: app
- 
-@@ -13,7 +12,7 @@ app: $(TARGET)
- 
- $(TARGET): $(OBJECTS) $(LOCAL_LIBS)
- 	$(SILENTMSG) "\tLD\t$@\n"
--	$(SILENTCMD) $(CXX) -o $@ $^ $(LIBS)
-+	$(SILENTCMD) $(CXX) -o $@ $^ $(LDFLAGS) $(LIBS)
- 
- clean: $(ADDITIONAL_CLEAN_TARGETS)
- 	$(SILENTMSG) "\tCLEAN\n"
-diff --git a/src/Os.cpp b/src/Os.cpp
-index b5d7fb9..6a0ccf4 100644
---- a/src/Os.cpp
-+++ b/src/Os.cpp
-@@ -262,5 +262,5 @@ Os::globalDataDir()
-     }
- 
-     // System-wide installation
--    return thp::format("%s/../share/%s/data", g_appDir.c_str(), appName().c_str());
-+    return "/usr/share/numptyphysics/data";
- }
diff --git a/games-puzzle/numptyphysics/files/numptyphysics-0.3.5-gentoo.patch b/games-puzzle/numptyphysics/files/numptyphysics-0.3.5-gentoo.patch
new file mode 100644
index 000000000000..9a739ed5227c
--- /dev/null
+++ b/games-puzzle/numptyphysics/files/numptyphysics-0.3.5-gentoo.patch
@@ -0,0 +1,13 @@
+diff --git a/makefile b/makefile
+index 8125a48..0ee4942 100644
+--- a/makefile
++++ b/makefile
+@@ -37,7 +37,7 @@ $(OBJECTS): $(GENERATED_HEADERS)
+ 
+ $(TARGET): $(OBJECTS) $(LOCAL_LIBS)
+ 	$(SILENTMSG) "\tLD\t$@\n"
+-	$(SILENTCMD) $(CXX) -o $@ $^ $(LIBS)
++	$(SILENTCMD) $(CXX) -o $@ $^ $(LDFLAGS) $(LIBS)
+ 
+ clean: $(ADDITIONAL_CLEAN_TARGETS)
+ 	$(SILENTMSG) "\tCLEAN\n"
diff --git a/games-puzzle/numptyphysics/numptyphysics-0.3.4.ebuild b/games-puzzle/numptyphysics/numptyphysics-0.3.5.ebuild
index f06dc622d84b..aed95f6655cd 100644
--- a/games-puzzle/numptyphysics/numptyphysics-0.3.4.ebuild
+++ b/games-puzzle/numptyphysics/numptyphysics-0.3.5.ebuild
@@ -1,15 +1,16 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit eutils gnome2-utils flag-o-matic
+EAPI=7
+
+inherit gnome2-utils toolchain-funcs
 
 DESCRIPTION="Crayon Physics-like drawing puzzle game using the same excellent Box2D engine"
-HOMEPAGE="http://thp.io/2015/numptyphysics/"
+HOMEPAGE="https://github.com/thp/numptyphysics"
 
 # This is only the SRC_URI for the user levels. The code is in git repo.
 SRC_URI="user-levels? (
-	https://github.com/thp/numptyphysics/archive/0.3.4.tar.gz -> ${P}.tar.gz
+	https://github.com/thp/numptyphysics/archive/${PV}.tar.gz -> ${P}.tar.gz
 	http://numptyphysics.garage.maemo.org/levels/butelo/butelo.npz
 	http://numptyphysics.garage.maemo.org/levels/catalyst/catalyst.npz
 	http://numptyphysics.garage.maemo.org/levels/christeck/christeck.npz
@@ -33,26 +34,28 @@ SRC_URI="user-levels? (
 	http://numptyphysics.garage.maemo.org/levels/zeez/zeez.npz
 )"
 
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="+user-levels"
 
 RDEPEND="
+	dev-libs/glib:2
 	media-libs/libsdl2[opengl,video]
 	media-libs/sdl2-image[png]
 	media-libs/sdl2-ttf
 	virtual/opengl
-	dev-libs/glib:2
-"
-DEPEND="${DEPEND}
-	virtual/pkgconfig
 "
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.3.5-gentoo.patch
+)
 
-src_prepare() {
-	default
-	append-cxxflags -std=c++11 -Isrc
-	eapply "${FILESDIR}"/${P}-gentoo.patch
+src_compile() {
+	tc-export CC CXX
+	emake
 }
 
 pkg_preinst() {
diff --git a/games-puzzle/numptyphysics/numptyphysics-9999.ebuild b/games-puzzle/numptyphysics/numptyphysics-9999.ebuild
index 01e05708917e..e9ab6b1a7e7d 100644
--- a/games-puzzle/numptyphysics/numptyphysics-9999.ebuild
+++ b/games-puzzle/numptyphysics/numptyphysics-9999.ebuild
@@ -1,12 +1,13 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit eutils gnome2-utils flag-o-matic git-r3
+EAPI=7
 
-DESCRIPTION="Crayon Physics-like drawing puzzle game using the same excellent Box2D engine"
-HOMEPAGE="http://thp.io/2015/numptyphysics/"
+inherit git-r3 gnome2-utils toolchain-funcs
 
+DESCRIPTION="Crayon Physics-like drawing puzzle game using the same excellent Box2D engine"
+HOMEPAGE="https://github.com/thp/numptyphysics"
+EGIT_REPO_URI="https://github.com/thp/numptyphysics"
 # This is only the SRC_URI for the user levels. The code is in git repo.
 SRC_URI="user-levels? (
 	http://numptyphysics.garage.maemo.org/levels/butelo/butelo.npz
@@ -32,35 +33,27 @@ SRC_URI="user-levels? (
 	http://numptyphysics.garage.maemo.org/levels/zeez/zeez.npz
 )"
 
-EGIT_REPO_URI="https://github.com/thp/numptyphysics"
-
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS=""
 IUSE="+user-levels"
 
-RDEPEND="media-libs/libsdl2[opengl,video]
+RDEPEND="
+	dev-libs/glib:2
+	media-libs/libsdl2[opengl,video]
 	media-libs/sdl2-image[png]
 	media-libs/sdl2-ttf
 	virtual/opengl
-	dev-libs/glib:2"
-DEPEND="${DEPEND}
-	virtual/pkgconfig"
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
-src_unpack() {
-	git-r3_src_unpack
-}
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.3.5-gentoo.patch
+)
 
-src_prepare() {
-	append-cxxflags -std=c++11 -Isrc
-	sed -i '/-g -O2/d' external/Box2D/Source/Makefile \
-		external/glaserl/makefile || die
-	sed -i "/return thp::/s% thp::.*$%\"/usr/share/${PN}/data\";%" \
-		src/Os.cpp || die
-	sed -e '/CXXFLAGS +=/s/\(CXXFLAGS +=\).*\( -DAPP=.*\)/\1\2/' \
-		-e '/SILENTCMD/s/$(LIBS)$/$(LDFLAGS) $(LIBS)/' \
-		-i makefile || die
-	eapply_user
+src_compile() {
+	tc-export CC CXX
+	emake
 }
 
 pkg_preinst() {