From 8a80e4d6494b79d4b5d82f71d7fcdf6a29cd3597 Mon Sep 17 00:00:00 2001 From: Michał Górny Date: Sat, 25 Mar 2017 09:30:56 +0100 Subject: games-puzzle/kiki: Remove last-rited pkg --- games-puzzle/kiki/Manifest | 1 - games-puzzle/kiki/files/kiki-1.0.2-build.patch | 45 -------------- games-puzzle/kiki/files/kiki-1.0.2-freeglut.patch | 19 ------ games-puzzle/kiki/files/kiki-1.0.2-gcc41.patch | 10 --- games-puzzle/kiki/files/kiki-1.0.2-gcc43.patch | 56 ----------------- games-puzzle/kiki/files/kiki-1.0.2-gcc46.patch | 22 ------- games-puzzle/kiki/kiki-1.0.2-r3.ebuild | 76 ----------------------- games-puzzle/kiki/metadata.xml | 11 ---- profiles/package.mask | 5 -- 9 files changed, 245 deletions(-) delete mode 100644 games-puzzle/kiki/Manifest delete mode 100644 games-puzzle/kiki/files/kiki-1.0.2-build.patch delete mode 100644 games-puzzle/kiki/files/kiki-1.0.2-freeglut.patch delete mode 100644 games-puzzle/kiki/files/kiki-1.0.2-gcc41.patch delete mode 100644 games-puzzle/kiki/files/kiki-1.0.2-gcc43.patch delete mode 100644 games-puzzle/kiki/files/kiki-1.0.2-gcc46.patch delete mode 100644 games-puzzle/kiki/kiki-1.0.2-r3.ebuild delete mode 100644 games-puzzle/kiki/metadata.xml diff --git a/games-puzzle/kiki/Manifest b/games-puzzle/kiki/Manifest deleted file mode 100644 index db1417db59b6..000000000000 --- a/games-puzzle/kiki/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST kiki-1.0.2-src.tgz 3366523 SHA256 7651f57543ce61c22bcc01daf6a68e0ab31ba353f9b2fbc067e323bbba6e1246 SHA512 9e5976fee8abcfc8226a158560ead409a68c0eb72d4b5138b10a4fe4ca1fb720972075c4c67f080856a2830fb039fc33151160736bda0b1121c23d9cf4e209c3 WHIRLPOOL 4c7454a43a1bdef285acffad1003f489c753d7afc2aab20b5363db75b906459c00918a9764c2bceb87587bc9b0c28893b166caa7f16e4d1738fe3958082f6d43 diff --git a/games-puzzle/kiki/files/kiki-1.0.2-build.patch b/games-puzzle/kiki/files/kiki-1.0.2-build.patch deleted file mode 100644 index 7510843272b3..000000000000 --- a/games-puzzle/kiki/files/kiki-1.0.2-build.patch +++ /dev/null @@ -1,45 +0,0 @@ ---- a/kodilib/linux/Makefile -+++ b/kodilib/linux/Makefile -@@ -21,7 +21,7 @@ - - INCLUDES = $(KODI_INCLUDES) $(X11_INCLUDES) $(SDL_INCLUDES) - --CXXFLAGS = $(INCLUDES) $(SDL_CFLAGS) -+CXXFLAGS += $(INCLUDES) $(SDL_CFLAGS) - - src = \ - $(KODISRCDIR)/handler/KEventHandler.cpp \ ---- a/linux/Makefile -+++ b/linux/Makefile -@@ -14,11 +14,7 @@ - - GLLIBS = -lglut -lGLU -lGL - --PYTHONHOME = /usr/lib/python$(PYTHON_VERSION)/ --PYTHONLIBS = $(PYTHONHOME)/config/libpython$(PYTHON_VERSION).a -lutil \ -- $(PYTHONHOME)/lib-dynload/math.so \ -- $(PYTHONHOME)/lib-dynload/time.so \ -- $(PYTHONHOME)/lib-dynload/_random.so -+PYTHONLIBS = -lpython$(PYTHON_VERSION) -lutil - - # change this, if the kodilib directory isn't parallel to the kiki directory - -@@ -46,7 +42,7 @@ - - INCLUDES = $(KIKI_INCLUDES) $(X11_INCLUDES) $(PYTHON_INCLUDES) - --CXXFLAGS = $(INCLUDES) $(SDLCFLAGS) -+CXXFLAGS += $(INCLUDES) $(SDLCFLAGS) - - src = \ - $(KIKISRC)/base/KikiAction.cpp \ -@@ -105,8 +101,7 @@ - obj = $(src:.cpp=.o) - - kiki: $(KIKISRC)/../SWIG/KikiPy_wrap.cpp $(obj) -- -(cd ../SWIG; swig -c++ -python -globals kiki -o KikiPy_wrap.cpp KikiPy.i; cp kiki.py ../py) -- $(CXX) $(obj) $(KODILIB) -o kiki $(GLLIBS) $(SDLLIBS) $(PYTHONLIBS) -+ $(CXX) $(CXXFLAGS) $(LDFLAGS) $(obj) $(KODILIB) -o kiki $(GLLIBS) $(SDLLIBS) $(PYTHONLIBS) - - obj-clean: - $(RM) -f $(obj) diff --git a/games-puzzle/kiki/files/kiki-1.0.2-freeglut.patch b/games-puzzle/kiki/files/kiki-1.0.2-freeglut.patch deleted file mode 100644 index bd40acb5c682..000000000000 --- a/games-puzzle/kiki/files/kiki-1.0.2-freeglut.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/src/main/main.cpp.orig 2003-04-11 14:42:29.000000000 +0100 -+++ b/src/main/main.cpp 2006-07-06 19:37:55.000000000 +0100 -@@ -9,6 +9,7 @@ - #include - - #include -+#include - #include "KikiController.h" - - // __________________________________________________________________________________________________ -@@ -19,6 +20,8 @@ - int width, height; - SDL_Surface * screen; - -+ glutInit(&argc, argv); -+ - // initialize SDL - if ( SDL_Init(SDL_INIT_VIDEO | SDL_INIT_VIDEO) < 0 ) // SDL_INIT_TIMER - { diff --git a/games-puzzle/kiki/files/kiki-1.0.2-gcc41.patch b/games-puzzle/kiki/files/kiki-1.0.2-gcc41.patch deleted file mode 100644 index 1c9dd35aabb6..000000000000 --- a/games-puzzle/kiki/files/kiki-1.0.2-gcc41.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/src/main/KikiPythonWidget.h.old 2006-05-07 23:14:09.000000000 +0200 -+++ b/src/main/KikiPythonWidget.h 2006-05-07 23:17:20.000000000 +0200 -@@ -9,6 +9,7 @@ - #include "KikiPos.h" - #include - -+class KikiPython; - class KikiPythonWidget : public KTextField - { - friend class KikiPython; diff --git a/games-puzzle/kiki/files/kiki-1.0.2-gcc43.patch b/games-puzzle/kiki/files/kiki-1.0.2-gcc43.patch deleted file mode 100644 index baa04f2ff98e..000000000000 --- a/games-puzzle/kiki/files/kiki-1.0.2-gcc43.patch +++ /dev/null @@ -1,56 +0,0 @@ ---- kiki/kodilib/src/handler/KPickable.h.orig 2003-04-09 05:56:01.000000000 +0300 -+++ kiki/kodilib/src/handler/KPickable.h 2008-10-18 17:23:42.000000000 +0300 -@@ -9,6 +9,8 @@ - #include "KIntrospection.h" - #include - -+#include -+ - #define DEBUG_PICKING false - - class KPickable; ---- kiki/kodilib/src/tools/KIntrospection.h.orig 2003-04-09 05:56:03.000000000 +0300 -+++ kiki/kodilib/src/tools/KIntrospection.h 2008-10-18 17:22:03.000000000 +0300 -@@ -11,6 +11,7 @@ - #endif - - #include -+#include - - // -------------------------------------------------------------------------------------------------------- - class KClassInfo ---- kiki/kodilib/src/tools/KStringTools.cpp.orig 2003-04-14 00:42:13.000000000 +0300 -+++ kiki/kodilib/src/tools/KStringTools.cpp 2008-10-18 17:25:48.000000000 +0300 -@@ -6,9 +6,10 @@ - #include "KStringTools.h" - #include "KVector.h" - --#include // INT_MAX - #include - -+#include // INT_MAX -+ - // -------------------------------------------------------------------------------------------------------- - void kStringInsertStringBehindTags ( std::string & str, const std::string & insertString, - const std::string & tag ) ---- kiki/kodilib/src/tools/KStringTools.h.orig 2003-04-09 05:56:04.000000000 +0300 -+++ kiki/kodilib/src/tools/KStringTools.h 2008-10-18 17:22:49.000000000 +0300 -@@ -7,6 +7,7 @@ - #define __KStringTools - - #include -+#include - #include - #include - ---- kiki/kodilib/src/tools/KXMLTools.cpp.orig 2003-04-14 00:42:13.000000000 +0300 -+++ kiki/kodilib/src/tools/KXMLTools.cpp 2008-10-18 17:26:42.000000000 +0300 -@@ -8,6 +8,8 @@ - #include "KSeparatedMatrix.h" - #include - -+#include -+ - // -------------------------------------------------------------------------------------------------------- - std::string kXMLTag ( const std::string & name, const std::string & attributes, int depth ) - { diff --git a/games-puzzle/kiki/files/kiki-1.0.2-gcc46.patch b/games-puzzle/kiki/files/kiki-1.0.2-gcc46.patch deleted file mode 100644 index 457c6d68ae02..000000000000 --- a/games-puzzle/kiki/files/kiki-1.0.2-gcc46.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- SWIG/KikiPy_wrap.cpp.old 2011-04-20 14:48:38.000000000 +0200 -+++ SWIG/KikiPy_wrap.cpp 2011-04-20 15:15:08.000000000 +0200 -@@ -12968,7 +12968,7 @@ - void *argp1 = 0 ; - int res1 = 0 ; - PyObject * obj0 = 0 ; -- std::string *result = 0 ; -+ std::string result ; - - if (!PyArg_ParseTuple(args,(char *)"O:KikiText_getText",&obj0)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_KikiText, 0 | 0 ); -@@ -12976,8 +12976,8 @@ - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "KikiText_getText" "', argument " "1"" of type '" "KikiText const *""'"); - } - arg1 = reinterpret_cast< KikiText * >(argp1); -- result = (std::string *) &((KikiText const *)arg1)->getText(); -- resultobj = SWIG_From_std_string(static_cast< std::string >(*result)); -+ result = ((KikiText const *)arg1)->getText(); -+ resultobj = SWIG_From_std_string(static_cast< std::string >(result)); - return resultobj; - fail: - return NULL; diff --git a/games-puzzle/kiki/kiki-1.0.2-r3.ebuild b/games-puzzle/kiki/kiki-1.0.2-r3.ebuild deleted file mode 100644 index 857419c8a94a..000000000000 --- a/games-puzzle/kiki/kiki-1.0.2-r3.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) - -inherit python-single-r1 toolchain-funcs - -DESCRIPTION="Fun 3D puzzle game using SDL/OpenGL" -HOMEPAGE="http://kiki.sourceforge.net/" -SRC_URI="mirror://sourceforge/kiki/${P}-src.tgz" - -LICENSE="public-domain" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND=" - media-libs/libsdl[opengl] - media-libs/sdl-image - media-libs/sdl-mixer - virtual/opengl - virtual/glu - media-libs/freeglut - ${PYTHON_DEPS}" -DEPEND="${RDEPEND} - dev-lang/swig" - -S=${WORKDIR}/${PN} - -PATCHES=( - "${FILESDIR}"/${P}-gcc41.patch - "${FILESDIR}"/${P}-freeglut.patch - "${FILESDIR}"/${P}-gcc43.patch - "${FILESDIR}"/${P}-build.patch -) - -src_prepare() { - default - - rm -f py/runkiki || die - - # Change the hard-coded data dir for sounds, etc... - sed -i \ - -e "s:kiki_home += /;:kiki_home = /usr/share/${PN}/;:g" \ - -e "s:KConsole\:\:printf(\"WARNING \:\: environment variable KIKI_HOME not set ...\");::g" \ - -e "s:KConsole\:\:printf(\" ... assuming resources in current directory\");::g" \ - src/main/KikiController.cpp || die - - # Bug 139570 - cd SWIG || die - swig -c++ -python -globals kiki -o KikiPy_wrap.cpp KikiPy.i || die - cp -f kiki.py ../py || die - eapply "${FILESDIR}"/${P}-gcc46.patch -} - -src_compile() { - tc-export AR CXX - - emake -C kodilib/linux - emake -C linux PYTHON_VERSION="${EPYTHON#python}" -} - -src_install() { - dobin linux/kiki - - insinto /usr/share/${PN} - doins -r sound - - python_moduleinto ${PN} - python_domodule py/. - - dodoc Readme.txt Thanks.txt -} diff --git a/games-puzzle/kiki/metadata.xml b/games-puzzle/kiki/metadata.xml deleted file mode 100644 index 10a8cdefb4c0..000000000000 --- a/games-puzzle/kiki/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - games@gentoo.org - Gentoo Games Project - - - kiki - - diff --git a/profiles/package.mask b/profiles/package.mask index 4e64b19daada..5e3ece82d4c3 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -297,11 +297,6 @@ media-fonts/acroread-asianfonts # Revdeps need patching. >=media-gfx/libopenraw-0.1.0 -# David Seifert (18 Feb 2017) -# Awful codebase, pointer-to-int-casts, SDL1 -# Masked for removal in 30 days -games-puzzle/kiki - # Kent Fredric (04 Feb 2017) # Unsecure versions that have been only restored to tree # to resolve compatibility problems with mail-filter/amavisd-new -- cgit v1.2.3-65-gdbad