public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/proj/guru:master commit in: games-board/rmahjong/
@ 2020-11-10 14:22 Andrew Ammerlaan
  0 siblings, 0 replies; 6+ messages in thread
From: Andrew Ammerlaan @ 2020-11-10 14:22 UTC (permalink / raw
  To: gentoo-commits

commit:     f1037d213c4e152e85658fab6f39696857f59581
Author:     Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru>
AuthorDate: Mon Nov  9 22:18:32 2020 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Mon Nov  9 22:18:32 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=f1037d21

games-board/rmahjong: update Manifest (missed change)

Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru>

 games-board/rmahjong/Manifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-board/rmahjong/Manifest b/games-board/rmahjong/Manifest
index 624f607c..a74ec7ec 100644
--- a/games-board/rmahjong/Manifest
+++ b/games-board/rmahjong/Manifest
@@ -1,2 +1,2 @@
 DIST kmahjongg_rmahjong.png 3816 BLAKE2B 8029e6c3f4eddff9d3593ad7d5615860cd3b9d9bc4b067145e2d191b8fec00f934f3752adec32db11eb7f3e31eba7d4586a2c2f005de4ded8555ec73a4f2f81f SHA512 49cb371b1260aa23bb7b341247047cf7abc59487fd75cc365c2c6f77588af7a83dfed73d7fc1845edcedb8a9b6810ac39dbecff065c3799e3fcc7195df84e67c
-DIST rmahjong-0.4_p20201013.tar.gz 1399540 BLAKE2B 9dd1c40fea7c2d93e33a7bea0e1b66912eb547c64b45bbeadd95e4234380786551005cec8bf5edc1a7e8b135e5a66b2af80b4f22d257e14aa7068ff9959cee64 SHA512 9eface62972abe37753c380af713e168d39e23f6031af08d735467669b2dd0cbe5dec40eb9e750fff675a054791a58cfad710266229c966d94c190990f63c466
+DIST rmahjong-0.4_p20201106.tar.gz 1399585 BLAKE2B c5b63e6b149945cece8d1a4bfc99b468876979161f2461b36acb8db7a5f6292a4d1e7f97079319f3b71fa32804d6135a83e102fd870f3cd86556e45c75b532fb SHA512 d311b025eb7d35e4523f139c8a0703c894b730b2da3a173930f5eeb36e7f7a9889b4caf8ccaa8b1683f10b47461c608ae49a0ba0657bb58bf8cb55f8ba66ed38


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/proj/guru:master commit in: games-board/rmahjong/
@ 2021-04-24 23:19 Theo Anderson
  0 siblings, 0 replies; 6+ messages in thread
From: Theo Anderson @ 2021-04-24 23:19 UTC (permalink / raw
  To: gentoo-commits

commit:     ed101e00ee873d95f0d01b2d637dff8e22c8c86e
Author:     Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru>
AuthorDate: Sat Apr 24 10:26:01 2021 +0000
Commit:     Theo Anderson <telans <AT> posteo <DOT> de>
CommitDate: Sat Apr 24 10:30:23 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ed101e00

games-board/rmahjong: fix bot install path; fix exec permissions

The bot file is installed wrong path since fix module installation.
Without shell-scripts and bot exec permissions app doesn't start.

Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru>

 games-board/rmahjong/rmahjong-0.4_p20201106.ebuild | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/games-board/rmahjong/rmahjong-0.4_p20201106.ebuild b/games-board/rmahjong/rmahjong-0.4_p20201106.ebuild
index 4453adf3c..a8a3e6da8 100644
--- a/games-board/rmahjong/rmahjong-0.4_p20201106.ebuild
+++ b/games-board/rmahjong/rmahjong-0.4_p20201106.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit desktop python-single-r1 xdg
 
@@ -62,9 +62,12 @@ src_test() {
 src_install() {
 	python_moduleinto ${PN}
 	python_domodule {client/,server/,start.sh}
+	fperms 755 $(python_get_sitedir)/${PN}/start.sh
+	fperms 755 $(python_get_sitedir)/${PN}/server/run_server.sh
 
-	python_moduleinto bot
-	python_domodule "bot/bot"
+	python_moduleinto ${PN}/bot
+	python_domodule bot/bot
+	fperms 755 $(python_get_sitedir)/${PN}/bot/bot
 
 	python_optimize "${D}/$(python_get_sitedir)/${PN}/"{client,server}/*.py
 


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/proj/guru:master commit in: games-board/rmahjong/
@ 2021-04-24 23:19 Theo Anderson
  0 siblings, 0 replies; 6+ messages in thread
From: Theo Anderson @ 2021-04-24 23:19 UTC (permalink / raw
  To: gentoo-commits

commit:     fbbfb65d28b9e7889b4615973cdc886787798561
Author:     Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru>
AuthorDate: Sat Apr 24 10:32:34 2021 +0000
Commit:     Theo Anderson <telans <AT> posteo <DOT> de>
CommitDate: Sat Apr 24 10:32:34 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=fbbfb65d

games-board/rmahjong: fix pass system CC and CFLAGS

Closes: https://bugs.gentoo.org/785019
Closes: https://bugs.gentoo.org/780966

Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru>

 games-board/rmahjong/rmahjong-0.4_p20201106.ebuild | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/games-board/rmahjong/rmahjong-0.4_p20201106.ebuild b/games-board/rmahjong/rmahjong-0.4_p20201106.ebuild
index a8a3e6da8..c05893d27 100644
--- a/games-board/rmahjong/rmahjong-0.4_p20201106.ebuild
+++ b/games-board/rmahjong/rmahjong-0.4_p20201106.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{7..9} )
 
-inherit desktop python-single-r1 xdg
+inherit desktop python-single-r1 toolchain-funcs xdg
 
 # Tarball from py3 port branch:
 # https://github.com/spirali/rmahjong/tree/py3
@@ -48,6 +48,10 @@ src_prepare(){
 	sed -i "/logging.info/d" "${S}/server/server.py" || die
 
 	echo $'#!/bin/sh\ncd '"$(python_get_sitedir)/${PN}"' && ./start.sh' > "${S}/rmahjong"
+
+	# pass compiler and CFLAGS to 'Bot' makefile
+	sed -i -e 's:gcc:'"$(tc-getCC)"':g' bot/makefile \
+		-e 's:CFLAGS=-Wall -O3 -march=native:CFLAGS='"${CFLAGS}"':'|| die
 }
 
 src_compile() {


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/proj/guru:master commit in: games-board/rmahjong/
@ 2021-04-25 20:28 Andrew Ammerlaan
  0 siblings, 0 replies; 6+ messages in thread
From: Andrew Ammerlaan @ 2021-04-25 20:28 UTC (permalink / raw
  To: gentoo-commits

commit:     270ab7dc299f649b2bab7339c8eb4a169d901060
Author:     Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru>
AuthorDate: Sun Apr 25 12:20:45 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Sun Apr 25 12:20:45 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=270ab7dc

games-board/rmahjong: fix passing system LDFLAGS

Closes: https://bugs.gentoo.org/785526

Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru>

 games-board/rmahjong/rmahjong-0.4_p20201106.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/games-board/rmahjong/rmahjong-0.4_p20201106.ebuild b/games-board/rmahjong/rmahjong-0.4_p20201106.ebuild
index c05893d27..0e87d3710 100644
--- a/games-board/rmahjong/rmahjong-0.4_p20201106.ebuild
+++ b/games-board/rmahjong/rmahjong-0.4_p20201106.ebuild
@@ -51,7 +51,8 @@ src_prepare(){
 
 	# pass compiler and CFLAGS to 'Bot' makefile
 	sed -i -e 's:gcc:'"$(tc-getCC)"':g' bot/makefile \
-		-e 's:CFLAGS=-Wall -O3 -march=native:CFLAGS='"${CFLAGS}"':'|| die
+		-e 's:CFLAGS=-Wall -O3 -march=native:CFLAGS='"${CFLAGS}"':' \
+		-e 's:\$(ARG):\$(ARG) '"${LDFLAGS}"':' || die
 }
 
 src_compile() {


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/proj/guru:master commit in: games-board/rmahjong/
@ 2022-02-13 20:24 Arthur Zamarin
  0 siblings, 0 replies; 6+ messages in thread
From: Arthur Zamarin @ 2022-02-13 20:24 UTC (permalink / raw
  To: gentoo-commits

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() {


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/proj/guru:master commit in: games-board/rmahjong/
@ 2024-04-18 21:26 Julien Roy
  0 siblings, 0 replies; 6+ messages in thread
From: Julien Roy @ 2024-04-18 21:26 UTC (permalink / raw
  To: gentoo-commits

commit:     efd57955d6243b5839c3edd951383114a444d43c
Author:     Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru>
AuthorDate: Thu Apr 18 20:05:52 2024 +0000
Commit:     Julien Roy <julien <AT> jroy <DOT> ca>
CommitDate: Thu Apr 18 20:05:52 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=efd57955

games-board/rmahjong: enable py3.12

Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru>

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

diff --git a/games-board/rmahjong/rmahjong-0.4_p20201106.ebuild b/games-board/rmahjong/rmahjong-0.4_p20201106.ebuild
index 2a02080965..e64fb3bc65 100644
--- a/games-board/rmahjong/rmahjong-0.4_p20201106.ebuild
+++ b/games-board/rmahjong/rmahjong-0.4_p20201106.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit desktop python-single-r1 toolchain-funcs xdg
 
@@ -20,15 +20,15 @@ SRC_URI="
 	https://github.com/spirali/${PN}/archive/${PKG_sha}.tar.gz -> ${P}.tar.gz
 	https://github.com/KDE/kmahjongg/raw/master/icons/48-apps-kmahjongg.png -> kmahjongg_${PN}.png"
 
+S="${WORKDIR}/${PN}-${PKG_sha}"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 IUSE="test"
-RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-S="${WORKDIR}/${PN}-${PKG_sha}"
+RESTRICT="mirror !test? ( test )"
 
 RDEPEND="
 	${PYTHON_DEPS}


^ permalink raw reply related	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2024-04-18 21:26 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-04-24 23:19 [gentoo-commits] repo/proj/guru:master commit in: games-board/rmahjong/ Theo Anderson
  -- strict thread matches above, loose matches on Subject: below --
2024-04-18 21:26 Julien Roy
2022-02-13 20:24 Arthur Zamarin
2021-04-25 20:28 Andrew Ammerlaan
2021-04-24 23:19 Theo Anderson
2020-11-10 14:22 Andrew Ammerlaan

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox