commit:     c84301a2f08f94fe74fac62811cac8fd1749bc6e
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 19 00:37:41 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Aug 19 00:39:10 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c84301a2

games-fps/worldofpadman: update EAPI 6 -> 7, add libsdl[joystick] dependency

Closes: https://bugs.gentoo.org/808831
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../worldofpadman/files/worldofpadman-1.6-gentoo.patch |  4 ++--
 games-fps/worldofpadman/worldofpadman-1.6-r1.ebuild    | 18 ++++++++++--------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/games-fps/worldofpadman/files/worldofpadman-1.6-gentoo.patch 
b/games-fps/worldofpadman/files/worldofpadman-1.6-gentoo.patch
index d55e43ffcf5..a8b46098eb7 100644
--- a/games-fps/worldofpadman/files/worldofpadman-1.6-gentoo.patch
+++ b/games-fps/worldofpadman/files/worldofpadman-1.6-gentoo.patch
@@ -1,5 +1,5 @@
---- a/Makefile.old     2012-04-26 21:40:25.277417417 +0200
-+++ b/Makefile 2012-04-26 21:43:34.300835150 +0200
+--- a/Makefile
++++ b/Makefile
 @@ -344,11 +344,11 @@
    endif
    

diff --git a/games-fps/worldofpadman/worldofpadman-1.6-r1.ebuild 
b/games-fps/worldofpadman/worldofpadman-1.6-r1.ebuild
index 523ca7b597b..a958dfcfe87 100644
--- a/games-fps/worldofpadman/worldofpadman-1.6-r1.ebuild
+++ b/games-fps/worldofpadman/worldofpadman-1.6-r1.ebuild
@@ -1,13 +1,15 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 inherit desktop
 
 DESCRIPTION="A cartoon style multiplayer first-person shooter"
 HOMEPAGE="https://worldofpadman.net/";
 SRC_URI="mirror://sourceforge/${PN}/wop-1.5-unified.zip
        mirror://sourceforge/${PN}/wop-1.5.x-to-1.6-patch-unified.zip"
+S="${WORKDIR}/${P}_svn2178-src"
 
 LICENSE="GPL-2 worldofpadman"
 SLOT="0"
@@ -19,7 +21,7 @@ RDEPEND="sys-libs/zlib
                >=media-libs/speex-1.2.0
                media-libs/speexdsp
                virtual/jpeg:0
-               media-libs/libsdl[opengl,video,X]
+               media-libs/libsdl[joystick,opengl,video,X]
                virtual/opengl
                virtual/glu
                openal? ( media-libs/openal )
@@ -31,11 +33,8 @@ RDEPEND="sys-libs/zlib
                )
        )
 "
-DEPEND="${RDEPEND}
-       app-arch/unzip
-"
-
-S="${WORKDIR}/${P}_svn2178-src"
+DEPEND="${RDEPEND}"
+BDEPEND="app-arch/unzip"
 
 src_unpack() {
        unpack ${A}
@@ -79,11 +78,13 @@ src_compile() {
 
 src_install() {
        newbin build/release-*/wopded.* ${PN}-ded
+
        if ! use dedicated ; then
                newbin build/release-*/wop.* ${PN}
                newicon misc/quake3.png ${PN}.png
                make_desktop_entry ${PN} "World of Padman"
        fi
+
        insinto /usr/share/${PN}
        doins -r ../wop
 
@@ -92,5 +93,6 @@ src_install() {
                voip-readme.txt \
                ../XTRAS/changelog.txt \
                ../XTRAS/sounds_readme.txt
+
        HTML_DOCS="../XTRAS/readme ../XTRAS/readme.html" einstalldocs
 }

Reply via email to