commit: a31bb849caf844d3521e8d29c579e65a4ddb420f Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> AuthorDate: Sun Apr 20 15:20:28 2014 +0000 Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> CommitDate: Sun Apr 20 15:48:28 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=a31bb849
gnome-base/gnome-control-center: QAed * Cosmetic changes for dependencies. * Lower gnome-bluetooth dependency per configure, not sure why it was 3.11.3. * Drop old patch revision. * Fix keywords. * Sync live ebuild. --- .../gnome-control-center-3.10.2-optional.patch | 384 --------------------- .../gnome-control-center-3.12.0.ebuild | 11 +- .../gnome-control-center-9999.ebuild | 17 +- 3 files changed, 14 insertions(+), 398 deletions(-) diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.10.2-optional.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.10.2-optional.patch deleted file mode 100644 index 0c4d111..0000000 --- a/gnome-base/gnome-control-center/files/gnome-control-center-3.10.2-optional.patch +++ /dev/null @@ -1,384 +0,0 @@ -From 079e6b87816d96d73adaa5eeb2f8a1b620a0ae70 Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev <[email protected]> -Date: Mon, 9 Dec 2013 23:23:13 +0100 -Subject: [PATCH 1/2] Make bluetooth/colord/goa/kerberos/wacom optional - -Upstream is not interested in any part of this patch: - -https://bugzilla.gnome.org/show_bug.cgi?id=686840 -https://bugzilla.gnome.org/show_bug.cgi?id=697478 -https://bugzilla.gnome.org/show_bug.cgi?id=700145 - -Dropped mm from this revision of the patch since it appears more -complicated than ever to split it from the network panel. - -Signed-Off: Gilles Dartiguelongue <[email protected]> ---- - configure.ac | 140 ++++++++++++++++++++++++++------ - panels/Makefile.am | 10 ++- - panels/user-accounts/um-realm-manager.c | 9 ++ - shell/Makefile.am | 10 ++- - shell/cc-panel-loader.c | 8 ++ - 5 files changed, 149 insertions(+), 28 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 19bebaf..8b4177a 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -136,14 +136,58 @@ PKG_CHECK_MODULES(MOUSE_PANEL, $COMMON_MODULES xi >= 1.2 - gnome-settings-daemon >= $GSD_REQUIRED_VERSION x11) - PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES gmodule-2.0) - PKG_CHECK_MODULES(NOTIFICATIONS_PANEL, $COMMON_MODULES libgnome-menu-3.0) --PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0 goa-backend-1.0 >= $GOA_REQUIRED_VERSION) -+ -+build_online_accounts=false -+AC_ARG_ENABLE(goa, -+ AC_HELP_STRING([--disable-goa], -+ [disable online accounts management panel]), -+ [case "${enableval}" in -+ yes) WANT_ONLINE_ACCOUNTS=yes ;; -+ no) WANT_ONLINE_ACCOUNTS=no ;; -+ *) AC_MSG_ERROR(bad value ${enableval} for --disable-goa) ;; -+ esac], -+ [WANT_ONLINE_ACCOUNTS=yes]) dnl Default value -+ -+if test x$WANT_ONLINE_ACCOUNTS = xyes; then -+ PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0 goa-backend-1.0 >= $GOA_REQUIRED_VERSION) -+ build_online_accounts=true -+fi -+if test "x$build_online_accounts" = xtrue ; then -+ AC_DEFINE(BUILD_ONLINE_ACCOUNTS, 1, [Define to 1 to build the Online Accounts panel]) -+fi -+AM_CONDITIONAL(BUILD_ONLINE_ACCOUNTS, test "x$build_online_accounts" = "xtrue") -+AC_SUBST(ONLINE_ACCOUNTS_PANEL_CFLAGS) -+AC_SUBST(ONLINE_ACCOUNTS_PANEL_LIBS) -+ - PKG_CHECK_MODULES(POWER_PANEL, $COMMON_MODULES upower-glib >= 0.9.1 - gnome-settings-daemon >= $GSD_REQUIRED_VERSION) --PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES -- colord >= $COLORD_REQUIRED_VERSION -- colord-gtk >= $COLORD_GTK_REQUIRED_VERSION -- libsoup-2.4 -- gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION) -+ -+build_color=false -+AC_ARG_ENABLE(color, -+ AC_HELP_STRING([--disable-color], -+ [disable color management panel]), -+ [case "${enableval}" in -+ yes) WANT_COLOR=yes ;; -+ no) WANT_COLOR=no ;; -+ *) AC_MSG_ERROR(bad value ${enableval} for --disable-color) ;; -+ esac], -+ [WANT_COLOR=yes]) dnl Default value -+ -+if test x$WANT_COLOR = xyes; then -+ PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES -+ colord >= $COLORD_REQUIRED_VERSION -+ colord-gtk >= $COLORD_GTK_REQUIRED_VERSION -+ libsoup-2.4 -+ gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION) -+ build_color=true -+fi -+if test "x$build_color" = xtrue ; then -+ AC_DEFINE(BUILD_COLOR, 1, [Define to 1 to build the Color panel]) -+fi -+AM_CONDITIONAL(BUILD_COLOR, test "x$build_color" = "xtrue") -+AC_SUBST(COLOR_PANEL_CFLAGS) -+AC_SUBST(COLOR_PANEL_LIBS) -+ - PKG_CHECK_MODULES(PRINTERS_PANEL, $COMMON_MODULES - polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION) - PKG_CHECK_MODULES(PRIVACY_PANEL, $COMMON_MODULES) -@@ -196,8 +240,24 @@ if test x${have_networkmanager} = xyes; then - fi - - # Check for gnome-bluetooth --PKG_CHECK_MODULES(BLUETOOTH, $COMMON_MODULES gnome-bluetooth-1.0 >= 3.9.3, -- [have_bluetooth=yes], have_bluetooth=no) -+have_bluetooth=no -+AC_ARG_ENABLE(bluetooth, -+ AC_HELP_STRING([--disable-bluetooth], -+ [disable bluetooth management panel]), -+ [case "${enableval}" in -+ yes) WANT_BLUETOOTH=yes ;; -+ no) WANT_BLUETOOTH=no ;; -+ *) AC_MSG_ERROR(bad value ${enableval} for --disable-bluetooth) ;; -+ esac], -+ [WANT_BLUETOOTH=yes]) dnl Default value -+ -+if test x$WANT_BLUETOOTH = xyes; then -+ # Check for gnome-bluetooth -+ PKG_CHECK_MODULES(BLUETOOTH, $COMMON_MODULES gnome-bluetooth-1.0 >= 3.9.3, -+ [have_bluetooth=yes], have_bluetooth=no) -+ have_bluetooth=yes -+fi -+ - if test "x$have_bluetooth" = xyes ; then - AC_DEFINE(BUILD_BLUETOOTH, 1, [Define to 1 to build the Bluetooth panel]) - fi -@@ -282,15 +342,26 @@ case $host_os in - if test "$host_cpu" = s390 -o "$host_cpu" = s390x; then - have_wacom=no - else -- PKG_CHECK_MODULES(WACOM_PANEL, $COMMON_MODULES -- gnome-settings-daemon >= $GSD_REQUIRED_VERSION -- xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION -- gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION -- clutter-gtk-1.0 -- clutter-1.0 >= $CLUTTER_REQUIRED_VERSION, [have_wacom=yes], [have_wacom=no]) -- if test x${have_wacom} = xyes; then -+ AC_ARG_ENABLE(wacom, -+ AC_HELP_STRING([--disable-wacom], -+ [disable wacom management panel]), -+ [case "${enableval}" in -+ yes) WANT_WACOM=yes ;; -+ no) WANT_WACOM=no ;; -+ *) AC_MSG_ERROR(bad value ${enableval} for --disable-wacom) ;; -+ esac], -+ [WANT_WACOM=yes]) dnl Default value -+ -+ if test x$WANT_WACOM = xyes; then -+ PKG_CHECK_MODULES(WACOM_PANEL, $COMMON_MODULES -+ gnome-settings-daemon >= $GSD_REQUIRED_VERSION -+ xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION -+ gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION -+ clutter-gtk-1.0 -+ clutter-1.0 >= $CLUTTER_REQUIRED_VERSION) - AC_DEFINE(BUILD_WACOM, 1, [Define to 1 to build the Wacom panel]) - AC_DEFINE(HAVE_WACOM, 1, [Define to 1 is Wacom is supportted]) -+ have_wacom=yes - fi - fi - ;; -@@ -301,16 +372,22 @@ esac - AM_CONDITIONAL(BUILD_WACOM, [test x${have_wacom} = xyes]) - - # Kerberos kerberos support --AC_PATH_PROG(KRB5_CONFIG, krb5-config, no) --if test "$KRB5_CONFIG" = "no"; then -- AC_MSG_ERROR([krb5-config executable not found in your path - should be installed with the kerberos libraries]) --fi -- --AC_MSG_CHECKING(for krb5 libraries and flags) --KRB5_CFLAGS="`$KRB5_CONFIG --cflags`" --KRB5_LIBS="`$KRB5_CONFIG --libs`" --AC_MSG_RESULT($KRB5_CFLAGS $KRB5_LIBS) -+AC_ARG_ENABLE([kerberos], -+ AS_HELP_STRING([--disable-kerberos], [disable kerberos support (default: enabled)]),, -+ [enable_kerberos=yes]) -+ -+if test x"$enable_kerberos" != x"no" ; then -+ AC_PATH_PROG(KRB5_CONFIG, krb5-config, no) -+ if test "$KRB5_CONFIG" = "no"; then -+ AC_MSG_ERROR([krb5-config executable not found in your path - should be installed with the kerberos libraries]) -+ fi - -+ AC_MSG_CHECKING(for krb5 libraries and flags) -+ KRB5_CFLAGS="`$KRB5_CONFIG --cflags`" -+ KRB5_LIBS="`$KRB5_CONFIG --libs`" -+ AC_MSG_RESULT($KRB5_CFLAGS $KRB5_LIBS) -+ AC_DEFINE(HAVE_KERBEROS, 1, [defined if krb5 is available]) -+fi - AC_SUBST(KRB5_CFLAGS) - AC_SUBST(KRB5_LIBS) - -@@ -547,6 +624,11 @@ if test "x$have_bluetooth" = "xyes"; then - else - AC_MSG_NOTICE([ Bluetooth panel disabled]) - fi -+if test "x$build_color" = "xtrue"; then -+ AC_MSG_NOTICE([** colord (Color panel)]) -+else -+ AC_MSG_NOTICE([ Color panel disabled]) -+fi - if test "x$enable_cups" = "xyes"; then - AC_MSG_NOTICE([** CUPS (Printers panel)]) - else -@@ -557,11 +639,21 @@ if test "x$have_cheese" = "xyes"; then - else - AC_MSG_NOTICE([ Users panel webcam support disabled]) - fi -+if test "x$build_online_accounts" = "xtrue"; then -+ AC_MSG_NOTICE([** gnome-online-accounts (Online Accounts panel)]) -+else -+ AC_MSG_NOTICE([ Online Accounts panel disabled]) -+fi - if test "x$with_libsocialweb" = "xyes"; then - AC_MSG_NOTICE([** libsocialweb (Background panel Flickr support)]) - else - AC_MSG_NOTICE([ Background panel Flickr support disabled]) - fi -+if test "x$build_wacom" = "xtrue"; then -+ AC_MSG_NOTICE([** libwacom (Wacom Graphics Tablet panel)]) -+else -+ AC_MSG_NOTICE([ Wacom Graphics Tablet panel disabled]) -+fi - if test "x$have_wacom" = "xyes"; then - AC_MSG_NOTICE([** wacom (Wacom tablet panel)]) - else -diff --git a/panels/Makefile.am b/panels/Makefile.am -index 9961c25..0c54622 100644 ---- a/panels/Makefile.am -+++ b/panels/Makefile.am -@@ -2,11 +2,9 @@ SUBDIRS= \ - common \ - background \ - power \ -- color \ - display \ - mouse \ - notifications \ -- online-accounts \ - region \ - info \ - sound \ -@@ -18,6 +16,10 @@ SUBDIRS= \ - privacy \ - sharing - -+if BUILD_COLOR -+SUBDIRS += color -+endif -+ - if BUILD_WACOM - SUBDIRS += wacom - endif -@@ -34,4 +36,8 @@ if BUILD_BLUETOOTH - SUBDIRS += bluetooth - endif - -+if BUILD_ONLINE_ACCOUNTS -+SUBDIRS += online-accounts -+endif -+ - -include $(top_srcdir)/git.mk -diff --git a/panels/user-accounts/um-realm-manager.c b/panels/user-accounts/um-realm-manager.c -index 1fd41ad..ce0988e 100644 ---- a/panels/user-accounts/um-realm-manager.c -+++ b/panels/user-accounts/um-realm-manager.c -@@ -23,7 +23,9 @@ - - #include "um-realm-manager.h" - -+#ifdef HAVE_KERBEROS - #include <krb5/krb5.h> -+#endif - - #include <glib.h> - #include <glib/gi18n.h> -@@ -697,6 +699,7 @@ login_closure_free (gpointer data) - g_slice_free (LoginClosure, login); - } - -+#ifdef HAVE_KERBEROS - static krb5_error_code - login_perform_kinit (krb5_context k5, - const gchar *realm, -@@ -760,12 +763,14 @@ login_perform_kinit (krb5_context k5, - - return code; - } -+#endif /* HAVE_KERBEROS */ - - static void - kinit_thread_func (GSimpleAsyncResult *async, - GObject *object, - GCancellable *cancellable) - { -+#ifdef HAVE_KERBEROS - LoginClosure *login = g_simple_async_result_get_op_res_gpointer (async); - krb5_context k5 = NULL; - krb5_error_code code; -@@ -843,6 +848,10 @@ kinit_thread_func (GSimpleAsyncResult *async, - - if (k5) - krb5_free_context (k5); -+#else /* HAVE_KERBEROS */ -+ g_simple_async_result_set_error (async, UM_REALM_ERROR, UM_REALM_ERROR_GENERIC, -+ _("gnome-control-center was built without kerberos support")); -+#endif - } - - void -diff --git a/shell/Makefile.am b/shell/Makefile.am -index ad7a68f..cc968ac 100644 ---- a/shell/Makefile.am -+++ b/shell/Makefile.am -@@ -52,14 +52,12 @@ gnome_control_center_LDADD = \ - $(top_builddir)/libgd/libgd.la \ - $(top_builddir)/panels/common/liblanguage.la \ - $(top_builddir)/panels/background/libbackground.la \ -- $(top_builddir)/panels/color/libcolor.la \ - $(top_builddir)/panels/datetime/libdate_time.la \ - $(top_builddir)/panels/display/libdisplay.la \ - $(top_builddir)/panels/info/libinfo.la \ - $(top_builddir)/panels/keyboard/libkeyboard.la \ - $(top_builddir)/panels/mouse/libmouse-properties.la \ - $(top_builddir)/panels/notifications/libnotifications.la \ -- $(top_builddir)/panels/online-accounts/libonline-accounts.la \ - $(top_builddir)/panels/power/libpower.la \ - $(top_builddir)/panels/privacy/libprivacy.la \ - $(top_builddir)/panels/region/libregion.la \ -@@ -85,6 +83,14 @@ if BUILD_BLUETOOTH - gnome_control_center_LDADD += $(top_builddir)/panels/bluetooth/libbluetooth.la - endif - -+if BUILD_COLOR -+gnome_control_center_LDADD += $(top_builddir)/panels/color/libcolor.la -+endif -+ -+if BUILD_ONLINE_ACCOUNTS -+gnome_control_center_LDADD += $(top_builddir)/panels/online-accounts/libonline-accounts.la -+endif -+ - AM_CPPFLAGS = -DGNOMELOCALEDIR="\"$(datadir)/locale\"" - - # Dbus service file -diff --git a/shell/cc-panel-loader.c b/shell/cc-panel-loader.c -index 26576dc..8a92f95 100644 ---- a/shell/cc-panel-loader.c -+++ b/shell/cc-panel-loader.c -@@ -33,7 +33,9 @@ extern GType cc_background_panel_get_type (void); - #ifdef BUILD_BLUETOOTH - extern GType cc_bluetooth_panel_get_type (void); - #endif /* BUILD_BLUETOOTH */ -+#ifdef BUILD_COLOR - extern GType cc_color_panel_get_type (void); -+#endif /* BUILD_COLOR */ - extern GType cc_date_time_panel_get_type (void); - extern GType cc_display_panel_get_type (void); - extern GType cc_info_panel_get_type (void); -@@ -43,7 +45,9 @@ extern GType cc_mouse_panel_get_type (void); - extern GType cc_network_panel_get_type (void); - #endif /* BUILD_NETWORK */ - extern GType cc_notifications_panel_get_type (void); -+#ifdef BUILD_ONLINE_ACCOUNTS - extern GType cc_goa_panel_get_type (void); -+#endif /* BUILD_ONLINE_ACCOUNTS */ - extern GType cc_power_panel_get_type (void); - #ifdef BUILD_PRINTERS - extern GType cc_printers_panel_get_type (void); -@@ -77,7 +81,9 @@ static struct { - #ifdef BUILD_BLUETOOTH - PANEL_TYPE("bluetooth", cc_bluetooth_panel_get_type ), - #endif -+#ifdef BUILD_COLOR - PANEL_TYPE("color", cc_color_panel_get_type ), -+#endif - PANEL_TYPE("datetime", cc_date_time_panel_get_type ), - PANEL_TYPE("display", cc_display_panel_get_type ), - PANEL_TYPE("info", cc_info_panel_get_type ), -@@ -87,7 +93,9 @@ static struct { - PANEL_TYPE("network", cc_network_panel_get_type ), - #endif - PANEL_TYPE("notifications", cc_notifications_panel_get_type), -+#ifdef BUILD_ONLINE_ACCOUNTS - PANEL_TYPE("online-accounts", cc_goa_panel_get_type ), -+#endif - PANEL_TYPE("power", cc_power_panel_get_type ), - #ifdef BUILD_PRINTERS - PANEL_TYPE("printers", cc_printers_panel_get_type ), --- -1.8.3.2 - diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.12.0.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.12.0.ebuild index 26f5b1e..db37e7b 100644 --- a/gnome-base/gnome-control-center/gnome-control-center-3.12.0.ebuild +++ b/gnome-base/gnome-control-center/gnome-control-center-3.12.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 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-3.10.3.ebuild,v 1.3 2014/03/09 11:58:09 pacho Exp $ +# $Header: $ EAPI="5" GCONF_DEBUG="yes" @@ -14,7 +14,7 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-control-center/"; LICENSE="GPL-2+" SLOT="2" IUSE="+bluetooth +colord +cups +gnome-online-accounts +i18n input_devices_wacom kerberos v4l" -KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris" # False positives caused by nested configure scripts QA_CONFIGURE_OPTIONS=".*" @@ -41,13 +41,14 @@ COMMON_DEPEND=" gnome-base/gnome-menus:3 gnome-base/libgtop:2 media-libs/fontconfig + >=media-libs/grilo-0.2.6:0.2 >=media-libs/libcanberra-0.13[gtk3] >=media-sound/pulseaudio-2[glib] >=sys-auth/polkit-0.97 - >=sys-power/upower-0.99.0 + >=sys-power/upower-0.99 >=x11-libs/libnotify-0.7.3:0= - >=media-libs/grilo-0.2.6:0.2 + >=gnome-extra/nm-applet-0.9.7.995 >=net-misc/networkmanager-0.9.8[modemmanager] >=net-misc/modemmanager-0.7.990 @@ -58,7 +59,7 @@ COMMON_DEPEND=" x11-libs/libXxf86misc >=x11-libs/libXi-1.2 - bluetooth? ( >=net-wireless/gnome-bluetooth-3.11.3:= ) + bluetooth? ( >=net-wireless/gnome-bluetooth-3.11.1:= ) colord? ( net-libs/libsoup:2.4 >=x11-misc/colord-0.1.34 ) diff --git a/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild b/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild index 13d6d21..524dd38 100644 --- a/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild +++ b/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild @@ -16,7 +16,7 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-control-center/"; LICENSE="GPL-2+" SLOT="2" -IUSE="+bluetooth +colord +cups +gnome-online-accounts +i18n input_devices_wacom kerberos +socialweb v4l" +IUSE="+bluetooth +colord +cups +gnome-online-accounts +i18n input_devices_wacom kerberos v4l" if [[ ${PV} = 9999 ]]; then KEYWORDS="" else @@ -38,11 +38,11 @@ QA_CONFIGURE_OPTIONS=".*" # networkmanager is not optional COMMON_DEPEND=" - >=dev-libs/glib-2.37.2:2 + >=dev-libs/glib-2.39.91:2 >=x11-libs/gdk-pixbuf-2.23.0:2 - >=x11-libs/gtk+-3.9.12:3 + >=x11-libs/gtk+-3.11.1:3 >=gnome-base/gsettings-desktop-schemas-3.9.91 - >=gnome-base/gnome-desktop-3.9.90:3= + >=gnome-base/gnome-desktop-3.11.3:3= >=gnome-base/gnome-settings-daemon-3.8.3[colord?,policykit] >=gnome-base/libgnomekbd-2.91.91 @@ -51,11 +51,12 @@ COMMON_DEPEND=" gnome-base/gnome-menus:3 gnome-base/libgtop:2 media-libs/fontconfig + >=media-libs/grilo-0.2.6:0.2 >=media-libs/libcanberra-0.13[gtk3] >=media-sound/pulseaudio-2[glib] >=sys-auth/polkit-0.97 - >=sys-power/upower-0.9.1 + >=sys-power/upower-0.99 >=x11-libs/libnotify-0.7.3:0= >=gnome-extra/nm-applet-0.9.7.995 @@ -68,7 +69,7 @@ COMMON_DEPEND=" x11-libs/libXxf86misc >=x11-libs/libXi-1.2 - bluetooth? ( >=net-wireless/gnome-bluetooth-3.9.3:= ) + bluetooth? ( >=net-wireless/gnome-bluetooth-3.11.1:= ) colord? ( net-libs/libsoup:2.4 >=x11-misc/colord-0.1.34 ) @@ -78,7 +79,6 @@ COMMON_DEPEND=" gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.9.90 ) i18n? ( >=app-i18n/ibus-1.5.2 ) kerberos? ( app-crypt/mit-krb5 ) - socialweb? ( net-libs/libsocialweb ) v4l? ( media-libs/gstreamer:1.0 media-libs/clutter-gtk:1.0 @@ -137,7 +137,7 @@ src_prepare() { # Make some panels and dependencies optional; requires eautoreconf # https://bugzilla.gnome.org/686840, 697478, 700145 - epatch "${FILESDIR}"/${PN}-3.10.2-optional.patch + epatch "${FILESDIR}"/${PN}-3.12.0-optional.patch # Fix some absolute paths to be appropriate for Gentoo epatch "${FILESDIR}"/${PN}-3.10.2-gentoo-paths.patch @@ -176,7 +176,6 @@ src_configure() { $(use_enable gnome-online-accounts goa) \ $(use_enable i18n ibus) \ $(use_enable kerberos) \ - $(use_with socialweb libsocialweb) \ $(use_with v4l cheese) \ $(use_enable input_devices_wacom wacom) }
