[gentoo-commits] repo/proj/guru:master commit in: games-action/ddnet/

[Florian Schmaus]

commit:     a73f510049e0053fce7184684e1a952452d173b2
Author:     Edgar Luque <edgar <AT> edgarluque <DOT> com>
AuthorDate: Sun Mar  5 14:12:55 2023 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Sun Mar  5 14:12:55 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=a73f5100

games-action/ddnet: add 16.7.2-r1, drop ddnet-16.7.2, fix deps

Signed-off-by: Edgar Luque <edgar <AT> edgarluque.com>

 .../ddnet/{ddnet-16.7.2.ebuild => ddnet-16.7.2-r1.ebuild}  | 14 +++++---------
 games-action/ddnet/ddnet-9999.ebuild                       | 14 +++++---------
 2 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/games-action/ddnet/ddnet-16.7.2.ebuild 
b/games-action/ddnet/ddnet-16.7.2-r1.ebuild
similarity index 91%
rename from games-action/ddnet/ddnet-16.7.2.ebuild
rename to games-action/ddnet/ddnet-16.7.2-r1.ebuild
index 449e24ac0..4b3da8145 100644
--- a/games-action/ddnet/ddnet-16.7.2.ebuild
+++ b/games-action/ddnet/ddnet-16.7.2-r1.ebuild
@@ -38,19 +38,19 @@ DEPEND="
                media-libs/libsdl2
                media-libs/opus
                media-libs/opusfile
-               media-libs/pnglite
+               media-libs/libpng
+               media-libs/x264
+               media-sound/wavpack
+               x11-libs/libnotify
                videorecorder? ( media-video/ffmpeg )
        )
-       dev-libs/glib
+       sys-libs/zlib
        dev-libs/openssl
        dev-db/sqlite
        download-gtest? (
                dev-cpp/gtest
                dev-vcs/git
        )
-       media-libs/libglvnd
-       media-libs/libpng
-       media-sound/wavpack
        net-misc/curl
        upnp? ( net-libs/miniupnpc )
        vulkan? (
@@ -58,9 +58,6 @@ DEPEND="
                media-libs/libsdl2[vulkan]
        )
        websockets? ( net-libs/libwebsockets[client] )
-       x11-libs/gdk-pixbuf
-       x11-libs/libnotify
-       <=x11-libs/libX11-1.8.2
 "
 RDEPEND="${DEPEND}"
 BDEPEND="
@@ -68,7 +65,6 @@ BDEPEND="
        dev-util/cmake
        dev-util/glslang
        dev-util/spirv-tools
-       media-libs/x264
 "
 
 src_unpack() {

diff --git a/games-action/ddnet/ddnet-9999.ebuild 
b/games-action/ddnet/ddnet-9999.ebuild
index 2f3dd8c1b..1888b1ecc 100644
--- a/games-action/ddnet/ddnet-9999.ebuild
+++ b/games-action/ddnet/ddnet-9999.ebuild
@@ -31,19 +31,18 @@ DEPEND="
                media-libs/libsdl2
                media-libs/opus
                media-libs/opusfile
-               media-libs/pnglite
+               media-libs/libpng
+               media-libs/x264
+               media-sound/wavpack
+               x11-libs/libnotify
                videorecorder? ( media-video/ffmpeg )
        )
-       dev-libs/glib
        dev-libs/openssl
        dev-db/sqlite
        download-gtest? (
                dev-cpp/gtest
                dev-vcs/git
        )
-       media-libs/libglvnd
-       media-libs/libpng
-       media-sound/wavpack
        net-misc/curl
        upnp? ( net-libs/miniupnpc )
        vulkan? (
@@ -51,9 +50,6 @@ DEPEND="
                media-libs/libsdl2[vulkan]
        )
        websockets? ( net-libs/libwebsockets[client] )
-       x11-libs/gdk-pixbuf
-       x11-libs/libnotify
-       <=x11-libs/libX11-1.8.2
 "
 RDEPEND="${DEPEND}"
 BDEPEND="
@@ -61,7 +57,6 @@ BDEPEND="
        dev-util/cmake
        dev-util/glslang
        dev-util/spirv-tools
-       media-libs/x264
 "
 
 src_unpack() {
@@ -87,6 +82,7 @@ src_configure(){
                -DVIDEORECORDER=$(usex videorecorder ON OFF)
                -DVULKAN=$(usex vulkan ON OFF)
                -DWEBSOCKETS=$(usex websockets ON OFF)
+               -DSECURITY_COMPILER_FLAGS=OFF # Set by gentoo toolchain, see 
https://bugs.gentoo.org/888875
        )
        cmake_src_configure
 }