Add desktop entry, bug #153531

Package-Manager: portage-2.1.2_rc1-r1

4 files changed, 78 insertions, 25 deletions

diff --git a/games-puzzle/xtris/ChangeLog b/games-puzzle/xtris/ChangeLog
index 19ca52712517..d40d175ce260 100644
--- a/games-puzzle/xtris/ChangeLog
+++ b/games-puzzle/xtris/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-puzzle/xtris
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/xtris/ChangeLog,v 1.6 2006/04/27 20:03:23 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/xtris/ChangeLog,v 1.7 2006/10/31 19:08:23 nyhm Exp $
+
+  31 Oct 2006; Tristan Heaven <nyhm@gentoo.org> +files/xtris.xpm,
+  xtris-1.15.ebuild:
+  Add desktop entry, bug #153531
 
   27 Apr 2006; Marien Zwart <marienz@gentoo.org> files/digest-xtris-1.15,
   Manifest:
diff --git a/games-puzzle/xtris/Manifest b/games-puzzle/xtris/Manifest
index 140680dd3335..4115e7690913 100644
--- a/games-puzzle/xtris/Manifest
+++ b/games-puzzle/xtris/Manifest
@@ -1,16 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST xtris-1.15.tar.gz 52130 RMD160 7d5fe32c8187e653fa40451e51c6ddd7fd58ab33 SHA256 5791b30795382a18536201c95c686f62ade6975fc4e63c651bff36226c933d68 size 52130
-EBUILD xtris-1.15.ebuild 887 RMD160 d16b185cf1ee2ae0cab75515b727c40f43ebf7e8 SHA1 a47dad3a707582df6b2b52a0075ffec657a8145b SHA256 56a68f461b38fa3a86494b1a39b1580eb5c1c59d8105f8163ae297c29f51d91e size 887
-MD5 c13e03c5e37487995b712d1d5e249f31 xtris-1.15.ebuild 887
-RMD160 d16b185cf1ee2ae0cab75515b727c40f43ebf7e8 xtris-1.15.ebuild 887
-SHA256 56a68f461b38fa3a86494b1a39b1580eb5c1c59d8105f8163ae297c29f51d91e xtris-1.15.ebuild 887
-MISC ChangeLog 852 RMD160 23b478999eafdf219169b767fa45a2c70a13a842 SHA1 97f1207e56ffb97989e0797f94c3455af177f823 SHA256 ae5ca1a0168cce74d1101cd6344f37f9837112a50f47f0b33a4a669fb06c9949 size 852
-MD5 a95196408d993d3e42962bf78fb5b65b ChangeLog 852
-RMD160 23b478999eafdf219169b767fa45a2c70a13a842 ChangeLog 852
-SHA256 ae5ca1a0168cce74d1101cd6344f37f9837112a50f47f0b33a4a669fb06c9949 ChangeLog 852
-MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 size 158
+AUX xtris.xpm 1403 RMD160 1d53fc85901b2858d8bfc538982d49c097e8eddc SHA1 5a64f0ee483cae85b474e63743aa2ba65fe614bd SHA256 60dc5ec114d394f6c9e7b69e93fad11213100148aa02ee51f7ba91f8f7500749
+MD5 535285bbea15f0e8cab7ebbf8294856a files/xtris.xpm 1403
+RMD160 1d53fc85901b2858d8bfc538982d49c097e8eddc files/xtris.xpm 1403
+SHA256 60dc5ec114d394f6c9e7b69e93fad11213100148aa02ee51f7ba91f8f7500749 files/xtris.xpm 1403
+DIST xtris-1.15.tar.gz 52130 RMD160 7d5fe32c8187e653fa40451e51c6ddd7fd58ab33 SHA1 157eb642ada6d72290acf3d4d2638ec04f8de878 SHA256 5791b30795382a18536201c95c686f62ade6975fc4e63c651bff36226c933d68
+EBUILD xtris-1.15.ebuild 924 RMD160 51b93be399ff9b546b5130dc3fdd1348692ab7ee SHA1 5ab3e5b1c40802b4fc7604870c31f8a768101b80 SHA256 0eae27c0624f332bd824c61e6503a79d1966c48b8938711b8427e392a41f6cbc
+MD5 9add0481316ddc335260b3b92a6e4711 xtris-1.15.ebuild 924
+RMD160 51b93be399ff9b546b5130dc3fdd1348692ab7ee xtris-1.15.ebuild 924
+SHA256 0eae27c0624f332bd824c61e6503a79d1966c48b8938711b8427e392a41f6cbc xtris-1.15.ebuild 924
+MISC ChangeLog 970 RMD160 5bd75ed26b44a256b27bf04b3054626ea5623114 SHA1 4f1fccf8a10c352a50cfabdb9711dc1d7834617d SHA256 25e283300732ca948a201ba90d1741e84351a42b132acd173c4172fd565a4ba0
+MD5 f1041c7b62fcb35846f76eccbc931688 ChangeLog 970
+RMD160 5bd75ed26b44a256b27bf04b3054626ea5623114 ChangeLog 970
+SHA256 25e283300732ca948a201ba90d1741e84351a42b132acd173c4172fd565a4ba0 ChangeLog 970
+MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
@@ -18,9 +22,9 @@ MD5 e91122a1a58e6e3faeb52120fffe2c39 files/digest-xtris-1.15 229
 RMD160 4b308f95ed7048de41498655326fe55057e865f9 files/digest-xtris-1.15 229
 SHA256 310c681a6cbefe6455e4a01182c3e7eef797f94ebcbbd855108ac6b9b5b6a718 files/digest-xtris-1.15 229
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFEUSORW78445TWHXcRArWYAKCGR30dQETXsIvsDzUh+SNPG9/TBACeO7t9
-TUJux/Ig2WNVmVO5M9tiYW8=
-=7rQr
+iD8DBQFFR58tdz7hIScOURERAmY1AKCiuIUvs8A9Haar2w7aDZt6mUNG1gCeMb6h
+p6oeCAjPdiRw1/eDDcOtc6c=
+=XjZS
 -----END PGP SIGNATURE-----
diff --git a/games-puzzle/xtris/files/xtris.xpm b/games-puzzle/xtris/files/xtris.xpm
new file mode 100644
index 000000000000..27ed16ef5ed7
--- /dev/null
+++ b/games-puzzle/xtris/files/xtris.xpm
@@ -0,0 +1,41 @@
+/* XPM */
+static char * xtris_xpm[] = {
+"34 34 4 1",
+" 	c None",
+".	c #00F000",
+"+	c #007000",
+"@	c #00A800",
+"                                  ",
+" ................................ ",
+" ...............+...............+ ",
+" ..@@@@@@@@@@@@++..@@@@@@@@@@@@++ ",
+" ..@@@@@@@@@@@@++..@@@@@@@@@@@@++ ",
+" ..@@@@@@@@@@@@++..@@@@@@@@@@@@++ ",
+" ..@@@@@@@@@@@@++..@@@@@@@@@@@@++ ",
+" ..@@@@@@@@@@@@++..@@@@@@@@@@@@++ ",
+" ..@@@@@@@@@@@@++..@@@@@@@@@@@@++ ",
+" ..@@@@@@@@@@@@++..@@@@@@@@@@@@++ ",
+" ..@@@@@@@@@@@@++..@@@@@@@@@@@@++ ",
+" ..@@@@@@@@@@@@++..@@@@@@@@@@@@++ ",
+" ..@@@@@@@@@@@@++..@@@@@@@@@@@@++ ",
+" ..@@@@@@@@@@@@++..@@@@@@@@@@@@++ ",
+" ..@@@@@@@@@@@@++..@@@@@@@@@@@@++ ",
+" .+++++++++++++++.+++++++++++++++ ",
+" ++++++++++++++++++++++++++++++++ ",
+" ................................ ",
+" ...............+...............+ ",
+" ..@@@@@@@@@@@@++..@@@@@@@@@@@@++ ",
+" ..@@@@@@@@@@@@++..@@@@@@@@@@@@++ ",
+" ..@@@@@@@@@@@@++..@@@@@@@@@@@@++ ",
+" ..@@@@@@@@@@@@++..@@@@@@@@@@@@++ ",
+" ..@@@@@@@@@@@@++..@@@@@@@@@@@@++ ",
+" ..@@@@@@@@@@@@++..@@@@@@@@@@@@++ ",
+" ..@@@@@@@@@@@@++..@@@@@@@@@@@@++ ",
+" ..@@@@@@@@@@@@++..@@@@@@@@@@@@++ ",
+" ..@@@@@@@@@@@@++..@@@@@@@@@@@@++ ",
+" ..@@@@@@@@@@@@++..@@@@@@@@@@@@++ ",
+" ..@@@@@@@@@@@@++..@@@@@@@@@@@@++ ",
+" ..@@@@@@@@@@@@++..@@@@@@@@@@@@++ ",
+" .+++++++++++++++.+++++++++++++++ ",
+" ++++++++++++++++++++++++++++++++ ",
+"                                  "};
diff --git a/games-puzzle/xtris/xtris-1.15.ebuild b/games-puzzle/xtris/xtris-1.15.ebuild
index dcec08c7d206..3570da6779af 100644
--- a/games-puzzle/xtris/xtris-1.15.ebuild
+++ b/games-puzzle/xtris/xtris-1.15.ebuild
@@ -1,33 +1,37 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/xtris/xtris-1.15.ebuild,v 1.6 2006/02/14 04:17:57 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/xtris/xtris-1.15.ebuild,v 1.7 2006/10/31 19:08:23 nyhm Exp $
 
-inherit games
+inherit eutils toolchain-funcs games
 
-S="${WORKDIR}/${PN}"
 DESCRIPTION="a networked Tetris-like game"
 HOMEPAGE="http://www.iagora.com/~espel/xtris/xtris.html"
 SRC_URI="http://www.iagora.com/~espel/xtris/${P}.tar.gz"
 
-KEYWORDS="x86 amd64 ppc"
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 
-DEPEND="|| ( x11-libs/libX11 virtual/x11 )"
+DEPEND="x11-libs/libX11"
+
+S=${WORKDIR}/${PN}
 
 src_compile() {
 	emake \
+		CC=$(tc-getCC) \
 		BINDIR="${GAMES_BINDIR}" \
 		MANDIR=/usr/share/man \
-		XLIBDIR=-L/usr/X11R6/lib \
 		CFLAGS="${CFLAGS}" \
-			|| die "emake failed"
+		EXTRALIBS="${LDFLAGS}" \
+		|| die "emake failed"
 }
 
 src_install() {
-	dogamesbin xtris xtserv xtbot   || die "dogamesbin failed"
-	doman xtris.6 xtserv.6 xtbot.6  || die "doman failed"
-	dodoc ChangeLog PROTOCOL README || die "dodoc failed"
+	dogamesbin xtris xtserv xtbot || die "dogamesbin failed"
+	doicon "${FILESDIR}"/${PN}.xpm
+	make_desktop_entry ${PN} xtris ${PN}.xpm
+	doman xtris.6 xtserv.6 xtbot.6
+	dodoc ChangeLog PROTOCOL README
 	prepgamesdirs
 }