gentoo auto-resync : 16:02:2023 - 14:04:41

5 files changed, 9 insertions, 45 deletions

diff --git a/games-puzzle/Manifest.gz b/games-puzzle/Manifest.gz
index 6a156e13e7b3..4f5d102e5a0d 100644
--- a/games-puzzle/Manifest.gz
+++ b/games-puzzle/Manifest.gz
diff --git a/games-puzzle/pingus/Manifest b/games-puzzle/pingus/Manifest
index f24ea6b3f75c..88195384e8c6 100644
--- a/games-puzzle/pingus/Manifest
+++ b/games-puzzle/pingus/Manifest
@@ -5,6 +5,5 @@ AUX pingus-0.7.6-gcc7.patch 675 BLAKE2B 76172b7151e30e800ab2210684a02605810b0f15
 AUX pingus-0.7.6-noopengl.patch 315 BLAKE2B 49d2f078506c38d7da57847c6189bf0f9fd0b8a87e80b16fb848f52e37a466111be753f68dc9bf889c66d4ad9a4fea8495fe73b860001d644f2dbb0091b319fe SHA512 f375591892ddecea0659f94ab3d4fc6744625b546fdbc6d80524c25d8ee494163a9b4a90671eed9e7fa2724a1fd91ccde2e80b8ba097c21aa76e0e9fb7e6f4a0
 AUX pingus-0.7.6-python3.patch 553 BLAKE2B aa15a12e8e4d578a91ff1b96aceb51a529595eae59d4f78e80a1b7bd2427a8658fdb9d91e32602d7ab1125b9c3c59538cf47d17ae4eb23bfe23d38b401ef0890 SHA512 5be04a07beddefe33681c6e0cf043e46e514a10665732015ff0ca01be933752f67d5a6161729c72d277ba5a56eb9bd38ab80da3bf0755895d0784196ad349a1c
 DIST pingus-0.7.6.tar.bz2 12622268 BLAKE2B 5ea1bbea7191919897bdedcda06f956d9b6cc0cda2ab11e475ef497ef8ba0c0de5a739ac334e2a5c9a0c138e6bfc44a23363dc59d3e4cfaea2b5388bbe57cc85 SHA512 6c8c2ace1a9229b4e3b506aee76aa94c0dd906a64fa2c817902c2cd3854df390cf675c8c6ddd3ba1926a467348b2103818bd44bc095378cc7bf3f2ff7af27188
-EBUILD pingus-0.7.6-r3.ebuild 1294 BLAKE2B 698a6ea880073fb00fc27f066263d68cf468344403890d5059c123f416339e4df50ebeb112abdc7e479e0be2c2557188b20f275750684887b52b5202fae6e585 SHA512 457f7e79f674089609c023478da04b466221322df1da0624ee2ca0e4bec9598c9ba0a34587de7c01c8f1a56d95b39827a10789bfac328db218e6a2dc2fa5e1ed
-EBUILD pingus-9999.ebuild 635 BLAKE2B a5741a018b2111cc3acd1fb9cc2de193c8e6e5b4454a537b22a212b8b57dbb334dcc711165874f0dbc8a797f8d65593ec4f1274e8ecad2ea43a93b00c1ab6518 SHA512 24a4bc4bbc79636e5baf580de0d224a289ed446b45c0f57d0e7b1a6fadd8fe0606b5b53498eed77bb0ac0eb1875a4a34da837e9340e816b8a8325d184c537e75
-MISC metadata.xml 1284 BLAKE2B b257a0f0fb609be11d197fd7c3837019b961514a13187a983c84f6bfb8ec00cc97ef77dd180cc54394076c19c35afb3712980cef7e8b563fd76d6aaaaa00aa85 SHA512 2be7245d0f08747eab1fbcfa33ca4c7c458b7b4ba0166e2186fde9c3b0864b3256fd5972dca390d6878d50593da59f0bf035fdaf488e19f0f05468bd7145cf67
+EBUILD pingus-0.7.6-r4.ebuild 1265 BLAKE2B 29038ae51f9fe4ddc01578ce69705d9ab02c1efc230c4b0e81198b1358e3d01af4da020ffdb6917a5b452f8525ea07812449d2c41151d2978b499651b16c9382 SHA512 3d500067f7e035349f82f06568aa5656e067b17c70b3ac5c202edebc5efbb3c1c9ee812f63385e572a9e5912ee8dc6dfcd2b3fa6f19971365056a26877ec7e49
+MISC metadata.xml 1286 BLAKE2B 6c7aca31ac2da0d7feaeff587ec61c63871cee36940afc9284d5fdd3f51a1c35cdac756b398dd61f0a9b94d641b952d369499d4373dbeaf9324a09a4f53d8553 SHA512 d75fbc588cf2c18c2fbd0958e80ac5b5048382c15f198181effdbc6d7908a3c93115e3c5aace272cfc1ec232846ddf614823a14a893944c5ce44e543100abaa3
diff --git a/games-puzzle/pingus/metadata.xml b/games-puzzle/pingus/metadata.xml
index 9c99fd275b97..79367cecc54e 100644
--- a/games-puzzle/pingus/metadata.xml
+++ b/games-puzzle/pingus/metadata.xml
@@ -16,7 +16,7 @@ influence them by giving them commands, like build a bridge, dig a hole or redir
 animals in the other direction. The goal of each level is to reach the exit, for fix
 multiple combination of commands are necessary. The game is presented in a 2D site view.</longdescription>
 	<upstream>
-		<remote-id type="google-code">pingus</remote-id>
+		<remote-id type="gitlab">pingus/pingus</remote-id>
 	</upstream>
 	<use>
 		<flag name="music">Enable playing of background music</flag>
diff --git a/games-puzzle/pingus/pingus-0.7.6-r3.ebuild b/games-puzzle/pingus/pingus-0.7.6-r4.ebuild
index 4ab22971d918..3efc2e7eeb36 100644
--- a/games-puzzle/pingus/pingus-0.7.6-r3.ebuild
+++ b/games-puzzle/pingus/pingus-0.7.6-r4.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 inherit desktop flag-o-matic python-any-r1 scons-utils toolchain-funcs xdg
 
 DESCRIPTION="Free Lemmings clone"
@@ -16,13 +16,13 @@ KEYWORDS="~amd64 ~x86"
 IUSE="opengl music"
 
 RDEPEND="
+	dev-libs/boost:=
+	media-libs/libpng:=
 	media-libs/libsdl[joystick,opengl?,video]
 	media-libs/sdl-image[png]
 	media-libs/sdl-mixer
 	music? ( media-libs/sdl-mixer[mod] )
-	opengl? ( virtual/opengl )
-	media-libs/libpng:0=
-	dev-libs/boost:=
+	opengl? ( media-libs/libglvnd[X] )
 "
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
@@ -36,12 +36,8 @@ PATCHES=(
 	"${FILESDIR}"/${P}-python3.patch
 )
 
-src_prepare() {
-	xdg_src_prepare
-	strip-flags
-}
-
 src_compile() {
+	strip-flags
 	escons \
 		CXX="$(tc-getCXX)" \
 		CCFLAGS="${CXXFLAGS}" \
diff --git a/games-puzzle/pingus/pingus-9999.ebuild b/games-puzzle/pingus/pingus-9999.ebuild
deleted file mode 100644
index 86efbe6553a5..000000000000
--- a/games-puzzle/pingus/pingus-9999.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg cmake git-r3
-
-DESCRIPTION="Free Lemmings clone"
-HOMEPAGE="https://pingus.gitlab.io/"
-EGIT_REPO_URI="https://gitlab.com/pingus/pingus.git"
-
-LICENSE="GPL-3+"
-SLOT="0"
-
-RDEPEND="
-	dev-libs/jsoncpp:=
-	dev-libs/libfmt:=
-	dev-libs/libsigc++:2
-	media-libs/libmodplug
-	media-libs/libpng:=
-	media-libs/libsdl2[joystick,opengl,video]
-	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"