apply desktop file patch; rerolled desktop file patch to quiet patch and quiet desktop-file-validate

Package-Manager: portage-2.1.6.13/cvs/Linux i686

4 files changed, 40 insertions, 27 deletions

diff --git a/games-rpg/tmw/ChangeLog b/games-rpg/tmw/ChangeLog
index 7f1038cd93df..34dfaf1b00c2 100644
--- a/games-rpg/tmw/ChangeLog
+++ b/games-rpg/tmw/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-rpg/tmw
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/tmw/ChangeLog,v 1.34 2009/09/30 19:50:14 nyhm Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/tmw/ChangeLog,v 1.35 2010/01/05 17:28:24 mr_bones_ Exp $
+
+  05 Jan 2010; Michael Sterrett <mr_bones_@gentoo.org> tmw-0.0.29.1.ebuild,
+  files/tmw-0.0.29.1-desktop.patch:
+  apply desktop file patch; rerolled desktop file patch to quiet patch
+  and quiet desktop-file-validate
 
   30 Sep 2009; Tristan Heaven <nyhm@gentoo.org> tmw-0.0.29.1.ebuild:
   Add dependencies for USE=nls
diff --git a/games-rpg/tmw/Manifest b/games-rpg/tmw/Manifest
index c3d90ab550c0..4e8a7e11cb12 100644
--- a/games-rpg/tmw/Manifest
+++ b/games-rpg/tmw/Manifest
@@ -1,16 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX tmw-0.0.29.1-desktop.patch 747 RMD160 1dbe8c0c1abcc59b0c2f109c093004866f10b0e5 SHA1 cd41b973d9929bc2b08c202beab612d238aae15e SHA256 f020e316fb746e40a74e7aaf0471a49de5e24248c9b89fe965ce66bf34e74577
+AUX tmw-0.0.29.1-desktop.patch 1524 RMD160 2d837ec55f6b9725ea59ba9ee1fee85a642e9cff SHA1 c98c84104edc792a2ebece4d9dd9d83a5830c81e SHA256 64d50fd25940f83e3afa524e1a9e5ff41c5aa70b5a1e0956e1156f308b29c165
 DIST tmw-0.0.29.1.tar.gz 2614869 RMD160 c80dd7f84bc84f6074a1e3256294f7ecbb3bc4e1 SHA1 c8f0c9627b1fe95547ad231cf24159c51f79899c SHA256 319e91e6e0434cdbefa1b6c1214bfbf24dca714dce57353cc6265506fbf031f7
 DIST tmwmusic-0.0.20.tar.gz 9259802 RMD160 a7212f90b40f864d0670905fe037564eba48ab30 SHA1 c1e3126ff7f53f6e12caaf885a493cd5c4aed6e3 SHA256 964bb27235cdc3199c392f6ddf25ce293c6f32e013abe85592b96221a5896939
-EBUILD tmw-0.0.29.1.ebuild 1718 RMD160 75e8f136c3933a71e96c566e23d8991d94af6dfc SHA1 3255bb2d6bd6c80ca9fb26d0f2b199bb558adcfe SHA256 baf6141c76913d2cd72f26cb839f25d385f30d31bd0bb34f6659e3a806a7c7cb
-MISC ChangeLog 4997 RMD160 57e90a190d2c0de37f919a3c5195c26458410213 SHA1 be90d296c67a799dca05be9aefb6249dd0543017 SHA256 6abb1d8b314d4e6d2f3ee057d85b3d2ac9b546952a78a5612ae4d4044e21ad18
+EBUILD tmw-0.0.29.1.ebuild 1719 RMD160 e43ec7257b2540a396e70e111af23137e7ce2188 SHA1 e3244c8d5a39815ebedf2be9acec7e243ac12e47 SHA256 24dbb56c072f8f74a297ace5cf83a8b52ce54f92cbba343d3dadc6c1addd245f
+MISC ChangeLog 5220 RMD160 a8fdfe9c753b6a383e022e2c350726e6893ef211 SHA1 ea1a8c0794d04a0743b5a5d1f4fed77b33fbc4a8 SHA256 61cfecf64f93b724d51aadd359a77a95bfe6d738d2d6a0d5c71a209878d457f0
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkrDtnwACgkQdz7hIScOURFBNQCg2Ey3BWzLZBCU1Rv/wbF3Bqo/
-bOEAnR6rb1/DcAWbX7728PQtCI0tzXgn
-=7YJm
------END PGP SIGNATURE-----
diff --git a/games-rpg/tmw/files/tmw-0.0.29.1-desktop.patch b/games-rpg/tmw/files/tmw-0.0.29.1-desktop.patch
index 127efd371f3a..4e3e0cf11913 100644
--- a/games-rpg/tmw/files/tmw-0.0.29.1-desktop.patch
+++ b/games-rpg/tmw/files/tmw-0.0.29.1-desktop.patch
@@ -1,15 +1,22 @@
-Make sure desktop/pixmaps dont get thrown into /usr/games.
-
---- Makefile.in
-+++ Makefile.in
-@@ -163,3 +163,3 @@
- SUBDIRS = data docs src
+diff -ru tmw-0.0.29.1.orig/Makefile.in tmw-0.0.29.1/Makefile.in
+--- tmw-0.0.29.1.orig/Makefile.in	2009-06-09 13:55:16.000000000 -0400
++++ tmw-0.0.29.1/Makefile.in	2010-01-05 12:24:52.394781633 -0500
+@@ -248,7 +248,7 @@
+ 
+ # Subdirectories to build
+ SUBDIRS = data docs po src
 -desktopdir = $(datadir)/applications
 +desktopdir =/usr/share/applications
  desktop_DATA = tmw.desktop
---- data/icons/Makefile.in
-+++ data/icons/Makefile.in
-@@ -318,7 +318,7 @@
+ 
+ # Extra files to include
+Only in tmw-0.0.29.1: Makefile.in.orig
+diff -ru tmw-0.0.29.1.orig/data/icons/Makefile.in tmw-0.0.29.1/data/icons/Makefile.in
+--- tmw-0.0.29.1.orig/data/icons/Makefile.in	2009-06-09 15:24:27.000000000 -0400
++++ tmw-0.0.29.1/data/icons/Makefile.in	2010-01-05 12:24:52.395781115 -0500
+@@ -400,11 +400,11 @@
+ 
+ 
  install-data-local:
 -	$(mkinstalldirs) $(DESTDIR)$(datadir)/pixmaps
 -	$(INSTALL) $(srcdir)/tmw.png $(DESTDIR)$(datadir)/pixmaps/tmw.png
@@ -19,4 +26,15 @@ Make sure desktop/pixmaps dont get thrown into /usr/games.
  uninstall-local:
 -	rm -f $(DESTDIR)$(datadir)/pixmaps/tmw.png
 +	rm -f $(DESTDIR)/usr/share/pixmaps/tmw.png
+ 
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+diff -ru tmw-0.0.29.1.orig/tmw.desktop tmw-0.0.29.1/tmw.desktop
+--- tmw-0.0.29.1.orig/tmw.desktop	2009-05-10 10:34:37.000000000 -0400
++++ tmw-0.0.29.1/tmw.desktop	2010-01-05 12:25:15.731780837 -0500
+@@ -12,4 +12,4 @@
+ Terminal=false
+ Type=Application
+ Icon=tmw
+-Categories=Application;Game;
++Categories=Game;
diff --git a/games-rpg/tmw/tmw-0.0.29.1.ebuild b/games-rpg/tmw/tmw-0.0.29.1.ebuild
index 69dbd418a16a..9202e7ff4f37 100644
--- a/games-rpg/tmw/tmw-0.0.29.1.ebuild
+++ b/games-rpg/tmw/tmw-0.0.29.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/tmw/tmw-0.0.29.1.ebuild,v 1.2 2009/09/30 19:50:14 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/tmw/tmw-0.0.29.1.ebuild,v 1.3 2010/01/05 17:28:24 mr_bones_ Exp $
 
 EAPI=2
 inherit eutils games
@@ -15,7 +15,6 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="nls opengl"
-PATCHES=( "${FILESDIR}"/${P}-desktop.patch )
 
 RDEPEND=">=dev-games/physfs-1.0.0
 	dev-libs/libxml2
@@ -39,6 +38,7 @@ src_prepare() {
 		-e '/^SUBDIRS/s/fonts//' \
 		data/Makefile.in \
 		|| die "sed failed"
+	epatch "${FILESDIR}"/${P}-desktop.patch
 }
 
 src_configure() {