Set needed permissions to remove colliding file when using 'userpriv', bug #397855...

Package-Manager: portage-2.1.10.44/cvs/Linux x86_64

diff --git a/x11-themes/metacity-themes/ChangeLog b/x11-themes/metacity-themes/ChangeLog
index 3cafad17e0011d6eec60bf3c728d74b6859a9042..ae172be1f8f02b2955e96e866da93c7e253aa4ae 100644 (file)
--- a/x11-themes/metacity-themes/ChangeLog
+++ b/x11-themes/metacity-themes/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-themes/metacity-themes
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/metacity-themes/ChangeLog,v 1.28 2012/01/05 22:24:30 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/metacity-themes/ChangeLog,v 1.29 2012/01/06 12:10:28 pacho Exp $
+
+  06 Jan 2012; Pacho Ramos <pacho@gentoo.org> metacity-themes-1.3-r1.ebuild:
+  Set needed permissions to remove colliding file when using 'userpriv', bug
+  #397855 by My Th and Zac Medico.
 
 *metacity-themes-1.3-r1 (05 Jan 2012)
 

diff --git a/x11-themes/metacity-themes/Manifest b/x11-themes/metacity-themes/Manifest
index 655a1561085d927129adc76178823bf8c0e72b1d..77cc94f42a34d0ecd77a75901d9b394bd87f01cb 100644 (file)
--- a/x11-themes/metacity-themes/Manifest
+++ b/x11-themes/metacity-themes/Manifest
@@ -79,13 +79,13 @@ DIST MCity-VistaBasic.tar.gz 16050 RMD160 42afd94045534d6052b6d4deed2f8247b7ebc3
 DIST MCity-W2k.tar.gz 3821 RMD160 140f8aaac63c9fef6e13595e52d140c912453c03 SHA1 c8b2504aa944939dbcde4332c384e61e43e83bc0 SHA256 f182adb967f6bb1be43004b3adc2e511cf1c131e977b58bc871f646ec03782b3
 DIST SmallPill-Citrus-0.2.tar.gz 6317 RMD160 5bf0311010d472c82055229dfbb61f8e68eba48f SHA1 bd0f781f051d857276bbece7187496e0a23917c7 SHA256 85e395972caf4f135fd1b1339b2deb25c3e1c977323b1115ab9b52d1fedd0db8
 EBUILD metacity-themes-1.2.ebuild 2513 RMD160 c9163c2d2731290daf38a5f4f4a1c41a2991d54f SHA1 07ad761ec73f54c9efb532696a54231848ece188 SHA256 eceda326700a188b2f638cfc60bc0fe8666b95825f5316bfa5f1a1dd0c908835
-EBUILD metacity-themes-1.3-r1.ebuild 4306 RMD160 5ae21d270a009e80e169f731dfd3b9328e4896bf SHA1 c52bc120805d44ee22c557de877116b4fbe783be SHA256 921a50d219da373a39deb04851a14c8475439f6ac919eb4382b5e7e88d2e591b
-MISC ChangeLog 3572 RMD160 51376d10315ae8c30941c17a517784cb632fb879 SHA1 16c1a6f9b5b4a38a119150c0c2a221051c7ea220 SHA256 959f9d52024fc291dca7b52fd660d0897ed4f939f181fc6bdfaa7042831cebbd
+EBUILD metacity-themes-1.3-r1.ebuild 4331 RMD160 353498b251d83d2d3491bfc0aec4342b04b99434 SHA1 c93f537ec3d0f7ddacaba4d8f2912edcfffc6001 SHA256 57e5fd5af86c78f0030db161f72d74fe2e2d1834c97990d929fa26cf0745a24d
+MISC ChangeLog 3762 RMD160 8d965611a2c2d9ea088a63b3241beb6a7df18ac3 SHA1 6c4a7e2bf11fface570e02764e04294c15016a03 SHA256 b13aceef00f6a47b1fedc0c6a1a8d77c3e0e53dfe78819a9eb7a0d0203d59e5c
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk8GIyQACgkQCaWpQKGI+9Sy4ACfbtqwwJsO906jYNQNbqsz4G/K
-XocAnj41RLhIvcAC0bstpmSABm0hqaOX
-=+q1h
+iEYEARECAAYFAk8G5LoACgkQCaWpQKGI+9RPPACfc6W7uStYC3M4D8G1/DL3k16Q
+8q4An21Azizdxsls6FlmKtIHr3YQGb6h
+=rM6C
 -----END PGP SIGNATURE-----

diff --git a/x11-themes/metacity-themes/metacity-themes-1.3-r1.ebuild b/x11-themes/metacity-themes/metacity-themes-1.3-r1.ebuild
index 031ede36532bb00fc16c077b2ed5c7cfc4465a23..4ccdff7c67060d98000cf1de1ec4361af19178c7 100644 (file)
--- a/x11-themes/metacity-themes/metacity-themes-1.3-r1.ebuild
+++ b/x11-themes/metacity-themes/metacity-themes-1.3-r1.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/x11-themes/metacity-themes/metacity-themes-1.3-r1.ebuild,v 1.1 2012/01/05 22:24:30 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/metacity-themes/metacity-themes-1.3-r1.ebuild,v 1.2 2012/01/06 12:10:28 pacho Exp $
 
 EAPI="4"
 
@@ -128,6 +128,7 @@ src_prepare() {
        find . -type d -iname ".xvpics" | xargs rm -rf
 
        # Tactile index.theme is provided by x11-themes/tactile, bug #395525
+       chmod +w Tactile || die
        rm -f Tactile/index.theme || die
 }