gentoo resync 04.02.2018

11 files changed, 132 insertions, 224 deletions

diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 9ffe6a6c8d77..45433a7d5886 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/gnome-online-accounts/Manifest b/net-libs/gnome-online-accounts/Manifest
index 106c73c54c4b..22a532facb73 100644
--- a/net-libs/gnome-online-accounts/Manifest
+++ b/net-libs/gnome-online-accounts/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-online-accounts-3.22.7.tar.xz 1404820 BLAKE2B 7a9bd80c5a240ff7172dda5cfe93fa7410b83e7f3b14c615a465b322d5ee07b220773c7424e8dd4c2e0dcacbd11545cfa968f247e545a9eaa530e6d2ecebfb72 SHA512 76a5b6897540f05126786caeddd392d465063571e3884484aa68cd66de851f2f72351afe74dd7e38d8fb8a628d57bd8dde0c8379f909f9de19e451cdf9112b67
 DIST gnome-online-accounts-3.24.4.tar.xz 1412004 BLAKE2B 96e92eefeedb94563af755367b4932469d8a55bd545324bb1ebffb4798bd0a499aafe9523abc7c707342b1c78f912c499335708dfb3f9a149567b64877f0bbd9 SHA512 6e12f03d3ff9b9c831705f0310923b2c3e0daeee1304bb3dfa52fd17d6df49656f3380a1ffd9f30f75890340fb7ee23f53789e4df357a0aeba4e31667fd9c45a
-EBUILD gnome-online-accounts-3.22.7.ebuild 2471 BLAKE2B 91861dafa0a3d5a4bca7664fcbd4a0f4b75942babd2763e5e2b0e2932a6c803597bd1869a22bd6a96d032f197aee5c33ece56e45acd2bc1f21cfa78fc9ba9a8a SHA512 b41c1207d37f821942ea448cc9cb69aee186b16888c2da5177790eac7cbd76a1d8672dfe2711d95903c87428616853aacdaae6bdc2711b3518dd20a069786005
 EBUILD gnome-online-accounts-3.24.4.ebuild 2471 BLAKE2B d5748c5b547daaba2a7eddd8141219d00f102f3522bfd3e7d03547db3a7114a9fb739a7d93a642fdcca6a549734ca4c20bd724fbd2d72b9453d8eae407f143fb SHA512 a7356397015414a0a4908eef03f38cb96286268bda14a82bb996ef2df1bdfde5969b0761b0f4a7ded9c4e4d065f682f16f60559b3af6b946fdb53cfc6b56531d
 MISC metadata.xml 473 BLAKE2B 316b4409acb16dbde8349acb5bbdeee6cfe96968bb15e90a2c3d96346f6ead282993a48e6b5ea201d9f0b3293e68259b7cd99bab1399cb6a92e1a0cc7291c197 SHA512 fe0bb40a0e1962c67a0208b6c2b9603ae37966b4427b5141efa7f63163fff3eed542a58400c0ac31e508589074c80d130de56733b55c7b10270e2e89de093a03
diff --git a/net-libs/gnome-online-accounts/gnome-online-accounts-3.22.7.ebuild b/net-libs/gnome-online-accounts/gnome-online-accounts-3.22.7.ebuild
deleted file mode 100644
index 77b22c15dc76..000000000000
--- a/net-libs/gnome-online-accounts/gnome-online-accounts-3.22.7.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# 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.40: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/miniupnpc/Manifest b/net-libs/miniupnpc/Manifest
index 9077bf767c24..dc2b7a59fe32 100644
--- a/net-libs/miniupnpc/Manifest
+++ b/net-libs/miniupnpc/Manifest
@@ -1,5 +1,7 @@
 DIST miniupnpc-2.0.20170509.tar.gz 86055 BLAKE2B 7da640c4baac58aa26965a670877953b4c2d27aff08b604366bad6913b30c152d52120099f37c6250eeed97396ff412a4dd6000179070a82eebd3c052596b0d0 SHA512 71ec052ef6c8ad0d529e467ddae6eae19a93b9816174eeac753aa90e036cc2f00cf7e8d1cdb188ef8280849a988fe2995e37b63f8e2a361e021c1d1b306bff6f
 DIST miniupnpc-2.0.20171212.tar.gz 86607 BLAKE2B fce582c4125192f74f6ffb174295020af1c9b574b2094f5565a5e49641820a2d9cef719de59cb94bfd207182505237c22cf58425e1a7b47f5dfe2eb84c07d3c5 SHA512 d25708f4e2ef7311878ba6d17cb506f4bfe5c9cc6b7a79e4168f143ca9da8b96beb018c42dd735f0b23806668eba2308b7de26d1b506d91c23f79c7ed77399a0
+DIST miniupnpc-2.0.20180203.tar.gz 86772 BLAKE2B 6959d7033f12d3cbe52bbe1ec2178c068a448441d22501f44a7228b2050b53ff5e955d390ff03071e6f34df2a652040bf5ab23c59aca16dc4379e380dd46fea8 SHA512 b8ebf02ed01c5217a789397b7c224ba21d233cb544ccdfd907fb9c6f49adae6864eb17963b9b9f654ecf3fde864c191fd7d00c5cf614771a7137a030f341f226
 EBUILD miniupnpc-2.0.20170509.ebuild 1266 BLAKE2B 275a77b2813007c8055df57d2e8d74c05c02e7f81af1b1ad766a4c9f274f955c7d56779184983a1e45962bbc38e9ff58f15f4bfc076ed86cc1400eabac4f2dcb SHA512 aeeaba172f38162342256afc17223e1efce42f149561ca0e19bcd8336d32dd74d51a55951f4df79663d1999702930eb4dcd6ceebeea9afe82d9f376432dd7271
 EBUILD miniupnpc-2.0.20171212.ebuild 1273 BLAKE2B 2fff06efc3482305a3a45a9e94bf1dca939c234d66d26ed9649d547b0e98c517cb1018bb1bd14209b88129fd113a4b64fce712f782da10dcb4a860e1d8d1497e SHA512 9de720f270d9a5d214ce314b85722b0b8a0db75d2e6624a7528d0fee12e993ac40ee5442ce0ec89bf65d03a018015b86894425b43a2d547e98e6ac25a99e1012
+EBUILD miniupnpc-2.0.20180203.ebuild 1339 BLAKE2B be0965e64f83087fffb495b3c3de74d691b2575fd8d14b36c56284404e912b623baea93027c61d58d354ef00c8fb31f4581b01959606683e1d23563e75b72891 SHA512 af3b05b0af780f4b8707209b7d1bbd26c8952c0f9314f613569f6da6e03a5bac9961d19e16e6c0876abee7006401c909b02e5c058daba7e2dbd6922aba98110e
 MISC metadata.xml 243 BLAKE2B 997913e51bb9c2ba601c78673246d3845d1078f5be11ff209532c5afc9f433d4cfe7a0066ba23677d23ffe368d7ee718df71d28301d45c0473f50e931f674165 SHA512 ded2bb7e056d9081e11b0470aa2874fbe9b5e63f0178bec611291f639763a9bd85a076dbc526e01df1403dea4d0eb28913addb346b676084e690e063b68eca28
diff --git a/net-libs/miniupnpc/miniupnpc-2.0.20180203.ebuild b/net-libs/miniupnpc/miniupnpc-2.0.20180203.ebuild
new file mode 100644
index 000000000000..3a1c24a1b100
--- /dev/null
+++ b/net-libs/miniupnpc/miniupnpc-2.0.20180203.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="UPnP client library and a simple UPnP client"
+HOMEPAGE="http://miniupnp.free.fr/"
+SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/16"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="ipv6 kernel_linux static-libs"
+
+RDEPEND=""
+DEPEND="kernel_linux? ( sys-apps/lsb-release sys-apps/which )"
+
+src_prepare() {
+	eapply_user
+
+	# These bins are not installed, upnpc-static requires building static lib
+	sed -i -e '/EXECUTABLES =/s/ upnpc-static listdevices//' Makefile || die
+	# Prevent gzipping manpage.
+	sed -i -e '/gzip/d' Makefile || die
+
+	if ! use static-libs; then
+		sed -i \
+			-e '/FILESTOINSTALL =/s/ $(LIBRARY)//' \
+			-e '/$(INSTALL) -m 644 $(LIBRARY) $(DESTDIR)$(INSTALLDIRLIB)/d' \
+			Makefile || die
+	fi
+}
+
+# Upstream cmake causes more trouble than it fixes,
+# so we'll just stay with the Makefile for now.
+
+src_compile() {
+	tc-export CC AR
+	emake upnpc-shared $(usex static-libs upnpc-static '')
+}
+
+src_test() {
+	emake -j1 HAVE_IPV6=$(usex ipv6) check
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		PREFIX="${EPREFIX}/usr" \
+		INSTALLDIRLIB="${EPREFIX}/usr/$(get_libdir)" \
+		install
+
+	dodoc README Changelog.txt
+}
diff --git a/net-libs/nghttp2/Manifest b/net-libs/nghttp2/Manifest
index 0b9d7bd8020b..c8d8a2b5822a 100644
--- a/net-libs/nghttp2/Manifest
+++ b/net-libs/nghttp2/Manifest
@@ -1,10 +1,8 @@
-DIST nghttp2-1.10.0.tar.gz 2086580 BLAKE2B 207b3906ec3a9e38fbac6331cdb2300c6bf440ee9704d14cf0068c192e1aa95f8ba70e1fbbb9bd9d10a4dcc18d3e3ab52f2305771be7fa3f4c38362b1db533dd SHA512 4341f76ead38ba30e0dfda492e2e0f4c842f453e235fa90ee55b1e556092828236f21c6b212d0099cea005f149e4be3e63ad007009dd5228999101e563009a6f
 DIST nghttp2-1.19.0.tar.gz 2159530 BLAKE2B 09e71408e527f5cd42ed224377042d4b68ff869e86c8727f63f2a4777253da9d03bd2cadfafd655b9984c7b71a52f928906db7b73d3adf74f36e69e28dba5618 SHA512 50f45082f725c237a0e1d25af57992b9cded6c9b68f0aa95c44c16eb4448e05b14e06c853032924d03034115286163de0ad684827cfa5d70896656868fdb4e01
-DIST nghttp2-1.28.0.tar.xz 1553032 BLAKE2B 81991f7b2ebd74c9a730e22b1f220ef9dbd60f38221313b83db71f92d32590c2a8387412a494be7e33adb2f855b82ed2a9f12c1df40e4602662874f5b1881620 SHA512 c49d4e02ec8e894e01aff0b3573e5ce6a33e37ddbd777f6363a2890681a2d09d9e29794c7a6aaf20dd094b4b6da4b535f3e81ac58ef4164b1f8cca9e0da26ee9
 DIST nghttp2-1.29.0.tar.xz 1544736 BLAKE2B 1708d2c787e27d722aec27890a21e752a9fe66cdcff481615ac0bd9dcc92099946d9e5563a70137029dec54f8cc4244ef22813e0c2010572cd070ff272120bdb SHA512 a518ff1dcc9ae93f8228f4fa9110b9cbc460260a794d455530218c66317c6b96a5b14971aff25428e37326b5ce9f4d8480eefe6fcba17af23efa4ebceb56f23e
-EBUILD nghttp2-1.10.0.ebuild 1772 BLAKE2B 06a02aa841f53f66fa01ad309041510f1deb98afef97894b6784e4b05f4e4fbe36f60a33c2033cbde16e9835a29df4f77f42b37a8c53fac961937a47b43fff19 SHA512 65a431e382cc6b7494674b0c662f1f18d0c3fa0b6ca7bb16dc3ad0f60213f51113a73aa1252680c63d687424bae54bfa2fc813501e90ded0cd08e06cb6088809
+DIST nghttp2-1.30.0.tar.xz 1545352 BLAKE2B 0d52f973a63632dc1ad235f1b535c24053a8dde52dfbda957c3e40548b4de5db5975639140f207cd9ffe564b6151ed6d97de45ff070eb2cfa3d6b41f52254430 SHA512 4b79f46947777627f0a9e1384ec51ac70e273aef6d46d322aa448731726b8ca606e73dcb171170bbe91fce93c28170ff04e11da56ee90fa28d642e7bc37b50be
 EBUILD nghttp2-1.19.0.ebuild 1811 BLAKE2B 7931aa1b1477275b7efb6f174bbcd5a7c18ef6df4d69d4097d4b199d9debe43a9de9a4ef3ffee66d7bd7b7895289fddb69707a69e6eb3da49210109b5d87ea39 SHA512 5ed6ebd9d727a4803878bade7f3abd7fdf61b53ce7e04259e3c07290fd48f8a26a4b61d64aa533afa9eaaf37d4c7a7376e9f37b6bbc04637e61d6d07f603857b
-EBUILD nghttp2-1.28.0.ebuild 1815 BLAKE2B 0e9dd0e955b6e595ef5177078b3653554014ae22e58e5400c419bd465bfe8804235a5e4ef1a1f37f04c1792d1982fc8856259560cd5f97926d5b769b83a82db7 SHA512 fd44ab40a68379bbef08e3471a38db2509b0f8f6fd29db8928e0310ee758a35c1c6b5c032b442aff437020df1e079af59e849aa83e3a019dc9ea6d7fb1c564c6
 EBUILD nghttp2-1.29.0.ebuild 1860 BLAKE2B a47893c442eca9d6702eb2763547c49b8357986b57f0b3643f1a8868e85dd74b65c92c628f4176a8b1dc3b9f911e44eb255c13ea4565f7b90e628b056c50adf7 SHA512 abcd9982970c135d1babd197a41a8978578797575997c94feb623ec12f296a91aaf80899169f837f020a3810af344e1dafa6c41b72465423d26526aacf303fdd
+EBUILD nghttp2-1.30.0.ebuild 1860 BLAKE2B 1921255023f5cf1ed11003ff073094c50427849fe965440ad361a86515f75d11825b04097d4c4728a7f3158f60b94a3cdf086297c2c54f68ba25699be7dca7d7 SHA512 b3a7e529a1c7d303e47d8440a673f5ec9a72f111c5473f3a7c5cb22610ca007d260d626a6f480ae1d9cbffece42cb7ecdb21535714ef74dd1f8d087e829026c1
 EBUILD nghttp2-9999.ebuild 1934 BLAKE2B 091fa366b740f254c371d075bf24dc126f8d86f66315816b16b3c4c0177c9d2fff66d4ba916adbc203bb2d92ca6a070e80d58d6a4f30cea6bc8fa71eb3718616 SHA512 7e157bcc44e80ca78a85fe1b0e97b293646a30aedbfe7d918f5e16b96d061e9303636053675021af5ca97f84f38fabe0e54c63348f40fe9a52b00e20b0717c4d
 MISC metadata.xml 578 BLAKE2B a210790f12a0149240e59fee7702570c81a026851cfe8fdc2ce015bfb56c73150937a06e26dfabf896118a4d566b33d94ace7a622d751c0455629bf02061fcdb SHA512 a8948265c469d936a699b42978f7e8b2fdd6a7d016094242763730f75f285e6b8ed2a26d66ae8597f1c0ca9d45d47f3e2893005c0cd101e13fd4f62c6e937e28
diff --git a/net-libs/nghttp2/nghttp2-1.10.0.ebuild b/net-libs/nghttp2/nghttp2-1.10.0.ebuild
deleted file mode 100644
index 8eb853b435c9..000000000000
--- a/net-libs/nghttp2/nghttp2-1.10.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# TODO: Add python support.
-
-EAPI=6
-
-inherit multilib-minimal
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/tatsuhiro-t/nghttp2.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/tatsuhiro-t/nghttp2/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-fi
-
-DESCRIPTION="HTTP/2 C Library"
-HOMEPAGE="https://nghttp2.org/"
-
-LICENSE="MIT"
-SLOT="0/1.14" # <C++>.<C> SONAMEs
-IUSE="cxx debug hpack-tools jemalloc libressl static-libs test +threads utils xml"
-
-RDEPEND="
-	cxx? ( dev-libs/boost:=[${MULTILIB_USEDEP},threads] )
-	hpack-tools? ( >=dev-libs/jansson-2.5 )
-	jemalloc? ( dev-libs/jemalloc[${MULTILIB_USEDEP}] )
-	utils? (
-		>=dev-libs/libev-4.15[${MULTILIB_USEDEP}]
-		!libressl? ( >=dev-libs/openssl-1.0.2:0[-bindist,${MULTILIB_USEDEP}] )
-		libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
-		>=sys-libs/zlib-1.2.3[${MULTILIB_USEDEP}]
-	)
-	xml? ( >=dev-libs/libxml2-2.7.7:2[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )"
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-	econf \
-		--disable-examples \
-		--disable-failmalloc \
-		--disable-werror \
-		--without-cython \
-		--disable-python-bindings \
-		--without-spdylay \
-		$(use_enable cxx asio-lib) \
-		$(use_enable debug) \
-		$(multilib_native_use_enable hpack-tools) \
-		$(use_enable static-libs static) \
-		$(use_enable threads) \
-		$(multilib_native_use_enable utils app) \
-		$(multilib_native_use_with jemalloc) \
-		$(multilib_native_use_with xml libxml2)
-}
-
-multilib_src_install_all() {
-	use static-libs || find "${ED}"/usr -name '*.la' -delete
-}
diff --git a/net-libs/nghttp2/nghttp2-1.28.0.ebuild b/net-libs/nghttp2/nghttp2-1.30.0.ebuild
index 73177fc62199..e578deb7b24b 100644
--- a/net-libs/nghttp2/nghttp2-1.28.0.ebuild
+++ b/net-libs/nghttp2/nghttp2-1.30.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # TODO: Add python support.
@@ -22,14 +22,20 @@ LICENSE="MIT"
 SLOT="0/1.14" # <C++>.<C> SONAMEs
 IUSE="cxx debug hpack-tools jemalloc libressl static-libs test +threads utils xml"
 
+SSL_DEPEND="
+	!libressl? ( >=dev-libs/openssl-1.0.2:0[-bindist,${MULTILIB_USEDEP}] )
+	libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
+"
 RDEPEND="
-	cxx? ( dev-libs/boost:=[${MULTILIB_USEDEP},threads] )
+	cxx? (
+		${SSL_DEPEND}
+		dev-libs/boost:=[${MULTILIB_USEDEP},threads]
+	)
 	hpack-tools? ( >=dev-libs/jansson-2.5 )
 	jemalloc? ( dev-libs/jemalloc[${MULTILIB_USEDEP}] )
 	utils? (
+		${SSL_DEPEND}
 		>=dev-libs/libev-4.15[${MULTILIB_USEDEP}]
-		!libressl? ( >=dev-libs/openssl-1.0.2:0[-bindist,${MULTILIB_USEDEP}] )
-		libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
 		>=sys-libs/zlib-1.2.3[${MULTILIB_USEDEP}]
 		net-dns/c-ares:=[${MULTILIB_USEDEP}]
 	)
@@ -39,24 +45,24 @@ DEPEND="${RDEPEND}
 	test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )"
 
 multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-	econf \
-		--disable-examples \
-		--disable-failmalloc \
-		--disable-werror \
-		--without-cython \
-		--disable-python-bindings \
-		--without-spdylay \
-		$(use_enable cxx asio-lib) \
-		$(use_enable debug) \
-		$(multilib_native_use_enable hpack-tools) \
-		$(use_enable static-libs static) \
-		$(use_enable threads) \
-		$(multilib_native_use_enable utils app) \
-		$(multilib_native_use_with jemalloc) \
+	local myeconfargs=(
+		--disable-examples
+		--disable-failmalloc
+		--disable-werror
+		--without-cython
+		--disable-python-bindings
+		$(use_enable cxx asio-lib)
+		$(use_enable debug)
+		$(multilib_native_use_enable hpack-tools)
+		$(use_enable static-libs static)
+		$(use_enable threads)
+		$(multilib_native_use_enable utils app)
+		$(multilib_native_use_with jemalloc)
 		$(multilib_native_use_with xml libxml2)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 }
 
 multilib_src_install_all() {
-	use static-libs || find "${ED}"/usr -name '*.la' -delete
+	use static-libs || find "${ED%/}"/usr -name '*.la' -delete
 }
diff --git a/net-libs/qxmpp/Manifest b/net-libs/qxmpp/Manifest
index 988510f7854d..77435326501c 100644
--- a/net-libs/qxmpp/Manifest
+++ b/net-libs/qxmpp/Manifest
@@ -1,6 +1,6 @@
 DIST qxmpp-0.8.0.tar.gz 1115730 BLAKE2B 57ca5d5a9f2ce625e78572ef52210defbcdab8da69cd785f14f41e155c4239213b4d70855cb18b9c3389c679469a194e2425ff3ad0084fd31aaab871b65c45ec SHA512 b4e3afa9a4ffdc03d2baf9660986d0cf4de5c2c7d1518ad83cd9b252ff7822da66d9356eab49ce9bd642884a41ec3b72f8d4e2cda964a9276d525d4895c6165f
 DIST qxmpp-0.9.3.tar.gz 300764 BLAKE2B a98d9bd9ab9c84ce6ac90722cd1f1b1609d345daa0b4e690e44b845408753b006261b293898bf419bea011005558584de24090ac1c8809845ec6f8a5c8bb05b1 SHA512 c6ada4398468b9ce84955ab3a1ca155afe3098dfe39dc952c3675be1a1e3a4f118f8b1e251567bc124faa645d2654252d3e32d94e21aae79547056a10a2d6a71
 EBUILD qxmpp-0.8.0.ebuild 1544 BLAKE2B 9d0672f5ecfee702623c5d0adeb22aa9cdaaf70c45c24006e05721e6779fa29126a99acc1c05555b04b24b7c1a6366e385ed08d0f6e1456dd4902e91aba70d53 SHA512 6d6c09eae7acb85bdc6f8f03a0962c71f02fb4f669aff259aff601d00c8b3be17670ba44ec72cd08a488d065c882c6538eda7bcb7bd6021a12dcf8e0581d925f
-EBUILD qxmpp-0.9.3-r1.ebuild 1831 BLAKE2B f6106a674a8cc99c5cf98704b235fadde290d8d9fc82cb4178b87fcfa7cabecb29fb8f475ce4985e7471ce3e2f680daa19e0dd8248dbe6d25f34f410be5b88bf SHA512 7d96a9e6e247d2e8c6ea1d1c8edf552fee0530b7e328357f02d2082e66b53d6dfc9826657449351eca1007aff85666f695008e61b5c1c379284e68c6a5932e58
-EBUILD qxmpp-9999.ebuild 1784 BLAKE2B ba5eaaec2434eb1cd27da015f449cb5bb25f2afc2dd9e1894ca883fe6e4eb405a493122dc7cc2bb6a5f91695b8d22310560a37d295cb4845acff4b8a7e3b468e SHA512 40e0c2b35ed81dd304df95feb634164ab69012641504df03e3dd9dfeba76437644e3d9125d33535a31e7e80ec39db6ca5efdbaa49f885e405bf9b650dc79a576
+EBUILD qxmpp-0.9.3-r1.ebuild 1811 BLAKE2B 871c93e3d047f22c0fdc34a2f8959ce6a23318ea3da8a06de2d24a585f4a18d39353277479460f24f71d89a1052c99be6f2de7047d85182d8d81d1c7398ca2b0 SHA512 722a51edb36ef19736e0d6ccc77c1435d1384d1b961ca86f22ea31d30da9eb5e3a16380d29e7014982b50dc59605352adc8391725799202d60480756412c3350
+EBUILD qxmpp-9999.ebuild 1764 BLAKE2B 95e41847555283e64dc393f9f5c5e67ea5b834472f097fbc7d7cda91b1b83b83952a68bbd13f77288ce7f402a2fc2fb67dad189293c41980d954f421b24ced11 SHA512 3f3ea1f1e22b136a79ff4c8b43ae978dff96b2c6652a1a80a91f534053707182649176728e928cf6c8e6be0f8639d4433b4979c9e4acc9a61edc88af49d20531
 MISC metadata.xml 794 BLAKE2B 039cc3d356927e6f18091e93f9c39a5bd07ee255eb71d588e417bfc9d446c2d00121a316f0c86e68296631c428358bdecab8877226ffd982f82ef8d001391402 SHA512 0486690da78f6876a4dc81eec34dbcfdb63df109ed9135c9fce5fe8355f3adb216e7766def8d87870a9ece522f57b295ed48aa7cca36f7bb2a64eef7f77bb74d
diff --git a/net-libs/qxmpp/qxmpp-0.9.3-r1.ebuild b/net-libs/qxmpp/qxmpp-0.9.3-r1.ebuild
index 688a4490a702..a8bd6e94ae7d 100644
--- a/net-libs/qxmpp/qxmpp-0.9.3-r1.ebuild
+++ b/net-libs/qxmpp/qxmpp-0.9.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -27,34 +27,35 @@ DEPEND="${RDEPEND}
 	test? ( dev-qt/qttest:5 )
 "
 
-src_prepare(){
+src_prepare() {
+	default
+
 	if ! use doc; then
-		sed -i \
-			-e '/SUBDIRS/s/doc//' \
+		sed -e '/SUBDIRS/s/doc//' \
 			-e '/INSTALLS/d' \
-			qxmpp.pro || die "sed for removing docs failed"
+			-i qxmpp.pro || die "failed to remove docs"
 	fi
 	if ! use test; then
-		sed -i -e '/SUBDIRS/s/tests//' \
-			qxmpp.pro || die "sed for removing tests failed"
+		sed -e '/SUBDIRS/s/tests//' \
+			-i qxmpp.pro || die "failed to remove tests"
+	else
+		# requires network connection, bug #623708
+		sed -e "/qxmppiceconnection/d" \
+			-i tests/tests.pro || die "failed to drop single test"
 	fi
 	# There is no point in building examples. Also, they require dev-qt/qtgui
-	sed -i -e '/SUBDIRS/s/examples//' \
-			qxmpp.pro || die "sed for removing examples failed"
-	default_src_prepare
+	sed -e '/SUBDIRS/s/examples//' \
+		-i qxmpp.pro || die "sed for removing examples failed"
 }
 
-src_configure(){
-	local conf_speex
-	local conf_theora
-	local conf_vpx
-
-	use opus && conf_opus="QXMPP_USE_OPUS=1"
-	use speex && conf_speex="QXMPP_USE_SPEEX=1"
-	use theora && conf_theora="QXMPP_USE_THEORA=1"
-	use vpx && conf_vpx="QXMPP_USE_VPX=1"
-
-	eqmake5 "${S}"/qxmpp.pro "PREFIX=${EPREFIX}/usr" "LIBDIR=$(get_libdir)" "${conf_opus}" "${conf_speex}" "${conf_theora}" "${conf_vpx}"
+src_configure() {
+	eqmake5 "${S}"/qxmpp.pro \
+		PREFIX="${EPREFIX}/usr" \
+		LIBDIR="$(get_libdir)" \
+		QXMPP_USE_OPUS=$(usex opus 1 0) \
+		QXMPP_USE_SPEEX=$(usex speex 1 0) \
+		QXMPP_USE_THEORA=$(usex theora 1 0) \
+		QXMPP_USE_VPX=$(usex vpx 1 0)
 }
 
 src_install() {
diff --git a/net-libs/qxmpp/qxmpp-9999.ebuild b/net-libs/qxmpp/qxmpp-9999.ebuild
index 21806f48a186..fc67feb3c99a 100644
--- a/net-libs/qxmpp/qxmpp-9999.ebuild
+++ b/net-libs/qxmpp/qxmpp-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -28,34 +28,35 @@ DEPEND="${RDEPEND}
 	test? ( dev-qt/qttest:5 )
 "
 
-src_prepare(){
+src_prepare() {
+	default
+
 	if ! use doc; then
-		sed -i \
-			-e '/SUBDIRS/s/doc//' \
+		sed -e '/SUBDIRS/s/doc//' \
 			-e '/INSTALLS/d' \
-			qxmpp.pro || die "sed for removing docs failed"
+			-i qxmpp.pro || die "failed to remove docs"
 	fi
 	if ! use test; then
-		sed -i -e '/SUBDIRS/s/tests//' \
-			qxmpp.pro || die "sed for removing tests failed"
+		sed -e '/SUBDIRS/s/tests//' \
+			-i qxmpp.pro || die "failed to remove tests"
+	else
+		# requires network connection, bug #623708
+		sed -e "/qxmppiceconnection/d" \
+			-i tests/tests.pro || die "failed to drop single test"
 	fi
 	# There is no point in building examples. Also, they require dev-qt/qtgui
-	sed -i -e '/SUBDIRS/s/examples//' \
-			qxmpp.pro || die "sed for removing examples failed"
-	default_src_prepare
+	sed -e '/SUBDIRS/s/examples//' \
+		-i qxmpp.pro || die "sed for removing examples failed"
 }
 
-src_configure(){
-	local conf_speex
-	local conf_theora
-	local conf_vpx
-
-	use opus && conf_opus="QXMPP_USE_OPUS=1"
-	use speex && conf_speex="QXMPP_USE_SPEEX=1"
-	use theora && conf_theora="QXMPP_USE_THEORA=1"
-	use vpx && conf_vpx="QXMPP_USE_VPX=1"
-
-	eqmake5 "${S}"/qxmpp.pro "PREFIX=${EPREFIX}/usr" "LIBDIR=$(get_libdir)" "${conf_opus}" "${conf_speex}" "${conf_theora}" "${conf_vpx}"
+src_configure() {
+	eqmake5 "${S}"/qxmpp.pro \
+		PREFIX="${EPREFIX}/usr" \
+		LIBDIR="$(get_libdir)" \
+		QXMPP_USE_OPUS=$(usex opus 1 0) \
+		QXMPP_USE_SPEEX=$(usex speex 1 0) \
+		QXMPP_USE_THEORA=$(usex theora 1 0) \
+		QXMPP_USE_VPX=$(usex vpx 1 0)
 }
 
 src_install() {