[gentoo-commits] repo/gentoo:master commit in: games-rpg/adonthell/files/, games-rpg/adonthell/

[gentoo-commits] repo/gentoo:master commit in: games-rpg/adonthell/files/, games-rpg/adonthell/

[James Le Cuirot]

commit:     24ab5599bcad574f7d3c89bbc2cbb0d371b434a6
Author:     Alexey Sokolov <sokolov <AT> google <DOT> com>
AuthorDate: Sat Oct 17 22:54:32 2020 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Thu Oct 22 21:18:19 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24ab5599

games-rpg/adonthell: don't call ar directly

Closes: https://bugs.gentoo.org/746095
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org>
Closes: https://github.com/gentoo/gentoo/pull/17961
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 games-rpg/adonthell/adonthell-0.3.8.ebuild         | 11 ++++++++++-
 games-rpg/adonthell/files/adonthell-0.3.8-ar.patch | 11 +++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/games-rpg/adonthell/adonthell-0.3.8.ebuild b/games-rpg/adonthell/adonthell-0.3.8.ebuild
index ee5853868fc..5407912c96c 100644
--- a/games-rpg/adonthell/adonthell-0.3.8.ebuild
+++ b/games-rpg/adonthell/adonthell-0.3.8.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 PYTHON_COMPAT=( python3_{6,7,8} )
 
-inherit python-single-r1
+inherit autotools python-single-r1
 
 DESCRIPTION="Roleplaying game engine"
 HOMEPAGE="http://adonthell.nongnu.org/"
@@ -37,6 +37,15 @@ BDEPEND="
 
 DOCS=( AUTHORS NEWBIE NEWS README )
 
+PATCHES=(
+	"${FILESDIR}/${P}-ar.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
 pkg_setup() {
 	python-single-r1_pkg_setup
 }

diff --git a/games-rpg/adonthell/files/adonthell-0.3.8-ar.patch b/games-rpg/adonthell/files/adonthell-0.3.8-ar.patch
new file mode 100644
index 00000000000..2b2e34d62c7
--- /dev/null
+++ b/games-rpg/adonthell/files/adonthell-0.3.8-ar.patch
@@ -0,0 +1,11 @@
+diff -r b3fec744fc29 configure.ac
+--- a/configure.ac	Sat Oct 17 22:39:45 2020 +0000
++++ b/configure.ac	Sat Oct 17 22:40:17 2020 +0000
+@@ -26,6 +26,7 @@
+ AC_PROG_CXXCPP
+ AC_PROG_MAKE_SET
+ AC_PROG_RANLIB
++AM_PROG_AR
+ 
+ dnl ****
+ dnl i18n

[gentoo-commits] repo/gentoo:master commit in: games-rpg/adonthell/files/, games-rpg/adonthell/

[Ionen Wolkens]

commit:     47c12dd527ebeccfc2d454efb584c7177f3eaaf9
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 12 02:21:55 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sat Feb 12 03:05:19 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47c12dd5

games-rpg/adonthell: enable py3.10

Turns out enabling py3.10 on this was simpler than it looked.
Unsure if entirely fine, but games-rpg/wastesedge seems to work.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-rpg/adonthell/adonthell-0.3.8.ebuild                 | 8 ++++----
 games-rpg/adonthell/files/adonthell-0.3.8-python3.10.patch | 7 +++++++
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/games-rpg/adonthell/adonthell-0.3.8.ebuild b/games-rpg/adonthell/adonthell-0.3.8.ebuild
index 55a6d24270f2..4a48d53e89f0 100644
--- a/games-rpg/adonthell/adonthell-0.3.8.ebuild
+++ b/games-rpg/adonthell/adonthell-0.3.8.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8,9} )
-
+PYTHON_COMPAT=( python3_{8..10} )
 inherit autotools python-single-r1
 
 DESCRIPTION="Roleplaying game engine"
@@ -39,7 +38,8 @@ BDEPEND="
 DOCS=( AUTHORS NEWBIE NEWS README )
 
 PATCHES=(
-	"${FILESDIR}/${P}-ar.patch"
+	"${FILESDIR}"/${P}-ar.patch
+	"${FILESDIR}"/${P}-python3.10.patch
 )
 
 src_prepare() {

diff --git a/games-rpg/adonthell/files/adonthell-0.3.8-python3.10.patch b/games-rpg/adonthell/files/adonthell-0.3.8-python3.10.patch
new file mode 100644
index 000000000000..21bba839a271
--- /dev/null
+++ b/games-rpg/adonthell/files/adonthell-0.3.8-python3.10.patch
@@ -0,0 +1,7 @@
+node.h was removed in python3.10 but this does not actually use it
+--- a/src/python_class.h
++++ b/src/python_class.h
+@@ -38,3 +38,2 @@
+ #include "eval.h"
+-#include "node.h"
+ #include "fileops.h"