Fix more, see ChangeLog

Package-Manager: portage-2.2.0_alpha29/cvs/Linux x86_64

4 files changed, 61 insertions, 8 deletions

diff --git a/x11-misc/rodent/ChangeLog b/x11-misc/rodent/ChangeLog
index 11143b35e9db..78efb081c36e 100644
--- a/x11-misc/rodent/ChangeLog
+++ b/x11-misc/rodent/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-misc/rodent
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/rodent/ChangeLog,v 1.1 2011/04/02 21:11:42 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/rodent/ChangeLog,v 1.2 2011/04/10 06:59:29 ssuominen Exp $
+
+  10 Apr 2011; Samuli Suominen <ssuominen@gentoo.org> rodent-4.6.2.ebuild,
+  +files/rodent-4.6.2-validate.patch:
+  Validate desktop entries. Update desktop, icon, and mime cache. Fix missing
+  sys-apps/file RDEPEND for libmagic.
 
 *rodent-4.6.2 (02 Apr 2011)
 
diff --git a/x11-misc/rodent/Manifest b/x11-misc/rodent/Manifest
index 51f4ab027507..832b830ea1ec 100644
--- a/x11-misc/rodent/Manifest
+++ b/x11-misc/rodent/Manifest
@@ -2,14 +2,15 @@
 Hash: SHA256
 
 AUX rodent-4.6.2-libs.patch 502 RMD160 e177b103144a2bfb3ac22de38f7c35452aab7855 SHA1 0ad2d617af2d7eca8658fb30b2426f60cf0885e3 SHA256 3d72ed0b87dc4775531c48e633627c2585ab994d3e3b54ca360b957a4597c999
+AUX rodent-4.6.2-validate.patch 1120 RMD160 d88f801c73f2542f3332f9e91f0bd60b95bdf71c SHA1 c20180c75c1e6aa9de8dbfee880078534dc4664c SHA256 d8fa77053cab7cbf4beafa95ea02a3db312ae8cfca4953a31f37f6c6b8001514
 DIST rodent-4.6.2.tar.bz2 2914010 RMD160 8d73000fa1115b058d9c9d474421d81afe8c5d22 SHA1 223a58f4f8ea0861c557fa6804c840be443f78f7 SHA256 4c8a0e5e673b7545ba65f1aafc583bfa559bb268b48522a3f2926f96ba5e4ace
-EBUILD rodent-4.6.2.ebuild 1140 RMD160 84a616f208febf5839dca1e3bf823010d38304b3 SHA1 134e22bf883bf4756c59fd5165c2e4d772801640 SHA256 1707c29fadc3424ce03c5c123a9f2ced4dbabc28cd19e0cfab0493e19a42e906
-MISC ChangeLog 374 RMD160 90ce2ef0cb9cf2bcf0204f7826b43b438983255d SHA1 f0754526ce2cdab8eddc3454934540f0b932e282 SHA256 5557111396e6c5e5da1c4067f21cce41109a30a8797ff1227f0b6c7f093d67d0
+EBUILD rodent-4.6.2.ebuild 1211 RMD160 6752078d40382c6cb125292f9ecf3c7c0fb94839 SHA1 15f4ff0aef7c03b03a75e5f3cee94b452caa1251 SHA256 fd92f9c1669ce23bfdaed5a81a04f58eabb3c9af449ce43d02a454e1c4d229b7
+MISC ChangeLog 606 RMD160 b1364fb3b66305d704778615de328a47fdbc5432 SHA1 0e556a8172262e84cff4fc1cd8babed761d9bcf2 SHA256 03a93d7a7352919790cfaa87e7d995e645ef4141b5dbc31d7ec8118d3a0072f8
 MISC metadata.xml 430 RMD160 bedc3a428fa6b8950a3a283f661a86b53db3cfb8 SHA1 a6d1cc9fdd898a63b51a431d5f14b32e4e4c8bd8 SHA256 9bc6034b2985ef23ccdcfcf65201cd9fc7d338de9c11a1e050a962346e15da04
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk2hUlUACgkQXkR9YqOcLPGGzQD/Wsl4O+297+F0TTnr/Ii7U9cv
-ijyasUl3bLxnDlsVEp0A/3FQgIzQ6n7istjwg7Fl+iHestpvHX7rn/AwaE/Bm/VX
-=qmO+
+iF4EAREIAAYFAk2hVVoACgkQXkR9YqOcLPEUoAD+MTZ7v+D4L2BLdWMG39uEzP2j
+NpxUNww0P5WJb8Hg6MIA/079qJqnTNqik1xLPh4cqi6/JVQZlPjY5nTPl2kM5ZCr
+=8ZZ3
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/rodent/files/rodent-4.6.2-validate.patch b/x11-misc/rodent/files/rodent-4.6.2-validate.patch
new file mode 100644
index 000000000000..0bef25be5f48
--- /dev/null
+++ b/x11-misc/rodent/files/rodent-4.6.2-validate.patch
@@ -0,0 +1,42 @@
+The lines starting with _ should get translated, but the build system lacks support for it.
+
+--- Build/bin/Rodent.desktop.in
++++ Build/bin/Rodent.desktop.in
+@@ -1,13 +1,12 @@
+ [Desktop Entry]
+ Version=1.0
+ Type=Application
+-Encoding=UTF-8
+-_Name=Rodent
+-_GenericName=Rodent Filemanager
+-_Comment=Advanced user filemanager
++Name=Rodent
++GenericName=Rodent Filemanager
++Comment=Advanced user filemanager
+ TryExec=rodent
+ Exec=rodent
+ Icon=Rodent-system
+ Terminal=false
+-Categories=Core;Filemanager;
++Categories=System;Utility;Core;GTK;FileTools;FileManager;
+ StartupNotify=false
+--- Build/bin/Rodent-diff.desktop.in
++++ Build/bin/Rodent-diff.desktop.in
+@@ -1,13 +1,12 @@
+ [Desktop Entry]
+ Version=1.0
+ Type=Application
+-Encoding=UTF-8
+-_Name=Rodent Differences tool
+-_GenericName=Rodent Differences tool
+-_Comment=File difference and patch visualiser
++Name=Rodent Differences tool
++GenericName=Rodent Differences tool
++Comment=File difference and patch visualiser
+ TryExec=rodent-diff
+ Exec=rodent-diff
+ Icon=diff-icon
+ Terminal=false
+-Categories=Core;Utility;
++Categories=Utility;Core;GTK;FileTools;
+ StartupNotify=false
diff --git a/x11-misc/rodent/rodent-4.6.2.ebuild b/x11-misc/rodent/rodent-4.6.2.ebuild
index d89a4155fecf..29239070c349 100644
--- a/x11-misc/rodent/rodent-4.6.2.ebuild
+++ b/x11-misc/rodent/rodent-4.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/rodent/rodent-4.6.2.ebuild,v 1.2 2011/04/10 06:46:36 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/rodent/rodent-4.6.2.ebuild,v 1.3 2011/04/10 06:59:29 ssuominen Exp $
 
 EAPI=4
 inherit autotools eutils fdo-mime gnome2-utils
@@ -28,7 +28,12 @@ DEPEND="${RDEPEND}
 DOCS="ChangeLog README TODO"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-libs.patch
+	rm -f Build/bin/*.desktop
+
+	epatch \
+		"${FILESDIR}"/${P}-libs.patch \
+		"${FILESDIR}"/${P}-validate.patch
+
 	eautoreconf
 }