Fix file collision with localization wrt #390267 by Graham Murray

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

diff --git a/gnome-extra/polkit-gnome/ChangeLog b/gnome-extra/polkit-gnome/ChangeLog
index e08044e6630c6470268da36e956eba23a1d517f5..3dcba861b3b5e70004f7f00a24c8859fa46c66fb 100644 (file)
--- a/gnome-extra/polkit-gnome/ChangeLog
+++ b/gnome-extra/polkit-gnome/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-extra/polkit-gnome
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/polkit-gnome/ChangeLog,v 1.45 2011/11/05 01:30:24 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/polkit-gnome/ChangeLog,v 1.46 2011/11/12 16:17:22 ssuominen Exp $
+
+  12 Nov 2011; Samuli Suominen <ssuominen@gentoo.org>
+  polkit-gnome-0.102.ebuild:
+  Fix file collision with localization wrt #390267 by Graham Murray
 
 *polkit-gnome-0.102 (05 Nov 2011)
 

diff --git a/gnome-extra/polkit-gnome/Manifest b/gnome-extra/polkit-gnome/Manifest
index ee729d31c9863022d1228052d79010e36277120d..dc8a29c17a6dea29aaa10bcbbb93ced6feab9ef8 100644 (file)
--- a/gnome-extra/polkit-gnome/Manifest
+++ b/gnome-extra/polkit-gnome/Manifest
@@ -8,18 +8,18 @@ DIST polkit-gnome-0.101.tar.bz2 408431 RMD160 cb620f245f9b2b2fb463db76f1e3e684d7
 DIST polkit-gnome-0.102.tar.xz 335144 RMD160 319c31c1f0454fadf51b6458462bc103e77a18d1 SHA1 e4b5d1a0b5bbdc1935dbe6f27411030087fc57c6 SHA256 c78cee0001128dc1b00248ed11ffd23988d9cd0ce78c8b00eb36880b289e7598
 DIST polkit-gnome-0.105.tar.xz 310876 RMD160 191c0a12fdb0cbff592f533f28b9f3180e57698e SHA1 948bad76395834a1b45b65bd191d46145f5c0b9f SHA256 1784494963b8bf9a00eedc6cd3a2868fb123b8a5e516e66c5eda48df17ab9369
 EBUILD polkit-gnome-0.101-r1.ebuild 1871 RMD160 df401363129aa100fab4ee4467da01ab32a4905b SHA1 1d1b15ef93208baca49d78e29088a620f1d847fa SHA256 351d32ed33a3aae205f05f780d1b661607c9ef21f066dfdd9d54e3b9787a96b3
-EBUILD polkit-gnome-0.102.ebuild 1176 RMD160 de8edafbd1145375f507a146949d02a8e7860698 SHA1 91708dc0745d0fb025eb55062cededa4f1460dab SHA256 767ac4ac06890ba1494cef878d39a0f8dfb7760d248b13db2637f896db88f745
+EBUILD polkit-gnome-0.102.ebuild 1205 RMD160 83a2b5d22940185e74c238a4b6a8735f1e3819ee SHA1 337afc1f9cb25bdff01db5e60218976788c3dcbe SHA256 acb021e3315ecc963639ceec3923fb0d0a1603f0747a6623c5863b106e594d26
 EBUILD polkit-gnome-0.105.ebuild 1211 RMD160 7764e1782ca1725262f6c77739b68c45c543761b SHA1 75c77c26a2ecda89e5756f41e09c5b0070569df3 SHA256 75b105cfb592db21b263e245e5dc26db2c2eb21ae94f804322e8748283f42244
-MISC ChangeLog 6435 RMD160 5a3171735b85dc7585727d4f3344d5ef0e9b5846 SHA1 b04fcbdad99164cfec78ec7d9308c03ea1d72635 SHA256 8f3641fe5713364e6c7ff8292135c3b611424416c8216280b8a8ecc0657bcf9b
+MISC ChangeLog 6587 RMD160 fa1dd1b126eff329152eba90e0a64a218d5f7e83 SHA1 1fd39fd7652be92cd6df754ecab14e003c49ac0f SHA256 f6ce064c41136416e1454e1aea1cf7a4c82766e94123fd3da2e8d399acc21376
 MISC metadata.xml 376 RMD160 8c718557c5de01a6b342f7c866c9690a90e1928e SHA1 b19aa2a188a24437f3529396ca9471437a3b012b SHA256 b201b0413405789b51dc0e76833050159a011be2312de5068976f228ca9b3ab3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJOtJGWAAoJEEdUh39IaPFNfQYH/iNEFLDgNAu2W0Yzr3VoTVNn
-AiJHa1lYVdYJ8ZSZUgHu17yqTS7q5xsld/RuV8xkeLq7sagmP6CfhN8bcA7ydXVz
-S5t3ayzrpmd0qXeXIJnmH6R31tx2Mr2l2yLrMVgdiTBPVRW1eyshUaN0TUknT6An
-f/xoWmxFrZ6oaTaYCkKvH5dzjEUC09ykwAlXG2cGzwYYfqEn78tjbrannpH8i3Fr
-Jw6z4zLFzKr56vqfSpGcApr40fVps13tzPsSfEf5DcvuldIMJwx+XRjLj7ddjnFo
-1MITc4GifpvR42RMwmBF0ARGFRSMrakZYHfNcxqBfk8j1QUY9KF6pMOPHor7unk=
-=UNn1
+iQEcBAEBAgAGBQJOvpvSAAoJEEdUh39IaPFNsdkH/2PWn18UZUXKXVwcr39d/3X2
+gxTSNk2eohkiGkVMtyb71JDHWtR7JsiWuHELsVppZHTpFtYcOJci4EajtBm82yXC
+RXPKoHU9Bcfy9Ci0olex1VORglN1NIej3T7ecNk5dqyucre7zOJtgwYbvpOdNy25
+0ty0yjnV1WQI9LdWYTJ2NcWA679Uin0LkgHFKV6JHMV37X7lGdiW6Z/d/b8GBZ3D
+OA1JO4DTDihIuwsle0hGMUd9vSiKGEGFPa+RZ9iDyV/6Fm9eVq7KPUFj+MhnxBuG
+cQ6BAmfVXoOIyeDHLhQmwEhgYk66QctdlSLr08qdir7Qj+dfRay8KZMqyYHJerw=
+=wmNz
 -----END PGP SIGNATURE-----

diff --git a/gnome-extra/polkit-gnome/polkit-gnome-0.102.ebuild b/gnome-extra/polkit-gnome/polkit-gnome-0.102.ebuild
index 394ef8bc0e2bda0f60eaf0c92ecbb5a3d11778ff..02107a3084f8711b0aa7cc7ea369a8728ba75ac6 100644 (file)
--- a/gnome-extra/polkit-gnome/polkit-gnome-0.102.ebuild
+++ b/gnome-extra/polkit-gnome/polkit-gnome-0.102.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/gnome-extra/polkit-gnome/polkit-gnome-0.102.ebuild,v 1.1 2011/11/05 01:30:24 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/polkit-gnome/polkit-gnome-0.102.ebuild,v 1.2 2011/11/12 16:17:22 ssuominen Exp $
 
 # This ebuild is only for installing obsolete libpolkit-gtk-1 wrt #387663
 
@@ -37,7 +37,8 @@ src_compile() {
 
 src_install() {
        emake DESTDIR="${D}" install
-       rm -f \
+       rm -rf \
                "${ED}"usr/lib*/polkit-gnome-authentication-agent-1 \
-               "${ED}"usr/lib*/libpolkit-gtk-1.la
+               "${ED}"usr/lib*/libpolkit-gtk-1.la \
+               "${ED}"usr/share/locale
 }