fix SRC_URI and rm old revision

Package-Manager: portage-2.1.2.7

4 files changed, 14 insertions, 59 deletions

diff --git a/games-misc/OilWar/Manifest b/games-misc/OilWar/Manifest
index 38aa4c78b5d4..528d3456607a 100644
--- a/games-misc/OilWar/Manifest
+++ b/games-misc/OilWar/Manifest
@@ -3,14 +3,10 @@ Hash: SHA1
 
 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 945 RMD160 2f879aeabfe3792df7ee1205d9b605d40f09b1f4 SHA1 a96f89bd803fcb2787c14873a505c5ea3dc187ad SHA256 894fb66b773c6d26bf1ec126bfe30deb511037f360df403b844fb964535d0c5a
-MD5 7c106f0a7f23eea78c63b7e5129e2783 OilWar-1.2.1-r1.ebuild 945
-RMD160 2f879aeabfe3792df7ee1205d9b605d40f09b1f4 OilWar-1.2.1-r1.ebuild 945
-SHA256 894fb66b773c6d26bf1ec126bfe30deb511037f360df403b844fb964535d0c5a OilWar-1.2.1-r1.ebuild 945
-EBUILD OilWar-1.2.1.ebuild 846 RMD160 29443d39f22c5a4bdaa80555448fe7c3a73546c0 SHA1 a97fab47de0523fff8ae37e17dbe48a8e4c0fe1c SHA256 b76824a7844cc2acb7aabb08ea250c3b3163628cef34cde165a5d46d8b2f719b
-MD5 9dd07a6b7cf2193e3619489ad6db5993 OilWar-1.2.1.ebuild 846
-RMD160 29443d39f22c5a4bdaa80555448fe7c3a73546c0 OilWar-1.2.1.ebuild 846
-SHA256 b76824a7844cc2acb7aabb08ea250c3b3163628cef34cde165a5d46d8b2f719b OilWar-1.2.1.ebuild 846
+EBUILD OilWar-1.2.1-r1.ebuild 974 RMD160 ad77b7551726431537418e98a8c96da4d9d6a8c4 SHA1 829cd58111ce7e000986b5e9f6ea715922c5dc70 SHA256 0b8fc7a590df3164ffce9b5cae110793851a11e619d3026c002d8f8bc2f975ca
+MD5 f5a238001197838659040184df951aaa OilWar-1.2.1-r1.ebuild 974
+RMD160 ad77b7551726431537418e98a8c96da4d9d6a8c4 OilWar-1.2.1-r1.ebuild 974
+SHA256 0b8fc7a590df3164ffce9b5cae110793851a11e619d3026c002d8f8bc2f975ca OilWar-1.2.1-r1.ebuild 974
 MISC ChangeLog 989 RMD160 4b7270d691f9cc6b9ed6df0f91c02989d4632ac4 SHA1 7d1d80fc0350c88e008232ec38665be06cc2dd91 SHA256 ff8e4312e785114090178f0d37609b99d936d8f5841fcb8df4548c13f9f78af6
 MD5 40e1a1ccc7d1cdb5435ce8250ededd52 ChangeLog 989
 RMD160 4b7270d691f9cc6b9ed6df0f91c02989d4632ac4 ChangeLog 989
@@ -19,16 +15,13 @@ MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be525
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
-MD5 1f84ee19f9d1553f6b6d806786d3149d files/digest-OilWar-1.2.1 238
-RMD160 af250836a1bc3ff8c5365c941d6812aaa530222f files/digest-OilWar-1.2.1 238
-SHA256 aea60df3a3fade883c05f527179a9f124660d55cb3d7e1e20ba1dc7e34aaa53b files/digest-OilWar-1.2.1 238
 MD5 2460875e8155967e5116e8ddcff1a82c files/digest-OilWar-1.2.1-r1 443
 RMD160 388f466be45594871875040b6a197ef164e2be58 files/digest-OilWar-1.2.1-r1 443
 SHA256 a12ca24bbd8075ffe4433668e56adc0bf218c815a155bd1c76efa9ba09e339c5 files/digest-OilWar-1.2.1-r1 443
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
+Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGU9paRmMZkarFlIwRAo7UAKC9rBbT0GJjS9RICnrnf2KQIpJchgCgxkNC
-kVwkEMxp8tSXGz9oqr0BwbQ=
-=I3JK
+iD8DBQFGVCf4dz7hIScOURERAlRWAKDgJrHGm1daew18LjTGNnfKY7FSAQCgkGjP
+UWXYgmQsuLWYg1iibBOi1HA=
+=15St
 -----END PGP SIGNATURE-----
diff --git a/games-misc/OilWar/OilWar-1.2.1-r1.ebuild b/games-misc/OilWar/OilWar-1.2.1-r1.ebuild
index d82d456529c6..d9dfb15534f8 100644
--- a/games-misc/OilWar/OilWar-1.2.1-r1.ebuild
+++ b/games-misc/OilWar/OilWar-1.2.1-r1.ebuild
@@ -1,17 +1,17 @@
 # Copyright 1999-2007 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.1 2007/05/23 06:08:16 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-misc/OilWar/OilWar-1.2.1-r1.ebuild,v 1.2 2007/05/23 11:39:31 nyhm Exp $
 
 inherit eutils 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
-	${PN}.png"
+	mirror://gentoo/${PN}.png"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 
 DEPEND="media-libs/libsdl
@@ -20,7 +20,7 @@ DEPEND="media-libs/libsdl
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 	sed -i '/^datafiledir/s:/games/:/:' Makefile.in || die "sed failed"
 }
 
@@ -30,9 +30,9 @@ src_compile() {
 }
 
 src_install() {
-	make install DESTDIR=${D} || die
+	emake DESTDIR="${D}" install || die "emake install failed"
 	dodoc AUTHORS ChangeLog NEWS README TODO
 	doicon "${DISTDIR}"/${PN}.png
-	make_desktop_entry oilwar ${PN} ${PN}.png
+	make_desktop_entry oilwar ${PN}
 	prepgamesdirs
 }
diff --git a/games-misc/OilWar/OilWar-1.2.1.ebuild b/games-misc/OilWar/OilWar-1.2.1.ebuild
deleted file mode 100644
index 1428b3706f52..000000000000
--- a/games-misc/OilWar/OilWar-1.2.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2006 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.ebuild,v 1.7 2006/09/24 11:36:08 blubb Exp $
-
-inherit 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"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-DEPEND="media-libs/libsdl
-	media-libs/sdl-image
-	media-libs/sdl-mixer"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	sed -i '/^datafiledir/s:/games/:/:' Makefile.in || die "sed failed"
-}
-
-src_compile() {
-	egamesconf --enable-sound || die
-	emake || die
-}
-
-src_install() {
-	make install DESTDIR=${D} || die
-	dodoc AUTHORS ChangeLog NEWS README TODO
-	prepgamesdirs
-}
diff --git a/games-misc/OilWar/files/digest-OilWar-1.2.1 b/games-misc/OilWar/files/digest-OilWar-1.2.1
deleted file mode 100644
index 4d01291df96f..000000000000
--- a/games-misc/OilWar/files/digest-OilWar-1.2.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 6286e7f5a5f4f8ce6489a996b188caa2 OilWar-1.2.1.tar.gz 515013
-RMD160 c59713f00d00da025f01d1daa34bf514d035d8d4 OilWar-1.2.1.tar.gz 515013
-SHA256 e16ffd11439dfc857daaa98cf8a266b24794a4fbb1e84c1558794ffb622b5c63 OilWar-1.2.1.tar.gz 515013