From 10e8f3dfdf2a7d1735949f820dddb790e6db137e Mon Sep 17 00:00:00 2001 From: Mart Raudsepp Date: Sat, 11 Aug 2007 17:39:16 +0000 Subject: Removing Gnome 2.14 (Portage version: 2.1.3.4) --- gnome-base/control-center/ChangeLog | 8 +- .../control-center/control-center-2.14.2.ebuild | 90 -------- .../files/control-center-2.14.1-path-fix.patch | 235 --------------------- .../files/control-center-2.6.0-remove-pmu.patch | 24 --- .../files/digest-control-center-2.14.2 | 3 - 5 files changed, 7 insertions(+), 353 deletions(-) delete mode 100644 gnome-base/control-center/control-center-2.14.2.ebuild delete mode 100644 gnome-base/control-center/files/control-center-2.14.1-path-fix.patch delete mode 100644 gnome-base/control-center/files/control-center-2.6.0-remove-pmu.patch delete mode 100644 gnome-base/control-center/files/digest-control-center-2.14.2 (limited to 'gnome-base/control-center') diff --git a/gnome-base/control-center/ChangeLog b/gnome-base/control-center/ChangeLog index 58a71186960d..25b5b26e5070 100644 --- a/gnome-base/control-center/ChangeLog +++ b/gnome-base/control-center/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for gnome-base/control-center # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/ChangeLog,v 1.245 2007/08/11 14:50:38 ticho Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/ChangeLog,v 1.246 2007/08/11 17:39:15 leio Exp $ + + 11 Aug 2007; Mart Raudsepp + -files/control-center-2.6.0-remove-pmu.patch, + -files/control-center-2.14.1-path-fix.patch, + -control-center-2.14.2.ebuild: + Removing Gnome 2.14 11 Aug 2007; Andrej Kacian control-center-2.18.1.ebuild: diff --git a/gnome-base/control-center/control-center-2.14.2.ebuild b/gnome-base/control-center/control-center-2.14.2.ebuild deleted file mode 100644 index 7392b8a6a046..000000000000 --- a/gnome-base/control-center/control-center-2.14.2.ebuild +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright 1999-2007 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.14.2.ebuild,v 1.13 2007/07/22 10:31:21 graaff Exp $ - -inherit eutils gnome2 autotools - -DESCRIPTION="The gnome2 Desktop configuration tool" -HOMEPAGE="http://www.gnome.org/" - -LICENSE="GPL-2" -SLOT="2" -KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86" -IUSE="alsa eds gstreamer" - -RDEPEND=">=gnome-base/gnome-vfs-2.2 - >=media-libs/fontconfig-1 - virtual/xft - x11-apps/xmodmap - x11-libs/libXdmcp - x11-libs/libICE - x11-libs/libSM - x11-libs/libXxf86misc - x11-libs/libXau - >=x11-libs/gtk+-2.8.12 - >=dev-libs/glib-2.8 - >=gnome-base/libbonobo-2 - >=gnome-base/libgnomeui-2.2 - >=gnome-base/nautilus-2.6 - >=gnome-base/gconf-2 - >=gnome-base/libglade-2 - >=gnome-base/libbonoboui-2.2 - >=gnome-base/gnome-desktop-2.2 - >=gnome-base/gnome-menus-2.11.1 - media-sound/esound - >=x11-wm/metacity-2.8.6-r1 - >=x11-libs/libxklavier-1.14 - >=gnome-base/libgnome-2.2 - media-libs/freetype - >=gnome-base/orbit-2.12.4 - eds? ( >=gnome-extra/evolution-data-server-1.3 ) - !arm? ( alsa? ( >=media-libs/alsa-lib-0.9 ) ) - gstreamer? ( >=media-libs/gst-plugins-base-0.10 )" - -DEPEND="${RDEPEND} - x11-libs/libxkbfile - x11-proto/kbproto - x11-proto/xf86miscproto - x11-proto/scrnsaverproto - app-text/scrollkeeper - >=dev-util/pkgconfig-0.9 - >=dev-util/intltool-0.34.2 - >=app-text/gnome-doc-utils-0.3.2 - dev-util/desktop-file-utils" - -DOCS="AUTHORS ChangeLog NEWS README TODO" - -MAKEOPTS="${MAKEOPTS} -j1" - -pkg_setup() { - G2CONF="${G2CONF} --disable-schemas-install \ - --disable-scrollkeeper \ - --enable-vfs-methods \ - $(use_enable alsa) \ - $(use_enable eds aboutme)" - - if use gstreamer ; then - G2CONF="${G2CONF} --enable-gstreamer=0.10" - else - G2CONF="${G2CONF} --enable-gstreamer=no" - fi -} - -src_unpack() { - gnome2_src_unpack - - # Temporary workaround for a problematic behaviour with acme. - epatch ${FILESDIR}/${PN}-2.6.0-remove-pmu.patch - - # Gentoo-specific support for xcursor themes. See bug #103638. - epatch ${FILESDIR}/${PN}-2.11-gentoo_xcursor.patch - - # Disable the master pty check, as it causes sandbox violations - epatch ${FILESDIR}/${PN}-2.13.5-disable-master-pty.patch - - # fix for hardcoded paths for bzip2 / tar in gnome-theme-installer - epatch "${FILESDIR}"/${PN}-2.14.1-path-fix.patch - - eautoreconf - intltoolize --force || die -} diff --git a/gnome-base/control-center/files/control-center-2.14.1-path-fix.patch b/gnome-base/control-center/files/control-center-2.14.1-path-fix.patch deleted file mode 100644 index 4f85474f6d9a..000000000000 --- a/gnome-base/control-center/files/control-center-2.14.1-path-fix.patch +++ /dev/null @@ -1,235 +0,0 @@ ---- control-center-2.14.1/capplets/theme-switcher/gnome-theme-installer.c 2006-01-09 07:09:44.000000000 -0500 -+++ control-center-2.14.1.new/capplets/theme-switcher/gnome-theme-installer.c 2006-05-13 09:21:51.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; -@@ -207,16 +229,20 @@ - g_random_int()); - - -- if (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 -n 1'", -- filename); -- theme_props->filetype=TARGZ; -- g_free (filename); -- } else if (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 -n 1'", -- filename); -+ gzip = g_find_program_in_path("gzip"); -+ bzip2 = g_find_program_in_path("bzip2"); -+ tar = g_find_program_in_path("tar"); -+ -+ 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 '%s -d -c < \"%s\" | %s ft - | head -1'", -+ gzip, filename, tar); -+ theme_props->filetype=TARGZ; -+ g_free (filename); -+ } else if (tar && bzip2 && path && len > 8 && !strcmp (path + len - 8, ".tar.bz2")) { -+ filename = g_shell_quote (path); -+ 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 +256,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; - } - -@@ -245,6 +274,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; - } - -@@ -252,7 +284,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) { - dialog = gtk_message_dialog_new (NULL, - GTK_DIALOG_MODAL, - GTK_MESSAGE_ERROR, -@@ -265,6 +297,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; - } - -@@ -281,12 +316,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) { - dialog = gtk_message_dialog_new (NULL, - GTK_DIALOG_MODAL, - GTK_MESSAGE_ERROR, -@@ -299,6 +337,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)) { -@@ -314,6 +355,9 @@ - g_free (theme_props->filename); - g_free (theme_props); - g_free (command); -+ g_free(gzip); -+ g_free(bzip2); -+ g_free(tar); - return; - } - } -@@ -351,6 +395,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 { - dialog = gtk_message_dialog_new (NULL, -@@ -365,6 +412,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 */ -@@ -391,6 +441,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 { - dialog = gtk_message_dialog_new (NULL, -@@ -408,6 +461,9 @@ - g_free (theme_props->user_message); - g_free (theme_props); - g_free (command); -+ g_free(gzip); -+ g_free(bzip2); -+ g_free(tar); - return; - } - -@@ -416,6 +472,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/control-center-2.6.0-remove-pmu.patch b/gnome-base/control-center/files/control-center-2.6.0-remove-pmu.patch deleted file mode 100644 index 6a349ba00801..000000000000 --- a/gnome-base/control-center/files/control-center-2.6.0-remove-pmu.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -ruN control-center-2.6.0.3.orig/capplets/keybindings/gnome-keybinding-properties.c control-center-2.6.0.3/capplets/keybindings/gnome-keybinding-properties.c ---- control-center-2.6.0.3.orig/capplets/keybindings/gnome-keybinding-properties.c 2004-04-05 18:33:34.595212248 +0200 -+++ control-center-2.6.0.3/capplets/keybindings/gnome-keybinding-properties.c 2004-04-05 18:34:18.521534432 +0200 -@@ -21,7 +21,7 @@ - #define KEY_THEME_KEY "/desktop/gnome/interface/gtk_key_theme" - #define MAX_ELEMENTS_BEFORE_SCROLLING 10 - --#if defined(__powerpc__) && defined (__linux__) -+#if 0 - #define USE_FBLEVEL - #else - #undef USE_FBLEVEL -diff -ruN control-center-2.6.0.3.orig/gnome-settings-daemon/gnome-settings-multimedia-keys.c control-center-2.6.0.3/gnome-settings-daemon/gnome-settings-multimedia-keys.c ---- control-center-2.6.0.3.orig/gnome-settings-daemon/gnome-settings-multimedia-keys.c 2004-04-05 18:33:34.877169384 +0200 -+++ control-center-2.6.0.3/gnome-settings-daemon/gnome-settings-multimedia-keys.c 2004-04-05 18:34:40.630173408 +0200 -@@ -32,7 +32,7 @@ - - #include "eggaccelerators.h" - --#if defined(__powerpc__) && defined (__linux__) -+#if 0 - #define USE_FBLEVEL - #include "actions/acme-fb-level.h" - #else diff --git a/gnome-base/control-center/files/digest-control-center-2.14.2 b/gnome-base/control-center/files/digest-control-center-2.14.2 deleted file mode 100644 index fc0368dabddb..000000000000 --- a/gnome-base/control-center/files/digest-control-center-2.14.2 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 08711b0f14584e7eaa9f4c275085ab36 control-center-2.14.2.tar.bz2 1864719 -RMD160 7c144f408245cace7c73c13432c900ae66dc190c control-center-2.14.2.tar.bz2 1864719 -SHA256 c0b428127f0e57921a36aff246f4a1b9d71c727506794afe7a778c2095b740d8 control-center-2.14.2.tar.bz2 1864719 -- cgit v1.2.3-65-gdbad