EAPI=5

Package-Manager: portage-2.2.14/cvs/Linux x86_64

3 files changed, 23 insertions, 42 deletions

diff --git a/games-puzzle/kiki/ChangeLog b/games-puzzle/kiki/ChangeLog
index 38d42b3c1fb9..745f120041ae 100644
--- a/games-puzzle/kiki/ChangeLog
+++ b/games-puzzle/kiki/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-puzzle/kiki
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/kiki/ChangeLog,v 1.19 2012/04/13 19:21:33 ulm Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/kiki/ChangeLog,v 1.20 2015/04/21 00:43:58 mr_bones_ Exp $
+
+  21 Apr 2015; Michael Sterrett <mr_bones_@gentoo.org> kiki-1.0.2-r2.ebuild:
+  EAPI=5
 
   13 Apr 2012; Ulrich Müller <ulm@gentoo.org> kiki-1.0.2-r2.ebuild:
   Move EAPI assignment to top of ebuild, bug 411875.
@@ -70,4 +73,3 @@
 
   05 Aug 2003; Michael Sterrett <msterret@gentoo.org> kiki-0.9.0.ebuild:
   initial commit.  ebuild supplied by Brent Kelly and modified. (bug 25977)
-
diff --git a/games-puzzle/kiki/Manifest b/games-puzzle/kiki/Manifest
index fc18c9012bfe..0496f9c96c1d 100644
--- a/games-puzzle/kiki/Manifest
+++ b/games-puzzle/kiki/Manifest
@@ -1,29 +1,9 @@
------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
-AUX kiki-1.0.2-gcc46.patch 938 RMD160 13fe528c70271620f0981f75289cb00509fbc609 SHA1 8655c77bbd4af78792d7b6df2759fd093f761fdb SHA256 4a9780173b3dc3151a36e33730b77aa8b5d6991e062965805a69bfc11b33f571
-DIST kiki-1.0.2-src.tgz 3366523 RMD160 78e71cae75f7d6957d06fb8c7323d607bc232499 SHA1 57f8583f7dfd3557524c98131e56e35251fdcc07 SHA256 7651f57543ce61c22bcc01daf6a68e0ab31ba353f9b2fbc067e323bbba6e1246
-EBUILD kiki-1.0.2-r2.ebuild 1853 RMD160 8398d2e9cb256e3db430fe140123f23dd74a8154 SHA1 8547b42859bfddcdf6f1a75c353674f9ff88c12f SHA256 7a1423cfc7263a676248f3a09a7e5f8e070b1f0fd8bfea6bcca7d4ef9139edde
-MISC ChangeLog 2695 RMD160 bec9a759aec376f1dbaafa2df61d2dfb65b49cf8 SHA1 ef81c9074da039b26bab692b4e246b56b9a4be58 SHA256 5ac5786f48ca9a6021c91e75b42109a46a67edaade5a4c4e81cadc264c8e94ed
-MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQIcBAEBAgAGBQJPiH2OAAoJEDxpGckxwJCBmUwQAKaGM7O0AOASypwaqnhgz09f
-Zvt9Qfdc1Xq03KonicVq6Q07oIjx/XzYTBcEkI/e5BaB+hB33m/hSb+Ues4s+AUK
-d2ldV5RJGkgvTnYZs8kNXyWI66DSh/7Vnt4S0kOJw7SfjQYvuuatf4YbELCw854S
-TL4q6KNd4m5Lou0g0A4Wk4biMz9fzkF8XZSO+ovIrJwj2KrZnnS+tnmyB9PRJtdv
-OGm7eUtmuK39zi+6SO/no6fs2u2U7UV5mQqZ/alP5+6n2Thl10MYM9meYUic1Qs4
-1AZo4x5HougKFe9PrG0qu+BI7Ae7Uw7j/Od++QhEGkazDQ4g7M4D/nFXizWl6jBp
-6R0kHBHwVXdO6zTeHhp1cYiJtMlpp3rsLppQHY99o/fccNLh+6ag6cKtcD3MkS0Z
-N00aCzQRwqKoQ0H5AAsnd8VxlDceY8UTDWpQytLOn+9zgtrkTkEwU9PVYP7yDRjM
-0ytq4hpYrhTmmHYliqpCvE9WAg/PfWUxTgAKoitzTYe2M7ksnIifeadvgYhChTQ6
-X1vxt1yYkWUw73F7JKdKutvb2nxb91+n/oz7m5wp7mQ/t/SlTOclijYhjxK7OrnH
-ac3Ds9f03dsFJb08veESTSQ3+brmVe2iWJ6+B0+OMEJkhlmuBAP1Gy9L625YmG6y
-aoUtuzdgJF4RlRmsqVTv
-=RETf
------END PGP SIGNATURE-----
+AUX kiki-1.0.2-build.patch 1374 SHA256 e4c347944b41a10790cc9e994a08d00493fa3549e746cd0137dac75d13189cec SHA512 94d1804ee25aabe711c966750337bcbb178e208e6aceec98d1d42c1bf445c138eb94f42ed87a8c58864c8598355bc52d04d416e978ba4973483d81b3775e1743 WHIRLPOOL c1f4cc8ac83bfc6b7375f4f18d4cf35e736139fc27d1f62525081e3789db29908b7fa35a45d3e3b9633b8f651b2c6c9b1a5cac6379f40d39f3e74bc8ff533ab2
+AUX kiki-1.0.2-freeglut.patch 551 SHA256 163e6662d38043b537724ded5822580afecb7304b46d83f00e1dae315ebdbf7f SHA512 9f8494cfedc4fd3b9f1ec6c8a58ddca2d5b11091ee4077f56a046872d113bfa5fe2386be3f59674ad3d83884e594bbe8d97abdfb0b8021c0c23b85dcc84c76bd WHIRLPOOL 42f69032ca7d298b6421541cf1a45e6d4f2149ff2c034805494a1dea05c696d8818427eb8d6a361628d507b457c87e10d3394528e4c3327d70d1258a971e0457
+AUX kiki-1.0.2-gcc41.patch 308 SHA256 bfa2934dd6849c552f90c5dfa2420dcfce96c493b87e988ae62306f6177c9636 SHA512 66bcc2f192251d3feb07c1011832e0967845d0c9972d7bf72ac97dfa899aa138dd0f4342e440d056aeadafcc09ffdcdb8ed127b81163047418cfbc5ade4a7650 WHIRLPOOL 38cdd355051bbc282e41b7e7f03aee2b4a26a736cb4e2dd1f889a55a3b43dfc0ad91cdd24648ca74806215ac1db2a6c19847a1ce90f8d90ebf6641bd04fe0bbb
+AUX kiki-1.0.2-gcc43.patch 2029 SHA256 4770fa15885dc7906c231039b9749a7d19502a9e23a2390e084e41164eb3721b SHA512 f3611491e82365422a902458a29bace1e4a90dbdc3b1e6566ae5c3c63c2ef92e78fd405a3504e5e9b293b678d1f34b94d126f9d69bda7d4d05a3c2fe6b001267 WHIRLPOOL bb219975e6357d0568a7b4088b8f25c70af4f694d9b38d9946057f4dc65ebaedeb50a8c0d4a375dd641ffeeefebff682a8c2aa74a7354c00b085fe9bf3fea72f
+AUX kiki-1.0.2-gcc46.patch 938 SHA256 4a9780173b3dc3151a36e33730b77aa8b5d6991e062965805a69bfc11b33f571 SHA512 55744358219fd11023cb9d087ab688e603f84d3c8681d3357b3ed6a955edc5163b978cccc0964c48e330196100ca68d19fedd767430980a6ef85d0e023246df8 WHIRLPOOL 618f67f7dfaeb599e1af998a059cd0512e4691299542b6ea7c452e02a941630effbaabb26a929e3b728a06a6eb4ccf579e1b05edce32399ab40d1910486dc24c
+DIST kiki-1.0.2-src.tgz 3366523 SHA256 7651f57543ce61c22bcc01daf6a68e0ab31ba353f9b2fbc067e323bbba6e1246 SHA512 9e5976fee8abcfc8226a158560ead409a68c0eb72d4b5138b10a4fe4ca1fb720972075c4c67f080856a2830fb039fc33151160736bda0b1121c23d9cf4e209c3 WHIRLPOOL 4c7454a43a1bdef285acffad1003f489c753d7afc2aab20b5363db75b906459c00918a9764c2bceb87587bc9b0c28893b166caa7f16e4d1738fe3958082f6d43
+EBUILD kiki-1.0.2-r2.ebuild 1733 SHA256 55068b50107a1407f327a7076ddeb68dc8af61bd71a48e38462b291b55dfa69b SHA512 56b3ad2310a375b2302a797fb46000273ee76f15a3e4a8964fab0b7a9b99ebed1ae820e652cc64d22b409be493b44a042f2969129c7aec63e7a0831a6f69d1e9 WHIRLPOOL cbf00234dab314e64dd8c5d8c2dc9cac2be8dec0ca0c25bb46fbb66683810ad99378f9e574b63962697e1d1a3657f2f348ae7e35655d762018967d4e4955bbcd
+MISC ChangeLog 2787 SHA256 837ec0b7fcc46fe924c01e17b96777db71aaa88adf48f3ca9e7a298a5ab2c6e8 SHA512 416a1f25451313a13d01749b01a0fd951e6ef18e1c17bbb0d7dc76fb3fed01c2bacd4099d39f29835c1ae8152fefc885850d8d3eecb9ba7985f8bceb071dc8ef WHIRLPOOL 6059fcfb0ea0be15b247292d2e6fe70deab3904f63bf13445659d8af8b9563944fd29780206938c1f30aec793fa089b93872cfde99495e482d07fa8e8bdb7191
+MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
diff --git a/games-puzzle/kiki/kiki-1.0.2-r2.ebuild b/games-puzzle/kiki/kiki-1.0.2-r2.ebuild
index b6b0f93c24c1..3b731861475d 100644
--- a/games-puzzle/kiki/kiki-1.0.2-r2.ebuild
+++ b/games-puzzle/kiki/kiki-1.0.2-r2.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 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.8 2012/04/13 19:21:33 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/kiki/kiki-1.0.2-r2.ebuild,v 1.9 2015/04/21 00:43:58 mr_bones_ Exp $
 
-EAPI=2
+EAPI=5
 PYTHON_DEPEND="2"
-
 inherit eutils python toolchain-funcs games
 
 DESCRIPTION="Fun 3D puzzle game using SDL/OpenGL"
@@ -41,8 +40,7 @@ src_prepare() {
 		-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"
+		src/main/KikiController.cpp || die
 
 	# Bug 139570
 	cd SWIG
@@ -52,21 +50,22 @@ src_prepare() {
 }
 
 src_compile() {
-	emake -C kodilib/linux AR="$(tc-getAR)" || die "emake kodilib failed"
-	emake -C linux PYTHON_VERSION="$(python_get_version)" || die "emake linux failed"
+	emake -C kodilib/linux AR="$(tc-getAR)"
+	emake -C linux PYTHON_VERSION="$(python_get_version)"
 }
 
 src_install() {
-	dogamesbin linux/kiki || die "dogamesbin failed"
+	dogamesbin linux/kiki
 
 	insinto "${GAMES_DATADIR}"/${PN}
-	doins -r py sound || die "doins failed"
+	doins -r py sound
 
 	dodoc Readme.txt Thanks.txt
 	prepgamesdirs
 }
 
 pkg_setup() {
+	python_pkg_setup
 	python_set_active_version 2
 	games_pkg_setup
 }