# ChangeLog for gnome-base/gnome-control-center
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/ChangeLog,v 1.52 2010/03/16 18:59:48 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/ChangeLog,v 1.53 2010/03/22 22:03:15 eva Exp $
+
+ 22 Mar 2010; Gilles Dartiguelongue <eva@gentoo.org>
+ -gnome-control-center-2.24.0.1.ebuild,
+ -gnome-control-center-2.24.0.1-r1.ebuild,
+ -gnome-control-center-2.24.0.1-r10.ebuild,
+ -files/gnome-control-center-2.24.0.1-capplet-help.patch,
+ -files/gnome-control-center-2.24.0.1-gnome-desktop-api.patch,
+ -files/gnome-control-center-2.24.0.1-hv-max.patch,
+ -files/gnome-control-center-2.24.0.1-libgnomeui.patch:
+ Clean up old revisions.
16 Mar 2010; Christian Faulhammer <fauli@gentoo.org>
gnome-control-center-2.26.0-r1.ebuild:
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-AUX gnome-control-center-2.24.0.1-capplet-help.patch 2345 RMD160 c92a563b9881b41015918f9fdba546d50e471b60 SHA1 e91afbf8f8802a51411ad5e5c22cf417800b3452 SHA256 c6f3cc0a9b5eeb569e2b62c75bf55f211fd7ba08de7b6db3923c7b40a71e7a95
AUX gnome-control-center-2.24.0.1-fbsd.patch 394 RMD160 e5558b7be781663e05c8964355443a2ec993b6a4 SHA1 e6a23b54558824b279a74fdda6afbecb7621b9cf SHA256 d7216a88d518110e3d6a9b64e72e8a02fea1c1b48da43783d0ca0c06f610e11f
-AUX gnome-control-center-2.24.0.1-gnome-desktop-api.patch 1247 RMD160 1abed623fbddf91a868b9996d58fa48fd5153671 SHA1 332f4768418c4ddf7127fce28005a1f4580d8b18 SHA256 5441d0c54f18dc20a4bf81b2e79b4ad047e65ac2e3d4afad0d54c6b8d4a7eeea
-AUX gnome-control-center-2.24.0.1-hv-max.patch 2105 RMD160 5424127ae1c41c72853812515d5975c6377ce285 SHA1 f9d8fbdf0cea5d8e9ff51553c4073b98c76e89d2 SHA256 32d8c14ec34c0bf293a4a9490fa950c6883025a5751da860a04c5687fe248b36
-AUX gnome-control-center-2.24.0.1-libgnomeui.patch 799 RMD160 b65ea123fa2136ccf1206990cff78ff1b6c51fbc SHA1 a7774c0310eecc2098d07fffc9671ff1e3f34c43 SHA256 a37fb83a1782a17892f4ad2d4778255a3c6a09de28b382ee09aec8605db9ece8
AUX gnome-control-center-2.26.0-automagics-canberra+polkit.patch 2432 RMD160 8dc01ee688986a20339e6d14d39a43d40a03a770 SHA1 cde5a169e98a7d92875bb7fc535502f375774e5b SHA256 1a2a294de055d561985ec95cd612b81cc8ad68820e890011a62afbb1e340b597
AUX gnome-control-center-2.26.0-default-background.patch 6341 RMD160 287b29d28ea56a7a25cb189412b41b0ba4dec9af SHA1 58297198e1e1d3c0f8de0b63316ddfd9e7488d5d SHA256 c6cf58d7e284df4a25b8ad226b5d3dc8c56f697e23962a4944e140c65c109edd
AUX gnome-control-center-2.26.0-gconf-unref.patch 680 RMD160 46e913235adea15003228959e9b198941602d904 SHA1 ddac887dd06f47ba2c624882e60f60ff6cb2986e SHA256 cd79f88e29b2c662910c6ddc57bd24958ba4f1c71ca60bf668f7c20261b1c573
AUX gnome-control-center-2.26.0-libxklavier4.patch 1651 RMD160 1bacf04c569b59a091a4ee2ac4d2b7d695be0f68 SHA1 7666c459f5aa71dd65e14ea092fff83588227f39 SHA256 453c08693d9fa79e6252a17e9aeef297089f6c709e2132e78b9a6b2858f051e4
AUX gnome-control-center-2.28.1-gdm-default-bg.patch 4946 RMD160 7a8593a071548dd7b8a562927eae56d08164c489 SHA1 2c36d84ba5498a387dd7973eef7b18bac9a40609 SHA256 d6cdfbf3c293d3fa57bf49bd7ba55f41074202df617cd12607b9bacbdb2eb49e
AUX org.gnome.control-center.defaultbackground.policy 836 RMD160 0e830941e4e03bd0c84ec6a352ed5df598f2ccb5 SHA1 c70e2db5e125e1236b0e796c3d9e293ecb3b58a7 SHA256 4fb135d55626e03a2b02b6c325e0fa3ee773984af2258acb3e2f1b22373dce52
-DIST gnome-control-center-2.24.0.1.tar.bz2 2113356 RMD160 5f211b12f7260a8af8c602066133d72cb61cc3f6 SHA1 daf737c762d53ef984a55fc5008e6a4e85b88294 SHA256 fa5d1ba5cb2f88d3c689c8a2bceb57508777a23cff020dcf2de67ad81b0fe57d
DIST gnome-control-center-2.26.0.tar.bz2 2262324 RMD160 d22c75b21d63bad9321ad1221e442f381da8dd35 SHA1 4730780aaab599869a2dfe2d72d68dd54bb77058 SHA256 62fb84ea1053971a53c5259b92eb3a282c2f317f72f761ed4dff434ed0e99c05
DIST gnome-control-center-2.28.1.tar.bz2 2287398 RMD160 a9620e2f227124bb81b7a3a811ac74cec193ac41 SHA1 ab41e211c507b9b781199f57ca87c704d07175c1 SHA256 bd1d9a55f810266c38a283baf6a4e92002d35c9366529eb92b25710f3456bbf1
-EBUILD gnome-control-center-2.24.0.1-r1.ebuild 2769 RMD160 8df832492e029b55239ebff3f5d2b4ef4836eb1f SHA1 a99239988a5a08c10d58c8cf53e5a780a74bcfde SHA256 11e9fcbcce321aa286ee8773624d57e3a83d6ce26999e1ac80cdf67287248ed9
-EBUILD gnome-control-center-2.24.0.1-r10.ebuild 2938 RMD160 f78416df69f49fe61074522791495241caffeed5 SHA1 c54dc1420c43c801806def07bc9bc7c3be8529db SHA256 661d46db71e3b81af155a8cb42dfed0d2a97ef9a87924e6f57d4f24ff852b20d
-EBUILD gnome-control-center-2.24.0.1.ebuild 2556 RMD160 76370a1d6750c343fe9c5791d0335991133a4dfa SHA1 2baecb6a12008f05d9b3f011413e6fe9bdf79bb4 SHA256 413162a78846d58d95e46e051e2a6d6d24ecd235e4acb1a2a5fa636670b6e698
EBUILD gnome-control-center-2.26.0-r1.ebuild 3091 RMD160 c47d251cd2ac956bd60c4d6fd2b522e95368bbbd SHA1 67b4faaa17d5c4b47d100f78366d33269e01879d SHA256 e46049c0352c7d2dbc2c4d769542115a5a4971b86ff55edfb6c9af44ccd25bec
EBUILD gnome-control-center-2.26.0.ebuild 2973 RMD160 07f61fe45337a66283b4160d48c7a39057876fa9 SHA1 64ce30df06246ff17078a07e81f67d58358b37fa SHA256 895a0776d35b7f97da3397840afd63159562ae3bcd28703babda9bb4178360e4
EBUILD gnome-control-center-2.28.1-r2.ebuild 2502 RMD160 f2dbfac5a1b3d32d151c697a72f9b4a17cf1c578 SHA1 40b5c662c737ecc73438772b9c06b8d61822f6ab SHA256 d419fdc1a62eb926323044e8a4268660bd6e13fbd99f0b38f19973bfcabef2fa
EBUILD gnome-control-center-2.28.1.ebuild 2226 RMD160 fc8765ff967ec8f19e02abbe70423607eeb2d218 SHA1 2abf3bbbb9d5ee3f510e14bece9203b7836c6478 SHA256 924c70582de6e2cffe770edfd5530415e1c7cda7c8860b44ff74d20c3ec4a8a6
-MISC ChangeLog 46082 RMD160 d6a4ba3a7a412948f7a5a0c006f7f06eda942a74 SHA1 08a0752a9ea0550a1705634e3cb4e3d2d7913340 SHA256 6441c034f8e9e082b3b723cbe4efbdc3422a6423b0f41366209fb9ff461c0b29
+MISC ChangeLog 46524 RMD160 6a51d4739bd6277b7709a89d867758e4cd499e46 SHA1 81d39c72112bb74555bbcfb76fd12ad0f75bac93 SHA256 a66c159735ac09d6c4a0d724ab96fff6fd3a80deeadb6ab809e9f1d62a64c7bd
MISC metadata.xml 264 RMD160 e891c8cddd44dc4a25f7b9a1172e8ad7332177c0 SHA1 379b57843ca1c94fe14c334b39d6aa2d1822623c SHA256 3df2f5e7333311872f1351c41df47ecfbfa3a85534f210911603d72968cb2d22
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.14 (GNU/Linux)
-iEYEARECAAYFAkuf1SoACgkQNQqtfCuFneObmgCfUmLsZ/6AKRYL8LxigyjYNrOP
-ttIAn3+r+26iF9D0BZ80i9Kcy/RhhLkw
-=dotj
+iEYEARECAAYFAkun6SkACgkQ1fmVwcYIWAaaKACeOPVC14mLajKRofglsJ8iboGt
+XBoAoIKcGOzrmQGo2dk8ZiSEt46Br9Sk
+=0tyH
-----END PGP SIGNATURE-----
+++ /dev/null
-diff -up gnome-control-center-2.24.0.1/capplets/appearance/appearance-main.c.capplet-help gnome-control-center-2.24.0.1/capplets/appearance/appearance-main.c
---- gnome-control-center-2.24.0.1/capplets/appearance/appearance-main.c.capplet-help 2008-10-04 01:40:15.000000000 -0400
-+++ gnome-control-center-2.24.0.1/capplets/appearance/appearance-main.c 2008-10-04 01:40:34.000000000 -0400
-@@ -85,6 +85,38 @@ main_window_response (GtkWidget *widget,
- g_object_unref (data->client);
- g_object_unref (data->xml);
- }
-+ else if (response_id == GTK_RESPONSE_HELP)
-+ {
-+ GtkNotebook *nb;
-+ gint pindex;
-+
-+ nb = GTK_NOTEBOOK (glade_xml_get_widget (data->xml, "main_notebook"));
-+ pindex = gtk_notebook_get_current_page (nb);
-+
-+ switch (pindex)
-+ {
-+ case 0: /* theme */
-+ capplet_help (GTK_WINDOW (widget), "user-guide.xml",
-+ "goscustdesk-12");
-+ break;
-+ case 1: /* background */
-+ capplet_help (GTK_WINDOW (widget), "user-guide.xml",
-+ "goscustdesk-7");
-+ break;
-+ case 2: /* fonts */
-+ capplet_help (GTK_WINDOW (widget), "user-guide.xml",
-+ "goscustdesk-38");
-+ break;
-+ case 3: /* interface */
-+ capplet_help (GTK_WINDOW (widget), "user-guide.xml",
-+ "goscustuserinter-2");
-+ break;
-+ default:
-+ capplet_help (GTK_WINDOW (widget), "user-guide.xml",
-+ "prefs-look-and-feel");
-+ break;
-+ }
-+ }
- }
-
- int
-diff -up gnome-control-center-2.24.0.1/capplets/appearance/appearance-style.c.capplet-help gnome-control-center-2.24.0.1/capplets/appearance/appearance-style.c
---- gnome-control-center-2.24.0.1/capplets/appearance/appearance-style.c.capplet-help 2008-10-04 01:40:24.000000000 -0400
-+++ gnome-control-center-2.24.0.1/capplets/appearance/appearance-style.c 2008-10-04 01:40:34.000000000 -0400
-@@ -392,7 +392,7 @@ static void
- style_response_cb (GtkDialog *dialog, gint response_id)
- {
- if (response_id == GTK_RESPONSE_HELP) {
-- /* FIXME: help */
-+ capplet_help (GTK_WINDOW (dialog), "user-guide.xml", "goscustdesk-61");
- } else {
- gtk_widget_hide (GTK_WIDGET (dialog));
- }
+++ /dev/null
-Index: gnome-control-center-2.24.0.1/capplets/display/xrandr-capplet.c
-===================================================================
---- gnome-control-center-2.24.0.1.orig/capplets/display/xrandr-capplet.c 2009-04-16 10:36:37.412850259 +0200
-+++ gnome-control-center-2.24.0.1/capplets/display/xrandr-capplet.c 2009-04-16 10:37:37.653350312 +0200
-@@ -435,7 +435,7 @@ rebuild_rotation_combo (App *app)
-
- app->current_output->rotation = info->rotation;
-
-- if (gnome_rr_config_applicable (app->current_configuration, app->screen))
-+ if (gnome_rr_config_applicable (app->current_configuration, app->screen, NULL))
- {
- add_key (app->rotation_combo, info->name, 0, 0, 0, info->rotation);
-
-@@ -1689,7 +1689,7 @@ on_detect_displays (GtkWidget *widget, g
- {
- App *app = data;
-
-- gnome_rr_screen_refresh (app->screen);
-+ gnome_rr_screen_refresh (app->screen, NULL);
- }
-
- #define SHOW_ICON_KEY "/apps/gnome_settings_daemon/xrandr/show_notification_icon"
-@@ -1723,7 +1723,7 @@ run_application (App *app)
- }
-
- app->screen = gnome_rr_screen_new (gdk_screen_get_default (),
-- on_screen_changed, app);
-+ on_screen_changed, app, NULL);
- if (!app->screen)
- {
- g_error ("Could not get screen info");
+++ /dev/null
-diff -up gnome-control-center-2.24.0.1/libwindow-settings/metacity-window-manager.c.hv-max gnome-control-center-2.24.0.1/libwindow-settings/metacity-window-manager.c
---- gnome-control-center-2.24.0.1/libwindow-settings/metacity-window-manager.c.hv-max 2008-10-04 02:01:24.000000000 -0400
-+++ gnome-control-center-2.24.0.1/libwindow-settings/metacity-window-manager.c 2008-10-04 02:02:53.000000000 -0400
-@@ -214,10 +214,10 @@ metacity_change_settings (GnomeWindowMan
- action = "toggle_maximize";
- break;
- case DOUBLE_CLICK_MAXIMIZE_VERTICALLY:
-- action = "toggle_maximize_vert";
-+ action = "toggle_maximize_vertically";
- break;
- case DOUBLE_CLICK_MAXIMIZE_HORIZONTALLY:
-- action = "toggle_maximize_horiz";
-+ action = "toggle_maximize_horizontally";
- break;
- case DOUBLE_CLICK_MINIMIZE:
- action = "minimize";
-@@ -370,9 +370,11 @@ metacity_get_settings (GnomeWindowManage
- settings->double_click_action = DOUBLE_CLICK_SHADE;
- else if (strcmp (str, "toggle_maximize") == 0)
- settings->double_click_action = DOUBLE_CLICK_MAXIMIZE;
-- else if (strcmp (str, "toggle_maximize_horiz") == 0)
-+ else if (strcmp (str, "toggle_maximize_horizontally") == 0 ||
-+ strcmp (str, "toggle_maximize_horiz") == 0)
- settings->double_click_action = DOUBLE_CLICK_MAXIMIZE_HORIZONTALLY;
-- else if (strcmp (str, "toggle_maximize_vert") == 0)
-+ else if (strcmp (str, "toggle_maximize_vertically") == 0 ||
-+ strcmp (str, "toggle_maximize_vert") == 0)
- settings->double_click_action = DOUBLE_CLICK_MAXIMIZE_VERTICALLY;
- else if (strcmp (str, "minimize") == 0)
- settings->double_click_action = DOUBLE_CLICK_MINIMIZE;
+++ /dev/null
-Index: gnome-control-center-2.24.0.1/configure.in
-===================================================================
---- gnome-control-center-2.24.0.1.orig/configure.in 2009-04-16 10:31:56.309352617 +0200
-+++ gnome-control-center-2.24.0.1/configure.in 2009-04-16 10:32:14.016853698 +0200
-@@ -98,7 +98,7 @@ PKG_CHECK_MODULES(CAPPLET, $COMMON_MODUL
- PKG_CHECK_MODULES(GNOMECC, $COMMON_MODULES libgnome-menu >= 2.10.1 libpanelapplet-2.0)
- PKG_CHECK_MODULES(GNOME, libgnomeui-2.0)
- PKG_CHECK_MODULES(DBUS, dbus-1 dbus-glib-1)
--PKG_CHECK_MODULES(GNOME_DESKTOP, gnome-desktop-2.0)
-+PKG_CHECK_MODULES(GNOME_DESKTOP, gnome-desktop-2.0 libgnomeui-2.0)
- PKG_CHECK_MODULES(DEFAULT_APPLICATIONS_CAPPLET, libxml-2.0)
- PKG_CHECK_MODULES(METACITY, libmetacity-private >= 2.23.1)
- PKG_CHECK_MODULES(SLAB, libslab)
+++ /dev/null
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/gnome-control-center-2.24.0.1-r1.ebuild,v 1.3 2009/07/27 00:03:27 eva Exp $
-
-EAPI="1"
-
-inherit eutils gnome2
-
-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 ~x86-fbsd"
-IUSE="eds hal +sound"
-
-# FIXME: eel is still needed for libslab
-RDEPEND="x11-libs/libXft
- >=x11-libs/gtk+-2.11.6
- >=dev-libs/glib-2.17.4
- >=gnome-base/gconf-2.0
- >=gnome-base/libglade-2
- >=gnome-base/librsvg-2.0
- >=gnome-base/nautilus-2.6
- >=media-libs/fontconfig-1
- >=dev-libs/dbus-glib-0.73
- >=x11-libs/libxklavier-3.6
- >=x11-wm/metacity-2.23.1
- >=gnome-base/gnome-panel-2.0
- >=gnome-base/libgnomekbd-2.21.4.1
- >=gnome-base/gnome-desktop-2.26
- >=gnome-base/gnome-menus-2.11.1
- gnome-base/eel
- gnome-base/gnome-settings-daemon
-
- >=media-libs/gstreamer-0.10.1.2
- >=media-libs/gst-plugins-base-0.10.1.2
- >=media-plugins/gst-plugins-gconf-0.10
- media-plugins/gst-plugins-meta:0.10
-
- x11-libs/pango
- dev-libs/libxml2
- media-libs/freetype
-
- eds? ( >=gnome-extra/evolution-data-server-1.7.90 )
- hal? ( >=sys-apps/hal-0.5.6 )
- sound? (
- >=media-libs/libcanberra-0.4
- x11-themes/sound-theme-freedesktop )
-
- >=gnome-base/libbonobo-2
- >=gnome-base/libgnome-2.2
- >=gnome-base/libbonoboui-2
- >=gnome-base/libgnomeui-2.2
-
- x11-apps/xmodmap
- x11-libs/libXScrnSaver
- x11-libs/libXext
- x11-libs/libX11
- x11-libs/libXxf86misc
- x11-libs/libXrandr
- x11-libs/libXrender
- x11-libs/libXcursor"
-DEPEND="${RDEPEND}
- x11-proto/scrnsaverproto
- x11-proto/xextproto
- x11-proto/xproto
- x11-proto/xf86miscproto
- x11-proto/kbproto
- x11-proto/randrproto
- x11-proto/renderproto
-
- sys-devel/gettext
- >=dev-util/intltool-0.40
- >=dev-util/pkgconfig-0.19
- dev-util/desktop-file-utils
-
- app-text/scrollkeeper
- >=app-text/gnome-doc-utils-0.10.1"
-# Needed for autoreconf
-# gnome-base/gnome-common
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-pkg_setup() {
- if use sound && ! built_with_use media-libs/libcanberra gtk; then
- eerror "You need to rebuild media-libs/libcanberra with gtk support."
- die "Rebuild media-libs/libcanberra with USE='gtk'"
- fi
-
- G2CONF="${G2CONF}
- --disable-update-mimedb
- --enable-gstreamer=0.10
- $(use_enable eds aboutme)
- $(use_enable hal)
- $(use_with sound libcanberra)"
-}
-
-src_unpack() {
- gnome2_src_unpack
-
- # Fix compilation on fbsd, bug #256958
- epatch "${FILESDIR}/${P}-fbsd.patch"
-
- # Upstream patch for Hor and Vert Maximise, bug #263166
- epatch "${FILESDIR}/${P}-hv-max.patch"
-
- # Upstream patch for fixing capplet help buttons, bug #263168
- epatch "${FILESDIR}/${P}-capplet-help.patch"
-}
+++ /dev/null
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/gnome-control-center-2.24.0.1-r10.ebuild,v 1.1 2009/07/27 00:03:27 eva Exp $
-
-EAPI="2"
-
-inherit autotools eutils gnome2
-
-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 ~x86-fbsd"
-IUSE="eds hal +sound"
-
-# FIXME: eel is still needed for libslab
-RDEPEND="x11-libs/libXft
- >=x11-libs/gtk+-2.11.6
- >=dev-libs/glib-2.17.4
- >=gnome-base/gconf-2.0
- >=gnome-base/libglade-2
- >=gnome-base/librsvg-2.0
- >=gnome-base/nautilus-2.6
- >=media-libs/fontconfig-1
- >=dev-libs/dbus-glib-0.73
- >=x11-libs/libxklavier-3.6
- >=x11-wm/metacity-2.23.1
- >=gnome-base/gnome-panel-2.0
- >=gnome-base/libgnomekbd-2.21.4.1
- >=gnome-base/gnome-desktop-2.23.90
- >=gnome-base/gnome-menus-2.11.1
- gnome-base/eel
- gnome-base/gnome-settings-daemon
-
- >=media-libs/gstreamer-0.10.1.2
- >=media-libs/gst-plugins-base-0.10.1.2
- >=media-plugins/gst-plugins-gconf-0.10
- media-plugins/gst-plugins-meta:0.10
-
- x11-libs/pango
- dev-libs/libxml2
- media-libs/freetype
-
- eds? ( >=gnome-extra/evolution-data-server-1.7.90 )
- hal? ( >=sys-apps/hal-0.5.6 )
- sound? (
- >=media-libs/libcanberra-0.4[gtk]
- x11-themes/sound-theme-freedesktop )
-
- >=gnome-base/libbonobo-2
- >=gnome-base/libgnome-2.2
- >=gnome-base/libbonoboui-2
- >=gnome-base/libgnomeui-2.2
-
- x11-apps/xmodmap
- x11-libs/libXScrnSaver
- x11-libs/libXext
- x11-libs/libX11
- x11-libs/libXxf86misc
- x11-libs/libXrandr
- x11-libs/libXrender
- x11-libs/libXcursor"
-DEPEND="${RDEPEND}
- x11-proto/scrnsaverproto
- x11-proto/xextproto
- x11-proto/xproto
- x11-proto/xf86miscproto
- x11-proto/kbproto
- x11-proto/randrproto
- x11-proto/renderproto
-
- sys-devel/gettext
- >=dev-util/intltool-0.40
- >=dev-util/pkgconfig-0.19
- dev-util/desktop-file-utils
-
- app-text/scrollkeeper
- gnome-base/gnome-common
- >=app-text/gnome-doc-utils-0.10.1"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-pkg_setup() {
- G2CONF="${G2CONF}
- --disable-update-mimedb
- --enable-gstreamer=0.10
- $(use_enable eds aboutme)
- $(use_enable hal)
- $(use_with sound libcanberra)"
-}
-
-src_prepare() {
- gnome2_src_prepare
-
- # Fix compilation on fbsd, bug #256958
- epatch "${FILESDIR}/${P}-fbsd.patch"
-
- # Upstream patch for Hor and Vert Maximise, bug #263166
- epatch "${FILESDIR}/${P}-hv-max.patch"
-
- # Upstream patch for fixing capplet help buttons, bug #263168
- epatch "${FILESDIR}/${P}-capplet-help.patch"
-
- # Add missing libgnomeui check, bug #269383
- epatch "${FILESDIR}/${P}-libgnomeui.patch"
-
- # Add fixes for gnome-desktop-2.26 API changes, bug #269383
- epatch "${FILESDIR}/${P}-gnome-desktop-api.patch"
-
- # Fix build with libxklavier-4
- epatch "${FILESDIR}/${PN}-2.26.0-libxklavier4.patch"
-
- intltoolize --force --copy --automake || die "intltoolize failed"
- eautoreconf
-}
+++ /dev/null
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/gnome-control-center-2.24.0.1.ebuild,v 1.15 2009/04/28 11:18:35 armin76 Exp $
-
-EAPI="1"
-
-inherit eutils gnome2
-
-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 ~x86-fbsd"
-IUSE="eds hal +sound"
-
-# FIXME: eel is still needed for libslab
-RDEPEND="x11-libs/libXft
- >=x11-libs/gtk+-2.11.6
- >=dev-libs/glib-2.17.4
- >=gnome-base/gconf-2.0
- >=gnome-base/libglade-2
- >=gnome-base/librsvg-2.0
- >=gnome-base/nautilus-2.6
- >=media-libs/fontconfig-1
- >=dev-libs/dbus-glib-0.73
- >=x11-libs/libxklavier-3.6
- >=x11-wm/metacity-2.23.1
- >=gnome-base/gnome-panel-2.0
- >=gnome-base/libgnomekbd-2.21.4.1
- >=gnome-base/gnome-desktop-2.23.90
- >=gnome-base/gnome-menus-2.11.1
- gnome-base/eel
- gnome-base/gnome-settings-daemon
-
- >=media-libs/gstreamer-0.10.1.2
- >=media-libs/gst-plugins-base-0.10.1.2
- >=media-plugins/gst-plugins-gconf-0.10
- media-plugins/gst-plugins-meta:0.10
-
- x11-libs/pango
- dev-libs/libxml2
- media-libs/freetype
-
- eds? ( >=gnome-extra/evolution-data-server-1.7.90 )
- hal? ( >=sys-apps/hal-0.5.6 )
- sound? (
- >=media-libs/libcanberra-0.4
- x11-themes/sound-theme-freedesktop )
-
- >=gnome-base/libbonobo-2
- >=gnome-base/libgnome-2.2
- >=gnome-base/libbonoboui-2
- >=gnome-base/libgnomeui-2.2
-
- x11-apps/xmodmap
- x11-libs/libXScrnSaver
- x11-libs/libXext
- x11-libs/libX11
- x11-libs/libXxf86misc
- x11-libs/libXrandr
- x11-libs/libXrender
- x11-libs/libXcursor"
-DEPEND="${RDEPEND}
- x11-proto/scrnsaverproto
- x11-proto/xextproto
- x11-proto/xproto
- x11-proto/xf86miscproto
- x11-proto/kbproto
- x11-proto/randrproto
- x11-proto/renderproto
-
- sys-devel/gettext
- >=dev-util/intltool-0.40
- >=dev-util/pkgconfig-0.19
- dev-util/desktop-file-utils
-
- app-text/scrollkeeper
- >=app-text/gnome-doc-utils-0.10.1"
-# Needed for autoreconf
-# gnome-base/gnome-common
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-pkg_setup() {
- if use sound && ! built_with_use media-libs/libcanberra gtk; then
- eerror "You need to rebuild media-libs/libcanberra with gtk support."
- die "Rebuild media-libs/libcanberra with USE='gtk'"
- fi
-
- G2CONF="${G2CONF}
- --disable-update-mimedb
- --enable-gstreamer=0.10
- $(use_enable eds aboutme)
- $(use_enable hal)
- $(use_with sound libcanberra)"
-}
-
-src_unpack() {
- gnome2_src_unpack
-
- # Fix compilation on fbsd, bug #256958
- epatch "${FILESDIR}/${P}-fbsd.patch"
-}