Don't install the Smooth theme engine, as gnome-themes provides it

4 files changed, 45 insertions, 2 deletions

diff --git a/x11-themes/gnome-themes-extras/ChangeLog b/x11-themes/gnome-themes-extras/ChangeLog
index fa3e3b6df4ae..00b639be64ac 100644
--- a/x11-themes/gnome-themes-extras/ChangeLog
+++ b/x11-themes/gnome-themes-extras/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-themes/gnome-themes-extras
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gnome-themes-extras/ChangeLog,v 1.22 2004/11/30 09:29:36 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gnome-themes-extras/ChangeLog,v 1.23 2004/12/08 03:00:34 obz Exp $
+
+*gnome-themes-extras-0.8.0-r1 (08 Dec 2004)
+
+  08 Dec 2004; Mike Gardiner <obz@gentoo.org>
+  +gnome-themes-extras-0.8.0-r1.ebuild:
+  Don't install the Smooth theme engine, as gnome-themes provides it
 
 *gnome-themes-extras-0.8.0 (30 Nov 2004)
 
diff --git a/x11-themes/gnome-themes-extras/Manifest b/x11-themes/gnome-themes-extras/Manifest
index ebad19c22002..df7b8a52a86d 100644
--- a/x11-themes/gnome-themes-extras/Manifest
+++ b/x11-themes/gnome-themes-extras/Manifest
@@ -1,10 +1,12 @@
 MD5 8c0e92be7a94c14807b8555e492ced49 gnome-themes-extras-0.5.ebuild 896
 MD5 27bd4b2da46466e67f9a974646eb1ece gnome-themes-extras-0.8.0.ebuild 746
 MD5 a687b55fa11e001a1287611e7d2b2878 gnome-themes-extras-0.7.ebuild 855
-MD5 e9b510a21497459391d2256a3e0fff6b ChangeLog 3178
+MD5 76e7fe409f8570af61a5af6b0f31af8c gnome-themes-extras-0.8.0-r1.ebuild 893
+MD5 9f82d3ed4a5692f47fcb9fc2f8af4b52 ChangeLog 3379
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 e34b5781bcf6b9aeeece58f4f64b42b0 files/gnome-themes-extras-0-smooth_engine_gtk_2.4.patch 872
 MD5 87553e94d3bef8af7a2313cb60745345 files/digest-gnome-themes-extras-0.8.0 79
 MD5 623769c489254fc5862e52076e7148f4 files/digest-gnome-themes-extras-0.5 77
 MD5 2aa7c7554474bc2ef5f70098577f0f1e files/digest-gnome-themes-extras-0.7 77
 MD5 9ae6a37c4ea5cf1b24e203cc3d520a00 files/gnome-themes-extras-0.5-industrial_uncorrupt.patch 1488
+MD5 87553e94d3bef8af7a2313cb60745345 files/digest-gnome-themes-extras-0.8.0-r1 79
diff --git a/x11-themes/gnome-themes-extras/files/digest-gnome-themes-extras-0.8.0-r1 b/x11-themes/gnome-themes-extras/files/digest-gnome-themes-extras-0.8.0-r1
new file mode 100644
index 000000000000..bfe492426150
--- /dev/null
+++ b/x11-themes/gnome-themes-extras/files/digest-gnome-themes-extras-0.8.0-r1
@@ -0,0 +1 @@
+MD5 a2c3eead4dd29bad88b57570d67afd33 gnome-themes-extras-0.8.0.tar.bz2 3900402
diff --git a/x11-themes/gnome-themes-extras/gnome-themes-extras-0.8.0-r1.ebuild b/x11-themes/gnome-themes-extras/gnome-themes-extras-0.8.0-r1.ebuild
new file mode 100644
index 000000000000..ac4f7f288f90
--- /dev/null
+++ b/x11-themes/gnome-themes-extras/gnome-themes-extras-0.8.0-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gnome-themes-extras/gnome-themes-extras-0.8.0-r1.ebuild,v 1.1 2004/12/08 03:00:34 obz Exp $
+
+inherit gnome2 eutils
+
+DESCRIPTION="Additional themes for GNOME 2.2"
+HOMEPAGE="http://librsvg.sourceforge.net/theme.php"
+
+SLOT="0"
+KEYWORDS="~x86 ~sparc ~hppa ~amd64 ~ppc"
+IUSE=""
+LICENSE="LGPL-2.1 GPL-2 DSL"
+
+RDEPEND=">=x11-libs/gtk+-2
+	gnome-base/librsvg"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	>=dev-util/intltool-0.23"
+
+DOCS="AUTHORS ChangeLog MAINTAINERS README TODO"
+
+src_unpack() {
+
+	unpack ${A}
+
+	EPATCH_OPTS="-d ${S}/Industrial" \
+		epatch ${FILESDIR}/${PN}-0.5-industrial_uncorrupt.patch
+	# the Smooth engine is provided by gnome-themes, and so
+	# conflicts if we install it here.
+	sed -i -e "s/Wasp\ Smooth/Wasp/" ${S}/Makefile.in
+
+}