Fix for new swig versions, bug #139570 by onur@pardus.org.tr

(Portage version: 2.1.2_rc1-r6)
 (Signed Manifest commit)

3 files changed, 15 insertions, 88 deletions

diff --git a/games-puzzle/kiki/Manifest b/games-puzzle/kiki/Manifest
index e6472c2e8b07..2b980fe09dea 100644
--- a/games-puzzle/kiki/Manifest
+++ b/games-puzzle/kiki/Manifest
@@ -10,25 +10,25 @@ MD5 5552203a107efad60340d522ef36b5e9 files/kiki-1.0.2-gcc41.patch 308
 RMD160 ed9831a808a75da349f91830212d1a4a4295cbd3 files/kiki-1.0.2-gcc41.patch 308
 SHA256 bfa2934dd6849c552f90c5dfa2420dcfce96c493b87e988ae62306f6177c9636 files/kiki-1.0.2-gcc41.patch 308
 DIST kiki-1.0.2-src.tgz 3366523 RMD160 78e71cae75f7d6957d06fb8c7323d607bc232499 SHA1 57f8583f7dfd3557524c98131e56e35251fdcc07 SHA256 7651f57543ce61c22bcc01daf6a68e0ab31ba353f9b2fbc067e323bbba6e1246
-EBUILD kiki-1.0.2-r1.ebuild 1923 RMD160 e8e2713b2fa5b26c1645b1f2b3b2dbb201406ed9 SHA1 13673527e07620322294e6814e9932ea1ce769d8 SHA256 907f293d64d0c0540a36b2a84a59e7da23f23175808d297299ceb96a0ea10a2c
-MD5 0e8d47a687aa409a98f2cac94a996c67 kiki-1.0.2-r1.ebuild 1923
-RMD160 e8e2713b2fa5b26c1645b1f2b3b2dbb201406ed9 kiki-1.0.2-r1.ebuild 1923
-SHA256 907f293d64d0c0540a36b2a84a59e7da23f23175808d297299ceb96a0ea10a2c kiki-1.0.2-r1.ebuild 1923
-MISC ChangeLog 1557 RMD160 db463b2564a8f276e0b6bcaa041aa6a1a1a163fb SHA1 ae87c043a0ed969ef4e5211a8a8932fb38c9a730 SHA256 fa8ca28b94c0ca5796a29239a818f33ee74af4fd79aa85a4cb7b7ead7d57ca9e
-MD5 ba631d8c9b9c1c67ffe1bace22730290 ChangeLog 1557
-RMD160 db463b2564a8f276e0b6bcaa041aa6a1a1a163fb ChangeLog 1557
-SHA256 fa8ca28b94c0ca5796a29239a818f33ee74af4fd79aa85a4cb7b7ead7d57ca9e ChangeLog 1557
+EBUILD kiki-1.0.2-r2.ebuild 1931 RMD160 8bea05e66497d5ff4d93b2bdc7ea8ed4e3184b65 SHA1 81397b0964c0c5877e1c047ad5316113d1c87873 SHA256 01b03cf39e12927e51c3387a283b59e6a3cc81d645bc59fc8e6c7fbeb132ca83
+MD5 075a27ca0280ecdc1398d4bcf7d69e5f kiki-1.0.2-r2.ebuild 1931
+RMD160 8bea05e66497d5ff4d93b2bdc7ea8ed4e3184b65 kiki-1.0.2-r2.ebuild 1931
+SHA256 01b03cf39e12927e51c3387a283b59e6a3cc81d645bc59fc8e6c7fbeb132ca83 kiki-1.0.2-r2.ebuild 1931
+MISC ChangeLog 1742 RMD160 637152ae3b580c03ca87115db933c020e4ed9269 SHA1 34e32f7c285e901043bcbd0790d95a65372a79d1 SHA256 b50df51e881cfa827424148a4dca8a0d5908ae16275cf70acc58fba9ce5813c0
+MD5 a2e20b9310a6979f7388e299d5f14dea ChangeLog 1742
+RMD160 637152ae3b580c03ca87115db933c020e4ed9269 ChangeLog 1742
+SHA256 b50df51e881cfa827424148a4dca8a0d5908ae16275cf70acc58fba9ce5813c0 ChangeLog 1742
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
-MD5 98cbce3d6a04bfa13ea5dbebfcad6d26 files/digest-kiki-1.0.2-r1 238
-RMD160 048cab33e0f50af66f1d018d73e7d0beef6c15a6 files/digest-kiki-1.0.2-r1 238
-SHA256 6a738265d834e8771de0587d801257e08e78828f0714fb759423f4d5699e3912 files/digest-kiki-1.0.2-r1 238
+MD5 98cbce3d6a04bfa13ea5dbebfcad6d26 files/digest-kiki-1.0.2-r2 238
+RMD160 048cab33e0f50af66f1d018d73e7d0beef6c15a6 files/digest-kiki-1.0.2-r2 238
+SHA256 6a738265d834e8771de0587d801257e08e78828f0714fb759423f4d5699e3912 files/digest-kiki-1.0.2-r2 238
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFErpm69AbAhSK0CiwRAkdCAKCHUY1YsuJWo+ZYXrHd/hwvYBzm3QCfcyB1
-wCDjFo4UdU3sCL95yPigNkI=
-=eRSw
+iD8DBQFFWGIsdz7hIScOURERAsPQAKDPCYbImeRoWT2UmVzDtdLukz0vhwCgqXvx
+z6eEh5gnb864GZ8SQ1bXv3I=
+=O+4d
 -----END PGP SIGNATURE-----
diff --git a/games-puzzle/kiki/files/digest-kiki-1.0.2-r1 b/games-puzzle/kiki/files/digest-kiki-1.0.2-r1
deleted file mode 100644
index 1162d1e6a149..000000000000
--- a/games-puzzle/kiki/files/digest-kiki-1.0.2-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 eb4966eae85d3a073aab521bf1ba33e2 kiki-1.0.2-src.tgz 3366523
-RMD160 78e71cae75f7d6957d06fb8c7323d607bc232499 kiki-1.0.2-src.tgz 3366523
-SHA256 7651f57543ce61c22bcc01daf6a68e0ab31ba353f9b2fbc067e323bbba6e1246 kiki-1.0.2-src.tgz 3366523
diff --git a/games-puzzle/kiki/kiki-1.0.2-r1.ebuild b/games-puzzle/kiki/kiki-1.0.2-r1.ebuild
deleted file mode 100644
index 4a2ccac18725..000000000000
--- a/games-puzzle/kiki/kiki-1.0.2-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2006 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-r1.ebuild,v 1.1 2006/07/07 17:28:12 mr_bones_ Exp $
-
-inherit eutils python games
-
-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="ppc x86"
-IUSE=""
-
-DEPEND=">=media-libs/libsdl-1.2
-	>=media-libs/sdl-image-1.2.2
-	>=media-libs/sdl-mixer-1.2.5
-	>=dev-lang/python-2.2
-	virtual/glut"
-
-S=${WORKDIR}/${PN}
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	epatch "${FILESDIR}/${P}"-gcc41.patch \
-		"${FILESDIR}/${P}"-freeglut.patch
-	# There are CVS directories in the tgz file
-	rm -rf $(find -name CVS -type d)
-	rm -rf $(find -name .cvsignore)
-	rm *.dll Readme.rtf uDevGame\ Readme.txt
-	edos2unix Readme.txt Thanks.txt Thanks.txt
-	chmod a-x sound/*.*
-
-	# Change the hard-coded data dir for sounds, etc...
-	sed -i \
-		-e "s:kiki_home += \"/\";:kiki_home = \"${GAMES_DATADIR}/${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 "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"
-}
-
-
-src_compile() {
-	cd kodilib/linux
-	emake || die "emake in kodilib/linux failed"
-	cd ../../linux
-	emake || die "emake in linux failed"
-}
-
-src_install() {
-	dogamesbin linux/kiki || die "dogamesbin failed"
-
-	dodir "${GAMES_DATADIR}/${PN}"/{py,sound}
-	cp -R py sound "${D}${GAMES_DATADIR}/${PN}" \
-		|| die "cp failed"
-
-	dodoc Readme.txt Thanks.txt
-	prepgamesdirs
-}