gentoo resync : 27.03.2018

25 files changed, 253 insertions, 800 deletions

diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 18a69c2a2781..d6982f4d7d55 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/libproxy/Manifest b/net-libs/libproxy/Manifest
index eb4841e5ff1c..64503caf2124 100644
--- a/net-libs/libproxy/Manifest
+++ b/net-libs/libproxy/Manifest
@@ -5,5 +5,5 @@ AUX libproxy-0.4.12-mozjs.pc.patch 781 BLAKE2B 9476a64b55fff7ec206042c42479c76bf
 AUX libproxy-0.4.13-cmake-37.patch 954 BLAKE2B 156f95113351f42f4e48a741f13dcda3cb0cfa7e26409c7cdb1b3347b4e0e30afb4c06de371723180cb4533df5180563606055b2ccd0f1a4a9b314cd3c84951c SHA512 e1aeacb40f06e9137d1f82444961e1216479e7d44d18c9d4c16b09d0e0b0c92c2f77e4c37fe33a020695d5dc23b1e4b2e4617d25e7d878bb816c60f3bc78ed45
 AUX proxy.1 681 BLAKE2B 14db05aa4282661bf4148af6187f8d3f2b9cefaa439851c5086b397f1b6972b8f28027aeb9ad7ac801d616f5b46f19b050642f0e754a63bd6aca1354aa2bad5c SHA512 57074dde3303d8775cb842fee5a6dde22f1c14d9e30af16f018e81fa87585c6e5b12edc1453cf8135624b4ac49568aebfdeaf634782307d6776c4cf2c5f8f96f
 DIST libproxy-0.4.13.tar.gz 89296 BLAKE2B 05e1c6a56e562a9fc8c8123bead6f3a264589f97895079f3d90cd0edd03d980c9b2bb0a4a3c2d2c2aa553e0ed0450863bd74236c00d94b9c42930efe9c37bff1 SHA512 babbe5e9326cb2bfdf4504662533b314f72c3475687f8b57c235614698cb18e0ed31752b834cb1d33cc94ecd3af6589684b2846e73830f0be3557c465a1f1c42
-EBUILD libproxy-0.4.13-r2.ebuild 3096 BLAKE2B d56dab6ace73d6fc7b67b3ba20def8de354341378e2401c7d830dd0aa114ba6f737dc74eb3adb39a08a9c44923486ad0d16bc36c55a5be9951e0571a3ec45a90 SHA512 8f8d8a9f9d4765f0221f36545ec7a92731b68d282e8423fe83de571685ecc9581eb78f372aaf740a8a0101da7f5d4350a59c54204b40bb6bffdcd67a0ef37b15
+EBUILD libproxy-0.4.13-r2.ebuild 3195 BLAKE2B ebe2b21a479df517431362a53256e6fda31d72ae3008488c436685e130d3623859a5e75973c8d7bf1d8e72acd4194a0f603a3b8cc94d91597822b6ea21c4d316 SHA512 7b9fdcb174da4960528774bf0fbe39cbcac080b9040d7373974deb7d7f85539b08355203d17bde2eb7c54df0e52e911b716a946ae3ff86dd4676d0735164b48a
 MISC metadata.xml 691 BLAKE2B fc4bcbf2660517674f65be0e28ee44bb1ad5958b2ab8bfc52ec071e46dd75b2ab7317f73644403c5fcc81bdb390afbad5da72763268bbbbe4bb50d077c1aa303 SHA512 d9405961f0cf0cc796948bacb020668a1a0d5b0e0690d9473029d3835dc51fed3d131b7e3da215419a2489bec21d95576fd4592a58aa46bb76114d985a981f7f
diff --git a/net-libs/libproxy/libproxy-0.4.13-r2.ebuild b/net-libs/libproxy/libproxy-0.4.13-r2.ebuild
index d212bc6f1b13..d5e475e1e5ce 100644
--- a/net-libs/libproxy/libproxy-0.4.13-r2.ebuild
+++ b/net-libs/libproxy/libproxy-0.4.13-r2.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
@@ -61,13 +61,13 @@ PATCHES=(
 
 multilib_src_configure() {
 	local mycmakeargs=(
-		'-DPERL_VENDORINSTALL=ON'
+		"$(multilib_is_native_abi && usex perl -DPERL_VENDORINSTALL=ON)"
 		# WITH_VALA just copies the .vapi file over and needs no deps,
 		# hence always enable it unconditionally
 		'-DWITH_VALA=ON'
 		"-DCMAKE_C_FLAGS=${CFLAGS}"
 		"-DCMAKE_CXX_FLAGS=${CXXFLAGS}"
-		"-DGMCS_EXECUTABLE='${EPREFIX}/usr/bin/mcs'"
+		"$(multilib_is_native_abi && usex mono -DGMCS_EXECUTABLE="${EPREFIX}/usr/bin/mcs")"
 		"-DWITH_GNOME3=$(usex gnome)"
 		"-DWITH_KDE=$(usex kde)"
 		"-DWITH_DOTNET=$(multilib_is_native_abi	&& usex mono || echo 'OFF')"
@@ -75,6 +75,7 @@ multilib_src_configure() {
 		"-DWITH_PERL=$(multilib_is_native_abi && usex perl || echo 'OFF')"
 		"-DWITH_PYTHON=$(multilib_is_native_abi	&& usex python || echo 'OFF')"
 		"-DWITH_MOZJS=$(multilib_is_native_abi && usex spidermonkey || echo 'OFF')"
+		"-DWITH_NATUS=OFF"
 		"-DWITH_WEBKIT=OFF"
 		"-DWITH_WEBKIT3=$(multilib_is_native_abi && usex webkit || echo 'OFF')"
 		"-DBUILD_TESTING=$(usex test)"
diff --git a/net-libs/mbedtls/Manifest b/net-libs/mbedtls/Manifest
index b6328056dcb6..a8ce5b5ae766 100644
--- a/net-libs/mbedtls/Manifest
+++ b/net-libs/mbedtls/Manifest
@@ -2,8 +2,12 @@ DIST mbedtls-2.6.0.tar.gz 1912899 BLAKE2B 6477cfabc8f86e4ac9cfd3539c3645ebb1446d
 DIST mbedtls-2.6.1.tar.gz 1912980 BLAKE2B 8ac29233edcd61fc2c440db86dd8359daa5fd6cf268f41748eb7d71d228739132ab22018ee636ac83e8bdb89917650103d9cea2b62ce28bf59a3a6d0cbe87f7e SHA512 06f8ba2a453164bac01d20ca6f5c80e691857977ef501d56685e81a0e90dddae1bedeab46c18c22f9a3b72894d45d7466f76a5c404417b6613ddae0ee4a881c8
 DIST mbedtls-2.7.0.tar.gz 2038485 BLAKE2B 66f853eb3832b3b8e531fc31ab826d9d4a19dc78cebb64d6893ed6adfce8816f65d43dee28ce34212e507e08c9fcb5918819996e3f819c0d048a5916857348df SHA512 411ec25d2cd51abbbfa2312195c4e65aa578855f6f909b8668375e6f5ce5401a00153cb4790328daaf85cd2d0ce647dbcc9fa556331e2d14709ba64aff883867
 DIST mbedtls-2.7.1.tar.gz 2040225 BLAKE2B 5743f1bdc9af8dd4425c36907d4cfa4a07ab6dd0a092d0b7e4ecdd775e19396ae409a7f5438bbe9d87a9e8fec28e45ef9472baea752bd2b3c06b4c62487bec49 SHA512 ba4b7dfafc02a949ffa91fb73ee574b320fe64731c3880abe4dd9730384c28ee67c9788375cbd654d385e90aee1bb9265a873ddda5c21ee8385f02ff784db3fc
+DIST mbedtls-2.7.2.tar.gz 2127772 BLAKE2B d66c65f0d974baf97ae361e64db5028af6c402ea248a785009b422d993deaa4facee98dd338ee4b5d36087fd07e679069fc4fb57cce548097d1f788cedb825fa SHA512 52455b68744a3c220aed7346d19c7b9bebd3a065406242b446816a3b02325d72005b5c381b158bfff90e2fe5854064629b297fbec95fea3ad203bfae51a15cab
+DIST mbedtls-2.8.0.tar.gz 2132562 BLAKE2B ac0a67c51e4aeb59e947d16039b20de680ccd7daf372652c0a7d1a6694ce8fe213f959b47a4335cda236575d8f491c84a413ae2f408e86600519ac66a31f8c1a SHA512 baa2024e26cb1d772a525348cdcc84e2b5eabf58642d8c792fe88cf6c539b36f14e80d592e85bc474f6be036513ed4b8bc86f5808ad4f5b08f25ca7e43dc3921
 EBUILD mbedtls-2.6.0.ebuild 2416 BLAKE2B e9f164316f072fe0648fc77391f78b14bd25fca8aac75172f086678592be85266236ae28e252d0595b52165016153f363f0b5af2ab799c544b9531070136031e SHA512 3ea0c78f51c759d556e68c51a5006d09004c98e04c7fe331b01b586dea921e39079cf00e7a6399a175c0b51bf07dec05c6a08ee54e622c35602fe5aed1f7f1cc
 EBUILD mbedtls-2.6.1.ebuild 2426 BLAKE2B fa77e8b8060ef1cba7e0dea4ba0da72b1f731fffb4194eb1d3c1b88dcd9f475e5d77a9113b825549ce1cd39bf3b2f8fa6907b862cf5ed2cb53e5f4a65214918d SHA512 38486a58add1060c65a0f190cb7b9e7327da8dfa9a3c05f93ee149b5e68ea9bf02d0acff502264d0314986e00a18ca3247f39adf4c6272fc1f6c0dd0cc0248de
 EBUILD mbedtls-2.7.0.ebuild 2426 BLAKE2B 3876ca38f5c8df3b858f4430bcf45fa5453876378fadfae9b06e0af1418c7dfdc853b9b781c0f12af47a6c2bc518c48203ba0f1bcf5fd05209dd831a33e82688 SHA512 d47bd79f91aa75bac1c15d945a01bcb1fd1df02641831b5579d52185c92419b3fb4a438be0968c4995a53ae360fd04e425b1ecc700cae42f6b92b4bb258face8
 EBUILD mbedtls-2.7.1.ebuild 2418 BLAKE2B aa3b1703e9054f1dbb4ad55eaf2ed3b286a1c3bd0f8a369f6123b1abfbcb42156bb2c71885c0ffa7710b6f842071532dd07776943cefd35728040c54ab307b87 SHA512 0ccf855ca1eb9cbf54a51ddd969bcf5feec66b3619d345be6cd480c782ddb36203f2e733475a5e2cf011c24ee1960f5f6ce03cc061cc55470328724844d8a942
+EBUILD mbedtls-2.7.2.ebuild 2426 BLAKE2B 3876ca38f5c8df3b858f4430bcf45fa5453876378fadfae9b06e0af1418c7dfdc853b9b781c0f12af47a6c2bc518c48203ba0f1bcf5fd05209dd831a33e82688 SHA512 d47bd79f91aa75bac1c15d945a01bcb1fd1df02641831b5579d52185c92419b3fb4a438be0968c4995a53ae360fd04e425b1ecc700cae42f6b92b4bb258face8
+EBUILD mbedtls-2.8.0.ebuild 2426 BLAKE2B 3876ca38f5c8df3b858f4430bcf45fa5453876378fadfae9b06e0af1418c7dfdc853b9b781c0f12af47a6c2bc518c48203ba0f1bcf5fd05209dd831a33e82688 SHA512 d47bd79f91aa75bac1c15d945a01bcb1fd1df02641831b5579d52185c92419b3fb4a438be0968c4995a53ae360fd04e425b1ecc700cae42f6b92b4bb258face8
 MISC metadata.xml 749 BLAKE2B ae622270ab3325ba6eb31b2699f2a470f348a4c7fa45dd1d11c7e022ded38bc57acb1357082fd57cf951b0422e0b5e08157acc6ebe841db9a5ef23ba9a3d9df9 SHA512 b1d9eb197d6c904a964bc21fadb939a2cdffaab0990c2254ed57e4dcf123353762c860ce36109072a192b3b31dec25b9c1236d209f42b2e95bcedb1e9342e3e5
diff --git a/net-libs/mbedtls/mbedtls-2.7.2.ebuild b/net-libs/mbedtls/mbedtls-2.7.2.ebuild
new file mode 100644
index 000000000000..a992986693d0
--- /dev/null
+++ b/net-libs/mbedtls/mbedtls-2.7.2.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils multilib-minimal
+
+DESCRIPTION="Cryptographic library for embedded systems"
+HOMEPAGE="https://tls.mbed.org/"
+SRC_URI="https://github.com/ARMmbed/mbedtls/archive/${P}.tar.gz"
+S=${WORKDIR}/${PN}-${P}
+
+LICENSE="Apache-2.0"
+SLOT="0/10" # slot for libmbedtls.so
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="cpu_flags_x86_sse2 doc havege libressl programs test threads zlib"
+
+RDEPEND="
+	programs? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen media-gfx/graphviz )
+	test? ( dev-lang/perl )"
+
+enable_mbedtls_option() {
+	local myopt="$@"
+	# check that config.h syntax is the same at version bump
+	sed -i \
+		-e "s://#define ${myopt}:#define ${myopt}:" \
+		include/mbedtls/config.h || die
+}
+
+src_prepare() {
+	use cpu_flags_x86_sse2 && enable_mbedtls_option MBEDTLS_HAVE_SSE2
+	use zlib && enable_mbedtls_option MBEDTLS_ZLIB_SUPPORT
+	use havege && enable_mbedtls_option MBEDTLS_HAVEGE_C
+	use threads && enable_mbedtls_option MBEDTLS_THREADING_C
+	use threads && enable_mbedtls_option MBEDTLS_THREADING_PTHREAD
+
+	cmake-utils_src_prepare
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DENABLE_PROGRAMS=$(multilib_native_usex programs)
+		-DENABLE_ZLIB_SUPPORT=$(usex zlib)
+		-DUSE_STATIC_MBEDTLS_LIBRARY=OFF
+		-DENABLE_TESTING=$(usex test)
+		-DUSE_SHARED_MBEDTLS_LIBRARY=ON
+		-DINSTALL_MBEDTLS_HEADERS=ON
+		-DLIB_INSTALL_DIR="/usr/$(get_libdir)"
+	)
+
+	cmake-utils_src_configure
+}
+
+multilib_src_compile() {
+	cmake-utils_src_compile
+	use doc && multilib_is_native_abi && emake apidoc
+}
+
+multilib_src_test() {
+	LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${BUILD_DIR}/library" \
+		cmake-utils_src_test
+}
+
+multilib_src_install() {
+	cmake-utils_src_install
+}
+
+multilib_src_install_all() {
+	use doc && HTML_DOCS=( apidoc )
+
+	einstalldocs
+
+	if use programs ; then
+		# avoid file collisions with sys-apps/coreutils
+		local p e
+		for p in "${ED%/}"/usr/bin/* ; do
+			if [[ -x "${p}" && ! -d "${p}" ]] ; then
+				mv "${p}" "${ED%/}"/usr/bin/mbedtls_${p##*/} || die
+			fi
+		done
+		for e in aes hash pkey ssl test ; do
+			docinto "${e}"
+			dodoc programs/"${e}"/*.c
+			dodoc programs/"${e}"/*.txt
+		done
+	fi
+}
diff --git a/net-libs/mbedtls/mbedtls-2.8.0.ebuild b/net-libs/mbedtls/mbedtls-2.8.0.ebuild
new file mode 100644
index 000000000000..a992986693d0
--- /dev/null
+++ b/net-libs/mbedtls/mbedtls-2.8.0.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils multilib-minimal
+
+DESCRIPTION="Cryptographic library for embedded systems"
+HOMEPAGE="https://tls.mbed.org/"
+SRC_URI="https://github.com/ARMmbed/mbedtls/archive/${P}.tar.gz"
+S=${WORKDIR}/${PN}-${P}
+
+LICENSE="Apache-2.0"
+SLOT="0/10" # slot for libmbedtls.so
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="cpu_flags_x86_sse2 doc havege libressl programs test threads zlib"
+
+RDEPEND="
+	programs? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen media-gfx/graphviz )
+	test? ( dev-lang/perl )"
+
+enable_mbedtls_option() {
+	local myopt="$@"
+	# check that config.h syntax is the same at version bump
+	sed -i \
+		-e "s://#define ${myopt}:#define ${myopt}:" \
+		include/mbedtls/config.h || die
+}
+
+src_prepare() {
+	use cpu_flags_x86_sse2 && enable_mbedtls_option MBEDTLS_HAVE_SSE2
+	use zlib && enable_mbedtls_option MBEDTLS_ZLIB_SUPPORT
+	use havege && enable_mbedtls_option MBEDTLS_HAVEGE_C
+	use threads && enable_mbedtls_option MBEDTLS_THREADING_C
+	use threads && enable_mbedtls_option MBEDTLS_THREADING_PTHREAD
+
+	cmake-utils_src_prepare
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DENABLE_PROGRAMS=$(multilib_native_usex programs)
+		-DENABLE_ZLIB_SUPPORT=$(usex zlib)
+		-DUSE_STATIC_MBEDTLS_LIBRARY=OFF
+		-DENABLE_TESTING=$(usex test)
+		-DUSE_SHARED_MBEDTLS_LIBRARY=ON
+		-DINSTALL_MBEDTLS_HEADERS=ON
+		-DLIB_INSTALL_DIR="/usr/$(get_libdir)"
+	)
+
+	cmake-utils_src_configure
+}
+
+multilib_src_compile() {
+	cmake-utils_src_compile
+	use doc && multilib_is_native_abi && emake apidoc
+}
+
+multilib_src_test() {
+	LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${BUILD_DIR}/library" \
+		cmake-utils_src_test
+}
+
+multilib_src_install() {
+	cmake-utils_src_install
+}
+
+multilib_src_install_all() {
+	use doc && HTML_DOCS=( apidoc )
+
+	einstalldocs
+
+	if use programs ; then
+		# avoid file collisions with sys-apps/coreutils
+		local p e
+		for p in "${ED%/}"/usr/bin/* ; do
+			if [[ -x "${p}" && ! -d "${p}" ]] ; then
+				mv "${p}" "${ED%/}"/usr/bin/mbedtls_${p##*/} || die
+			fi
+		done
+		for e in aes hash pkey ssl test ; do
+			docinto "${e}"
+			dodoc programs/"${e}"/*.c
+			dodoc programs/"${e}"/*.txt
+		done
+	fi
+}
diff --git a/net-libs/miniupnpc/Manifest b/net-libs/miniupnpc/Manifest
index 1472aa783db3..f0cbb644bb20 100644
--- a/net-libs/miniupnpc/Manifest
+++ b/net-libs/miniupnpc/Manifest
@@ -5,5 +5,5 @@ DIST miniupnpc-2.0.20180222.tar.gz 87018 BLAKE2B 656ae02ac6e462084252d95e579972d
 EBUILD miniupnpc-2.0.20170509.ebuild 1266 BLAKE2B 275a77b2813007c8055df57d2e8d74c05c02e7f81af1b1ad766a4c9f274f955c7d56779184983a1e45962bbc38e9ff58f15f4bfc076ed86cc1400eabac4f2dcb SHA512 aeeaba172f38162342256afc17223e1efce42f149561ca0e19bcd8336d32dd74d51a55951f4df79663d1999702930eb4dcd6ceebeea9afe82d9f376432dd7271
 EBUILD miniupnpc-2.0.20171212.ebuild 1270 BLAKE2B 42eab3cd40d4764a3c551cb4530ce4def1cf190b475db3dcd4da32b7e420384a20a05d33ae009e44736e75f2e65ed5a0b07207cbf8aa9d492d8b67c0c8aec25e SHA512 6bf4ca48552697b0d25988f7561e436e8cb6fb77ae8d4c45dafc45fa98f5e42482561cbd45ade92a8f218874b37925c6c9874f83a98e9d1a13d286202238d3d6
 EBUILD miniupnpc-2.0.20180203.ebuild 1339 BLAKE2B be0965e64f83087fffb495b3c3de74d691b2575fd8d14b36c56284404e912b623baea93027c61d58d354ef00c8fb31f4581b01959606683e1d23563e75b72891 SHA512 af3b05b0af780f4b8707209b7d1bbd26c8952c0f9314f613569f6da6e03a5bac9961d19e16e6c0876abee7006401c909b02e5c058daba7e2dbd6922aba98110e
-EBUILD miniupnpc-2.0.20180222.ebuild 1339 BLAKE2B be0965e64f83087fffb495b3c3de74d691b2575fd8d14b36c56284404e912b623baea93027c61d58d354ef00c8fb31f4581b01959606683e1d23563e75b72891 SHA512 af3b05b0af780f4b8707209b7d1bbd26c8952c0f9314f613569f6da6e03a5bac9961d19e16e6c0876abee7006401c909b02e5c058daba7e2dbd6922aba98110e
+EBUILD miniupnpc-2.0.20180222.ebuild 1338 BLAKE2B b6b40fd03fe5f2e1c4e5523dc77f59a9af2cfb0d00f16faf0af41574a530ea4993a00598a3489d31462809dc604d300815dc5ad3475f896919d09374f4e61912 SHA512 da05d6da1326d40e2ba67a72ec19c079ab2d7dca4472ab1327ee2f68bb31dda9b2115e3c9219654502244d424238eb49e9ca9fef9e9cda8825fe7c316cc05b07
 MISC metadata.xml 243 BLAKE2B 997913e51bb9c2ba601c78673246d3845d1078f5be11ff209532c5afc9f433d4cfe7a0066ba23677d23ffe368d7ee718df71d28301d45c0473f50e931f674165 SHA512 ded2bb7e056d9081e11b0470aa2874fbe9b5e63f0178bec611291f639763a9bd85a076dbc526e01df1403dea4d0eb28913addb346b676084e690e063b68eca28
diff --git a/net-libs/miniupnpc/miniupnpc-2.0.20180222.ebuild b/net-libs/miniupnpc/miniupnpc-2.0.20180222.ebuild
index 3a1c24a1b100..1838ac4461be 100644
--- a/net-libs/miniupnpc/miniupnpc-2.0.20180222.ebuild
+++ b/net-libs/miniupnpc/miniupnpc-2.0.20180222.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 sparc ~x86 ~x86-fbsd"
 IUSE="ipv6 kernel_linux static-libs"
 
 RDEPEND=""
diff --git a/net-libs/srt/Manifest b/net-libs/srt/Manifest
new file mode 100644
index 000000000000..9e555977c928
--- /dev/null
+++ b/net-libs/srt/Manifest
@@ -0,0 +1,3 @@
+DIST srt-1.2.2.tar.gz 634049 BLAKE2B 1f650c5d8ab470829212b9c4a1082eb1de4480c8bad4b787a63a2b9c06cb7c8c0ad3a80a06ec5b13e629ec2d18a025ff36e3dcdaa9de8359805e3ff4c1b4d963 SHA512 cb897c97d5fd93b333c8de0805c78c940650a2daf8d821e09e3fb01c7e4b56bd7513cf28545f7ac422fba9fa8420b745f397359a4b9e81cff496c776820ea90a
+EBUILD srt-1.2.2.ebuild 1055 BLAKE2B 3548583311b1ea6d21c20ff9752cd29968d8357b99821d56b7f894495efa11eb31e2624f8cc45d6ef50915c188ebf0f9ee7579fe4502c48eb3ab919ffcbe004e SHA512 a85446242b4830255ea70b9b2632dfb404178056b29009e6facffc6ac35dc708c018baf8c48dd9f97d5bed1bf7109fe6df0946173c072264f95635180e395c5f
+MISC metadata.xml 324 BLAKE2B e4ec422ef551112cbabbcf38a7e2cb7afbcdfe7b731aa3c1bf38536dc588102fb891e0ad619fb7027d55bc51c87b66f665c6500d488582dca753e48d03d632c1 SHA512 a01b2427991b2a6fb99a6bee4cfe0f1653a5ab640febe2ecbb0b0d0c0453f58aeea033865babb58d7aea338900a1a6924caf691c272c6750ca031bdb0894ddf1
diff --git a/net-libs/srt/metadata.xml b/net-libs/srt/metadata.xml
new file mode 100644
index 000000000000..b865368cdf49
--- /dev/null
+++ b/net-libs/srt/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>lu_zero@gentoo.org</email>
+		<name>Luca Barbato</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">Haivision/srt</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-libs/srt/srt-1.2.2.ebuild b/net-libs/srt/srt-1.2.2.ebuild
new file mode 100644
index 000000000000..66d1b1dadb46
--- /dev/null
+++ b/net-libs/srt/srt-1.2.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-multilib
+
+DESCRIPTION="Open-source implementation of the Secure Real-time Transport Protocol (SRTP)"
+HOMEPAGE="https://github.com/Haivision/srt"
+SRC_URI="https://github.com/Haivision/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc libressl gnutls"
+
+RDEPEND="
+	gnutls? ( net-libs/gnutls )
+	!gnutls? (
+		!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
+		libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+	)
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( README.md )
+
+#PATCHES=( "${FILESDIR}/${P} )
+
+src_prepare() {
+	cmake-utils_src_prepare
+	sed -i -e "s:hcrypt_ut.c::" "${S}"/haicrypt/*.maf || die
+	sed -i -e 's:DESTINATION lib:DESTINATION lib${LIB_SUFFIX}:' CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_GNUTLS=$(usex gnutls)
+	)
+	cmake-multilib_src_configure
+}
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index ca18a8ed938e..b0384a96b9b7 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,17 +1,4 @@
-AUX webkit-gtk-1.11.90-gtk-docize-fix.patch 426 BLAKE2B 19086e859da5b565c31aff471a55a1b5896f9ffc9f3a916737f6639483711ef6e3587184f7c89d5578c217eabb41be8d52bfb8f015e30daaff8f77fdb9d6e614 SHA512 e35cc255e36742519b4f26b60d8e704eb3e0e66e8e13599cadae6fe445a3a87a2c6c65b6746c4d39f1ab11e7eb79b0f63a5fc9d5af5d7fa8907b224b852e3b32
-AUX webkit-gtk-1.6.1-darwin-quartz.patch 1516 BLAKE2B 728f0c5a6952179bc06ede8b3a71eae51e082802d8db720e5dfad859e02a5d3915756aa4368df790a549f9a61dfad7f0e0da9d6c57f71a9bc27a8ca17b2c69f0 SHA512 ca8c80d06aa93c07d658ebf3433f5fdee9225616740a075f5606df87e3b90a83b2c492777a8e30255cdd4f11f889be789544ac1fc4a39056e1929a72720347ea
-AUX webkit-gtk-2.2.5-hppa-platform.patch 530 BLAKE2B 0326e813a0b732eafd569db4eb408e2924df65464359eca4dfccdbaeecbc853084a08ed6ac50a973e9f5abeb0d6a847e8e8b3a51937d3a8840957af4e607a374 SHA512 168d4f8acddf4a5fa6ddc3661ef3ec344824c854db036b279d38d526b6025cfbb8bbd15bc64ddd846876749823796ca7d05e4083cf35a744d46b00cfd5179ae1
-AUX webkit-gtk-2.2.5-ia64-platform.patch 331 BLAKE2B 6793b3cddfdfcdb859cd19b33968bd1da2c4bd9958fe69341f83476d5918cbde2dbbc0a2e191f887265e51ad0ab3ee290f2e2de2bf48752e4c8b9dacd245d5cf SHA512 dae3cde801d2d29c61abb64c00bf33ac1f7080dd2085cc9a1520c8606ef65538ccee9b1e4c4c16a3dba551acd035542f80b6e808ae5090bb883c85ecfa7ac36e
-AUX webkit-gtk-2.4.1-ia64-malloc.patch 807 BLAKE2B 240c2f978f2b2cba7fc1d5e2c3c597a462cf28d9dc7d31dcde1db4d64c7cc0a98558bb6bd2ce0f28cb07a74bc333ca01b1ec817674c18a71d1622a821c2a8681 SHA512 d9e7a792861ff30137072eba6b5b80e7b37e47e7302bf1cd56027b5c30aea3fd215891f6272d85b80e98c826b3216d0701fe92f06b76e7d1fb860028d7a701c0
-AUX webkit-gtk-2.4.11-video-web-audio.patch 520 BLAKE2B f7af9601ad10920aea28f000b5457a5bea3d50ffe8cd873138fae1ffcd5ca191e3517452e748295ddb16ab6ac46d22074d9bf475aa69d2b1772ed44ecb427722 SHA512 df7b54fed95d0132bbed22fa90f3523b94a70940ac33acefc46aa0c59b604ee36d3350035fe8bca78ba9a7ab45527d0c1afde8160e4d408eb8a7ee07048bd8d1
-AUX webkit-gtk-2.4.4-atomic-ppc.patch 1294 BLAKE2B 05d62a79aaa66eeae5d80d5aa25747fcf021c8416a1db8f60b46f7164d3e4648089af99fcc8062d3f543b2b9dd6819efa82a4d54c193cf15465cbaa4d23d2beb SHA512 80c5c158eba950e56e6a3c046cc3325efcdeab0ad1add140bae1b08a9620553e2166f5df7b0a586814cd49add430dfd15b6675f1467532f294120bdd8852d067
-AUX webkit-gtk-2.4.4-jpeg-9a.patch 1262 BLAKE2B 0ba241e782fb5ac415149e621f04f0db8d1fce035e78b1fca77902a7904858f71a25d19f6666f8a25b22b34a1104372ccd681a124e142fecafa232c778040019 SHA512 8bfc1255f083b7d4cdbe5e03d7a006efae976988847f36c27758589a2410cf6b84e0c81a3c9673ec9b552e34af92e6d833a8db5413c03d0c85c3d82f4628c583
-AUX webkit-gtk-2.4.7-disable-webgl.patch 442 BLAKE2B 5f9586b33fa496ae49f52143dc3d966d989ba24094fa98558ab23cb9a73df26666101ae78e41c408429eba5540f6803c564d4736a882bedba3cc7ab920c3c061 SHA512 742854749e674b3fec33652709921630a5fd3d7afd10446b3121a8cf94fb4fef70cc4de6ffe1a08143f518fd76aa05d0f4b54a041192cbc8eb9fbd5766faa5b8
-AUX webkit-gtk-2.4.9-gcc-6.patch 1890 BLAKE2B dd539bc80529b737d1fa613dcdbd2445e062234533df8f12c6b7ce2f4852e22f912e5199701863b8c1f947fd3dc0ce52c8c0c357af006eb6160f8ce8e3f8b52d SHA512 cfcfe95b08d503456b1ea6e1770dd4ca4cd61f613ef76962cd01bc4826fbb25aed04834f820da987fd1c80941b90da73086ec5e7e19285e54082f5e90598fd9c
 AUX webkit-gtk-2.8.5-fix-ia64-build.patch 663 BLAKE2B 4eb51aefe08ba9c2bef60a9b5f5f68dad98dac259fc2c014b0fd567a45424a30aee9412cd914b0a05745c16df0dd81e553fdf80e15beef5f006408ce78825321 SHA512 ce8dbe7f2bacfc6d1ad70d39d80447ab90e6daf63bc1dc4a49c406255f76eff090f79e6076ebc349d69193b72a821fa6591692cf74a28e529f8db95cf86358fc
 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.6.ebuild 8283 BLAKE2B 746803e8799d8125e39fb395b8ffdeb4bd0e34c969bec79b264974aead813a7e73a1b6c4d121bd34ee42a060f970fe0966c1272fac4f723cb71e669d8425af9d SHA512 93a751dc658101a97ccff5ad637e317200a21b0faabb42a35502a5b40b850ce23ce843f6bdb5de08fa5cdf991ebd91b780260b9a5130a8def2c4191b295a4b74
-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
+MISC metadata.xml 680 BLAKE2B f984312660f4c50297f07b4618ac873dea2c68ea9d38c14e623cbf28fd01a2c8253b632b321647efb517c9b921908497bb83e2713c037deac61d3c5e8ad62877 SHA512 acbcc1a46d844cb1b5fe7f69c77cf98c920c78e535a4cc3ab33269da8361aedb4a6a7a8433b053cf73b5d07b8981d6892ef92ff25471f4e133ad5179c7df181e
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.11.90-gtk-docize-fix.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.11.90-gtk-docize-fix.patch
deleted file mode 100644
index c94f545356ee..000000000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-1.11.90-gtk-docize-fix.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/configure.ac.old	2013-03-02 09:22:53.791750644 +0200
-+++ b/configure.ac	2013-03-02 09:24:56.725213764 +0200
-@@ -24,6 +24,7 @@
- m4_include([Source/autotools/SetupLibtool.m4])
- m4_include([Source/autotools/ReadCommandLineArguments.m4])
- m4_include([Source/autotools/FindDependencies.m4])
-+GTK_DOC_CHECK([1.10])
- m4_include([Source/autotools/SetupCompilerFlags.m4])
- m4_include([Source/autotools/SetupAutoconfHeader.m4])
- 
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.6.1-darwin-quartz.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.6.1-darwin-quartz.patch
deleted file mode 100644
index 5ad357e9eeed..000000000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-1.6.1-darwin-quartz.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-Original from:
-http://trac.macports.org/browser/trunk/dports/www/webkit-gtk/files/patch-quartz-WebCore-plugins-gtk-gtkxtbin.c.diff?format=txt
-http://trac.macports.org/browser/trunk/dports/www/webkit-gtk/files/patch-quartz-WebCore-plugins-gtk-PluginViewGtk.cpp.diff?format=txt
-
-Adapted for 1.6.1
-
---- Source/WebCore/plugins/gtk/PluginViewGtk.cpp
-+++ Source/WebCore/plugins/gtk/PluginViewGtk.cpp
-@@ -70,6 +70,8 @@
- #endif
- #include <gtk/gtk.h>
- 
-+#undef XP_UNIX
-+
- #if defined(XP_UNIX)
- #include "RefPtrCairo.h"
- #include "gtk2xtbin.h"
-@@ -439,9 +441,9 @@
-         event->setDefaultHandled();
- }
- 
--#if defined(XP_UNIX)
- void PluginView::handleFocusInEvent()
- {
-+#if defined(XP_UNIX)
-     if (!m_isStarted || m_status != PluginStatusLoadedSuccessfully)
-         return;
- 
-@@ -454,10 +456,12 @@
-     event.detail = NotifyDetailNone;
- 
-     dispatchNPEvent(npEvent);
-+#endif
- }
- 
- void PluginView::handleFocusOutEvent()
- {
-+#if defined(XP_UNIX)
-     if (!m_isStarted || m_status != PluginStatusLoadedSuccessfully)
-         return;
- 
-@@ -470,8 +474,8 @@
-     event.detail = NotifyDetailNone;
- 
-     dispatchNPEvent(npEvent);
--}
- #endif
-+}
- 
- void PluginView::setParent(ScrollView* parent)
- {
---- Source/WebCore/plugins/gtk/gtk2xtbin.c
-+++ Source/WebCore/plugins/gtk/gtk2xtbin.c
-@@ -41,7 +41,7 @@
-  * The GtkXtBin widget allows for Xt toolkit code to be used
-  * inside a GTK application.  
-  */
--
-+#if 0
- #include "GtkVersioning.h"
- #include "xembed.h"
- #include "gtk2xtbin.h"
-@@ -966,3 +966,4 @@
- 
-   return;
- }
-+#endif
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.2.5-hppa-platform.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.2.5-hppa-platform.patch
deleted file mode 100644
index 8aee778c1bb9..000000000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-2.2.5-hppa-platform.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: webkitgtk/Source/WTF/wtf/Platform.h
-===================================================================
---- webkitgtk.orig/Source/WTF/wtf/Platform.h
-+++ webkitgtk/Source/WTF/wtf/Platform.h
-@@ -72,6 +72,15 @@
- #define WTF_CPU_BIG_ENDIAN 1
- #endif
- 
-+/* CPU(HPPA) - HP PARISC */
-+#if defined(__hppa__)
-+#define WTF_CPU_HPPA 1
-+#define WTF_CPU_BIG_ENDIAN 1
-+#define ENABLE_JIT 0
-+#define ENABLE_YARR_JIT 0
-+#define ENABLE_ASSEMBLER 0
-+#endif
-+
- /* CPU(IA64) - Itanium / IA-64 */
- #if defined(__ia64__)
- #define WTF_CPU_IA64 1
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.2.5-ia64-platform.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.2.5-ia64-platform.patch
deleted file mode 100644
index a63e9e82e31a..000000000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-2.2.5-ia64-platform.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/Source/WTF/wtf/Platform.h	2014-02-25 00:33:16.561606810 +0100
-+++ b/Source/WTF/wtf/Platform.h	2014-02-25 00:49:52.895512955 +0100
-@@ -79,6 +79,9 @@
- #if !defined(__LP64__)
- #define WTF_CPU_IA64_32 1
- #endif
-+#define ENABLE_JIT 0
-+#define ENABLE_YARR_JIT 0
-+#define ENABLE_ASSEMBLER 0
- #endif
- 
- /* CPU(MIPS) - MIPS 32-bit */
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.4.1-ia64-malloc.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.4.1-ia64-malloc.patch
deleted file mode 100644
index 8c387ffecb61..000000000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-2.4.1-ia64-malloc.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Fix wide pointer issues on ia64 (closes: #642750).
-Author: Stephan Schreiber <info@fs-driver.org>
-Index: webkitgtk/Source/WTF/wtf/Platform.h
-===================================================================
---- webkitgtk.orig/Source/WTF/wtf/Platform.h
-+++ webkitgtk/Source/WTF/wtf/Platform.h
-@@ -705,6 +705,13 @@
- #define ENABLE_JIT 1
- #endif
- 
-+/* FIXME: The fast malloc implementation is broken on Itanium / IA64 because
-+   some memory barriers are missing in the thread-unsafe code around the
-+   pagemap_cache_ object. */
-+#if CPU(IA64) || CPU(IA64_32)
-+#define USE_SYSTEM_MALLOC 1
-+#endif
-+
- /* The JIT is enabled by default on all x86, x86-64, ARM & MIPS platforms except Win64. */
- #if !defined(ENABLE_JIT) \
-     && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)) \
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.4.11-video-web-audio.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.4.11-video-web-audio.patch
deleted file mode 100644
index ead696c7856b..000000000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-2.4.11-video-web-audio.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -purN a/Source/WebCore/platform/gtk/RenderThemeGtk2.cpp b/Source/WebCore/platform/gtk/RenderThemeGtk2.cpp
---- a/Source/WebCore/platform/gtk/RenderThemeGtk2.cpp	2016-03-14 08:09:01.000000000 +0100
-+++ b/Source/WebCore/platform/gtk/RenderThemeGtk2.cpp	2016-04-10 19:43:00.215345381 +0200
-@@ -40,6 +40,7 @@
- #include "PaintInfo.h"
- #include "PlatformContextCairo.h"
- #include "RenderElement.h"
-+#include "RenderBox.h"
- #include "TextDirection.h"
- #include "UserAgentStyleSheets.h"
- #include "WidgetRenderingContext.h"
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.4.4-atomic-ppc.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.4.4-atomic-ppc.patch
deleted file mode 100644
index c160376fc608..000000000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-2.4.4-atomic-ppc.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-$OpenBSD: patch-Source_WebKit2_Platform_IPC_Connection_h,v 1.2 2014/07/14 21:13:31 ajacoutot Exp $
-https://bugs.webkit.org/show_bug.cgi?id=130837
---- a/Source/WebKit2/Platform/IPC/Connection.h.orig	Fri Jul  4 11:06:55 2014
-+++ b/Source/WebKit2/Platform/IPC/Connection.h	Mon Jul 14 19:31:35 2014
-@@ -216,7 +216,11 @@ class Connection : public ThreadSafeRefCounted<Connect
- 
-     Client* m_client;
-     bool m_isServer;
-+#if CPU(PPC)
-+    uint64_t m_syncRequestID;
-+#else
-     std::atomic<uint64_t> m_syncRequestID;
-+#endif
- 
-     bool m_onlySendMessagesAsDispatchWhenWaitingForSyncReplyWhenProcessingSuchAMessage;
-     bool m_shouldExitOnSyncMessageSendFailure;
-$OpenBSD: patch-Source_WebKit2_UIProcess_StatisticsRequest_cpp,v 1.3 2014/03/27 22:03:48 landry Exp $
-https://bugs.webkit.org/show_bug.cgi?id=130837
---- a/Source/WebKit2/UIProcess/StatisticsRequest.cpp.orig	Thu Mar 27 21:13:49 2014
-+++ b/Source/WebKit2/UIProcess/StatisticsRequest.cpp	Thu Mar 27 21:14:23 2014
-@@ -44,7 +44,11 @@ StatisticsRequest::~StatisticsRequest()
- 
- uint64_t StatisticsRequest::addOutstandingRequest()
- {
-+#if CPU(PPC)
-+    static int64_t uniqueRequestID;
-+#else
-     static std::atomic<int64_t> uniqueRequestID;
-+#endif
- 
-     uint64_t requestID = ++uniqueRequestID;
-     m_outstandingRequests.add(requestID);
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.4.4-jpeg-9a.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.4.4-jpeg-9a.patch
deleted file mode 100644
index cded605f54ff..000000000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-2.4.4-jpeg-9a.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-http://bugs.gentoo.org/481688
-http://trac.webkit.org/changeset/166490/trunk/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp
-
---- a/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp
-+++ b/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp
-@@ -334,5 +334,5 @@
-         case JPEG_HEADER:
-             // Read file parameters with jpeg_read_header().
--            if (jpeg_read_header(&m_info, true) == JPEG_SUSPENDED)
-+            if (jpeg_read_header(&m_info, TRUE) == JPEG_SUSPENDED)
-                 return false; // I/O suspension.
- 
-@@ -420,7 +420,7 @@
-             m_info.dct_method = dctMethod();
-             m_info.dither_mode = ditherMode();
--            m_info.do_fancy_upsampling = doFancyUpsampling();
--            m_info.enable_2pass_quant = false;
--            m_info.do_block_smoothing = true;
-+            m_info.do_fancy_upsampling = doFancyUpsampling() ? TRUE : FALSE;
-+            m_info.enable_2pass_quant = FALSE;
-+            m_info.do_block_smoothing = TRUE;
- 
-             // Start decompressor.
-@@ -573,5 +573,5 @@
-     // called, then we have hit the end of the buffer.  A return value of false
-     // indicates that we have no data to supply yet.
--    return false;
-+    return FALSE;
- }
- 
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.4.7-disable-webgl.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.4.7-disable-webgl.patch
deleted file mode 100644
index 67760e2878ba..000000000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-2.4.7-disable-webgl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- webkitgtk-2.4.6.orig/Source/WebCore/platform/graphics/OpenGLShims.cpp	2014-09-26 11:40:44.000000000 +0400
-+++ webkitgtk-2.4.6.orig/Source/WebCore/platform/graphics/OpenGLShims.cpp	2014-10-13 15:38:38.496444600 +0400
-@@ -17,7 +17,7 @@ 
-  */
- 
- #include "config.h"
--#if USE(3D_GRAPHICS) || defined(QT_OPENGL_SHIMS)
-+#if USE(3D_GRAPHICS) || defined(QT_OPENGL_SHIMS) || USE(EGL) || USE(GLX)
- 
- #define DISABLE_SHIMS
- #include "OpenGLShims.h"
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.4.9-gcc-6.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.4.9-gcc-6.patch
deleted file mode 100644
index bd8507cdb018..000000000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-2.4.9-gcc-6.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Fedora patch fixes build failure for gcc-6 (abs/fabs ambifuity)
-https://bugs.webkit.org/show_bug.cgi?id=159124#c1
-https://bugs.gentoo.org/show_bug.cgi?id=592048
-diff -Nur webkitgtk-2.4.9.orig/Source/WebCore/platform/gtk/GtkClickCounter.cpp webkitgtk-2.4.9/Source/WebCore/platform/gtk/GtkClickCounter.cpp
---- webkitgtk-2.4.9.orig/Source/WebCore/platform/gtk/GtkClickCounter.cpp	2015-05-20 03:03:24.000000000 -0600
-+++ webkitgtk-2.4.9/Source/WebCore/platform/gtk/GtkClickCounter.cpp	2016-02-07 11:30:42.392686308 -0700
-@@ -85,8 +85,8 @@
-     guint32 eventTime = getEventTime(event);
- 
-     if ((event->type == GDK_2BUTTON_PRESS || event->type == GDK_3BUTTON_PRESS)
--        || ((abs(buttonEvent->x - m_previousClickPoint.x()) < doubleClickDistance)
--            && (abs(buttonEvent->y - m_previousClickPoint.y()) < doubleClickDistance)
-+        || ((fabs(buttonEvent->x - m_previousClickPoint.x()) < doubleClickDistance)
-+            && (fabs(buttonEvent->y - m_previousClickPoint.y()) < doubleClickDistance)
-             && (eventTime - m_previousClickTime < static_cast<guint>(doubleClickTime))
-             && (buttonEvent->button == m_previousClickButton)))
-         m_currentClickCount++;
-diff -Nur webkitgtk-2.4.9.orig/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp webkitgtk-2.4.9/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp
---- webkitgtk-2.4.9.orig/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp	2015-05-20 03:03:24.000000000 -0600
-+++ webkitgtk-2.4.9/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp	2016-02-07 11:49:36.384691005 -0700
-@@ -659,7 +659,7 @@
-     if (!std::isfinite(time))
-         return String::fromUTF8(_("indefinite time"));
- 
--    int seconds = static_cast<int>(abs(time));
-+    int seconds = static_cast<int>(fabs(time));
-     int days = seconds / (60 * 60 * 24);
-     int hours = seconds / (60 * 60);
-     int minutes = (seconds / 60) % 60;
diff --git a/net-libs/webkit-gtk/metadata.xml b/net-libs/webkit-gtk/metadata.xml
index 9a96619fdf3e..0d69dc72c24f 100644
--- a/net-libs/webkit-gtk/metadata.xml
+++ b/net-libs/webkit-gtk/metadata.xml
@@ -8,7 +8,6 @@
 <use>
 	<flag name="coverage">Enable code coverage support</flag>
 	<flag name="egl">Enable EGL support</flag>
-	<flag name="geoloc">Enable geolocation support through <pkg>app-misc/geoclue</pkg></flag>
 	<flag name="geolocation">Enable geolocation support through <pkg>app-misc/geoclue</pkg></flag>
 	<flag name="gles2">Enable GLESv2 support</flag>
 	<flag name="nsplugin">Enable full nsplugin support (GTK2 plugins)</flag>
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.4.11-r1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.4.11-r1.ebuild
deleted file mode 100644
index 7e418d824541..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.4.11-r1.ebuild
+++ /dev/null
@@ -1,275 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python2_7 )
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-inherit autotools check-reqs flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs versionator virtualx
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="http://www.webkitgtk.org/"
-SRC_URI="http://www.webkitgtk.org/releases/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2+ BSD"
-SLOT="3/25" # soname version of libwebkit2gtk-3.0
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
-
-IUSE="aqua coverage debug +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit +opengl spell wayland +webgl +X"
-# bugs 372493, 416331
-REQUIRED_USE="
-	geolocation? ( introspection )
-	gles2? ( egl )
-	introspection? ( gstreamer )
-	webgl? ( ^^ ( gles2 opengl ) )
-	!webgl? ( ?? ( gles2 opengl ) )
-	|| ( aqua wayland X )
-"
-
-# use sqlite, svg by default
-# Aqua support in gtk3 is untested
-# gtk2 is needed for plugin process support
-# gtk3-3.10 required for wayland
-# gtk3-3.20 is needed to ensure we get fixed theming:
-# https://bugzilla.gnome.org/show_bug.cgi?id=757503
-RDEPEND="
-	dev-db/sqlite:3=
-	>=dev-libs/glib-2.36:2
-	>=dev-libs/icu-3.8.1-r1:=
-	>=dev-libs/libxml2-2.6:2
-	>=dev-libs/libxslt-1.1.7
-	>=media-libs/fontconfig-2.5:1.0
-	>=media-libs/freetype-2.4.2:2
-	>=media-libs/harfbuzz-0.9.7:=[icu(+)]
-	>=media-libs/libpng-1.4:0=
-	media-libs/libwebp:=
-	>=net-libs/libsoup-2.42:2.4[introspection?]
-	virtual/jpeg:0=
-	>=x11-libs/cairo-1.10:=[X?]
-	>=x11-libs/gtk+-3.20.0:3[X?,aqua?,introspection?]
-	>=x11-libs/pango-1.30.0
-
-	>=x11-libs/gtk+-2.24.10:2
-
-	egl? ( media-libs/mesa[egl] )
-	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
-	gles2? ( media-libs/mesa[gles2] )
-	gnome-keyring? ( app-crypt/libsecret )
-	gstreamer? (
-		>=media-libs/gstreamer-1.2:1.0
-		>=media-libs/gst-plugins-base-1.2:1.0 )
-	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
-	opengl? ( virtual/opengl )
-	spell? ( >=app-text/enchant-0.22:= )
-	wayland? ( >=x11-libs/gtk+-3.10:3[wayland] )
-	webgl? (
-		x11-libs/cairo[opengl]
-		x11-libs/libXcomposite
-		x11-libs/libXdamage )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXrender
-		x11-libs/libXt )
-"
-
-# paxctl needed for bug #407085
-# Need real bison, not yacc
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=dev-lang/perl-5.10
-	>=app-accessibility/at-spi2-core-2.5.3
-	>=dev-libs/atk-2.8.0
-	>=dev-util/gtk-doc-am-1.10
-	>=dev-util/gperf-3.0.1
-	>=sys-devel/bison-2.4.3
-	>=sys-devel/flex-2.5.34
-	|| ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.3 )
-	sys-devel/gettext
-	>=sys-devel/make-3.82-r4
-	virtual/pkgconfig
-
-	geolocation? ( dev-util/gdbus-codegen )
-	introspection? ( jit? ( sys-apps/paxctl ) )
-	test? (
-		dev-lang/python:2.7
-		dev-python/pygobject:3[python_targets_python2_7]
-		x11-themes/hicolor-icon-theme
-		jit? ( sys-apps/paxctl ) )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-		check-reqs_pkg_pretend
-	fi
-
-	if [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11; then
-		die "You need at least GCC 4.7.x or Clang >= 3.3 for C++11-specific compiler flags"
-	fi
-}
-
-pkg_setup() {
-	# Check whether any of the debugging flags is enabled
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		if is-flagq "-ggdb" && [[ ${WEBKIT_GTK_GGDB} != "yes" ]]; then
-			replace-flags -ggdb -g
-			ewarn "Replacing \"-ggdb\" with \"-g\" in your CFLAGS."
-			ewarn "Building ${PN} with \"-ggdb\" produces binaries which are too"
-			ewarn "large for current binutils releases (bug #432784) and has very"
-			ewarn "high temporary build space and memory requirements."
-			ewarn "If you really want to build ${PN} with \"-ggdb\", add"
-			ewarn "WEBKIT_GTK_GGDB=yes"
-			ewarn "to your make.conf file."
-		fi
-		einfo "You need to have at least 18GB of temporary build space available"
-		einfo "to build ${PN} with debugging CFLAGS. Note that it might still"
-		einfo "not be enough, as the total space requirements depend on the flags"
-		einfo "(-ggdb vs -g1) and enabled features."
-		check-reqs_pkg_setup
-	fi
-
-	[[ ${MERGE_TYPE} = "binary" ]] || python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# intermediate MacPorts hack while upstream bug is not fixed properly
-	# https://bugs.webkit.org/show_bug.cgi?id=28727
-	use aqua && eapply "${FILESDIR}"/${PN}-1.6.1-darwin-quartz.patch
-
-	# Leave optimization level to user CFLAGS
-	# FORTIFY_SOURCE is enabled by default in Gentoo
-	sed -e 's/-O[012]//g' \
-		-e 's/-D_FORTIFY_SOURCE=2//g' \
-		-i Source/autotools/SetupCompilerFlags.m4 || die
-
-	# bug #459978, upstream bug #113397
-	eapply "${FILESDIR}"/${PN}-1.11.90-gtk-docize-fix.patch
-
-	# Debian patches to fix support for some arches
-	# https://bugs.webkit.org/show_bug.cgi?id=129540
-	eapply "${FILESDIR}"/${PN}-2.2.5-{hppa,ia64}-platform.patch
-	# https://bugs.webkit.org/show_bug.cgi?id=129542
-	eapply "${FILESDIR}"/${PN}-2.4.1-ia64-malloc.patch
-
-	# Fix building on ppc (from OpenBSD, only needed on slot 3)
-	# https://bugs.webkit.org/show_bug.cgi?id=130837
-	eapply "${FILESDIR}"/${PN}-2.4.4-atomic-ppc.patch
-
-	# Fix build with recent libjpeg, bug #481688
-	# https://bugs.webkit.org/show_bug.cgi?id=122412
-	eapply "${FILESDIR}"/${PN}-2.4.4-jpeg-9a.patch
-
-	# Fix building with --disable-webgl, bug #500966
-	# https://bugs.webkit.org/show_bug.cgi?id=131267
-	eapply "${FILESDIR}"/${PN}-2.4.7-disable-webgl.patch
-
-	# https://bugs.webkit.org/show_bug.cgi?id=156510
-	eapply "${FILESDIR}"/${PN}-2.4.11-video-web-audio.patch
-
-	# https://bugs.webkit.org/show_bug.cgi?id=159124#c1
-	eapply "${FILESDIR}"/${PN}-2.4.9-gcc-6.patch
-
-	AT_M4DIR=Source/autotools eautoreconf
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# Arches without JIT support also need this to really disable it in all places
-	use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags "-Wl,--no-keep-memory"
-	fi
-	if ! $(tc-getLD) --version | grep -q "GNU gold"; then
-		append-ldflags "-Wl,--reduce-memory-overheads"
-	fi
-
-	local ruby_interpreter=""
-
-	if has_version "virtual/rubygems[ruby_targets_ruby23]"; then
-		ruby_interpreter="RUBY=$(type -P ruby23)"
-	elif has_version "virtual/rubygems[ruby_targets_ruby22]"; then
-		ruby_interpreter="RUBY=$(type -P ruby22)"
-	elif has_version "virtual/rubygems[ruby_targets_ruby21]"; then
-		ruby_interpreter="RUBY=$(type -P ruby21)"
-	else
-		ruby_interpreter="RUBY=$(type -P ruby20)"
-	fi
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-	#
-	# * Aqua support in gtk3 is untested
-	# * dependency-tracking is required so parallel builds won't fail
-	gnome2_src_configure \
-		$(use_enable aqua quartz-target) \
-		$(use_enable coverage) \
-		$(use_enable debug) \
-		$(use_enable egl) \
-		$(use_enable geolocation) \
-		$(use_enable gles2) \
-		$(use_enable gnome-keyring credential_storage) \
-		$(use_enable gstreamer video) \
-		$(use_enable gstreamer web-audio) \
-		$(use_enable introspection) \
-		$(use_enable jit) \
-		$(use_enable opengl glx) \
-		$(use_enable spell spellcheck) \
-		$(use_enable webgl) \
-		$(use_enable webgl accelerated-compositing) \
-		$(use_enable wayland wayland-target) \
-		$(use_enable X x11-target) \
-		--with-gtk=3.0 \
-		--enable-dependency-tracking \
-		--disable-gtk-doc \
-		${ruby_interpreter}
-}
-
-src_test() {
-	# Tests expect an out-of-source build in WebKitBuild
-	ln -s . WebKitBuild || die "ln failed"
-
-	# Prevents test failures on PaX systems
-	use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
-
-	# Tests need virtualx, bug #294691, bug #310695
-	# Parallel tests sometimes fail
-	virtx emake -j1 check
-}
-
-src_install() {
-	DOCS="ChangeLog NEWS" # other ChangeLog files handled by src_install
-
-	# https://bugs.webkit.org/show_bug.cgi?id=129242
-	MAKEOPTS="${MAKEOPTS} -j1" gnome2_src_install
-
-	newdoc Source/WebKit/gtk/ChangeLog ChangeLog.gtk
-	newdoc Source/JavaScriptCore/ChangeLog ChangeLog.JavaScriptCore
-	newdoc Source/WebCore/ChangeLog ChangeLog.WebCore
-
-	# Prevents crashes on PaX systems, bug #522808
-	use jit && pax-mark m "${ED}usr/bin/jsc-3" "${ED}usr/libexec/WebKitWebProcess"
-	pax-mark m "${ED}usr/libexec/WebKitPluginProcess"
-}
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.4.11-r200.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.4.11-r200.ebuild
deleted file mode 100644
index 1c3cf3c05cf5..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.4.11-r200.ebuild
+++ /dev/null
@@ -1,262 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python2_7 )
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-inherit autotools check-reqs flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs versionator virtualx
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="http://www.webkitgtk.org/"
-SRC_URI="http://www.webkitgtk.org/releases/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2+ BSD"
-SLOT="2" # no usable subslot
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
-
-IUSE="aqua coverage debug +egl +geoloc gles2 gnome-keyring +gstreamer +introspection +jit +opengl spell +webgl +X"
-# bugs 372493, 416331
-REQUIRED_USE="
-	geoloc? ( introspection )
-	gles2? ( egl )
-	introspection? ( gstreamer )
-	webgl? ( ^^ ( gles2 opengl ) )
-	!webgl? ( ?? ( gles2 opengl ) )
-	|| ( aqua X )
-"
-
-# use sqlite, svg by default
-RDEPEND="
-	dev-db/sqlite:3=
-	>=dev-libs/glib-2.36:2
-	>=dev-libs/icu-3.8.1-r1:=
-	>=dev-libs/libxml2-2.6:2
-	>=dev-libs/libxslt-1.1.7
-	>=media-libs/fontconfig-2.5:1.0
-	>=media-libs/freetype-2.4.2:2
-	>=media-libs/harfbuzz-0.9.7:=[icu(+)]
-	>=media-libs/libpng-1.4:0=
-	media-libs/libwebp:=
-	>=net-libs/libsoup-2.42:2.4[introspection?]
-	virtual/jpeg:0=
-	>=x11-libs/cairo-1.10:=[X]
-	>=x11-libs/gtk+-2.24.10:2[aqua?,introspection?]
-	x11-libs/libXrender
-	x11-libs/libXt
-	>=x11-libs/pango-1.30.0
-
-	egl? ( media-libs/mesa[egl] )
-	geoloc? ( >=app-misc/geoclue-2.1.5:2.0 )
-	gles2? ( media-libs/mesa[gles2] )
-	gnome-keyring? ( app-crypt/libsecret )
-	gstreamer? (
-		>=media-libs/gstreamer-1.2:1.0
-		>=media-libs/gst-plugins-base-1.2:1.0 )
-	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
-	opengl? ( virtual/opengl )
-	spell? ( >=app-text/enchant-0.22:= )
-	webgl? (
-		x11-libs/cairo[opengl]
-		x11-libs/libXcomposite
-		x11-libs/libXdamage )
-"
-
-# paxctl needed for bug #407085
-# Need real bison, not yacc
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=dev-lang/perl-5.10
-	>=dev-libs/atk-2.8.0
-	>=dev-util/gtk-doc-am-1.10
-	>=dev-util/gperf-3.0.1
-	>=sys-devel/bison-2.4.3
-	>=sys-devel/flex-2.5.34
-	|| ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.3 )
-	sys-devel/gettext
-	>=sys-devel/make-3.82-r4
-	virtual/pkgconfig
-
-	geoloc? ( dev-util/gdbus-codegen )
-	introspection? ( jit? ( sys-apps/paxctl ) )
-	test? (
-		dev-lang/python:2.7
-		dev-python/pygobject:3[python_targets_python2_7]
-		x11-themes/hicolor-icon-theme
-		jit? ( sys-apps/paxctl ) )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-		check-reqs_pkg_pretend
-	fi
-
-	if [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11; then
-		die "You need at least GCC 4.7.x or Clang >= 3.3 for C++11-specific compiler flags"
-	fi
-}
-
-pkg_setup() {
-	# Check whether any of the debugging flags is enabled
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		if is-flagq "-ggdb" && [[ ${WEBKIT_GTK_GGDB} != "yes" ]]; then
-			replace-flags -ggdb -g
-			ewarn "Replacing \"-ggdb\" with \"-g\" in your CFLAGS."
-			ewarn "Building ${PN} with \"-ggdb\" produces binaries which are too"
-			ewarn "large for current binutils releases (bug #432784) and has very"
-			ewarn "high temporary build space and memory requirements."
-			ewarn "If you really want to build ${PN} with \"-ggdb\", add"
-			ewarn "WEBKIT_GTK_GGDB=yes"
-			ewarn "to your make.conf file."
-		fi
-		einfo "You need to have at least 18GB of temporary build space available"
-		einfo "to build ${PN} with debugging CFLAGS. Note that it might still"
-		einfo "not be enough, as the total space requirements depend on the flags"
-		einfo "(-ggdb vs -g1) and enabled features."
-		check-reqs_pkg_setup
-	fi
-
-	[[ ${MERGE_TYPE} = "binary" ]] || python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# intermediate MacPorts hack while upstream bug is not fixed properly
-	# https://bugs.webkit.org/show_bug.cgi?id=28727
-	use aqua && eapply "${FILESDIR}"/${PN}-1.6.1-darwin-quartz.patch
-
-	# Leave optimization level to user CFLAGS
-	# FORTIFY_SOURCE is enabled by default in Gentoo
-	sed -e 's/-O[012]//g' \
-		-e 's/-D_FORTIFY_SOURCE=2//g' \
-		-i Source/autotools/SetupCompilerFlags.m4 || die
-
-	# bug #459978, upstream bug #113397
-	eapply "${FILESDIR}"/${PN}-1.11.90-gtk-docize-fix.patch
-
-	# Debian patches to fix support for some arches
-	# https://bugs.webkit.org/show_bug.cgi?id=129540
-	eapply "${FILESDIR}"/${PN}-2.2.5-{hppa,ia64}-platform.patch
-	# https://bugs.webkit.org/show_bug.cgi?id=129542
-	eapply "${FILESDIR}"/${PN}-2.4.1-ia64-malloc.patch
-
-	# Fix build with recent libjpeg, bug #481688
-	# https://bugs.webkit.org/show_bug.cgi?id=122412
-	eapply "${FILESDIR}"/${PN}-2.4.4-jpeg-9a.patch
-
-	# Fix building with --disable-webgl, bug #500966
-	# https://bugs.webkit.org/show_bug.cgi?id=131267
-	eapply "${FILESDIR}"/${PN}-2.4.7-disable-webgl.patch
-
-	# https://bugs.webkit.org/show_bug.cgi?id=156510
-	eapply "${FILESDIR}"/${PN}-2.4.11-video-web-audio.patch
-
-	# https://bugs.webkit.org/show_bug.cgi?id=159124#c1
-	eapply "${FILESDIR}"/${PN}-2.4.9-gcc-6.patch
-
-	AT_M4DIR=Source/autotools eautoreconf
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# Arches without JIT support also need this to really disable it in all places
-	use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags "-Wl,--no-keep-memory"
-	fi
-	if ! $(tc-getLD) --version | grep -q "GNU gold"; then
-		append-ldflags "-Wl,--reduce-memory-overheads"
-	fi
-
-	local ruby_interpreter=""
-
-	if has_version "virtual/rubygems[ruby_targets_ruby23]"; then
-		ruby_interpreter="RUBY=$(type -P ruby23)"
-	elif has_version "virtual/rubygems[ruby_targets_ruby22]"; then
-		ruby_interpreter="RUBY=$(type -P ruby22)"
-	elif has_version "virtual/rubygems[ruby_targets_ruby21]"; then
-		ruby_interpreter="RUBY=$(type -P ruby21)"
-	else
-		ruby_interpreter="RUBY=$(type -P ruby20)"
-	fi
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-	#
-	# * dependency-tracking is required so parallel builds won't fail
-	gnome2_src_configure \
-		$(use_enable aqua quartz-target) \
-		$(use_enable coverage) \
-		$(use_enable debug) \
-		$(use_enable egl) \
-		$(use_enable geoloc geolocation) \
-		$(use_enable gles2) \
-		$(use_enable gnome-keyring credential_storage) \
-		$(use_enable gstreamer video) \
-		$(use_enable gstreamer web-audio) \
-		$(use_enable introspection) \
-		$(use_enable jit) \
-		$(use_enable opengl glx) \
-		$(use_enable spell spellcheck) \
-		$(use_enable webgl) \
-		$(use_enable webgl accelerated-compositing) \
-		$(use_enable X x11-target) \
-		--with-gtk=2.0 \
-		--disable-webkit2 \
-		--enable-dependency-tracking \
-		--disable-gtk-doc \
-		${ruby_interpreter}
-}
-
-src_test() {
-	# Tests expect an out-of-source build in WebKitBuild
-	ln -s . WebKitBuild || die "ln failed"
-
-	# Prevents test failures on PaX systems
-	use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
-
-	# Tests need virtualx, bug #294691, bug #310695
-	# Parallel tests sometimes fail
-	virtx emake -j1 check
-}
-
-src_install() {
-	DOCS="ChangeLog NEWS" # other ChangeLog files handled by src_install
-
-	# https://bugs.webkit.org/show_bug.cgi?id=129242
-	MAKEOPTS="${MAKEOPTS} -j1" gnome2_src_install
-
-	newdoc Source/WebKit/gtk/ChangeLog ChangeLog.gtk
-	newdoc Source/JavaScriptCore/ChangeLog ChangeLog.JavaScriptCore
-	newdoc Source/WebCore/ChangeLog ChangeLog.WebCore
-
-	# Prevents crashes on PaX systems
-	use jit && pax-mark m "${ED}usr/bin/jsc-1"
-
-	# File collisions with slot 3
-	# bug #402699, https://bugs.webkit.org/show_bug.cgi?id=78134
-	rm -rf "${ED}usr/share/gtk-doc" || die
-}