apply Matthias Langer's patch and mark amd64 stable; bug 150272

Package-Manager: portage-2.1.2-r7

4 files changed, 35 insertions, 25 deletions

diff --git a/x11-themes/ximian-artwork/ChangeLog b/x11-themes/ximian-artwork/ChangeLog
index 0699bb9a185e..48b01ba2acde 100644
--- a/x11-themes/ximian-artwork/ChangeLog
+++ b/x11-themes/ximian-artwork/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-themes/ximian-artwork
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/ximian-artwork/ChangeLog,v 1.28 2007/01/04 12:56:16 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/ximian-artwork/ChangeLog,v 1.29 2007/02/06 14:18:19 blubb Exp $
+
+  06 Feb 2007; Simon Stelling <blubb@gentoo.org>
+  ximian-artwork-0.2.32.1.ebuild:
+  apply Matthias Langer's patch and mark amd64 stable; bug 150272
 
   04 Jan 2007; Diego Pettenò <flameeyes@gentoo.org>
   ximian-artwork-0.2.32.1.ebuild:
diff --git a/x11-themes/ximian-artwork/Manifest b/x11-themes/ximian-artwork/Manifest
index b7d6a8b12b87..204bffd720e9 100644
--- a/x11-themes/ximian-artwork/Manifest
+++ b/x11-themes/ximian-artwork/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX ximian-artwork-0.2.26-corruption_fix.patch 716 RMD160 dcb420c9b04c12577d6a54ca96f57d2eae4d50e0 SHA1 9339dc77a9f78201f59247dadb559187cadfd04a SHA256 b4b809081d5dd62ae1b5ab2244e3c68dd0b04bbea9919b16a5a909a939306b81
 MD5 481c98be012989222f01734d8c6e43e4 files/ximian-artwork-0.2.26-corruption_fix.patch 716
 RMD160 dcb420c9b04c12577d6a54ca96f57d2eae4d50e0 files/ximian-artwork-0.2.26-corruption_fix.patch 716
@@ -17,34 +14,27 @@ AUX ximian-artwork-0.2.32.1-disable_industrial_engine.patch 1374 RMD160 b59808c7
 MD5 97a527cd1be3926af01ecbff0cc1311d files/ximian-artwork-0.2.32.1-disable_industrial_engine.patch 1374
 RMD160 b59808c7a823ebdbc925b1e0ef06f67a9e71f1a6 files/ximian-artwork-0.2.32.1-disable_industrial_engine.patch 1374
 SHA256 6c1a1d5a38cb731f50207ff7f9ac68a2f0b05cab0137479ac66c8e2f0632d1bc files/ximian-artwork-0.2.32.1-disable_industrial_engine.patch 1374
-DIST ximian-artwork-0.2.29-0.ximian.6.3.src.rpm 3824967
+DIST ximian-artwork-0.2.29-0.ximian.6.3.src.rpm 3824967 RMD160 2257cdb51ac2f7a8bb6cd1370384033f37cd3216 SHA1 0041cd03d6190b18bc88f28b7e15fdfed84ef53b SHA256 3703f6b1da092890b9200cca8e2a6be6269eb5e0f016339e3d2e2880ba156fff
 DIST ximian-artwork-0.2.32-1.rf.src.rpm 3958480 RMD160 83ba9fcbffced7396e34959f4a6d0cc522840db6 SHA1 8da4df6f5e6ec4683ac5a86ab1b7403f47db71da SHA256 bbb520faa99e08bc562a09bcf495291296f52f18a1323b228250d5fc5e3bfcff
 EBUILD ximian-artwork-0.2.29.0.6.3.ebuild 1978 RMD160 7cbbcc24b8b2e2f00a91da6ea6662d1227140031 SHA1 f0694fbd90b94a48902db0b9180ea1a15318d64b SHA256 c414b2c28523ca70ae73a317ff6788e1d34317e5b439fe395e69a2f928a4c5a7
 MD5 da4ef2cfee15b650827fc41ce8d9cd02 ximian-artwork-0.2.29.0.6.3.ebuild 1978
 RMD160 7cbbcc24b8b2e2f00a91da6ea6662d1227140031 ximian-artwork-0.2.29.0.6.3.ebuild 1978
 SHA256 c414b2c28523ca70ae73a317ff6788e1d34317e5b439fe395e69a2f928a4c5a7 ximian-artwork-0.2.29.0.6.3.ebuild 1978
-EBUILD ximian-artwork-0.2.32.1.ebuild 1734 RMD160 db85690a3dbc7577125d214dbfc68fd93fa7cc8b SHA1 c87eb28c69ded6e4ccee11e85611a57badaae5ce SHA256 0ecb0ae0a07cf43ca5f30aab420385feef82f2915f623b80cb6320818c5c1038
-MD5 1bfd35364f2e59370415dec83fcb7b98 ximian-artwork-0.2.32.1.ebuild 1734
-RMD160 db85690a3dbc7577125d214dbfc68fd93fa7cc8b ximian-artwork-0.2.32.1.ebuild 1734
-SHA256 0ecb0ae0a07cf43ca5f30aab420385feef82f2915f623b80cb6320818c5c1038 ximian-artwork-0.2.32.1.ebuild 1734
-MISC ChangeLog 4382 RMD160 cb6c179e87340bef6c9e9f2e116316bcecdf415c SHA1 b8d5580162c837c8e5819ca8946e155984a7e09b SHA256 5a2f146f48a689add79c03719176ff11b02c5cd4246561e30f295b9edab051c6
-MD5 360f8cac615e82580fe3bb0077b51224 ChangeLog 4382
-RMD160 cb6c179e87340bef6c9e9f2e116316bcecdf415c ChangeLog 4382
-SHA256 5a2f146f48a689add79c03719176ff11b02c5cd4246561e30f295b9edab051c6 ChangeLog 4382
+EBUILD ximian-artwork-0.2.32.1.ebuild 2320 RMD160 6d8449fd622e86206f356e572c00e71ecf285625 SHA1 c1c9162f82c45ef3b9a6c6db14662f89641306be SHA256 58fe0abcf7913bdf0532aaf942850b23c5b5763e280b058513e38733bc584428
+MD5 6bd6fc977691810e7990027f055485b7 ximian-artwork-0.2.32.1.ebuild 2320
+RMD160 6d8449fd622e86206f356e572c00e71ecf285625 ximian-artwork-0.2.32.1.ebuild 2320
+SHA256 58fe0abcf7913bdf0532aaf942850b23c5b5763e280b058513e38733bc584428 ximian-artwork-0.2.32.1.ebuild 2320
+MISC ChangeLog 4528 RMD160 8200732e6bdc33c226bf5bdd3ae617bc29e00395 SHA1 735568501626d569959acd7adbe6a8e9bd3771d0 SHA256 41304577249bdfc54a0a364feade9dc5a393c222bcfc811905b517b2ddd90042
+MD5 d60fd567f342a490796cc822a55434a4 ChangeLog 4528
+RMD160 8200732e6bdc33c226bf5bdd3ae617bc29e00395 ChangeLog 4528
+SHA256 41304577249bdfc54a0a364feade9dc5a393c222bcfc811905b517b2ddd90042 ChangeLog 4528
 MISC metadata.xml 219 RMD160 fd2bbaf1c19b4ad2d876f02846608907516e2403 SHA1 aad05fa7d0ab2c9304502d4843d10f775afad2a8 SHA256 f39a99f0777bf9eac2d5a444a392d3b93da834a6de01613747bad25c84637138
 MD5 8f906ffe0aa837e5e26fe03af3043461 metadata.xml 219
 RMD160 fd2bbaf1c19b4ad2d876f02846608907516e2403 metadata.xml 219
 SHA256 f39a99f0777bf9eac2d5a444a392d3b93da834a6de01613747bad25c84637138 metadata.xml 219
-MD5 f3b6233f881db50604d1cceebc2c2b40 files/digest-ximian-artwork-0.2.29.0.6.3 88
-RMD160 d8f9f65eaea3eff2f49b79229cf1d7b4c56c2942 files/digest-ximian-artwork-0.2.29.0.6.3 88
-SHA256 e0136d26523683bd81c0a57c202548ea94aa758b43482948d0bf30a73b402f88 files/digest-ximian-artwork-0.2.29.0.6.3 88
+MD5 91635f9d31984003b59e46eb88f3a1ae files/digest-ximian-artwork-0.2.29.0.6.3 310
+RMD160 d50dc35decefb33641ea67600372e4d98e32065a files/digest-ximian-artwork-0.2.29.0.6.3 310
+SHA256 80f764abdf6a6e10069b327f16c226e11753331ccda4bbb825e0fe0fb6bd0f96 files/digest-ximian-artwork-0.2.29.0.6.3 310
 MD5 f9969c019aa4a21e476f82f4a972afc3 files/digest-ximian-artwork-0.2.32.1 286
 RMD160 4d7c68cacfeb8a6c4ff65821da19102b3237a2c0 files/digest-ximian-artwork-0.2.32.1 286
 SHA256 00059478c2964f401e47c5fb0ad87902cc06c7b6f19c430d9446ad78cf175b4e files/digest-ximian-artwork-0.2.32.1 286
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
-
-iD8DBQFFnPl3AiZjviIA2XgRAu9SAJ9Spst/vFZ8006kIEbQjbf5gnR4jwCgs4Oo
-x8VpcriM2zGF/cjwe81zcAc=
-=qzuE
------END PGP SIGNATURE-----
diff --git a/x11-themes/ximian-artwork/files/digest-ximian-artwork-0.2.29.0.6.3 b/x11-themes/ximian-artwork/files/digest-ximian-artwork-0.2.29.0.6.3
index d9e33b6ea029..d17ad2de7b56 100644
--- a/x11-themes/ximian-artwork/files/digest-ximian-artwork-0.2.29.0.6.3
+++ b/x11-themes/ximian-artwork/files/digest-ximian-artwork-0.2.29.0.6.3
@@ -1 +1,3 @@
 MD5 e9cb7d70a2e86570b8f9b7fff730adbc ximian-artwork-0.2.29-0.ximian.6.3.src.rpm 3824967
+RMD160 2257cdb51ac2f7a8bb6cd1370384033f37cd3216 ximian-artwork-0.2.29-0.ximian.6.3.src.rpm 3824967
+SHA256 3703f6b1da092890b9200cca8e2a6be6269eb5e0f016339e3d2e2880ba156fff ximian-artwork-0.2.29-0.ximian.6.3.src.rpm 3824967
diff --git a/x11-themes/ximian-artwork/ximian-artwork-0.2.32.1.ebuild b/x11-themes/ximian-artwork/ximian-artwork-0.2.32.1.ebuild
index 8b957e1398d0..eb22195124d2 100644
--- a/x11-themes/ximian-artwork/ximian-artwork-0.2.32.1.ebuild
+++ b/x11-themes/ximian-artwork/ximian-artwork-0.2.32.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/ximian-artwork/ximian-artwork-0.2.32.1.ebuild,v 1.6 2007/01/04 12:56:16 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/ximian-artwork/ximian-artwork-0.2.32.1.ebuild,v 1.7 2007/02/06 14:18:19 blubb Exp $
 
 WANT_AUTOMAKE="latest"
 WANT_AUTOCONF="latest"
@@ -17,7 +17,7 @@ HOMEPAGE="http://www.novell.com/products/desktop/"
 SRC_URI="http://apt.sw.be/packages/ximian-artwork/ximian-artwork-${MY_PV}-${RPM_V}.rf.src.rpm"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ppc sparc ~x86"
+KEYWORDS="amd64 ppc sparc ~x86"
 IUSE=""
 
 DEPEND="app-arch/rpm2targz
@@ -52,6 +52,20 @@ src_install () {
 	# remove xmms skin if unneeded
 	rm -rf "${D}"/usr/share/xmms
 
+	# remove colliding files, see bug 150272
+	DUPES="/usr/share/icons/gnome/32x32/apps/file-manager.png
+		/usr/share/icons/gnome/32x32/apps/logviewer.png
+		/usr/share/icons/gnome/48x48/apps/administration.png
+		/usr/share/icons/gnome/48x48/apps/apacheconf.png
+		/usr/share/icons/gnome/48x48/apps/applets-screenshooter.png
+		/usr/share/icons/gnome/48x48/apps/gnome-networktool.png
+		/usr/share/icons/gnome/48x48/apps/network-config.png
+		/usr/share/icons/gnome/48x48/apps/postscript-viewer.png
+		/usr/share/icons/gnome/48x48/apps/serviceconf.png"
+	for i in $DUPES; do
+		rm -f "${D}/${i}"
+	done
+
 	cd "${S}"
 	dodoc ChangeLog
 }