Install menu entry, bug #159770

Package-Manager: portage-2.1.2.2

5 files changed, 41 insertions, 81 deletions

diff --git a/games-puzzle/4stattack/4stattack-2.1.4.ebuild b/games-puzzle/4stattack/4stattack-2.1.4.ebuild
index f89e16d49268..3f4fa773851f 100644
--- a/games-puzzle/4stattack/4stattack-2.1.4.ebuild
+++ b/games-puzzle/4stattack/4stattack-2.1.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/4stattack/4stattack-2.1.4.ebuild,v 1.8 2005/09/26 18:13:01 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/4stattack/4stattack-2.1.4.ebuild,v 1.9 2007/03/15 14:07:57 nyhm Exp $
 
 inherit eutils games
 
@@ -10,33 +10,31 @@ SRC_URI="mirror://sourceforge/forcedattack/4stAttack-${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 hppa ~amd64 ppc"
+KEYWORDS="~amd64 hppa ppc x86"
 IUSE=""
 
-DEPEND=">=dev-python/pygame-1.5"
+RDEPEND="dev-python/pygame"
 
-S="${WORKDIR}/4stAttack-${PV}"
+S=${WORKDIR}/4stAttack-${PV}
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
 	# move the doc files aside so it's easier to install the game files
 	mv README.txt credits.txt changelog.txt ..
-	rm GPL version~
+	rm -f GPL version~
 
-	#This patch makes the game save settings in $HOME instead
-	# of in /usr/share/games
-	epatch ${FILESDIR}/${P}-gentoo.diff
+	# This patch makes the game save settings in $HOME
+	epatch "${FILESDIR}"/${P}-gentoo.diff
 }
 
 src_install() {
-	dogamesbin ${FILESDIR}/4stattack
-	dosed "s:GENTOO_DIR:${GAMES_DATADIR}/${PN}:" ${GAMES_BINDIR}/4stattack
-	dodoc ../README.txt ../credits.txt ../changelog.txt
-
-	dodir ${GAMES_DATADIR}/4stattack
-	cp -R * ${D}/${GAMES_DATADIR}/4stattack/
-
+	games_make_wrapper ${PN} "python ${PN}.py" "${GAMES_DATADIR}"/${PN}
+	insinto "${GAMES_DATADIR}"/${PN}
+	doins -r * || die "doins failed"
+	newicon kde/icons/48x48/forcedattack2.png ${PN}.png
+	make_desktop_entry ${PN} "4st Attack 2"
+	dodoc ../{README.txt,credits.txt,changelog.txt}
 	prepgamesdirs
 }
diff --git a/games-puzzle/4stattack/ChangeLog b/games-puzzle/4stattack/ChangeLog
index db3d8a04da8e..a6f3168dc0e9 100644
--- a/games-puzzle/4stattack/ChangeLog
+++ b/games-puzzle/4stattack/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-puzzle/4stattack
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/4stattack/ChangeLog,v 1.7 2007/02/08 21:17:48 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/4stattack/ChangeLog,v 1.8 2007/03/15 14:07:57 nyhm Exp $
+
+  15 Mar 2007; Tristan Heaven <nyhm@gentoo.org> 4stattack-2.1.4.ebuild:
+  Install menu entry, bug #159770
 
   08 Feb 2007; Chris Gianelloni <wolf31o2@gentoo.org> ChangeLog:
   Regenerate digest in Manifest2 format.
diff --git a/games-puzzle/4stattack/Manifest b/games-puzzle/4stattack/Manifest
index 921ecffaa5c5..ed59973aa2d2 100644
--- a/games-puzzle/4stattack/Manifest
+++ b/games-puzzle/4stattack/Manifest
@@ -1,23 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX 4stattack 80 RMD160 6ada675e28a276987d85f6d8cc2b92ea1289c114 SHA1 cdb840f19d5e93e1ad4193ab5c12408ca93751a6 SHA256 08615c5bddd50072db95e8fe1f0ad75d827651c447d13efe96b7bfb184957e5f
-MD5 0042001873ffd1ee94e39a06a6ba3baf files/4stattack 80
-RMD160 6ada675e28a276987d85f6d8cc2b92ea1289c114 files/4stattack 80
-SHA256 08615c5bddd50072db95e8fe1f0ad75d827651c447d13efe96b7bfb184957e5f files/4stattack 80
-AUX 4stattack-2.1.4-gentoo.diff 1316 RMD160 76baf47edc9ef14e00664ec38b9d1e1d97d34852 SHA1 63c1ee3181faec91f0f92a7d8d0bac25f6af5777 SHA256 23d8f9702d413120611af02ff69239d6884cbec3cdce4c49240731d1d2de4128
-MD5 a38f167d6d78ba1c79320f6c2f4f9754 files/4stattack-2.1.4-gentoo.diff 1316
-RMD160 76baf47edc9ef14e00664ec38b9d1e1d97d34852 files/4stattack-2.1.4-gentoo.diff 1316
-SHA256 23d8f9702d413120611af02ff69239d6884cbec3cdce4c49240731d1d2de4128 files/4stattack-2.1.4-gentoo.diff 1316
+AUX 4stattack-2.1.4-gentoo.diff 509 RMD160 b37270759c3911ea74022026349a4fb6035f218b SHA1 ef31e82b59bc09d7f0ab1922ac7c62ebfdb86762 SHA256 bcb638ed992288e844db9f4e5fadb9196f20c8e8ae2c1695defc8fdc8fb4cb13
+MD5 edf83caf813c7a7d4c5b58dbc2c83cbe files/4stattack-2.1.4-gentoo.diff 509
+RMD160 b37270759c3911ea74022026349a4fb6035f218b files/4stattack-2.1.4-gentoo.diff 509
+SHA256 bcb638ed992288e844db9f4e5fadb9196f20c8e8ae2c1695defc8fdc8fb4cb13 files/4stattack-2.1.4-gentoo.diff 509
 DIST 4stAttack-2.1.4.tar.gz 1828247 RMD160 df5d420b5024e8634dac646247583179df533e44 SHA1 ecfe89054202b3c9fea9be4a03de72faaa406f6f SHA256 196c553fd3dbda8b2c2a07a9b0cbacf4f067712498f909d2823161e7d0b289e6
-EBUILD 4stattack-2.1.4.ebuild 1123 RMD160 1ca07eefd179e537740caa801bc77b0bdc9e956a SHA1 e644f0d7ad7589d8065db5c5bb136bcee82da0e5 SHA256 385ec53a6febdd270c05e4fe3e2a9bfae848328ada0f31d438a5c00ce6ecfd19
-MD5 7c945bcf6929edbd13717a063446f72f 4stattack-2.1.4.ebuild 1123
-RMD160 1ca07eefd179e537740caa801bc77b0bdc9e956a 4stattack-2.1.4.ebuild 1123
-SHA256 385ec53a6febdd270c05e4fe3e2a9bfae848328ada0f31d438a5c00ce6ecfd19 4stattack-2.1.4.ebuild 1123
-MISC ChangeLog 835 RMD160 263d79ea1ede63a2bf8ea5c680dbdc45e7024b56 SHA1 e18af26ae59ec6c5da605d1f2d5ebecad5bf1114 SHA256 66b3de72747a128227deffdbee809424741ccf3a1b87ff45fa58cefcc1b83d44
-MD5 a0e8afc75d7a4d8c9918df6282806e71 ChangeLog 835
-RMD160 263d79ea1ede63a2bf8ea5c680dbdc45e7024b56 ChangeLog 835
-SHA256 66b3de72747a128227deffdbee809424741ccf3a1b87ff45fa58cefcc1b83d44 ChangeLog 835
+EBUILD 4stattack-2.1.4.ebuild 1129 RMD160 609862c721e202ad5f2bd74f34bbd4965bae44d8 SHA1 587c6390d76217b0f314e9cd11feff0d466f0728 SHA256 3032b4d49dd025bf2069a7ce0c152ca7cac9f3f7de4ff6cfb194e82981aee213
+MD5 b731faa4f5bc8a94f6f5de6457446bd5 4stattack-2.1.4.ebuild 1129
+RMD160 609862c721e202ad5f2bd74f34bbd4965bae44d8 4stattack-2.1.4.ebuild 1129
+SHA256 3032b4d49dd025bf2069a7ce0c152ca7cac9f3f7de4ff6cfb194e82981aee213 4stattack-2.1.4.ebuild 1129
+MISC ChangeLog 938 RMD160 db09a0ef90bd21e198120867ed1ccb04d51cccba SHA1 cb37580cd32d92b84fafc9136fc58f71d6a3b41d SHA256 23523afcffe8b8aa3a7c97ce451c871e4268912f7e12428a23cbf6b0b827cbb8
+MD5 522152ed625f69b27dfe71533c57fba4 ChangeLog 938
+RMD160 db09a0ef90bd21e198120867ed1ccb04d51cccba ChangeLog 938
+SHA256 23523afcffe8b8aa3a7c97ce451c871e4268912f7e12428a23cbf6b0b827cbb8 ChangeLog 938
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -26,9 +22,9 @@ MD5 97b51d54bdbe3a4d3c3fb58bbcede7eb files/digest-4stattack-2.1.4 250
 RMD160 f98fabae47df0d1e992bdad4cc929ff9df216355 files/digest-4stattack-2.1.4 250
 SHA256 ba37e9009dbf0b2cf8095a4255aafe4005142454a4ea1f170229847af84dc3e4 files/digest-4stattack-2.1.4 250
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
+Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFFy5OBkT4lNIS36YERAj3kAKCwi/lzViK3hSTWdfTD7Vwyb8nXtACeI33S
-zulcJwlul1N5wGTuDD6wKFs=
-=UzNa
+iD8DBQFF+VNDdz7hIScOURERAiu1AKCtmfy4p6DTpaJ/+reYbkmcr6oClQCg0tsP
+nwEcN6gxQoMnYAPBqkRZH8A=
+=1Vew
 -----END PGP SIGNATURE-----
diff --git a/games-puzzle/4stattack/files/4stattack b/games-puzzle/4stattack/files/4stattack
deleted file mode 100644
index c0b761b3b44c..000000000000
--- a/games-puzzle/4stattack/files/4stattack
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-cd GENTOO_DIR
-exec /usr/bin/env python GENTOO_DIR/4stattack.py "${@}"
diff --git a/games-puzzle/4stattack/files/4stattack-2.1.4-gentoo.diff b/games-puzzle/4stattack/files/4stattack-2.1.4-gentoo.diff
index a6b77993dc00..be7d32ed3ff2 100644
--- a/games-puzzle/4stattack/files/4stattack-2.1.4-gentoo.diff
+++ b/games-puzzle/4stattack/files/4stattack-2.1.4-gentoo.diff
@@ -1,55 +1,21 @@
---- 4stAttack-2.1.4/4stattack.py	2002-10-01 07:38:03.000000000 -0700
-+++ new/4stattack.py	2003-07-24 22:11:34.000000000 -0700
+--- 4stattack.py
++++ 4stattack.py
 @@ -28,6 +28,9 @@
  images	= None
  screen	= None
  
 +f = os.path.expanduser('~/.4stattackrc')
 +if not os.path.exists(f):
-+    os.system('cp /usr/share/games/4stattack/settings.ini %s' % f)
++    os.system('cp settings.ini %s' % f)
  
  def playMusic(datadir):
  	if pygame.mixer.get_init():
-@@ -49,11 +52,11 @@
- 		screen = pygame.display.set_mode(resolution, FULLSCREEN)
- 	else:
- 		screen = pygame.display.set_mode(resolution)
--	
-+
- 	pygame.display.set_caption('4st Attack 2')
- 	pygame.mouse.set_visible(1)
- 	pygame.display.init()
--	
-+
- 	pygame.display.Info()
- 	return screen
- 
-@@ -72,21 +75,21 @@
- 	pygame.quit()
- 	os._exit(0)
- 
--def main():                    
-+def main():
- 	options = getOptions(sys.argv)
--	
-+
+@@ -78,7 +81,7 @@
  	if options.has_key('-ini'):
  		ini_settings = IniSettings(options['-ini'])
  	else:
 -		ini_settings = IniSettings('settings.ini')
--	
 +		ini_settings = IniSettings(os.path.expanduser('~/.4stattackrc'))
-+
+ 	
  	settings = ini_settings.settings
--	
-+
- 	datadir = settings['path']['data']
--	
-+
- 	if settings['sound']['music'] == 'yes':
- 		playMusic(datadir)
--	
-+
- 	resolution = settings['video']['resolution']
- 	res = string.split(resolution, 'x')
- 	screen = setDisplay((int(res[0]), int(res[1])), settings['video']['fullscreen'])
+