Tactile index.theme is provided by x11-themes/tactile, bug #395525 by Joost Ruis...

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 ca38fd5378b164c3a3a6be0b8adc5370dcbf832a..3cafad17e0011d6eec60bf3c728d74b6859a9042 100644 (file)
--- a/x11-themes/metacity-themes/ChangeLog
+++ b/x11-themes/metacity-themes/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-themes/metacity-themes
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/metacity-themes/ChangeLog,v 1.27 2011/12/18 14:38:27 pacho Exp $
+# 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 $
+
+*metacity-themes-1.3-r1 (05 Jan 2012)
+
+  05 Jan 2012; Pacho Ramos <pacho@gentoo.org> +metacity-themes-1.3-r1.ebuild,
+  -metacity-themes-1.3.ebuild:
+  Tactile index.theme is provided by x11-themes/tactile, bug #395525 by Joost
+  Ruis. Drop old.
 
 *metacity-themes-1.3 (18 Dec 2011)
 

diff --git a/x11-themes/metacity-themes/Manifest b/x11-themes/metacity-themes/Manifest
index be1473b12b60f15390f602f6b4bfcccb0a6d292d..655a1561085d927129adc76178823bf8c0e72b1d 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.ebuild 4198 RMD160 1e2af254774ba186ca43e5bcfdc5eead7852d2e3 SHA1 40ad7108183719cb6a8caf5d8201100169841392 SHA256 f1daef1c73da0bbf64f5a8a84add9f407664926fc554c437d602d071c3668163
-MISC ChangeLog 3327 RMD160 04f8744c7ecf516c65e776eb8e2db20b541aa5dd SHA1 2a0adfdcec2446af35a3b61143596ae929bfe7e6 SHA256 6ad0914a8066745e6ad6bbdcda77e1d0e9ac3ab307349f2051bd653f062fc95c
+EBUILD metacity-themes-1.3-r1.ebuild 4306 RMD160 5ae21d270a009e80e169f731dfd3b9328e4896bf SHA1 c52bc120805d44ee22c557de877116b4fbe783be SHA256 921a50d219da373a39deb04851a14c8475439f6ac919eb4382b5e7e88d2e591b
+MISC ChangeLog 3572 RMD160 51376d10315ae8c30941c17a517784cb632fb879 SHA1 16c1a6f9b5b4a38a119150c0c2a221051c7ea220 SHA256 959f9d52024fc291dca7b52fd660d0897ed4f939f181fc6bdfaa7042831cebbd
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk7t+ukACgkQCaWpQKGI+9RCwACfb3UYq5GLSMQ1fWSFwCvcopxf
-p4gAnRzxfnh2RwjNKpg/UksMhESjV+HB
-=28lQ
+iEYEARECAAYFAk8GIyQACgkQCaWpQKGI+9Sy4ACfbtqwwJsO906jYNQNbqsz4G/K
+XocAnj41RLhIvcAC0bstpmSABm0hqaOX
+=+q1h
 -----END PGP SIGNATURE-----

diff --git a/x11-themes/metacity-themes/metacity-themes-1.3.ebuild b/x11-themes/metacity-themes/metacity-themes-1.3-r1.ebuild
similarity index 95%
rename from x11-themes/metacity-themes/metacity-themes-1.3.ebuild
rename to x11-themes/metacity-themes/metacity-themes-1.3-r1.ebuild
index 5403fdeadfbe253aff8b5cdd4c84460ac4ebfdeb..031ede36532bb00fc16c077b2ed5c7cfc4465a23 100644 (file)
--- a/x11-themes/metacity-themes/metacity-themes-1.3.ebuild
+++ b/x11-themes/metacity-themes/metacity-themes-1.3-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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.ebuild,v 1.1 2011/12/18 14:38:27 pacho Exp $
+# $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 $
 
 EAPI="4"
 
@@ -126,6 +126,9 @@ src_prepare() {
 
        # Remove all of the .xvpics directories, see bug #97368
        find . -type d -iname ".xvpics" | xargs rm -rf
+
+       # Tactile index.theme is provided by x11-themes/tactile, bug #395525
+       rm -f Tactile/index.theme || die
 }
 
 src_install() {