Install menu entry, bug #160204

Package-Manager: portage-2.1.2.2

4 files changed, 35 insertions, 55 deletions

diff --git a/games-arcade/defendguin/ChangeLog b/games-arcade/defendguin/ChangeLog
index 595dac3477da..a28591be6137 100644
--- a/games-arcade/defendguin/ChangeLog
+++ b/games-arcade/defendguin/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-arcade/defendguin
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/defendguin/ChangeLog,v 1.10 2006/10/02 02:59:32 dang Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/defendguin/ChangeLog,v 1.11 2007/03/15 21:31:23 nyhm Exp $
+
+  15 Mar 2007; Tristan Heaven <nyhm@gentoo.org> defendguin-0.0.11.ebuild:
+  Install menu entry, bug #160204
 
   02 Oct 2006; Daniel Gryniewicz <dang@gentoo.org> defendguin-0.0.11.ebuild:
   Marked stable on amd64 For bug #149769
diff --git a/games-arcade/defendguin/Manifest b/games-arcade/defendguin/Manifest
index 848f12b1ed05..39b1327a2568 100644
--- a/games-arcade/defendguin/Manifest
+++ b/games-arcade/defendguin/Manifest
@@ -1,19 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX 0.0.11-makefile.patch 777 RMD160 b69f0158733e3d0cc74fd9bdc68ffe4c887da879 SHA1 974499732549addd9cd8d26bfd8de43edcfa1902 SHA256 6bfb84a9bfb92a3b3ced4897d487a3bed9ecd4dcb11df01d93836821c5d56c71
-MD5 c49253cc21948dd1647e4eef78e28327 files/0.0.11-makefile.patch 777
-RMD160 b69f0158733e3d0cc74fd9bdc68ffe4c887da879 files/0.0.11-makefile.patch 777
-SHA256 6bfb84a9bfb92a3b3ced4897d487a3bed9ecd4dcb11df01d93836821c5d56c71 files/0.0.11-makefile.patch 777
 DIST defendguin-0.0.11.tar.gz 2233817 RMD160 383c40d5091aad917b290506cd1e1527531e106c SHA1 e7d9e31aebe5d43d854170fcbbf82eaf8daa4ea4 SHA256 f445cd106f02eaa2352450a8f9f753532008726774be9e1b7ce79c5146668d7d
-EBUILD defendguin-0.0.11.ebuild 1002 RMD160 5eeb91c23a0da0b0278d58287a3a6a591da76533 SHA1 22613823e587ea79f6043b35e1423d25b6b0c06e SHA256 c36720ccc7e5fb598261bd7f0c35123727e35660c090dd28592870cb60c23282
-MD5 aed441b029ae5d484118e3c999aefdd8 defendguin-0.0.11.ebuild 1002
-RMD160 5eeb91c23a0da0b0278d58287a3a6a591da76533 defendguin-0.0.11.ebuild 1002
-SHA256 c36720ccc7e5fb598261bd7f0c35123727e35660c090dd28592870cb60c23282 defendguin-0.0.11.ebuild 1002
-MISC ChangeLog 1611 RMD160 1b6222026b8268f84e4fd1c458f854ab4d1c04a6 SHA1 99eb62e177c6ddc6ffa1ff30ae60b330a65c9897 SHA256 d7be27b05441b542cd0fb7c6461750f510d53c4d25fa12f49e8b26214456af3e
-MD5 eef4e3e31d4527f1db8f620c54a4ac79 ChangeLog 1611
-RMD160 1b6222026b8268f84e4fd1c458f854ab4d1c04a6 ChangeLog 1611
-SHA256 d7be27b05441b542cd0fb7c6461750f510d53c4d25fa12f49e8b26214456af3e ChangeLog 1611
+EBUILD defendguin-0.0.11.ebuild 1280 RMD160 51f2f594fb0fbba16254ca34bfa1195f7e33d883 SHA1 8631346bc42306c7860d1bbd12de034e8c1cbc1b SHA256 61f2d99207fcb08215e8995948ca463676377718a6d861c6355dfedeaa1f4109
+MD5 bbab655ec69c6f33c5cf39af2ef20c68 defendguin-0.0.11.ebuild 1280
+RMD160 51f2f594fb0fbba16254ca34bfa1195f7e33d883 defendguin-0.0.11.ebuild 1280
+SHA256 61f2d99207fcb08215e8995948ca463676377718a6d861c6355dfedeaa1f4109 defendguin-0.0.11.ebuild 1280
+MISC ChangeLog 1720 RMD160 aba83fc7658086ae0b11184dca3cafc7a65d6116 SHA1 c3b0b2c94811e5c19d4f7c9af9a75b1a5f113996 SHA256 17f02c380f783f1e6118a7201443aef55b9fbceb63105a7ece5b95ebd2d9abf7
+MD5 b0f0f9890fe5ca277e98dc6ae830f7e7 ChangeLog 1720
+RMD160 aba83fc7658086ae0b11184dca3cafc7a65d6116 ChangeLog 1720
+SHA256 17f02c380f783f1e6118a7201443aef55b9fbceb63105a7ece5b95ebd2d9abf7 ChangeLog 1720
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -22,9 +18,9 @@ MD5 03ab6f3c37f5bf55ab81ca05c265ae52 files/digest-defendguin-0.0.11 256
 RMD160 202c93639ee25f336d6bfd38fd923163feafaa76 files/digest-defendguin-0.0.11 256
 SHA256 bdf2b11b014faf642aaa68bfb46340e40c0dafd4aba5ac7969bb63b4777a93bc files/digest-defendguin-0.0.11 256
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
+Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFFZftRdz7hIScOURERAjNVAJ94PW9RdIDGGDOYQMUutVe6YyctGgCeO+0l
-rvfuPP6/ZGPFUzN4OQyh4+I=
-=xDT+
+iD8DBQFF+bsxdz7hIScOURERAhGQAKDI6a0HLYRkxk0wMe/Yl8OA5zgb+gCgjbhY
+HGwI7YBqYz/qYNz2pA3V2lo=
+=n95G
 -----END PGP SIGNATURE-----
diff --git a/games-arcade/defendguin/defendguin-0.0.11.ebuild b/games-arcade/defendguin/defendguin-0.0.11.ebuild
index 3a41a998a9f5..a9e1581d84c6 100644
--- a/games-arcade/defendguin/defendguin-0.0.11.ebuild
+++ b/games-arcade/defendguin/defendguin-0.0.11.ebuild
@@ -1,11 +1,12 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/defendguin/defendguin-0.0.11.ebuild,v 1.4 2006/10/02 02:59:32 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/defendguin/defendguin-0.0.11.ebuild,v 1.5 2007/03/15 21:31:23 nyhm Exp $
+
+inherit eutils toolchain-funcs games
 
-inherit eutils games
 DESCRIPTION="A clone of the arcade game Defender, but with a Linux theme"
 HOMEPAGE="http://www.newbreedsoftware.com/defendguin/"
-SRC_URI="ftp://ftp.billsgames.com/unix/x/defendguin/src/${P}.tar.gz"
+SRC_URI="ftp://ftp.billsgames.com/unix/x/${PN}/src/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -17,7 +18,7 @@ DEPEND="media-libs/sdl-mixer
 
 pkg_setup() {
 	if ! built_with_use media-libs/sdl-mixer mikmod; then
-		die "You need to build media-libs/sdl-mixer with mikmod USE flag enabled!"
+		die "Please build media-libs/sdl-mixer with USE=mikmod"
 	fi
 	games_pkg_setup
 }
@@ -25,13 +26,22 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}/${PV}-makefile.patch"
+	sed -i \
+		-e "1i CC=$(tc-getCC)" \
+		-e "s:\$(DATA_PREFIX):${GAMES_DATADIR}/${PN}/:" \
+		-e "s:-Wall:-Wall ${CFLAGS}:" \
+		Makefile \
+		|| die "sed failed"
 	rm -f data/images/*.sh
 }
 
 src_install() {
-	dogamesbin defendguin || die "dogamesbin failed"
-	insinto "${GAMES_DATADIR}/${PN}"
+	dogamesbin ${PN} || die "dogamesbin failed"
+	insinto "${GAMES_DATADIR}"/${PN}
 	doins -r ./data/* || die "doins failed"
+	newicon data/images/ufo/ufo0.bmp ${PN}.bmp
+	make_desktop_entry ${PN} Defendguin /usr/share/pixmaps/${PN}.bmp
+	doman src/${PN}.6
+	dodoc docs/{AUTHORS,CHANGES,README,TODO}.txt
 	prepgamesdirs
 }
diff --git a/games-arcade/defendguin/files/0.0.11-makefile.patch b/games-arcade/defendguin/files/0.0.11-makefile.patch
deleted file mode 100644
index bb61b8c437ba..000000000000
--- a/games-arcade/defendguin/files/0.0.11-makefile.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- Makefile.orig	2002-01-06 02:09:37.000000000 +0100
-+++ Makefile	2004-09-14 22:03:45.525993936 +0200
-@@ -9,12 +9,12 @@
- 
- # User-definable stuff:
- 
--CFLAGS=-Wall -O2
-+#CFLAGS=-Wall -O2
- #DATA_PREFIX=$(PWD)/data/
--PREFIX=/usr/local
--MAN_PREFIX=$(PREFIX)
--BIN_PREFIX=$(PREFIX)/bin
--DATA_PREFIX=$(PREFIX)/share/defendguin/
-+PREFIX=/usr/share
-+MAN_PREFIX=$(PREFIX)/man
-+BIN_PREFIX=/usr/games/bin
-+DATA_PREFIX=$(PREFIX)/games/defendguin/
- JOY=YES
- 
- 
-@@ -24,7 +24,7 @@
- SDL_LDFLAGS := $(shell sdl-config --libs) -L/usr/X11R6/lib
- MIXER=-lSDL_mixer
- NOSOUNDFLAG=__SOUND
--CFLAGS=-Wall $(SDL_CFLAGS) -DDATA_PREFIX=\"$(DATA_PREFIX)\" -D$(NOSOUNDFLAG) \
-+CFLAGS+=-Wall $(SDL_CFLAGS) -DDATA_PREFIX=\"$(DATA_PREFIX)\" -D$(NOSOUNDFLAG) \
- 	-DJOY_$(JOY)
- SDL_LIB=$(SDL_LDFLAGS) $(MIXER)
-