diff options
Diffstat (limited to 'games-puzzle')
| -rw-r--r-- | games-puzzle/kiki/ChangeLog | 8 | ||||
| -rw-r--r-- | games-puzzle/kiki/Manifest | 15 | ||||
| -rw-r--r-- | games-puzzle/kiki/files/kiki-1.0.2-build.patch | 45 | ||||
| -rw-r--r-- | games-puzzle/kiki/kiki-1.0.2-r2.ebuild | 44 |
4 files changed, 83 insertions, 29 deletions
diff --git a/games-puzzle/kiki/ChangeLog b/games-puzzle/kiki/ChangeLog index 2e8af68609a6..8473f1de9647 100644 --- a/games-puzzle/kiki/ChangeLog +++ b/games-puzzle/kiki/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-puzzle/kiki -# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-puzzle/kiki/ChangeLog,v 1.14 2008/11/18 22:38:40 mr_bones_ Exp $ +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-puzzle/kiki/ChangeLog,v 1.15 2009/06/16 20:28:29 nyhm Exp $ + + 16 Jun 2009; Tristan Heaven <nyhm@gentoo.org> kiki-1.0.2-r2.ebuild, + +files/kiki-1.0.2-build.patch: + Fix building with latest python versions, bug #273600 18 Nov 2008; Michael Sterrett <mr_bones_@gentoo.org> +files/kiki-1.0.2-gcc43.patch, kiki-1.0.2-r2.ebuild: diff --git a/games-puzzle/kiki/Manifest b/games-puzzle/kiki/Manifest index 65a14ef82881..512af386ff5b 100644 --- a/games-puzzle/kiki/Manifest +++ b/games-puzzle/kiki/Manifest @@ -1,7 +1,18 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +AUX kiki-1.0.2-build.patch 1374 RMD160 cc74d64c5ca953e80667fb95890b385583d422b3 SHA1 966b54721f6c16d89e028eb0f1536dcb12c50b7f SHA256 e4c347944b41a10790cc9e994a08d00493fa3549e746cd0137dac75d13189cec AUX kiki-1.0.2-freeglut.patch 551 RMD160 b6883f4d68f66aca98d42a3a9eeca61e568f7294 SHA1 4ca546c618246f83a1d6cf37d53f8a3aa5719ad1 SHA256 163e6662d38043b537724ded5822580afecb7304b46d83f00e1dae315ebdbf7f AUX kiki-1.0.2-gcc41.patch 308 RMD160 ed9831a808a75da349f91830212d1a4a4295cbd3 SHA1 e7d1915e98fd539fab4f777e2d0a08eae779104d SHA256 bfa2934dd6849c552f90c5dfa2420dcfce96c493b87e988ae62306f6177c9636 AUX kiki-1.0.2-gcc43.patch 2029 RMD160 003a9634db96e2081d683e3db1ffcbf0b6a6ec51 SHA1 77e8acaa2fcaceb9c125e1415676f375fd92de16 SHA256 4770fa15885dc7906c231039b9749a7d19502a9e23a2390e084e41164eb3721b DIST kiki-1.0.2-src.tgz 3366523 RMD160 78e71cae75f7d6957d06fb8c7323d607bc232499 SHA1 57f8583f7dfd3557524c98131e56e35251fdcc07 SHA256 7651f57543ce61c22bcc01daf6a68e0ab31ba353f9b2fbc067e323bbba6e1246 -EBUILD kiki-1.0.2-r2.ebuild 1992 RMD160 63ffe8e14f118848941998fd24b790e779022c30 SHA1 9907fea526832d3d79d1bb66c76fc553970337de SHA256 dfce5fc1c3a1d01aa0f3deafdf35471acc1e622c00764b5678af12634f3b173b -MISC ChangeLog 2015 RMD160 09d238deb2f2c7d0e67d26b9211069d30de44293 SHA1 631df3f087a0cd20ef077449f2b7160d16976e99 SHA256 6d06a8241776a6091a414da8830043a4c88068196392bbf595bb88685a02132c +EBUILD kiki-1.0.2-r2.ebuild 1746 RMD160 9b7750739b4422f3fce82268bfa3ce898e6a33d4 SHA1 c98c3c77ca6892e34633736b8eb258492c573c11 SHA256 cd84ff763604b3973efe1e12ed1cfeae72117ba0add0e87f6f3999265701d901 +MISC ChangeLog 2170 RMD160 16984a5b5adf5e780d9a6e36a1412ff9a5e2ce55 SHA1 47966c722e04de0b42b6083d0cd56289b14f5714 SHA256 d20f631da7eff910eb7df7d8fea3ffdd000f741e7adb840ac9543eac811128c3 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.11 (GNU/Linux) + +iEYEARECAAYFAko4AHMACgkQdz7hIScOURGh4QCfRnlHEgC1RG+/+KEopKMb0+RJ +6TUAn3cf4RTYh66Ur/8DRBT+ruiVqMlb +=+Ed6 +-----END PGP SIGNATURE----- diff --git a/games-puzzle/kiki/files/kiki-1.0.2-build.patch b/games-puzzle/kiki/files/kiki-1.0.2-build.patch new file mode 100644 index 000000000000..b3798678f81a --- /dev/null +++ b/games-puzzle/kiki/files/kiki-1.0.2-build.patch @@ -0,0 +1,45 @@ +--- kodilib/linux/Makefile ++++ 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 \
+--- linux/Makefile ++++ 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/kiki-1.0.2-r2.ebuild b/games-puzzle/kiki/kiki-1.0.2-r2.ebuild index 17f8c8adcb11..7d9b9900b7a1 100644 --- a/games-puzzle/kiki/kiki-1.0.2-r2.ebuild +++ b/games-puzzle/kiki/kiki-1.0.2-r2.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-puzzle/kiki/kiki-1.0.2-r2.ebuild,v 1.3 2008/11/18 22:38:40 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-puzzle/kiki/kiki-1.0.2-r2.ebuild,v 1.4 2009/06/16 20:28:29 nyhm Exp $ +EAPI=2 inherit eutils python toolchain-funcs games DESCRIPTION="Fun 3D puzzle game using SDL/OpenGL" @@ -13,26 +14,26 @@ SLOT="0" KEYWORDS="ppc x86" IUSE="" -RDEPEND=">=media-libs/libsdl-1.2 - >=media-libs/sdl-image-1.2.2 - >=media-libs/sdl-mixer-1.2.5 - >=dev-lang/python-2.2 +RDEPEND="media-libs/libsdl[opengl] + media-libs/sdl-image + media-libs/sdl-mixer + dev-lang/python + virtual/opengl + virtual/glu virtual/glut" DEPEND="${RDEPEND} dev-lang/swig" S=${WORKDIR}/${PN} -src_unpack() { - unpack ${A} - cd "${S}" +src_prepare() { epatch \ - "${FILESDIR}/${P}"-gcc41.patch \ - "${FILESDIR}/${P}"-freeglut.patch \ - "${FILESDIR}/${P}"-gcc43.patch - # There are CVS directories in the tgz file - rm -rf $(find -name CVS -type d) - rm -rf $(find -name .cvsignore) + "${FILESDIR}"/${P}-gcc41.patch \ + "${FILESDIR}"/${P}-freeglut.patch \ + "${FILESDIR}"/${P}-gcc43.patch \ + "${FILESDIR}"/${P}-build.patch + ecvs_clean + rm -f py/runkiki # Change the hard-coded data dir for sounds, etc... sed -i \ @@ -41,13 +42,6 @@ src_unpack() { -e "s:KConsole\:\:printf(\" ... assuming resources in current directory\");::g" \ src/main/KikiController.cpp \ || die "sed KikiController.cpp failed" - python_version - sed -i \ - -e "/^PYTHON_VERSION/s/2.3/${PYVER}/" \ - -e '/lib-dynload/d' \ - -e '/^PYTHONLIBS/s:\\:-lpython$(PYTHON_VERSION):' \ - linux/Makefile \ - || die "sed kiki_src/kiki/linux/Makefile failed" # Bug 139570 cd SWIG @@ -56,9 +50,9 @@ src_unpack() { } src_compile() { - tc-export AR CXX - emake -C kodilib/linux || die "emake in kodilib/linux failed" - emake -C linux || die "emake in linux failed" + emake -C kodilib/linux AR="$(tc-getAR)" || die "emake kodilib failed" + python_version + emake -C linux PYTHON_VERSION="${PYVER}" || die "emake linux failed" } src_install() { |