fix desktop file, remove duplicate

Package-Manager: portage-2.2.0_alpha145/cvs/Linux x86_64
Manifest-Sign-Key: 0xE73C35B3

4 files changed, 50 insertions, 9 deletions

diff --git a/games-action/supertuxkart/ChangeLog b/games-action/supertuxkart/ChangeLog
index c6a5c6a2e4b7..3d34b833d930 100644
--- a/games-action/supertuxkart/ChangeLog
+++ b/games-action/supertuxkart/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-action/supertuxkart
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/supertuxkart/ChangeLog,v 1.32 2012/12/13 16:12:24 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/supertuxkart/ChangeLog,v 1.33 2012/12/13 19:05:05 hasufell Exp $
+
+  13 Dec 2012; Julian Ospald <hasufell@gentoo.org> supertuxkart-0.8.ebuild,
+  +files/supertuxkart-0.8-desktopfile.patch:
+  fix desktop file, remove duplicate
 
   13 Dec 2012; Michael Sterrett <mr_bones_@gentoo.org> supertuxkart-0.8.ebuild:
   fix desktop entry
diff --git a/games-action/supertuxkart/Manifest b/games-action/supertuxkart/Manifest
index 5e4ad1affe4e..d18625d4befa 100644
--- a/games-action/supertuxkart/Manifest
+++ b/games-action/supertuxkart/Manifest
@@ -1,5 +1,9 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX supertuxkart-0.7-build.patch 6759 SHA256 03e81146a1b2dda8b4382abf8258a319d4b9057f5a06e661ea8cef18c4dd5550 SHA512 a886150a016f3deeafa779685de6039e81289e2241003f174e2865ac5c1a1eac5d91db07c7bf3f20f887928e384a2856dde518ff3f2d5c23600c2158a590b587 WHIRLPOOL 65acff78d23171faae5ce9db52bc0cc4ce2ae75467fb46bec181db256c2780464ece41ecec3ad32e14abb8af6eaccefaf26a68d1bc58492fb7c5c84b02fd3770
 AUX supertuxkart-0.7-underlink.patch 819 SHA256 2e4b3a83bcb7e747b0f24fde7f955e2a972f70014d47124d8d93559e896269e1 SHA512 4def49ba56fc1ddeea75e60cd059017a50f1259bcf512501ab2c772fe398003351f2560d60e0b526e60f67553548a01703811e6f43d86b67b96bf0b69510d567 WHIRLPOOL ad7180950cf6c041bbf236f5f6e1f5c8941c3b3441f382f8b24dbc7322062a04c3ed2095bdca47145487362cb0a609026a0b00a626662d40d50864a356557f7c
+AUX supertuxkart-0.8-desktopfile.patch 804 SHA256 b3a08696d2aa64988b434873a80a3a9fe764b3be245a7e9a9619cf85178b2793 SHA512 3eb4e49bc2ae0e97ae2b4344bcf1c8fba996f17357b4e90d1a2fa38f94ab7f81b0c91a491c0c4661b39c20a65e3b9b76706d5b368e0c73c8a1f2dc241139d446 WHIRLPOOL b815324a61c11f1c7253e6021c7ad5581c6cc6b05b0da3f1b9095af29bc4ae8607bd23f124462632c88d6fbd3c7b595f186011505f04ec87e53b243e1a016380
 AUX supertuxkart-0.8-fribidi.patch 1766 SHA256 ef11ccc0e759778184f686d9e3637f863ceda9defe4355da0128ecd20963fe51 SHA512 0998db03662402781b00f0792e365046dbc1157cf0278eaeb8da38a8f8992274320ba887eb4f9365d3c98272199020116ea3ac867f0841a8817e7f5096618a93 WHIRLPOOL 8369f96bf8f6c389d9582a3fd617653b23f4fe50a7c9cb5ff19933a594a06aa979b5839f66b507b7a5a3edd46a3eab4622a6970d67d360f38ccd2b676c6c2fbd
 AUX supertuxkart-0.8-gentoo.patch 377 SHA256 a574c514490744cb98dc97460d33acfd26336d41d6fbc84145be7ea052b7c3f8 SHA512 07a49a03f943fb14543a01c705f69dbf7fc5238510d6ad615243c51cb142e856af3e3bb4cc2134b28652acf2944fdf9075311947c2afdb9d6dd62033222a016e WHIRLPOOL 2e0086cdbc34a278707254cde7239ac38549212baecea608b56f014aed9431910e28b6504e532ac8992b4ecac01001a8878557fdf9703167e8ddc767c2e5a555
 AUX supertuxkart-0.8-irrlicht.patch 4824 SHA256 0388d3e5f5519039208069e0ff88edb7936ccf8038e3082c4ed432ab46deb09d SHA512 1ac949874baf83ae501bbf01b0678fe91a9d019b9939f7f1383c182a0ff0ace0b9154c23d14fc2bca8b4e7d8708d81b4f3a58e0019032c2a8738f887ad7990ce WHIRLPOOL 06b719b6136841baff4c9d81f386f4d56bda04ab224c21522c54369af1259f01a1e85e372a675aa5d78b6c1e8221fc45012d869dfe5c034bb4de25df1acc7add
@@ -7,6 +11,17 @@ DIST supertuxkart-0.7-src.tar.bz2 110770427 SHA256 18543c4b0c48c4952efe076cf9cdb
 DIST supertuxkart-0.8-src.tar.bz2 171184279 SHA256 b99f3d2311457a34db3c42ba2195662f2993a48eae4f6b1f175dbcce09ad4b8b SHA512 1936ff85ab896ad46633e53423a55c74aebe7a49d55024ed9bd76baf735e2e3c1ada0e83e3cc29dc7b9ff257484f2a9edb0bf5cf61b0b78fa5757f2e702a6f72 WHIRLPOOL f196b1faa13e6e7282df3ca88597a8dcaf1a0ef122274faef8b9ec123eb249ff93cf1b902b31376083cf02c1a267ed80a5b3e2c7a59b6526effefff260d742bf
 DIST supertuxkart.png 4435 SHA256 99bc1801cb0514946cb0171d6d5a84484b6dc881edfa7f096b6eb5fea2f28828 SHA512 a180332f79220431922fa8b351cb476ebc5d9d1df09f20707eb3bdd7002fd264cb027b8190c73c5221050e6e8601beb6758a5809d05aedfb18f0bdb426f47eda WHIRLPOOL eef651802a927b451226fc06a682d7dea68b65b05195130ccfc7544165f26f65bda4fc9565e09d6487d02be3cf57880b0c6c257f26587c6bc6d30afc6aa5d3c2
 EBUILD supertuxkart-0.7.ebuild 1437 SHA256 8b97e588feafb1e5ddae49d2d6dd9374719573094d85a0dc75336164e2a5b76f SHA512 0302146be7eaca4caf18842233e08fe0c998a111242499ae35e5487869dcba9ed7516578d602eac84cac16b3ef4b9e17c6179ba0f646bc352a301808095ad8fe WHIRLPOOL 2ddb3cdc5d18c5d83055df15602492a2bd07c9a077883048855825ba4715e37e9b018cc3521f58f24972831ebc78ac7a5546276980868399dd8b02a8d54459e9
-EBUILD supertuxkart-0.8.ebuild 2037 SHA256 a441ff085a4058fc4ce0d95628f222e92ad849ea449935d1e63992af99334403 SHA512 03f4451237d61fd8de1036aa71ff4fa8605ea4853d4d2175227676b2dfbaa2559b52302928ffa8f7c57ad8a4bef1e63b0f62ee0323a5087e4da3b485aa2ce4b1 WHIRLPOOL a830b515a1541dcb7e846e46e9bdef0494d4435458483b4ae79aa1a81f45f704fbaeb7f6cfae3aea3c18a646cee69b387bb0c331e070e780c2669f812a42f7ae
-MISC ChangeLog 4495 SHA256 75c7899d346931058e09babb2208bd3998b1f207ecd94746a285bca158121817 SHA512 0974c99da94087f8db9f1d142991090d6e6064fd175c1d16488360f6449601553d459ed4545f622bcfb8d8f036ec2431ac5c8d20a75f576f67d85c2d954a6f5e WHIRLPOOL 2ce1d3674fd35d87314675d9d15e11e9c06c15897930a0b8350e2aced38088b03936c5eadc0bb4abc02c50e8e40acca58b26d15bac87ca114dfaf7e0f61c36dd
+EBUILD supertuxkart-0.8.ebuild 1934 SHA256 49dfd3a7d25a2e622651816e8d93693b883f34ecd7e697b4d9765ee561c1cabb SHA512 8552ddbf4ec8f00eeabef5674413d33af8f9a237ae58e2b01ca43753e945e537ebbab25e3ce186bc4496a8a7cbc8796df0027e15e253cc86f748c5317f53000c WHIRLPOOL c729af98da2f586e385820aafce4d0d2e8130756ca1e378aa3cc5bb2d257d7bca66273400ce2483aa6f4e014ae5f44113b9e538b78e2e1747eda97f730de1ba0
+MISC ChangeLog 4653 SHA256 af4ed8d3e4f200adcb3443163ef398e4bf342bca5002de054db38653481a664e SHA512 763f070c25e629931ae52d6b01b19e26668e8306df39b0fac0ae35911f14ed9f82c6171a2910ce4839c6702ee85ed8104cc032cf13d17210867aff0a21349131 WHIRLPOOL 6d6962d2fee84b06e2b862609b2855a3788d5395de26c2ec4aaef581d0c24549aa156b1a92565b39e957534925b50ae75ae4c974e6a67bf8810c75b94fe65881
 MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQyibnAAoJEFpvPKfnPDWzCHAIALHp7DVW0BDPe7StoK35Y8UP
+CrQqUDOJ9SH3cHA3564XVtyiIPFQd33qLixHjduqtZHFEUjblOscWYLAOlVZXOPC
+GMKSA0Mh4SwotJvZOYcnwxehqqUNwpTJIkPSU7L1Jbz+SEKleFpMmgkUR9TQl3cI
+AX9MhtgyRwJHfNk+8IxvvQ31BhtYUqH9jgR0tgmvK9F2b3z4FqMJzceDccNMt4qd
+1tfPS0CwC/RDGddgFoeavZy2fFn2Sim4/V/FtNvGrRH7RErL98z1f3oRghoHJIbs
+tBnxbAIse+hjyFib54oZ8lcvxtJPtgqU1Q7vGsIYHsbCQDR5g4OIy2iKls3Lsd4=
+=JUbk
+-----END PGP SIGNATURE-----
diff --git a/games-action/supertuxkart/files/supertuxkart-0.8-desktopfile.patch b/games-action/supertuxkart/files/supertuxkart-0.8-desktopfile.patch
new file mode 100644
index 000000000000..5df84f6fce57
--- /dev/null
+++ b/games-action/supertuxkart/files/supertuxkart-0.8-desktopfile.patch
@@ -0,0 +1,26 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Thu Dec 13 18:45:18 UTC 2012
+Subject: fix desktop file
+
+https://sourceforge.net/apps/trac/supertuxkart/ticket/841
+
+--- data/supertuxkart_desktop.template
++++ data/supertuxkart_desktop.template
+@@ -1,5 +1,4 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+ Name=SuperTuxKart
+ Icon=@PREFIX@/share/pixmaps/supertuxkart_64.xpm
+ GenericName=A kart racing game
+@@ -7,9 +6,9 @@
+ GenericName[fr_FR]=Un jeu de karting
+ GenericName[gl]=Xogo de carreiras con karts
+ GenericName[ro_RO]=Un joc de curse cu carturi
+-Exec=@PREFIX@/games/supertuxkart --log=file
++Exec=@STK_INSTALL_BINARY_DIR@/supertuxkart --log=file
+ Terminal=false
+ StartupNotify=false
+ Type=Application
+-TryExec=@PREFIX@/games/supertuxkart
++TryExec=@STK_INSTALL_BINARY_DIR@/supertuxkart
+ Categories=Game;ArcadeGame;
diff --git a/games-action/supertuxkart/supertuxkart-0.8.ebuild b/games-action/supertuxkart/supertuxkart-0.8.ebuild
index 972ab38baeba..92eeac1c96f8 100644
--- a/games-action/supertuxkart/supertuxkart-0.8.ebuild
+++ b/games-action/supertuxkart/supertuxkart-0.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/supertuxkart/supertuxkart-0.8.ebuild,v 1.4 2012/12/13 16:12:24 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/supertuxkart/supertuxkart-0.8.ebuild,v 1.5 2012/12/13 19:05:05 hasufell Exp $
 
 EAPI=2
 inherit cmake-utils eutils games
@@ -40,10 +40,7 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/SuperTuxKart-${PV}
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-{gentoo,fribidi,irrlicht}.patch
-	sed -i \
-		-e '/Encoding/d' \
-		data/supertuxkart_desktop.template || die
+	epatch "${FILESDIR}"/${P}-{gentoo,fribidi,irrlicht,desktopfile}.patch
 
 	# inconsistent handling of debug definition
 	# avoid using Debug build type
@@ -73,7 +70,6 @@ src_compile() {
 src_install() {
 	cmake-utils_src_install
 	doicon "${DISTDIR}"/${PN}.png
-	make_desktop_entry ${PN} SuperTuxKart
 	dodoc AUTHORS ChangeLog README TODO
 	prepgamesdirs
 }