Cleanups related to bug #30276

5 files changed, 13 insertions, 57 deletions

diff --git a/x11-themes/gtk-themes/ChangeLog b/x11-themes/gtk-themes/ChangeLog
index aabac6334450..06cafc884a73 100644
--- a/x11-themes/gtk-themes/ChangeLog
+++ b/x11-themes/gtk-themes/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-themes/gtk-themes
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-themes/ChangeLog,v 1.9 2003/08/31 03:14:19 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-themes/ChangeLog,v 1.10 2003/10/04 12:33:58 leonardop Exp $
+
+  04 Oct 2003; L. Boshell <leonardop@gentoo.org> gtk-themes-2.0-r1.ebuild,
+  gtk-themes-2.0-r2.ebuild:
+  Replacing gtk-engines-mgicchicken with gtk-engines-magicchicken. Related
+  bug: #30276. Removed gtk-engines-crux since it conflicts with
+  Gnome stuff, and is a Gnome package after all.
 
   31 Aug 2003; Alastair Tse <liquidx@gentoo.org> gtk-themes-1.0-r1.ebuild:
   fixed hard version dep on geramik and mist for 1.0
diff --git a/x11-themes/gtk-themes/files/digest-gtk-themes-2.0 b/x11-themes/gtk-themes/files/digest-gtk-themes-2.0
deleted file mode 100644
index 07aac731e771..000000000000
--- a/x11-themes/gtk-themes/files/digest-gtk-themes-2.0
+++ /dev/null
@@ -1,5 +0,0 @@
-MD5 8c384d6cede228c251fc4f9a9ca84533 aqualightblue-gtk2-default.tar.gz 48408
-MD5 c6c8b257f5494a1c06a0de9705c3e346 bumblebee-gtk2-default-1.5.tar.gz 29034
-MD5 2a4e4b816891b2ed1d2beecce930b9b8 gnububble-default-0.2.tar.gz 162650
-MD5 702f746dafe6b6a3d958d9a519eb968e prettyokayish-prion-default.tar.gz 1249
-MD5 889cb3316fda78068819bc82e1bf2ea7 thinandmild-default.tar.gz 1643
diff --git a/x11-themes/gtk-themes/gtk-themes-2.0-r1.ebuild b/x11-themes/gtk-themes/gtk-themes-2.0-r1.ebuild
index 0570efda4010..37521f629bc0 100644
--- a/x11-themes/gtk-themes/gtk-themes-2.0-r1.ebuild
+++ b/x11-themes/gtk-themes/gtk-themes-2.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-themes/gtk-themes-2.0-r1.ebuild,v 1.7 2003/09/06 07:28:56 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-themes/gtk-themes-2.0-r1.ebuild,v 1.8 2003/10/04 12:33:58 leonardop Exp $
 
 DESCRIPTION="Some nice themes for GTK+ 2"
 LICENSE="GPL-2"
@@ -29,13 +29,12 @@ DEPEND=">=x11-themes/gtk-engines-cleanice-1.1.5
 	>=x11-themes/gtk-engines-flat-2.0
 	>=x11-themes/gtk-engines-lighthouseblue-0.4.2
 	>=x11-themes/gtk-engines-metal-1.9.0
-	>=x11-themes/gtk-engines-mgicchikn-1.0.0
+	>=x11-themes/gtk-engines-magicchicken-1
 	=x11-themes/gtk-engines-mist-0.8-r2
 	>=x11-themes/gtk-engines-pixbuf-1.9.0
 	>=x11-themes/gtk-engines-redmond95-1.9.0
 	>=x11-themes/gtk-engines-thinice-2.0.1
-	>=x11-themes/gtk-engines-xfce-2.0.8
-	gnome? ( >=x11-themes/gtk-engines-crux-1.9.3 )"
+	>=x11-themes/gtk-engines-xfce-2.0.8"
 
 src_unpack() {
 	return 0
diff --git a/x11-themes/gtk-themes/gtk-themes-2.0-r2.ebuild b/x11-themes/gtk-themes/gtk-themes-2.0-r2.ebuild
index a57edc2b6ae4..66e4a720a9cd 100644
--- a/x11-themes/gtk-themes/gtk-themes-2.0-r2.ebuild
+++ b/x11-themes/gtk-themes/gtk-themes-2.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-themes/gtk-themes-2.0-r2.ebuild,v 1.2 2003/09/06 07:28:56 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-themes/gtk-themes-2.0-r2.ebuild,v 1.3 2003/10/04 12:33:58 leonardop Exp $
 
 DESCRIPTION="Some nice themes for GTK+ 2"
 LICENSE="GPL-2"
@@ -29,13 +29,12 @@ DEPEND=">=x11-themes/gtk-engines-cleanice-1.1.5
 	>=x11-themes/gtk-engines-flat-2.0
 	>=x11-themes/gtk-engines-lighthouseblue-0.4.2
 	>=x11-themes/gtk-engines-metal-1.9.0
-	>=x11-themes/gtk-engines-mgicchikn-1.0.0
+	>=x11-themes/gtk-engines-magicchicken-1
 	=x11-themes/gtk-engines-mist-0.8-r2
 	>=x11-themes/gtk-engines-pixbuf-1.9.0
 	>=x11-themes/gtk-engines-redmond95-1.9.0
 	>=x11-themes/gtk-engines-thinice-2.0.1
-	>=x11-themes/gtk-engines-xfce-2.0.8
-	gnome? ( >=x11-themes/gtk-engines-crux-1.9.3 )"
+	>=x11-themes/gtk-engines-xfce-2.0.8"
 
 src_unpack() {
 	return 0
diff --git a/x11-themes/gtk-themes/gtk-themes-2.0.ebuild b/x11-themes/gtk-themes/gtk-themes-2.0.ebuild
deleted file mode 100644
index 41e77c41d204..000000000000
--- a/x11-themes/gtk-themes/gtk-themes-2.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-themes/gtk-themes-2.0.ebuild,v 1.6 2003/09/06 07:28:56 msterret Exp $
-
-DESCRIPTION="Some nice themes for GTK+ 2"
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="x86 ppc alpha"
-
-BASE_URI="http://download.freshmeat.net/themes/"
-SRC_URI="${BASE_URI}aqualightblue-gtk2/aqualightblue-gtk2-default.tar.gz
-	${BASE_URI}bumblebee-gtk2/bumblebee-gtk2-default-1.5.tar.gz
-	${BASE_URI}gnububble/gnububble-default-0.2.tar.gz
-	${BASE_URI}prettyokayish-prion/prettyokayish-prion-default.tar.gz
-	${BASE_URI}thinandmild/thinandmild-default.tar.gz"
-
-
-HOMEPAGE="http://themes.freshmeat.net/"
-
-DEPEND=">=x11-themes/gtk-engines-cleanice-1.1.5
-	>=x11-themes/gtk-engines-crux-1.9.3
-	>=x11-themes/gtk-engines-metal-1.9.0
-	>=x11-themes/gtk-engines-mgicchikn-1.0.0
-	>=x11-themes/gtk-engines-pixbuf-1.9.0
-	>=x11-themes/gtk-engines-redmond95-1.9.0
-	>=x11-themes/gtk-engines-thinice-2.0.1
-	>=x11-themes/gtk-engines-xfce-2.0.8"
-
-src_unpack() {
-	return 0
-}
-
-src_compile() {
-	einfo "Nothing to compile"
-}
-
-src_install() {
-	dodir /usr/share/themes
-	cd ${D}/usr/share/themes
-
-	unpack ${A}
-	chmod -R ugo=rX *
-}