New version, removed old versions. Also needed a not-arm? for the alsa dependency, as alsa-lib isn't available on arm

11 files changed, 36 insertions, 127 deletions

diff --git a/gnome-base/control-center/ChangeLog b/gnome-base/control-center/ChangeLog
index b92e72ff9f16..2b426c0c5961 100644
--- a/gnome-base/control-center/ChangeLog
+++ b/gnome-base/control-center/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-base/control-center
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/ChangeLog,v 1.80 2004/11/12 04:18:06 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/ChangeLog,v 1.81 2004/11/25 05:29:14 obz Exp $
+
+*control-center-2.8.1 (25 Nov 2004)
+
+  25 Nov 2004; Mike Gardiner <obz@gentoo.org> -control-center-2.4.0.ebuild,
+  -control-center-2.6.0.3.ebuild, control-center-2.6.1.ebuild,
+  control-center-2.8.0.ebuild, +control-center-2.8.1.ebuild:
+  New version, removed old versions. Also needed a not-arm? for the alsa
+  dependency, as alsa-lib isn't available on arm
 
   12 Nov 2004; Gustavo Zacarias <gustavoz@gentoo.org>
   control-center-2.8.0.ebuild:
diff --git a/gnome-base/control-center/Manifest b/gnome-base/control-center/Manifest
index 8d0a293cc484..41049705e493 100644
--- a/gnome-base/control-center/Manifest
+++ b/gnome-base/control-center/Manifest
@@ -1,18 +1,21 @@
-MD5 84daec758f21ba8e3459360799785218 ChangeLog 10284
-MD5 33b394e0936edc187e0ca9481cc6a7c9 control-center-1.4.0.5-r1.ebuild 1259
-MD5 976dca97eee7c08e04e522ba34ce31d3 control-center-2.4.0.ebuild 1427
+MD5 00a0abd6fb58a890077bd5aea138edaf control-center-2.8.1.ebuild 1724
 MD5 4fce178594768afecbaeb7600e7adca8 control-center-2.6.0.3.ebuild 1872
-MD5 aa26993c8e8c283697da9c551ff5899d control-center-2.6.1.ebuild 1872
 MD5 2e38cb27012f55763035d61437ec5bc2 control-center-2.8.0.ebuild 1838
+MD5 976dca97eee7c08e04e522ba34ce31d3 control-center-2.4.0.ebuild 1427
+MD5 aa26993c8e8c283697da9c551ff5899d control-center-2.6.1.ebuild 1872
+MD5 33b394e0936edc187e0ca9481cc6a7c9 control-center-1.4.0.5-r1.ebuild 1259
+MD5 84daec758f21ba8e3459360799785218 ChangeLog 10284
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 adbe3cf7b6918f7681569128f76a4b71 files/control-center-2.2-icons_install.patch 2943
-MD5 fdc3d7feea8b429588a2d193c9547dbf files/control-center-2.2.0.1-alpha_hack.patch 2997
-MD5 b76eaa4944f6f4be761fc68f0c46c52c files/control-center-2.4.0-64bit-fixes.patch 1663
+MD5 e7a06ed90bbffbfdeecbf3082dc1d39d .control-center-2.8.1.ebuild.swp 12288
+MD5 440e2fbb11ac5952e79c4205595d54f3 files/digest-control-center-2.4.0 74
+MD5 3afae17cdd913d2de47ec8017cafe327 files/digest-control-center-2.6.1 74
+MD5 0ac36f350969840cdac6ab03ead02612 files/digest-control-center-2.8.0 74
+MD5 3c50bab26a7b8dd1ccb40514655a0a79 files/digest-control-center-2.8.1 74
 MD5 111edb31ce663d8dbe8011f77cf9e913 files/control-center-2.5.4-fix_gst_0.8.patch 443
+MD5 b76eaa4944f6f4be761fc68f0c46c52c files/control-center-2.4.0-64bit-fixes.patch 1663
+MD5 fdc3d7feea8b429588a2d193c9547dbf files/control-center-2.2.0.1-alpha_hack.patch 2997
 MD5 63670f480e3cafb0d9dc8b3423425071 files/control-center-2.6.0-remove-pmu.patch 1210
-MD5 38949ed5d795344f78a96af44764f896 files/digest-control-center-1.4.0.5-r1 76
-MD5 440e2fbb11ac5952e79c4205595d54f3 files/digest-control-center-2.4.0 74
 MD5 a9a7aa3c505ea4bfac681c5d87d9d451 files/digest-control-center-2.6.0.3 76
-MD5 3afae17cdd913d2de47ec8017cafe327 files/digest-control-center-2.6.1 74
+MD5 adbe3cf7b6918f7681569128f76a4b71 files/control-center-2.2-icons_install.patch 2943
 MD5 dbc915ad73576e8f0ae8a948e52fb621 files/control-center-1.4.0.5-cflags.patch 744
-MD5 0ac36f350969840cdac6ab03ead02612 files/digest-control-center-2.8.0 74
+MD5 38949ed5d795344f78a96af44764f896 files/digest-control-center-1.4.0.5-r1 76
diff --git a/gnome-base/control-center/control-center-2.4.0.ebuild b/gnome-base/control-center/control-center-2.4.0.ebuild
deleted file mode 100644
index c81c2786adad..000000000000
--- a/gnome-base/control-center/control-center-2.4.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/control-center-2.4.0.ebuild,v 1.14 2004/11/08 22:52:48 vapier Exp $
-
-inherit gnome2 eutils
-
-DESCRIPTION="the gnome2 Desktop configuration tool"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc sparc x86"
-IUSE=""
-
-RDEPEND=">=x11-libs/gtk+-2.2
-	>=dev-libs/atk-1.2
-	>=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.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/themus"
-
-DEPEND="${RDEPEND}
-	>=app-text/scrollkeeper-0.3.11
-	>=dev-util/pkgconfig-0.12.0"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-
-DOCS="AUTHORS ChangeLog README TODO INSTALL NEWS"
-
-G2CONF="${G2CONF} --disable-schemas-install"
-
-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
-	use amd64 && epatch ${FILESDIR}/control-center-2.4.0-64bit-fixes.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/control-center-2.6.1.ebuild b/gnome-base/control-center/control-center-2.6.1.ebuild
index 980a4e0e54fb..d7de38d13a83 100644
--- a/gnome-base/control-center/control-center-2.6.1.ebuild
+++ b/gnome-base/control-center/control-center-2.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/control-center-2.6.1.ebuild,v 1.9 2004/11/08 22:52:48 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/control-center-2.6.1.ebuild,v 1.10 2004/11/25 05:29:14 obz Exp $
 
 # FIXME : double check all the acme stuff
 inherit gnome2 eutils
@@ -30,7 +30,7 @@ RDEPEND=">=x11-libs/gtk+-2.3
 	media-sound/esound
 	>=x11-wm/metacity-2.4.5
 	>=x11-libs/libxklavier-1.02
-	alsa? ( >=media-libs/alsa-lib-0.9 )
+	!arm? ( alsa? ( >=media-libs/alsa-lib-0.9 ) )
 	gstreamer? ( >=media-libs/gst-plugins-0.8 )
 	!gnome-extra/fontilus
 	!gnome-extra/themus
diff --git a/gnome-base/control-center/control-center-2.8.0.ebuild b/gnome-base/control-center/control-center-2.8.0.ebuild
index 8e61318ea6a7..23f68b2bb3d9 100644
--- a/gnome-base/control-center/control-center-2.8.0.ebuild
+++ b/gnome-base/control-center/control-center-2.8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/control-center-2.8.0.ebuild,v 1.5 2004/11/12 04:18:06 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/control-center-2.8.0.ebuild,v 1.6 2004/11/25 05:29:14 obz Exp $
 
 inherit gnome2 eutils
 
@@ -31,7 +31,7 @@ RDEPEND=">=x11-libs/gtk+-2.3
 	media-sound/esound
 	>=x11-wm/metacity-2.4.5
 	>=x11-libs/libxklavier-1.02
-	alsa? ( >=media-libs/alsa-lib-0.9 )
+	!arm? ( alsa? ( >=media-libs/alsa-lib-0.9 ) )
 	gstreamer? ( >=media-libs/gst-plugins-0.8 )
 	!gnome-extra/fontilus
 	!gnome-extra/themus
diff --git a/gnome-base/control-center/control-center-2.6.0.3.ebuild b/gnome-base/control-center/control-center-2.8.1.ebuild
index f93d05987255..77ea621b2282 100644
--- a/gnome-base/control-center/control-center-2.6.0.3.ebuild
+++ b/gnome-base/control-center/control-center-2.8.1.ebuild
@@ -1,8 +1,7 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/control-center-2.6.0.3.ebuild,v 1.10 2004/11/08 22:52:48 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/control-center-2.8.1.ebuild,v 1.1 2004/11/25 05:29:14 obz Exp $
 
-# FIXME : double check all the acme stuff
 inherit gnome2 eutils
 
 DESCRIPTION="The gnome2 Desktop configuration tool"
@@ -10,9 +9,11 @@ HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ~sparc x86"
+KEYWORDS="~x86 ~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~sparc"
 IUSE="alsa gstreamer"
 
+MAKEOPTS="${MAKEOPTS} -j1"
+
 RDEPEND=">=x11-libs/gtk+-2.3
 	virtual/xft
 	media-libs/fontconfig
@@ -29,8 +30,8 @@ RDEPEND=">=x11-libs/gtk+-2.3
 	dev-libs/libxml2
 	media-sound/esound
 	>=x11-wm/metacity-2.4.5
-	>=x11-libs/libxklavier-1
-	alsa? ( >=media-libs/alsa-lib-0.9 )
+	>=x11-libs/libxklavier-1.02
+	!arm? ( alsa? ( >=media-libs/alsa-lib-0.9 ) )
 	gstreamer? ( >=media-libs/gst-plugins-0.8 )
 	!gnome-extra/fontilus
 	!gnome-extra/themus
@@ -41,9 +42,7 @@ DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.12.0
 	>=dev-util/intltool-0.29"
 
-MAKEOPTS="${MAKEOPTS} -j1"
-
-DOCS="AUTHORS ChangeLog README TODO INSTALL NEWS"
+DOCS="AUTHORS ChangeLog README TODO NEWS"
 
 G2CONF="${G2CONF} \
 	--disable-schemas-install\
@@ -64,6 +63,7 @@ src_unpack() {
 
 	# Temporary workaround for a problematic behaviour with acme.
 	epatch ${FILESDIR}/control-center-2.6.0-remove-pmu.patch
+
 	# temporary fix for icon installation adapted by <link@sub_pop.net> (#16928)
 	# FIXME : this broke again
 #	epatch ${FILESDIR}/${PN}-2.2-icons_install.patch
diff --git a/gnome-base/control-center/files/control-center-2.4.0-64bit-fixes.patch b/gnome-base/control-center/files/control-center-2.4.0-64bit-fixes.patch
deleted file mode 100644
index 020f56cab04b..000000000000
--- a/gnome-base/control-center/files/control-center-2.4.0-64bit-fixes.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -ur control-center-2.4.0.orig/capplets/font/main.c control-center-2.4.0/capplets/font/main.c
---- control-center-2.4.0.orig/capplets/font/main.c	2004-01-12 20:03:32.860516011 +0100
-+++ control-center-2.4.0/capplets/font/main.c	2004-01-12 20:06:09.399260795 +0100
-@@ -85,7 +85,7 @@
- 
- static void
- sample_expose (GtkWidget      *darea,
--	       GdkEventExpose  expose)
-+               GdkEventExpose *expose)
- {
- 	GdkPixbuf *pixbuf = g_object_get_data (G_OBJECT (darea), "sample-pixbuf");
- 	int width = gdk_pixbuf_get_width (pixbuf);
-diff -ur control-center-2.4.0.orig/gnome-settings-daemon/gnome-settings-gtk1theme.c control-center-2.4.0/gnome-settings-daemon/gnome-settings-gtk1theme.c
---- control-center-2.4.0.orig/gnome-settings-daemon/gnome-settings-gtk1theme.c	2004-01-12 20:03:17.865618679 +0100
-+++ control-center-2.4.0/gnome-settings-daemon/gnome-settings-gtk1theme.c	2004-01-12 20:04:36.964003364 +0100
-@@ -151,7 +151,7 @@
- 	gchar *theme_filename;
- 	gchar *rc_filename;
- 	gchar *current_contents;
--	gint current_length;
-+	gsize current_length;
- 	gchar *new_contents;
- 	GError *err = NULL;
- 
-diff -ur control-center-2.4.0.orig/vfs-methods/themus/theme-method.c control-center-2.4.0/vfs-methods/themus/theme-method.c
---- control-center-2.4.0.orig/vfs-methods/themus/theme-method.c	2004-01-12 20:03:19.535607241 +0100
-+++ control-center-2.4.0/vfs-methods/themus/theme-method.c	2004-01-12 20:06:54.772898040 +0100
-@@ -21,7 +21,7 @@
- #include <errno.h>
- #include <sys/stat.h>
- #include <sys/types.h>
--
-+#include <libintl.h>
- #include <libgnomevfs/gnome-vfs.h>
- #include <libgnomevfs/gnome-vfs-cancellable-ops.h>
- #include <libgnomevfs/gnome-vfs-module.h>
diff --git a/gnome-base/control-center/files/control-center-2.5.4-fix_gst_0.8.patch b/gnome-base/control-center/files/control-center-2.5.4-fix_gst_0.8.patch
deleted file mode 100644
index f7d224d3e594..000000000000
--- a/gnome-base/control-center/files/control-center-2.5.4-fix_gst_0.8.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.in	2004-03-14 02:12:35.406882224 +0100
-+++ configure.in.patched	2004-03-14 02:12:45.294379096 +0100
-@@ -329,7 +329,7 @@
- 
- if test "x$ENABLE_GSTREAMER" = "xyes"; then
-    have_gstreamer=no
--   PKG_CHECK_MODULES(GST, gstreamer-interfaces-0.7 >= 0.7.3.1,
-+   PKG_CHECK_MODULES(GST, gstreamer-interfaces-0.8 >= 0.7.3.1,
- 		   have_gstreamer=yes,
- 		   AC_MSG_RESULT(*** All of GStreamer dependent parts will be disabled ***))
- else
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
deleted file mode 100644
index f075d6440b72..000000000000
--- a/gnome-base/control-center/files/digest-control-center-2.4.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 44115d3174d2f603f34a336ada562bae control-center-2.4.0.tar.bz2 2042574
diff --git a/gnome-base/control-center/files/digest-control-center-2.6.0.3 b/gnome-base/control-center/files/digest-control-center-2.6.0.3
deleted file mode 100644
index c2115ec31560..000000000000
--- a/gnome-base/control-center/files/digest-control-center-2.6.0.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7d482e42842dc5b8a52714ae7a0aafed control-center-2.6.0.3.tar.bz2 2364656
diff --git a/gnome-base/control-center/files/digest-control-center-2.8.1 b/gnome-base/control-center/files/digest-control-center-2.8.1
new file mode 100644
index 000000000000..3d5859c76a3c
--- /dev/null
+++ b/gnome-base/control-center/files/digest-control-center-2.8.1
@@ -0,0 +1 @@
+MD5 7bd9c12b9abb05b6fcf7b4906b6918ea control-center-2.8.1.tar.bz2 2547071