From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5BB66158CB7 for ; Thu, 19 Aug 2021 00:39:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AC38DE0845; Thu, 19 Aug 2021 00:39:39 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7BA7AE0845 for ; Thu, 19 Aug 2021 00:39:39 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C8C18340F79 for ; Thu, 19 Aug 2021 00:39:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CA59E8DC for ; Thu, 19 Aug 2021 00:39:33 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1629333550.c84301a2f08f94fe74fac62811cac8fd1749bc6e.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-fps/worldofpadman/, games-fps/worldofpadman/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-fps/worldofpadman/files/worldofpadman-1.6-gentoo.patch games-fps/worldofpadman/worldofpadman-1.6-r1.ebuild X-VCS-Directories: games-fps/worldofpadman/ games-fps/worldofpadman/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: c84301a2f08f94fe74fac62811cac8fd1749bc6e X-VCS-Branch: master Date: Thu, 19 Aug 2021 00:39:33 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 54ff7c0c-f7f2-418a-b89b-7fff33bf1f41 X-Archives-Hash: 5a52f7e392490b813124df19dab5cff1 commit: c84301a2f08f94fe74fac62811cac8fd1749bc6e Author: Sam James gentoo org> AuthorDate: Thu Aug 19 00:37:41 2021 +0000 Commit: Sam James gentoo 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 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 }