[gentoo-commits] repo/proj/guru:dev commit in: games-board/rmahjong/

["Arthur Zamarin" <arthurzam@gentoo.org>]

commit:     5cb6039ba2075a60a8c88968678f75b9b1c58c18
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 13 20:18:15 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sun Feb 13 20:18:33 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=5cb6039b

games-board/rmahjong: fix python usedep variable, small cleanup

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 games-board/rmahjong/rmahjong-0.4_p20201106.ebuild | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/games-board/rmahjong/rmahjong-0.4_p20201106.ebuild b/games-board/rmahjong/rmahjong-0.4_p20201106.ebuild
index 28a3c2288..266c5a722 100644
--- a/games-board/rmahjong/rmahjong-0.4_p20201106.ebuild
+++ b/games-board/rmahjong/rmahjong-0.4_p20201106.ebuild
@@ -34,8 +34,8 @@ RDEPEND="
 	${PYTHON_DEPS}
 	dev-python/pygame[X,opengl]
 	$(python_gen_cond_dep '
-		dev-python/pygame[${PYTHON_MULTI_USEDEP}]
-		dev-python/pyopengl[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygame[${PYTHON_USEDEP}]
+		dev-python/pyopengl[${PYTHON_USEDEP}]
 	')
 "
 
@@ -47,7 +47,10 @@ src_prepare(){
 	sed -i "/logging.basicConfig/d" "${S}/server/server.py" || die
 	sed -i "/logging.info/d" "${S}/server/server.py" || die
 
-	echo $'#!/bin/sh\ncd '"$(python_get_sitedir)/${PN}"' && ./start.sh' > "${S}/rmahjong"
+	cat > "${S}/rmahjong" <<- EOF || die
+		#!/bin/sh
+		cd "$(python_get_sitedir)/${PN}" && ./start.sh
+	EOF
 
 	# pass compiler and CFLAGS to 'Bot' makefile
 	sed -i -e 's:gcc:'"$(tc-getCC)"':g' bot/makefile \
@@ -57,11 +60,13 @@ src_prepare(){
 
 src_compile() {
 	# Build bots
-	cd "${S}/bot/" && emake
+	cd "${S}/bot/" || die
+	emake
 }
 
 src_test() {
-	cd "${S}/server/" && python3 test.py -v
+	cd "${S}/server/" || die
+	"${EPYTHON}" test.py -v || die
 }
 
 src_install() {