[gentoo-commits] repo/gentoo:master commit in: games-action/rrootage/, games-action/rrootage/files/

[gentoo-commits] repo/gentoo:master commit in: games-action/rrootage/, games-action/rrootage/files/

[Sam James]

commit:     2a5c0c46e3051cc42c3299eae20fb77ce6d10e7e
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 19 00:34:54 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Aug 19 00:39:08 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a5c0c46

games-action/rrootage: respect CC/CXX, fix libsdl[joystick] dependency

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

 games-action/rrootage/files/rrootage-0.23a-gcc41.patch       |  8 ++++----
 .../{rrootage-0.23a-r1.ebuild => rrootage-0.23a-r2.ebuild}   | 12 +++++++-----
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/games-action/rrootage/files/rrootage-0.23a-gcc41.patch b/games-action/rrootage/files/rrootage-0.23a-gcc41.patch
index 1e6e50e683f..00926f9b75d 100644
--- a/games-action/rrootage/files/rrootage-0.23a-gcc41.patch
+++ b/games-action/rrootage/files/rrootage-0.23a-gcc41.patch
@@ -1,5 +1,5 @@
---- src/foecommand.h.old	2006-04-21 23:26:03.000000000 +0200
-+++ src/foecommand.h	2006-04-21 23:26:26.000000000 +0200
+--- a/foecommand.h
++++ b/foecommand.h
 @@ -39,10 +39,10 @@
    
    virtual void doChangeDirection(double d);
@@ -15,8 +15,8 @@
    
   private:
    struct foe *foe;
---- src/screen.c.old	2006-04-21 23:50:01.000000000 +0200
-+++ src/screen.c	2006-04-21 23:50:30.000000000 +0200
+--- a/screen.c
++++ b/screen.c
 @@ -73,7 +73,7 @@
  void loadGLTexture(char *fileName, GLuint *texture) {
    SDL_Surface *surface;

diff --git a/games-action/rrootage/rrootage-0.23a-r1.ebuild b/games-action/rrootage/rrootage-0.23a-r2.ebuild
similarity index 92%
rename from games-action/rrootage/rrootage-0.23a-r1.ebuild
rename to games-action/rrootage/rrootage-0.23a-r2.ebuild
index 7fbee7b1a76..0defc88d532 100644
--- a/games-action/rrootage/rrootage-0.23a-r1.ebuild
+++ b/games-action/rrootage/rrootage-0.23a-r2.ebuild
@@ -1,7 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
+inherit toolchain-funcs
 
 MY_PN="rRootage"
 MY_P="${MY_PN}-${PV}"
@@ -9,11 +11,11 @@ DESCRIPTION="Abstract shooter - defeat auto-created huge battleships"
 HOMEPAGE="http://www.asahi-net.or.jp/~cs8k-cyu/windows/rr_e.html
 	http://rrootage.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+S="${WORKDIR}"/${MY_PN}/src
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 DEPEND="
 	>=dev-libs/libbulletml-0.0.3
@@ -21,9 +23,7 @@ DEPEND="
 	media-libs/sdl-mixer[vorbis]
 	virtual/glu
 	virtual/opengl"
-RDEPEND=${DEPEND}
-
-S=${WORKDIR}/${MY_PN}/src
+RDEPEND="${DEPEND}"
 
 PATCHES=(
 	"${FILESDIR}/${P}"-gcc41.patch
@@ -50,6 +50,8 @@ src_prepare() {
 
 src_compile() {
 	emake \
+		CC=$(tc-getCC) \
+		CXX=$(tc-getCXX) \
 		MORE_CFLAGS="-DLINUX ${CFLAGS}" \
 		MORE_CXXFLAGS="-DLINUX ${CXXFLAGS}"
 }