summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Stelling <blubb@gentoo.org>2007-02-06 14:18:19 +0000
committerSimon Stelling <blubb@gentoo.org>2007-02-06 14:18:19 +0000
commitfa3ba76c2b966e3b110b79efa4b9fe58a9f33625 (patch)
tree03c60b26547d0f4efe3a8d9860a4aa14f096ffbb /x11-themes
parentRegenerate digest in Manifest2 format. (diff)
downloadgentoo-2-fa3ba76c2b966e3b110b79efa4b9fe58a9f33625.tar.gz
gentoo-2-fa3ba76c2b966e3b110b79efa4b9fe58a9f33625.tar.bz2
gentoo-2-fa3ba76c2b966e3b110b79efa4b9fe58a9f33625.zip
apply Matthias Langer's patch and mark amd64 stable; bug 150272
(Portage version: 2.1.2-r7)
Diffstat (limited to 'x11-themes')
-rw-r--r--x11-themes/ximian-artwork/ChangeLog6
-rw-r--r--x11-themes/ximian-artwork/files/digest-ximian-artwork-0.2.29.0.6.32
-rw-r--r--x11-themes/ximian-artwork/ximian-artwork-0.2.32.1.ebuild18
3 files changed, 23 insertions, 3 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/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
}