Version bump for Gnome 3.12.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xC6085806

12 files changed, 462 insertions, 24 deletions

diff --git a/net-misc/gnome-online-miners/ChangeLog b/net-misc/gnome-online-miners/ChangeLog
index b56408d499c4..4e3cbed13bc4 100644
--- a/net-misc/gnome-online-miners/ChangeLog
+++ b/net-misc/gnome-online-miners/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/gnome-online-miners
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/gnome-online-miners/ChangeLog,v 1.9 2014/03/30 10:30:28 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/gnome-online-miners/ChangeLog,v 1.10 2014/04/27 18:00:36 eva Exp $
+
+*gnome-online-miners-3.12.0 (27 Apr 2014)
+
+  27 Apr 2014; Gilles Dartiguelongue <eva@gentoo.org>
+  +gnome-online-miners-3.12.0.ebuild:
+  Version bump for Gnome 3.12.
 
   30 Mar 2014; Pacho Ramos <pacho@gentoo.org> gnome-online-miners-3.10.3.ebuild:
   Fix RDEPEND on newer goa (#505888 by renato gallo)
diff --git a/net-misc/gnome-online-miners/Manifest b/net-misc/gnome-online-miners/Manifest
index f4edc45a45eb..0f4a1205e8e6 100644
--- a/net-misc/gnome-online-miners/Manifest
+++ b/net-misc/gnome-online-miners/Manifest
@@ -2,13 +2,15 @@
 Hash: SHA256
 
 DIST gnome-online-miners-3.10.3.tar.xz 242348 SHA256 129807d398e7744870110e6875629b6858d289021271550569ce5afa10fe9ea8 SHA512 d4d65ae3ea5e3c6dab4281536df5a4ff0a8e6f5193a04c39809fde7487e2045c578d6041458a621653a6b095d448bd701b4d94b3fc79de32681ce9d2c7e394ed WHIRLPOOL 9244b3dc3bd0c92c51e2c9d0e95ab2f423df70c012c6ee3751a3195c82aa102b632139532b35a459d55c61f62feb081908c6ef4ef64b55043912047ce96040b0
+DIST gnome-online-miners-3.12.0.tar.xz 243744 SHA256 734db67bb158a046bc8bbbe418f0fdaf6d8652ac86406907a8d17d069fa48f23 SHA512 4b2ee0390c7fe04c5d935106166c5ccffcb160191196489e22fa8ed092a8f8e121f934de50312d9bd4c335fe2bdfdcb93e6e9218c591095affecc39ed2e95fea WHIRLPOOL aebff970b9d31b3f73896717fcf59e16b012383368bbaad002d7de0ae668ff88f11f316095627fbf94aed00284a4c6970905f23ec599666354f2c88d8919498b
 EBUILD gnome-online-miners-3.10.3.ebuild 749 SHA256 7738e687e27021741314495a3989d61ba68fb940153529004028de2d58b69f45 SHA512 96efc9fb36929fa20a4907856af3bb6884ccc26e881e3aaaf70a6becae36557a0dde93f6144dd18b2ee194bb0f1fe28a90db77160556a05c879749234714b316 WHIRLPOOL 6e63bdfc9d64d0195b06494693558c62d98bfcc8e8135ac5f856b555af14d0c2e01ef184ca6597b229efadf27c0ae9c08d7b99de920d3bb1014057fb49ee2060
-MISC ChangeLog 1372 SHA256 6ab8367dfeb44faa0a12d4268a3877768bbe6da6896d1a9f722c6fd08cd1adc5 SHA512 58c0ce8744f91c61e79405a58a9a469931ee6cec15f23dca52b74e18128e0cd76ab92d09abf2279af4e6fc2f50a04e8c540d080a2c5377143a03d434d924460a WHIRLPOOL 8a3096ecff1f10faf83701223bd182ee6f39d23347f69b69fb25d5b86aee3ef3d2fa2b95ae847828a0aab83ebe6368772aa078ae02de96109136776251c98f1e
+EBUILD gnome-online-miners-3.12.0.ebuild 781 SHA256 c15d7ac1bc2c01818fea78fcb5ca49ba43dba2b36b0a3c7f8eedbbe806a9729d SHA512 69ab3dddf517d0a1d2946a2982384df16f7ceab3ee6cb1974e2ec8e7906d48f3fe7f9086ccccc3cfb6ddb2aa014c704371126f9246c7925966c8ceae9ba7687a WHIRLPOOL 043e5c87bf2315d651c319cbdfaf32abb199bd2a0e8b1b769b17062517d69ffd9e27a8bc8cb4eebb8b96426bcd012dccf17cf239d93344dc6e841f28607c68b5
+MISC ChangeLog 1538 SHA256 6a2a7579ab0d8e81064c97930846860332d5a84ae3621bbe0830bc33af0ee7db SHA512 27865ab90ce570e4bc43a7a6fa87e163aac1a6745cf831aebed312aa6eba7e61abf0f25c63433606db8c1d6e47babf0b401bd60d4edd00b5980faac12a761242 WHIRLPOOL e8d6ac12e69adcc95b6743fcaecc819586d58ffe8983a26164dda73f1066e170231abff668fb948a009b9aa868823e75831217586825518ba4dfe47660479f2e
 MISC metadata.xml 160 SHA256 4d793ecb79b17794248102d8409d16bc27b1022c72038bd2d1241e129693d5f2 SHA512 677650c05f31fc27035e12f3f5e4b095715dfe12d2d3483f800bfbc6e986a98dbb1997cd52ad7a177b5c120c9b87fe5a2452a4f0f9852ac9a58262e0c5d576c9 WHIRLPOOL 070602fb27fee6a25035c9e93f5c2422270a5781fd11dac318d3f5c32cf9e49163abf7999729df230d3e181b6a1362982744e1f0ac016bf59a3458ae23abbb83
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlM38kUACgkQCaWpQKGI+9Qf2gCdHcjLLnH/tVJD0pBxSENvgnzk
-LZcAn1torzA3uOG6rP4oDp8kAMfD0qBs
-=dp9r
+iEYEAREIAAYFAlNdRcUACgkQ1fmVwcYIWAZoPgCfZ89JVXhorvvRogiCZ3fCDzsn
+wIYAnRql5Wv3XQZfqfFzTVQICeVVwAiA
+=HfKu
 -----END PGP SIGNATURE-----
diff --git a/net-misc/gnome-online-miners/gnome-online-miners-3.12.0.ebuild b/net-misc/gnome-online-miners/gnome-online-miners-3.12.0.ebuild
new file mode 100644
index 000000000000..71869a6256e4
--- /dev/null
+++ b/net-misc/gnome-online-miners/gnome-online-miners-3.12.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/gnome-online-miners/gnome-online-miners-3.12.0.ebuild,v 1.1 2014/04/27 18:00:36 eva Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome2
+
+DESCRIPTION="Crawls through your online content"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeOnlineMiners"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-libs/libgdata-0.13.3:0=
+	>=dev-libs/glib-2.35.1:2
+	>=net-libs/gnome-online-accounts-3.7.3
+	>=media-libs/grilo-0.2.6:0.2
+	>=net-libs/libgfbgraph-0.2.2:0.2
+	>=net-libs/libzapojit-0.0.2
+	>=app-misc/tracker-1:0=
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_configure() {
+	gnome2_src_configure --disable-static
+}
diff --git a/net-misc/networkmanager/ChangeLog b/net-misc/networkmanager/ChangeLog
index bac62ed3bc61..65d02ca59047 100644
--- a/net-misc/networkmanager/ChangeLog
+++ b/net-misc/networkmanager/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/networkmanager
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.194 2014/03/29 21:57:33 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.195 2014/04/27 18:04:11 eva Exp $
+
+*networkmanager-0.9.8.10 (27 Apr 2014)
+
+  27 Apr 2014; Gilles Dartiguelongue <eva@gentoo.org>
+  +networkmanager-0.9.8.10.ebuild:
+  Version bump for Gnome 3.12.
 
   29 Mar 2014; Alexandre Rostovtsev <tetromino@gentoo.org>
   networkmanager-0.9.8.8.ebuild:
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index 2327ce0def1b..2541fde0e34f 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -24,19 +24,17 @@ AUX networkmanager-0.9.8.2-allow-new-dhcpcd.patch 917 SHA256 b3a69fd9850634edc19
 AUX networkmanager-0.9.8.4-pre-sleep.patch 4606 SHA256 ea70654524d5b414fcef10164b8dfb5e84bdf2444341f62fc7617952e2e721de SHA512 0781743f1e1afce3e51df6958996ea96885f56be96bd377dfbf115efaaa935396d468c701dd8a8c97e3a1623743476880e5936f4c0db4d560188e1f4c3b9b814 WHIRLPOOL 76dc1381cf0d7aa4d2d1530c077379929b40fcd54f66426ff46cca28d128fb40c88fd15bb6cb6139bec8c6bc338dbc8d266512056d27f307fa4e830cf28deb12
 AUX nm-system-settings.conf-ifnet 70 SHA256 34f53d9ac1ad65eda6942dc3059117f60f6321059ca23f4fbfcc2f2edcae151f SHA512 74304a367c0675cfc88a6ae17b291a9bc20f24a9dab72e9a4578e697870c4d96245aa45ce62ec86f1e5e7e3069ab8fccec33936e479ca630a836805addb5574d WHIRLPOOL 24e140440014c07c355cecab0564d6a57fc2e37e3ded242f3b9dd3e6ddd05dd924a7497400d2984eed407e99ba9661028a159dd4e393917cee7665b0ff4737eb
 DIST NetworkManager-0.9.6.4.tar.xz 1968564 SHA256 511b411e055d187bc8f26c519fdb3e55e07fc40d4adecbbec623c0249380a7eb SHA512 900eb30f7fed35d43f2c1003fcf7fc0b6ab9c5a9f0a14777d4636372376af8477e63fc7fc9b05d2f281d48de658d96d9b30f44851af8ae2b4271bb2b5c2cb669 WHIRLPOOL b87903e4cbb3efcec17b25e74dd67dc6a81a6d553df57e9c699bb1f0d40fe6d611953f6baaeca48ef4387316980d775ec2b07a9df06ecb5f03c10dffc2b60584
+DIST NetworkManager-0.9.8.10.tar.xz 2015492 SHA256 064d27223d3824859df12e1fb25b787fec1c68bbc864dc52a0289b9211c4c972 SHA512 8688b8dceadf87d26b76bdda76ecb0b383ecaa7991487e6f6ddc150cf311f2f0cb3487afd91f19ecde2925585e8d53c8761fd45743f25c488eff6a7811ca4200 WHIRLPOOL 29c4f2189eb812c23e8c1cfbce728c525282ad3f04d3c9c25b3a80a043c95f2a9419fa71ac6f8a59d7abde8a30275e68e3ef615b74f78c07846757d92f114e1c
 DIST NetworkManager-0.9.8.8.tar.xz 2026860 SHA256 8a0a3de9cd2897f778193aa5f04c8a6f6f87fe07f7a088aab26d2b35baa17a55 SHA512 d65ab18642e7aff09d64ef97bb87324eb10955c71db5896d326f2f9acc340ae185b701405a441998555ac080c95ffafd32dfcbe8c8cca00ecffa64873d0bbd9f WHIRLPOOL 2d71561619003fbfdf9ef547e5ede49860fe891434be9948f50ed751b8ffbc961c87d804ea6676f5b2dad2ef5889f70afb05ce3ef374c8f47d1bba60931eae96
 EBUILD networkmanager-0.9.6.4.ebuild 7528 SHA256 d1beabae169c44e904b08349354c6f08951403b215078acf44182d18d18dc47a SHA512 4923345662ac03f50cad820d7d6fa43853559eb3a4f0f54255918cc0b39e6359a72f25aff2ead92ff7bb36943a494908d907f862e5c01e1c11ac808d4cc37b83 WHIRLPOOL 73048473fbe83b576f3abb9133b6b6dbd9a1aa2feea26ade80f87cfb7e26b5068b9fb4cc3384c1480d078153fc9f26f0fe0eb46dc08d9cd92a91370e8795daf7
+EBUILD networkmanager-0.9.8.10.ebuild 8267 SHA256 a36963b303083f78376652296dfde1180df5e98d8dbcaaeb545f1ade71a5e372 SHA512 2949955a57d4cb09b6a5d1676413d5901c5a83378a3a01f55f4e64b69cdbd79d59cf26166b42096f65c733cf03315f1fd0e0f03fee596ae044f5278913018602 WHIRLPOOL 6f400b1049c9578980170f9615250ed875264a2e2a26426d5de28a78dde4337634aeff8310b5982e39d86596e764892e7ec13771834b189e3b0ca9c4aa88e35e
 EBUILD networkmanager-0.9.8.8.ebuild 8271 SHA256 3311c32587ddbaab8b03b148163f7f7f45f01eb189254982f15791bf2360414c SHA512 b9341097dd4799db32f20e55e0724c6811c4766af49d9ca3f0338531690741bcb4d59acbfa2e4e1d0cd15232c2ce04059609c0ed921a09eba40713c0d0f28a58 WHIRLPOOL c19359a88816b5f95ea74014dd5a1c8e105082775ab84517b091de332538e8dbf2c398c8f378b152652719a9803bd90f3e570d69c14aafeed2b78cb54c8ce025
-MISC ChangeLog 47663 SHA256 590ba7245dc1d561e81a4c3456760d3ade6dd30f8d6387f880a8d11490f1f51e SHA512 30a189c1c5866a3d99414dee126aa745a8083218a66178c923e1c88f770cc99e30e21975311ed3de8ccec8f3bee6b69cca9e57297d361624a8935e020a9c217f WHIRLPOOL b7e6bed7eee2a36c5af06825bd0dc68596cd99728a5ef0a5896dc906bef1a40606d928776f4866fcff3e02fb82e5cfe4efc883549d828589344ebd1ceccbbfdf
+MISC ChangeLog 47818 SHA256 81c7aa56acdd4a1df82e2b5fa8610696761b586b60958e3ecb28e355b6e510df SHA512 d052227705f843959d00ce509e2e784e2be29d6cac5d7e63de3151b219b6a49cdd3d40fb16a762696d73c63994e24e72f3eaf4e68a5052b8ad02df835b7a7952 WHIRLPOOL c3c72b4ef82f442a5e7f828995570cde1acb6fc1d9b01770f7c07d799120f6de547f5741d2a1456eb849e9f00b3bae4c7906fe0fcbfbfb8198a10984c600805f
 MISC metadata.xml 1432 SHA256 473cf4f4e96a9d2ba397bf2526ea54565ff8901e358e2e47fd395a27a00fa201 SHA512 1007fac4c7de320b942d41cc8ce04648077c7aaff2daf18423be86caa322e4dfae4ed009becbfb22e324de9d65e261bb9c410f240ec4700ffbeb8325c6181a62 WHIRLPOOL 52ae999e503fed880202a1d7af606ab3678f43e25496ce043a58d83a4db606e17e8c0375c60471baa38251a1e48077c030d4e023d5edcd846c69af82cfed504a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTN0GbAAoJEJ0WA1zPCt1hMjQH/Rm2/axcFW9Tyk5H99R8445M
-yrU2qnHK7W42CfvPVvlqjk7dojz512GO1gZ5KaZJNZyrLSRFkY3+8pFTPrg9uAya
-e9cHowveol+O5NsVsL/L1YLbLDGTHPK1b0Vdn2M38nZ+HGx9069wmLcSNZybic8F
-A/yCG4CoIzp30aQbf/UitDcG3nsxKoMhc1C0r0Lxd1CDkLq+YIZbuXBXnqsQsHMt
-tv41xmRleU145ZFyInt1uxhIsSnUuH7xSFZuZgUMOSJuZZjCN9qUJGRTQ1FIxobM
-brmiuB42rLh3fFLqnX1elh/7sArrh/u8oi5RMGpJmif97ih0oJU7y4+5w88ial0=
-=8so+
+iEYEAREIAAYFAlNdRpwACgkQ1fmVwcYIWAZrMQCfSMxHzqEb3eBuDT5DNG+uFiI6
+f2kAoNIXi+SXBJ8tEX4ZIGDD7AK3Ul7K
+=pnpg
 -----END PGP SIGNATURE-----
diff --git a/net-misc/networkmanager/networkmanager-0.9.8.10.ebuild b/net-misc/networkmanager/networkmanager-0.9.8.10.ebuild
new file mode 100644
index 000000000000..449a71c17d19
--- /dev/null
+++ b/net-misc/networkmanager/networkmanager-0.9.8.10.ebuild
@@ -0,0 +1,248 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.9.8.10.ebuild,v 1.1 2014/04/27 18:04:11 eva Exp $
+
+EAPI="5"
+GNOME_ORG_MODULE="NetworkManager"
+VALA_MIN_API_VERSION="0.18"
+VALA_USE_DEPEND="vapigen"
+
+inherit bash-completion-r1 gnome.org linux-info systemd user readme.gentoo toolchain-funcs vala virtualx udev eutils
+
+DESCRIPTION="Universal network configuration daemon for laptops, desktops, servers and virtualization hosts"
+HOMEPAGE="http://projects.gnome.org/NetworkManager/"
+
+LICENSE="GPL-2+"
+SLOT="0" # add subslot if libnm-util.so.2 or libnm-glib.so.4 bumps soname version
+IUSE="avahi bluetooth connection-sharing consolekit dhclient +dhcpcd gnutls +introspection kernel_linux +nss +modemmanager +ppp resolvconf systemd test vala +wext +wifi" # wimax
+
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+REQUIRED_USE="
+	modemmanager? ( ppp )
+	^^ ( nss gnutls )
+	^^ ( dhclient dhcpcd )
+"
+
+# gobject-introspection-0.10.3 is needed due to gnome bug 642300
+# wpa_supplicant-0.7.3-r3 is needed due to bug 359271
+# TODO: Qt support?
+COMMON_DEPEND="
+	>=sys-apps/dbus-1.2
+	>=dev-libs/dbus-glib-0.94
+	>=dev-libs/glib-2.30
+	>=dev-libs/libnl-3.2.7:3=
+	>=sys-auth/polkit-0.106
+	>=net-libs/libsoup-2.26:2.4=
+	>=virtual/udev-165[gudev]
+	bluetooth? ( >=net-wireless/bluez-4.82 )
+	avahi? ( net-dns/avahi:=[autoipd] )
+	connection-sharing? (
+		net-dns/dnsmasq[dhcp]
+		net-firewall/iptables )
+	gnutls? (
+		dev-libs/libgcrypt:0=
+		net-libs/gnutls:= )
+	modemmanager? ( >=net-misc/modemmanager-0.7.991 )
+	nss? ( >=dev-libs/nss-3.11:= )
+	dhclient? ( =net-misc/dhcp-4*[client] )
+	dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 )
+	introspection? ( >=dev-libs/gobject-introspection-0.10.3 )
+	ppp? ( >=net-dialup/ppp-2.4.5[ipv6] )
+	resolvconf? ( net-dns/openresolv )
+	systemd? ( >=sys-apps/systemd-183:0= )
+	|| ( sys-power/upower >=sys-apps/systemd-183 )
+"
+RDEPEND="${COMMON_DEPEND}
+	consolekit? ( sys-auth/consolekit )
+	wifi? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.17
+	>=sys-kernel/linux-headers-2.6.29
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+	test? (
+		dev-lang/python:2.7
+		dev-python/dbus-python[python_targets_python2_7]
+		dev-python/pygobject:2[python_targets_python2_7] )
+"
+
+sysfs_deprecated_check() {
+	ebegin "Checking for SYSFS_DEPRECATED support"
+
+	if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then
+		eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel"
+		eerror "or NetworkManager will not work correctly."
+		eerror "See http://bugs.gentoo.org/333639 for more info."
+		die "CONFIG_SYSFS_DEPRECATED_V2 support detected!"
+	fi
+	eend $?
+}
+
+pkg_pretend() {
+	if use kernel_linux; then
+		get_version
+		if linux_config_exists; then
+			sysfs_deprecated_check
+		else
+			ewarn "Was unable to determine your kernel .config"
+			ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly."
+			ewarn "See http://bugs.gentoo.org/333639 for more info."
+		fi
+
+	fi
+}
+
+pkg_setup() {
+	enewgroup plugdev
+}
+
+src_prepare() {
+	DOC_CONTENTS="To modify system network connections without needing to enter the
+		root password, add your user account to the 'plugdev' group."
+
+	# Bug #402085, https://bugzilla.gnome.org/show_bug.cgi?id=387832
+	epatch "${FILESDIR}/${PN}-0.9.8.4-pre-sleep.patch"
+
+	# Use python2.7 shebangs for test scripts
+	sed -e 's@\(^#!.*python\)@\12.7@' \
+		-i */tests/*.py || die
+
+	# Fix completiondir, avoid eautoreconf, bug #465100
+	sed -i "s|^completiondir =.*|completiondir = $(get_bashcompdir)|" \
+		cli/completion/Makefile.in || die "sed completiondir failed"
+
+	## Force use of /run, avoid eautoreconf
+	sed -e 's:$localstatedir/run/:/run/:' -i configure || die
+
+	use vala && vala_src_prepare
+
+	epatch_user # don't remove, users often want custom patches for NM
+}
+
+src_configure() {
+	# TODO: enable wimax when we have a libnl:3 compatible revision of it
+	# We are not ready for bluez5 yet
+	econf \
+		--enable-bluez4 \
+		--disable-more-warnings \
+		--disable-static \
+		--localstatedir=/var \
+		$(usex systemd '--disable-ifnet' '--enable-ifnet') \
+		--without-netconfig \
+		--with-dbus-sys-dir=/etc/dbus-1/system.d \
+		--with-udev-dir="$(udev_get_udevdir)" \
+		--with-iptables=/sbin/iptables \
+		--enable-concheck \
+		--with-crypto=$(usex nss nss gnutls) \
+		--with-session-tracking=$(usex systemd systemd $(usex consolekit consolekit no)) \
+		--with-suspend-resume=$(usex systemd systemd upower) \
+		$(use_enable introspection) \
+		$(use_enable ppp) \
+		--disable-wimax \
+		$(use_with dhclient) \
+		$(use_with dhcpcd) \
+		$(use_with modemmanager modem-manager-1) \
+		$(use_with resolvconf) \
+		$(use_enable test tests) \
+		$(use_enable vala) \
+		$(use_with wext) \
+		"$(systemd_with_unitdir)"
+}
+
+src_test() {
+	# bug #????
+	cp libnm-util/tests/certs/test_ca_cert.pem src/settings/plugins/ifnet/tests/ || die
+	Xemake check
+}
+
+src_install() {
+	default
+
+	readme.gentoo_create_doc
+
+	# Gentoo init script
+	newinitd "${FILESDIR}/init.d.NetworkManager" NetworkManager
+
+	# /var/run/NetworkManager is used by some distros, but not by Gentoo
+	rmdir -v "${ED}/var/run/NetworkManager" || die "rmdir failed"
+
+	# Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
+	keepdir /etc/NetworkManager/dispatcher.d
+
+	# Provide openrc net dependency only when nm is connected
+	exeinto /etc/NetworkManager/dispatcher.d
+	newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status
+	sed -e "s:@EPREFIX@:${EPREFIX}:g" \
+		-i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die
+
+	# Default conf.d file
+	newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
+
+	# Add keyfile plugin support
+	keepdir /etc/NetworkManager/system-connections
+	chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765
+
+	if ! use systemd; then
+		insinto /etc/NetworkManager
+		newins "${FILESDIR}/nm-system-settings.conf-ifnet" NetworkManager.conf
+	fi
+
+	# Allow users in plugdev group to modify system connections
+	insinto /usr/share/polkit-1/rules.d/
+	doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
+
+	prune_libtool_files --modules
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+
+	if [[ -e "${EROOT}etc/NetworkManager/nm-system-settings.conf" ]]; then
+		ewarn "The ${PN} system configuration file has moved to a new location."
+		ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
+		ewarn "to ${EROOT}etc/NetworkManager/NetworkManager.conf"
+		ewarn
+		ewarn "After doing so, you can remove ${EROOT}etc/NetworkManager/nm-system-settings.conf"
+	fi
+
+	# The polkit rules file moved to /usr/share
+	old_rules="${EROOT}etc/polkit-1/rules.d/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
+	if [[ -f "${old_rules}" ]]; then
+		case "$(md5sum ${old_rules})" in
+		  574d0cfa7e911b1f7792077003060240* )
+			# Automatically delete the old rules.d file if the user did not change it
+			elog
+			elog "Removing old ${old_rules} ..."
+			rm -f "${old_rules}" || eerror "Failed, please remove ${old_rules} manually"
+			;;
+		  * )
+			elog "The ${old_rules}"
+			elog "file moved to /usr/share/polkit-1/rules.d/ in >=networkmanager-0.9.4.0-r4"
+			elog "If you edited ${old_rules}"
+			elog "without changing its behavior, you may want to remove it."
+			;;
+		esac
+	fi
+
+	if use systemd; then
+		if [[ ${REPLACING_VERSIONS} < 0.9.8.6 ]]; then
+			ewarn "Ifnet plugin won't be used with systemd support enabled"
+			ewarn "as it is meant to be used with openRC and can cause collisions"
+			ewarn "(like bug #485658)."
+			ewarn "Because of this, you will likely need to reconfigure some of"
+			ewarn "your networks."
+		fi
+
+		if [[ -e "${EROOT}etc/NetworkManager/NetworkManager.conf" ]]; then
+			if grep -q plugins "${EROOT}etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then
+				ewarn "You seem to use 'ifnet' plugin in ${EROOT}etc/NetworkManager/NetworkManager.conf"
+				ewarn "Since it won't be used when running under Systemd, you will need to stop setting"
+				ewarn "ifnet plugin there to allow NetworkManager to work."
+			fi
+		fi
+	fi
+}
diff --git a/net-misc/vinagre/ChangeLog b/net-misc/vinagre/ChangeLog
index 36bd02c461e7..602c9bd1857d 100644
--- a/net-misc/vinagre/ChangeLog
+++ b/net-misc/vinagre/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/vinagre
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vinagre/ChangeLog,v 1.102 2014/04/27 09:02:09 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vinagre/ChangeLog,v 1.103 2014/04/27 18:01:53 eva Exp $
+
+*vinagre-3.12.1 (27 Apr 2014)
+
+  27 Apr 2014; Gilles Dartiguelongue <eva@gentoo.org> +vinagre-3.12.1.ebuild:
+  Version bump for Gnome 3.12.
 
   27 Apr 2014; Pacho Ramos <pacho@gentoo.org> -vinagre-3.8.3.ebuild:
   drop old
diff --git a/net-misc/vinagre/Manifest b/net-misc/vinagre/Manifest
index 27eade96d341..31f9cf68659c 100644
--- a/net-misc/vinagre/Manifest
+++ b/net-misc/vinagre/Manifest
@@ -4,14 +4,16 @@ Hash: SHA256
 AUX vinagre-2.30.3-gmodule.patch 396 SHA256 3c52b535e4d143b6c7b44b457b10175ffdff62555a259c1e4f132c5cc5b014ba SHA512 d57a0e0237d0cc632e688d2609a405ab084a36fa78ba9c5dfd088c215e79ac0a146b92763e617e3effda27c67e3dfd42aa7a47cbc4b18f7843270d97b690fc4d WHIRLPOOL 7de0085159a6878c684e30a6c43db009b194ad0b1986ff86dc0956198946c3810965f0632ce2ca81ec6edaea0b978a32123a9e12821234067334d3cb39642893
 DIST vinagre-2.30.3.tar.bz2 2447388 SHA256 28bfc70a816bc3f1e71ada82e260c39ee2dac693cb7859323b06c8b1452a39f4 SHA512 3363d55f013d1477fd3270f701f717df5ffdf187d2718ab577b3acead5950bdc566bc714fd689a63c44c13160e4d0fdfc7be89b495859d721b8b3c6121443c5d WHIRLPOOL e79aa98f9252b2b50fd77f0debd622d716a4b81addc75d662ea224f876e4e718c20bbbff2c9569a16d8efb563dbe8720430907067eb0cf006261def0397f215b
 DIST vinagre-3.10.2.tar.xz 1075560 SHA256 72907079da70dcda63870a790db956bebee241a920daa99c4a80766c177ead87 SHA512 386d64d4711efbf03add09062a865da6b33a8a805e115f7085c35e75ebd0e92d37a12335a27dea1eed053acff0fa5fcfd9b2af4b36a93432fa7bd8ffd2bfb364 WHIRLPOOL 75ac5529138f860bb4af0e078aeea61d22c5c9192ba5cf698b3fc0bf61722b21a4e5d8a23dc1c1dda39aeefdaf59bd30014ed0148ee41ad2febb8748b6e454f9
+DIST vinagre-3.12.1.tar.xz 1086496 SHA256 11453b2e8c96c22a47556afd99f47274337e1d56b2cc74e33e50629e2cb7bdb5 SHA512 5c1dd3f6f5961de9493dc084d7d0e533ad62c99d0d3bf73385436ed62174d00b0575fbc2eccda0193c27e8f270f23017af975b1a91829ff1994a2d12576a2d86 WHIRLPOOL 0eb25ae02315dc96329c82bc832c42e8721668da63f0ba299099fc545724ca62b21e2d37a049cc0a298414246c1235f8d307acb73e9ec656b0052a11aee8973c
 EBUILD vinagre-2.30.3.ebuild 1858 SHA256 80e617428723c8b545630367d86e65760578a5f2ad9317beaceec6e1209702fb SHA512 38147f893ecb869f00576e51789c29422441e557ba5a2ca738f1cd011d559a07c99e5ae83b69e5d085766f1b6296d61d29e7caea6c2fcb1f8d5ba3cde94091b2 WHIRLPOOL 58deb1c11d9fc474f49bd9d61e69d46ee0c8379939bed7d1808fa99554da0e88c04e36f57f789e82d548c6deff1f5b9bfc3fdf63bcc87fd406856fc448458897
 EBUILD vinagre-3.10.2.ebuild 1466 SHA256 460cf302d97abe71ca374955e5dc06ce60f2a5f7f599f18728bfa4fc7cf51c48 SHA512 e76e3a55fc0164fcbe05cf0db9543265a8d24e8f8e3571772e9732f7045a454c58012e6492a92750f1bcf76021c6b80f7dbd0a94324343ef65ed9cae52e1963c WHIRLPOOL 889ea1497111a52ceeaa5a370449f427d38d41a7716065340be5ed76502baa621e6f795e680b7dd8cc13716433cc90cee877c202d2accfc772e07bcca8c124cf
-MISC ChangeLog 13999 SHA256 39445cb49a13810d9dc6341b3b3adfa86034ff1617bbec62cfb3f1afc1feba47 SHA512 eddcadee3ced0935305762a62aaca92925c245973d047e93a305fb611367b6a9617fd23aceff35fb5ec06ff131432c9a0c0f764b0ed92e9e83b3a0edd79caba2 WHIRLPOOL aa5619fda8465d27c836f9ba0259392d6825df474577761705db726ad04e8842cd325efaa12c2973ed68cb78f2c2b4628277873113a867e3ef7fe4f29efaf0f8
+EBUILD vinagre-3.12.1.ebuild 1466 SHA256 d48e5af14a5a7f33b3e7fccdca754b0ae71b608a134f05dac3b68c5a29ec6069 SHA512 df79c65c06be808185f6d0954f39c06d6631490d3b7db161cc83226686e5fa70eb6ff932aab9305c9056e439cc5d6629e70e60325f99000d6439117abf112965 WHIRLPOOL 26d8c784796a595ddd13a239a4ec50c2b582292de66377f5d53e80c2a54f98eb4b98c159610f09ed1a4a5d8fa990f428a394e4dd08b68a009f5e91aee08b0c5f
+MISC ChangeLog 14138 SHA256 ca6599320fbcc08d26364e17b275c067271621da04dc44ece3c6c5303123a3ab SHA512 dec5b0659dc150b830c259a7dc4c6e9e3e420441bb33adb94eb83a19f6bb1f3b432575cefee3b35e94b4bd48e71303adb934c4936af1a89548207822c3244075 WHIRLPOOL dddf359129825ef42d5cd7d4e09b32e8ca6283239921b20bdfe260190a55fb62e0d03d7a64b6418103f41b36b75da7fe167e099fbadbcebf3de339b846fa47a0
 MISC metadata.xml 633 SHA256 a6ad796117ba8acfa7a4751bfab866713d1b5861eba7eef0a5ed239ebc236363 SHA512 1e5eb8f97a57f6d19aaacc15e468bb0388d7bd0c331efa65cff2b843ef61f4a5971c89b0c2745f86d59d27a454211a2e38744f976d0bb2699298506627922ce3 WHIRLPOOL c6deceea983d4d2b215846ff97fd7aaac03e1d2fd8f51c7ce006236baea39fe5aa2b4834ea7be81cb05262a93eca33dd79ed8d98cac1048994b47130060b46d3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlNcx5IACgkQCaWpQKGI+9RttQCffd7e6wUghzkRa3o5sQmIRTsD
-ZAgAnj12imZ+Knc+mDJVFupC9aYRBNmM
-=udYa
+iEYEAREIAAYFAlNdRhIACgkQ1fmVwcYIWAY1nACeMhjIlAvkeJjwl4keijBWiJaB
+e8sAoKTt/+/tk61MH+aKUZt9zAqE1tYR
+=rteW
 -----END PGP SIGNATURE-----
diff --git a/net-misc/vinagre/vinagre-3.12.1.ebuild b/net-misc/vinagre/vinagre-3.12.1.ebuild
new file mode 100644
index 000000000000..1c6590f8fc28
--- /dev/null
+++ b/net-misc/vinagre/vinagre-3.12.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vinagre/vinagre-3.12.1.ebuild,v 1.1 2014/04/27 18:01:53 eva Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+VALA_MIN_API_VERSION=0.18
+
+inherit gnome2 vala
+
+DESCRIPTION="VNC client for the GNOME desktop"
+HOMEPAGE="https://wiki.gnome.org/Vinagre"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="avahi rdp +ssh spice +telepathy"
+
+# cairo used in vinagre-tab
+# gdk-pixbuf used all over the place
+# FIXME: uses xfreerdp ???
+RDEPEND="
+	>=dev-libs/glib-2.28.0:2
+	>=x11-libs/gtk+-3.9.6:3
+	app-crypt/libsecret
+	>=dev-libs/libxml2-2.6.31:2
+	>=net-libs/gtk-vnc-0.4.3[gtk3]
+	x11-libs/cairo:=
+	x11-libs/gdk-pixbuf:2
+	x11-themes/gnome-icon-theme
+
+	avahi? ( >=net-dns/avahi-0.6.26[dbus,gtk3] )
+	rdp? ( net-misc/freerdp )
+	ssh? ( >=x11-libs/vte-0.20:2.90 )
+	spice? ( >=net-misc/spice-gtk-0.5[gtk3] )
+	telepathy? (
+		dev-libs/dbus-glib
+		>=net-libs/telepathy-glib-0.11.6 )
+"
+DEPEND="${RDEPEND}
+	>=dev-lang/perl-5
+	>=dev-util/intltool-0.50
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+	$(vala_depend)
+"
+
+src_prepare() {
+	vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	DOCS="AUTHORS ChangeLog ChangeLog.pre-git NEWS README"
+	gnome2_src_configure \
+		$(use_with avahi) \
+		$(use_enable rdp) \
+		$(use_enable ssh) \
+		$(use_enable spice) \
+		$(use_with telepathy) \
+		ITSTOOL=$(type -P true)
+}
diff --git a/net-misc/vino/ChangeLog b/net-misc/vino/ChangeLog
index 6db4f090aa04..f68200b3d8a8 100644
--- a/net-misc/vino/ChangeLog
+++ b/net-misc/vino/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/vino
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vino/ChangeLog,v 1.209 2014/04/27 09:02:49 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vino/ChangeLog,v 1.210 2014/04/27 18:02:39 eva Exp $
+
+*vino-3.12.0 (27 Apr 2014)
+
+  27 Apr 2014; Gilles Dartiguelongue <eva@gentoo.org> +vino-3.12.0.ebuild:
+  Version bump for Gnome 3.12.
 
   27 Apr 2014; Pacho Ramos <pacho@gentoo.org> -vino-3.8.1-r1.ebuild:
   drop old
diff --git a/net-misc/vino/Manifest b/net-misc/vino/Manifest
index f2a5d86b9c54..845cd5037f96 100644
--- a/net-misc/vino/Manifest
+++ b/net-misc/vino/Manifest
@@ -6,14 +6,16 @@ AUX vino-3.6.2-clipboard-leak.patch 1869 SHA256 74a222caaf49a5d9e2d2edb7aefa87fa
 AUX vino-3.8.1-new-client.patch 1099 SHA256 e2508bf3e13125cf819c1ee779c10c9836fc39cf6b506a4fc39f1ee0f49228e3 SHA512 0318569a311bb6fb407804c321890efa87d536e3a935cabb7186bf3f809f3a42ba60dd9f02b9278a50ef7a9a3832800f7c5a5f30f6bb9902e36320fc8657fddb WHIRLPOOL 134f8cbc362db6047392d2f5281fa360b9bb8b13c89df84fbd0448dbefd14457c006058fe9efb00d9f91306b44d85d38ea550c56cfd7e108226b5ef9e71645f9
 DIST vino-2.32.2.tar.bz2 856440 SHA256 1260b1f7b647caff69db441dc13c992f843d9d75b9386ec07b724a5e30c6d4fa SHA512 1205341c83f296f93d948d3b0408a54e9a036abc15ad4e980e9abde8d24ab4a1639ea0d0898d768cf0a01e1ef9e916d907c58d4617534b0dc6860900e1a62a58 WHIRLPOOL 13ca83f6fee1f941d6d078202efae91879243862a0e6740b70511368e123a00cc52f681860ab0ef09e301081b5045327bf40800d68006ace634c6ff407bada10
 DIST vino-3.10.1.tar.xz 753836 SHA256 faf10d667c43d00cd37dc6343b44012456de9d2e39d8ce679c719e65d2dfbe46 SHA512 3b551710d9dc57f9afb1e1ec4896c68c3a2e959b141a6341723b7c1302ea0d902c41cefbd512056782278bc3727f255d2a35e1d536bc1254da243ee5e77e093a WHIRLPOOL 4b133e14914ddae400ba183ae2cd4fd9aae8cb6b152f25bebf572241d2a38bfc403104634e376616bef1a4573065cac1c25f18f157cdf85f474009ebc97302ce
+DIST vino-3.12.0.tar.xz 751352 SHA256 86c9d8b60d79982e4488815db0d441c398e011ad8262659789afecc97a01ca5b SHA512 0955d3446c33999c74b4f4225bef2750fc0384164a5d9675a6a3a571125f860f265b9f2d23541a6ad0eaa78d93a416f63402c84a2e631c60c467ca2b217a88cf WHIRLPOOL fb3c38c56987a29cbc454e75840144ba42fb5416495624681479611da9e578b6ed6c076ecc56738df40b1957a10d0ce362f6488e222524d688c74168675b1bc5
 EBUILD vino-2.32.2-r2.ebuild 2585 SHA256 5ea19fc2d5afab06e6ef7c6792af80fad63b7b99de483d66c0fbe61bfbece61f SHA512 8702fca746ba2da89ca4c7a191984a65b92673cd12c4cd9c3f42627eeb14baecc78ed7af02e4613d92ce707cc3987353e5a0795ecacb3d27cd298ef54300be77 WHIRLPOOL 4f5951fcd67fc1a0979e53c482679abee52135b4fa314e9ee551fc72c356e40d70170065e93b3e5897cad2c5e11fa5a8da531244b8732e3cfc94f53b4cec8223
 EBUILD vino-3.10.1.ebuild 1903 SHA256 e3297b72439ae1ef045c11f6afa414c8eaf4cc6e0db02b86d960ea57c5bf7e25 SHA512 6cfd648d509876a257207acc8f4a61a8c0ca3a75c714ac625dd7c0ad373bfd53543b3b857f0373ec798edfbf16490c83d27643d0120422a528d4be01a2b2e9a4 WHIRLPOOL 7997c689e3563c881d70cbdda04206967bf86787bea95aa1d52798a928cdb0860e2c565c9fd1ea20862f7ccfb2a49772c4e551a6ee838cf2ea0a9ec12e756751
-MISC ChangeLog 26362 SHA256 84fcaaf849eddf59293b420add68268eaeea8740339632a4e9a438f911c3b888 SHA512 de5e0556e00348287a4a7984f8356d502d4ed732a39e0dcce84d4db6e8d16f2dc4c0f2e01490d8fe032d5e32249e21a49fc884375cd285f69b37275863e2250a WHIRLPOOL 51c3b6858533e1ed24b1779c5d3d3b7d84a6cdaad42c50986d7255297fb522baeaf723fd3e9a7ea5003871eaca9954e0c97bda9f3e2bd229de02dbcdd218bb7c
+EBUILD vino-3.12.0.ebuild 1796 SHA256 7215e32eb9ce5b6c5fdb8b76a124ae9a695c08002d0f3b393d08e43d90cad902 SHA512 9889918600d4d5362465af7a5d16eb56811e20a12c96785210509192ac0d921ae9c79345e5a0f8b4a212d1044b25391481dee2cfe174566544a4c1e7de05b176 WHIRLPOOL 9fc7731b9156eab85e113f0c20865a0aaf08d5b7fd8018d9d5f88d0b33831ce639ad40689984111c30fd9aa7814be4077cab35987e907ac582f8c22573a8d134
+MISC ChangeLog 26495 SHA256 bd221cf22ea0ba9b1d962636a89b891a7aa05a83c16fb67766dc565702ddf248 SHA512 d2a074da594fab9048df92c40aa131641a91f1dc43cabf8f19615619e49ef0a99b9420f33b5233483564676f1b3b2d161dc49fb508708d23cc7a708536b46c86 WHIRLPOOL 24bb12125def8ec08d92a405ed0a5d481b577338b1b7a0f8f63630f799717e2620e15dc2dde7f53bde7e4594e4f21be67cf802d69bb03d33b055177fd1cdc718
 MISC metadata.xml 252 SHA256 17ae8caf7ad8c64f98c45410f316d2dd6b3d12c822827fd34def79f7ee1f7602 SHA512 62b9c645ac3ae60defe99902b3129005670072b77d5de362223714e0c443103f51234a62dbee476aca83aefd30506334c67daa3eed462b238445d4bcce5125ae WHIRLPOOL 201a4c535e7c8a4d0fa834b09a5765043a8edfe848a7c28c1a0f87e892165488c8a6ae67f9821e33d66ae3c9b6951bdfacb73f2f5db6d4ae946e7e8e92b86dbe
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlNcx7oACgkQCaWpQKGI+9SUjQCcDw3PC5ulqxhktskqEVZEJ5ey
-Ll8An2mROalUcR/dH0EO+Tyb/1fpIPY9
-=P1bR
+iEYEAREIAAYFAlNdRkAACgkQ1fmVwcYIWAaIigCgkuGYHc7Fu4jRFhmwClGzeTjN
+kwcAoO0tgvbSRzzH7Wk/aHQy6Nw9IDvK
+=rAcY
 -----END PGP SIGNATURE-----
diff --git a/net-misc/vino/vino-3.12.0.ebuild b/net-misc/vino/vino-3.12.0.ebuild
new file mode 100644
index 000000000000..c37fc07fc64a
--- /dev/null
+++ b/net-misc/vino/vino-3.12.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vino/vino-3.12.0.ebuild,v 1.1 2014/04/27 18:02:39 eva Exp $
+
+EAPI="5"
+GCONF_DEBUG="yes"
+
+inherit gnome2
+
+DESCRIPTION="An integrated VNC server for GNOME"
+HOMEPAGE="http://live.gnome.org/Vino"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="avahi crypt gnome-keyring ipv6 jpeg networkmanager ssl +telepathy +zlib"
+# bug #394611; tight encoding requires zlib encoding
+REQUIRED_USE="jpeg? ( zlib )"
+
+# cairo used in vino-fb
+# libSM and libICE used in eggsmclient-xsmp
+RDEPEND="
+	>=dev-libs/glib-2.26:2
+	>=x11-libs/gtk+-3.0.0:3
+	>=dev-libs/libgcrypt-1.1.90:0=
+
+	dev-libs/dbus-glib
+	x11-libs/cairo:=
+	x11-libs/pango[X]
+	x11-libs/libICE
+	x11-libs/libX11
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libSM
+	x11-libs/libXtst
+
+	>=x11-libs/libnotify-0.7.0:=
+
+	avahi? ( >=net-dns/avahi-0.6:=[dbus] )
+	crypt? ( >=dev-libs/libgcrypt-1.1.90:0= )
+	gnome-keyring? ( app-crypt/libsecret )
+	jpeg? ( virtual/jpeg:0= )
+	networkmanager? ( >=net-misc/networkmanager-0.7 )
+	ssl? ( >=net-libs/gnutls-2.2.0:= )
+	telepathy? ( >=net-libs/telepathy-glib-0.18 )
+	zlib? ( sys-libs/zlib:= )
+"
+DEPEND="${RDEPEND}
+	>=dev-lang/perl-5
+	>=dev-util/intltool-0.50
+	virtual/pkgconfig
+	app-crypt/libsecret"
+# libsecret is always required at build time per bug 322763
+
+src_configure() {
+	gnome2_src_configure \
+		--enable-http-server \
+		--with-gcrypt \
+		$(use_with avahi) \
+		$(use_with crypt gcrypt) \
+		$(use_enable ipv6) \
+		$(use_with jpeg) \
+		$(use_with gnome-keyring secret) \
+		$(use_with networkmanager network-manager) \
+		$(use_with ssl gnutls) \
+		$(use_with telepathy) \
+		$(use_with zlib)
+}