From: Tristan Heaven <tristan@gentoo.org>
Date: Thu, 28 Dec 2006 00:59:28 +0000 (+0000)
Subject: Install desktop entry, bug #159205
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=634c4aa914a758d919ff817251cd4baf8cebdfe6;p=gentoo.git

Install desktop entry, bug #159205
Package-Manager: portage-2.1.2_rc4-r1
---

diff --git a/games-board/mah-jong/ChangeLog b/games-board/mah-jong/ChangeLog
index 561d074e5ba1..3d15dc3e52e8 100644
--- a/games-board/mah-jong/ChangeLog
+++ b/games-board/mah-jong/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-board/mah-jong
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/mah-jong/ChangeLog,v 1.8 2006/04/23 06:30:51 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/mah-jong/ChangeLog,v 1.9 2006/12/28 00:59:28 nyhm Exp $
+
+  28 Dec 2006; Tristan Heaven <nyhm@gentoo.org> mah-jong-1.7.ebuild:
+  Install desktop entry, bug #159205
 
 *mah-jong-1.7 (23 Apr 2006)
 
diff --git a/games-board/mah-jong/Manifest b/games-board/mah-jong/Manifest
index 596234101c19..74fbe352871a 100644
--- a/games-board/mah-jong/Manifest
+++ b/games-board/mah-jong/Manifest
@@ -2,14 +2,14 @@
 Hash: SHA1
 
 DIST mj-1.7-src.tar.gz 367906 RMD160 4156397020ca6a7b9f3be94b5190f20c1d1d00a3 SHA1 49805879e27dc329effd9cc257787fd08d5e028c SHA256 7395d974ee884929a12ce8298fc5d02ff689f9027f3ce9486e60fb171b507994
-EBUILD mah-jong-1.7.ebuild 1252 RMD160 0fa255265aaa63b700484deae3c6768bb5955e37 SHA1 cb34b76e00c4c08bb6bb645d79be9888df433542 SHA256 c020ad998f98d69e767c6403a6e9df993acc43a97e3ba28e9596971769b1adcf
-MD5 0831acc5a99f621969eac67fd387d461 mah-jong-1.7.ebuild 1252
-RMD160 0fa255265aaa63b700484deae3c6768bb5955e37 mah-jong-1.7.ebuild 1252
-SHA256 c020ad998f98d69e767c6403a6e9df993acc43a97e3ba28e9596971769b1adcf mah-jong-1.7.ebuild 1252
-MISC ChangeLog 1066 RMD160 3492ec3d08806c54fd26b118a8f48981cc4a9261 SHA1 78d0c8086f6ff03f3b516c1ae730a30b42b9e040 SHA256 22a408cf14bf55ee1b6bff62bd3e52d65daf44a8d4d0abf0b6566f3191c19723
-MD5 ddf2c768fa52cee6d5a28294020f4010 ChangeLog 1066
-RMD160 3492ec3d08806c54fd26b118a8f48981cc4a9261 ChangeLog 1066
-SHA256 22a408cf14bf55ee1b6bff62bd3e52d65daf44a8d4d0abf0b6566f3191c19723 ChangeLog 1066
+EBUILD mah-jong-1.7.ebuild 1487 RMD160 09e36c616281d7bc6dd55069fa05f0a87ea8f299 SHA1 4b33aed3d226792ea77e1541e8fca33d9039f15f SHA256 20e4ff3f21da050f755dd86c6ec689c735ab3151e936629b32bec134c106dcd8
+MD5 6ae257908e46f524ebf03e4632cdaf9d mah-jong-1.7.ebuild 1487
+RMD160 09e36c616281d7bc6dd55069fa05f0a87ea8f299 mah-jong-1.7.ebuild 1487
+SHA256 20e4ff3f21da050f755dd86c6ec689c735ab3151e936629b32bec134c106dcd8 mah-jong-1.7.ebuild 1487
+MISC ChangeLog 1168 RMD160 19ec2e275822bf3470b3af2474937c2ab4a539a0 SHA1 056542a3a19e18652fba43264b3099fd2d347ed7 SHA256 b468204be06b982b664fb02702b4ac812c71ba4ecd2794cec47dd9cc5756ba28
+MD5 abb5caee77411cce9adb0cce58468fb4 ChangeLog 1168
+RMD160 19ec2e275822bf3470b3af2474937c2ab4a539a0 ChangeLog 1168
+SHA256 b468204be06b982b664fb02702b4ac812c71ba4ecd2794cec47dd9cc5756ba28 ChangeLog 1168
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -18,9 +18,9 @@ MD5 be09f90842a5fcd329391269954925e9 files/digest-mah-jong-1.7 232
 RMD160 5948a41823accd46f30a69305c985e237a3a655e files/digest-mah-jong-1.7 232
 SHA256 8032831a23af20d768ae24484c48585e5cc03af0d38ad0e9c7d063d263874e93 files/digest-mah-jong-1.7 232
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
+Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFEq+rj9AbAhSK0CiwRAoXIAJ9UFQYjjTE46J4w3HMelRdd7BfNzQCfWd0N
-/vyEGK2gtpyYFH175nd0eLI=
-=Ibmo
+iD8DBQFFkxb3dz7hIScOURERAl53AJ4vz+M1cwhbkAOxga61gma2Dk+FVgCfTI0E
+FwzfiirrC0MleQOogw31lU4=
+=tTz5
 -----END PGP SIGNATURE-----
diff --git a/games-board/mah-jong/mah-jong-1.7.ebuild b/games-board/mah-jong/mah-jong-1.7.ebuild
index d3626f78c490..d2690460d697 100644
--- a/games-board/mah-jong/mah-jong-1.7.ebuild
+++ b/games-board/mah-jong/mah-jong-1.7.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/mah-jong/mah-jong-1.7.ebuild,v 1.1 2006/04/23 06:30:51 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/mah-jong/mah-jong-1.7.ebuild,v 1.2 2006/12/28 00:59:28 nyhm Exp $
 
-inherit games
+inherit eutils toolchain-funcs games
 
 MY_P="mj-${PV}-src"
 DESCRIPTION="A networked Mah Jong program, together with a computer player"
@@ -30,17 +30,23 @@ src_unpack() {
 	sed -i \
 		-e "/^DESTDIR =/ s:=.*:= ${D}:" \
 		-e "/^BINDIR =/ s:=.*:= ${GAMES_BINDIR}:" \
-		-e "/^MANDIR =/ s:man/man1:/usr/share/man/man6:" \
-		-e "/^MANSUFFIX =/ s:1:6:" \
+		-e '/^MANDIR =/ s:man/man1:/usr/share/man/man6:' \
+		-e '/^MANSUFFIX =/ s:1:6:' \
+		-e "/^CC =/ s:gcc:$(tc-getCC):" \
 		-e "/^CFLAGS =/ s:=:= ${CFLAGS}:" \
+		-e "/^LDLIBS =/ s:$:${LDFLAGS}:" \
+		-e '/^INSTPGMFLAGS =/ s:-s::' \
+		-e '/^CDEBUGFLAGS =/d' \
 		-e "/^TILESETPATH=/ s:NULL:\"${GAMES_DATADIR}/${PN}/\":" Makefile \
 		|| die "sed failed"
 }
 
 src_install() {
-	make install install.man || die "make install failed"
+	emake install install.man || die "emake install failed"
 	insinto "${GAMES_DATADIR}/${PN}"
 	doins -r fallbacktiles/ tiles-numbered/ tiles-small/ || die "doins failed"
+	newicon tiles-v1/tongE.xpm ${PN}.xpm
+	make_desktop_entry xmj Mah-Jong ${PN}.xpm
 	dodoc CHANGES ChangeLog *.txt
 	prepgamesdirs
 }