diff options
Diffstat (limited to 'games-rpg')
15 files changed, 227 insertions, 220 deletions
diff --git a/games-rpg/Manifest.gz b/games-rpg/Manifest.gz Binary files differindex db0466158b39..622fb4b8295a 100644 --- a/games-rpg/Manifest.gz +++ b/games-rpg/Manifest.gz 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 diff --git a/games-rpg/daimonin-client/Manifest b/games-rpg/daimonin-client/Manifest index 73c0b39cbdf7..478aad13f047 100644 --- a/games-rpg/daimonin-client/Manifest +++ b/games-rpg/daimonin-client/Manifest @@ -1,7 +1,8 @@ AUX daimonin-client-0.10.5-datadir.patch 983 BLAKE2B 810f36eed097c19a0d77ea89d60a4ac9acc83e2fe74d4563d77789fbfbdd5d9823c0e9271bcd113c00e6f6044c910338596c967d3fd68304863d0f9008da3324 SHA512 eb4748894c0722ee112efc3953a14784eb13237919813c057afddc09104f250f346c29a1a224bd3ce8a44b22af4fa2b59f826aa5eb96fb45a51f276f743fa3fa AUX daimonin-client-0.10.5-nozlib.patch 1094 BLAKE2B d617dbee2d2a23eff6b6330c59c2fe7501ec06437d5d179611ea9ab50a2e15bacc7e948d3cd114bf1745d6649e80f503b8e364752c9f689c4f95170d3ebf74bb SHA512 31ef58b81c669f7a8c685355dfb37d85383891db4534c3b62b0d9f5beaed6cb6d4be34657acd109287dc85d83a6c81950322667729b36552394c17a9b0bfc989 AUX daimonin-client-0.10.8-fix-build-system.patch 2538 BLAKE2B 1eb570088a9bd44489ce63eeef445a3d9b27f421abb28cad9f83eb622b7da33ed94ec9265f0c0d59744521367dd82d6bc4ba7001e1fd938629b3ec4bb0f9f8ee SHA512 baf333aad05a662bf38e6579cb6f8bfcb0b1fbf2a48191df28a96fe3d20585f7a2ad211d96107a3f99245bc99b877ca140b450111e7466d866e07d32199c737d +AUX daimonin-client-0.10.8-fno-common.patch 3617 BLAKE2B e9454ca77e8332bc8ce5b592dfc9c173d4a79f48649c32dba8180b778718779f988a4c1f3cf89a2f20f70b3292110732186eb743e8e608b49c692c9611fcbaaf SHA512 ad7a14d6d8feca43a4ffbaf5f6869a89b9c294b110ebec07755e2dcb0d1e06015388dfddec8d8f40dc62d9359e30986aa9706a2b85ef36fdfc139c2132b28bb9 DIST daimonin-client-0.10.8.zip 51894462 BLAKE2B 9803b0e597134fa605ffc4e38b2f6f58cd76d45141bb0d5c5387e9b507c4b80b4a566d266b622df7ea38b3e9eb00e839981bcb999ac2d14e59a8cff37340f6fa SHA512 f4f5891697f96a60a8ee79973b0172b544cbae25b2d8787e0a4e9113d95be3b41b8c29c80ba5cbaf7548055e4c847456fa364346489f4d6ad165b984cfd64531 DIST daimoninMusicLQ20100827.zip 24293301 BLAKE2B 35ee421c0db8f0ff29768b58af8fbc1d804d24534b8558631c97cf36b624999d0e5f422cd32e4a13bc09765b183bfd52270b33f2614023202211399e3d5da484 SHA512 f24bba24c0e9a79469511315c608c464568f3ee0dc05b3d83c791512fa51eae07669dc175e7672cc8b31764a7bdff5c975ac2b13e2d7b0e5287717e188f1d439 -EBUILD daimonin-client-0.10.8.ebuild 1483 BLAKE2B c67064029f915a15e5be0ce393275a05163ccd6ca9d16f1fc73fa9ae153b2ce85b55c2d6bb255b0f149bc60d75c2c902f1476859eac6b10bf92d29f2482bca6c SHA512 46898d7d1b725f963ceaf4e12ea8833feb37ae7e294f589789b87a1c51fd0bb5d404a6442a799ac59e061689ff6752482f3d623477cd1a27a6ffd7e4b1683a31 +EBUILD daimonin-client-0.10.8.ebuild 1548 BLAKE2B b7aa99bea8e527ec406c20606416ce3c58056d85d154537980afbb89e4b2f4ae4eef98d819c0b7447ed2d8dec63df4557e21c8ab14d24bcc364eabccafdac097 SHA512 9bed8d9bb8d67126fca2798a5edc003f677e91444242f71d69f1ceff9d73016ef7f4d21b73cd55cac8080556a0d2916ac12f0cb3008a04eac719f565d8156493 MISC metadata.xml 408 BLAKE2B d816c7d0cd53dc68147f8a23d89d46da21defb09e0b9717b777b23881189ec61ae82ed3bb42dbccadd94a34421c6b92755bb20cdb60bd2a17826dcc128332930 SHA512 039f6849c28f9c21b7e2854314fcd0ff9b356b3983e68c0a4a2eb8e96893475e4333f7408c233f8f9651c4613a2683a63a4f5da58d11555d34712f9ebe0a2f6b diff --git a/games-rpg/daimonin-client/daimonin-client-0.10.8.ebuild b/games-rpg/daimonin-client/daimonin-client-0.10.8.ebuild index 3ee1bd720d75..4cd5b7623861 100644 --- a/games-rpg/daimonin-client/daimonin-client-0.10.8.ebuild +++ b/games-rpg/daimonin-client/daimonin-client-0.10.8.ebuild @@ -1,13 +1,14 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit autotools eutils +inherit autotools desktop DESCRIPTION="A graphical 2D tile-based MMORPG" HOMEPAGE="http://daimonin.sourceforge.net/" -SRC_URI="https://dev.gentoo.org/~soap/distfiles/${P}.zip +SRC_URI=" + https://dev.gentoo.org/~soap/distfiles/${P}.zip music? ( mirror://sourceforge/daimonin/daimoninMusicLQ20100827.zip )" LICENSE="GPL-2" @@ -22,10 +23,10 @@ RDEPEND=" media-libs/sdl-mixer[vorbis] net-misc/curl sys-libs/zlib:=" -DEPEND="${RDEPEND} - app-arch/unzip" +DEPEND="${RDEPEND}" +BDEPEND="app-arch/unzip" -S=${WORKDIR}/daimonin-code-8183-trunk/client/make/linux +S="${WORKDIR}/daimonin-code-8183-trunk/client/make/linux" src_unpack() { unpack ${P}.zip @@ -42,6 +43,7 @@ src_prepare() { pushd ../../src >/dev/null || die eapply "${FILESDIR}"/${PN}-0.10.5-datadir.patch + eapply "${FILESDIR}"/${PN}-0.10.8-fno-common.patch popd >/dev/null || die eapply_user @@ -64,6 +66,7 @@ src_install() { cd ../.. || die dodoc README* + newicon bitmaps/pentagram.png "daimonin.png" make_desktop_entry "daimonin" "Daimonin" "daimonin" "Game;Amusement" } diff --git a/games-rpg/daimonin-client/files/daimonin-client-0.10.8-fno-common.patch b/games-rpg/daimonin-client/files/daimonin-client-0.10.8-fno-common.patch new file mode 100644 index 000000000000..d4369e5f3fbe --- /dev/null +++ b/games-rpg/daimonin-client/files/daimonin-client-0.10.8-fno-common.patch @@ -0,0 +1,128 @@ +--- a/dialog.c ++++ b/dialog.c +@@ -581,7 +581,7 @@ + /****************************************************************** + draws all options for the actual page. + ******************************************************************/ +-inline void optwin_draw_options(int x, int y) ++void optwin_draw_options(int x, int y) + { + #define LEN_NAME 111 + int i = -1, pos = 0, max = 0; +--- a/include/main.h ++++ b/include/main.h +@@ -118,7 +118,7 @@ + } + _bmaptype_table; + +-_bmaptype_table bmaptype_table[BMAPTABLE]; ++extern _bmaptype_table bmaptype_table[BMAPTABLE]; + + extern int bmaptype_table_size; + +@@ -306,7 +306,7 @@ + double killhour; + } _statometer; + +-struct statometer statometer; ++extern struct statometer statometer; + + extern time_t sleeptime; + +--- a/include/map.h ++++ b/include/map.h +@@ -70,7 +70,7 @@ + } + _mapdata; + +-struct MapCell ++typedef struct MapCell + { + short faces[MAXFACES]; + short pos[MAXFACES]; +@@ -85,7 +85,7 @@ + } + MapCell; + +-struct Map ++typedef struct Map + { + struct MapCell cells[MAP_MAX_SIZE][MAP_MAX_SIZE]; + } +--- a/include/menu.h ++++ b/include/menu.h +@@ -41,15 +41,15 @@ + #define MENU_ALL (MENU_NO & MENU_KEYBIND & MENU_SPELL & MENU_STATUS & MENU_OPTION & MENU_NPC & MENU_BOOK & MENU_QUEST) + + #define MENU_SOUND_VOL 40 +-struct _skill_list skill_list[SKILL_LIST_MAX]; ++extern struct _skill_list skill_list[SKILL_LIST_MAX]; + extern _dialog_list_set skill_list_set; + +-struct _spell_list spell_list[SPELL_LIST_MAX]; /* skill list entries */ ++extern struct _spell_list spell_list[SPELL_LIST_MAX]; /* skill list entries */ + extern _dialog_list_set spell_list_set; + + extern _dialog_list_set option_list_set; + +-struct _bindkey_list bindkey_list[BINDKEY_LIST_MAX]; ++extern struct _bindkey_list bindkey_list[BINDKEY_LIST_MAX]; + extern _dialog_list_set bindkey_list_set; + + extern _dialog_list_set create_list_set; +--- a/include/wrapper.h ++++ b/include/wrapper.h +@@ -118,7 +118,7 @@ + extern int parse_metaserver_data(char *info); + + #if defined( __WIN_32) || defined(__LINUX) +- FILE *msglog; ++ extern FILE *msglog; + #endif + + #if defined(HAVE_STRNICMP) +--- a/main.c ++++ b/main.c +@@ -24,6 +24,10 @@ + #include <include.h> + #include <signal.h> + ++_bmaptype_table bmaptype_table[BMAPTABLE]; ++ ++struct statometer statometer; ++ + Account account; /* account data of this player, received from the server */ + + _server_char *first_server_char = NULL; /* list of possible chars/race with setup when we want create a char */ +@@ -33,7 +37,7 @@ + SDL_Surface *ScreenSurfaceMap; /* THE map surface (backbuffer)*/ + SDL_Surface *zoomed = NULL; + struct sockaddr_in insock; /* Server's attributes */ +-ClientSocket csocket; ++extern ClientSocket csocket; + int SocketStatusErrorNr; /* if an socket error, this is it */ + + _login_step LoginInputStep; +--- a/menu.c ++++ b/menu.c +@@ -29,6 +29,7 @@ + + struct _spell_list spell_list[SPELL_LIST_MAX]; /* skill list entries */ + struct _skill_list skill_list[SKILL_LIST_MAX]; /* skill list entries */ ++struct _bindkey_list bindkey_list[BINDKEY_LIST_MAX]; + + struct _dialog_list_set spell_list_set; + struct _dialog_list_set skill_list_set; +--- a/wrapper.c ++++ b/wrapper.c +@@ -22,6 +22,10 @@ + */ + #include <include.h> + ++#if defined( __WIN_32) || defined(__LINUX) ++ FILE *msglog; ++#endif ++ + /* This is because PHYSFS_isInit() was introduced in 2.0.0 and some linux + * distros are still stuck in 1.x.x. So in time we can dump this global and + * use PHYSFS_isInit(). But for now, it's a simple query we can reproduce diff --git a/games-rpg/wastesedge/Manifest b/games-rpg/wastesedge/Manifest index 72317d4f1f11..f86c39503d05 100644 --- a/games-rpg/wastesedge/Manifest +++ b/games-rpg/wastesedge/Manifest @@ -1,3 +1,4 @@ -DIST wastesedge-src-0.3.5.tar.gz 10749912 BLAKE2B ec4cd1135cd09c92937c8749905872b635e72575662bb7c1e188281e47ec0a285045aced378659fed20942c4bc7e67f11fa95e1cf0fe220c0be0f3b6527aa754 SHA512 d4c77eb1bde2c28002e4f56a6bfa5f816ea53de7061b5e60635f15c670ff45c3a18e3316b92007f74033a62538503f14b67e1175cf22c718c22ca1021dc7af3b -EBUILD wastesedge-0.3.5-r2.ebuild 937 BLAKE2B 3c4806fb544b7c9ee8abb65c25956af20beed59a9d9e3d3b1b29afe946f3648b26425306a4ff9378a00f69db8591ebe6ad0b70b2a901c506d315c23aedaab478 SHA512 9c75eb782246696718968d431e4be17ab15b7d96f5a5a6f8224029a74bc31579803aee0f0eea53519b9243e9f316c04a513efbc0cd1af069141f9109cd58f93b +AUX wastesedge-0.3.8_version-handling.patch 1136 BLAKE2B f3278c8d1fb37b662d5b8d4fd0235968642c003af868029bb3b62c7c399505301860f9b2ad17642f547de9fecb73a81cbd6df7ea804c0647d2622c2ca2c5569b SHA512 5df47cfb2a91a848a244fa0cea7c6ca58afde75737d974bdfd452cf02541d766385885be5d7b3889667a481894758361bc66cd778794224b09035e83ac3e011a +DIST wastesedge-src-0.3.8.tar.gz 20779629 BLAKE2B 40a63298ea9b704407fcac244f22a3e26190fec37cb0dae0e18e55478d866a215a6be6e1bd08ef2d303894aca2edd09e7b299ae9c2da21d999f47c6d799fde83 SHA512 410e01d803b6ff72c4c0d8f035c5e3228c2311bc200359ecb748be63474ae0afb8609cc9daed940670d02190fa3c047ea2a2cd116b7680398cdcc7523a64c386 +EBUILD wastesedge-0.3.8.ebuild 866 BLAKE2B 1a3d8b5d7b3b84555ce361ef95d246a8b3aaff8297db847cbad0e1769036db5e4bc445b540206eaa4195aca386febf6adaeb303da41f821ee4c0cc0a98a9a2e5 SHA512 91186ea598dad6fd642470338b1ef03a937fababa41e2cd7c7bbc453b4a93716a23b77a37b416b723ef89751731f05aa5d69dfa1bd4ce7a77d1ca33416af1401 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118 diff --git a/games-rpg/wastesedge/files/wastesedge-0.3.8_version-handling.patch b/games-rpg/wastesedge/files/wastesedge-0.3.8_version-handling.patch new file mode 100644 index 000000000000..33f3eedad1e5 --- /dev/null +++ b/games-rpg/wastesedge/files/wastesedge-0.3.8_version-handling.patch @@ -0,0 +1,35 @@ +From b3987b74cc6ff89187b95c692a4aacc13db98564 Mon Sep 17 00:00:00 2001 +From: "Azamat H. Hackimov" <azamat.hackimov@gmail.com> +Date: Wed, 9 Sep 2020 20:01:41 +0300 +Subject: [PATCH] Rework adonthell version handling + +--- + configure.ac | 11 +++-------- + 1 file changed, 3 insertions(+), 8 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 76d87bd..fff8268 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -46,15 +46,10 @@ fi + + dnl Checking for the proper version + AC_MSG_CHECKING(for Adonthell's version) +-$adonthell_binary -v &> adonthell.ver + +-changequote(<<, >>) +-adonthell_major_ver=`sed 's/\([0-9]*\)\.[0-9]*\.[0-9]*/\1/p; d' adonthell.ver` +-adonthell_minor_ver=`sed 's/[0-9]*\.\([0-9]*\)\.[0-9]*/\1/p; d' adonthell.ver` +-adonthell_micro_ver=`sed 's/[0-9]*\.[0-9]*\.\([0-9]*\)/\1/p; d' adonthell.ver` +-changequote([, ]) +- +-rm -f adonthell.ver ++adonthell_major_ver=$($adonthell_binary -v | cut -d'.' -f1) ++adonthell_minor_ver=$($adonthell_binary -v | cut -d'.' -f2) ++adonthell_micro_ver=$($adonthell_binary -v | cut -d'.' -f3) + + adonthellver="$adonthell_major_ver.$adonthell_minor_ver.$adonthell_micro_ver" + +-- +2.26.2 + diff --git a/games-rpg/wastesedge/wastesedge-0.3.5-r2.ebuild b/games-rpg/wastesedge/wastesedge-0.3.8.ebuild index 1e576c82d444..1138036c0acd 100644 --- a/games-rpg/wastesedge/wastesedge-0.3.5-r2.ebuild +++ b/games-rpg/wastesedge/wastesedge-0.3.8.ebuild @@ -1,35 +1,38 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -PYTHON_COMPAT=( python2_7 ) -inherit eutils python-single-r1 +EAPI=7 -DESCRIPTION="role playing game to showcase the adonthell engine" +PYTHON_COMPAT=( python3_{6,7,8} ) + +inherit autotools python-single-r1 xdg + +DESCRIPTION="Role playing game to showcase the adonthell engine" HOMEPAGE="http://adonthell.nongnu.org/download/" SRC_URI="https://savannah.nongnu.org/download/adonthell/${PN}-src-${PV}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" + IUSE="nls" REQUIRED_USE="${PYTHON_REQUIRED_USE}" -RESTRICT="userpriv" RDEPEND="${PYTHON_DEPS} - >=games-rpg/adonthell-0.3.5-r2[${PYTHON_SINGLE_USEDEP}] + >=games-rpg/adonthell-0.3.8[${PYTHON_SINGLE_USEDEP}] nls? ( virtual/libintl )" -DEPEND="${RDEPEND} - nls? ( sys-devel/gettext )" +BDEPEND="nls? ( sys-devel/gettext )" + +PATCHES=( "${FILESDIR}/${P}_version-handling.patch" ) +DOCS=( AUTHORS ChangeLog NEWS PLAYING README ) + +src_prepare() { + default + eautoreconf +} src_configure() { econf \ $(use_enable nls) \ --with-adonthell-binary="/usr/bin/adonthell" } - -src_install() { - emake DESTDIR="${D}" pixmapdir=/usr/share/pixmaps install - dodoc AUTHORS ChangeLog NEWS PLAYING README - make_desktop_entry adonthell-wastesedge "Waste's Edge" wastesedge_32x32 -} |