Fix for bug #84997

(Portage version: 2.0.51.19)

5 files changed, 336 insertions, 16 deletions

diff --git a/gnome-base/control-center/ChangeLog b/gnome-base/control-center/ChangeLog
index 2f94e75e7555..1fcec6b40b42 100644
--- a/gnome-base/control-center/ChangeLog
+++ b/gnome-base/control-center/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-base/control-center
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/ChangeLog,v 1.104 2005/05/18 01:53:26 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/ChangeLog,v 1.105 2005/05/26 17:25:03 dang Exp $
+
+*control-center-2.10.1-r1 (26 May 2005)
+
+  26 May 2005; <dang@gentoo.org> +files/control-center-2.10.1-pathfix.patch,
+  +control-center-2.10.1-r1.ebuild:
+  change hardcoded tar/gzip/bzip2 paths in gnome-theme-installer to use
+  g_find_program_in_path(). Bug #84997
 
   18 May 2005; Jason Wever <weeve@gentoo.org> control-center-2.8.2.ebuild:
   Stable on SPARC.
diff --git a/gnome-base/control-center/Manifest b/gnome-base/control-center/Manifest
index 476d120fe21c..e83b933131bc 100644
--- a/gnome-base/control-center/Manifest
+++ b/gnome-base/control-center/Manifest
@@ -1,23 +1,26 @@
-MD5 56fbdc795a7d7f1ddced897b58cc4039 ChangeLog 13289
-MD5 aa3234dd1a36f666ba5ace0047cdd8b9 control-center-1.4.0.5-r1.ebuild 1258
+MD5 018875cfbff301a0223bacfc7897650e control-center-2.10.1.ebuild 1892
+MD5 a107b54f30dfce0439114e5f58fae5f0 control-center-2.10.1-r1.ebuild 2025
+MD5 f9a1a02659086003d74a108906fcbaf4 control-center-2.8.0.ebuild 1845
+MD5 bcc9935f8901dd5f049e9ac731bd8864 control-center-2.10.0.ebuild 1892
+MD5 b42cd14dfbb24d8ca75778be583a459f control-center-2.8.1-r1.ebuild 1845
 MD5 2aecca7e67d6a685c8aafc7acf2528c2 control-center-2.6.1.ebuild 1883
 MD5 e565863da1bff6673ef0668ec30772c7 control-center-2.8.2.ebuild 1845
+MD5 aa3234dd1a36f666ba5ace0047cdd8b9 control-center-1.4.0.5-r1.ebuild 1258
+MD5 56fbdc795a7d7f1ddced897b58cc4039 ChangeLog 13289
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 f9a1a02659086003d74a108906fcbaf4 control-center-2.8.0.ebuild 1845
-MD5 b42cd14dfbb24d8ca75778be583a459f control-center-2.8.1-r1.ebuild 1845
-MD5 bcc9935f8901dd5f049e9ac731bd8864 control-center-2.10.0.ebuild 1892
-MD5 018875cfbff301a0223bacfc7897650e control-center-2.10.1.ebuild 1892
-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 38949ed5d795344f78a96af44764f896 files/digest-control-center-1.4.0.5-r1 76
+MD5 86ede4717972671750335483cefdf77b files/digest-control-center-2.10.0 75
+MD5 2f0867c07305e05e49c57051e20dc068 files/digest-control-center-2.10.1 75
 MD5 3afae17cdd913d2de47ec8017cafe327 files/digest-control-center-2.6.1 74
+MD5 0ac36f350969840cdac6ab03ead02612 files/digest-control-center-2.8.0 74
 MD5 67a5a28783f9b30d8f05ef301d2eeb7a files/digest-control-center-2.8.2 74
+MD5 c74402dbfb3e7cdb095304cc4751d86a files/control-center-2.9-logout.patch 4083
+MD5 fdc3d7feea8b429588a2d193c9547dbf files/control-center-2.2.0.1-alpha_hack.patch 2997
 MD5 cfecda4817a0252254abf7ee4d1a10ba files/control-center-2-logout.patch 12887
-MD5 3c50bab26a7b8dd1ccb40514655a0a79 files/digest-control-center-2.8.1-r1 74
 MD5 63670f480e3cafb0d9dc8b3423425071 files/control-center-2.6.0-remove-pmu.patch 1210
-MD5 0ac36f350969840cdac6ab03ead02612 files/digest-control-center-2.8.0 74
-MD5 dbc915ad73576e8f0ae8a948e52fb621 files/control-center-1.4.0.5-cflags.patch 744
 MD5 a9b97cf7218d917325a6e3b8504276fd files/control-center-2.8-logout.patch 13181
-MD5 c74402dbfb3e7cdb095304cc4751d86a files/control-center-2.9-logout.patch 4083
-MD5 86ede4717972671750335483cefdf77b files/digest-control-center-2.10.0 75
-MD5 2f0867c07305e05e49c57051e20dc068 files/digest-control-center-2.10.1 75
+MD5 adbe3cf7b6918f7681569128f76a4b71 files/control-center-2.2-icons_install.patch 2943
+MD5 dbc915ad73576e8f0ae8a948e52fb621 files/control-center-1.4.0.5-cflags.patch 744
+MD5 f14d2fe3d15320580a2ab5715e6e2d94 files/control-center-2.10.1-pathfix.patch 6670
+MD5 3c50bab26a7b8dd1ccb40514655a0a79 files/digest-control-center-2.8.1-r1 74
+MD5 2f0867c07305e05e49c57051e20dc068 files/digest-control-center-2.10.1-r1 75
+MD5 38949ed5d795344f78a96af44764f896 files/digest-control-center-1.4.0.5-r1 76
diff --git a/gnome-base/control-center/control-center-2.10.1-r1.ebuild b/gnome-base/control-center/control-center-2.10.1-r1.ebuild
new file mode 100644
index 000000000000..5a052f88b731
--- /dev/null
+++ b/gnome-base/control-center/control-center-2.10.1-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2005 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.10.1-r1.ebuild,v 1.1 2005/05/26 17:25:03 dang Exp $
+
+inherit gnome2 eutils
+
+DESCRIPTION="The gnome2 Desktop configuration tool"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~ppc ~x86 ~amd64 ~sparc ~ppc64 ~ia64"
+IUSE="alsa gstreamer"
+
+MAKEOPTS="${MAKEOPTS} -j1"
+
+RDEPEND=">=x11-libs/gtk+-2.6
+	>=dev-libs/glib-2.5
+	virtual/xft
+	media-libs/fontconfig
+	>=dev-libs/atk-1.2
+	>=gnome-base/gconf-1.2
+	>=gnome-base/libgnome-2.2
+	>=gnome-base/libgnomeui-2.2
+	>=gnome-base/libglade-2
+	>=gnome-base/libbonobo-2.2
+	>=gnome-base/libbonoboui-2.2
+	>=gnome-base/nautilus-2.6
+	>=gnome-base/gnome-vfs-2.2
+	>=gnome-base/gnome-desktop-2.2
+	>=gnome-base/gnome-menus-2.9.1
+	dev-libs/libxml2
+	media-sound/esound
+	>=x11-wm/metacity-2.8.6-r1
+	>=x11-libs/libxklavier-1.14
+	!arm? ( alsa? ( >=media-libs/alsa-lib-0.9 ) )
+	gstreamer? ( >=media-libs/gst-plugins-0.8 )
+	!gnome-extra/fontilus
+	!gnome-extra/themus
+	!gnome-extra/acme"
+
+DEPEND="${RDEPEND}
+	>=app-text/scrollkeeper-0.3.11
+	>=dev-util/pkgconfig-0.12.0
+	>=dev-util/intltool-0.29"
+
+DOCS="AUTHORS ChangeLog README TODO NEWS"
+
+G2CONF="${G2CONF} \
+	--disable-schemas-install\
+	--enable-vfs-methods \
+	$(use_enable alsa) \
+	$(use_enable gstreamer)"
+
+USE_DESTDIR="1"
+
+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
+
+	# Temporary workaround for a problematic behaviour with acme.
+	epatch ${FILESDIR}/control-center-2.6.0-remove-pmu.patch
+
+	# Fix the logout keyboard shortcut by moving it out of
+	# the control-center here, and into metacity, bug #52034
+	epatch ${FILESDIR}/control-center-2.9-logout.patch
+
+	# Fix the hardcoding of tar, bzip2, and gzip paths in
+	# gnome-theme-installer.  bug #84977
+	epatch ${FILESDIR}/${P}-pathfix.patch
+
+}
diff --git a/gnome-base/control-center/files/control-center-2.10.1-pathfix.patch b/gnome-base/control-center/files/control-center-2.10.1-pathfix.patch
new file mode 100644
index 000000000000..5a9e9aa3cd07
--- /dev/null
+++ b/gnome-base/control-center/files/control-center-2.10.1-pathfix.patch
@@ -0,0 +1,232 @@
+diff -u -ruN control-center-2.10.1.orig/capplets/theme-switcher/gnome-theme-installer.c control-center-2.10.1/capplets/theme-switcher/gnome-theme-installer.c
+--- control-center-2.10.1.orig/capplets/theme-switcher/gnome-theme-installer.c	2005-02-08 17:42:10.000000000 -0500
++++ control-center-2.10.1/capplets/theme-switcher/gnome-theme-installer.c	2005-05-26 12:17:39.000000000 -0400
+@@ -139,19 +139,30 @@
+ transfer_done_targz_idle_cb (gpointer data)
+ {
+ 	int status;
+-	gchar *command, *filename;
++	gchar *command, *filename, *gzip, *tar;
+ 	theme_properties *theme_props = data;
+ 		
++	if (!(gzip = g_find_program_in_path("gzip"))) {
++		return FALSE;
++	}
++	if (!(tar = g_find_program_in_path("tar"))) {
++		g_free(gzip);
++		return FALSE;
++	}
+ 	/* this should be something more clever and nonblocking */
+ 	filename = g_shell_quote(theme_props->filename);
+-	command = g_strdup_printf ("sh -c 'cd \"%s\"; /bin/gzip -d -c < \"%s\" | /bin/tar xf - '",
+-				    theme_props->target_tmp_dir, filename);
++	command = g_strdup_printf ("sh -c 'cd \"%s\"; %s -d -c < \"%s\" | %s xf - '",
++				    theme_props->target_tmp_dir, gzip, filename, tar);
+ 	g_free(filename);
+ 	if (g_spawn_command_line_sync (command, NULL, NULL, &status, NULL) && status == 0) {
+ 		g_free (command);
++		g_free(gzip);
++		g_free(tar);
+ 		return TRUE;
+ 	} else {	
+ 		g_free (command);
++		g_free(gzip);
++		g_free(tar);
+ 		return FALSE;
+ 	}
+ }
+@@ -171,18 +182,29 @@
+ transfer_done_tarbz2_idle_cb (gpointer data)
+ {
+ 	int status;
+-	gchar *command, *filename;
++	gchar *command, *filename, *bzip2, *tar;
+ 	theme_properties *theme_props = data;
+ 	
++	if (!(bzip2 = g_find_program_in_path("bzip2"))) {
++		return FALSE;
++	}
++	if (!(tar = g_find_program_in_path("tar"))) {
++		g_free(bzip2);
++		return FALSE;
++	}
+ 	filename = g_shell_quote(theme_props->filename);
+ 	/* this should be something more clever and nonblocking */
+-	command = g_strdup_printf ("sh -c 'cd \"%s\"; /usr/bin/bzip2 -d -c < \"%s\" | /bin/tar xf - '",
+-				   theme_props->target_tmp_dir, filename);
++	command = g_strdup_printf ("sh -c 'cd \"%s\"; %s -d -c < \"%s\" | %s xf - '",
++				   theme_props->target_tmp_dir, bzip2, filename, tar);
+ 	g_free (filename);
+ 	if (g_spawn_command_line_sync (command, NULL, NULL, &status, NULL) && status == 0) {
++		g_free(bzip2);
++		g_free(tar);
+ 		g_free (command);
+ 		return TRUE;
+ 	} else {
++		g_free(bzip2);
++		g_free(tar);
+ 		g_free (command);
+ 		return FALSE;
+ 	}
+@@ -193,7 +215,7 @@
+ {
+ 	GtkWidget *dialog;
+ 	int len = strlen (path);
+-	gchar *command,**dir, *first_line, *filename;
++	gchar *command,**dir, *first_line, *filename, *gzip, *bzip2, *tar;
+ 	int status,theme_type;
+ 	theme_properties *theme_props;
+ 	GnomeVFSURI *theme_source_dir, *theme_dest_dir;
+@@ -206,17 +228,20 @@
+ 				 			g_get_home_dir(), 
+ 							g_random_int());
+ 		
++	gzip = g_find_program_in_path("gzip");
++	bzip2 = g_find_program_in_path("bzip2");
++	tar = g_find_program_in_path("tar");
+ 	
+-	if (path && len > 7 && ( (!strcmp (path + len - 7, ".tar.gz")) || (!strcmp (path + len - 4, ".tgz")) )) {
++	if (tar && gzip && path && len > 7 && ( (!strcmp (path + len - 7, ".tar.gz")) || (!strcmp (path + len - 4, ".tgz")) )) {
+ 		filename = g_shell_quote (path);
+-		command = g_strdup_printf ("sh -c '/bin/gzip -d -c < \"%s\" | /bin/tar ft -  | head -1'",
+-					    filename);
++		command = g_strdup_printf ("sh -c '%s -d -c < \"%s\" | %s ft -  | head -1'",
++					    gzip, filename, tar);
+ 		theme_props->filetype=TARGZ;
+ 		g_free (filename);
+-	} else if (path && len > 8 && !strcmp (path + len - 8, ".tar.bz2")) {
++	} else if (tar && bzip2 && path && len > 8 && !strcmp (path + len - 8, ".tar.bz2")) {
+ 		filename = g_shell_quote (path);
+-		command = g_strdup_printf ("sh -c '/usr/bin/bzip2 -d -c < \"%s\" | /bin/tar ft - | head -1'",
+-					    filename);
++		command = g_strdup_printf ("sh -c '%s -d -c < \"%s\" | %s ft - | head -1'",
++					    bzip2, filename, tar);
+ 		theme_props->filetype=TARBZ;
+ 		g_free (filename);
+ 	} else {
+@@ -230,6 +255,9 @@
+ 		gnome_vfs_unlink(path);		
+ 		g_free (theme_props->target_tmp_dir);
+ 		g_free (theme_props);
++		g_free(gzip);
++		g_free(bzip2);
++		g_free(tar);
+ 		return;	
+ 	}
+ 	
+@@ -247,6 +275,9 @@
+ 		g_free (command);
+ 		g_free (theme_props->target_tmp_dir);
+ 		g_free (theme_props);
++		g_free(gzip);
++		g_free(bzip2);
++		g_free(tar);
+ 		return;	
+ 	}
+ 	
+@@ -254,7 +285,7 @@
+ 	theme_props->filename=g_strdup(path);
+ 	
+ 	if (theme_props->filetype == TARBZ ) {
+-		if (!g_file_test ("/usr/bin/bzip2", G_FILE_TEST_EXISTS)) {
++		if (!bzip2) {
+ 			GtkWidget *dialog;
+ 				
+ 			dialog = gtk_message_dialog_new (NULL,
+@@ -269,6 +300,9 @@
+ 			g_free (theme_props->target_tmp_dir);
+ 			g_free (theme_props->filename);
+ 			g_free (theme_props);
++			g_free(gzip);
++			g_free(bzip2);
++			g_free(tar);
+ 			return;	
+ 		}
+ 		
+@@ -287,12 +321,15 @@
+ 			g_free (theme_props->filename);
+ 			g_free (theme_props);
+ 			g_free (command);
++			g_free(gzip);
++			g_free(bzip2);
++			g_free(tar);
+ 			return;	
+ 		}
+ 	}
+ 	
+ 	if (theme_props->filetype == TARGZ ) {
+-		if (!g_file_test ("/bin/gzip", G_FILE_TEST_EXISTS)) {
++		if (!gzip) {
+ 			GtkWidget *dialog;
+ 
+ 			dialog = gtk_message_dialog_new (NULL,
+@@ -307,6 +344,9 @@
+ 			g_free (theme_props->target_tmp_dir);
+ 			g_free (theme_props->filename);
+ 			g_free (theme_props);
++			g_free(gzip);
++			g_free(bzip2);
++			g_free(tar);
+ 			return;	
+ 		}
+ 		if (!transfer_done_targz_idle_cb(theme_props)) {
+@@ -324,6 +364,9 @@
+ 			g_free (theme_props->filename);
+ 			g_free (theme_props);
+ 			g_free (command);
++			g_free(gzip);
++			g_free(bzip2);
++			g_free(tar);
+ 			return;	
+ 		}	
+ 	}
+@@ -363,6 +406,9 @@
+ 			g_free (theme_props->theme_tmp_dir);
+ 			g_free (theme_props);
+ 			g_free (command);
++			g_free(gzip);
++			g_free(bzip2);
++			g_free(tar);
+ 			return;	
+ 		} else {
+ 			GtkWidget *dialog;
+@@ -379,6 +425,9 @@
+                         g_free (theme_props->theme_tmp_dir);
+                         g_free (theme_props);
+ 			g_free (command);
++			g_free(gzip);
++			g_free(bzip2);
++			g_free(tar);
+ 			return;	
+ 		}
+ 		/* Move the Dir to the target dir */
+@@ -407,6 +456,9 @@
+ 			g_free (theme_props->user_message);
+                         g_free (theme_props);
+ 			g_free (command);
++			g_free(gzip);
++			g_free(bzip2);
++			g_free(tar);
+ 			return;	
+ 		} else {
+ 			GtkWidget *dialog;
+@@ -426,6 +478,9 @@
+ 			g_free (theme_props->user_message);
+                         g_free (theme_props);
+ 			g_free (command);
++			g_free(gzip);
++			g_free(bzip2);
++			g_free(tar);
+ 			return;	
+ 		}
+ 		
+@@ -434,6 +489,9 @@
+ 	g_free (theme_props->target_tmp_dir);
+ 	g_free (theme_props->filename);
+ 	g_free (theme_props);
++	g_free(gzip);
++	g_free(bzip2);
++	g_free(tar);
+ }
+ 
+ static void
diff --git a/gnome-base/control-center/files/digest-control-center-2.10.1-r1 b/gnome-base/control-center/files/digest-control-center-2.10.1-r1
new file mode 100644
index 000000000000..558324993206
--- /dev/null
+++ b/gnome-base/control-center/files/digest-control-center-2.10.1-r1
@@ -0,0 +1 @@
+MD5 d95a5746aa349536dc0f59c61cdaf19f control-center-2.10.1.tar.bz2 2648247