EAPI=5; tidy

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

3 files changed, 38 insertions, 24 deletions

diff --git a/games-misc/OilWar/ChangeLog b/games-misc/OilWar/ChangeLog
index 727b51e981e7..d974568b1361 100644
--- a/games-misc/OilWar/ChangeLog
+++ b/games-misc/OilWar/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-misc/OilWar
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-misc/OilWar/ChangeLog,v 1.9 2008/10/07 17:21:27 mr_bones_ Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-misc/OilWar/ChangeLog,v 1.10 2013/11/12 01:53:15 mr_bones_ Exp $
+
+  12 Nov 2013; Michael Sterrett <mr_bones_@gentoo.org> OilWar-1.2.1-r1.ebuild:
+  EAPI=5; tidy
 
   07 Oct 2008; Michael Sterrett <mr_bones_@gentoo.org>
   OilWar-1.2.1-r1.ebuild:
diff --git a/games-misc/OilWar/Manifest b/games-misc/OilWar/Manifest
index 22e5d680e4ea..0a1fe2718808 100644
--- a/games-misc/OilWar/Manifest
+++ b/games-misc/OilWar/Manifest
@@ -1,5 +1,5 @@
-DIST OilWar-1.2.1.tar.gz 515013 RMD160 c59713f00d00da025f01d1daa34bf514d035d8d4 SHA1 57193eccb2ac3244705b9c208876df0ebdc6cb8b SHA256 e16ffd11439dfc857daaa98cf8a266b24794a4fbb1e84c1558794ffb622b5c63
-DIST OilWar.png 2961 RMD160 9a17e3bbd4e035aad4122ff9f0fef0d6b5af7b9c SHA1 7b4016c735c729156d495b035d3c4b89546dfa65 SHA256 f1e77e048b979b493fb9e3c48fc6a8d643836f121775f3cc4d64321260377e1a
-EBUILD OilWar-1.2.1-r1.ebuild 1164 RMD160 ac632bd7f1b20c22a8b55187dceacdeb6bf195c4 SHA1 c1f78fa2b7f08aac4e2df197a86f0b36bf4bcbbc SHA256 7bf1da0b764aa3a517a818e9b484e96bbfaeced5543eaf750fa50e2b264cbeff
-MISC ChangeLog 1132 RMD160 f11aa4a484d4bc34c577f121e7873be5f385fa7e SHA1 017af03669b21f00d8b89f847817e856b39bf648 SHA256 990d0276f8febe06d7d84bd2fc4124a70e730517c39d467ed1d113e8961989e6
-MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
+DIST OilWar-1.2.1.tar.gz 515013 SHA256 e16ffd11439dfc857daaa98cf8a266b24794a4fbb1e84c1558794ffb622b5c63 SHA512 303581caf1cb59a4623b136595e0c1af6f682ae4c059a8848b481b42dee622083d436edb86ca9073edcf4c573f8a73b284dddea89cb8013943ef4ec81b3e17a1 WHIRLPOOL 5447c0af48b55e939b188e6351b63b3f3050fe3f7529026604194c95c84fcb2a254e33b39b55dd44391af81c62305aeac5864204104f8612813078d31be04db1
+DIST OilWar.png 2961 SHA256 f1e77e048b979b493fb9e3c48fc6a8d643836f121775f3cc4d64321260377e1a SHA512 75bd4c18791593f0bb81b51d87f6f033e2ebebe6de3653276b14e852d3625f01a61fb34257eb3d15ebf265908563f2820793b84196138b39c9329839e8fefe2d WHIRLPOOL 9bf04463dba9e043fb3c6d0dce69cc73796bba52cb06b820a304860d13294954018f6dd290ca4d760cf834bd0fefc0bdcc78f9748e9e154d68a2e083aecd1786
+EBUILD OilWar-1.2.1-r1.ebuild 1242 SHA256 526ff93ed8aa4206a2ea6f100f5f2b9ee768e3faea2f4629eba40ae8a7da2cad SHA512 a715429583df7a61f02ef1ed1e38d9d4da44687c1c2f18c0b21802ddf07430d133374d6e91b450047348630a68d8502597c91f029865d8232e3ec10fc10a6f7e WHIRLPOOL dedd5c89cc7267cd9ca1a3102618b4cffbe52179720074ebb0dc18b74740d884c6b7d90414b167c32ad0f803b964d96f6f55d1797b802704fcb64afc86ab8f36
+MISC ChangeLog 1228 SHA256 7db067e52f13777627e2dc177c14d34f5a2b79302c5ab9e900983d7113f3b85b SHA512 555b6a7bfff42eee15f96cb0fc76500781dea9b92f5f2021cc3c692bae2574c3bef95c085379c25478a408842ca6ac4dac00bb37fff913f86ce0c5273e1efc64 WHIRLPOOL 53f060ab539331c4bfc4b54c8865d378b4c6f38c9eb2340f08cff0a6cb2c053203d6d79e6506560207cfe92f7fd584227f0d04b6e0848676054a6ae874fa2cf1
+MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
diff --git a/games-misc/OilWar/OilWar-1.2.1-r1.ebuild b/games-misc/OilWar/OilWar-1.2.1-r1.ebuild
index 33a2ba4d46be..3fe770cd135f 100644
--- a/games-misc/OilWar/OilWar-1.2.1-r1.ebuild
+++ b/games-misc/OilWar/OilWar-1.2.1-r1.ebuild
@@ -1,12 +1,13 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-misc/OilWar/OilWar-1.2.1-r1.ebuild,v 1.3 2008/10/07 17:21:27 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-misc/OilWar/OilWar-1.2.1-r1.ebuild,v 1.4 2013/11/12 01:53:15 mr_bones_ Exp $
 
-inherit eutils games
+EAPI=5
+inherit eutils gnome2-utils games
 
 DESCRIPTION="Evil army is attacking your country and tries to steal your oil"
-HOMEPAGE="http://www.2ndpoint.fi/projektit/oilwar.html"
-SRC_URI="http://www.2ndpoint.fi/projektit/filut/${P}.tar.gz
+HOMEPAGE="http://linux.softpedia.com/get/GAMES-ENTERTAINMENT/RTS/OilWar-15354.shtml"
+SRC_URI="mirror://gentoo/${P}.tar.gz
 	mirror://gentoo/${PN}.png"
 
 LICENSE="GPL-2"
@@ -14,32 +15,42 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE=""
 
-DEPEND="media-libs/libsdl
-	media-libs/sdl-image
+DEPEND="media-libs/libsdl[video]
+	media-libs/sdl-image[png]
 	media-libs/sdl-mixer"
+RDEPEND="${DEPEND}"
 
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd "${S}"
+src_prepare() {
 	sed -i \
 		-e '/^CXXCOMPILE/s:$(CPPFLAGS):$(SDL_CFLAGS):' \
 		-e '/^datafiledir/s:/games/:/:' \
 		-e '/install-data-am:/s:\\::' \
 		-e '/install-data-local$/d' \
-		Makefile.in \
-		|| die "sed failed"
+		Makefile.in || die
 }
 
-src_compile() {
-	egamesconf --enable-sound || die
-	emake || die
+src_configure() {
+	egamesconf --enable-sound
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog NEWS README TODO
+	default
 	doicon "${DISTDIR}"/${PN}.png
 	make_desktop_entry oilwar ${PN}
 	fperms 664 "${GAMES_STATEDIR}/oilwar.scores"
 	prepgamesdirs
 }
+
+pkg_preinst() {
+	games_pkg_preinst
+    gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+    gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+    gnome2_icon_cache_update
+}