public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: games-arcade/openmortal/files/, games-arcade/openmortal/
Date: Thu, 19 Aug 2021 00:39:32 +0000 (UTC)	[thread overview]
Message-ID: <1629333538.2cc8300fe0b1887194c6c4ce26d48f1fb3c5525a.sam@gentoo> (raw)

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
 }


             reply	other threads:[~2021-08-19  0:39 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-08-19  0:39 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2018-05-07  9:13 [gentoo-commits] repo/gentoo:master commit in: games-arcade/openmortal/files/, games-arcade/openmortal/ Lars Wendler
2015-10-11  5:43 Michael Sterrett

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1629333538.2cc8300fe0b1887194c6c4ce26d48f1fb3c5525a.sam@gentoo \
    --to=sam@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox