new version

4 files changed, 15 insertions, 11 deletions

diff --git a/gnome-base/control-center/Manifest b/gnome-base/control-center/Manifest
index 95b836c18982..18b2ad758143 100644
--- a/gnome-base/control-center/Manifest
+++ b/gnome-base/control-center/Manifest
@@ -1,15 +1,13 @@
 MD5 b3eff5f25b710499dad3ee7dba904969 control-center-2.2.2.ebuild 1111
-MD5 5225ee1b3e5e3921270ea19fddec4b0d control-center-2.4.0.ebuild 1202
+MD5 75708f6397d228f93c336e6c4c6f93ee control-center-2.4.0.ebuild 1353
 MD5 e1c0c367fe0bd93637deea26f5db84dd control-center-2.2.1.ebuild 1120
 MD5 e8143ea8b2f1acd8266df0ee2f20207d control-center-1.4.0.5-r1.ebuild 1260
 MD5 4dd492cac52cd6377f0174be507b9cd4 control-center-2.2.0.1-r1.ebuild 1118
 MD5 d7c5e8d0623aa1fd9aa4d932e9375b48 control-center-2.2.2-r1.ebuild 1284
-MD5 9cb9e4c6a7305f90e6fe2771ef872c38 ChangeLog 6325
-MD5 5225ee1b3e5e3921270ea19fddec4b0d control-center-2.3.6.ebuild 1202
+MD5 d3553eefa1ed0b2fd6c6eeb7c6e91db7 ChangeLog 6495
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 d505cf9f64f1562a777380d903306088 files/digest-control-center-2.2.1 74
 MD5 dbda24a02e6a621f95ad2ee91c154112 files/digest-control-center-2.2.2 74
-MD5 eeafcea3e96e178cde572c73a7ea76ac files/digest-control-center-2.3.6 74
 MD5 440e2fbb11ac5952e79c4205595d54f3 files/digest-control-center-2.4.0 74
 MD5 fdc3d7feea8b429588a2d193c9547dbf files/control-center-2.2.0.1-alpha_hack.patch 2997
 MD5 dbda24a02e6a621f95ad2ee91c154112 files/digest-control-center-2.2.2-r1 74
diff --git a/gnome-base/control-center/control-center-2.3.6.ebuild b/gnome-base/control-center/control-center-2.4.0.ebuild
index 0ce7813fe9db..7a700a74a0c0 100644
--- a/gnome-base/control-center/control-center-2.3.6.ebuild
+++ b/gnome-base/control-center/control-center-2.4.0.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/gnome-base/control-center/control-center-2.3.6.ebuild,v 1.4 2003/09/08 14:12:17 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/control-center-2.4.0.ebuild,v 1.1 2003/09/09 17:35:23 foser Exp $
 
 inherit gnome2 eutils
 
@@ -14,18 +14,19 @@ MAKEOPTS="${MAKEOPTS} -j1"
 
 RDEPEND=">=x11-libs/gtk+-2.2
 	>=dev-libs/atk-1.2
-	>=gnome-base/gconf-2.3
-	>=gnome-base/libgnomeui-2.3
+	>=gnome-base/gconf-1.2
+	>=gnome-base/libgnomeui-2.2
 	>=gnome-base/libglade-2
 	>=gnome-base/libbonobo-2.2
 	>=gnome-base/libbonoboui-2.2
-	>=gnome-base/nautilus-2.3
+	>=gnome-base/nautilus-2.2
 	>=gnome-base/gnome-vfs-2.2
 	>=gnome-base/gnome-desktop-2.2
 	dev-libs/libxml2
 	media-sound/esound
 	>=x11-wm/metacity-2.4.5
-	!gnome-extra/fontilus"
+	!gnome-extra/fontilus
+	!gnome-extra/themus"
 
 DEPEND="${RDEPEND}
 	>=app-text/scrollkeeper-0.3.11
@@ -36,10 +37,15 @@ DOCS="AUTHORS ChangeLog COPYING README TODO INSTALL NEWS"
 G2CONF="${G2CONF} --disable-schemas-install"
 
 src_unpack() {
+
 	unpack ${A}
-	cd ${S}
 
+	cd ${S}
 	# See http://gcc.gnu.org/cgi-bin/gnatsweb.pl problem #9700 for
 	# what this is about.
 	use alpha && epatch ${FILESDIR}/control-center-2.2.0.1-alpha_hack.patch
+
+	# temporary fix for icon installation adapted by <link@sub_pop.net> (#16928)
+	epatch ${FILESDIR}/${PN}-2.2-icons_install.patch
+
 }
diff --git a/gnome-base/control-center/files/digest-control-center-2.3.6 b/gnome-base/control-center/files/digest-control-center-2.3.6
deleted file mode 100644
index 21253f707d72..000000000000
--- a/gnome-base/control-center/files/digest-control-center-2.3.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c9fce7ede99b4396c771ace7b1af132b control-center-2.3.6.tar.bz2 2033095
diff --git a/gnome-base/control-center/files/digest-control-center-2.4.0 b/gnome-base/control-center/files/digest-control-center-2.4.0
new file mode 100644
index 000000000000..f075d6440b72
--- /dev/null
+++ b/gnome-base/control-center/files/digest-control-center-2.4.0
@@ -0,0 +1 @@
+MD5 44115d3174d2f603f34a336ada562bae control-center-2.4.0.tar.bz2 2042574