gentoo resync : 27.01.2018

36 files changed, 15 insertions, 1354 deletions

diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index e2a3d9b7d0f6..203d0d1cf86f 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 c42fc58a473d..106c73c54c4b 100644
--- a/net-libs/gnome-online-accounts/Manifest
+++ b/net-libs/gnome-online-accounts/Manifest
@@ -1,5 +1,5 @@
 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 2472 BLAKE2B 97b454a3efe7a14b1568be3588ffe3af8f14de2f26f38b92c3a4f5008c5cda5d46023ec2837a883c9b73c4108b0703f10a86e7bbc02e095c2290e6c86e9bae5b SHA512 90c67ff61cf2ea918007d0bf40c4ea83205e1e44870b3ba96bd64ebe7215f1ba636b9d33701d472e84d810dddac2fccc437a38707ba814316921124f40e1b517
+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.24.4.ebuild b/net-libs/gnome-online-accounts/gnome-online-accounts-3.24.4.ebuild
index 4db7224a62ae..728d55bc04df 100644
--- 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
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GnomeOnlineAccounts"
 
 LICENSE="LGPL-2+"
 SLOT="0/1"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 IUSE="debug gnome +introspection kerberos vala" # telepathy"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/net-libs/h323plus/Manifest b/net-libs/h323plus/Manifest
deleted file mode 100644
index 7f6267b83722..000000000000
--- a/net-libs/h323plus/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX h323plus-1.25.0-ptlib-2.10.10.patch 668 BLAKE2B 1b9681e4fe23141c5160dac0124944603a32e5dcd88d0ae9e2fd24e3ea9ee2a7e6aaeb768d46bf9e6e636cdceab7fd0db2dcc8e8f309c49999cbf5b053b05f05 SHA512 8c1c1777663a77fbe38d3c033ca388c3dbfaeeef2665a5564d8f482bbe26146d6f79be71100fb395dc35c33fcccda9c6eb0a4cfe9746aa968933e287343b1c93
-AUX h323plus-1.25.0-ptrace-debugoptionlist.patch 470 BLAKE2B 9b632864138a891e38c3f95bf487b4faf035ebbcf452cd223b5c10ab5294fcbf3437ec84d7fdaaa9dae78da0bd2f5bf87bfe1657645e1ab60cecddc99ba4d914 SHA512 a12809c96ad236a1c3d9aed07976ea64653227f612676f0bac34fde6638e1719ade9fbd31e54f601c6dcefb52170788cead570b6dfdd2e1763b7b55d85e3d9ba
-AUX h323plus-1.25.0-ptrace-param.patch 598 BLAKE2B c81a1048811905c76cea9163e03e157b917cc462ea97db9e49d9c5bcd4393aca6e866dad84d694e2f9e711bfee0e37ca46867a461f4834b0136ed92e928cc86f SHA512 b51686ec30930cbf4749f233625a9f26651f7a93570468e70ff7e423fc74508f0495b74e565ff7f907a2e775572a54dc7253ebe8434e1d4f5a2b1b990638c09d
-DIST h323plus-v1_25_0.tar.gz 4193136 BLAKE2B 341458e146cef9a006a990ae04749c4f18dfeababb07fee69eaf19a72fb5509d76e8eccb553ecf91b9b13123b485b40be8dc96c7c797706f516b7ff36db83a32 SHA512 f0b8b26a0062eadc183af60d25302f95d06720dffe23f0bc0c9568ce34d7aae10acef434da9e09839fe19fcdc9f7f5d47396eb7c684ef55e457556abb66a682d
-EBUILD h323plus-1.25.0-r1.ebuild 1836 BLAKE2B 816edd10d8130695001df87052a779218d00856241f8462bc76a2664454980c09c6660eef72f7b6397efd616ab37eaaf03aa2d06648b11d73e8ec0d368ce50d7 SHA512 a0cdc1e6f52db1fe609c4e673a2e18d5c463cfdc8f48409454a8ce9c9eca80586311ff2026e445d47a97d71c8ab0a6a0e621ff45b45cb8c9a6a2051747de5f36
-EBUILD h323plus-1.25.0-r2.ebuild 1882 BLAKE2B fc9ce9fdfcf3dce4461a5e34f916269f5367f79297290ab4ff7b210fadc6dd60cf4c17608821090a1590f72ad1d209afc8c5427e86e266c2b305837583f50ba4 SHA512 404ea34aa939aeb2316342afde62286f6da1790aa2b5270cfa1bf4b6334611b6814fbb2300fb4790d2db2d72e5538c3ed4b9048d8e5f54a9854f57f8757f1512
-MISC metadata.xml 429 BLAKE2B e2ead7699cf8fa757fae60249cdb08af08b85ddbcecca3932418ca5dd7832093d8d1668bcd496f9507e3dbcf85fa2cc9993c167b6c0b017318aae9abd5eeb155 SHA512 6f4be02d7183a2a7376ee3d003b91f6996f2b7d4793ee9c91bd038f584efd7f892c8e4065979f50616a9119109f62831904109e834055de2386e176f97cbdb4b
diff --git a/net-libs/h323plus/files/h323plus-1.25.0-ptlib-2.10.10.patch b/net-libs/h323plus/files/h323plus-1.25.0-ptlib-2.10.10.patch
deleted file mode 100644
index 74856a099c0f..000000000000
--- a/net-libs/h323plus/files/h323plus-1.25.0-ptlib-2.10.10.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Fix macro definition for ptlib-2.10.10 compatibility
-http://lists.packetizer.com/pipermail/h323plus/2012-December/002543.html
-
-diff -ur a/include/openh323buildopts.h.in b/include/openh323buildopts.h.in
---- a/include/openh323buildopts.h.in	2012-09-21 05:53:21.000000000 +0200
-+++ b/include/openh323buildopts.h.in	2013-03-05 19:26:25.251373540 +0100
-@@ -35,7 +35,7 @@
- #include <ptbuildopts.h>
- #include <ptlib/../../revision.h>
- 
--#if PTLIB_MAJOR == 2 && PTLIB_MINOR < 10
-+#if PTLIB_MAJOR == 2 && PTLIB_MINOR <= 10
-    #define PTLIB_VER ( PTLIB_MAJOR*100 + PTLIB_MINOR*10 + PTLIB_BUILD )
- #else
-    #define PTLIB_VER ( PTLIB_MAJOR*1000 + PTLIB_MINOR*10 + PTLIB_BUILD )
diff --git a/net-libs/h323plus/files/h323plus-1.25.0-ptrace-debugoptionlist.patch b/net-libs/h323plus/files/h323plus-1.25.0-ptrace-debugoptionlist.patch
deleted file mode 100644
index 7e800f490f19..000000000000
--- a/net-libs/h323plus/files/h323plus-1.25.0-ptrace-debugoptionlist.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ur a/src/h323pluginmgr.cxx b/src/h323pluginmgr.cxx
---- a/src/h323pluginmgr.cxx	2012-11-29 17:23:26.000000000 +0100
-+++ b/src/h323pluginmgr.cxx	2013-02-22 18:56:33.100356993 +0100
-@@ -1543,7 +1543,9 @@
-     PopulateMediaFormatOptions(codecDefn, fmt);
-     PopulateMediaFormatFromGenericData(fmt, 
-           (PluginCodec_H323GenericCodecData *)codecDefn->h323CapabilityData);
-+#if PTRACING
-     OpalMediaFormat::DebugOptionList(fmt);
-+#endif
-     return true;
- }
- 
diff --git a/net-libs/h323plus/files/h323plus-1.25.0-ptrace-param.patch b/net-libs/h323plus/files/h323plus-1.25.0-ptrace-param.patch
deleted file mode 100644
index c69e703f42c0..000000000000
--- a/net-libs/h323plus/files/h323plus-1.25.0-ptrace-param.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -ur a/src/rtp.cxx b/src/rtp.cxx
---- a/src/rtp.cxx	2012-12-10 18:56:08.000000000 +0100
-+++ b/src/rtp.cxx	2013-02-22 18:54:35.360358638 +0100
-@@ -1164,9 +1164,13 @@
-   return e_ProcessPacket;
- }
- 
--
-+#if PTRACING
- void RTP_Session::OnRxSenderReport(const SenderReport & PTRACE_PARAM(sender),
-                                    const ReceiverReportArray & PTRACE_PARAM(reports))
-+#else
-+void RTP_Session::OnRxSenderReport(const SenderReport & sender,
-+                                   const ReceiverReportArray & reports)
-+#endif
- {
-    userData->OnRxSenderReport(sessionID,sender,reports);
- 
diff --git a/net-libs/h323plus/h323plus-1.25.0-r1.ebuild b/net-libs/h323plus/h323plus-1.25.0-r1.ebuild
deleted file mode 100644
index cd5e799e4520..000000000000
--- a/net-libs/h323plus/h323plus-1.25.0-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-MY_P="${PN}-v${PV//./_}"
-
-DESCRIPTION="Open Source implementation of the ITU H.323 protocol, successor of OpenH323"
-HOMEPAGE="http://www.h323plus.org/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-v${PV//./_}.tar.gz"
-
-IUSE="aec debug +sound +video"
-SLOT="0/${PV}"
-LICENSE="MPL-1.1"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~sparc ~x86"
-
-DEPEND=">=net-libs/ptlib-2.6.4:=[wav]
-	aec? ( >=media-libs/speex-1.2_rc1 )
-	sound? (
-		media-sound/gsm
-		dev-libs/ilbc-rfc3951
-	)
-	video? (
-		media-libs/libtheora
-		virtual/ffmpeg
-	)"
-RDEPEND="${DEPEND}
-	!net-libs/openh323"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.25.0-ptrace-param.patch
-	epatch "${FILESDIR}"/${PN}-1.25.0-ptrace-debugoptionlist.patch
-	epatch "${FILESDIR}"/${PN}-1.25.0-ptlib-2.10.10.patch
-}
-
-src_configure() {
-	# TODO: support for h.263/h.264/sbc(bluetooth)/celt/spandsp
-	#export OPENH323DIR=${S}
-	econf \
-		PTLIB_CONFIG="${EPREFIX}/usr/bin/ptlib-config" \
-		$(use_enable video) \
-		$(use_enable sound audio) \
-		$(use_enable aec) \
-		$(use_enable debug asntracing)
-	# revision.h does not exist in ptlib(?)
-	sed -i "/revision.h/d" include/openh323buildopts.h || die
-}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		CXX="$(tc-getCXX)" \
-		AR="$(tc-getAR)"
-	# these should point to the right directories,
-	# openh323.org apps and others need this
-	sed -i -e "s:^OH323_LIBDIR = \$(OPENH323DIR).*:OH323_LIBDIR = /usr/$(get_libdir):" \
-		openh323u.mak || die
-	sed -i -e "s:^OH323_INCDIR = \$(OPENH323DIR).*:OH323_INCDIR = /usr/include/openh323:" \
-		openh323u.mak || die
-	# this is hardcoded now?
-	sed -i -e "s:^\(OPENH323DIR[ \t]\+=\) "${S}":\1 /usr/share/openh323:" \
-		openh323u.mak || die
-}
diff --git a/net-libs/h323plus/h323plus-1.25.0-r2.ebuild b/net-libs/h323plus/h323plus-1.25.0-r2.ebuild
deleted file mode 100644
index 6abbd14d31f1..000000000000
--- a/net-libs/h323plus/h323plus-1.25.0-r2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-MY_P="${PN}-v${PV//./_}"
-
-DESCRIPTION="Open Source implementation of the ITU H.323 protocol, successor of OpenH323"
-HOMEPAGE="http://www.h323plus.org/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-v${PV//./_}.tar.gz"
-
-IUSE="aec debug +sound +video"
-SLOT="0/${PV}"
-LICENSE="MPL-1.1"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~sparc ~x86"
-
-DEPEND=">=net-libs/ptlib-2.6.4:=[-debug,wav]
-	aec? ( >=media-libs/speex-1.2_rc1 )
-	sound? (
-		media-sound/gsm
-		dev-libs/ilbc-rfc3951
-	)
-	video? (
-		media-libs/libtheora
-		virtual/ffmpeg
-	)
-	net-nds/openldap
-	dev-libs/openssl:0="
-RDEPEND="${DEPEND}
-	!net-libs/openh323"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.25.0-ptrace-param.patch
-	epatch "${FILESDIR}"/${PN}-1.25.0-ptrace-debugoptionlist.patch
-	epatch "${FILESDIR}"/${PN}-1.25.0-ptlib-2.10.10.patch
-}
-
-src_configure() {
-	# TODO: support for h.263/h.264/sbc(bluetooth)/celt/spandsp
-	#export OPENH323DIR=${S}
-	econf \
-		PTLIB_CONFIG="${EPREFIX}/usr/bin/ptlib-config" \
-		$(use_enable video) \
-		$(use_enable sound audio) \
-		$(use_enable aec) \
-		$(use_enable debug asntracing)
-	# revision.h does not exist in ptlib(?)
-	sed -i "/revision.h/d" include/openh323buildopts.h || die
-}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		CXX="$(tc-getCXX)" \
-		AR="$(tc-getAR)"
-	# these should point to the right directories,
-	# openh323.org apps and others need this
-	sed -i -e "s:^OH323_LIBDIR = \$(OPENH323DIR).*:OH323_LIBDIR = /usr/$(get_libdir):" \
-		openh323u.mak || die
-	sed -i -e "s:^OH323_INCDIR = \$(OPENH323DIR).*:OH323_INCDIR = /usr/include/openh323:" \
-		openh323u.mak || die
-	# this is hardcoded now?
-	sed -i -e "s:^\(OPENH323DIR[ \t]\+=\) "${S}":\1 /usr/share/openh323:" \
-		openh323u.mak || die
-}
diff --git a/net-libs/h323plus/metadata.xml b/net-libs/h323plus/metadata.xml
deleted file mode 100644
index 304a5e0c2a93..000000000000
--- a/net-libs/h323plus/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-  <use>
-    <flag name="aec">Enable acoustic echo cancellation</flag>
-    <flag name="sound">Enable audio codecs</flag>
-    <flag name="video">Enable video codecs</flag>
-  </use>
-  <upstream>
-    <remote-id type="sourceforge">h323plus</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/net-libs/libbitcoinconsensus/Manifest b/net-libs/libbitcoinconsensus/Manifest
index 57aaa6869141..56d8f3ab4dfd 100644
--- a/net-libs/libbitcoinconsensus/Manifest
+++ b/net-libs/libbitcoinconsensus/Manifest
@@ -6,5 +6,5 @@ DIST bitcoin-v0.13.2.tgz 6088472 BLAKE2B d6b13613d90d0abf33c937ec0cd003756c4984b
 DIST bitcoin-v0.15.1.tar.gz 7550228 BLAKE2B 0cbb7d0e9d0e5e8eb33502a28289c3f9c86b7c531ed179f7e3e8b601a69a423fa736238a2caae890fd8850eb505533995e578e676860a4014922fbc238185ebb SHA512 a09b6cb64a1649d11e3fd6deeb13a07b1bf4bed504a2fc1c585919459ca8ac1af8e5ecc89dee487359e831a8f12625d54f408f95bb341033d6380b82c290c0d9
 EBUILD libbitcoinconsensus-0.13.1.ebuild 608 BLAKE2B 6f6cfdf482edc19ba4708664d0a161514c13c205d0ba5f9ddfcf8492e9ab5b734ccc73ced89d196cac82cfa314dbff14900648d461886d972d0c18d3b240f110 SHA512 20581062b5cc1dd73e8334aa127b750f2b73e38544076ab77c5f9d9659d186f4d46b4e0ecf31317d16893dfef89e194eaef310e108d76115e3d8b359edb3339f
 EBUILD libbitcoinconsensus-0.13.2.ebuild 608 BLAKE2B 5536ce019cd28b55129ac466012f0d3463cc081389ce3497fda010e46a9c0ffa586a0c9f00fd80ce81463f3a77d6ad6dccf1b4959f1e8f8ac5ed1ec8b158a0b6 SHA512 62b1de1e117af3f66721df34519a40f3347e51914f0f3deab203225d684a4056e0db09a1e2c8acdcaf97b492018d6ab726f9e2b6e0b87b3200d203df9ea66348
-EBUILD libbitcoinconsensus-0.15.1.ebuild 2387 BLAKE2B 41805a2aeae89849833054571267ad0c90d20cf25570cc60e70fe2ca15abce2a482cdbe6be3b10ff8a9c682b6dcb27c844dc0628b9855440464961d46d203f7d SHA512 6912c3598f2516d583f4569bb66fcf30c8ab12e097393a3d5ee6d37ff6f890c4a002b349e0d616303bc87481b93352898327d54a288de5197af82e10bb74da77
+EBUILD libbitcoinconsensus-0.15.1.ebuild 2386 BLAKE2B 5da5ee97d5adba35f46518d85811b3a0408360d547214af6bbfaed2cbad06d5220e4a62fd6ca8eb429aadc001b002db0bd3fd12f6a687a977b9aaf5b3bc53784 SHA512 fa19b751ca150dd23153875198e9193504c08504d3ee2169871c256bb2401cb78b8858f51ac715f61ff037d7449818d9942d7ad91eea280f2db57e21e9da4149
 MISC metadata.xml 679 BLAKE2B 5283fe5aba24ba5d425e68ee4f6b1059378027c116c675d94ffdd44fab28c68ea52434df749a3a906121e2a044e296e8a26975f9653b93e693f3815bddf98d9d SHA512 3a9ccff97c3e952ec4c321184144be64daf4d9a1c03d21cc8aa454162ad1c1d133382cbbf5d21a873ea3bf746ec68c4ed0be0b81e2b562724ca9bd05f481d665
diff --git a/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.15.1.ebuild b/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.15.1.ebuild
index d83c3297cadf..58ed3be69a99 100644
--- a/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.15.1.ebuild
+++ b/net-libs/libbitcoinconsensus/libbitcoinconsensus-0.15.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2010-2017 Gentoo Foundation
+# Copyright 2010-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,7 +18,7 @@ DESCRIPTION="Bitcoin Core consensus library"
 HOMEPAGE="http://bitcoincore.org/ http://bitcoinknots.org/"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~amd64-linux ~arm ~arm64 ~mips ~ppc ~x86 ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc x86 ~amd64-linux ~x86-linux"
 
 SRC_URI="
 	https://github.com/${MyPN}/${MyPN}/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> ${MyPN}-v${PV}.tar.gz
diff --git a/net-libs/libsignon-glib/Manifest b/net-libs/libsignon-glib/Manifest
index 1151259a81b3..c2dc2fb690db 100644
--- a/net-libs/libsignon-glib/Manifest
+++ b/net-libs/libsignon-glib/Manifest
@@ -1,5 +1,5 @@
 AUX libsignon-glib-1.12-doc-disable.patch 844 BLAKE2B 600b936552c64473dfce637d60a782526a42858d3b7e3118c78ec442cb6d53e167503407d0bf3ded34024a7065d5fdbf3f487edd7e3fb701d0a009eff158d094 SHA512 690ee30d4e1d6277c0b02720212654d482173a75657da7f72c30f258921cbe790ea2d47d3de9a598be04e4ef55b995118ab5a537ed728c2735445915810f561d
 AUX libsignon-glib-1.14-default-opts.patch 1714 BLAKE2B 8c00bcf5b056cd0fe05f58ed5727569cf9b917d6e4e7e11d90bd52ef343f8b26e02f98ab463e5c2a1121ba48f0260896f1301b1446c0f26146a8e2e5d6ce3c05 SHA512 bb27417ff1dc03510fdd1f019b7b8d044a8c281243467dfa7d2fdd8123ef3290a325a7c9a96bd246f37891bd7ac9ce2702b40396ed067dbac4b9e995a89d2430
 DIST libsignon-glib-1.14.tar.gz 54019 BLAKE2B 9ffdb96a374ef0848c1b70cb369a533ea826b24856a32b4b454a0fd8982533041fcc88382fdf1eee6857aa36ec8d076885fc769a058e148e91da54dbddaf7125 SHA512 c2277933d6ec2c3288ce510c853da7719116dac15d60c7114fcdcb87d04e7f70390d066938dea6aa0f819fbd70158fb875c5be5684c47fd27c0b6c55e9467a1d
-EBUILD libsignon-glib-1.14.ebuild 1752 BLAKE2B eb39bd4d5031d29377681babdaddb090639295fa080da51fb110b94adbd31f19a1ab60f35f482e27c64e84e16070dcd8df3ec047021bc47be466393d2da6d87a SHA512 d11952359f6aacffdbd5cb91db8f91eb788bbeb6719c0cf564191453a887bd088b0437c99166c1b33a696646c96854de146a90aa91d3f910a52f2f3b60aa492f
+EBUILD libsignon-glib-1.14.ebuild 1756 BLAKE2B bb5a3f42035dee0647b6e13f040c766ab1b78210cd4fcdf39e05869e22e9a56ec9b7d4e7a10643765407a16ff173eb646b52599fc6ce6748b53d9b8cb6cb8d6a SHA512 1b11907e4a449014fa1a75ce0b06e1cc6790d9843dcf5725b4ac7bd5ce6e3ec33e8ae58702fcc5c0b0bb72eee27091528f7963a0325e55db7387ba1b776b745d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-libs/libsignon-glib/libsignon-glib-1.14.ebuild b/net-libs/libsignon-glib/libsignon-glib-1.14.ebuild
index 4b1fc11e2067..51eecdc3d558 100644
--- a/net-libs/libsignon-glib/libsignon-glib-1.14.ebuild
+++ b/net-libs/libsignon-glib/libsignon-glib-1.14.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit autotools python-r1 vcs-snapshot xdg-utils
 
 DESCRIPTION="GLib binding for the D-Bus API provided by signond"
diff --git a/net-libs/libsoup/Manifest b/net-libs/libsoup/Manifest
index 531290cdd07b..513a1effbad8 100644
--- a/net-libs/libsoup/Manifest
+++ b/net-libs/libsoup/Manifest
@@ -1,5 +1,5 @@
 DIST libsoup-2.56.1.tar.xz 1806416 BLAKE2B eb10d76a92912dcf8f450d6e8449e2aec26936ca1b706d16351ead4174f0cc107e6a2b43b96bf75c16106f8f4b24620bfb07814162390eba195b8a9f56a338fb SHA512 5ac087eeba346c27e884a2053a4f8afdb2fc6e432527f4494024a7edc4eccdf145188a3faa64e3f4bdd98af2fcb98914e494b4ed24f92cffc2ff1485dce7d693
 DIST libsoup-2.58.2.tar.xz 1815256 BLAKE2B 23c6e40f91a2dca13fcabe4fa3af7311874cbe06962c6cdc93d8d8d0a998d29cff9e7ce61190541b6114b4996d758b7c469b0354a6012856667e9541a78177cb SHA512 85af6fac87343bdd22312518402144d33916225f60d6fa158efdd84f7ee7ed1f9895989b3558f711c9aedc93cff35a4114ad79d6d2aa19c54cb326f162a4c7de
 EBUILD libsoup-2.56.1.ebuild 2726 BLAKE2B d8451ad0baebc1441d8f9627107abbc78bdf965089b94b9286d951357641eeafef784cfb4f8b31a69510ed6b597a308a848edde02a6307e6a77cbbad7215a122 SHA512 342ca26d36901023c260c366b4dc97a003f88b397c803680aeb57de39129b48c8e12ad338673872ff315796da703ad782d4e473e658d690133247461a589b753
-EBUILD libsoup-2.58.2.ebuild 2890 BLAKE2B 9347a865b2526f0d5a53a3a13f56a02f80e03406da7d2be1a6597de595b2bf367169a8272f476b08adfbd314e63f92f02935c88c9b0b3c62cd6b214a7b32dc5d SHA512 1c7738dab99b6b9ef3f85426f3a944e130be90cd8feb6bc78b248feeb244d55b4ea51e7494365f5b00d2eb3730ceb0e35e79d6ff9cd1d27851ac1399f5c4cea8
+EBUILD libsoup-2.58.2.ebuild 2889 BLAKE2B b1fd946deb5d4b9db875d98a32a25031c8dab6f5c93df16735e841e8bc4c5199b311e61c48a44bef424a28e4f8372b3377c4d2e997c1140d46dd5aa1e7f4a18d SHA512 a696e7e6d9acc4db758e01b3a06778ae941ba95a97bb41726432e963da08786d0bbb8ec8a5ae43eedd1760a08d109ed09ecf1f6a9fd3bc1ce35a4e35b482edec
 MISC metadata.xml 402 BLAKE2B 19f91e3d9de7ec450d9c60686a443e0180d3f36c5d9508d50ef55f64924fa4b7e6f143e7fd5c25b437bd4a1d85e9a1c8aa8592b414c73935084fa6d93aa18f55 SHA512 db900ca6c6904d8c293938f6cbd25a39aa123273cf42dd6f5c670635501c81af94e0c4076ca45267c2d8861ce61b3189900b3027c6477d9e9b6d3c093006ed9f
diff --git a/net-libs/libsoup/libsoup-2.58.2.ebuild b/net-libs/libsoup/libsoup-2.58.2.ebuild
index 537c2349be01..ac2b25eaa0ea 100644
--- a/net-libs/libsoup/libsoup-2.58.2.ebuild
+++ b/net-libs/libsoup/libsoup-2.58.2.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
@@ -17,7 +17,7 @@ SLOT="2.4"
 IUSE="debug gssapi +introspection samba ssl test vala"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
diff --git a/net-libs/opal/Manifest b/net-libs/opal/Manifest
deleted file mode 100644
index 00d20887de32..000000000000
--- a/net-libs/opal/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX opal-3.10.10-ffmpeg2-1.patch 15039 BLAKE2B 6951443ade9bbcaf2cebad4865ff63c3b99f8cc68dc0adf5400c9c95432a32243503f2c140c71e65f609e9a595dbdcaeefa13e5c21236b46960f2abda0689d5f SHA512 606eb31858505c03086e963d2f75108f7ef1e6653beb46d4bc5c8ec5672fca06c653ae82689cacd6278bad32d243c4822ba9ab87500626380ca74c39081d8a82
-AUX opal-3.10.9-disable-h323-workaround.patch 498 BLAKE2B a75a6dcea5f329ce9d5750bff4e100e7692f51379334c7e7d2a47f061479807484e30cfd9ba6626e682334fe4bd2042465532da4c4c750406ab8670df56849d7 SHA512 58e8ef12c39bce3a4d386b2b6033e1e242852bbf78371c58e91bd020cfcd95b40a9831db91fa76da431a9f8c4bb40c846b420e3a462dad77658a37c2281a9d39
-AUX opal-3.10.9-java-ruby-swig-fix.patch 874 BLAKE2B 4d78f1790265f37b0bfc86bd1009802acc5d4f7b105e2c2471b3658185a90ae719d26815bf481177e5207b82110d41fa1049f4d12af0d1aaf17d88a2722f16a5 SHA512 a7132cd6ad61d143cc11e00a048aaf66e1802890ac5fbde7ff964f99dc45a3abc79a081572cbdae5a84a50eee8af11266695a5de9c2691385c6f849e27105022
-DIST opal-3.10.11-htmldoc.tar.bz2 2944338 BLAKE2B 3e686809a217c13718e3e777a5c11b92b1405d5421b882abc50a3e231db28d72099e7383fa23bf130cc5fa2bf123412702248054cfa7be14dcbc999fd3bd1248 SHA512 6075487344d4cfa5c2e2219376e3eccd98028475eac6f89d20d24d611a8806a27eb354ce8e77e16c620c8cb3d398b9502082f3fe8f67763d3f67feea835819b5
-DIST opal-3.10.11.tar.bz2 8590616 BLAKE2B 1ea56285315e879d85190db4e2b2fa814cf0fc7825db80547d1fde978f6d24a8e2cd853575a4c13dbfc7d8dada422a90ab95512a367a87de6d13889a6d8f8ca4 SHA512 970745375e7ebb29178ce9d0bc29254e69dd952e5f754038979a8613489a26f0fb68d63ec2709ffa1964e50fe9cfde874489f683a451d83e7a075d62d9228fa1
-EBUILD opal-3.10.11-r1.ebuild 7154 BLAKE2B 24fa894a33811f40fe1199cf941245b04059a86cc7ee9b5a42647ce60264595a692651153b1e62111e1f827c323f93007d0c215576426c859e4c323555e27d60 SHA512 7ea10d2622315c6f20af990d2d4239f9e30c88ccf975e58acda2aec2723e9a693aa575f0fdb531c868f21162dff1d7940be458a5ad658cc7c9981e36c168c717
-MISC metadata.xml 1834 BLAKE2B c3c4375126d202302919e5077ce6ba78fb0607e6bf398bbb47e10661d615eff11a734d86c96e131712f7b4fb3edb67b2cee2a7b7af5adc9a34c99245ad6e0cb3 SHA512 4b411c0729d4927420c19a6e2063937de3b0e4922771c44467a6f7bcd47c728ec361edd529e1736e2f8b5ce1d53851612ce85e30b22098bd55ba71bf6cb38d90
diff --git a/net-libs/opal/files/opal-3.10.10-ffmpeg2-1.patch b/net-libs/opal/files/opal-3.10.10-ffmpeg2-1.patch
deleted file mode 100644
index 6b58ac28f3d4..000000000000
--- a/net-libs/opal/files/opal-3.10.10-ffmpeg2-1.patch
+++ /dev/null
@@ -1,396 +0,0 @@
-Submitted By:            Igor Živković <contact@igor-zivkovic.from.hr>
-Date:                    2013-10-08
-Initial Package Version: 3.10.10
-Upstream Status:         Unknown
-Origin:                  Gentoo
-Description:             Fixes building against FFmpeg version >= 2.0.0
-
-diff -Naur opal-3.10.10.orig/plugins/video/common/dyna.cxx opal-3.10.10/plugins/video/common/dyna.cxx
---- opal-3.10.10.orig/plugins/video/common/dyna.cxx	2013-02-20 03:18:05.000000000 +0100
-+++ opal-3.10.10/plugins/video/common/dyna.cxx	2013-10-08 12:57:25.058873513 +0200
-@@ -210,7 +210,7 @@
- #endif
- 
- 
--FFMPEGLibrary::FFMPEGLibrary(CodecID codec)
-+FFMPEGLibrary::FFMPEGLibrary(AVCodecID codec)
- {
-   m_codec = codec;
-   if (m_codec==CODEC_ID_H264)
-@@ -348,12 +348,12 @@
-   return true;
- }
- 
--AVCodec *FFMPEGLibrary::AvcodecFindEncoder(enum CodecID id)
-+AVCodec *FFMPEGLibrary::AvcodecFindEncoder(enum AVCodecID id)
- {
-   return Favcodec_find_encoder(id);
- }
- 
--AVCodec *FFMPEGLibrary::AvcodecFindDecoder(enum CodecID id)
-+AVCodec *FFMPEGLibrary::AvcodecFindDecoder(enum AVCodecID id)
- {
-   WaitAndSignal m(processLock);
- 
-diff -Naur opal-3.10.10.orig/plugins/video/common/dyna.h opal-3.10.10/plugins/video/common/dyna.h
---- opal-3.10.10.orig/plugins/video/common/dyna.h	2013-02-20 03:18:05.000000000 +0100
-+++ opal-3.10.10/plugins/video/common/dyna.h	2013-10-08 12:57:25.058873513 +0200
-@@ -88,13 +88,13 @@
- class FFMPEGLibrary 
- {
-   public:
--    FFMPEGLibrary(CodecID codec);
-+    FFMPEGLibrary(AVCodecID codec);
-     ~FFMPEGLibrary();
- 
-     bool Load();
- 
--    AVCodec *AvcodecFindEncoder(enum CodecID id);
--    AVCodec *AvcodecFindDecoder(enum CodecID id);
-+    AVCodec *AvcodecFindEncoder(enum AVCodecID id);
-+    AVCodec *AvcodecFindDecoder(enum AVCodecID id);
-     AVCodecContext *AvcodecAllocContext(void);
-     AVFrame *AvcodecAllocFrame(void);
-     int AvcodecOpen(AVCodecContext *ctx, AVCodec *codec);
-@@ -117,15 +117,15 @@
-     DynaLink m_libAvcodec;
-     DynaLink m_libAvutil;
- 
--    CodecID m_codec;
-+    AVCodecID m_codec;
-     char m_codecString[32];
- 
-     void (*Favcodec_init)(void);
-     void (*Fav_init_packet)(AVPacket *pkt);
- 
-     void (*Favcodec_register_all)(void);
--    AVCodec *(*Favcodec_find_encoder)(enum CodecID id);
--    AVCodec *(*Favcodec_find_decoder)(enum CodecID id);
-+    AVCodec *(*Favcodec_find_encoder)(enum AVCodecID id);
-+    AVCodec *(*Favcodec_find_decoder)(enum AVCodecID id);
-     AVCodecContext *(*Favcodec_alloc_context)(void);
-     AVFrame *(*Favcodec_alloc_frame)(void);
-     int (*Favcodec_open)(AVCodecContext *ctx, AVCodec *codec);
-diff -Naur opal-3.10.10.orig/plugins/video/common/ffmpeg/libavcodec/avcodec.h opal-3.10.10/plugins/video/common/ffmpeg/libavcodec/avcodec.h
---- opal-3.10.10.orig/plugins/video/common/ffmpeg/libavcodec/avcodec.h	2013-02-20 03:18:04.000000000 +0100
-+++ opal-3.10.10/plugins/video/common/ffmpeg/libavcodec/avcodec.h	2013-10-08 12:57:25.060873488 +0200
-@@ -101,7 +101,7 @@
-  * 1. no value of a existing codec ID changes (that would break ABI),
-  * 2. it is as close as possible to similar codecs.
-  */
--enum CodecID {
-+enum AVCodecID {
-     CODEC_ID_NONE,
- 
-     /* video codecs */
-@@ -1390,7 +1390,7 @@
- 
-     char codec_name[32];
-     enum AVMediaType codec_type; /* see AVMEDIA_TYPE_xxx */
--    enum CodecID codec_id; /* see CODEC_ID_xxx */
-+    enum AVCodecID codec_id; /* see CODEC_ID_xxx */
- 
-     /**
-      * fourcc (LSB first, so "ABCD" -> ('D'<<24) + ('C'<<16) + ('B'<<8) + 'A').
-@@ -2843,7 +2843,7 @@
-      */
-     const char *name;
-     enum AVMediaType type;
--    enum CodecID id;
-+    enum AVCodecID id;
-     int priv_data_size;
-     int (*init)(AVCodecContext *);
-     int (*encode)(AVCodecContext *, uint8_t *buf, int buf_size, void *data);
-@@ -2898,7 +2898,7 @@
-      *
-      * See CODEC_ID_xxx
-      */
--    enum CodecID id;
-+    enum AVCodecID id;
- 
-     /**
-      * Supported pixel format.
-@@ -3402,10 +3402,10 @@
- /**
-  * Find a registered encoder with a matching codec ID.
-  *
-- * @param id CodecID of the requested encoder
-+ * @param id AVCodecID of the requested encoder
-  * @return An encoder if one was found, NULL otherwise.
-  */
--AVCodec *avcodec_find_encoder(enum CodecID id);
-+AVCodec *avcodec_find_encoder(enum AVCodecID id);
- 
- /**
-  * Find a registered encoder with the specified name.
-@@ -3418,10 +3418,10 @@
- /**
-  * Find a registered decoder with a matching codec ID.
-  *
-- * @param id CodecID of the requested decoder
-+ * @param id AVCodecID of the requested decoder
-  * @return A decoder if one was found, NULL otherwise.
-  */
--AVCodec *avcodec_find_decoder(enum CodecID id);
-+AVCodec *avcodec_find_decoder(enum AVCodecID id);
- 
- /**
-  * Find a registered decoder with the specified name.
-@@ -3822,7 +3822,7 @@
-  * @param[in] codec_id the codec
-  * @return Number of bits per sample or zero if unknown for the given codec.
-  */
--int av_get_bits_per_sample(enum CodecID codec_id);
-+int av_get_bits_per_sample(enum AVCodecID codec_id);
- 
- #if FF_API_OLD_SAMPLE_FMT
- /**
-diff -Naur opal-3.10.10.orig/plugins/video/H.263-1998/h263-1998.cxx opal-3.10.10/plugins/video/H.263-1998/h263-1998.cxx
---- opal-3.10.10.orig/plugins/video/H.263-1998/h263-1998.cxx	2013-02-20 03:18:03.000000000 +0100
-+++ opal-3.10.10/plugins/video/H.263-1998/h263-1998.cxx	2013-10-08 12:57:25.061873475 +0200
-@@ -48,6 +48,10 @@
- #endif
- 
- #include "h263-1998.h"
-+extern "C"
-+{
-+#include <libavutil/opt.h>
-+}
- #include <limits>
- #include <iomanip>
- #include <stdio.h>
-@@ -203,7 +207,7 @@
-   PTRACE(4, m_prefix, "Encoder closed");
- }
- 
--bool H263_Base_EncoderContext::Init(CodecID codecId)
-+bool H263_Base_EncoderContext::Init(AVCodecID codecId)
- {
-   PTRACE(5, m_prefix, "Opening encoder");
- 
-@@ -317,9 +321,9 @@
-     // Level 2+ 
-     // works with eyeBeam, signaled via  non-standard "D"
-     if (atoi(value) == 1)
--      m_context->flags |= CODEC_FLAG_H263P_UMV; 
-+      av_opt_set_int(m_context->priv_data, "umv", 1, 0);
-     else
--      m_context->flags &= ~CODEC_FLAG_H263P_UMV; 
-+      av_opt_set_int(m_context->priv_data, "umv", 0, 0);
-     return;
-   }
- 
-@@ -328,9 +332,9 @@
-     // Annex F: Advanced Prediction Mode
-     // does not work with eyeBeam
-     if (atoi(value) == 1)
--      m_context->flags |= CODEC_FLAG_OBMC; 
-+      av_opt_set_int(m_context->priv_data, "obmc", 1, 0);
-     else
--      m_context->flags &= ~CODEC_FLAG_OBMC; 
-+      av_opt_set_int(m_context->priv_data, "obmc", 0, 0);
-     return;
-   }
- #endif
-@@ -360,9 +364,9 @@
-     // Annex K: Slice Structure
-     // does not work with eyeBeam
-     if (atoi(value) != 0)
--      m_context->flags |= CODEC_FLAG_H263P_SLICE_STRUCT; 
-+      av_opt_set_int(m_context->priv_data, "structured_slices", 1, 0);
-     else
--      m_context->flags &= ~CODEC_FLAG_H263P_SLICE_STRUCT; 
-+      av_opt_set_int(m_context->priv_data, "structured_slices", 0, 0);
-     return;
-   }
- 
-@@ -370,9 +374,9 @@
-     // Annex S: Alternative INTER VLC mode
-     // does not work with eyeBeam
-     if (atoi(value) == 1)
--      m_context->flags |= CODEC_FLAG_H263P_AIV; 
-+      av_opt_set_int(m_context->priv_data, "aiv", 1, 0);
-     else
--      m_context->flags &= ~CODEC_FLAG_H263P_AIV; 
-+      av_opt_set_int(m_context->priv_data, "aiv", 0, 0);
-     return;
-   }
- 
-@@ -450,15 +454,6 @@
-   PTRACE(5, m_prefix, "qmax set to " << m_context->qmax);
-   PTRACE(5, m_prefix, "payload size set to " << m_context->rtp_payload_size);
- 
--  #define CODEC_TRACER_FLAG(tracer, flag) \
--    PTRACE(4, m_prefix, #flag " is " << ((m_context->flags & flag) ? "enabled" : "disabled"));
--  CODEC_TRACER_FLAG(tracer, CODEC_FLAG_H263P_UMV);
--  CODEC_TRACER_FLAG(tracer, CODEC_FLAG_OBMC);
--  CODEC_TRACER_FLAG(tracer, CODEC_FLAG_AC_PRED);
--  CODEC_TRACER_FLAG(tracer, CODEC_FLAG_H263P_SLICE_STRUCT)
--  CODEC_TRACER_FLAG(tracer, CODEC_FLAG_LOOP_FILTER);
--  CODEC_TRACER_FLAG(tracer, CODEC_FLAG_H263P_AIV);
--
-   return FFMPEGLibraryInstance.AvcodecOpen(m_context, m_codec) == 0;
- }
- 
-@@ -521,7 +516,7 @@
- 
-     // Need to copy to local buffer to guarantee 16 byte alignment
-     memcpy(m_inputFrame->data[0], OPAL_VIDEO_FRAME_DATA_PTR(header), header->width*header->height*3/2);
--    m_inputFrame->pict_type = (flags & PluginCodec_CoderForceIFrame) ? FF_I_TYPE : AV_PICTURE_TYPE_NONE;
-+    m_inputFrame->pict_type = (flags & PluginCodec_CoderForceIFrame) ? AV_PICTURE_TYPE_I : AV_PICTURE_TYPE_NONE;
- 
-     /*
-     m_inputFrame->pts = (int64_t)srcRTP.GetTimestamp()*m_context->time_base.den/m_context->time_base.num/VIDEO_CLOCKRATE;
-@@ -603,13 +598,13 @@
-   m_context->rtp_callback = &H263_RFC2190_EncoderContext::RTPCallBack;
-   m_context->opaque = this; // used to separate out packets from different encode threads
- 
--  m_context->flags &= ~CODEC_FLAG_H263P_UMV;
-+  av_opt_set_int(m_context->priv_data, "umv", 0, 0);
-   m_context->flags &= ~CODEC_FLAG_4MV;
- #if LIBAVCODEC_RTP_MODE
-   m_context->flags &= ~CODEC_FLAG_H263P_AIC;
- #endif
--  m_context->flags &= ~CODEC_FLAG_H263P_AIV;
--  m_context->flags &= ~CODEC_FLAG_H263P_SLICE_STRUCT;
-+  av_opt_set_int(m_context->priv_data, "aiv", 0, 0);
-+  av_opt_set_int(m_context->priv_data, "structured_slices", 0, 0);
- 
-   return true;
- }
-diff -Naur opal-3.10.10.orig/plugins/video/H.263-1998/h263-1998.h opal-3.10.10/plugins/video/H.263-1998/h263-1998.h
---- opal-3.10.10.orig/plugins/video/H.263-1998/h263-1998.h	2013-02-20 03:18:03.000000000 +0100
-+++ opal-3.10.10/plugins/video/H.263-1998/h263-1998.h	2013-10-08 12:57:25.062873463 +0200
-@@ -115,7 +115,7 @@
-     virtual ~H263_Base_EncoderContext();
- 
-     virtual bool Init() = 0;
--    virtual bool Init(CodecID codecId);
-+    virtual bool Init(AVCodecID codecId);
- 
-     virtual bool SetOptions(const char * const * options);
-     virtual void SetOption(const char * option, const char * value);
-diff -Naur opal-3.10.10.orig/plugins/video/H.263-1998/Makefile.in opal-3.10.10/plugins/video/H.263-1998/Makefile.in
---- opal-3.10.10.orig/plugins/video/H.263-1998/Makefile.in	2013-02-20 03:18:03.000000000 +0100
-+++ opal-3.10.10/plugins/video/H.263-1998/Makefile.in	2013-10-08 12:57:25.062873463 +0200
-@@ -35,7 +35,7 @@
-              $(COMMONDIR)/dyna.cxx
- 
- CFLAGS += @LIBAVCODEC_CFLAGS@ -I$(COMMONDIR)
--LIBS   += @DL_LIBS@
-+LIBS   += @DL_LIBS@ @LIBAVUTIL_LIBS@
- 
- HAVE_LIBAVCODEC_RTP_MODE=@HAVE_LIBAVCODEC_RTP_MODE@
- ifeq ($(HAVE_LIBAVCODEC_RTP_MODE),yes)
-diff -Naur opal-3.10.10.orig/plugins/video/H.264/gpl/h264_helper.cxx opal-3.10.10/plugins/video/H.264/gpl/h264_helper.cxx
---- opal-3.10.10.orig/plugins/video/H.264/gpl/h264_helper.cxx	2013-02-20 03:18:02.000000000 +0100
-+++ opal-3.10.10/plugins/video/H.264/gpl/h264_helper.cxx	2013-10-08 12:57:25.062873463 +0200
-@@ -27,6 +27,7 @@
- #include <fstream>
- #include <stdlib.h> 
- #include <sys/stat.h>
-+#include <unistd.h>
- 
- #ifdef HAVE_UNISTD_H
- #include <unistd.h>
-diff -Naur opal-3.10.10.orig/plugins/video/H.264/h264-x264.cxx opal-3.10.10/plugins/video/H.264/h264-x264.cxx
---- opal-3.10.10.orig/plugins/video/H.264/h264-x264.cxx	2013-02-20 03:18:02.000000000 +0100
-+++ opal-3.10.10/plugins/video/H.264/h264-x264.cxx	2013-10-08 12:57:25.063873450 +0200
-@@ -40,6 +40,9 @@
- #include "plugin-config.h"
- #endif
- 
-+#define FF_IDCT_H264 11
-+#define CODEC_FLAG2_SKIP_RD 0x00004000
-+
- #include <codec/opalplugin.hpp>
- 
- #include "../common/ffmpeg.h"
-@@ -1071,13 +1074,10 @@
-         return false;
- 
-       m_context->workaround_bugs = FF_BUG_AUTODETECT;
--      m_context->error_recognition = FF_ER_AGGRESSIVE;
-       m_context->idct_algo = FF_IDCT_H264;
-       m_context->error_concealment = FF_EC_GUESS_MVS | FF_EC_DEBLOCK;
-       m_context->flags = CODEC_FLAG_INPUT_PRESERVED | CODEC_FLAG_EMU_EDGE;
--      m_context->flags2 = CODEC_FLAG2_BRDO |
--                          CODEC_FLAG2_MEMC_ONLY |
--                          CODEC_FLAG2_DROP_FRAME_TIMECODE |
-+      m_context->flags2 = CODEC_FLAG2_DROP_FRAME_TIMECODE |
-                           CODEC_FLAG2_SKIP_RD |
-                           CODEC_FLAG2_CHUNKS;
- 
-diff -Naur opal-3.10.10.orig/plugins/video/H.264/shared/x264wrap.cxx opal-3.10.10/plugins/video/H.264/shared/x264wrap.cxx
---- opal-3.10.10.orig/plugins/video/H.264/shared/x264wrap.cxx	2013-02-20 03:18:02.000000000 +0100
-+++ opal-3.10.10/plugins/video/H.264/shared/x264wrap.cxx	2013-10-08 12:57:25.064873438 +0200
-@@ -33,6 +33,7 @@
- 
- #include <codec/opalplugin.hpp>
- #include <stdio.h>
-+#include <unistd.h>
- 
- #ifdef HAVE_UNISTD_H
- #include <unistd.h>
-diff -Naur opal-3.10.10.orig/plugins/video/MPEG4-ffmpeg/Makefile.in opal-3.10.10/plugins/video/MPEG4-ffmpeg/Makefile.in
---- opal-3.10.10.orig/plugins/video/MPEG4-ffmpeg/Makefile.in	2013-02-20 03:18:07.000000000 +0100
-+++ opal-3.10.10/plugins/video/MPEG4-ffmpeg/Makefile.in	2013-10-08 12:57:25.064873438 +0200
-@@ -31,7 +31,7 @@
- SRCS      := mpeg4.cxx $(COMMONDIR)/dyna.cxx
- 
- CFLAGS += @LIBAVCODEC_CFLAGS@ -I$(COMMONDIR)
--LIBS   += @DL_LIBS@
-+LIBS   += @DL_LIBS@ @LIBAVUTIL_LIBS@
- 
- # Add LIBAVCODEC_SOURCE_DIR to the include path so we can #include <libavcodec/...h>
- # Also add libavutil, so ffmpeg headers can #include "log.h".
-diff -Naur opal-3.10.10.orig/plugins/video/MPEG4-ffmpeg/mpeg4.cxx opal-3.10.10/plugins/video/MPEG4-ffmpeg/mpeg4.cxx
---- opal-3.10.10.orig/plugins/video/MPEG4-ffmpeg/mpeg4.cxx	2013-02-20 03:18:07.000000000 +0100
-+++ opal-3.10.10/plugins/video/MPEG4-ffmpeg/mpeg4.cxx	2013-10-08 12:57:25.065873425 +0200
-@@ -103,6 +103,7 @@
- 
- #else /* LIBAVCODEC_HAVE_SOURCE_DIR */
- #include "../common/ffmpeg.h"
-+#include <libavutil/opt.h>
- #endif /* LIBAVCODEC_HAVE_SOURCE_DIR */
- }
- 
-@@ -589,17 +590,17 @@
-     m_avpicture->quality = m_videoQMin;
- 
- #ifdef USE_ORIG
--    m_avcontext->flags |= CODEC_FLAG_PART;   // data partitioning
-+    av_opt_set_int(m_avcontext->priv_data, "data_partitionin", 1, 0);
-     m_avcontext->flags |= CODEC_FLAG_4MV;    // 4 motion vectors
- #else
-     m_avcontext->max_b_frames=0; /*don't use b frames*/
-     m_avcontext->flags|=CODEC_FLAG_AC_PRED;
--    m_avcontext->flags|=CODEC_FLAG_H263P_UMV;
-+    av_opt_set_int(m_avcontext->priv_data, "umv", 1, 0);
-     /*c->flags|=CODEC_FLAG_QPEL;*/ /*don't enable this one: this forces profile_level to advanced simple profile */
-     m_avcontext->flags|=CODEC_FLAG_4MV;
-     m_avcontext->flags|=CODEC_FLAG_GMC;
-     m_avcontext->flags|=CODEC_FLAG_LOOP_FILTER;
--    m_avcontext->flags|=CODEC_FLAG_H263P_SLICE_STRUCT;
-+    av_opt_set_int(m_avcontext->priv_data, "structured_slices", 1, 0);
- #endif
-     m_avcontext->opaque = this;              // for use in RTP callback
- }
-@@ -804,7 +805,7 @@
-         // Should the next frame be an I-Frame?
-         if ((flags & PluginCodec_CoderForceIFrame) || (m_frameNum == 0))
-         {
--            m_avpicture->pict_type = FF_I_TYPE;
-+            m_avpicture->pict_type = AV_PICTURE_TYPE_I;
-         }
-         else // No IFrame requested, let avcodec decide what to do
-         {
-@@ -1325,7 +1326,7 @@
- 
- void MPEG4DecoderContext::SetStaticDecodingParams() {
-     m_avcontext->flags |= CODEC_FLAG_4MV; 
--    m_avcontext->flags |= CODEC_FLAG_PART;
-+    av_opt_set_int(m_avcontext->priv_data, "data_partitionin", 1, 0);
-     m_avcontext->workaround_bugs = 0; // no workaround for buggy implementations
- }
- 
diff --git a/net-libs/opal/files/opal-3.10.9-disable-h323-workaround.patch b/net-libs/opal/files/opal-3.10.9-disable-h323-workaround.patch
deleted file mode 100644
index 3d1761566ed1..000000000000
--- a/net-libs/opal/files/opal-3.10.9-disable-h323-workaround.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-# Sent to upstream on 2012-10-23
-# By Jesus Rivero <neurogeek@gentoo.org>
-diff -uNr opal-3.10.8.orig/include/h323/h323.h opal-3.10.8/include/h323/h323.h
---- opal-3.10.8.orig/include/h323/h323.h        2012-10-22 07:50:37.000000000 -0400
-+++ opal-3.10.8/include/h323/h323.h     2012-10-23 14:10:37.000000000 -0400
-@@ -40,6 +40,7 @@
- #include <h323/h323con.h>
- #include <h323/gkclient.h>
- #include <opal/buildopts.h>
-+#include <ptlib.h>
- 
- PString  OpalGetVersion();
- unsigned OpalGetMajorVersion();
diff --git a/net-libs/opal/files/opal-3.10.9-java-ruby-swig-fix.patch b/net-libs/opal/files/opal-3.10.9-java-ruby-swig-fix.patch
deleted file mode 100644
index 65708635a34d..000000000000
--- a/net-libs/opal/files/opal-3.10.9-java-ruby-swig-fix.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -uNr opal-3.10.9.orig/Makefile.in opal-3.10.9/Makefile.in
---- opal-3.10.9.orig/Makefile.in	2012-12-03 11:09:17.000000000 -0500
-+++ opal-3.10.9/Makefile.in	2012-12-03 11:09:35.000000000 -0500
-@@ -371,9 +371,9 @@
- ifeq ($(OPAL_JAVA), yes)
- 
- JAVA_SRCDIR      = $(OPAL_SRCDIR)/java
--JAVA_WRAPPER     = $(JAVA_SRCDIR)/java_swig_wrapper.c
-+JAVA_WRAPPER     = $(JAVA_SRCDIR)/java_swig_wrapper.cxx
- 
--VPATH_C         += $(JAVA_SRCDIR)
-+VPATH_CXX       += $(JAVA_SRCDIR)
- SOURCES         += $(JAVA_WRAPPER)
- 
- endif
-@@ -384,10 +384,10 @@
- 
- ifeq ($(OPAL_RUBY), yes)
- 
--RUBY_SRCDIR      = $(OPAL_SRCDIR)/ruby
--RUBY_WRAPPER     = $(JAVA_SRCDIR)/ruby_swig_wrapper.c
-+RUBY_SRCDIR      = $(OPAL_SRCDIR)/Ruby
-+RUBY_WRAPPER     = $(JAVA_SRCDIR)/ruby_swig_wrapper.cxx
- 
--VPATH_C         += $(RUBY_SRCDIR)
-+VPATH_CXX       += $(RUBY_SRCDIR)
- SOURCES         += $(RUBY_WRAPPER)
- 
- endif
diff --git a/net-libs/opal/metadata.xml b/net-libs/opal/metadata.xml
deleted file mode 100644
index 237de9848980..000000000000
--- a/net-libs/opal/metadata.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<use>
-		<flag name="celt">Enable CELT ultra-low delay audio codec</flag>
-		<flag name="dtmf">Enable DTMF encoding/decoding support</flag>
-		<flag name="fax">Enable T.38 FAX protocol</flag>
-		<flag name="h224">Enable H.224 real time control protocol</flag>
-		<flag name="h281">Enable H.281 Far-End Camera Control protocol</flag>
-		<flag name="h323">Enable H.323 protocol</flag>
-		<flag name="iax">Enable Inter-Asterisk eXchange protocol</flag>
-		<flag name="ivr">Enable Interactive Voice Response</flag>
-		<flag name="ilbc">Enable iLBC (RFC 3951) speech codec</flag>
-		<flag name="lid">Enable Line Interface Device</flag>
-		<flag name="plugins">Enable plugins support</flag>
-		<flag name="sbc">Enable the Bluetooth low-complexity, SubBand Codec
-		</flag>
-		<flag name="sip">Enable Session Initiation Protocol</flag>
-		<flag name="sipim">Enable SIP Instant Messages session</flag>
-		<flag name="srtp">Enable Secure Real-time Transport Protocol</flag>
-		<flag name="stats">Enable statistic reporting</flag>
-		<flag name="swig">Use swig to generate bindings</flag>
-		<flag name="video">Enable video support</flag>
-		<flag name="vpb">Enable Voicetronics VPB card support</flag>
-		<flag name="vxml">Enable VXML support</flag>
-		<flag name="wav">Enable WAVFILE support</flag>
-		<flag name="x264-static">Install x264 plugin statically linked with x264
-		</flag>
-		<!-- unused atm
-		<flag name="g711plc">Enable G711 Packet Loss Concealment</flag>
-		<flag name="msrp">Enable Message Session Relay Protocol</flag>
-		<flag name="rfc4103">Enable RTP Payload for Text Conversation</flag>
-		-->
-	</use>
-	<upstream>
-		<remote-id type="sourceforge">opalvoip</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-libs/opal/opal-3.10.11-r1.ebuild b/net-libs/opal/opal-3.10.11-r1.ebuild
deleted file mode 100644
index eb0508072328..000000000000
--- a/net-libs/opal/opal-3.10.11-r1.ebuild
+++ /dev/null
@@ -1,252 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools toolchain-funcs java-pkg-opt-2 flag-o-matic
-
-DESCRIPTION="C++ class library normalising numerous telephony protocols"
-HOMEPAGE="http://www.opalvoip.org/"
-SRC_URI="mirror://sourceforge/opalvoip/${P}.tar.bz2
-	doc? ( mirror://sourceforge/opalvoip/${P}-htmldoc.tar.bz2 )"
-
-LICENSE="MPL-1.0"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
-IUSE="celt debug doc +dtmf examples fax ffmpeg h224 h281 h323 iax ilbc
-ipv6 ivr java ldap libav lid +plugins sbc +sip +sipim +sound srtp ssl static-libs
-stats swig theora +video vpb vxml +wav x264 x264-static +xml"
-
-REQUIRED_USE="
-	x264-static? ( x264 )
-	h281? ( h224 )
-	sip? ( sipim )
-"
-
-RDEPEND="
-	>=net-libs/ptlib-2.10.10:=[stun,debug=,dtmf,http,ipv6?,ldap?,sound?,ssl?,video?,vxml?,wav?,xml?]
-	>=media-libs/speex-1.2_beta
-	fax? ( net-libs/ptlib[asn] )
-	h323? ( net-libs/ptlib[asn] )
-	ivr? ( net-libs/ptlib[http,xml,vxml] )
-	java? ( >=virtual/jre-1.4:* )
-	plugins? (
-		media-sound/gsm
-		celt? ( media-libs/celt:0 )
-		ffmpeg? (
-			libav? ( media-video/libav:0=[encode] )
-			!libav? ( media-video/ffmpeg:0=[encode] ) )
-		ilbc? ( dev-libs/ilbc-rfc3951 )
-		sbc? ( media-libs/libsamplerate )
-		theora? ( media-libs/libtheora )
-		x264? (	virtual/ffmpeg
-			media-libs/x264 ) )
-	srtp? ( net-libs/libsrtp:0= )
-	vxml? ( net-libs/ptlib[http,vxml] )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	java? ( swig? ( dev-lang/swig )
-		>=virtual/jdk-1.4 )
-"
-
-# NOTES:
-# ffmpeg[encode] is for h263 and mpeg4
-# ssl, xml, vxml, ipv6, ldap, sound, wav, and video are use flags
-#   herited from ptlib: feature is enabled if ptlib has enabled it
-#   however, disabling it if ptlib has it looks hard (coz of buildopts.h)
-#   forcing ptlib to disable it for opal is not a solution too
-#   atm, accepting the "auto-feature" looks like a good solution
-#   (asn is used for fax and config _only_ for examples)
-# OPALDIR should not be used anymore but if a package still need it, create it
-
-pkg_setup() {
-	# workaround for bug 282838
-	append-cxxflags "-fno-visibility-inlines-hidden"
-	append-cxxflags "-fno-strict-aliasing"
-
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# remove visual studio related files from samples/
-	if use examples; then
-		rm -f samples/*/*.vcproj
-		rm -f samples/*/*.sln
-		rm -f samples/*/*.dsp
-		rm -f samples/*/*.dsw
-	fi
-
-	# LFS ffmpeg2+ fixes.
-	eapply "${FILESDIR}"/opal-3.10.10-ffmpeg2-1.patch
-
-	if ! use h323; then
-		# Without this patch, ekiga wont compile, even with
-		# USE=-h323.
-		eapply "${FILESDIR}/${PN}-3.10.9-disable-h323-workaround.patch"
-	fi
-
-	eapply "${FILESDIR}/${PN}-3.10.9-java-ruby-swig-fix.patch"
-
-	sed -i -e "s:\(.*HAS_H224.*\), \[OPAL_H323\]:\1:" configure.ac \
-		|| die "sed failed"
-
-	# sed fixes for ffmpeg-3.
-	sed -e 's/CODEC_ID/AV_&/' \
-		-e 's/PIX_FMT_/AV_&/' \
-		-i plugins/video/H.263-1998/h263-1998.cxx \
-		   plugins/video/common/dyna.cxx          \
-		   plugins/video/H.264/h264-x264.cxx      \
-		   plugins/video/MPEG4-ffmpeg/mpeg4.cxx || die "sed failed"
-
-	eaclocal
-	eautoconf
-
-	# in plugins
-	cd plugins/
-	eaclocal
-	eautoconf
-	cd ..
-
-	# disable celt if celt is not enabled (prevent auto magic dep)
-	# already in repository
-	if ! use celt; then
-		sed -i -e "s/HAVE_CELT=yes/HAVE_CELT=no/" plugins/configure \
-			|| die "sed failed"
-	fi
-
-	# fix automatic swig detection, upstream bug 2712521 (upstream reject it)
-	if ! use swig; then
-		sed -i -e "/^SWIG=/d" configure || die "patching configure failed"
-	fi
-
-	use ilbc || { rm -r plugins/audio/iLBC/ || die "removing iLBC failed"; }
-
-	java-pkg-opt-2_src_prepare
-}
-
-src_configure() {
-	local forcedconf=""
-
-	# fix bug 277233, upstream bug 2820939
-	if use fax; then
-		forcedconf="${forcedconf} --enable-statistics"
-	fi
-
-	# --with-libavcodec-source-dir should _not_ be set, it's for trunk sources
-	# versioncheck: check for ptlib version
-	# shared: should always be enabled for a lib
-	# localspeex, localspeexdsp, localgsm, localilbc: never use bundled libs
-	# samples: only build some samples, useless
-	# libavcodec-stackalign-hack: prevent hack (default disable by upstream)
-	# default-to-full-capabilties: default enable by upstream
-	# aec: atm, only used when bundled speex, so it's painless for us
-	# zrtp doesn't depend on net-libs/libzrtpcpp but on libzrtp from
-	# 	http://zfoneproject.com/ wich is not in portage
-	# msrp: highly experimental
-	# spandsp: doesn't work with newest spandsp, upstream bug 2796047
-	# g711plc: force enable
-	# rfc4103: not really used, upstream bug 2795831
-	# t38, spandsp: merged in fax
-	# h450, h460, h501: merged in h323 (they are additional features of h323)
-	econf \
-		--enable-versioncheck \
-		--enable-shared \
-		--disable-zrtp \
-		--disable-localspeex \
-		--disable-localspeexdsp \
-		--disable-localgsm \
-		--disable-localilbc \
-		--disable-samples \
-		--disable-libavcodec-stackalign-hack \
-		--enable-default-to-full-capabilties \
-		--enable-aec \
-		--disable-msrp \
-		--disable-spandsp \
-		--enable-g711plc \
-		--enable-rfc4103 \
-		--disable-capi \
-		--disable-ixj \
-		$(use_enable debug) \
-		$(use_enable fax) \
-		$(use_enable fax t38) \
-		$(use_enable h224) \
-		$(use_enable h281) \
-		$(use_enable h323) \
-		$(use_enable h323 h450) \
-		$(use_enable h323 h460) \
-		$(use_enable h323 h501) \
-		$(use_enable iax) \
-		$(use_enable ivr) \
-		$(use_enable java) \
-		$(use_enable lid) \
-		$(use_enable plugins) \
-		$(use_enable sbc) \
-		$(use_enable sip) \
-		$(use_enable sipim) \
-		$(use_enable stats statistics) \
-		$(use_enable video) $(use_enable video rfc4175) \
-		$(use_enable vpb) \
-		$(use_enable x264 h264) \
-		$(use_enable x264-static x264-link-static) \
-		${forcedconf}
-}
-
-src_compile() {
-	local makeopts=""
-
-	use debug && makeopts="debug"
-
-	emake ${makeopts}
-}
-
-src_install() {
-	default
-
-	# Get rid of static libraries if not requested
-	# There seems to be no easy way to disable this in the build system
-	if ! use static-libs; then
-		rm -v "${D}"/usr/lib*/*.a || die
-	fi
-
-	if use doc; then
-		dohtml -r "${WORKDIR}"/html/* docs/* || die "dohtml failed"
-	fi
-
-	if use examples; then
-		local exampledir="/usr/share/doc/${PF}/examples"
-		local basedir="samples"
-		local sampledirs="`ls ${basedir} --hide=configure* \
-			--hide=opal_samples.mak.in`"
-
-		# first, install files
-		insinto ${exampledir}/
-		doins ${basedir}/{configure*,opal_samples*} \
-			|| die "doins failed"
-
-		# now, all examples
-		for x in ${sampledirs}; do
-			insinto ${exampledir}/${x}/
-			doins ${basedir}/${x}/* || die "doins failed"
-		done
-
-		# some examples need version.h
-		insinto "/usr/share/doc/${PF}/"
-		doins version.h || die "doins failed"
-	fi
-}
-
-pkg_postinst() {
-	if use examples; then
-		ewarn "All examples have been installed, some of them will not work on your system"
-		ewarn "it will depend of the enabled USE flags in ptlib and opal"
-	fi
-
-	if ! use plugins || ! use sound || ! use video; then
-		ewarn "You have disabled sound, video or plugins USE flags."
-		ewarn "Most audio/video features or plugins have been disabled silently"
-		ewarn "even if enabled via USE flags."
-		ewarn "Having a feature enabled via USE flag but disabled can lead to issues."
-	fi
-}
diff --git a/net-libs/phodav/Manifest b/net-libs/phodav/Manifest
index aa5d07afb5b6..8aeb55b441c3 100644
--- a/net-libs/phodav/Manifest
+++ b/net-libs/phodav/Manifest
@@ -3,5 +3,5 @@ AUX spice-webdavd.initd 344 BLAKE2B 6a7f36f4f698e5327455b3e95a71ae39df56f6d57e8d
 DIST phodav-2.1.tar.xz 293128 BLAKE2B bdb175812d742189b1efe5589f63a1fd50a18d7f1a59e0627a0eba0c8a82fd110bec1d434519c362a2d232680b3040c47768d9f960236c20dad0e036b7433529 SHA512 e43bd4c9ed97b7454e8452246c37211905b4cff430e91f3d2d36182736e1b8924d6ad477f58f110c98b85f02c085cd12c099020a0bea8abb19e65a9d52e1f4a8
 DIST phodav-2.2.tar.xz 294216 BLAKE2B e7062f933f407dff339b050a8b735e733fa41634cc34b0a37556b283b941ff620ae59a2ed3b7bce41530195f33a9fb3113f89e37190bb046352d90d72a750468 SHA512 1d16716c1bda674a6695b651e9b1bcb4b7cfefd9b60291ed3f5691f4f6f45f68a970d99fc4820bed0484cf0a43c1bf32e4d208fcc239ac0c0b7a75bf779e8913
 EBUILD phodav-2.1.ebuild 1255 BLAKE2B ce097cfc986614406a34dd30998b32b45d3b3b05b7e569b82cc0e3715f6cbf3f74d46cf8af45deab1f9ce3f48fe100285e674f952b723934bf2410f5c10373b6 SHA512 2a09d351e0b45efcb5efce2d58fe6e265c4e98d54795ff4d89c0751933534e8dc8dc0ce69031d7361f14155c822dcf90e6f9d322caffbf25c631729714a8fc1c
-EBUILD phodav-2.2.ebuild 1518 BLAKE2B ea481edd7864d561e47ca9e809d833131c3c95be08ed8942499900ec067d9aae9b583ec4daf65f20b264d922f26ef2e11ac18c0ea0f25e91fe840fe6d40b8bf0 SHA512 ec3768e75b61c16c7e4b56b637ba97a316dbb7853d24d1f278040781445b6dba4bd6ab66573d647a7ad174e057148622c2544ca16a775066ef87e1a2cd1ddc8e
+EBUILD phodav-2.2.ebuild 1517 BLAKE2B 5684a44e1061b57b647c203e26581e9ba4622b1e01e099488aa1e050f30ddb9d4b38caa9dec38cc2b42a5d012e67bd8116c12949b7088096cc799d6fb0e983e8 SHA512 ab4b0dd9ee1761e0560cbf88b4323815be6540d060c584ea68bf28eba078811b48f255149dac79a10eb8a7bfa98df1147896828130e520e730ad1cf34908a6a0
 MISC metadata.xml 466 BLAKE2B 81d7512b98e6c1e300131546f378edffde1f5206fde50b012cda0167df1ff4e16c7f64b5362b2dfa6797c2ebabfd8f89f88fe2bd01f5c0d3397ba1f0555b00ea SHA512 835e6f875a2540a0f6761373e568c6e24bb60ab437164638f69e238c5eba8413cd3752a19aab9ecdbbef4f1f0927d00ee11a51f8786c54feec401426ae76b6ec
diff --git a/net-libs/phodav/phodav-2.2.ebuild b/net-libs/phodav/phodav-2.2.ebuild
index 10fd9a02ac54..03d13d55eda9 100644
--- a/net-libs/phodav/phodav-2.2.ebuild
+++ b/net-libs/phodav/phodav-2.2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/phodav"
 
 LICENSE="LGPL-2.1+"
 SLOT="2.0"
-KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 x86"
 IUSE="spice systemd zeroconf"
 
 # It included g_uuid_* symbols of its own from an unapplied patch to glib; now that they
diff --git a/net-libs/ptlib/Manifest b/net-libs/ptlib/Manifest
deleted file mode 100644
index f9e8db713e73..000000000000
--- a/net-libs/ptlib/Manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-AUX ptlib-2.10.10-mga-bison-parameter.patch 820 BLAKE2B 9168cef397a8699c90f65d586253e07eb023485f242b3edfd15ab88c246baadb59c10d4f699cab3620e6cf4c1418c0223fd4675d01a5d7910e92d3e85f196a42 SHA512 9e28f29c26bd990bea3ff22bff8594eb24aff9a485bea54ebd97d0ec96d693ba64ee872fe1e7036188167d31f010a38ee811821236673bfaddbe28854a584748
-AUX ptlib-2.10.10-respect_cflags_cxxflags.patch 578 BLAKE2B 75360ba7fcd2643887e748c39d323466b095e244c3ad28cb747f0eaa825f74b4156749d09ac040184e23ee8fa3f9428aca5de58cd44984decc101a2dd5c99753 SHA512 551d9b8dd248fa66da731bd274c6183deacdbfe48d46b3686ae72aca5b622d4f62c00f6e27bf989d9ae8f2b9c58481b29c84eb99ee0c0a994668037c81bc15f8
-AUX ptlib-2.10.11-gcc6.patch 979 BLAKE2B 08faf2766450c4d7945a0db78b8525f6fc17f329e731725bedf19fd9471f01d78058909dfdbbe50991cb352e5d835e7c530d562aa6ebab8e1430ee84d8e484ee SHA512 11433fc6bdc3e6e275b5a8545796d566fe5e7ad26908205f8cb689ccc4e243d7abb94a11a0e18b60b7ac5ff8a546303b204db85f632e5e8da8d993d98183621b
-AUX ptlib-2.10.9-disable-telnet-symbols.patch 636 BLAKE2B 541478b517fd779c0a32b881cdfd568855bf7eafb56c11ef84e80e2b858ace74c3ebe4cd6c69bea27407adb7e4a5fdc18ae2ea1af3fe1f4a73514454e8bb29fa SHA512 63568fd8b6333af4ce553acf3a143dd91ff948ba905333ffa4e0156be4557aacedc75c6f2025d36216b6c9719fa79da9a9fe77c9c6f9e07d5e9764358532d682
-AUX ptlib-2.10.9-pkgconfig_ldflags.patch 444 BLAKE2B df7f56bd2a68c9266fbd7bb1651355fd7bece0658cb983a60e75ef8e7c97a4cc4c3715fd6c412abbbe8606d827542d8cd1002a2a78c99dcbc672909604986b30 SHA512 948a3c3ba011ae773b0c575109b833446bc5acc7dd3415545dc5f53548a0c2d973f3485672d3694a373242b9ff33911fd9c5efe67c42c8be1289b7622f87e8b4
-AUX ptlib-2.10.9-respect_cxxflags.patch 350 BLAKE2B 683b044721a8abbf36aed816e0a74b9578f063a8ab48d6edbe99c3d37c0880f7824290ad468270ab9e6f7979350b72457306d79ad17d706c9a1a281bf5182a16 SHA512 a74aa658f73b0b73db90324a7e6ef6546e43c190aa052119abf6898c70938a64a896b62d4a237002c7e235f1ba527c80e3befb9757da5de18934a029abf1bd7d
-AUX ptlib-2.10.9-svn_revision_override.patch 706 BLAKE2B 01051f4fd2d27425b9331d69b276bb0821df3e60ddc90dc5311cd6398af55ff5de1e21e9eec5cf7673315ce41cf5cd41e9605de33691789b8ef030f47d829cfa SHA512 be1c89ba86f6587d59fa9ed14e2db4ec02639922461d06e28ef302e2ae9085f7d6c388b51931ec32d78aff0c38eb72d48714e6602e296ce934053eaf6f1bb137
-DIST ptlib-2.10.10-htmldoc.tar.bz2 4504867 BLAKE2B a260c8a170c067e89f07185e0512f7857f2ffcc3c93a3d3853bd93a367333fcd94cd7e9d767e2131180fb9be09ce16c1f4d6c8052bee2db6feda8274d9eaa674 SHA512 7db5d169ad107132d2bca945a1269bae0dd0100b7566b1766dda83d0559a6f2044ffc21905520f7f15d218dd0b1290eaa13d5150d81340c6b0a9a464a713741d
-DIST ptlib-2.10.11.tar.bz2 3736259 BLAKE2B f594f71ca11b7828b5bcb88f5b7468c3689afa68d2cac6693a37cce12aa188e5c4b724eb08e3a8f077c57613846ba1b261c2b3a16a9345030332b5dd0c5b83e3 SHA512 ac8af8962330abf11986ccb863be0990c2e78ae611666d17c68068b72c4a5ea523ba74c55566284c3549e2346e407ccfffb5cc509fbf6ef19f1eb51dcb8b5f15
-EBUILD ptlib-2.10.11.ebuild 6278 BLAKE2B 9fd19dbce5213407461371b812bbc2b125b42f1f8015461249bd99b1ff2050f1d6bd643fc1923ede31759f65de948e2f760606ab8995808914c8b83c9a287a4b SHA512 caf82a7e556ea73801c06e7d08699662bd82391f21bd0d95ebfe7ff6e108f6c81dd774a17f4bda6b778fcbe17d0484c8cfeea6c84afd987f96d5cc27118ae9a1
-MISC metadata.xml 1102 BLAKE2B 59263308311f10f4e5a7f0425ab60fd6d60af2131dbd64c8b0517ea4a02b102f28d9b340b76c0522c3eac87304c28630525c01dc66922c35b60be473b9694300 SHA512 1d45a13f4197fbf7fc9ae6f8f0222309f59dd0fd7bedd6844125c48e60431d99a81d0e4dbeee4b9aa1dc4fb2c1e100f262b113dadf46e65613ed5a09e18435f7
diff --git a/net-libs/ptlib/files/ptlib-2.10.10-mga-bison-parameter.patch b/net-libs/ptlib/files/ptlib-2.10.10-mga-bison-parameter.patch
deleted file mode 100644
index fcc8d0d2e7a8..000000000000
--- a/net-libs/ptlib/files/ptlib-2.10.10-mga-bison-parameter.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- ptlib-2.10.11/./src/ptlib/common/getdate.y	2013-08-15 01:20:26.000000000 +0200
-+++ /mnt/chroot/cauldron/home/dan/rpm/BUILD/ptlib-2.10.11/src/ptlib/common/getdate.y	2013-12-15 00:24:27.866481490 +0100
-@@ -121,9 +121,9 @@
- static int yylex();
- 
- #ifdef __GNUC__
--static int yyerror(char const *msg);
-+static int yyerror(void *, char const *msg);
- #else
--static void yyerror(char const *msg);
-+static void yyerror(void *, char const *msg);
- #endif
- 
- 
-@@ -132,7 +132,8 @@
- 
- %}
- 
--%pure_parser
-+%pure-parser
-+%parse-param {void *parseParam}
- 
- %union {
-     time_t		Number;
-@@ -1018,12 +1019,12 @@
- #endif
- 
- #ifdef __GNUC__
--int yyerror(const char * s)
-+int yyerror(void *var, const char * s)
- {
-   return 0;
- }
- #else
--static void yyerror(const char * s)
-+static void yyerror(void *var, const char * s)
- {
- }
- #endif
diff --git a/net-libs/ptlib/files/ptlib-2.10.10-respect_cflags_cxxflags.patch b/net-libs/ptlib/files/ptlib-2.10.10-respect_cflags_cxxflags.patch
deleted file mode 100644
index 4442d333fcd1..000000000000
--- a/net-libs/ptlib/files/ptlib-2.10.10-respect_cflags_cxxflags.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ur ptlib-2.10.10.orig/make/ptbuildopts.mak.in ptlib-2.10.10/make/ptbuildopts.mak.in
---- ptlib-2.10.10.orig/make/ptbuildopts.mak.in	2014-08-04 18:11:02.000000000 +0000
-+++ ptlib-2.10.10/make/ptbuildopts.mak.in	2014-08-04 18:11:32.000000000 +0000
-@@ -15,8 +15,8 @@
- OSTYPE	   = @OSTYPE@
- OSRELEASE  = @OSRELEASE@
- 
--STDCCFLAGS    += @STDCCFLAGS@ @CPPFLAGS@
--STDCXXFLAGS   += @STDCXXFLAGS@ @CPPFLAGS@
-+STDCCFLAGS    += @STDCCFLAGS@ @CFLAGS@
-+STDCXXFLAGS   += @STDCXXFLAGS@ @CXXFLAGS@
- OPTSTDCCFLAGS += @OPTSTDCCFLAGS@
- LDFLAGS	      += @LDFLAGS@
- ENDLDLIBS     += @ENDLDLIBS@
\ No newline at end of file
diff --git a/net-libs/ptlib/files/ptlib-2.10.11-gcc6.patch b/net-libs/ptlib/files/ptlib-2.10.11-gcc6.patch
deleted file mode 100644
index 140de64f16e4..000000000000
--- a/net-libs/ptlib/files/ptlib-2.10.11-gcc6.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/src/ptlib/unix/svcproc.cxx
-+++ b/src/ptlib/unix/svcproc.cxx
-@@ -217,7 +217,7 @@
-     pid_t pid;
- 
-     {
--      ifstream pidfile(pidfilename);
-+      ifstream pidfile(static_cast<const char*>(pidfilename));
-       if (!pidfile.is_open()) {
-         cout << "Could not open pid file: \"" << pidfilename << "\""
-                 " - " << strerror(errno) << endl;
-@@ -384,7 +384,7 @@
-   // Run as a daemon, ie fork
- 
-   if (!pidfilename) {
--    ifstream pidfile(pidfilename);
-+    ifstream pidfile(static_cast<const char*>(pidfilename));
-     if (pidfile.is_open()) {
-       pid_t pid;
-       pidfile >> pid;
-@@ -412,7 +412,7 @@
-       cout << "Daemon started with pid " << pid << endl;
-       if (!pidfilename) {
-         // Write out the child pid to magic file in /var/run (at least for linux)
--        ofstream pidfile(pidfilename);
-+        ofstream pidfile(static_cast<const char*>(pidfilename));
-         if (pidfile.is_open())
-           pidfile << pid;
-         else
diff --git a/net-libs/ptlib/files/ptlib-2.10.9-disable-telnet-symbols.patch b/net-libs/ptlib/files/ptlib-2.10.9-disable-telnet-symbols.patch
deleted file mode 100644
index 0a3012c8510a..000000000000
--- a/net-libs/ptlib/files/ptlib-2.10.9-disable-telnet-symbols.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -uNr ptlib-2.10.8.orig/src/ptclib/cli.cxx ptlib-2.10.8/src/ptclib/cli.cxx
---- ptlib-2.10.8.orig/src/ptclib/cli.cxx	2012-10-19 13:45:35.000000000 -0400
-+++ ptlib-2.10.8/src/ptclib/cli.cxx	2012-10-22 16:02:58.000000000 -0400
-@@ -858,6 +858,7 @@
- 
- ///////////////////////////////////////////////////////////////////////////////
- 
-+#ifdef HAS_TELNET
- PCLITelnet::PCLITelnet(WORD port, const char * prompt, bool singleThreadForAll)
-   : PCLISocket(port, prompt, singleThreadForAll)
- {
-@@ -868,6 +869,7 @@
- {
-   return new PTelnetSocket();
- }
-+#endif
- 
- 
- ///////////////////////////////////////////////////////////////////////////////
diff --git a/net-libs/ptlib/files/ptlib-2.10.9-pkgconfig_ldflags.patch b/net-libs/ptlib/files/ptlib-2.10.9-pkgconfig_ldflags.patch
deleted file mode 100644
index acd531977c3b..000000000000
--- a/net-libs/ptlib/files/ptlib-2.10.9-pkgconfig_ldflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -uNr ptlib-2.10.8.orig/ptlib.pc.in ptlib-2.10.8/ptlib.pc.in
---- ptlib-2.10.8.orig/ptlib.pc.in       2012-10-19 13:45:35.000000000 -0400
-+++ ptlib-2.10.8/ptlib.pc.in    2012-10-19 14:03:26.000000000 -0400
-@@ -11,7 +11,7 @@
- Name: ptlib
- Description: PT Library
- Version: @PTLIB_VERSION@
--Libs: @LDFLAGS@ -L${libdir} -lpt${suffix}
-+Libs: @ENDLDLIBS@ -L${libdir} -lpt${suffix}
- Libs.private: @ENDLDLIBS@
- Cflags: -I${includedir} @STDCCFLAGS@
diff --git a/net-libs/ptlib/files/ptlib-2.10.9-respect_cxxflags.patch b/net-libs/ptlib/files/ptlib-2.10.9-respect_cxxflags.patch
deleted file mode 100644
index dc09f960f05a..000000000000
--- a/net-libs/ptlib/files/ptlib-2.10.9-respect_cxxflags.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff -uNr ptlib-2.10.8.orig/configure.ac ptlib-2.10.8/configure.ac
---- ptlib-2.10.8.orig/configure.ac	2012-10-19 13:45:35.000000000 -0400
-+++ ptlib-2.10.8/configure.ac	2012-10-23 08:08:57.000000000 -0400
-@@ -538,7 +540,7 @@
-   AC_MSG_RESULT(yes)
- else
-   AC_MSG_RESULT(no)
--  STDCXXFLAGS="$STDCCFLAGS -frtti"
-+  STDCXXFLAGS="$STDCXXFLAGS -frtti"
- fi
diff --git a/net-libs/ptlib/files/ptlib-2.10.9-svn_revision_override.patch b/net-libs/ptlib/files/ptlib-2.10.9-svn_revision_override.patch
deleted file mode 100644
index 5531fd9f6fcb..000000000000
--- a/net-libs/ptlib/files/ptlib-2.10.9-svn_revision_override.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -uNr ptlib-2.10.8.orig/src/ptlib/common/osutils.cxx ptlib-2.10.8/src/ptlib/common/osutils.cxx
---- ptlib-2.10.8.orig/src/ptlib/common/osutils.cxx      2012-10-19 13:45:35.000000000 -0400
-+++ ptlib-2.10.8/src/ptlib/common/osutils.cxx   2012-10-19 13:52:50.000000000 -0400
-@@ -43,13 +43,13 @@
- #include <ptlib/svcproc.h>
- #include <ptlib/pluginmgr.h>
- #include "../../../version.h"
--#include "../../../revision.h"
-+# define SVN_REVISION 0
-+//#include "../../../revision.h"
- 
- #ifdef _WIN32
- #include <ptlib/msos/ptlib/debstrm.h>
- #endif
- 
--
- static const char * const VersionStatus[PProcess::NumCodeStatuses] = { "alpha", "beta", "." };
- static const char DefaultRollOverPattern[] = "_yyyy_MM_dd_hh_mm";
diff --git a/net-libs/ptlib/metadata.xml b/net-libs/ptlib/metadata.xml
deleted file mode 100644
index 11317127f35c..000000000000
--- a/net-libs/ptlib/metadata.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<use>
-		<flag name="asn">Enable ASN decoding/encoding support</flag>
-		<flag name="dtmf">Enable DTMF encoding/decoding support</flag>
-		<flag name="http">Enable HTTP support</flag>
-		<flag name="mail">Enable mail protocols (POP3/SMTP)</flag>
-		<flag name="qos">Enable QOS support</flag>
-		<flag name="remote">Enable remote connection support</flag>
-		<flag name="serial">Enable serial port support</flag>
-		<flag name="shmvideo">Enable shared memory video devices</flag>
-		<flag name="socks">Enable SOCKS protocol support</flag>
-		<flag name="stun">Enable STUN support</flag>
-		<flag name="telnet">Enable telnet protocol support</flag>
-		<flag name="tts">Enable Text-To-Speech server support</flag>
-		<flag name="video">Enable video support</flag>
-		<flag name="vxml">Enable VoiceXML support</flag>
-		<flag name="wav">Enable WAVFILE support</flag>
-	</use>
-	<upstream>
-		<remote-id type="sourceforge">opalvoip</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-libs/ptlib/ptlib-2.10.11.ebuild b/net-libs/ptlib/ptlib-2.10.11.ebuild
deleted file mode 100644
index 02495a8d0e38..000000000000
--- a/net-libs/ptlib/ptlib-2.10.11.ebuild
+++ /dev/null
@@ -1,225 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils
-
-DESCRIPTION="Network focused portable C++ class library providing high level functions"
-HOMEPAGE="http://www.opalvoip.org/"
-SRC_URI="mirror://sourceforge/opalvoip/${P}.tar.bz2
-	doc? ( mirror://sourceforge/opalvoip/${PN}-2.10.10-htmldoc.tar.bz2 )"
-
-LICENSE="MPL-1.0"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ~arm ia64 ppc ppc64 sparc x86"
-# default enabled are features from 'minsize', the most used according to ptlib
-IUSE="alsa +asn debug doc +dtmf examples ffmpeg ftp +http ipv6
-xmpp ldap lua mail odbc oss pch pulseaudio qos remote sasl sdl serial
-shmvideo snmp soap socks +sound ssl static-libs +stun telnet tts v4l +video
-vxml +wav +xml xmlrpc"
-
-CDEPEND="
-	ldap? ( net-nds/openldap )
-	lua? ( dev-lang/lua )
-	odbc? ( dev-db/unixODBC )
-	pulseaudio? ( media-sound/pulseaudio )
-	sasl? ( dev-libs/cyrus-sasl:2 )
-	sdl? ( media-libs/libsdl )
-	sound? ( alsa? ( media-libs/alsa-lib ) )
-	ssl? ( dev-libs/openssl )
-	video? ( v4l? ( media-libs/libv4l ) )
-	xml? ( dev-libs/expat )
-	!!dev-libs/pwlib"
-RDEPEND="${CDEPEND}
-	ffmpeg? ( virtual/ffmpeg )"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	sys-devel/bison
-	sys-devel/flex
-	video? ( v4l? ( sys-kernel/linux-headers ) )"
-
-# NOTES:
-# media-libs/libdc1394:2 should be supported but headers location have changed
-# tools/ directory is ignored
-# avc plugin is disabled to fix bug 276514, see upstream bug 2821744
-
-conditional_use_warn_msg() {
-	ewarn "To enable ${1} USE flag, you need ${2} USE flag to be enabled"
-	ewarn "Please, enable ${2} or disable ${1}"
-}
-
-REQUIRED_USE="sdl? ( video )
-	xmpp? ( xml )
-	vxml? ( http tts xml )
-	xmlrpc? ( http xml )
-	soap? ( http xml )"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-2.10.9-svn_revision_override.patch" \
-		"${FILESDIR}/${PN}-2.10.9-pkgconfig_ldflags.patch" \
-		"${FILESDIR}/${PN}-2.10.9-respect_cxxflags.patch" \
-		"${FILESDIR}/${PN}-2.10.10-mga-bison-parameter.patch" \
-		"${FILESDIR}/${PN}-2.10.10-respect_cflags_cxxflags.patch" \
-		"${FILESDIR}/${P}-gcc6.patch"
-
-	if ! use telnet; then
-		epatch "${FILESDIR}/${PN}-2.10.9-disable-telnet-symbols.patch"
-	fi
-
-	# remove visual studio related files from samples/
-	if use examples; then
-		rm -f samples/*/*.vcproj
-		rm -f samples/*/*.sln
-		rm -f samples/*/*.dsp
-		rm -f samples/*/*.dsw
-	fi
-
-	if [[ ! -z ${TARGET+set} ]]; then
-		ewarn "TARGET variable is set. Removing as it would break the build, bug #465722."
-		unset TARGET
-	fi
-}
-
-src_configure() {
-	local myconf=""
-
-	# plugins are disabled only if ! sound and ! video
-	if ! use sound && ! use video; then
-		myconf="${myconf} --disable-plugins"
-	else
-		myconf="${myconf} --enable-plugins"
-	fi
-
-	# minsize: presets of features (overwritten by use flags)
-	# ansi-bool, atomicity: there is no reason to disable those features
-	# internalregex: we want to use system one
-	# sunaudio and bsdvideo are respectively for SunOS and BSD's
-	# appshare, vfw: only for windows
-	# samples: no need to build samples
-	# avc: disabled, bug 276514, upstream bug 2821744
-	# mlib: SUN mediaLibs. Not in tree.
-	# pipechan, configfile, resolver, url: force enabling
-	econf ${myconf} \
-		--disable-minsize \
-		--enable-ansi-bool \
-		--enable-atomicity \
-		--disable-internalregex \
-		--disable-sunaudio \
-		--disable-bsdvideo \
-		--disable-appshare \
-		--disable-vfw \
-		--disable-samples \
-		--disable-avc \
-		--disable-mlib \
-		--enable-configfile \
-		--enable-pipechan \
-		--enable-resolver \
-		--enable-url \
-		$(use_enable alsa) \
-		$(use_enable asn) \
-		$(use_enable debug exceptions) \
-		$(use_enable debug memcheck) \
-		$(use_enable debug tracing) \
-		$(use_enable dtmf) \
-		--disable-esd \
-		$(use_enable ffmpeg ffvdev) \
-		$(use_enable ftp) \
-		$(use_enable http) \
-		$(use_enable http httpforms) \
-		$(use_enable http httpsvc) \
-		--disable-dc \
-		$(use_enable ipv6) \
-		$(use_enable xmpp jabber) \
-		$(use_enable ldap openldap) \
-		$(use_enable lua) \
-		$(use_enable mail pop3smtp) \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable odbc) \
-		$(use_enable oss) \
-		$(use_enable pch) \
-		$(use_enable qos) \
-		$(use_enable remote remconn) \
-		$(use_enable sasl) \
-		$(use_enable sdl) \
-		$(use_enable serial) \
-		$(use_enable shmvideo) \
-		$(use_enable snmp) \
-		$(use_enable soap) \
-		$(use_enable socks) \
-		$(use_enable sound audio) \
-		$(use_enable ssl openssl) \
-		$(use_enable stun) \
-		$(use_enable telnet) \
-		$(use_enable tts) \
-		--disable-v4l \
-		$(use_enable v4l v4l2) \
-		$(use_enable video) $(use_enable video vidfile) \
-		$(use_enable vxml) \
-		$(use_enable wav wavfile) \
-		$(use_enable xml expat) \
-		$(use_enable xmlrpc)
-}
-
-src_compile() {
-	local makeopts=""
-	tc-env_build
-
-	use debug && makeopts="debug"
-
-	emake ${makeopts} V=1 || die "emake failed"
-}
-
-src_install() {
-	local makeopts=""
-
-	use debug && makeopts="DEBUG=1"
-
-	emake DESTDIR="${D}" ${makeopts} install || die "emake install failed"
-
-	# Get rid of static libraries if not requested
-	# There seems to be no easy way to disable this in the build system
-	if ! use static-libs; then
-		rm -v "${D}"/usr/lib*/*.a || die
-	fi
-
-	if use doc; then
-		dohtml -r "${WORKDIR}"/html/* || die "dohtml failed"
-	fi
-
-	dodoc History.txt ReadMe.txt ReadMe_QOS.txt || die "dodoc failed"
-
-	if use sound || use video; then
-		newdoc plugins/ReadMe.txt ReadMe-Plugins.txt || die "newdoc failed"
-	fi
-
-	if use examples; then
-		local exampledir="/usr/share/doc/${PF}/examples"
-		local basedir="samples"
-		local sampledirs="`ls samples --hide=Makefile`"
-
-		# first, install Makefile
-		insinto ${exampledir}/
-		doins ${basedir}/Makefile || die "doins failed"
-
-		# now, all examples
-		for x in ${sampledirs}; do
-			insinto ${exampledir}/${x}/
-			doins ${basedir}/${x}/* || die "doins failed"
-		done
-	fi
-}
-
-pkg_postinst() {
-	if use examples; then
-		ewarn "All examples have been installed, some of them will not work on your system"
-		ewarn "it will depend of the enabled USE flags."
-		ewarn "To test examples, you have to run PTLIBDIR=/usr/share/ptlib make"
-	fi
-
-	if ! use sound || ! use video; then
-		ewarn "You have disabled sound or video USE flags."
-		ewarn "Most audio/video have been disabled silently even if enabled via USE flags."
-		ewarn "Having a feature enabled via use flag but disabled can lead to issues."
-	fi
-}
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 13e5c0ac210f..400ebec082a6 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -13,7 +13,7 @@ DIST webkitgtk-2.18.5.tar.xz 14828616 BLAKE2B 850d5b74327975060615d9bb481c8ec264
 DIST webkitgtk-2.18.6.tar.xz 14829316 BLAKE2B 4c0140c17d513f064efe09aaefff434e3cbf2a88691c7916ed393bf9bd25a3cb5a1d4ea8699eb7e0d678d807293b66c4629e46df9088df9b4d122c554b280ead SHA512 375907d4c84e27aaa4b5df9a71424488c1b2ba0cf1d63e107d678c0f55f677996a80e9d9a9d4a412b40d1d0dde77b88464c54246cbafe70751042ec8a7bbe029
 DIST webkitgtk-2.4.11.tar.xz 9869100 BLAKE2B 9b1351976dc753025e6aba86a40f97fdf58821a6a7af109140a18adc7a0e1d8c140711b48bceeb3c4c189e7d52f258520623c7d971c46b6f2572c0e1de0d0100 SHA512 2e2cf01a52b8593765a0a3c2d7f0ad306121660019eb402226bd2826c7d4666dab4e91ca6ccbd29abe0ad3993549f256ed1ab88de22e9c8516d5f40a4edd6bfb
 EBUILD webkit-gtk-2.18.5.ebuild 8283 BLAKE2B 746803e8799d8125e39fb395b8ffdeb4bd0e34c969bec79b264974aead813a7e73a1b6c4d121bd34ee42a060f970fe0966c1272fac4f723cb71e669d8425af9d SHA512 93a751dc658101a97ccff5ad637e317200a21b0faabb42a35502a5b40b850ce23ce843f6bdb5de08fa5cdf991ebd91b780260b9a5130a8def2c4191b295a4b74
-EBUILD webkit-gtk-2.18.6.ebuild 8285 BLAKE2B e9937008fc089687a6903593651f4a9dddbf5a5090d88ffda3f88a6ae2b21f94bd6a2a5605520091b0c5e0fe70db9ecbd15f658fba4e58121222a3a127b53cd4 SHA512 33e38bebe2027cb9cef7d2f1492ae318fc6aa212204f86b904a3ea921712cc20c6c1778f6fd5264b5210a26058826b33c063b7f2180e7f30e61aa3340acd5beb
+EBUILD webkit-gtk-2.18.6.ebuild 8284 BLAKE2B 0d476e2d8f12429328ba8675ba51dc822de26a6b37a1284be6da0883ba622dc9bf88a6be8d911d75ac0a5dc68727ef7bd047f8641456f72a0f0f6f26e46ddd4e SHA512 067593940d294aaa82007d72a2915b5748c4f229812859a040103b99d5586595fe2e267df65a94e921aa1b5f9b8498dc715ca0cf6862cac8a89b052ebc141fc4
 EBUILD webkit-gtk-2.4.11-r1.ebuild 8966 BLAKE2B f54135230b3e5d12303f131bec732e2163c32a58c8571d566810f6563b285c11b253d5e46b80752a1e15a3f6c8462aaa3e856ea1c52b1bb9032d80f1e1b3f021 SHA512 559a7228b2c7f2dd00c26c7d4b0b935850eb93cc1e192c2e6695e5a418766050c80181d3b96254dcbfc3b9a8419c0605835a13b7640ceb6b750ec40edff35cd9
 EBUILD webkit-gtk-2.4.11-r200.ebuild 8373 BLAKE2B 9ee92280f93c2aa1107aab98faabf9c3298b0b70b9e5c30fdfd6c8d9cb3f7c9ab5362248c19a9d0d6ed49ec81ca4e6f0b5510413e16dbdace7941f051d0872ca SHA512 7b96440750ed9f5e6402aed773cfe1e40e419364d7d526922247e58c9cb7ead97960f9866d90cc990abce8e183d06bd66191d09991d137b7b9ba86faee4f4dca
 MISC metadata.xml 771 BLAKE2B 219d1c257311262d452b02b19b387cca0fc17cdc675cb4c790277c2c4f2ae9863a6039738a9151a3d6912ca024bc1d2348f5ca786f50412295fa8455c90fc8b4 SHA512 a4f15ea6644bf827f15628917d7af57f6569a2273cdf1246d468af95ab776ffe89fa305f842c869ad75c2b9a9480c4d5bc0e00732952ded75607de7ed9695236
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.18.6.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.18.6.ebuild
index 300736415c52..0e48cc9ffb85 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.18.6.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.18.6.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 
 IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl +X"