new version 'n cleanup

12 files changed, 51 insertions, 139 deletions

diff --git a/gnome-base/control-center/ChangeLog b/gnome-base/control-center/ChangeLog
index 9700b762b370..7b8dde5e656e 100644
--- a/gnome-base/control-center/ChangeLog
+++ b/gnome-base/control-center/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/control-center
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/ChangeLog,v 1.37 2003/04/09 15:40:18 todd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/ChangeLog,v 1.38 2003/06/03 10:38:40 foser Exp $
+
+*control-center-2.2.2 (03 Jun 2003)
+
+  03 Jun 2003; foser <foser@gentoo.org> control-center-2.2.2.ebuild :
+  New version
 
 *control-center-2.2.1 (16 Mar 2003)
 
diff --git a/gnome-base/control-center/Manifest b/gnome-base/control-center/Manifest
index aee4687868d4..947aa1c0d410 100644
--- a/gnome-base/control-center/Manifest
+++ b/gnome-base/control-center/Manifest
@@ -1,23 +1,12 @@
-MD5 c1dd1deb5201348c2ebbde0f1155165e control-center-2.0.3-r1.ebuild 915
-MD5 b873a810d8da29bbaf56553f86031f53 control-center-2.2.1-r1.ebuild 1300
-MD5 1ff5c8a157cdb575e5d0c8cd280b75e2 control-center-2.2.2.ebuild 1128
-MD5 6c250fc2087f368ad29f797e1cbfbd6b control-center-2.0.3.ebuild 852
+MD5 8df995809f517181e4283416a466ab8a control-center-2.2.2.ebuild 1129
 MD5 1ff5c8a157cdb575e5d0c8cd280b75e2 control-center-2.2.1.ebuild 1128
 MD5 972fa184915c450d46fff3e4a73f2d89 control-center-2.2.0.1.ebuild 912
-MD5 0d099a3c63167778715964cc040e5a6b control-center-2.0.1.1.ebuild 910
 MD5 4734b63853c5414c31033d455487345d control-center-1.4.0.5-r1.ebuild 1258
 MD5 d3aaafe94dfd3c22fa095fd71f84eb21 control-center-2.2.0.1-r1.ebuild 1135
-MD5 6cc76713ae43c34701401e749f2b179a ChangeLog 5184
-MD5 346a157eaec680e24228bdb92d2d92d2 files/control-center-xrandr-r1.patch 26069
-MD5 3f093f43d4049167b3936420e2318b97 files/digest-control-center-2.0.3 74
+MD5 d3f233a3886b08fe0e474a2751f92aa7 ChangeLog 5307
 MD5 d505cf9f64f1562a777380d903306088 files/digest-control-center-2.2.1 74
 MD5 dbda24a02e6a621f95ad2ee91c154112 files/digest-control-center-2.2.2 74
 MD5 fdc3d7feea8b429588a2d193c9547dbf files/control-center-2.2.0.1-alpha_hack.patch 2997
-MD5 b57ded66ccdafa28f772452321fde231 files/crash-on-exit-fix.patch 598
-MD5 786886230f6d8d5d198ff96948c5303d files/digest-control-center-2.0.1.1 76
 MD5 3a350ea03e5e1ae9da23581ab4a4aa47 files/digest-control-center-2.2.0.1 76
-MD5 9778102fe12bed4ed5ead8de60f609ce files/digest-control-center-2.0.3-r1 158
-MD5 d505cf9f64f1562a777380d903306088 files/digest-control-center-2.2.1-r1 74
 MD5 38949ed5d795344f78a96af44764f896 files/digest-control-center-1.4.0.5-r1 76
-MD5 98fac973be67f5db0ac7480e915e923e files/control-center-2.2.0-gcc2.patch 649
 MD5 658cec88c3df90c404210e45aed0535a files/digest-control-center-2.2.0.1-r1 75
diff --git a/gnome-base/control-center/control-center-2.0.1.1.ebuild b/gnome-base/control-center/control-center-2.0.1.1.ebuild
deleted file mode 100644
index 0abfb718b185..000000000000
--- a/gnome-base/control-center/control-center-2.0.1.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# 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.0.1.1.ebuild,v 1.7 2003/02/13 12:04:45 vapier Exp $
-
-inherit gnome2
-
-S=${WORKDIR}/${P}
-DESCRIPTION="the gnome2 Desktop configuration tool"
-SRC_URI="mirror://gnome/2.0.1/sources/${PN}/${P}.tar.bz2"
-HOMEPAGE="http://www.gnome.org/"
-SLOT="2"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc alpha"
-
-RDEPEND=">=x11-libs/gtk+-2.0.6
-	>=dev-libs/glib-2.0.6
-	>=gnome-base/gconf-1.2.1
-	>=gnome-base/libgnomeui-2.0.5
-	>=gnome-base/libglade-2.0.1
-	>=gnome-base/libbonobo-2.0.0
-	>=gnome-base/libbonoboui-2.0.3
-	>=gnome-base/gnome-vfs-2.0.4
-	>=gnome-base/gnome-desktop-2.0.8
-	>=app-text/scrollkeeper-0.3.11"
-																		
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0" 
-
-DOCS="AUTHORS ChangeLog COPYING README* TODO INSTALL NEWS"
-
diff --git a/gnome-base/control-center/control-center-2.0.3-r1.ebuild b/gnome-base/control-center/control-center-2.0.3-r1.ebuild
deleted file mode 100644
index 8fd366043664..000000000000
--- a/gnome-base/control-center/control-center-2.0.3-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# 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.0.3-r1.ebuild,v 1.7 2003/02/13 12:04:50 vapier Exp $
-
-inherit gnome2
-
-S=${WORKDIR}/${P}
-DESCRIPTION="the gnome2 Desktop configuration tool"
-SRC_URI="${SRC_URI}
-	mirror://gentoo/gentoo-xft2-control-center-2.0.3.tar.bz2"
-HOMEPAGE="http://www.gnome.org/"
-SLOT="2"
-LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc ~sparc alpha"
-
-RDEPEND=">=x11-libs/gtk+-2.0.6
-	>=dev-libs/glib-2.0.6
-	>=gnome-base/gconf-1.2.1
-	>=gnome-base/libgnomeui-2.0.5
-	>=gnome-base/libglade-2.0.1
-	>=gnome-base/libbonobo-2.0.0
-	>=gnome-base/libbonoboui-2.0.3
-	>=gnome-base/gnome-vfs-2.0.4
-	>=gnome-base/gnome-desktop-2.0.8
-	>=app-text/scrollkeeper-0.3.11"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0" 
-
-DOCS="AUTHORS ChangeLog COPYING README* TODO INSTALL NEWS"
diff --git a/gnome-base/control-center/control-center-2.0.3.ebuild b/gnome-base/control-center/control-center-2.0.3.ebuild
deleted file mode 100644
index a3825c4a893f..000000000000
--- a/gnome-base/control-center/control-center-2.0.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# 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.0.3.ebuild,v 1.6 2003/02/13 12:04:54 vapier Exp $
-
-inherit gnome2
-
-S=${WORKDIR}/${P}
-DESCRIPTION="the gnome2 Desktop configuration tool"
-HOMEPAGE="http://www.gnome.org/"
-SLOT="2"
-LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc ~sparc alpha"
-
-RDEPEND=">=x11-libs/gtk+-2.0.6
-	>=dev-libs/glib-2.0.6
-	>=gnome-base/gconf-1.2.1
-	>=gnome-base/libgnomeui-2.0.5
-	>=gnome-base/libglade-2.0.1
-	>=gnome-base/libbonobo-2.0.0
-	>=gnome-base/libbonoboui-2.0.3
-	>=gnome-base/gnome-vfs-2.0.4
-	>=gnome-base/gnome-desktop-2.0.8
-	>=app-text/scrollkeeper-0.3.11"
-																		
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0" 
-
-DOCS="AUTHORS ChangeLog COPYING README* TODO INSTALL NEWS"
-
diff --git a/gnome-base/control-center/control-center-2.2.2.ebuild b/gnome-base/control-center/control-center-2.2.2.ebuild
new file mode 100644
index 000000000000..bcca47f856cf
--- /dev/null
+++ b/gnome-base/control-center/control-center-2.2.2.ebuild
@@ -0,0 +1,42 @@
+# 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.2.2.ebuild,v 1.1 2003/06/03 10:38:40 foser Exp $
+
+inherit gnome2 eutils
+
+S=${WORKDIR}/${P}
+DESCRIPTION="the gnome2 Desktop configuration tool"
+HOMEPAGE="http://www.gnome.org/"
+SLOT="2"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~alpha ~sparc"
+
+MAKEOPTS="${MAKEOPTS} -j1"
+
+RDEPEND=">=x11-libs/gtk+-2.2
+	>=gnome-base/gconf-2
+	>=gnome-base/libgnomeui-2
+	>=gnome-base/libglade-2
+	>=gnome-base/libbonobo-2
+	>=gnome-base/libbonoboui-2
+	>=gnome-base/gnome-vfs-2
+	>=gnome-base/gnome-desktop-2.2
+	>=gnome-base/libgnomeui-2.2
+	dev-libs/libxml2
+	media-sound/esound
+	>=x11-wm/metacity-2.4.5"
+																		
+DEPEND="${RDEPEND}
+	>=app-text/scrollkeeper-0.3.11
+	>=dev-util/pkgconfig-0.12.0" 
+
+DOCS="AUTHORS ChangeLog COPYING README TODO INSTALL NEWS"
+
+src_unpack() {
+	unpack ${A}
+	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
+}
diff --git a/gnome-base/control-center/files/control-center-2.2.0-gcc2.patch b/gnome-base/control-center/files/control-center-2.2.0-gcc2.patch
deleted file mode 100644
index e26fe8491397..000000000000
--- a/gnome-base/control-center/files/control-center-2.2.0-gcc2.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -ur control-center-2.2.0/capplets/common/gnome-theme-test.c control-center-2.2.0.patched/capplets/common/gnome-theme-test.c
---- control-center-2.2.0/capplets/common/gnome-theme-test.c	2003-01-19 08:14:34.000000000 +0100
-+++ control-center-2.2.0.patched/capplets/common/gnome-theme-test.c	2003-02-02 00:32:33.000000000 +0100
-@@ -10,11 +10,12 @@
- int
- main (int argc, char *argv[])
- {
--  gtk_init (&argc, &argv);
--  gnome_vfs_init ();
-   gboolean monitor_not_added = FALSE;
-   GList *themes, *list;
- 
-+  gtk_init (&argc, &argv);
-+  gnome_vfs_init ();
-+
-   gnome_theme_init (&monitor_not_added);
-   
-   themes = gnome_theme_meta_info_find_all ();
diff --git a/gnome-base/control-center/files/crash-on-exit-fix.patch b/gnome-base/control-center/files/crash-on-exit-fix.patch
deleted file mode 100644
index 4603a498d056..000000000000
--- a/gnome-base/control-center/files/crash-on-exit-fix.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- control-center/capplet-manager.c.orig	Thu Jan 24 21:57:56 2002
-+++ control-center/capplet-manager.c	Thu Jan 24 21:58:01 2002
-@@ -323,7 +323,10 @@
-                 close_capplet (TRUE, nd);
-                 nd->state = CAPPLET_INACTIVE;
-                 style = gtk_widget_get_style (GTK_WIDGET (nd->ctree));
--                gtk_ctree_node_set_foreground (nd->ctree, nd->node, &style->fg[GTK_STATE_NORMAL]);
-+
-+                if (style) {
-+                        gtk_ctree_node_set_foreground (nd->ctree, nd->node, &style->fg[GTK_STATE_NORMAL]);
-+                }
-         }
- }
- static void
diff --git a/gnome-base/control-center/files/digest-control-center-2.0.1.1 b/gnome-base/control-center/files/digest-control-center-2.0.1.1
deleted file mode 100644
index 9a4d2f6a291c..000000000000
--- a/gnome-base/control-center/files/digest-control-center-2.0.1.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0fc108bda3a23910392cbb70570b3a5d control-center-2.0.1.1.tar.bz2 1177465
diff --git a/gnome-base/control-center/files/digest-control-center-2.0.3 b/gnome-base/control-center/files/digest-control-center-2.0.3
deleted file mode 100644
index c89fb1b1958c..000000000000
--- a/gnome-base/control-center/files/digest-control-center-2.0.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 14b07a21d46b645cbab43c38f822afa2 control-center-2.0.3.tar.bz2 1212426
diff --git a/gnome-base/control-center/files/digest-control-center-2.0.3-r1 b/gnome-base/control-center/files/digest-control-center-2.0.3-r1
deleted file mode 100644
index a6a631ca140d..000000000000
--- a/gnome-base/control-center/files/digest-control-center-2.0.3-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 14b07a21d46b645cbab43c38f822afa2 control-center-2.0.3.tar.bz2 1212426
-MD5 9cdcc68cbd6c58b4f4983e136572be76 gentoo-xft2-control-center-2.0.3.tar.bz2 71699
diff --git a/gnome-base/control-center/files/digest-control-center-2.2.2 b/gnome-base/control-center/files/digest-control-center-2.2.2
new file mode 100644
index 000000000000..4d5a3972ed84
--- /dev/null
+++ b/gnome-base/control-center/files/digest-control-center-2.2.2
@@ -0,0 +1 @@
+MD5 d5288d0e4249a5afdef494d5c59cb1bc control-center-2.2.2.tar.bz2 1543005