Fix NM version checking, bug #536224 by poncho

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

6 files changed, 461 insertions, 6 deletions

diff --git a/gnome-base/gnome-control-center/ChangeLog b/gnome-base/gnome-control-center/ChangeLog
index ba28cf666170..6775e316893f 100644
--- a/gnome-base/gnome-control-center/ChangeLog
+++ b/gnome-base/gnome-control-center/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for gnome-base/gnome-control-center
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/ChangeLog,v 1.159 2014/12/22 21:35:02 eva Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/ChangeLog,v 1.160 2015/01/12 17:07:48 pacho Exp $
+
+*gnome-control-center-3.14.2-r1 (12 Jan 2015)
+*gnome-control-center-3.12.1-r2 (12 Jan 2015)
+
+  12 Jan 2015; Pacho Ramos <pacho@gentoo.org>
+  +files/gnome-control-center-3.12.1-networkmanager-version.patch,
+  +files/gnome-control-center-3.14.2-networkmanager-version.patch,
+  +gnome-control-center-3.12.1-r2.ebuild,
+  +gnome-control-center-3.14.2-r1.ebuild:
+  Fix NM version checking, bug #536224 by poncho
 
 *gnome-control-center-3.14.2 (22 Dec 2014)
 
diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest
index 0faf35879cd7..efb62a27964b 100644
--- a/gnome-base/gnome-control-center/Manifest
+++ b/gnome-base/gnome-control-center/Manifest
@@ -2,18 +2,22 @@
 Hash: SHA256
 
 AUX gnome-control-center-3.10.2-gentoo-paths.patch 4304 SHA256 63a8fd44d0585c141e3207b697266850215ee3e0254621c4aa15ae17469dd385 SHA512 5340686d2e0de699d495d30e6969f5c4fcc5ce735e43d659da326c9445821c6de142b8ab98c858cf7c33c6c2acbbc91aab8d145d32bc2a4a17caef99a09f8623 WHIRLPOOL ff8aac218544b8ea0caa2cd7210129ca5277275a8c7db3846e4ca8e8c5eed6d8ca1e0a9de415d52ab51bf624247bd248442cc18a79fb8ba0f0ec032cef81663d
+AUX gnome-control-center-3.12.1-networkmanager-version.patch 1567 SHA256 17f2d7c5b6db879e7426e5a2c30ba1eeb5b3b61512bdd1c2948bb661901942e5 SHA512 65d0c13b85bf8f5931133cdec02a3024a1b0134b2c4ecca8b71eb85a52f1b12a1a451978650129b7226800008d82bea355c8d59e615266f7e4464416b8ca5f91 WHIRLPOOL be64c2b41dadc7df48536b84d842c60bff7ef077d074d4f07cd4318a791cf03260e8a5d991d15aac2a0bbd8f326351720b93e05f48b526a545090030de45cf80
 AUX gnome-control-center-3.12.1-optional-r1.patch 19513 SHA256 f28ff1f142031f3a02abb91d4cfae5037f02caec4d11899ac50de35d1631a2c5 SHA512 949c808a34c6df8e66efba945af9561391fab52c32d2b3928361cdffd50f030c8c61f811f7fb1e601127bb38bb788f6a751cf78cd6f3757b255fd89722c3d15b WHIRLPOOL 72b91611ada4ebabf118d9af73511da186f470054533867ea78cc3cade2a4d40240b668ccd94ebecb5ce8098f0d48de13cdcb6dde3842be2eba57ae8a5b742fe
 AUX gnome-control-center-3.14.0-optional.patch 19466 SHA256 154aff2082e4c9009e4bda1a54fa479430cfde08c91e446b64517cfe7a2b28d9 SHA512 e59082f637573a339aeb931423e55e971118c3b1ed05474d315c86843d0766f0339e33c4461e6b2e6e8bd167de6dc0705cf37aa44ea886fed3fa9d174678ff17 WHIRLPOOL 92603d135e486694c6a4b4af735e6498c14259c5b1e5add1b0a944f4809a2da2d8aa0edece113e683aa52e276ca9951c585c285d1033d9730a7eb8b87020d689
+AUX gnome-control-center-3.14.2-networkmanager-version.patch 2255 SHA256 fd54ec2c32eba9318d111c13ddb3d4f74985586af65182471917556599b58eb3 SHA512 88ec790e9d129f5b6006c2cb0b4b36a99b9609e408c6d8669f2a7421cbc24e249fa77bb82550f327aae13d4e5bba6ae57a70f5465a41e6c25452084a604edf7a WHIRLPOOL 65f8e63cc6adcca6269821e4326be66a7b035f12dc563704957b1472827ba1c61e19e5ffa055307758737122f2b4616d92ee55041f08f627700056e1711003c2
 DIST gnome-control-center-3.12.1.tar.xz 6866544 SHA256 5297d448eff0ec58f6c0ad9fbd1b94bed0a850496df0ee65571c0622b49c1582 SHA512 35b765fc11182b0f7eec6bc31934f51ccbf01dde9f2e7deed6c84ca9811bd0a00783d75bd3fab7004fe41cc29740b6d6e0a7f3c6391a482eefcab0129d0278fe WHIRLPOOL 294a2f81a1b225814fd895dc7b579f0dec9c360983d3d683b4ff5bd47dd9ac91a84088485f872a7ef95e05f021469da9eaf5d987bd537a062f9a1525c03c4b47
 DIST gnome-control-center-3.14.2.tar.xz 6938572 SHA256 b15e188b3d45c86d71f4d8cb297829cf190be81f22ce76dc74c7b4232bd0652a SHA512 c5bcdcae87f32cf4b0f9d99709dfe7fcb48e5086945d1685ce94c3996022ff5bf4c82994bbec28e0cf91c9c85309638225536e1dcca06b96cdbaf1ff38f2ae6b WHIRLPOOL 3188ff540a8a01a6479c529f4fe629d2b695b185f762291691a6aefd0f815af382afca2ed8c4ff56e4e5161b3cabe751d507625e4638856034982d2e408000a5
 EBUILD gnome-control-center-3.12.1-r1.ebuild 5021 SHA256 382d52bbc8294eaac4bc9d2daf878c0720007a18b3712ff5be12b5ad90316bfd SHA512 c601e47473fd60af2da56529ee1b883e055ee398a4d08a9cc028671e00e0ceb5316cb17a486385f1e242efb8bf5e5623f487ff42c8b9119d30cc50687d4f40b3 WHIRLPOOL fa6236ecd93946911b6e3ecdcc1c0a42ac919bf058afca79beb557142c5f6317f9fdd470de486770960a74adf9c2318676577a4c99ff86bd5676b7077f52d196
+EBUILD gnome-control-center-3.12.1-r2.ebuild 5147 SHA256 6e2aeee17151737b861ba8553f7e215357d1517918c22d79847e05e44948ca91 SHA512 9fc5d85d7046405d7724a7fa34ad33b055a49b53b5283f3b80350fd9064995ca291a33eeb9e46ec88d2002a9ade6f1ab324b98a145ea6fa0573ea089cd84bdd7 WHIRLPOOL b95d2bcd8d086f16c8c87d82db75e674b0a2b37c039eef4f6806cf9002426974ca575903128e483048325f4bad447288341911c9c42d4e4e1e8d0378ea91dd13
+EBUILD gnome-control-center-3.14.2-r1.ebuild 5133 SHA256 d096f00d7e36c03c429deb9df4038ed94c1ad78c9dca007b03dc410c2184a49d SHA512 dc167a7d83061828c89f0c8e2fe7702c25965b858c85f4a5e0eb503065214de2240dac915827c90fcad0ffeac26ce9a422b90ed23f45a4fc88276c864479b280 WHIRLPOOL 4f7d0735deceed0ed4e55973c0aad6deb3808626d035f4fac4728ecf93edf10bce69c554d90d1fa71d430b14b58c634493848e4d5af49eb59d1b1f3df66f3265
 EBUILD gnome-control-center-3.14.2.ebuild 5004 SHA256 6dc5d4894eef7bf8abee2396fd243a7dd9c1ce55f7dceabdd5dbf5b249b7d879 SHA512 6497014c7c9c1e04ca62bb2296ea8faf30e11c4fedf6932f55067ff956c3333f6fd4cda76499ea848a2f556d28985a2edbedb52a7f968a5b7889ea64e38a2d6b WHIRLPOOL 38e12952cfa3887d7e912b8587b3fa1ee5f6cff08e887ae49e8b9fc2fa5b016007da21b32ef8ea4921089a789826ce5045684c576723f9457681caff8e78bec2
-MISC ChangeLog 70440 SHA256 4c66ef4d196b57f2c2e19382f5de4084a489f24d98c801f61fe4e77a09433faa SHA512 9051f814cb5d7e6416f2390defc277dc9d87071b407b187642137c6ed0b7369746806993ba3c491a57907e3e2a00c47ef1028446fb752f36175e8ebf52c40de0 WHIRLPOOL bf53e77ce954a9cbb47212e010ac40248b2bf465cbe5f68614d4b0f4830c5a3be608ce3d0e6c86e55e51e6e23dc0d84594ba0a15f2cd049e6d7eb1560936d2d8
+MISC ChangeLog 70849 SHA256 99b751d3c96cb3e9b2dd815edfcc0595184b71fe7b69ae7f70e1f4c18f6a4c9c SHA512 a56c08e71fc9006ff902f342bc92333c1ef5e54a4159767eef1a3193fa0de3631bdb3b0cc2b4bbd4fa10e8ea186f3cb9bd777efae72e957fb0a6568c4ecf7377 WHIRLPOOL 25f1183efad56fdb4a0ad08755647c08b897346760165709889404b9963c6c9a7b83c284b6fe1ae8304ed6fad92a92a9dfefe60a4b18ad2699c7acf7b8e912a0
 MISC metadata.xml 498 SHA256 fb46c54dc3e3ce2c8297d67292cd0ecadbdadf8c22a50437f8a03fd5b6ec9dc2 SHA512 ae1ff3489b7d037af4d1a550538e0cadfa815f6afcaa76b73afb3fa7d87d888c1ae5b3642416e9eb0cf0c2ba4f70a5ed1f5a9ccbb1d63320fc444ac3c3aed2d3 WHIRLPOOL 94896b01f55c9a411cf85eda67cdebba03f2e32a723094f9f839e04c5096d09b63b4ac0895b7ddb70bc0ba3ef2ea4aeb6eba650e926fbaef155554a768fad970
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlSYjocACgkQ1fmVwcYIWAZTtACglYuz+3MSXjwjLtHdxrIkWMb9
-42sAnRII79QJjJAdIlz2doW9m+dQGiuH
-=FM5E
+iEYEAREIAAYFAlSz/2UACgkQCaWpQKGI+9SXXgCcDnNWtvj2lzB9GKfVY4NA+3wI
+4JQAnifR/7m309NNkQy5oADXttRl34n/
+=BMxw
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.12.1-networkmanager-version.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.12.1-networkmanager-version.patch
new file mode 100644
index 000000000000..79abc8a5824a
--- /dev/null
+++ b/gnome-base/gnome-control-center/files/gnome-control-center-3.12.1-networkmanager-version.patch
@@ -0,0 +1,46 @@
+--- panels/network/cc-network-panel.c~	2014-04-14 11:23:25.000000000 +0200
++++ panels/network/cc-network-panel.c	2015-01-12 17:51:44.855061255 +0100
+@@ -1294,30 +1294,18 @@
+ panel_check_network_manager_version (CcNetworkPanel *panel)
+ {
+         const gchar *version;
+-        gchar **split = NULL;
+-        guint major = 0;
+-        guint micro = 0;
+-        guint minor = 0;
+         gboolean ret = TRUE;
+ 
+         /* parse running version */
+         version = nm_client_get_version (panel->priv->client);
+-        if (version != NULL) {
+-                split = g_strsplit (version, ".", -1);
+-                major = atoi (split[0]);
+-                minor = atoi (split[1]);
+-                micro = atoi (split[2]);
+-        }
+ 
+-        /* is it too new or old */
+-        if (major > 0 || major > 9 || (minor <= 8 && micro < 992)) {
++        if (version == NULL) {
+                 ret = FALSE;
+ 
+                 /* do modal dialog in idle so we don't block startup */
+                 panel->priv->nm_warning_idle = g_idle_add ((GSourceFunc)display_version_warning_idle, panel);
+         }
+ 
+-        g_strfreev (split);
+         return ret;
+ }
+ 
+@@ -1364,8 +1352,9 @@
+ {
+         gboolean ret;
+ 
+-        /* is the user compiling against a new version, but running an
+-         * old daemon version? */
++        /* is the user compiling against a new version, but not running
++         * the daemon? */
++
+         ret = panel_check_network_manager_version (panel);
+         if (ret) {
+                 manager_running (panel->priv->client, NULL, panel);
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.14.2-networkmanager-version.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.14.2-networkmanager-version.patch
new file mode 100644
index 000000000000..40f09d89bf06
--- /dev/null
+++ b/gnome-base/gnome-control-center/files/gnome-control-center-3.14.2-networkmanager-version.patch
@@ -0,0 +1,63 @@
+From fa8d6a13747ed3e586e139b79b63280bd951d10b Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Thu, 18 Dec 2014 08:04:00 +0100
+Subject: [PATCH] network: Also work with NM 1.0
+
+Remove the NetworkManager version checking altogether. The code was made
+to check for now very old versions of NetworkManager, and anything newer
+than ancient should degrade gracefully if we support newer features.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=741661
+---
+ panels/network/cc-network-panel.c | 19 +++----------------
+ 1 file changed, 3 insertions(+), 16 deletions(-)
+
+diff --git a/panels/network/cc-network-panel.c b/panels/network/cc-network-panel.c
+index 90b265e..28f6158 100644
+--- a/panels/network/cc-network-panel.c
++++ b/panels/network/cc-network-panel.c
+@@ -1321,30 +1321,17 @@ static gboolean
+ panel_check_network_manager_version (CcNetworkPanel *panel)
+ {
+         const gchar *version;
+-        gchar **split = NULL;
+-        guint major = 0;
+-        guint micro = 0;
+-        guint minor = 0;
+         gboolean ret = TRUE;
+ 
+         /* parse running version */
+         version = nm_client_get_version (panel->priv->client);
+-        if (version != NULL) {
+-                split = g_strsplit (version, ".", -1);
+-                major = atoi (split[0]);
+-                minor = atoi (split[1]);
+-                micro = atoi (split[2]);
+-        }
+-
+-        /* is it too new or old */
+-        if (major > 0 || minor > 9 || (minor <= 8 && micro < 992)) {
++        if (version == NULL) {
+                 ret = FALSE;
+ 
+                 /* do modal dialog in idle so we don't block startup */
+                 panel->priv->nm_warning_idle = g_idle_add ((GSourceFunc)display_version_warning_idle, panel);
+         }
+ 
+-        g_strfreev (split);
+         return ret;
+ }
+ 
+@@ -1391,8 +1378,8 @@ on_toplevel_map (GtkWidget      *widget,
+ {
+         gboolean ret;
+ 
+-        /* is the user compiling against a new version, but running an
+-         * old daemon version? */
++        /* is the user compiling against a new version, but not running
++         * the daemon? */
+         ret = panel_check_network_manager_version (panel);
+         if (ret) {
+                 manager_running (panel->priv->client, NULL, panel);
+-- 
+2.1.0
\ No newline at end of file
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.12.1-r2.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.12.1-r2.ebuild
new file mode 100644
index 000000000000..d74cfa6b751d
--- /dev/null
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.12.1-r2.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2015 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.12.1-r2.ebuild,v 1.1 2015/01/12 17:07:48 pacho Exp $
+
+EAPI="5"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes" # gmodule is used, which uses dlopen
+
+inherit autotools bash-completion-r1 eutils gnome2
+
+DESCRIPTION="GNOME's main interface to configure various aspects of the desktop"
+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"
+
+# False positives caused by nested configure scripts
+QA_CONFIGURE_OPTIONS=".*"
+
+# gnome-session-2.91.6-r1 is needed so that 10-user-dirs-update is run at login
+# g-s-d[policykit] needed for bug #403527
+#
+# kerberos unfortunately means mit-krb5; build fails with heimdal
+
+# FIXME: modemmanager is not optional
+#        networkmanager is not optional
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.39.91:2
+	>=x11-libs/gdk-pixbuf-2.23.0:2
+	>=x11-libs/gtk+-3.11.1:3
+	>=gnome-base/gsettings-desktop-schemas-3.9.91
+	>=gnome-base/gnome-desktop-3.11.3:3=
+	>=gnome-base/gnome-settings-daemon-3.8.3[colord?,policykit]
+
+	>=dev-libs/libpwquality-1.2.2
+	dev-libs/libxml2:2
+	gnome-base/gnome-menus:3
+	gnome-base/libgtop:2=
+	media-libs/fontconfig
+
+	>=media-libs/libcanberra-0.13[gtk3]
+	>=media-sound/pulseaudio-2[glib]
+	>=sys-auth/polkit-0.97
+	>=sys-power/upower-0.99:=
+	>=x11-libs/libnotify-0.7.3:0=
+
+	>=gnome-extra/nm-applet-0.9.7.995
+	>=net-misc/networkmanager-0.9.8[modemmanager]
+	>=net-misc/modemmanager-0.7.990
+
+	virtual/opengl
+	x11-apps/xmodmap
+	x11-libs/libX11
+	x11-libs/libXxf86misc
+	>=x11-libs/libXi-1.2
+
+	bluetooth? ( >=net-wireless/gnome-bluetooth-3.11.1:= )
+	colord? (
+		net-libs/libsoup:2.4
+		>=x11-misc/colord-0.1.34:0=
+		>=x11-libs/colord-gtk-0.1.24 )
+	cups? (
+		>=net-print/cups-1.4[dbus]
+		|| ( >=net-fs/samba-3.6.14-r1[smbclient] >=net-fs/samba-4.0.0[client] ) )
+	gnome-online-accounts? (
+		>=media-libs/grilo-0.2.6:0.2
+		>=net-libs/gnome-online-accounts-3.9.90 )
+	i18n? ( >=app-i18n/ibus-1.5.2 )
+	kerberos? ( app-crypt/mit-krb5 )
+	v4l? (
+		media-libs/gstreamer:1.0
+		media-libs/clutter-gtk:1.0
+		>=media-video/cheese-3.5.91 )
+	input_devices_wacom? (
+		>=dev-libs/libwacom-0.7
+		>=media-libs/clutter-1.11.3:1.0
+		media-libs/clutter-gtk:1.0
+		>=x11-libs/libXi-1.2 )
+"
+# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
+# libgnomekbd needed only for gkbd-keyboard-display tool
+RDEPEND="${COMMON_DEPEND}
+	|| ( ( app-admin/openrc-settingsd sys-auth/consolekit ) >=sys-apps/systemd-31 )
+	>=sys-apps/accountsservice-0.6.30
+	x11-themes/gnome-icon-theme-symbolic
+	colord? ( >=gnome-extra/gnome-color-manager-3 )
+	cups? (
+		>=app-admin/system-config-printer-gnome-1.3.5
+		net-print/cups-pk-helper )
+	input_devices_wacom? ( gnome-base/gnome-settings-daemon[input_devices_wacom] )
+	i18n? ( >=gnome-base/libgnomekbd-3 )
+
+	!<gnome-base/gdm-2.91.94
+	!<gnome-extra/gnome-color-manager-3.1.2
+	!gnome-extra/gnome-media[pulseaudio]
+	!<gnome-extra/gnome-media-2.32.0-r300
+	!<net-wireless/gnome-bluetooth-3.3.2
+"
+# PDEPEND to avoid circular dependency
+PDEPEND=">=gnome-base/gnome-session-2.91.6-r1"
+
+DEPEND="${COMMON_DEPEND}
+	x11-proto/xproto
+	x11-proto/xf86miscproto
+	x11-proto/kbproto
+
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	>=dev-util/intltool-0.40.1
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+
+	cups? ( sys-apps/sed )
+
+	gnome-base/gnome-common
+"
+# Needed for autoreconf
+#	gnome-base/gnome-common
+
+src_prepare() {
+	# Gentoo handles completions in a different directory, bugs #465094 and #477390
+	sed -i "s|^completiondir =.*|completiondir = $(get_bashcompdir)|" \
+		shell/Makefile.am || die "sed completiondir failed"
+
+	# Make some panels and dependencies optional; requires eautoreconf
+	# https://bugzilla.gnome.org/686840, 697478, 700145
+	epatch "${FILESDIR}"/${PN}-3.12.1-optional-r1.patch
+
+	# Fix some absolute paths to be appropriate for Gentoo
+	epatch "${FILESDIR}"/${PN}-3.10.2-gentoo-paths.patch
+
+	# Fix NM version checking, bug #536224 (from 3.14 branch)
+	epatch "${FILESDIR}"/${PN}-3.12.1-networkmanager-version.patch
+
+	epatch_user
+
+	eautoreconf
+
+	# panels/datetime/Makefile.am gets touched by "gentoo-paths" patch.
+	# We need to touch timedated{c,h} to prevent them from being
+	# regenerated (bug #415901)
+	# Upstream think they should be removed, preventing compilation errors too
+	# (https://bugzilla.gnome.org/704822)
+	[[ -f panels/datetime/timedated.h ]] && rm -f panels/datetime/timedated.h
+	[[ -f panels/datetime/timedated.c ]] && rm -f panels/datetime/timedated.c
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-update-mimedb \
+		--disable-static \
+		--enable-documentation \
+		$(use_enable bluetooth) \
+		$(use_enable colord color) \
+		$(use_enable cups) \
+		$(use_enable gnome-online-accounts goa) \
+		$(use_enable i18n ibus) \
+		$(use_enable kerberos) \
+		$(use_with v4l cheese) \
+		$(use_enable input_devices_wacom wacom)
+}
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.14.2-r1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.14.2-r1.ebuild
new file mode 100644
index 000000000000..58aecff1c5a1
--- /dev/null
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.14.2-r1.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2015 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.14.2-r1.ebuild,v 1.1 2015/01/12 17:07:48 pacho Exp $
+
+EAPI="5"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes" # gmodule is used, which uses dlopen
+
+inherit autotools bash-completion-r1 eutils gnome2
+
+DESCRIPTION="GNOME's main interface to configure various aspects of the desktop"
+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"
+
+# False positives caused by nested configure scripts
+QA_CONFIGURE_OPTIONS=".*"
+
+# gnome-session-2.91.6-r1 is needed so that 10-user-dirs-update is run at login
+# g-s-d[policykit] needed for bug #403527
+#
+# kerberos unfortunately means mit-krb5; build fails with heimdal
+
+# FIXME: modemmanager is not optional
+#        networkmanager is not optional
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.39.91:2
+	>=x11-libs/gdk-pixbuf-2.23.0:2
+	>=x11-libs/gtk+-3.13:3
+	>=gnome-base/gsettings-desktop-schemas-3.13.91
+	>=gnome-base/gnome-desktop-3.11.3:3=
+	>=gnome-base/gnome-settings-daemon-3.8.3[colord?,policykit]
+
+	>=dev-libs/libpwquality-1.2.2
+	dev-libs/libxml2:2
+	gnome-base/libgtop:2=
+	media-libs/fontconfig
+
+	>=media-libs/libcanberra-0.13[gtk3]
+	>=media-sound/pulseaudio-2[glib]
+	>=sys-auth/polkit-0.97
+	>=sys-power/upower-0.99:=
+	>=x11-libs/libnotify-0.7.3:0=
+
+	>=gnome-extra/nm-applet-0.9.7.995
+	>=net-misc/networkmanager-0.9.8[modemmanager]
+	>=net-misc/modemmanager-0.7.990
+
+	virtual/opengl
+	x11-apps/xmodmap
+	x11-libs/cairo
+	x11-libs/libX11
+	x11-libs/libXxf86misc
+	>=x11-libs/libXi-1.2
+
+	bluetooth? ( >=net-wireless/gnome-bluetooth-3.11.1:= )
+	colord? (
+		net-libs/libsoup:2.4
+		>=x11-misc/colord-0.1.34:0=
+		>=x11-libs/colord-gtk-0.1.24 )
+	cups? (
+		>=net-print/cups-1.4[dbus]
+		|| ( >=net-fs/samba-3.6.14-r1[smbclient] >=net-fs/samba-4.0.0[client] ) )
+	gnome-online-accounts? (
+		>=media-libs/grilo-0.2.6:0.2
+		>=net-libs/gnome-online-accounts-3.9.90 )
+	i18n? ( >=app-i18n/ibus-1.5.2 )
+	kerberos? ( app-crypt/mit-krb5 )
+	v4l? (
+		media-libs/gstreamer:1.0
+		media-libs/clutter-gtk:1.0
+		>=media-video/cheese-3.5.91 )
+	input_devices_wacom? (
+		>=dev-libs/libwacom-0.7
+		>=media-libs/clutter-1.11.3:1.0
+		media-libs/clutter-gtk:1.0
+		>=x11-libs/libXi-1.2 )
+"
+# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
+# libgnomekbd needed only for gkbd-keyboard-display tool
+RDEPEND="${COMMON_DEPEND}
+	|| ( ( app-admin/openrc-settingsd sys-auth/consolekit ) >=sys-apps/systemd-31 )
+	>=sys-apps/accountsservice-0.6.30
+	x11-themes/gnome-icon-theme-symbolic
+	colord? ( >=gnome-extra/gnome-color-manager-3 )
+	cups? (
+		>=app-admin/system-config-printer-gnome-1.3.5
+		net-print/cups-pk-helper )
+	input_devices_wacom? ( gnome-base/gnome-settings-daemon[input_devices_wacom] )
+	i18n? ( >=gnome-base/libgnomekbd-3 )
+
+	!<gnome-base/gdm-2.91.94
+	!<gnome-extra/gnome-color-manager-3.1.2
+	!gnome-extra/gnome-media[pulseaudio]
+	!<gnome-extra/gnome-media-2.32.0-r300
+	!<net-wireless/gnome-bluetooth-3.3.2
+"
+# PDEPEND to avoid circular dependency
+PDEPEND=">=gnome-base/gnome-session-2.91.6-r1"
+
+DEPEND="${COMMON_DEPEND}
+	x11-proto/xproto
+	x11-proto/xf86miscproto
+	x11-proto/kbproto
+
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	>=dev-util/intltool-0.40.1
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+
+	cups? ( sys-apps/sed )
+
+	gnome-base/gnome-common
+"
+# Needed for autoreconf
+#	gnome-base/gnome-common
+
+src_prepare() {
+	# Gentoo handles completions in a different directory, bugs #465094 and #477390
+	sed -i "s|^completiondir =.*|completiondir = $(get_bashcompdir)|" \
+		shell/Makefile.am || die "sed completiondir failed"
+
+	# Make some panels and dependencies optional; requires eautoreconf
+	# https://bugzilla.gnome.org/686840, 697478, 700145
+	epatch "${FILESDIR}"/${PN}-3.14.0-optional.patch
+
+	# Fix some absolute paths to be appropriate for Gentoo
+	epatch "${FILESDIR}"/${PN}-3.10.2-gentoo-paths.patch
+
+	# Fix NM version checking, bug #536224 (from 3.14 branch)
+	epatch "${FILESDIR}"/${PN}-3.14.2-networkmanager-version.patch
+
+	epatch_user
+
+	eautoreconf
+
+	# panels/datetime/Makefile.am gets touched by "gentoo-paths" patch.
+	# We need to touch timedated{c,h} to prevent them from being
+	# regenerated (bug #415901)
+	# Upstream think they should be removed, preventing compilation errors too
+	# (https://bugzilla.gnome.org/704822)
+	[[ -f panels/datetime/timedated.h ]] && rm -f panels/datetime/timedated.h
+	[[ -f panels/datetime/timedated.c ]] && rm -f panels/datetime/timedated.c
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-update-mimedb \
+		--disable-static \
+		--enable-documentation \
+		$(use_enable bluetooth) \
+		$(use_enable colord color) \
+		$(use_enable cups) \
+		$(use_enable gnome-online-accounts goa) \
+		$(use_enable i18n ibus) \
+		$(use_enable kerberos) \
+		$(use_with v4l cheese) \
+		$(use_enable input_devices_wacom wacom)
+}