gentoo resync : 25.11.2020

8 files changed, 32 insertions, 196 deletions

diff --git a/games-rpg/adonthell/Manifest b/games-rpg/adonthell/Manifest
index d1bff342358c..3e7bea19d086 100644
--- a/games-rpg/adonthell/Manifest
+++ b/games-rpg/adonthell/Manifest
@@ -1,8 +1,4 @@
-AUX adonthell-0.3.5-configure.in.patch 3314 BLAKE2B 8361ee19dae579666d6adc585a6ac3da1b0059fdf70f446c0db9a75ee34df86f26f781624ed736f1b23c598e30359b2a6d4e006fb7da9b619c51ed9ad7518cd9 SHA512 4bd82920dac28c28b96b4ec0e5251c3627a3284ebe6e55eb889e542494ba44b13de8e24210b229e9f37f2259c941743792133d0e9a4b91219b6dc366584d16ed
-AUX adonthell-0.3.5-format.patch 320 BLAKE2B c73d15a7aefc3b15df17740c3db7bfa9eabf0d5e322cf5db040d1a202c8a17b5fed6e485815a797eca3b1a98fce1c05d893c5c61231cb38196d6efacf5a1e2d0 SHA512 901d0cc307b1fbf78708a2d6cd8e6d6284ee66c9ac23bed64b1bd0685bc5adc113a8816bca80c44999d5558e6b6e635bd58c1d1894d8e8631fa97da6309b554f
-AUX adonthell-0.3.5-freetype_pkgconfig.patch 422 BLAKE2B 302dd008224d1e5a48bbd7a450c0b9dfcf533c3e75dfdcf5b170a91c16ad27c23553484ad652dfbbbc623ca7bd40fa55ed690b1a43093b2dd1545dd4bc95c1f8 SHA512 027d2b6ddd9448e305b5a2fea80a345d9af578fe37361501e8653e9647acb4b046887438f8dee7c2c38c371f6b001e3d2fcb0662e61d049876c4425954af4bcf
-AUX adonthell-0.3.5-gcc46.patch 432 BLAKE2B 66706aea9dbcd8827dd3a7054242066a49546e742ff3c2b8edc6262a786230f1269cb1f7f552373af5da95ee3b8136a6fbba490ffeda60ea56236ed992c073d6 SHA512 57d23fc4ef209b6e07b5e9d039db257c564e874914d0b9d9abda5d62608b9f6b32252667fa4638e9dfc7632111cafec5fad634992dce7b76309d177450fb0404
-AUX adonthell-0.3.5-glibc-2.10.patch 792 BLAKE2B 26a724ff84b31a66f6a8ed2dfdc917b220dc1083a017b4a2311c7a91d8ed5b493ca4ba3ac507c2e243980dd18dd1f9fffb434ad38968bb950a3747a5fb16b812 SHA512 6aaf6eced04b777804271dbee082c3ac0d39381e079065ff714bbb66b3ac8be96094e37bfa5e5f986ef91ffe6902f91f8ca7777ae7f3b277c56db37562958aff
-DIST adonthell-src-0.3.5.tar.gz 877439 BLAKE2B 995102c30b5557aaa02ab463a9c609251175b1a590e8bc89b457feead74391dc3756c8c06bba580a5f2b02cbe4cd87f27249364be3355409e3507269fb653094 SHA512 bf970b809b22a8563b196d6817553dd58dc9cb09b3bd99eb99d5c8e6f0828cf59965633acd4fdf7835dd9cb732cbb3290d3663521201ece7569cad2f494fb15d
-EBUILD adonthell-0.3.5-r2.ebuild 1462 BLAKE2B 237f854840a700ad4b90626f370db20a1e22632a54a989eeeaf9b974efb46b1415ae81db6136a5c277212058da965fccdcc19b33094f013785bf2f7f8dc6b983 SHA512 8e489d245e592e98ffabac8994d66fd55affacb8b44d5331ae4ad32330247a4ea78dfbbc9f78ae29f04d23dd2deadbd9e07df8165e9bba193dffebb1e399b4c9
+AUX adonthell-0.3.8-ar.patch 236 BLAKE2B 5ff259fd847ead6b1f70de02f94c8bb43ed984cab240a73f6933b0b86e65fa9e35dff4abed748cb535e772a0f79d5aa306088f650ee39ec41d2dab751ca5fc58 SHA512 af019fb6a32dc630dd00f9101967a7344b9e7172fcc46400b156247c54d59512533012ca6e715ea47f561e3a5b5b3467ee1c3381541d8bca9345792604564aa0
+DIST adonthell-src-0.3.8.tar.gz 889244 BLAKE2B 43b685feaa9ae616fea0eaa7687c72455ef916c9eeaf0dd07724fbaae5e33fb36130252c3c493cff34889cbc6146d76cc9ba2a1ec4e4f20b3b16c188c837d51a SHA512 7a047ec4d01d677c616dcc1f8efff2fecc95c1636172fd6709736de79f485711f169057af5797db85243592b5622f25f69e3393469321d7989c054bb41e17cf3
+EBUILD adonthell-0.3.8.ebuild 1149 BLAKE2B 36157e4b810efc9359a806ab67b14e3a9b063ec88f28df53d00fe8304ce534e5e7f9032b44071a6815886b77e8c37423627fbab3cb5ac81294ced888c0ccf235 SHA512 1048b11377a4c3a91b38842cd4b6fd34021d338d51f9a676d75119f6a439f85930c8e520c4e4c2d4dde2a3bcfed2a278ec5448dbc63cccb3033afeb33733134f
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-rpg/adonthell/adonthell-0.3.5-r2.ebuild b/games-rpg/adonthell/adonthell-0.3.8.ebuild
index 020a4c6cbcbb..5407912c96c2 100644
--- a/games-rpg/adonthell/adonthell-0.3.5-r2.ebuild
+++ b/games-rpg/adonthell/adonthell-0.3.8.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
 
-inherit autotools eutils python-single-r1
+inherit autotools python-single-r1
 
-DESCRIPTION="roleplaying game engine"
+DESCRIPTION="Roleplaying game engine"
 HOMEPAGE="http://adonthell.nongnu.org/"
 SRC_URI="https://savannah.nongnu.org/download/${PN}/${PN}-src-${PV}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc nls"
@@ -19,14 +19,15 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RDEPEND="${PYTHON_DEPS}
 	media-libs/freetype
 	media-libs/libogg
-	media-libs/libsdl:0[X,video,sound]
+	media-libs/libsdl2[X,video,sound]
 	media-libs/libvorbis
-	media-libs/sdl-mixer[vorbis]
-	media-libs/sdl-ttf
+	media-libs/sdl2-mixer[vorbis]
+	media-libs/sdl2-ttf
 	sys-libs/zlib
 	nls? ( virtual/libintl )"
 DEPEND="${RDEPEND}
-	dev-lang/swig
+	dev-lang/swig"
+BDEPEND="
 	virtual/pkgconfig
 	doc? (
 		app-doc/doxygen
@@ -34,39 +35,26 @@ DEPEND="${RDEPEND}
 	)
 	nls? ( sys-devel/gettext )"
 
-S=${WORKDIR}/${PN}-${PV/a/}
+DOCS=( AUTHORS NEWBIE NEWS README )
 
 PATCHES=(
-		"${FILESDIR}"/${P}-configure.in.patch
-		"${FILESDIR}"/${P}-format.patch
-		"${FILESDIR}"/${P}-gcc46.patch
-		"${FILESDIR}"/${P}-glibc-2.10.patch
-		"${FILESDIR}"/${P}-freetype_pkgconfig.patch
+	"${FILESDIR}/${P}-ar.patch"
 )
 
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
 src_prepare() {
 	default
-
-	sed -i \
-		-e "/AC_PATH_PROGS/s:python:${EPYTHON}:" \
-		configure.in || die "sed failed"
-	rm -f ac{local,include}.m4
 	eautoreconf
 }
 
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
 src_configure() {
 	econf \
+		--program-transform-name="s:${PN}-$(ver_cut 1-2):${PN}:" \
 		--disable-py-debug \
+		--with-python=${EPYTHON} \
 		$(use_enable nls) \
 		$(use_enable doc)
 }
-
-src_install() {
-	emake DESTDIR="${D}" install
-	keepdir /usr/share/${PN}/games
-	dodoc AUTHORS ChangeLog FULLSCREEN.howto NEWBIE NEWS README
-}
diff --git a/games-rpg/adonthell/files/adonthell-0.3.5-configure.in.patch b/games-rpg/adonthell/files/adonthell-0.3.5-configure.in.patch
deleted file mode 100644
index 8aaad58894b7..000000000000
--- a/games-rpg/adonthell/files/adonthell-0.3.5-configure.in.patch
+++ /dev/null
@@ -1,92 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -13,7 +13,7 @@
- AM_INIT_AUTOMAKE([])
- AM_CONFIG_HEADER(config.h)
- 
--CFLAGS="-g -Wall -fno-exceptions"
-+CXXFLAGS="$CXXFLAGS -Wall -fno-exceptions"
- CPPFLAGS=""
- DEFS=""
- 
-@@ -163,10 +163,8 @@
- 
-    dnl Extract the version using Python, check against 2.2+
- 
--   changequote(<<, >>)
--   PYTHON_VERSION=`$PYPACKAGE -c 'import sys ; print (int(sys.version[0]) * 10 + int(sys.version[2]))'`
--   PY_VERSION=`$PYPACKAGE -c 'import sys ; print sys.version[0:3]'`
--   changequote([, ])
-+   PYTHON_VERSION=`$PYPACKAGE -c 'import sys ; print (int(sys.version@<:@0@:>@) * 10 + int(sys.version@<:@2@:>@))'`
-+   PY_VERSION=`$PYPACKAGE -c 'import sys ; print sys.version@<:@0:3@:>@'`
- 
-    if test $PYTHON_VERSION -lt 22; then
- 	echo "Sorry, you need to have Python 2.2+ installed - update your version!"
-@@ -176,9 +174,7 @@
-    dnl Find the Python.h header file
- 
-    AC_MSG_CHECKING(for Python header files)
--   changequote(<<, >>)
--   PYINCLUDE=`$PYPACKAGE -c 'import sys ; print "%s/include/python%s" % (sys.prefix, sys.version[:3])'`
--   changequote([, ])
-+   PYINCLUDE=`$PYPACKAGE -c 'import sys ; print "%s/include/python%s" % (sys.prefix, sys.version@<:@:3@:>@)'`
- 
-    if test -r "$PYINCLUDE/Python.h"; then
-       PY_CFLAGS="-I$PYINCLUDE"
-@@ -191,10 +187,8 @@
-    dnl Find the Python library
-    AC_MSG_CHECKING(for Python library)
-    PYLIB=""
--   changequote(<<, >>)
-    PYPREFIX=`$PYPACKAGE -c 'import sys; print sys.prefix'`
--   PYLIBVER=`$PYPACKAGE -c 'import sys; print sys.version[:3]'`
--   changequote([, ])
-+   PYLIBVER=`$PYPACKAGE -c 'import sys; print sys.version@<:@:3@:>@'`
- 
-    dnl look for a framework build of python first
-    fw=`echo "$PYPREFIX" | sed 's/.*\(Python\.framework\).*/\1/;'`
-@@ -233,19 +227,9 @@
-    fi
-    dnl Get the libraries that python depends on
- 
--   AC_PATH_PROG(haveldd, ldd)
-    AC_MSG_CHECKING(for Python's dependencies)
- 
--   if test x$haveldd != x ; then
--       changequote(<<, >>)
--       py_deps=`ldd $PYPACKAGE | sed 's/\( *.*lib\([^\/]*\)\.so.*=.*$\)/-l\2/p; d' | grep -v 'stdc++'`
--       for py_lib in $py_deps ; do
--         if test "$py_lib" != "-lm" && test "$py_lib" != "-lc" ; then
--            PY_DEPS="$PY_DEPS $py_lib"
--         fi
--      done
--      changequote([, ])
--   fi
-+   PY_DEPS="$PY_DEPS `python-config --libs` -lutil"
- 
-    case $target in
-        *-sun-solaris*)
-@@ -293,11 +277,9 @@
- if test "$P_SWIG" != "no" ; then
-     $P_SWIG -version &> swig.ver
- 
--    changequote(<<, >>)
--    swig_major_ver=`more swig.ver | sed 's/.* \([0-9]*\)\.[0-9]*\.[0-9]*.*/\1/p; d'`
--    swig_minor_ver=`more swig.ver | sed 's/.* [0-9]*\.\([0-9]*\)\.[0-9]*.*/\1/p; d'`
--    swig_micro_ver=`more swig.ver | sed 's/.* [0-9]*\.[0-9]*\.\([0-9]*\).*/\1/p; d'`
--    changequote([, ])
-+    swig_major_ver=`more swig.ver | sed 's/.* \(@<:@0-9@:>@*\)\.@<:@0-9@:>@*\.@<:@0-9@:>@*.*/\1/p; d'`
-+    swig_minor_ver=`more swig.ver | sed 's/.* @<:@0-9@:>@*\.\(@<:@0-9@:>@*\)\.@<:@0-9@:>@*.*/\1/p; d'`
-+    swig_micro_ver=`more swig.ver | sed 's/.* @<:@0-9@:>@*\.@<:@0-9@:>@*\.\(@<:@0-9@:>@*\).*/\1/p; d'`
- 
-     rm -f swig.ver
- 
-@@ -387,7 +369,7 @@
- dnl Generate our compiler arguements
- dnl ********************************
- 
--CXXFLAGS="$CFLAGS $DEFS $INCLUDES"
-+CXXFLAGS="$CXXFLAGS $DEFS $INCLUDES"
- 
- AC_SUBST(CXX) 
- AC_SUBST(CXXFLAGS) 
diff --git a/games-rpg/adonthell/files/adonthell-0.3.5-format.patch b/games-rpg/adonthell/files/adonthell-0.3.5-format.patch
deleted file mode 100644
index fa85d7858109..000000000000
--- a/games-rpg/adonthell/files/adonthell-0.3.5-format.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/py_adonthell_wrap.cc	2014-10-20 14:21:57.495642785 +0200
-+++ b/src/py_adonthell_wrap.cc	2014-10-20 14:22:35.019293237 +0200
-@@ -867,7 +867,7 @@
-     Py_DECREF(old_str);
-     Py_DECREF(value);
-   } else {
--    PyErr_Format(PyExc_RuntimeError, mesg);
-+    PyErr_Format(PyExc_RuntimeError, "%s", mesg);
-   }
- }
- 
diff --git a/games-rpg/adonthell/files/adonthell-0.3.5-freetype_pkgconfig.patch b/games-rpg/adonthell/files/adonthell-0.3.5-freetype_pkgconfig.patch
deleted file mode 100644
index ff11ffa96f5f..000000000000
--- a/games-rpg/adonthell/files/adonthell-0.3.5-freetype_pkgconfig.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- adonthell-0.3.5/configure.in
-+++ adonthell-0.3.5/configure.in
-@@ -17,6 +17,8 @@
- CPPFLAGS=""
- DEFS=""
- 
-+PKG_PROG_PKG_CONFIG
-+
- dnl ********************
- dnl Checks for programs.
- dnl ********************
-@@ -144,8 +146,7 @@
- dnl Check for FreeType2
- dnl *******************
- 
--AC_CHECK_FT2(6.0.0,
--    :,
-+PKG_CHECK_MODULES(FT2, freetype2 >= 6.0.0,,
-     AC_MSG_ERROR([*** Freetype version >= 6.0.0 not found!])
- )
- 
diff --git a/games-rpg/adonthell/files/adonthell-0.3.5-gcc46.patch b/games-rpg/adonthell/files/adonthell-0.3.5-gcc46.patch
deleted file mode 100644
index 7e54ec5ee03a..000000000000
--- a/games-rpg/adonthell/files/adonthell-0.3.5-gcc46.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/src/win_event.cc	2011-04-18 08:24:16.000000000 +0200
-+++ b/src/win_event.cc	2011-04-18 08:25:18.000000000 +0200
-@@ -34,8 +34,9 @@
- 	
- 	    case DESTROY:
- 	    {
-+		Functor0wRet<bool> func0ret;
- 	        set_callback_destroy (
--	        makeFunctor (&Functor0wRet<bool>(), *callback, &py_callback::callback_func0ret));
-+	        makeFunctor (&func0ret, *callback, &py_callback::callback_func0ret));
- 	        break;
- 	    }
- 	
diff --git a/games-rpg/adonthell/files/adonthell-0.3.5-glibc-2.10.patch b/games-rpg/adonthell/files/adonthell-0.3.5-glibc-2.10.patch
deleted file mode 100644
index 7aec808cd5f1..000000000000
--- a/games-rpg/adonthell/files/adonthell-0.3.5-glibc-2.10.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -Naurp adonthell-0.3.4-orig/src/dialog.cc adonthell-0.3.4/src/dialog.cc
---- adonthell-0.3.4-orig/src/dialog.cc	2005-03-10 12:39:41.000000000 -0600
-+++ adonthell-0.3.4/src/dialog.cc	2009-07-26 15:57:01.410882131 -0600
-@@ -265,7 +265,8 @@ string dialog::scan_string (const char *
- {
-     u_int32 begin, end, len;
-     PyObject *result;
--    char *tmp, *start, *mid, *str = NULL;
-+    const char *start;
-+    char *tmp, *mid, *str = NULL;
-     character *the_player = data::the_player;
-     string newstr (s); 
- 
-@@ -318,7 +319,7 @@ string dialog::scan_string (const char *
- 
-         // Error!
-         cout << "\n*** Error, unknown macro " << start << flush;
--        start[0] = ' ';
-+        newstr[newstr.length () - strlen (start)] = ' ';
-     }
-     
-     // execute python functions
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 000000000000..2b2e34d62c7d
--- /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