Version bump, fixes lots of bugs. Drop old.

Package-Manager: portage-2.2.4/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

4 files changed, 26 insertions, 186 deletions

diff --git a/gnome-base/gnome-control-center/ChangeLog b/gnome-base/gnome-control-center/ChangeLog
index d27ebf4aa4cc..b38123aa2650 100644
--- a/gnome-base/gnome-control-center/ChangeLog
+++ b/gnome-base/gnome-control-center/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-base/gnome-control-center
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/ChangeLog,v 1.133 2013/07/28 18:44:53 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/ChangeLog,v 1.134 2013/09/15 02:42:26 tetromino Exp $
+
+*gnome-control-center-3.8.5 (15 Sep 2013)
+
+  15 Sep 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -gnome-control-center-3.8.3.ebuild, -gnome-control-center-3.8.4.1.ebuild,
+  +gnome-control-center-3.8.5.ebuild:
+  Version bump, fixes lots of bugs. Drop old.
 
 *gnome-control-center-3.8.4.1-r1 (28 Jul 2013)
 
diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest
index dfe9ad4b322c..8bc3b9cecbe8 100644
--- a/gnome-base/gnome-control-center/Manifest
+++ b/gnome-base/gnome-control-center/Manifest
@@ -19,23 +19,22 @@ AUX gnome-control-center-3.8.1.5-optional-modemmanager.patch 1082 SHA256 21bf87d
 AUX gnome-control-center-3.8.4-optional-kerberos.patch 3161 SHA256 006b656afe65f0b2bf6fd2780ae4f876ff6c1cd4f846a5ca52cd6e7df7193c06 SHA512 665122f0dd30e911c3c1b1e2fd11239563d5a8467aae43e9a913c66087bdf44a4a8c0a39045022df4d6ecd062a7dc23f57e7ae1f61cfb8234ce47c5124a383b0 WHIRLPOOL 603dfb6708f9afef61527ddd8b4590af3c42c025cc29a21cf3203a72a003d57e4ac58fb6dda5acb5f1f1dee97763c38179db07246c7c902c11c69444094dc109
 DIST gnome-control-center-2.32.1.tar.bz2 2280217 SHA256 7c568b57358e5c08f4d8dd76dbac7df2539135ad081872b60514b7a8ac797e66 SHA512 dc84bd222d1a2db0c4d10c56739e1d9da18945c579ae184f69080aa4b6fa0f0b908c5beafe82a82b6277630d685bed98fe8418421db4275653afbe302d810872 WHIRLPOOL 9b0fe4ed2bb741496642a57e178ca43049d53c71d9a82d311dc5a3ab6dfaf28019a8fa1b41a218b2ede11b4d0ac735034604dd9d952cb215e12327e71d0e69f4
 DIST gnome-control-center-3.6.3.tar.xz 4877812 SHA256 2ae23972bc64f62b4facd12dd5adce212bda02491eb6e56bbf195332157d21fb SHA512 77cd68349dc7f58714fbd121a34ec73a5c3e67c7a42a08c20a8dfdcfc9cefdec47af0f09130b7e3f0407cb7a786234b2619fdb76462c3bdb2bbc548294bfd444 WHIRLPOOL bf4ba1b6c9cb17f6b5f22003ee89af051ad152dd5671ffe01ba5cc0339d51659a8af7c629755726d305caf75c1fe4629b268fc269862751bc24317d323395697
-DIST gnome-control-center-3.8.3.tar.xz 6899396 SHA256 e78a5b01692ccfe825e079d795d9e9610fcb94853c0e6d747b2d8d36dead9d84 SHA512 5b4738535e759607b305f6b962917155f949f64c2f18c80cf6cf13b4a18275dba703afca48f5abba46c326fe32248520080f1b838c958bc0a0df011fe07a379f WHIRLPOOL 006bac04738c4617d4f3d761707a97a16e21b95b84c15bef7543688dfd5b737d4c3e78b9f4d58f0a3fe1fe78ab337596f895a36324635655bee27ae402f2e6d4
 DIST gnome-control-center-3.8.4.1.tar.xz 6707796 SHA256 3cfc5b93ca12f498c075f5b5356e0af4a0aaee003c0a90a4309bc12876f40c55 SHA512 8bb9544c07c89593d6e438fb10072326d2f16ecd0ccc62838c61e62f05f70cf99f69e063fff7e0a13dc2c82b14adebf7868ae2e746a56024bc3be659092ec95d WHIRLPOOL 68d2cdbf1406522d248db0a4c5ab1d2d60e8ca78b0a006eb2fceea072c22a44faa20df9b807251646aeb29d5a3b1ca545555c268e8880cff119c924e9dafb69a
+DIST gnome-control-center-3.8.5.tar.xz 6925968 SHA256 efb9fb47aaa9a308aed3064efc39356db05d71ddb0374561eeccc57c122212e2 SHA512 5023a859756fe94334632ee2cf6206fbaed5c612d30ba230da52e7d62d95b94002f03adf0b39af18b5489428d559cc9ec6baf95698b894f275a5eaa86ff670b5 WHIRLPOOL 9ae8d2971ea793533bd3a2875f39b33b123a83c25ced2a241e8a7cdc4dd9f34f4547472e60bdffbdad34e09ca7867441a2a2fcd841b2ebbbcf45734a36607944
 EBUILD gnome-control-center-2.32.1-r1.ebuild 2686 SHA256 575724aa369631c48fef3810bc831abc687fe38e30df4f25e7af600fc998e270 SHA512 2b792066b1c09eb4433a87222732c9dc4e3df593699454da57e9d4f3939f0c593429c8b2b3e712d2508700fc03b8e8e1066efa65348bc2016dee0d21c4089a92 WHIRLPOOL 8b7f2d6b9a66581efb5b31b8573d67acbce8d450ca303eab36641ef429e8fa6e88aa299c525cd223155ad67299926c56a0dfd432b8414672284424642117d92a
 EBUILD gnome-control-center-3.6.3-r1.ebuild 4559 SHA256 d532e2601572d312f367ee885aedf2f9b057b2ea1151bbf4bb2051f5633bb892 SHA512 db7dd4fdc00654669da0c0213714eb9a966f4a5ac1d98b5455eb1470fdb31c5d31ace30793c2e32f9fecf42adc58aac6e2d2e581e9f73e6eb3d9e6618447d2dd WHIRLPOOL c5bf7f6bcc5ee2eda5bc351975ed9143f9b31a14af3f250cdfc8d82189485eeea5db5f236b29be74ea59914151500d4a3841854146a8f163b58f45228ffd5db8
-EBUILD gnome-control-center-3.8.3.ebuild 5168 SHA256 2046667a597cba2992b055da53f774f12a93d1cb3b514da8c76cf5f5751caad3 SHA512 5dd831d4d0ca4b05af7b48906d17485c568dcc83d9ceedd16bb70e9c04f0964f1dae0ad183252a1d1b6de407f9bde5cb64de5ada2a954fba16c5719f7d6862ad WHIRLPOOL 4bb01901659374242304da13b08337391fa573cba0e809a0e71afb4743656e42f00c61665dd7266b661902535ff25600fe8e1c4401400b3a20e43a47d0f0bdb7
 EBUILD gnome-control-center-3.8.4.1-r1.ebuild 5456 SHA256 b7f90f7c6e35eddf7443b750349aba2b9542ebbda7dfef2731c293971e74a796 SHA512 3a96f0c873d0be5ed000299bc4e120ed856bbdd2df3f9cdae449529a499f9dc3c0218f5b1f6ce9a9fefc4469757d87c1d6bff7383c213a3d65c5dad44a57eeae WHIRLPOOL 2a65133ce93a9f79ec24cc54d23b600f35f9efeca17a9fac4f1052593f08d321200241ccc6613ad49d199da91f779c528cd33cdd210c32ddf24f83ea026d16b2
-EBUILD gnome-control-center-3.8.4.1.ebuild 5473 SHA256 d8fd864e11e6697d5419369f62c0e88e4dd300cab63f7e3b4bae17154d611a74 SHA512 b47c62f98c70fd76a0224b09d20a361085c62b46f674352d0ae1a3f43a4c7c52ec2dc0dd4f1bd3549b87bbf45291a588554bdb08103798806653babd4ac04442 WHIRLPOOL 104be46543710c5b83d76546b152b6746af0316018098ae12d33de7248ed75853b2e7fe8828202715f65c042a57386c383b8f219687a0782230ad4c51d33a197
-MISC ChangeLog 64490 SHA256 b0f50c388ba4ac6f742a182ce4d3b19bd3ac9bb299b76f75407d39b87698cbd3 SHA512 9b738719b378c729d94f7310767beae573b455a4c00bb298d61ab647a99ca8675504557227cb4d7a524692e198671e2f6610b1103e317510ab0e4a76d3bcfed9 WHIRLPOOL 0eca5eb4baef0f22274f2796613f133fa5e86427e57c7b5a31534442bf4737be8d8a80be1a54ab4af65f023fba0c30b249f46868814a0c8478c87de070ff10cc
+EBUILD gnome-control-center-3.8.5.ebuild 5347 SHA256 8907c83cce82759d6e6263e48aa3ec89337b5b31b784a03185e225fac3abc224 SHA512 3f1634000dd27f6c28a2aa62055e565314493e93d5e6be18851d4b083f3df4c11980abdca1b06da07e8dbf6c1f05a2ba58266277403aa2879c9bde8b572fea0c WHIRLPOOL 95d272ae584c26e85b7a64cb1669cfea7abcad410bf1d4340ca50f9d8ac148b6db31e3bfdee45564d511db8b3215b5510530a3ff46e1fddfeecc81f06f48a2c3
+MISC ChangeLog 64753 SHA256 6c65d539c625f8a8e4d67708b30ce59b1df5b1cd1ffa6c1dd11fabe06b115336 SHA512 ebe8bf96c375042b247d338c2354ba43e71c581cf990995583ac892819cc5dc6a7b19a55a3ace2381e63fac8882f902e11b36de57def4ce333b38d364ec001b5 WHIRLPOOL 9b0f3ce3828d9c0c761656d8c7d80799f7828c64b6afb92e40a7c5ff09babb3abe7116e54eb0d3d0fe21512fa4a189464e48b5d43304f3840eaff7bb4d37bec3
 MISC metadata.xml 747 SHA256 1780f48a525b476ec5d3472ceab620769f7498980b57d2f5b55787832ac3912e SHA512 2c90dc956fd5a5462432fe1ac537851bf848b1d109fa190dea47ed58b0f44422895e5f4ea6bbafbd31d2121c5ad9c7870b3ef4e20eb7396a905f68a10ae0d0f3 WHIRLPOOL 80276e19b1d4d24263d8dbfc1e0425365115fd94d34977f146309aea893163936cf0d3f7d1fbe68ba3caa4209e4dacf95d4d8ee266a5dfe30e16a3fd2c7a6e9b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.21 (GNU/Linux)
 
-iQEcBAEBCAAGBQJR9WamAAoJEJ0WA1zPCt1hSgEH/RpvA8RJE23bos0xjm5SsB9H
-EOUquFqG5S200YLIOuzx9pMvGwg0AEn2evfYbMXkiqENNvHm7s0z/+FWJM6RAMhm
-TzSUr4dr2OwioUptpUOBP29yz4fu3CVS6DQ54AhpLdqlWsVgQFZIAdv8Tpk3PohM
-soVYRb10nqoIJCfx49nXoWnkwS+d4or5JZjlEXv9rovyGjN4EaeiMgBEoOAy2Oj4
-jvHpT6uiuyFavNw7tdGXXQ1rBZDU8JLJssOuwDjgAl0dLaRy62OMrBDbLTiFSEte
-Nhk7YegwWp9GJwUxZFPhL4pq1OH8SIGszdRrsXNUzXUOe+bEHJsl99Zo0OmNYRo=
-=Abln
+iQEcBAEBCAAGBQJSNR6UAAoJEJ0WA1zPCt1htA4H/1DLXl0Rb8Kb+WOv5iXkGpyS
+J5uAud8MyPJcvDlSuliSEaceXh7BTB4tZNxR3K17kYqlvLEXdHGcP5ggrE4dtXmG
+/p9e9YxalDjH4LGZ4Y+XzC4YkbZj3bpnOih5y5pHE91yV/ej4VbWn2wtLhpQYSme
+Bf3OEh76YZSnNxEv7pRbxGQb1yMsz8v3ZkN5nolJWn/NKj6M/XfLD75QPo5tWrSa
+DKQYEruk5l+xovuNeK+4+J69Bqm/heWA8iLjJb2kAk8CD5Iy5spyc7RbNHplG+kN
+Dym4gZeDuvIxo1/DvSg5mWNE4mtIneXJYEY1waIvC3XTuGxvZanBf1rI8ooCSQI=
+=oREy
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.8.3.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.8.3.ebuild
deleted file mode 100644
index 533ef26c0a5b..000000000000
--- a/gnome-base/gnome-control-center/gnome-control-center-3.8.3.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2013 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.8.3.ebuild,v 1.2 2013/07/26 07:01:05 eva Exp $
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes" # gmodule is used, which uses dlopen
-
-inherit autotools 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 modemmanager +socialweb 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
-#
-# gnome-shell/gnome-control-center/mutter/gnome-settings-daemon better to be in sync for 3.8.3
-# https://mail.gnome.org/archives/gnome-announce-list/2013-June/msg00005.html
-COMMON_DEPEND="
-	>=dev-libs/glib-2.35.1:2
-	>=x11-libs/gdk-pixbuf-2.23.0:2
-	>=x11-libs/gtk+-3.7.10:3
-	>=gnome-base/gsettings-desktop-schemas-3.7.2.2
-	>=gnome-base/gnome-desktop-3.7.5:3=
-	>=gnome-base/gnome-settings-daemon-3.8.3[colord?,policykit]
-	>=gnome-base/libgnomekbd-2.91.91
-
-	dev-libs/libpwquality
-	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.9.1
-	>=x11-libs/libnotify-0.7.3:0=
-
-	>=gnome-extra/nm-applet-0.9.7.995
-	>=net-misc/networkmanager-0.9.8[modemmanager?]
-
-	virtual/opengl
-	x11-apps/xmodmap
-	x11-libs/libX11
-	x11-libs/libXxf86misc
-	>=x11-libs/libXi-1.2
-
-	bluetooth? ( >=net-wireless/gnome-bluetooth-3.5.5:= )
-	colord? ( >=x11-misc/colord-0.1.29 )
-	cups? (
-		>=net-print/cups-1.4[dbus]
-		>=net-fs/samba-3.6.14-r1[smbclient] )
-	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8.1 )
-	i18n? ( >=app-i18n/ibus-1.4.99 )
-	kerberos? ( virtual/krb5 )
-	modemmanager? ( >=net-misc/modemmanager-0.7.990 )
-	socialweb? ( net-libs/libsocialweb )
-	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
-		>=x11-libs/libXi-1.2 )
-"
-# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
-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
-		>=x11-misc/colord-0.1.29
-		>=x11-libs/colord-gtk-0.1.24 )
-	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] )
-
-	!<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, bug #465094
-	sed -i 's|^completiondir =.*|completiondir = $(datadir)/bash-completion|' \
-		shell/Makefile.am || die "sed completiondir failed"
-
-	# Make some panels optional; requires eautoreconf
-	# https://bugzilla.gnome.org/697478
-	epatch "${FILESDIR}/${PN}-3.8.0-optional-r1.patch"
-
-	# https://bugzilla.gnome.org/686840
-	epatch "${FILESDIR}/${PN}-3.7.4-optional-kerberos.patch"
-
-	# Fix some absolute paths to be appropriate for Gentoo
-	epatch "${FILESDIR}/${PN}-3.8.0-paths-makefiles.patch"
-	epatch "${FILESDIR}/${PN}-3.8.0-paths.patch"
-
-	# Make modemmanager optional, bug 463852, upstream bug #700145
-	epatch "${FILESDIR}/${PN}-3.8.1.5-optional-modemmanager.patch"
-
-	eautoreconf
-	gnome2_src_prepare
-
-	# panels/datetime/Makefile.am gets touched as a result of something in our
-	# src_prepare(). We need to touch timedated{c,h} to prevent them from being
-	# regenerated (bug #415901)
-	[[ -f panels/datetime/timedated.h ]] && touch panels/datetime/timedated.h
-	[[ -f panels/datetime/timedated.c ]] && touch panels/datetime/timedated.c
-}
-
-src_configure() {
-	# FIXME: add $(use_with kerberos) support?
-	! use kerberos && G2CONF+=" KRB5_CONFIG=$(type -P true)"
-
-	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 modemmanager) \
-		$(use_with socialweb libsocialweb) \
-		$(use_with v4l cheese) \
-		$(use_enable input_devices_wacom wacom)
-}
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.8.4.1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.8.5.ebuild
index a8e4a482d799..7a3235c02362 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-3.8.4.1.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.8.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.8.4.1.ebuild,v 1.3 2013/07/26 20:20:41 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/gnome-control-center-3.8.5.ebuild,v 1.1 2013/09/15 02:42:26 tetromino Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
@@ -14,8 +14,7 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-control-center/"
 LICENSE="GPL-2+"
 SLOT="2"
 
-# kerberos optional patch is broken, bug #475526
-IUSE="+bluetooth +colord +cups +gnome-online-accounts +i18n input_devices_wacom modemmanager +socialweb v4l" #kerberos
+IUSE="+bluetooth +colord +cups +gnome-online-accounts +i18n input_devices_wacom kerberos modemmanager +socialweb 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
@@ -26,6 +25,8 @@ QA_CONFIGURE_OPTIONS=".*"
 #
 # gnome-shell/gnome-control-center/mutter/gnome-settings-daemon better to be in sync for 3.8.3
 # https://mail.gnome.org/archives/gnome-announce-list/2013-June/msg00005.html
+#
+# kerberos unfortunately means mit-krb5; build fails with heimdal
 COMMON_DEPEND="
 	>=dev-libs/glib-2.35.1:2
 	>=x11-libs/gdk-pixbuf-2.23.0:2
@@ -56,8 +57,6 @@ COMMON_DEPEND="
 	x11-libs/libXxf86misc
 	>=x11-libs/libXi-1.2
 
-	virtual/krb5
-
 	bluetooth? ( >=net-wireless/gnome-bluetooth-3.5.5:= )
 	colord? ( >=x11-misc/colord-0.1.29 )
 	cups? (
@@ -65,6 +64,7 @@ COMMON_DEPEND="
 		>=net-fs/samba-3.6.14-r1[smbclient] )
 	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8.1 )
 	i18n? ( >=app-i18n/ibus-1.4.99 )
+	kerberos? ( app-crypt/mit-krb5 )
 	modemmanager? ( >=net-misc/modemmanager-0.7.990 )
 	socialweb? ( net-libs/libsocialweb )
 	v4l? (
@@ -75,7 +75,6 @@ COMMON_DEPEND="
 		>=dev-libs/libwacom-0.7
 		>=x11-libs/libXi-1.2 )
 "
-# kerberos? ( virtual/krb5 )
 # <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
 RDEPEND="${COMMON_DEPEND}
 	|| ( ( app-admin/openrc-settingsd sys-auth/consolekit ) >=sys-apps/systemd-31 )
@@ -127,8 +126,7 @@ src_prepare() {
 	epatch "${FILESDIR}/${PN}-3.8.0-optional-r1.patch"
 
 	# https://bugzilla.gnome.org/686840
-	# Broken: https://bugs.gentoo.org/show_bug.cgi?id=475526
-#	epatch "${FILESDIR}/${PN}-3.7.4-optional-kerberos.patch"
+	epatch "${FILESDIR}/${PN}-3.8.4-optional-kerberos.patch"
 
 	# Fix some absolute paths to be appropriate for Gentoo
 	epatch "${FILESDIR}/${PN}-3.8.0-paths-makefiles.patch"
@@ -151,9 +149,6 @@ src_prepare() {
 }
 
 src_configure() {
-	# FIXME: add $(use_with kerberos) support?
-#	! use kerberos && G2CONF+=" KRB5_CONFIG=$(type -P true)"
-
 	gnome2_src_configure \
 		--disable-update-mimedb \
 		--disable-static \
@@ -163,6 +158,7 @@ src_configure() {
 		$(use_enable cups) \
 		$(use_enable gnome-online-accounts goa) \
 		$(use_enable i18n ibus) \
+		$(use_enable kerberos) \
 		$(use_enable modemmanager) \
 		$(use_with socialweb libsocialweb) \
 		$(use_with v4l cheese) \