clean out cruft; add freeglut patch from Tristan Heaven for bug #139445

(Portage version: 2.1.1_pre2-r2)
 (Signed Manifest commit)

5 files changed, 19 insertions, 172 deletions

diff --git a/games-puzzle/kiki/Manifest b/games-puzzle/kiki/Manifest
index 678939346653..e6472c2e8b07 100644
--- a/games-puzzle/kiki/Manifest
+++ b/games-puzzle/kiki/Manifest
@@ -1,38 +1,34 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX kiki-1.0.2-freeglut.patch 551 RMD160 b6883f4d68f66aca98d42a3a9eeca61e568f7294 SHA1 4ca546c618246f83a1d6cf37d53f8a3aa5719ad1 SHA256 163e6662d38043b537724ded5822580afecb7304b46d83f00e1dae315ebdbf7f
+MD5 380ce89a54ed8392dae758929be001cf files/kiki-1.0.2-freeglut.patch 551
+RMD160 b6883f4d68f66aca98d42a3a9eeca61e568f7294 files/kiki-1.0.2-freeglut.patch 551
+SHA256 163e6662d38043b537724ded5822580afecb7304b46d83f00e1dae315ebdbf7f files/kiki-1.0.2-freeglut.patch 551
 AUX kiki-1.0.2-gcc41.patch 308 RMD160 ed9831a808a75da349f91830212d1a4a4295cbd3 SHA1 e7d1915e98fd539fab4f777e2d0a08eae779104d SHA256 bfa2934dd6849c552f90c5dfa2420dcfce96c493b87e988ae62306f6177c9636
 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
-DIST kiki-src-0.9.0.tgz 2978977 RMD160 4afe5ba12765f42e612014ebceca7f520dfefdbb SHA1 ef190e31136ca41e7df40059c493b0925b37ff61 SHA256 610e8a131833d0c8a2fcbb0105aa3153c9961cccc530a7685d7f268bb7bbc1e4
-EBUILD kiki-0.9.0-r1.ebuild 2091 RMD160 6f9c7cc0077917bb75e3d54cc5a4fafeb8d636d5 SHA1 ce66dec4f8e772458763f49c6e94b2b8b223d743 SHA256 2493facece7e8a638edff1f7b847ea80ce43c3612462a7f7665f056325cb593b
-MD5 9e72f76b8a2dd407187a37f1289fca6d kiki-0.9.0-r1.ebuild 2091
-RMD160 6f9c7cc0077917bb75e3d54cc5a4fafeb8d636d5 kiki-0.9.0-r1.ebuild 2091
-SHA256 2493facece7e8a638edff1f7b847ea80ce43c3612462a7f7665f056325cb593b kiki-0.9.0-r1.ebuild 2091
-EBUILD kiki-1.0.2.ebuild 1885 RMD160 616e61e834f851dd3b6a6efdb28110871742d37d SHA1 7b013acd336dbd401c79b6045e8d4191095b166c SHA256 eac41cc69cf668b1ac923d322960b026f31b5f4a545b4f1510cd487aa3d6e408
-MD5 2974ac5797d2bcce40da774ac96bd2eb kiki-1.0.2.ebuild 1885
-RMD160 616e61e834f851dd3b6a6efdb28110871742d37d kiki-1.0.2.ebuild 1885
-SHA256 eac41cc69cf668b1ac923d322960b026f31b5f4a545b4f1510cd487aa3d6e408 kiki-1.0.2.ebuild 1885
-MISC ChangeLog 1290 RMD160 317d96d90e612ea3a8ce19ef199749a0c65f1a60 SHA1 3fe6abe9c03859a15729565a48a419f95338fb8d SHA256 37a3881ffa8b54719de8372181aa878a9c81c793fab79cf7d2c326178ba9cefc
-MD5 8d1246fadb9ec7b148eb209f9c91826c ChangeLog 1290
-RMD160 317d96d90e612ea3a8ce19ef199749a0c65f1a60 ChangeLog 1290
-SHA256 37a3881ffa8b54719de8372181aa878a9c81c793fab79cf7d2c326178ba9cefc ChangeLog 1290
+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
 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 446c991addbfd4d44ce8ef36f372cde2 files/digest-kiki-0.9.0-r1 238
-RMD160 9855686d1c091fd1cedff2ca6085e567014a2457 files/digest-kiki-0.9.0-r1 238
-SHA256 8b0e90f6800bb3d2e8ed0876cf1defba1a758303b0b786d1f9def05de2a6954d files/digest-kiki-0.9.0-r1 238
-MD5 98cbce3d6a04bfa13ea5dbebfcad6d26 files/digest-kiki-1.0.2 238
-RMD160 048cab33e0f50af66f1d018d73e7d0beef6c15a6 files/digest-kiki-1.0.2 238
-SHA256 6a738265d834e8771de0587d801257e08e78828f0714fb759423f4d5699e3912 files/digest-kiki-1.0.2 238
+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
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
+Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFEe3Rd2CTtIKiFlQIRAqFvAJ0a9s+QhnwcQsMOZv5uODrbwT5PIwCeK74E
-LeubZ3jdNeiI2upaHsFEfq4=
-=KneN
+iD8DBQFErpm69AbAhSK0CiwRAkdCAKCHUY1YsuJWo+ZYXrHd/hwvYBzm3QCfcyB1
+wCDjFo4UdU3sCL95yPigNkI=
+=eRSw
 -----END PGP SIGNATURE-----
diff --git a/games-puzzle/kiki/files/digest-kiki-0.9.0-r1 b/games-puzzle/kiki/files/digest-kiki-0.9.0-r1
deleted file mode 100644
index 330397ecfbd5..000000000000
--- a/games-puzzle/kiki/files/digest-kiki-0.9.0-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 60ec6bdf0196c9c934f683d3bf7a12ea kiki-src-0.9.0.tgz 2978977
-RMD160 4afe5ba12765f42e612014ebceca7f520dfefdbb kiki-src-0.9.0.tgz 2978977
-SHA256 610e8a131833d0c8a2fcbb0105aa3153c9961cccc530a7685d7f268bb7bbc1e4 kiki-src-0.9.0.tgz 2978977
diff --git a/games-puzzle/kiki/files/digest-kiki-1.0.2 b/games-puzzle/kiki/files/digest-kiki-1.0.2
deleted file mode 100644
index 1162d1e6a149..000000000000
--- a/games-puzzle/kiki/files/digest-kiki-1.0.2
+++ /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-0.9.0-r1.ebuild b/games-puzzle/kiki/kiki-0.9.0-r1.ebuild
deleted file mode 100644
index 3fb1a750541b..000000000000
--- a/games-puzzle/kiki/kiki-0.9.0-r1.ebuild
+++ /dev/null
@@ -1,74 +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-0.9.0-r1.ebuild,v 1.5 2006/03/16 20:45:25 tupone Exp $
-
-inherit python games
-
-DATA="${GAMES_DATADIR}/${PN}"
-DESCRIPTION="Fun 3D puzzle game using SDL/OpenGL"
-HOMEPAGE="http://kiki.sourceforge.net/"
-SRC_URI="mirror://sourceforge/kiki/${PN}-src-${PV}.tgz"
-
-LICENSE="public-domain"
-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
-		virtual/glut"
-DEPEND="${RDEPEND}
-	>=sys-devel/gcc-3"
-
-S=${WORKDIR}
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	# There are CVS directories in the tgz file
-	rm -rf $(find -name CVS -type d)
-	rm -rf $(find -name .cvsignore)
-	chmod a-x kiki_src/kiki/sounds/*.*
-
-	# Change the hard-coded data dir for sounds, etc...
-	sed -i \
-		-e "s:kiki_home += \"/\";:kiki_home = \"${DATA}/\";:g" \
-		-e "s:KConsole\:\:printf(\"WARNING \:\: environment variable KIKI_HOME not set ...\");::g" \
-		-e "s:KConsole\:\:printf(\"           ... assuming resources in current directory\");::g" \
-		kiki_src/kiki/src/main/KikiController.cpp \
-		|| die "sed KikiController.cpp failed"
-	sed -i \
-		-e 's/import random/import random, types/' \
-		kiki_src/kiki/py/world.py \
-		|| die "sed world.py failed"
-	python_version
-	sed -i \
-		-e "/^PYTHON_VERSION/s/2.2/${PYVER}/" \
-		-e '/lib-dynload/d' \
-		-e '/^PYTHONLIBS/s:\\:-lpython$(PYTHON_VERSION):' \
-		kiki_src/kiki/linux/Makefile \
-		|| die "sed kiki_src/kiki/linux/Makefile failed"
-}
-
-
-src_compile() {
-	cd "${S}/kiki_src/kodilib/linux"
-	emake || die "emake in kodilib/linux failed"
-	cd "${S}/kiki_src/kiki/linux"
-	emake || die "emake in kiki/linux failed"
-}
-
-src_install() {
-	dogamesbin kiki_src/kiki/linux/kiki || die "dogamesbin failed"
-
-	dodir "${DATA}/misc" "${DATA}/py" "${DATA}/sounds"
-	cp -R "${S}/kiki_src/kiki/"{misc,py,sounds} "${D}${DATA}" \
-		|| die "cp failed"
-
-	cd "${S}/kiki_src/kiki"
-	dodoc Readme.txt Thanks.txt "uDevGame Readme.txt"
-	prepgamesdirs
-}
diff --git a/games-puzzle/kiki/kiki-1.0.2.ebuild b/games-puzzle/kiki/kiki-1.0.2.ebuild
deleted file mode 100644
index adf6d5c6e740..000000000000
--- a/games-puzzle/kiki/kiki-1.0.2.ebuild
+++ /dev/null
@@ -1,69 +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.ebuild,v 1.2 2006/05/07 21:32:51 tupone 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
-	# 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
-}