10 files changed, 437 insertions, 107 deletions
diff --git a/net-libs/gnome-online-accounts/Manifest b/net-libs/gnome-online-accounts/Manifest
index 6b651007599a..56e16ebd64fd 100644
--- a/net-libs/gnome-online-accounts/Manifest
+++ b/net-libs/gnome-online-accounts/Manifest
@@ -1,9 +1,11 @@
 DIST gnome-online-accounts-3.22.5.tar.xz 1404888 SHA256 a8a4894ea5c6ba4508f8fec539287f2ebaf2c9bcf4426463b6724ca58b9d8982 SHA512 5c87decaeb64850be02c3191088d518a5c3b84cb8d202692ff50b59dbf83f28a56f5bf34873ec9cc16301da3f8b3f41a892cf6a67f9e9f9f2bf35a8bde07a258 WHIRLPOOL abc5c08bcc384159ff021fcec960baf707b49bbacf1d07984b01d7180244c8e4424e4c14ce3cdb7fd89c0e88dd33bfa40dbfcd32e1ace1a6730ef64d143ba64f
 DIST gnome-online-accounts-3.22.6.tar.xz 1404728 SHA256 464248492840f6e3c6b3a30c54dad4995c1e348bce04c899a6a26b7a2551f7e5 SHA512 6b5370447ccc5407ed5abd32b70c94c52de1166466e731e2a0295800e598be5c068a8fd6c492d439bce1a7faea8ed3638f689438d42e335997892738b51ed673 WHIRLPOOL 44494f1fb48e17874120ebf0a5b765f40dbb277030d01ee073377a5030af18249a422397f6f63dc2ebebdd759d083e021cf4c1bae556fc217d64026d4afec5c0
 DIST gnome-online-accounts-3.24.3.tar.xz 1410696 SHA256 252e58eb953032f84731724ff2e8c8afb403ca803bd35382eabcfeee9c703854 SHA512 356e3b967f1821303926334d00cb2df875d81d20bb38905ba754b4aa03644aabd561e1da2de8df2325fac50b8d02e3422f2bc4f22bdbc3fe8b32c11ded738ce2 WHIRLPOOL ffaa8943b5d21989b70384712346a6846c1db991ceca61d53041e807316d63b8997381bb5ae7595a60f1cb6729e639ecd42b8a198d9fbf3721a5df9898fc9e66
+DIST gnome-online-accounts-3.24.4.tar.xz 1412004 SHA256 96e13c08dbbd4cff8a3dff5d1d4229fc3dbc6e007f1c4f5bad7497c8ce91767d SHA512 6e12f03d3ff9b9c831705f0310923b2c3e0daeee1304bb3dfa52fd17d6df49656f3380a1ffd9f30f75890340fb7ee23f53789e4df357a0aeba4e31667fd9c45a WHIRLPOOL 9eaa8f2d754b3c8b92fceefb28497e63ebcf8646bd8a6759db9c43f50f90d257714d999365f0359b9b03c3fbf83c231062945e360d096ca855ac6e2b8635c54b
 EBUILD gnome-online-accounts-3.22.5.ebuild 2349 SHA256 7ba6d34f56e8d10e2f052075e7c189ebb29ae7d9e3c19686d777cfd4242b427c SHA512 139d7c40e5fa01a3a9e4f90f3e2a350b450ef82c13f94ac2208fd9184099a01924e26616f7a17ccce826839a254f0b02f1eab9c4b0663d8249f389e92c9c366a WHIRLPOOL 9ed1f6677e8a2f57604e34b4a621efa0b995e833fe7947fdbf3ccea06df13277c7d0a2a767fcecd23c510cbd3f6891abd63310de64aadd88bbd9ce2e1183e3a5
 EBUILD gnome-online-accounts-3.22.6-r1.ebuild 2473 SHA256 47cd2c29cd0b56bb8f6f99258f7ce1109996b4b14a517b9c8a2b00c192461ff0 SHA512 992f6003eb9fcf683a62a8f45aa63a9e2a59f3b962396a7443dad80642ede06b112caa4b8b26af6781fc5ca28ea76a22269381e94ed7bfde92fb3e40f9bb2d1c WHIRLPOOL 014204469620dedc072774584c04d807d6923f884e65c0cc320a3f7b305f90d48d06a44d9d3bd10dfb586292995d5a6c6572ef9ea4ee14c771633e34cb0e9019
 EBUILD gnome-online-accounts-3.24.3.ebuild 2473 SHA256 6ac7794c79943e543795aeba7813f9ac2581b02045a9e24a2ee778017e8100be SHA512 d4191659707cd43ccd3c843233890700fbfce1379fb4edc4d2f97d847607168d240b1d8ac82d46b3822b11f5042b8f2588a0e47ed7a9b03befe14efd2ab7480e WHIRLPOOL f961257d5244fa5b90df4a36e8931de5d48d49a33fbcb0ac42e80ec279b853800a8bbea41b0990c4ade75c4845fd172f62b815bb7dad98f05de31ab843dd2f76
+EBUILD gnome-online-accounts-3.24.4.ebuild 2473 SHA256 6ac7794c79943e543795aeba7813f9ac2581b02045a9e24a2ee778017e8100be SHA512 d4191659707cd43ccd3c843233890700fbfce1379fb4edc4d2f97d847607168d240b1d8ac82d46b3822b11f5042b8f2588a0e47ed7a9b03befe14efd2ab7480e WHIRLPOOL f961257d5244fa5b90df4a36e8931de5d48d49a33fbcb0ac42e80ec279b853800a8bbea41b0990c4ade75c4845fd172f62b815bb7dad98f05de31ab843dd2f76
 MISC ChangeLog 8528 SHA256 b4e49992d5c0f21e95fe0d96838b16885163ca5ea684b92e6ed2f4e15bf187fe SHA512 4fb5faddd15e26590d74b14fe3ec186aa5a912a6ae332766b6fbdf90006827f3557230dc757f381e21e167d2354bb62d2b6bcf6bc8ba68a9970790ea466b449b WHIRLPOOL 40077ee11250f856b21a79342b15e8992bb0177356c0a2e6011a9dcdc61fed07c7863291fb4c01cf63b2f6d9f3220ebd0102ac00c1b51bb079e500a8648c9c98
 MISC ChangeLog-2015 9567 SHA256 aaca8489a27e3f97315745e9baf0a81756e383789b4f72efb640efe128cecf3e SHA512 da224604f471b220af662ab97055dafe7ba3a183e815d7a54b4c0aae4b66e525c7e1fa886d3afaed96f38606085aed1f219fd5db04646c10d04d5ae18fba7433 WHIRLPOOL cda8948541042f5e0039cac0063d834fafcd65bafa440be1fbc1953275b46665d6725d06dab4f10802f311a0f9fd9da1d4ca9b88c3c79f64209453861242c0c9
 MISC metadata.xml 473 SHA256 9670807777cb87e84bfb63d1f2b976f042c42b8a306e4e5323e3ed9a85dff0a8 SHA512 fe0bb40a0e1962c67a0208b6c2b9603ae37966b4427b5141efa7f63163fff3eed542a58400c0ac31e508589074c80d130de56733b55c7b10270e2e89de093a03 WHIRLPOOL 5de1ba810f50ad347e72c1a5cb4daf2f70affb3944681cf9bf2b7c9b5c44128447e6640b0bd4f15108fcfccd0e14a6829a61abc5a6b5cc0ed58bd97b64ab0479
diff --git a/net-libs/gnome-online-accounts/gnome-online-accounts-3.24.4.ebuild b/net-libs/gnome-online-accounts/gnome-online-accounts-3.24.4.ebuild
new file mode 100644
index 000000000000..f5fea7795c11
--- /dev/null
+++ b/net-libs/gnome-online-accounts/gnome-online-accounts-3.24.4.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2 vala
+
+DESCRIPTION="GNOME framework for accessing online accounts"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeOnlineAccounts"
+
+LICENSE="LGPL-2+"
+SLOT="0/1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="debug gnome +introspection kerberos vala" # telepathy"
+REQUIRED_USE="vala? ( introspection )"
+
+# pango used in goaeditablelabel
+# libsoup used in goaoauthprovider
+# goa kerberos provider is incompatible with app-crypt/heimdal, see
+# https://bugzilla.gnome.org/show_bug.cgi?id=692250
+# json-glib-0.16 needed for bug #485092
+RDEPEND="
+	>=dev-libs/glib-2.44:2
+	>=app-crypt/libsecret-0.5
+	>=dev-libs/json-glib-0.16
+	dev-libs/libxml2:2
+	>=net-libs/libsoup-2.42:2.4
+	net-libs/rest:0.7
+	net-libs/telepathy-glib
+	>=net-libs/webkit-gtk-2.7.2:4
+	>=x11-libs/gtk+-3.19.12:3
+	x11-libs/pango
+
+	introspection? ( >=dev-libs/gobject-introspection-0.6.2:= )
+	kerberos? (
+		app-crypt/gcr:0=[gtk]
+		app-crypt/mit-krb5 )
+"
+#	telepathy? ( net-libs/telepathy-glib )
+# goa-daemon can launch gnome-control-center
+PDEPEND="gnome? ( >=gnome-base/gnome-control-center-3.2[gnome-online-accounts(+)] )"
+
+DEPEND="${RDEPEND}
+	vala? ( $(vala_depend) )
+	dev-libs/libxslt
+	>=dev-util/gtk-doc-am-1.3
+	>=dev-util/gdbus-codegen-2.30.0
+	>=dev-util/intltool-0.50.1
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	dev-libs/gobject-introspection-common
+	gnome-base/gnome-common
+"
+# eautoreconf needs gobject-introspection-common, gnome-common
+
+# Due to sub-configure
+QA_CONFIGURE_OPTIONS=".*"
+
+src_prepare() {
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# TODO: Give users a way to set the G/FB/Windows Live secrets
+	# telepathy optional support is really a badly one, bug #494456
+	gnome2_src_configure \
+		--disable-static \
+		--enable-backend \
+		--enable-documentation \
+		--enable-exchange \
+		--enable-facebook \
+		--enable-flickr \
+		--enable-foursquare \
+		--enable-imap-smtp \
+		--enable-lastfm \
+		--enable-media-server \
+		--enable-owncloud \
+		--enable-pocket \
+		--enable-telepathy \
+		--enable-windows-live \
+		$(usex debug --enable-debug=yes ' ') \
+		$(use_enable kerberos) \
+		$(use_enable introspection) \
+		$(use_enable vala)
+		#$(use_enable telepathy)
+	# gudev & cheese from sub-configure is overriden
+	# by top level configure, and disabled so leave it like that
+}
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index 16adcba3e1b2..88e936d26af7 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -1,9 +1,13 @@
 DIST gnutls-3.5.13.tar.xz 7226468 SHA256 79f5480ad198dad5bc78e075f4a40c4a315a1b2072666919d2d05a08aec13096 SHA512 e98f23a589042f879936c3f8b474535e695fb7dd68a9e81323668c013241f765c2d3af6c6a072ecf867acc1e551ec46e15bb842144d3a06bdd5d2f4fc3d828a7 WHIRLPOOL 89439e7adba634698642a247c418569c0ea6ca6155bfb5dce17c8ed69d2506a37d9ad793122aaaec92adffefa75cb23a857c49ef722c5cf506700fe0c34b6028
 DIST gnutls-3.5.15.tar.xz 7238928 SHA256 046081108b8b1fe455a13a4c5a4eaa0368e185b678f1670fe09a11a2d7ecfad5 SHA512 046cf3adf6cc3d38fd431f2ff28ddabb65f3c13379516d105316a04c7128be89c5f7ed3df6a034fc06e9ab2e154c2cde2f5cbe8530a1e58cc4b4fb72e158134b WHIRLPOOL 811cca49bdd144107b6c25de31b3209694a8590107953fc3c4ecafddba48339e98cf1dc8e489addb04f0ac525411e96e505fd8edb342dca4e02f97dde3f26ffe
+DIST gnutls-3.5.16.tar.xz 7559812 SHA256 0924dec90c37c05f49fec966eba3672dab4d336d879e5c06e06e13325cbfec25 SHA512 451d3167be599ed8e0333dd7c9f8501fcb47b7aa871aeb461c368381c0b7ecd7e2026ec35dbbb2aa685cb2c3a22e9296e0a0699409e3744b731c1bb7e7e69f07 WHIRLPOOL aeda2b36dc339bd3282368bdc3d4af849a294c901b0ca816b32552d4bc61ef1d9920400e7f49e5f0fbe6798becd1d21047b26f93001dd8b29df2a777add0d662
 DIST gnutls-3.6.0.tar.xz 8024972 SHA256 2ab9e3c0131fcd9142382f37ba9c6d20022b76cba83560cbcaa8e4002d71fb72 SHA512 e5f36d7e8d64e8432098e30549c321745d3605eeb85aba2a04bfa92146ca771961f0e2f3682bcae36be5b6095acd25996104a4213ce7b3466d61332a5188dc03 WHIRLPOOL e8e479d7a0adc14c969b7364f58505f68ed92054fb8d8ba862f59d9ab64578e83ae02309ec9b5da2e63fc5dec799d86e434abc32394dbf414dc46bf46b15b0c8
+DIST gnutls-3.6.1.tar.xz 8064408 SHA256 20b10d2c9994bc032824314714d0e84c0f19bdb3d715d8ed55beb7364a8ebaed SHA512 1f2bd3203ea96844c531be700b44623b79f46743143edf97011aab07895ca18d62f1659c7fafc5e1c4b0686fde490836f00358bdd60d6ac0b842526db002da23 WHIRLPOOL aa859108083d7b6580b6e9c6dd2f4cbf43bb444114339ca68bc7bc45a1238b7793b50e95fdd26fa9592a8892881fedd79697999111f568f3a56e32be91996e65
 EBUILD gnutls-3.5.13.ebuild 4239 SHA256 1a469cfd52bb5ae35dd8c082d92da70eb95df5d31d6408ebce877e4ee5414367 SHA512 7a3ab4ada4edc640dac61f6fa7054d4ef1b8e3c434634cbe6edfbc1d7a99694e9612c5d2f6bf39c57389ef55f73f602b90c3a4e472ae3a0e571d83d6bc54fd42 WHIRLPOOL 7558a9899237bd14695304d52e108b0aaf314e489d5635a7180dd063c0c09e95b0ac17482759f59c7a23f38d2188a6030f9ea9fc2bb82d8e45d33247ce933970
 EBUILD gnutls-3.5.15.ebuild 4341 SHA256 41d87ba00de0d1e4410a9fc6b08c275ee698c05fc991131dc87a389b27e3edb9 SHA512 46fd00d54ef3db933d62b1c51290e24e7f7c4972925ede37fd6083e421fb90bb8adb215d446fa201661703020555c443c38090fda2086976b3e8d679221c317f WHIRLPOOL 7ebd1870bf98d39d0bf2d5652f7da5294c4ac1d6df9ad402f2f642e967bba8c5060a092534733d1984088b2978ccd0a0c08adbc4c71df490b6fded931bb6fe62
+EBUILD gnutls-3.5.16.ebuild 4348 SHA256 60325da7c14160c32e04a9debd687c857ec204b66f62067b56c8b31b3d7b7f8f SHA512 9937ce68b1e6322a60ad8e03b1e75dbdce825444aa879e563a77002040ac0d26b6b98739ac5b1f70827d93621f873e1f822cf5bc58f1766a7d70207781e75b83 WHIRLPOOL a71d1bfc14f273791af793de045e68810bbfd8c4c0ef0b0d734efee7e8ff283aa87996d91ec97a9331461dca1b7f331db2283fd1136e6ed57640852c83d3f53b
 EBUILD gnutls-3.6.0.ebuild 3965 SHA256 9711114c2b419436ccfa3fae4044802e22fa35471bd9285cfc3408f36be50989 SHA512 87f609adfed0b553b68dac75a4a89a17b6e51a28be4ebb8a4ba810bfa1f984ee6d57a5f0a7c91f32a5af3c0e7548b7abe9ec471352b905227a8897ffbc435f29 WHIRLPOOL 5466e3f81ca9c0ff730274225c38c36d0addb985b2e3c3cf27522cf71d7ae2602039398b4f695185391f77233cd6045edb9cf371988b6d48cb3509fc3f1fcafb
+EBUILD gnutls-3.6.1.ebuild 3965 SHA256 9711114c2b419436ccfa3fae4044802e22fa35471bd9285cfc3408f36be50989 SHA512 87f609adfed0b553b68dac75a4a89a17b6e51a28be4ebb8a4ba810bfa1f984ee6d57a5f0a7c91f32a5af3c0e7548b7abe9ec471352b905227a8897ffbc435f29 WHIRLPOOL 5466e3f81ca9c0ff730274225c38c36d0addb985b2e3c3cf27522cf71d7ae2602039398b4f695185391f77233cd6045edb9cf371988b6d48cb3509fc3f1fcafb
 MISC ChangeLog 17487 SHA256 745581f186ce927f027e522a8526063db87e0f641ee11341812bb5f63f9b33f4 SHA512 c002d5c6d3dbfb1b0d6fb98971e1a0863984504f8f8dd6a3e14e14b8345e3e1707ae5048cdddd84417a527c8c654f5d947d4dd5d722f98b21349a1ec199c03e1 WHIRLPOOL 1497e5ef4f12af6e20ab11ce5fedd3b90e590886d423e5cf2aeb3839ce1b5a0077370b13683c2c17f921524e8e4e988a4c72cbfd757148097bed92ce1ef6f803
 MISC ChangeLog-2015 82624 SHA256 4fe397e159cdb07634ca978c94cc0b39eca917b0ba6ba076d8a604a493048226 SHA512 5e51b3daec255369511ffdab025e38c8b0328981534f78ee9b878ce53b101c2a66227b6990743010dc842fbf283748227a39edee290ddcb0c9caabb783c248c1 WHIRLPOOL 7eac80b27265b5035b09fc24c318602153f84bbaa242b5a490380fa2134a5bbe2ba4f946d5d34057c7f99b4c6a1a8fcbb2e53026418347ffda04d6477cd95be7
 MISC metadata.xml 1261 SHA256 8b7398e78d0897f95937f18de6768d0bc5aa710f50a7fca7f0e77ad90794222b SHA512 80a2e2d7a81cd6f19d361d31b3f7356a3664aa637531943fdb8d0876b13eddbc5a72aeac60506ae751105c35004de8fe5149ce149dd4b56b10c3522428885992 WHIRLPOOL 6c597442b0a270ded3b49c54ab04106fd2f74c45b64a2f552498ca0f262d088f0daf0771d4eedec6fa3810db0dae54a168e1fe7da2e8f815a6be7423ac7adef5
diff --git a/net-libs/gnutls/gnutls-3.5.16.ebuild b/net-libs/gnutls/gnutls-3.5.16.ebuild
new file mode 100644
index 000000000000..f4f614daebed
--- /dev/null
+++ b/net-libs/gnutls/gnutls-3.5.16.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit libtool ltprune multilib-minimal versionator
+
+DESCRIPTION="A TLS 1.2 and SSL 3.0 implementation for the GNU project"
+HOMEPAGE="http://www.gnutls.org/"
+SRC_URI="mirror://gnupg/gnutls/v$(get_version_component_range 1-2)/${P}.tar.xz"
+
+LICENSE="GPL-3 LGPL-2.1"
+SLOT="0/30" # libgnutls.so number
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE_LINGUAS=" en cs de fi fr it ms nl pl sv uk vi zh_CN"
+IUSE="+cxx dane doc examples guile +idn nls openpgp +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind zlib ${IUSE_LINGUAS// / linguas_}"
+
+REQUIRED_USE="
+	test-full? ( guile pkcs11 openpgp openssl idn seccomp tools zlib )"
+
+# NOTICE: sys-devel/autogen is required at runtime as we
+# use system libopts
+RDEPEND=">=dev-libs/libtasn1-4.9:=[${MULTILIB_USEDEP}]
+	dev-libs/libunistring:=[${MULTILIB_USEDEP}]
+	>=dev-libs/nettle-3.1:=[gmp,${MULTILIB_USEDEP}]
+	>=dev-libs/gmp-5.1.3-r1:=[${MULTILIB_USEDEP}]
+	tools? ( sys-devel/autogen )
+	dane? ( >=net-dns/unbound-1.4.20[${MULTILIB_USEDEP}] )
+	guile? ( >=dev-scheme/guile-1.8:=[networking] )
+	nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
+	pkcs11? ( >=app-crypt/p11-kit-0.23.1[${MULTILIB_USEDEP}] )
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+	idn? ( >=net-dns/libidn2-0.16-r1[${MULTILIB_USEDEP}] )
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20140508
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)"
+DEPEND="${RDEPEND}
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	doc? ( dev-util/gtk-doc )
+	nls? ( sys-devel/gettext )
+	valgrind? ( dev-util/valgrind )
+	test? (
+		seccomp? ( sys-libs/libseccomp )
+	)
+	test-full? (
+		guile? ( >=dev-scheme/guile-2 )
+		app-crypt/dieharder
+		app-misc/datefudge
+		dev-libs/softhsm:2[-bindist]
+		net-dialup/ppp
+		net-misc/socat
+	)"
+
+DOCS=(
+	README.md
+	doc/certtool.cfg
+)
+
+HTML_DOCS=()
+
+pkg_setup() {
+	# bug#520818
+	export TZ=UTC
+
+	use doc && HTML_DOCS+=(
+		doc/gnutls.html
+	)
+}
+
+src_prepare() {
+	default
+
+	# force regeneration of autogen-ed files
+	local file
+	for file in $(grep -l AutoGen-ed src/*.c) ; do
+		rm src/$(basename ${file} .c).{c,h} || die
+	done
+
+	# Use sane .so versioning on FreeBSD.
+	elibtoolize
+}
+
+multilib_src_configure() {
+	LINGUAS="${LINGUAS//en/en@boldquot en@quot}"
+
+	# remove magic of library detection
+	# bug#438222
+	local libconf=($("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g'))
+
+	# TPM needs to be tested before being enabled
+	libconf+=( --without-tpm )
+
+	# hardware-accell is disabled on OSX because the asm files force
+	#   GNU-stack (as doesn't support that) and when that's removed ld
+	#   complains about duplicate symbols
+	[[ ${CHOST} == *-darwin* ]] && libconf+=( --disable-hardware-acceleration )
+
+	# Cygwin as does not understand these asm files at all
+	[[ ${CHOST} == *-cygwin* ]] && libconf+=( --disable-hardware-acceleration )
+
+	ECONF_SOURCE=${S} econf \
+		$(multilib_native_enable manpages) \
+		$(multilib_native_use_enable doc gtk-doc) \
+		$(multilib_native_use_enable doc) \
+		$(multilib_native_use_enable guile) \
+		$(multilib_native_use_enable seccomp seccomp-tests) \
+		$(multilib_native_use_enable test tests) \
+		$(multilib_native_use_enable test-full full-test-suite) \
+		$(multilib_native_use_enable tools) \
+		$(multilib_native_use_enable valgrind valgrind-tests) \
+		$(use_enable cxx) \
+		$(use_enable dane libdane) \
+		$(use_enable nls) \
+		$(use_enable openpgp openpgp-authentication) \
+		$(use_enable openssl openssl-compatibility) \
+		$(use_enable sslv2 ssl2-support) \
+		$(use_enable sslv3 ssl3-support) \
+		$(use_enable static-libs static) \
+		$(use_enable tls-heartbeat heartbeat-support) \
+		$(use_with idn libidn2) \
+		$(use_with idn) \
+		$(use_with pkcs11 p11-kit) \
+		$(use_with zlib) \
+		--with-unbound-root-key-file="${EPREFIX}/etc/dnssec/root-anchors.txt" \
+		--without-included-libtasn1 \
+		"${libconf[@]}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files --all
+
+	if use examples; then
+		docinto examples
+		dodoc doc/examples/*.c
+	fi
+}
diff --git a/net-libs/gnutls/gnutls-3.6.1.ebuild b/net-libs/gnutls/gnutls-3.6.1.ebuild
new file mode 100644
index 000000000000..c8182318d3df
--- /dev/null
+++ b/net-libs/gnutls/gnutls-3.6.1.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit libtool ltprune multilib-minimal versionator
+
+DESCRIPTION="A TLS 1.2 and SSL 3.0 implementation for the GNU project"
+HOMEPAGE="http://www.gnutls.org/"
+SRC_URI="mirror://gnupg/gnutls/v$(get_version_component_range 1-2)/${P}.tar.xz"
+
+LICENSE="GPL-3 LGPL-2.1"
+SLOT="0/30" # libgnutls.so number
+KEYWORDS=""
+IUSE_LINGUAS=" en cs de fi fr it ms nl pl sv uk vi zh_CN"
+IUSE="+cxx dane doc examples guile +idn nls +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind ${IUSE_LINGUAS// / linguas_}"
+
+REQUIRED_USE="
+	test-full? ( cxx dane doc examples guile idn nls openssl pkcs11 seccomp tls-heartbeat tools )"
+
+# NOTICE: sys-devel/autogen is required at runtime as we
+# use system libopts
+RDEPEND=">=dev-libs/libtasn1-4.9:=[${MULTILIB_USEDEP}]
+	dev-libs/libunistring:=[${MULTILIB_USEDEP}]
+	>=dev-libs/nettle-3.1:=[gmp,${MULTILIB_USEDEP}]
+	>=dev-libs/gmp-5.1.3-r1:=[${MULTILIB_USEDEP}]
+	tools? ( sys-devel/autogen )
+	dane? ( >=net-dns/unbound-1.4.20[${MULTILIB_USEDEP}] )
+	guile? ( >=dev-scheme/guile-1.8:=[networking] )
+	nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
+	pkcs11? ( >=app-crypt/p11-kit-0.23.1[${MULTILIB_USEDEP}] )
+	idn? ( >=net-dns/libidn2-0.16-r1[${MULTILIB_USEDEP}] )
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20140508
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)"
+DEPEND="${RDEPEND}
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	doc? ( dev-util/gtk-doc )
+	nls? ( sys-devel/gettext )
+	valgrind? ( dev-util/valgrind )
+	test? (
+		seccomp? ( sys-libs/libseccomp )
+	)
+	test-full? (
+		guile? ( >=dev-scheme/guile-2 )
+		app-crypt/dieharder
+		app-misc/datefudge
+		dev-libs/softhsm:2[-bindist]
+		net-dialup/ppp
+		net-misc/socat
+	)"
+
+DOCS=(
+	README.md
+	doc/certtool.cfg
+)
+
+HTML_DOCS=()
+
+pkg_setup() {
+	# bug#520818
+	export TZ=UTC
+
+	use doc && HTML_DOCS+=(
+		doc/gnutls.html
+	)
+}
+
+src_prepare() {
+	default
+
+	# force regeneration of autogen-ed files
+	local file
+	for file in $(grep -l AutoGen-ed src/*.c) ; do
+		rm src/$(basename ${file} .c).{c,h} || die
+	done
+
+	# Use sane .so versioning on FreeBSD.
+	elibtoolize
+}
+
+multilib_src_configure() {
+	LINGUAS="${LINGUAS//en/en@boldquot en@quot}"
+
+	# remove magic of library detection
+	# bug#438222
+	local libconf=($("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g'))
+
+	# TPM needs to be tested before being enabled
+	libconf+=( --without-tpm )
+
+	# hardware-accell is disabled on OSX because the asm files force
+	#   GNU-stack (as doesn't support that) and when that's removed ld
+	#   complains about duplicate symbols
+	[[ ${CHOST} == *-darwin* ]] && libconf+=( --disable-hardware-acceleration )
+
+	# Cygwin as does not understand these asm files at all
+	[[ ${CHOST} == *-cygwin* ]] && libconf+=( --disable-hardware-acceleration )
+
+	ECONF_SOURCE=${S} econf \
+		$(multilib_native_enable manpages) \
+		$(multilib_native_use_enable doc gtk-doc) \
+		$(multilib_native_use_enable doc) \
+		$(multilib_native_use_enable guile) \
+		$(multilib_native_use_enable seccomp seccomp-tests) \
+		$(multilib_native_use_enable test tests) \
+		$(multilib_native_use_enable test-full full-test-suite) \
+		$(multilib_native_use_enable tools) \
+		$(multilib_native_use_enable valgrind valgrind-tests) \
+		$(use_enable cxx) \
+		$(use_enable dane libdane) \
+		$(use_enable nls) \
+		$(use_enable openssl openssl-compatibility) \
+		$(use_enable sslv2 ssl2-support) \
+		$(use_enable sslv3 ssl3-support) \
+		$(use_enable static-libs static) \
+		$(use_enable tls-heartbeat heartbeat-support) \
+		$(use_with idn) \
+		$(use_with pkcs11 p11-kit) \
+		--with-unbound-root-key-file="${EPREFIX}/etc/dnssec/root-anchors.txt" \
+		--without-included-libtasn1 \
+		"${libconf[@]}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files --all
+
+	if use examples; then
+		docinto examples
+		dodoc doc/examples/*.c
+	fi
+}
diff --git a/net-libs/libtorrent-rasterbar/Manifest b/net-libs/libtorrent-rasterbar/Manifest
index 49a9d700ac25..3e6a098e99a9 100644
--- a/net-libs/libtorrent-rasterbar/Manifest
+++ b/net-libs/libtorrent-rasterbar/Manifest
@@ -5,10 +5,8 @@ AUX libtorrent-rasterbar-1.0.11-move-header.patch 1277 SHA256 76b30ae734a927ac8f
 AUX libtorrent-rasterbar-1.0.9-test_torrent_parse.patch 1240 SHA256 c736e1e6641b19d47f11b13e7e732a6344357c47b1c65aa6108ed9eaae641002 SHA512 8e6cca0ac5d1e1b43e771921c64258b61e5c3c1249ae9c1b80d784153d919aff1eb7ebf3141a7bc5b926553b2c3c027a5659703da52b9f901c77bb288436edbb WHIRLPOOL 8ed51aa4b0aecb65c886f73cc1276e845a7e1527a76cc623b49965754018f399721d0f19a5c40452927a69ac390439b40ecbca5c09f68d131f5d935a0c4bce10
 DIST libtorrent-rasterbar-1.0.10.tar.gz 3324494 SHA256 a865ceaca8b14acdd7be56d361ce4e64361299647e157ef7b3ac7e2812ca4c3e SHA512 08976239ec12e2d67a974dadf3f16330f48e4b6de314f9d97c5fbbdbc696b76b6b1f8e20ceab6830d46d17b1bfd7e2fe4048fb1a5a97ece12c242c0cd0f7ded2 WHIRLPOOL 1e4ef2fb41eef0b825bd7c8c665638e3f689c3cefca3caa18a01c328caad9d31cd417fb49d25a7d55da6457a89e35a891427d70fb4f4d070c74be2e2e0347a60
 DIST libtorrent-rasterbar-1.0.11.tar.gz 3325786 SHA256 828d686770346f6da2c143c5a2844c5f5e407eb4a37982e90022763508abd62f SHA512 770d16b241174ae4b121af9b2ac7bcde8b14c6ed99352b827b760a3cbdc2c0ebd0d505319762897720c5f72acdff506ee9948ac1140e6d4591805eca5439b184 WHIRLPOOL e56bfe0830cfc7776436552171b14b08913d99a2c726c9eefa828027caaa96d9c3d97e6442a3b53f315eaa3e7e0f68175d813dbab1d6de1da5937054fc6cac9c
-DIST libtorrent-rasterbar-1.1.4.tar.gz 3917557 SHA256 ccf42367803a6df7edcf4756d1f7d0a9ce6158ec33b851b3b58fd470ac4eeba6 SHA512 50f5dfffbd9e6ba21dbe328be17962f29088a326c2c2bf177e1137ed2900323b9a5bae75ee63635404928452f206c72dd4f9100438a6b802bd36b11430e51bc3 WHIRLPOOL f1231e97cdaf820910dafbaf83f9edadf3b70a8fadc71b370e9813d9b9893e6ee893fccfc71a20438ca0b138ac9035c220b656843e7af2755451bf6587f07fc5
 DIST libtorrent-rasterbar-1.1.5.tar.gz 3942894 SHA256 103134068389155a0f2bccaca72a57765460eb8188495089dcad280dcf426930 SHA512 d0e7fe944c8a396aaf79ce80c7513be07a855bc8a9eee3bca46ed83d5e190aaa5ea4dc9a8a7208e27e18ae8f15733e6e34eabd375f0bde43d4dc4607840782e7 WHIRLPOOL 1f78afceb67a69418d2afac915616812fe3a223c548ba2baf7e643fc5e63c79bd87998473ac4b6cab6ac0093d7f43ac91bcfba41c9d6ce0fc1ac46914fce74d2
 EBUILD libtorrent-rasterbar-1.0.10.ebuild 2431 SHA256 c2b6473d53562301ec57d3ea147d30a61715b5ba3ca027f9c2c90bd4c63c6f44 SHA512 44a727e1e5f8fc1e18d1ba64807fc822e166afb1e2b7b274343232f526972d865c22feccd593dcbdcc488557f139a7aeb6a85bae4cf2e29f8c271a204dfd6857 WHIRLPOOL 8a8ebff96da931f3c402189b1d040998a14f578efcc5efedb5d4b80f71ff3ac94c757c76e6ff0bb832c8bb4dc8cd93b665ed903f05675c10cc1f3f931302ba8c
 EBUILD libtorrent-rasterbar-1.0.11-r1.ebuild 2623 SHA256 5cbf92b7321c8ace0bb9f09219c049ecb09631fe00394d4b4e9840f318bd1362 SHA512 486a328d3ee6cb6d434a75f3368995a28b85193e9aa3b8a761d52c710e201112b2a9a89fd127ae87370d2eebc5cc06c4122f792c21d80c0d698c1125f673bd77 WHIRLPOOL c3b2a633fdc1535e3da2381c79a49da4baf0a94d06dca1a4483cd46388c3c3ae8a2aab04ada68e5895c1226b87bc2d479fc9cb71b2e050aaf0cfeaacfdd8b838
-EBUILD libtorrent-rasterbar-1.1.4.ebuild 2334 SHA256 99111ace0270ab88dc27cf8542285b6d603f26bf7889d063c17175f5d40a272d SHA512 c40d33148287943821e6da1ac724cf7124af40d44364b2875ca1f429dd021d8fc237244d0eb23f5df70dcd4d1276f251033e329caafef647c6a731d82c23fbae WHIRLPOOL 12d6e247f9894f3c8a9c056547e4705d161bb87e0d9a2ea4488b88295e41dac69274c9dd38353f0eb678a151653685e97af15a52f8b6d92dfe2841b7a2c4f5fb
-EBUILD libtorrent-rasterbar-1.1.5.ebuild 2334 SHA256 99111ace0270ab88dc27cf8542285b6d603f26bf7889d063c17175f5d40a272d SHA512 c40d33148287943821e6da1ac724cf7124af40d44364b2875ca1f429dd021d8fc237244d0eb23f5df70dcd4d1276f251033e329caafef647c6a731d82c23fbae WHIRLPOOL 12d6e247f9894f3c8a9c056547e4705d161bb87e0d9a2ea4488b88295e41dac69274c9dd38353f0eb678a151653685e97af15a52f8b6d92dfe2841b7a2c4f5fb
+EBUILD libtorrent-rasterbar-1.1.5-r1.ebuild 2402 SHA256 40233eee2963010229498247cf8081f1307a6ba51ab3b028ca009b9706365bd9 SHA512 2286e415d754cefbb77fd85ab0bad0ad50811c75c936c2446d09350b9ed2144c39fc8b14c7ec2862fd3c61cce0dfd96ff8e633c03aeb29991331834b0e2f4f52 WHIRLPOOL 2a5a7e0fc15bab29016e6f6942935ad9ac4bce2e40a5ced46e9a93c5307803aff78e74feb79501026a9e5d89ef7e7aed241dc011581b3143825e18ee6b222819
 MISC metadata.xml 527 SHA256 e53fe78e5ff72e704f0119e0226da2416169291e7a840340c811dd123d72538e SHA512 7dd3d0492dd77ffb05fa50b96253d8e7cc01c86b9eedf3891a5b8b09e49ef8d51747890a874609c077d95d5144f949bb31db9bb40e0ba520a3917a548db129f3 WHIRLPOOL 8f531637c7660ea459f60795f94db29f575552fb6a015283c9253d01d7c7140028b645985109e838bdb45ecab9e43acb57b58269c8af69523e3eb7ba1f07f06e
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.4.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.5-r1.ebuild
index 86fa8d7e920c..ccafa8fcf824 100644
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.4.ebuild
+++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.5-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_REQ_USE="threads"
 DISTUTILS_OPTIONAL=true
 DISTUTILS_IN_SOURCE_BUILD=true
 
-inherit distutils-r1 eutils versionator
+inherit distutils-r1 flag-o-matic versionator
 
 MY_PV=$(replace_all_version_separators _)
 
@@ -54,6 +54,8 @@ src_prepare() {
 }
 
 src_configure() {
+	append-cxxflags -std=c++11 # bug 634506
+
 	local myeconfargs=(
 		$(use_enable debug)
 		$(use_enable debug logging)
@@ -98,5 +100,5 @@ src_install() {
 	}
 	use python && distutils-r1_src_install
 
-	prune_libtool_files
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.5.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.5.ebuild
deleted file mode 100644
index 86fa8d7e920c..000000000000
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.5.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-PYTHON_REQ_USE="threads"
-DISTUTILS_OPTIONAL=true
-DISTUTILS_IN_SOURCE_BUILD=true
-
-inherit distutils-r1 eutils versionator
-
-MY_PV=$(replace_all_version_separators _)
-
-DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability"
-HOMEPAGE="http://libtorrent.org"
-SRC_URI="https://github.com/arvidn/libtorrent/releases/download/libtorrent-${MY_PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/9"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="debug +dht doc examples libressl python +ssl static-libs test"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	dev-libs/boost:=[threads]
-	virtual/libiconv
-	examples? ( !net-p2p/mldonkey )
-	python? (
-		${PYTHON_DEPS}
-		dev-libs/boost:=[python,${PYTHON_USEDEP}]
-	)
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-"
-DEPEND="${RDEPEND}
-	sys-devel/libtool
-"
-
-src_prepare() {
-	default
-
-	# bug 578026
-	# prepend -L${S}/... to ensure bindings link against the lib we just built
-	sed -i -e "s|^|-L${S}/src/.libs |" bindings/python/link_flags.in || die
-
-	# prepend -I${S}/... to ensure bindings use the right headers
-	sed -i -e "s|^|-I${S}/src/include |" bindings/python/compile_flags.in || die
-
-	use python && distutils-r1_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable debug)
-		$(use_enable debug logging)
-		$(use_enable debug disk-stats)
-		$(use_enable dht dht $(usex debug logging yes))
-		$(use_enable examples)
-		$(use_enable ssl encryption)
-		$(use_enable static-libs static)
-		$(use_enable test tests)
-		--with-libiconv
-	)
-	econf "${myeconfargs[@]}"
-
-	if use python; then
-		python_configure() {
-			econf "${myeconfargs[@]}" \
-				--enable-python-binding \
-				--with-boost-python="${EPYTHON#python}"
-		}
-		distutils-r1_src_configure
-	fi
-}
-
-src_compile() {
-	default
-
-	python_compile() {
-		cd "${BUILD_DIR}/../bindings/python" || die
-		distutils-r1_python_compile
-	}
-	use python && distutils-r1_src_compile
-}
-
-src_install() {
-	use doc && HTML_DOCS+=( "${S}"/docs )
-
-	default
-
-	python_install() {
-		cd "${BUILD_DIR}/../bindings/python" || die
-		distutils-r1_python_install
-	}
-	use python && distutils-r1_src_install
-
-	prune_libtool_files
-}
diff --git a/net-libs/rest/Manifest b/net-libs/rest/Manifest
index ffbe7d6a9757..dbf1c645c05e 100644
--- a/net-libs/rest/Manifest
+++ b/net-libs/rest/Manifest
@@ -1,5 +1,7 @@
 DIST rest-0.8.0.tar.xz 334024 SHA256 e7b89b200c1417073aef739e8a27ff2ab578056c27796ec74f5886a5e0dff647 SHA512 dfcfed4196e613ed4415ea04eaa890e47d1d2e6899afdefff3dd7bfed5bcace58724158deb4c0cc7974f9a4493d00d5c0a27415160f2795df81c2210c14a823a WHIRLPOOL b4a2de0fac2fe5bd6280c5e06a18a2b3b2fe1ca3d6f6a38ae1a34c3a9d1a3d8efa8c19ffac15ed4f9ca2ef7a7febf225f8954f6446c3a7078a3e2c02ff08ee73
+DIST rest-0.8.1.tar.xz 333376 SHA256 0513aad38e5d3cedd4ae3c551634e3be1b9baaa79775e53b2dba9456f15b01c9 SHA512 824a341db3827e4360abe03e33735918c68913c70d797699ef74271080a1985872006ec70fd994dc8fa3fbfef417e6fe979883c11286512d0ce623b8368e40c3 WHIRLPOOL cab32832ed08c60bfd662a6b32d7b98b0300e60032c979dc9ac1152f0fcf39e63d1eb1a4b5d65bfae5fae9e3e5cc9e4ac94cc14eda86c0a0000aa00e9c52d872
 EBUILD rest-0.8.0.ebuild 1483 SHA256 4c64a04f8ae6de7ec5d6bb6b860056ee67732142e28992b19a4b0859945ef687 SHA512 d308e4194480917c537a696c9e825dbffe17c73dca684adb653e73baed63869534ae0d09316c669a2452d267d21bfc724ebdf442178b8e95e7b20645687c2279 WHIRLPOOL 163c465d6840fe0c619372bda771d2c1a4933ed4e98a14ca6501ecf87949d502e04286bc3d0ab29ea66e0a998844b29e7e512a3d6dcc64a766e731234ccaffff
+EBUILD rest-0.8.1.ebuild 1487 SHA256 c6c79fe448aa8ea6ef9d541f4c0e996e39a72acfb4174207cf657c2e1a583fdc SHA512 1395b97d0e682a303c33995a2322a05414034858d27674e9e5aea7b8ef66ce0ed740f00e8da48fed953d40e742bbddb128411e6294939d6d5786d7af48231ab5 WHIRLPOOL 499e8255e90e957a78d222f7be0cf1d87bfef8111bc82d2f7842f17fae3eddf10105607955b32d0290ba7a4512245a9c0538c6b730feb1754fdc886805e7a3e8
 MISC ChangeLog 4454 SHA256 5e42fa635b46e3e44193170e08d69d919af8f5de99bed6cfec75badc94ceb5da SHA512 5cbfaad67725de9b5c0e367af8ee85e5e04c2d4b34446a5f1adae44d16d1b162c604580eb2ea78c53f65ceb62a8421fefe5811956187217ee7c55b43a67368cb WHIRLPOOL b0d2733de73c2e6d9bcabc539e13d4416b6b670ddb612a1e8324cfde38535e29763ea3aebe485e595db3884617a83611b03fde943debc590b30c843e0352bc9a
 MISC ChangeLog-2015 5469 SHA256 38f95baadbbf93e8185399b0f42581585ad3e44fe4ae1e2ff69cfa84f1d6d8da SHA512 2dc1af7fd3fe124131da9c9fb16c1a3c54fb31bd018b963d1f8c6d9cce41f42358cb7ab05364d952cc33d309348f3e49828f91180e15e2fcc25b603801a8e670 WHIRLPOOL 61d6271a17d2e8fd51f86c30c01fe94b57bfb9ba61409dfc9575d620115063d78616b79bbbac125e43355218b90e7dcedf13e03ff658e3ca3512587e53884de1
 MISC metadata.xml 259 SHA256 6d16d32cce05219baff0d7aef9baf4f8f4622ba77a55e9bc5ae9b074ae8d4600 SHA512 fbef629394690b3a5608abc6344816f6acf1e8e2663f29949fd14a662c628f16fee77a1ec1641066806d143fb94c1571bc5b46b829dc53620af6956377fe15cc WHIRLPOOL dd2c856848fdc98df5a4ffca31b95078656373a87ccf2e44be410e7139f2980f3ebb0ae951e2e92fc46ce8e3a3ecefec169c3a15bbcceba69c1bd8224a8dd271
diff --git a/net-libs/rest/rest-0.8.1.ebuild b/net-libs/rest/rest-0.8.1.ebuild
new file mode 100644
index 000000000000..da3e684eae12
--- /dev/null
+++ b/net-libs/rest/rest-0.8.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+GNOME2_LA_PUNT="yes"
+
+inherit eutils gnome2 multilib-minimal virtualx
+
+DESCRIPTION="Helper library for RESTful services"
+HOMEPAGE="https://wiki.gnome.org/Projects/Librest"
+
+LICENSE="LGPL-2.1"
+SLOT="0.7"
+IUSE="+introspection test"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+# Coverage testing should not be enabled
+RDEPEND="
+	app-misc/ca-certificates
+	>=dev-libs/glib-2.24:2[${MULTILIB_USEDEP}]
+	dev-libs/libxml2:2[${MULTILIB_USEDEP}]
+	net-libs/libsoup:2.4[${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.13
+	>=dev-util/intltool-0.40
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	test? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+"
+
+multilib_src_configure() {
+	# gnome support only adds dependency on obsolete libsoup-gnome
+	# https://bugzilla.gnome.org/show_bug.cgi?id=758166
+	ECONF_SOURCE=${S} \
+	gnome2_src_configure \
+		--disable-static \
+		--disable-gcov \
+		--without-gnome \
+		--with-ca-certificates="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt \
+		$(multilib_native_use_enable introspection)
+
+	if multilib_is_native_abi; then
+		ln -s "${S}"/docs/reference/rest/html docs/reference/rest/html || die
+	fi
+}
+
+multilib_src_test() {
+	# Tests need dbus
+	virtx emake check
+}
+
+multilib_src_compile() {
+	gnome2_src_compile
+}
+
+multilib_src_install() {
+	gnome2_src_install
+}