| 1 |
commit: 13e64dce95ade0844531fc9fb4e3b41978a78d31 |
| 2 |
Author: Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Wed Sep 9 17:19:45 2020 +0000 |
| 4 |
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Oct 2 06:41:15 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13e64dce |
| 7 |
|
| 8 |
games-rpg/adonthell: remove old version |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.4, Repoman-3.0.1 |
| 11 |
Signed-off-by: Azamat H. Hackimov <azamat.hackimov <AT> gmail.com> |
| 12 |
Closes: https://github.com/gentoo/gentoo/pull/17483 |
| 13 |
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> |
| 14 |
|
| 15 |
games-rpg/adonthell/Manifest | 1 - |
| 16 |
games-rpg/adonthell/adonthell-0.3.5-r2.ebuild | 72 ----------------- |
| 17 |
.../files/adonthell-0.3.5-configure.in.patch | 92 ---------------------- |
| 18 |
.../adonthell/files/adonthell-0.3.5-format.patch | 11 --- |
| 19 |
.../files/adonthell-0.3.5-freetype_pkgconfig.patch | 21 ----- |
| 20 |
.../adonthell/files/adonthell-0.3.5-gcc46.patch | 13 --- |
| 21 |
.../files/adonthell-0.3.5-glibc-2.10.patch | 22 ------ |
| 22 |
7 files changed, 232 deletions(-) |
| 23 |
|
| 24 |
diff --git a/games-rpg/adonthell/Manifest b/games-rpg/adonthell/Manifest |
| 25 |
index 1e009bdaf6f..de8df9b31cb 100644 |
| 26 |
--- a/games-rpg/adonthell/Manifest |
| 27 |
+++ b/games-rpg/adonthell/Manifest |
| 28 |
@@ -1,2 +1 @@ |
| 29 |
-DIST adonthell-src-0.3.5.tar.gz 877439 BLAKE2B 995102c30b5557aaa02ab463a9c609251175b1a590e8bc89b457feead74391dc3756c8c06bba580a5f2b02cbe4cd87f27249364be3355409e3507269fb653094 SHA512 bf970b809b22a8563b196d6817553dd58dc9cb09b3bd99eb99d5c8e6f0828cf59965633acd4fdf7835dd9cb732cbb3290d3663521201ece7569cad2f494fb15d |
| 30 |
DIST adonthell-src-0.3.8.tar.gz 889244 BLAKE2B 43b685feaa9ae616fea0eaa7687c72455ef916c9eeaf0dd07724fbaae5e33fb36130252c3c493cff34889cbc6146d76cc9ba2a1ec4e4f20b3b16c188c837d51a SHA512 7a047ec4d01d677c616dcc1f8efff2fecc95c1636172fd6709736de79f485711f169057af5797db85243592b5622f25f69e3393469321d7989c054bb41e17cf3 |
| 31 |
|
| 32 |
diff --git a/games-rpg/adonthell/adonthell-0.3.5-r2.ebuild b/games-rpg/adonthell/adonthell-0.3.5-r2.ebuild |
| 33 |
deleted file mode 100644 |
| 34 |
index 020a4c6cbcb..00000000000 |
| 35 |
--- a/games-rpg/adonthell/adonthell-0.3.5-r2.ebuild |
| 36 |
+++ /dev/null |
| 37 |
@@ -1,72 +0,0 @@ |
| 38 |
-# Copyright 1999-2020 Gentoo Authors |
| 39 |
-# Distributed under the terms of the GNU General Public License v2 |
| 40 |
- |
| 41 |
-EAPI=6 |
| 42 |
-PYTHON_COMPAT=( python2_7 ) |
| 43 |
- |
| 44 |
-inherit autotools eutils python-single-r1 |
| 45 |
- |
| 46 |
-DESCRIPTION="roleplaying game engine" |
| 47 |
-HOMEPAGE="http://adonthell.nongnu.org/" |
| 48 |
-SRC_URI="https://savannah.nongnu.org/download/${PN}/${PN}-src-${PV}.tar.gz" |
| 49 |
- |
| 50 |
-LICENSE="GPL-2" |
| 51 |
-SLOT="0" |
| 52 |
-KEYWORDS="~amd64 ~x86" |
| 53 |
-IUSE="doc nls" |
| 54 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
| 55 |
- |
| 56 |
-RDEPEND="${PYTHON_DEPS} |
| 57 |
- media-libs/freetype |
| 58 |
- media-libs/libogg |
| 59 |
- media-libs/libsdl:0[X,video,sound] |
| 60 |
- media-libs/libvorbis |
| 61 |
- media-libs/sdl-mixer[vorbis] |
| 62 |
- media-libs/sdl-ttf |
| 63 |
- sys-libs/zlib |
| 64 |
- nls? ( virtual/libintl )" |
| 65 |
-DEPEND="${RDEPEND} |
| 66 |
- dev-lang/swig |
| 67 |
- virtual/pkgconfig |
| 68 |
- doc? ( |
| 69 |
- app-doc/doxygen |
| 70 |
- media-gfx/graphviz |
| 71 |
- ) |
| 72 |
- nls? ( sys-devel/gettext )" |
| 73 |
- |
| 74 |
-S=${WORKDIR}/${PN}-${PV/a/} |
| 75 |
- |
| 76 |
-PATCHES=( |
| 77 |
- "${FILESDIR}"/${P}-configure.in.patch |
| 78 |
- "${FILESDIR}"/${P}-format.patch |
| 79 |
- "${FILESDIR}"/${P}-gcc46.patch |
| 80 |
- "${FILESDIR}"/${P}-glibc-2.10.patch |
| 81 |
- "${FILESDIR}"/${P}-freetype_pkgconfig.patch |
| 82 |
-) |
| 83 |
- |
| 84 |
-pkg_setup() { |
| 85 |
- python-single-r1_pkg_setup |
| 86 |
-} |
| 87 |
- |
| 88 |
-src_prepare() { |
| 89 |
- default |
| 90 |
- |
| 91 |
- sed -i \ |
| 92 |
- -e "/AC_PATH_PROGS/s:python:${EPYTHON}:" \ |
| 93 |
- configure.in || die "sed failed" |
| 94 |
- rm -f ac{local,include}.m4 |
| 95 |
- eautoreconf |
| 96 |
-} |
| 97 |
- |
| 98 |
-src_configure() { |
| 99 |
- econf \ |
| 100 |
- --disable-py-debug \ |
| 101 |
- $(use_enable nls) \ |
| 102 |
- $(use_enable doc) |
| 103 |
-} |
| 104 |
- |
| 105 |
-src_install() { |
| 106 |
- emake DESTDIR="${D}" install |
| 107 |
- keepdir /usr/share/${PN}/games |
| 108 |
- dodoc AUTHORS ChangeLog FULLSCREEN.howto NEWBIE NEWS README |
| 109 |
-} |
| 110 |
|
| 111 |
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 |
| 112 |
deleted file mode 100644 |
| 113 |
index 8aaad58894b..00000000000 |
| 114 |
--- a/games-rpg/adonthell/files/adonthell-0.3.5-configure.in.patch |
| 115 |
+++ /dev/null |
| 116 |
@@ -1,92 +0,0 @@ |
| 117 |
---- a/configure.in |
| 118 |
-+++ b/configure.in |
| 119 |
-@@ -13,7 +13,7 @@ |
| 120 |
- AM_INIT_AUTOMAKE([]) |
| 121 |
- AM_CONFIG_HEADER(config.h) |
| 122 |
- |
| 123 |
--CFLAGS="-g -Wall -fno-exceptions" |
| 124 |
-+CXXFLAGS="$CXXFLAGS -Wall -fno-exceptions" |
| 125 |
- CPPFLAGS="" |
| 126 |
- DEFS="" |
| 127 |
- |
| 128 |
-@@ -163,10 +163,8 @@ |
| 129 |
- |
| 130 |
- dnl Extract the version using Python, check against 2.2+ |
| 131 |
- |
| 132 |
-- changequote(<<, >>) |
| 133 |
-- PYTHON_VERSION=`$PYPACKAGE -c 'import sys ; print (int(sys.version[0]) * 10 + int(sys.version[2]))'` |
| 134 |
-- PY_VERSION=`$PYPACKAGE -c 'import sys ; print sys.version[0:3]'` |
| 135 |
-- changequote([, ]) |
| 136 |
-+ PYTHON_VERSION=`$PYPACKAGE -c 'import sys ; print (int(sys.version@<:@0@:>@) * 10 + int(sys.version@<:@2@:>@))'` |
| 137 |
-+ PY_VERSION=`$PYPACKAGE -c 'import sys ; print sys.version@<:@0:3@:>@'` |
| 138 |
- |
| 139 |
- if test $PYTHON_VERSION -lt 22; then |
| 140 |
- echo "Sorry, you need to have Python 2.2+ installed - update your version!" |
| 141 |
-@@ -176,9 +174,7 @@ |
| 142 |
- dnl Find the Python.h header file |
| 143 |
- |
| 144 |
- AC_MSG_CHECKING(for Python header files) |
| 145 |
-- changequote(<<, >>) |
| 146 |
-- PYINCLUDE=`$PYPACKAGE -c 'import sys ; print "%s/include/python%s" % (sys.prefix, sys.version[:3])'` |
| 147 |
-- changequote([, ]) |
| 148 |
-+ PYINCLUDE=`$PYPACKAGE -c 'import sys ; print "%s/include/python%s" % (sys.prefix, sys.version@<:@:3@:>@)'` |
| 149 |
- |
| 150 |
- if test -r "$PYINCLUDE/Python.h"; then |
| 151 |
- PY_CFLAGS="-I$PYINCLUDE" |
| 152 |
-@@ -191,10 +187,8 @@ |
| 153 |
- dnl Find the Python library |
| 154 |
- AC_MSG_CHECKING(for Python library) |
| 155 |
- PYLIB="" |
| 156 |
-- changequote(<<, >>) |
| 157 |
- PYPREFIX=`$PYPACKAGE -c 'import sys; print sys.prefix'` |
| 158 |
-- PYLIBVER=`$PYPACKAGE -c 'import sys; print sys.version[:3]'` |
| 159 |
-- changequote([, ]) |
| 160 |
-+ PYLIBVER=`$PYPACKAGE -c 'import sys; print sys.version@<:@:3@:>@'` |
| 161 |
- |
| 162 |
- dnl look for a framework build of python first |
| 163 |
- fw=`echo "$PYPREFIX" | sed 's/.*\(Python\.framework\).*/\1/;'` |
| 164 |
-@@ -233,19 +227,9 @@ |
| 165 |
- fi |
| 166 |
- dnl Get the libraries that python depends on |
| 167 |
- |
| 168 |
-- AC_PATH_PROG(haveldd, ldd) |
| 169 |
- AC_MSG_CHECKING(for Python's dependencies) |
| 170 |
- |
| 171 |
-- if test x$haveldd != x ; then |
| 172 |
-- changequote(<<, >>) |
| 173 |
-- py_deps=`ldd $PYPACKAGE | sed 's/\( *.*lib\([^\/]*\)\.so.*=.*$\)/-l\2/p; d' | grep -v 'stdc++'` |
| 174 |
-- for py_lib in $py_deps ; do |
| 175 |
-- if test "$py_lib" != "-lm" && test "$py_lib" != "-lc" ; then |
| 176 |
-- PY_DEPS="$PY_DEPS $py_lib" |
| 177 |
-- fi |
| 178 |
-- done |
| 179 |
-- changequote([, ]) |
| 180 |
-- fi |
| 181 |
-+ PY_DEPS="$PY_DEPS `python-config --libs` -lutil" |
| 182 |
- |
| 183 |
- case $target in |
| 184 |
- *-sun-solaris*) |
| 185 |
-@@ -293,11 +277,9 @@ |
| 186 |
- if test "$P_SWIG" != "no" ; then |
| 187 |
- $P_SWIG -version &> swig.ver |
| 188 |
- |
| 189 |
-- changequote(<<, >>) |
| 190 |
-- swig_major_ver=`more swig.ver | sed 's/.* \([0-9]*\)\.[0-9]*\.[0-9]*.*/\1/p; d'` |
| 191 |
-- swig_minor_ver=`more swig.ver | sed 's/.* [0-9]*\.\([0-9]*\)\.[0-9]*.*/\1/p; d'` |
| 192 |
-- swig_micro_ver=`more swig.ver | sed 's/.* [0-9]*\.[0-9]*\.\([0-9]*\).*/\1/p; d'` |
| 193 |
-- changequote([, ]) |
| 194 |
-+ swig_major_ver=`more swig.ver | sed 's/.* \(@<:@0-9@:>@*\)\.@<:@0-9@:>@*\.@<:@0-9@:>@*.*/\1/p; d'` |
| 195 |
-+ swig_minor_ver=`more swig.ver | sed 's/.* @<:@0-9@:>@*\.\(@<:@0-9@:>@*\)\.@<:@0-9@:>@*.*/\1/p; d'` |
| 196 |
-+ swig_micro_ver=`more swig.ver | sed 's/.* @<:@0-9@:>@*\.@<:@0-9@:>@*\.\(@<:@0-9@:>@*\).*/\1/p; d'` |
| 197 |
- |
| 198 |
- rm -f swig.ver |
| 199 |
- |
| 200 |
-@@ -387,7 +369,7 @@ |
| 201 |
- dnl Generate our compiler arguements |
| 202 |
- dnl ******************************** |
| 203 |
- |
| 204 |
--CXXFLAGS="$CFLAGS $DEFS $INCLUDES" |
| 205 |
-+CXXFLAGS="$CXXFLAGS $DEFS $INCLUDES" |
| 206 |
- |
| 207 |
- AC_SUBST(CXX) |
| 208 |
- AC_SUBST(CXXFLAGS) |
| 209 |
|
| 210 |
diff --git a/games-rpg/adonthell/files/adonthell-0.3.5-format.patch b/games-rpg/adonthell/files/adonthell-0.3.5-format.patch |
| 211 |
deleted file mode 100644 |
| 212 |
index fa85d785810..00000000000 |
| 213 |
--- a/games-rpg/adonthell/files/adonthell-0.3.5-format.patch |
| 214 |
+++ /dev/null |
| 215 |
@@ -1,11 +0,0 @@ |
| 216 |
---- a/src/py_adonthell_wrap.cc 2014-10-20 14:21:57.495642785 +0200 |
| 217 |
-+++ b/src/py_adonthell_wrap.cc 2014-10-20 14:22:35.019293237 +0200 |
| 218 |
-@@ -867,7 +867,7 @@ |
| 219 |
- Py_DECREF(old_str); |
| 220 |
- Py_DECREF(value); |
| 221 |
- } else { |
| 222 |
-- PyErr_Format(PyExc_RuntimeError, mesg); |
| 223 |
-+ PyErr_Format(PyExc_RuntimeError, "%s", mesg); |
| 224 |
- } |
| 225 |
- } |
| 226 |
- |
| 227 |
|
| 228 |
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 |
| 229 |
deleted file mode 100644 |
| 230 |
index ff11ffa96f5..00000000000 |
| 231 |
--- a/games-rpg/adonthell/files/adonthell-0.3.5-freetype_pkgconfig.patch |
| 232 |
+++ /dev/null |
| 233 |
@@ -1,21 +0,0 @@ |
| 234 |
---- adonthell-0.3.5/configure.in |
| 235 |
-+++ adonthell-0.3.5/configure.in |
| 236 |
-@@ -17,6 +17,8 @@ |
| 237 |
- CPPFLAGS="" |
| 238 |
- DEFS="" |
| 239 |
- |
| 240 |
-+PKG_PROG_PKG_CONFIG |
| 241 |
-+ |
| 242 |
- dnl ******************** |
| 243 |
- dnl Checks for programs. |
| 244 |
- dnl ******************** |
| 245 |
-@@ -144,8 +146,7 @@ |
| 246 |
- dnl Check for FreeType2 |
| 247 |
- dnl ******************* |
| 248 |
- |
| 249 |
--AC_CHECK_FT2(6.0.0, |
| 250 |
-- :, |
| 251 |
-+PKG_CHECK_MODULES(FT2, freetype2 >= 6.0.0,, |
| 252 |
- AC_MSG_ERROR([*** Freetype version >= 6.0.0 not found!]) |
| 253 |
- ) |
| 254 |
- |
| 255 |
|
| 256 |
diff --git a/games-rpg/adonthell/files/adonthell-0.3.5-gcc46.patch b/games-rpg/adonthell/files/adonthell-0.3.5-gcc46.patch |
| 257 |
deleted file mode 100644 |
| 258 |
index 7e54ec5ee03..00000000000 |
| 259 |
--- a/games-rpg/adonthell/files/adonthell-0.3.5-gcc46.patch |
| 260 |
+++ /dev/null |
| 261 |
@@ -1,13 +0,0 @@ |
| 262 |
---- a/src/win_event.cc 2011-04-18 08:24:16.000000000 +0200 |
| 263 |
-+++ b/src/win_event.cc 2011-04-18 08:25:18.000000000 +0200 |
| 264 |
-@@ -34,8 +34,9 @@ |
| 265 |
- |
| 266 |
- case DESTROY: |
| 267 |
- { |
| 268 |
-+ Functor0wRet<bool> func0ret; |
| 269 |
- set_callback_destroy ( |
| 270 |
-- makeFunctor (&Functor0wRet<bool>(), *callback, &py_callback::callback_func0ret)); |
| 271 |
-+ makeFunctor (&func0ret, *callback, &py_callback::callback_func0ret)); |
| 272 |
- break; |
| 273 |
- } |
| 274 |
- |
| 275 |
|
| 276 |
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 |
| 277 |
deleted file mode 100644 |
| 278 |
index 7aec808cd5f..00000000000 |
| 279 |
--- a/games-rpg/adonthell/files/adonthell-0.3.5-glibc-2.10.patch |
| 280 |
+++ /dev/null |
| 281 |
@@ -1,22 +0,0 @@ |
| 282 |
-diff -Naurp adonthell-0.3.4-orig/src/dialog.cc adonthell-0.3.4/src/dialog.cc |
| 283 |
---- adonthell-0.3.4-orig/src/dialog.cc 2005-03-10 12:39:41.000000000 -0600 |
| 284 |
-+++ adonthell-0.3.4/src/dialog.cc 2009-07-26 15:57:01.410882131 -0600 |
| 285 |
-@@ -265,7 +265,8 @@ string dialog::scan_string (const char * |
| 286 |
- { |
| 287 |
- u_int32 begin, end, len; |
| 288 |
- PyObject *result; |
| 289 |
-- char *tmp, *start, *mid, *str = NULL; |
| 290 |
-+ const char *start; |
| 291 |
-+ char *tmp, *mid, *str = NULL; |
| 292 |
- character *the_player = data::the_player; |
| 293 |
- string newstr (s); |
| 294 |
- |
| 295 |
-@@ -318,7 +319,7 @@ string dialog::scan_string (const char * |
| 296 |
- |
| 297 |
- // Error! |
| 298 |
- cout << "\n*** Error, unknown macro " << start << flush; |
| 299 |
-- start[0] = ' '; |
| 300 |
-+ newstr[newstr.length () - strlen (start)] = ' '; |
| 301 |
- } |
| 302 |
- |
| 303 |
- // execute python functions |
Archives