From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1313957-garchives=archives.gentoo.org@lists.gentoo.org> 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 3E66E158CB7 for <garchives@archives.gentoo.org>; Thu, 19 Aug 2021 00:39:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1F6B6E0826; Thu, 19 Aug 2021 00:39:36 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 05AB8E0828 for <gentoo-commits@lists.gentoo.org>; Thu, 19 Aug 2021 00:39:35 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 61002340FFC for <gentoo-commits@lists.gentoo.org>; Thu, 19 Aug 2021 00:39:34 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D552D8C3 for <gentoo-commits@lists.gentoo.org>; Thu, 19 Aug 2021 00:39:32 +0000 (UTC) From: "Sam James" <sam@gentoo.org> 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" <sam@gentoo.org> Message-ID: <1629333538.2cc8300fe0b1887194c6c4ce26d48f1fb3c5525a.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-arcade/openmortal/files/, games-arcade/openmortal/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-arcade/openmortal/files/openmortal-0.7-freetype.patch games-arcade/openmortal/files/openmortal-0.7-freetype_pkgconfig.patch games-arcade/openmortal/files/openmortal-0.7-gcc41.patch games-arcade/openmortal/openmortal-0.7-r2.ebuild X-VCS-Directories: games-arcade/openmortal/ games-arcade/openmortal/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 2cc8300fe0b1887194c6c4ce26d48f1fb3c5525a X-VCS-Branch: master Date: Thu, 19 Aug 2021 00:39:32 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 753a7467-0af4-4b66-89d7-48e5be96f88d X-Archives-Hash: 8bf1c632dc879f4ae3f4edbaf1776299 commit: 2cc8300fe0b1887194c6c4ce26d48f1fb3c5525a Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Thu Aug 19 00:12:06 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Aug 19 00:38:58 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2cc8300f games-arcade/openmortal: update EAPI 6 -> 7, add libsdl2[joystick] dep Closes: https://bugs.gentoo.org/742518 Signed-off-by: Sam James <sam <AT> gentoo.org> .../openmortal/files/openmortal-0.7-freetype.patch | 4 ++-- .../files/openmortal-0.7-freetype_pkgconfig.patch | 4 ++-- .../openmortal/files/openmortal-0.7-gcc41.patch | 2 +- games-arcade/openmortal/openmortal-0.7-r2.ebuild | 20 ++++++++++++-------- 4 files changed, 17 insertions(+), 13 deletions(-) diff --git a/games-arcade/openmortal/files/openmortal-0.7-freetype.patch b/games-arcade/openmortal/files/openmortal-0.7-freetype.patch index 3a342c88979..2c545edc1d1 100644 --- a/games-arcade/openmortal/files/openmortal-0.7-freetype.patch +++ b/games-arcade/openmortal/files/openmortal-0.7-freetype.patch @@ -1,5 +1,5 @@ ---- openmortal-0.7/src/sge_tt_text.cpp.old -+++ openmortal-0.7/src/sge_tt_text.cpp +--- a/src/sge_tt_text.cpp ++++ b/src/sge_tt_text.cpp @@ -37,9 +37,9 @@ #ifndef _SGE_NOTTF diff --git a/games-arcade/openmortal/files/openmortal-0.7-freetype_pkgconfig.patch b/games-arcade/openmortal/files/openmortal-0.7-freetype_pkgconfig.patch index fe683899f2e..cde67a66e10 100644 --- a/games-arcade/openmortal/files/openmortal-0.7-freetype_pkgconfig.patch +++ b/games-arcade/openmortal/files/openmortal-0.7-freetype_pkgconfig.patch @@ -1,5 +1,5 @@ ---- openmortal-0.7/configure.in -+++ openmortal-0.7/configure.in +--- a/configure.in ++++ b/configure.in @@ -25,6 +25,7 @@ AC_C_CONST AC_PROG_CXX diff --git a/games-arcade/openmortal/files/openmortal-0.7-gcc41.patch b/games-arcade/openmortal/files/openmortal-0.7-gcc41.patch index 2620c153e83..888a06868d0 100644 --- a/games-arcade/openmortal/files/openmortal-0.7-gcc41.patch +++ b/games-arcade/openmortal/files/openmortal-0.7-gcc41.patch @@ -1,4 +1,4 @@ ---- a/src/OnlineChat.cpp.old +--- a/src/OnlineChat.cpp +++ b/src/OnlineChat.cpp @@ -56,7 +56,7 @@ class CChallengeMenu: public Menu diff --git a/games-arcade/openmortal/openmortal-0.7-r2.ebuild b/games-arcade/openmortal/openmortal-0.7-r2.ebuild index 6e1e3a824af..1c6c8ce1d1b 100644 --- a/games-arcade/openmortal/openmortal-0.7-r2.ebuild +++ b/games-arcade/openmortal/openmortal-0.7-r2.ebuild @@ -1,7 +1,8 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 + inherit autotools desktop DESCRIPTION="A spoof of the famous Mortal Kombat game" @@ -11,7 +12,6 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" RDEPEND="media-libs/libsdl[video] media-libs/sdl-image @@ -21,21 +21,25 @@ RDEPEND="media-libs/libsdl[video] >=media-libs/freetype-2.4.0:2 dev-lang/perl " -DEPEND="${RDEPEND} - virtual/pkgconfig" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}/${P}"-gcc41.patch + "${FILESDIR}/${P}"-freetype.patch + "${FILESDIR}/${P}"-freetype_pkgconfig.patch +) src_prepare() { default - eapply \ - "${FILESDIR}/${P}"-gcc41.patch \ - "${FILESDIR}/${P}"-freetype.patch \ - "${FILESDIR}/${P}"-freetype_pkgconfig.patch + mv configure.{in,ac} || die eautoreconf } src_install() { default + newicon data/gfx/icon.png ${PN}.png make_desktop_entry ${PN} OpenMortal }