gentoo resync : 15.06.2021

3 files changed, 22 insertions, 67 deletions

diff --git a/games-puzzle/pingus/Manifest b/games-puzzle/pingus/Manifest
index 28ef72a1847c..42185bff6396 100644
--- a/games-puzzle/pingus/Manifest
+++ b/games-puzzle/pingus/Manifest
@@ -4,8 +4,7 @@ AUX pingus-0.7.6-gcc47.patch 1096 BLAKE2B 8e7a56634eb69cc1c0797a2fa020b30e0eecf0
 AUX pingus-0.7.6-gcc7.patch 675 BLAKE2B 76172b7151e30e800ab2210684a02605810b0f15b972ad6942b65c5c333f5f29e6ace7dd37a9d7541468906a2864925df5a899c5c98a6404b65dbfa802a9f5b7 SHA512 7e7fc8d7b23453b33899452d9ee19a134fe7ab1326a2560698624dc686de98108baeb026401704c06dd262c69542499b0cc3727c57d47f924f3a4020ff386027
 AUX pingus-0.7.6-noopengl.patch 315 BLAKE2B 49d2f078506c38d7da57847c6189bf0f9fd0b8a87e80b16fb848f52e37a466111be753f68dc9bf889c66d4ad9a4fea8495fe73b860001d644f2dbb0091b319fe SHA512 f375591892ddecea0659f94ab3d4fc6744625b546fdbc6d80524c25d8ee494163a9b4a90671eed9e7fa2724a1fd91ccde2e80b8ba097c21aa76e0e9fb7e6f4a0
 AUX pingus-0.7.6-python3.patch 553 BLAKE2B aa15a12e8e4d578a91ff1b96aceb51a529595eae59d4f78e80a1b7bd2427a8658fdb9d91e32602d7ab1125b9c3c59538cf47d17ae4eb23bfe23d38b401ef0890 SHA512 5be04a07beddefe33681c6e0cf043e46e514a10665732015ff0ca01be933752f67d5a6161729c72d277ba5a56eb9bd38ab80da3bf0755895d0784196ad349a1c
-AUX pingus-9999-no_libexec.patch 895 BLAKE2B 2cdbf1faffe66c4b6a9fe3518cbecbfce292995cc08f28ef4929a72d1df00a4f937a0c270d932ab724946986104f59a00af58676496950a429d14b1436386f39 SHA512 91bdecf06f47dca2ff3c019b6bafdbdba560ac05c49389b1fd9d59ab89f20b7251c3cfea62857b6f6de4720a2cba405e1c7bb8df5b36c76b2e2c0bf36fc7a5e4
 DIST pingus-0.7.6.tar.bz2 12622268 BLAKE2B 5ea1bbea7191919897bdedcda06f956d9b6cc0cda2ab11e475ef497ef8ba0c0de5a739ac334e2a5c9a0c138e6bfc44a23363dc59d3e4cfaea2b5388bbe57cc85 SHA512 6c8c2ace1a9229b4e3b506aee76aa94c0dd906a64fa2c817902c2cd3854df390cf675c8c6ddd3ba1926a467348b2103818bd44bc095378cc7bf3f2ff7af27188
 EBUILD pingus-0.7.6-r3.ebuild 1283 BLAKE2B 00c962037144ae945a566f7c0f7f9beee6b17c3b05740aa0415c404700e8c0ae9a34226c9c870a24c437b9d1203d5b95019373919db1f08788a57fc27b9453d7 SHA512 80926aeb99b05783497a2e1db5f30a7e4302eddcf53e8072ee55da144694146df47c2c683e7067d2b9a66c8860f368e07ed2975f953246fb654364fa25493a7b
-EBUILD pingus-9999.ebuild 908 BLAKE2B 4b46851176ab8ecfd078d3d52401c3f5ac8c17f0ef5afe0f6b74daa590dc675c3d7d4b29b8712b4a9fb6a92403486c08d3c9c47f43f89b815c0160429161c4fd SHA512 baf30d488bfd4da6a6b7623b7ece35cbd9d9084730719e35623248762787d5233cdd2d23dcdd9bd8504c06bc5c1153aa2cb8227c9f9c1e99da48092be2c23d94
+EBUILD pingus-9999.ebuild 635 BLAKE2B a5741a018b2111cc3acd1fb9cc2de193c8e6e5b4454a537b22a212b8b57dbb334dcc711165874f0dbc8a797f8d65593ec4f1274e8ecad2ea43a93b00c1ab6518 SHA512 24a4bc4bbc79636e5baf580de0d224a289ed446b45c0f57d0e7b1a6fadd8fe0606b5b53498eed77bb0ac0eb1875a4a34da837e9340e816b8a8325d184c537e75
 MISC metadata.xml 1283 BLAKE2B 971b7c831e81413f71e70c7f66ef01b493296d33ff6bbb2997690b60c10eb1a4ffa29c47f335bbd4c57c178e35aef3d59586bbe06199bc50df34501f56b3be2d SHA512 04c0f4cb00f8b50e5f589d6bfa48389fb7fb2ff0ac2343c625f98383ec41ea77d63dbdc14d12325f3837e4961c544503f1a76a4298fa061458a71b1e198c8219
diff --git a/games-puzzle/pingus/files/pingus-9999-no_libexec.patch b/games-puzzle/pingus/files/pingus-9999-no_libexec.patch
deleted file mode 100644
index 45da29a42264..000000000000
--- a/games-puzzle/pingus/files/pingus-9999-no_libexec.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From ef01ebf5401419a0e98dfe32efa9a0bc8564e26f Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Wed, 3 Apr 2019 18:35:28 +0200
-Subject: [PATCH] Don't install pingus executable into libexec
-
-This doesn't really make any sense.
----
- CMakeLists.txt | 9 ---------
- 1 file changed, 9 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f3a92be64..fa835236d 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -213,15 +213,6 @@ if(BUILD_TESTS)
- endif(BUILD_TESTS)
- 
- install(TARGETS pingus
--  RUNTIME DESTINATION ${CMAKE_INSTALL_LIBEXECDIR})
--
--configure_file(
--  ${CMAKE_CURRENT_SOURCE_DIR}/pingus.sh.in
--  ${CMAKE_BINARY_DIR}/pingus.sh)
--
--install(FILES
--  ${CMAKE_BINARY_DIR}/pingus.sh
--  RENAME pingus
-   PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
-   DESTINATION ${CMAKE_INSTALL_BINDIR})
- 
--- 
-2.21.0
-
diff --git a/games-puzzle/pingus/pingus-9999.ebuild b/games-puzzle/pingus/pingus-9999.ebuild
index b0083c14fd54..86efbe6553a5 100644
--- a/games-puzzle/pingus/pingus-9999.ebuild
+++ b/games-puzzle/pingus/pingus-9999.ebuild
@@ -2,41 +2,30 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit cmake flag-o-matic xdg
 
-DESCRIPTION="free Lemmings clone"
+inherit xdg cmake git-r3
+
+DESCRIPTION="Free Lemmings clone"
 HOMEPAGE="https://pingus.gitlab.io/"
-if [[ "${PV}" == *9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.com/pingus/pingus.git"
-else
-	SRC_URI="https://github.com/Pingus/pingus/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-LICENSE="GPL-3"
+EGIT_REPO_URI="https://gitlab.com/pingus/pingus.git"
+
+LICENSE="GPL-3+"
 SLOT="0"
-IUSE=""
 
 RDEPEND="
-	dev-libs/boost:=
-	dev-libs/jsoncpp
-	media-libs/libpng:0=
+	dev-libs/jsoncpp:=
+	dev-libs/libfmt:=
+	dev-libs/libsigc++:2
+	media-libs/libmodplug
+	media-libs/libpng:=
 	media-libs/libsdl2[joystick,opengl,video]
-	media-libs/sdl2-image[png]
-	media-libs/sdl2-mixer[mod]
-	virtual/opengl
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.7.6-noopengl.patch
-	"${FILESDIR}"/${P}-no_libexec.patch
-)
-
-src_prepare() {
-	sed '/find_package(Boost/s@ signals@@' -i CMakeLists.txt || die
-	cmake_src_prepare
-	strip-flags
-}
+	media-libs/libvorbis
+	media-libs/openal
+	media-libs/opusfile
+	media-libs/sdl2-image[jpeg,png]
+	media-sound/mpg123
+	virtual/opengl"
+DEPEND="
+	${RDEPEND}
+	dev-libs/boost
+	media-libs/glm"