fix collisions

5 files changed, 39 insertions, 4 deletions

diff --git a/gnome-base/libgnomeui/ChangeLog b/gnome-base/libgnomeui/ChangeLog
index a4396d70ecb9..f3cde4ad4a2f 100644
--- a/gnome-base/libgnomeui/ChangeLog
+++ b/gnome-base/libgnomeui/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/libgnomeui
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomeui/ChangeLog,v 1.68 2005/02/24 06:40:44 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomeui/ChangeLog,v 1.69 2005/03/02 23:07:08 foser Exp $
+
+*libgnomeui-2.8.1-r1 (03 Mar 2005)
+
+  03 Mar 2005; foser <foser@gentoo.org> libgnomeui-2.8.1-r1.ebuild :
+  New release, add patch to fix collision (#68698)
 
 *libgnomeui-2.8.1 (24 Feb 2005)
 
diff --git a/gnome-base/libgnomeui/Manifest b/gnome-base/libgnomeui/Manifest
index 87ee319733f9..9349326a5af3 100644
--- a/gnome-base/libgnomeui/Manifest
+++ b/gnome-base/libgnomeui/Manifest
@@ -2,11 +2,14 @@ MD5 6af5745a6eafe97daf03a45278b60e1c libgnomeui-2.6.1.1.ebuild 1002
 MD5 3db4ef5de35ddd44be69ab2e5a0c5a5b libgnomeui-2.8.0.ebuild 992
 MD5 293b5d554585d90fed1a2dff5d264167 libgnomeui-2.4.0.1.ebuild 884
 MD5 a367254e9c3911e428448e32bb16bc80 libgnomeui-2.6.0.ebuild 994
+MD5 67820daff4f39e711595224b2d38c22e libgnomeui-2.8.1-r1.ebuild 1149
 MD5 6d945d4d4a565863eb4ac8f2c971b6b2 libgnomeui-2.8.1.ebuild 1002
 MD5 33c1a39fbac0d0701c76fc36b04a9f81 ChangeLog 7696
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 aa8a8358c612ef8399525582a64c7cf7 files/digest-libgnomeui-2.6.0 70
 MD5 0db411f046038dd128c7486865b18212 files/digest-libgnomeui-2.8.0 70
 MD5 9826934947d2ada3715a8cd28696047d files/digest-libgnomeui-2.8.1 70
+MD5 4becd0494324e4349c245e2b95b0f663 files/libgnomeui-2.8.0-ditch_ancient_pics.patch 505
 MD5 856ca51af259bcbfe426d1c09c7bafcd files/digest-libgnomeui-2.4.0.1 72
 MD5 21a5070695ab142c951bd58c17b8fe91 files/digest-libgnomeui-2.6.1.1 72
+MD5 9826934947d2ada3715a8cd28696047d files/digest-libgnomeui-2.8.1-r1 70
diff --git a/gnome-base/libgnomeui/files/digest-libgnomeui-2.8.1 b/gnome-base/libgnomeui/files/digest-libgnomeui-2.8.1-r1
index 6717d48daf4b..6717d48daf4b 100644
--- a/gnome-base/libgnomeui/files/digest-libgnomeui-2.8.1
+++ b/gnome-base/libgnomeui/files/digest-libgnomeui-2.8.1-r1
diff --git a/gnome-base/libgnomeui/files/libgnomeui-2.8.0-ditch_ancient_pics.patch b/gnome-base/libgnomeui/files/libgnomeui-2.8.0-ditch_ancient_pics.patch
new file mode 100644
index 000000000000..d6275b9c36de
--- /dev/null
+++ b/gnome-base/libgnomeui/files/libgnomeui-2.8.0-ditch_ancient_pics.patch
@@ -0,0 +1,16 @@
+diff -uNr libgnomeui-2.8.0/images/Makefile.am libgnomeui-2.8.0.patched/images/Makefile.am
+--- libgnomeui-2.8.0/images/Makefile.am	2002-02-11 02:48:51.000000000 +0100
++++ libgnomeui-2.8.0.patched/images/Makefile.am	2005-03-02 23:48:31.000000000 +0100
+@@ -1,11 +1,6 @@
+ pixmapdir = $(datadir)/pixmaps
+ 
+ pixmap_DATA = \
+-	gnome-about-logo.png	\
+-	gnome-info.png		\
+-	gnome-error.png		\
+-	gnome-question.png	\
+-	gnome-warning.png	\
+-	gnome-default-dlg.png
++	gnome-about-logo.png
+ 
+ EXTRA_DIST=$(pixmap_DATA)
diff --git a/gnome-base/libgnomeui/libgnomeui-2.8.1.ebuild b/gnome-base/libgnomeui/libgnomeui-2.8.1-r1.ebuild
index eddb4984c28b..9c25a98e975f 100644
--- a/gnome-base/libgnomeui/libgnomeui-2.8.1.ebuild
+++ b/gnome-base/libgnomeui/libgnomeui-2.8.1-r1.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomeui/libgnomeui-2.8.1.ebuild,v 1.1 2005/02/24 06:40:44 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomeui/libgnomeui-2.8.1-r1.ebuild,v 1.1 2005/03/02 23:07:08 foser Exp $
 
-inherit gnome2
+inherit gnome2 eutils
 
 DESCRIPTION="User Interface routines for Gnome"
 HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~alpha ~sparc ~hppa ~amd64 ~ia64 ~mips ~ppc64 ~arm"
+KEYWORDS="x86 ~ppc ~alpha ~sparc ~hppa ~amd64 ~ia64 ~mips ~ppc64 ~arm"
 IUSE="doc jpeg"
 
 RDEPEND=">=x11-libs/gtk+-2.4.1
@@ -36,3 +36,14 @@ PDEPEND="x11-themes/gnome-themes
 
 DOCS="AUTHORS ChangeLog INSTALL NEWS README"
 
+src_unpack() {
+
+	unpack ${A}
+
+	cd ${S}
+	# cleanliness is ... (#68698)
+	epatch ${FILESDIR}/${PN}-2.8.0-ditch_ancient_pics.patch
+
+	automake || die
+
+}