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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9343815808B for ; Sun, 13 Feb 2022 20:18:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D688BE0909; Sun, 13 Feb 2022 20:18:38 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BF9C8E0909 for ; Sun, 13 Feb 2022 20:18:38 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EBF51342E33 for ; Sun, 13 Feb 2022 20:18:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 54EF5272 for ; Sun, 13 Feb 2022 20:18:36 +0000 (UTC) From: "Arthur Zamarin" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Arthur Zamarin" Message-ID: <1644783513.5cb6039ba2075a60a8c88968678f75b9b1c58c18.arthurzam@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: games-board/rmahjong/ X-VCS-Repository: repo/proj/guru X-VCS-Files: games-board/rmahjong/rmahjong-0.4_p20201106.ebuild X-VCS-Directories: games-board/rmahjong/ X-VCS-Committer: arthurzam X-VCS-Committer-Name: Arthur Zamarin X-VCS-Revision: 5cb6039ba2075a60a8c88968678f75b9b1c58c18 X-VCS-Branch: dev Date: Sun, 13 Feb 2022 20:18:36 +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: 396b79c2-9eda-40c4-8abf-8283c0f49f76 X-Archives-Hash: 4cff3cfc6086279817a54117aa996547 Message-ID: <20220213201836.8uOSTz-nFSXmcZSdJetX71NOvkRq7bIs_YEvIDT5e3Q@z> commit: 5cb6039ba2075a60a8c88968678f75b9b1c58c18 Author: Arthur Zamarin gentoo org> AuthorDate: Sun Feb 13 20:18:15 2022 +0000 Commit: Arthur Zamarin gentoo 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 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() {