Merge updates from master

11 files changed, 85 insertions, 34 deletions

diff --git a/app-backup/burp/burp-2.1.32.ebuild b/app-backup/burp/burp-2.1.32.ebuild
index 0b3678fbd2a0..85135a31410d 100644
--- a/app-backup/burp/burp-2.1.32.ebuild
+++ b/app-backup/burp/burp-2.1.32.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/grke/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE="acl ipv6 libressl test xattr"
 
 CDEPEND="dev-libs/uthash
diff --git a/app-benchmarks/siege/Manifest b/app-benchmarks/siege/Manifest
index 4f1b253e416d..856e8d6a9090 100644
--- a/app-benchmarks/siege/Manifest
+++ b/app-benchmarks/siege/Manifest
@@ -1,3 +1,4 @@
 DIST siege-3.0.6.tar.gz 496002 BLAKE2B b21ed07a36b3e0ae5b4166f2d1351be790261d149bcac98f4d2795796e42a8697bf618822792f6f7c912be29d926cf5f8d3de443498deab8c553217db359d282 SHA512 621f3f60f2aac70fb051f48819f5673d60f31fc4fc69e4c65d4ae0a285d02112686f1e9b40241d48afc378446a2b296a7dc4bbc6d8ae38e390d380506f4d448b
 DIST siege-3.1.3.tar.gz 527862 BLAKE2B 9cc10b5afa15c5a7682452d8a4020de62c195192abcb222c36d148da871693c1fcf5be2e3d1a3ca1c4a7fd39fda505520f40ee053ca50fd15340441a498e368f SHA512 880b6d8bbe6b8210147ebb26fd724f4c242076740284977471165fbca514b56c49812ace42dcbe23c57be8fd10a2503b129deec10b79991451a9ae83f30a742b
 DIST siege-3.1.4.tar.gz 530149 BLAKE2B 3721387fa1ace745ce7748612849b84c07e84456bd903460930ab407cba1e24f493d4a251bacd3e509aafbc653e5d74e96509bf74f0a2a8066a0ec2b7ad2e9ee SHA512 8e8b4c1e9c20833f4c3538e8929e47d1c9113cd1faf395e5f07734fb7f4291061cb7554cf500a80d8b1b6be0d6f4c8194b054f632f35533837220702784ee068
+DIST siege-4.0.4.tar.gz 523102 BLAKE2B 2d69dd37fea7ff35e05b41d500d4efb5b4fe60d9389b7bd98ec360148af781a24b6ebaa213b59ffc36cfcc8421efea14d8ec9f5742a53e019b2221584b5af17e SHA512 a8361ac0e2514626d794e7e4a345b178462409a1f3b53a9318adf171b511c408508acdb07652ad38f34021ac4a614dc5e6d2ea3c6a4ffd261ceef36d3226e573
diff --git a/app-benchmarks/siege/siege-4.0.4.ebuild b/app-benchmarks/siege/siege-4.0.4.ebuild
new file mode 100644
index 000000000000..364acb95e137
--- /dev/null
+++ b/app-benchmarks/siege/siege-4.0.4.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools bash-completion-r1
+
+DESCRIPTION="A HTTP regression testing and benchmarking utility"
+HOMEPAGE="https://www.joedog.org/siege-home/"
+SRC_URI="http://download.joedog.org/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~x86 ~x64-macos"
+SLOT="0"
+IUSE="libressl ssl"
+
+RDEPEND="ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)"
+DEPEND="${RDEPEND}
+	sys-devel/libtool"
+
+src_prepare() {
+	default
+	# bundled macros break recent libtool
+	sed -i -e '/AC_PROG_SHELL/d' configure.ac || die
+	rm *.m4 || die "failed to remove bundled macros"
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		$(use_with ssl ssl "${EPREFIX}/usr")
+	)
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	dodoc AUTHORS ChangeLog INSTALL README* doc/siegerc doc/urls.txt
+
+	newbashcomp "${FILESDIR}"/${PN}.bash-completion ${PN}
+}
+
+pkg_postinst() {
+	elog "An example ~/.siegerc file has been installed in"
+	elog "${EPREFIX}/usr/share/doc/${PF}/"
+}
diff --git a/dev-libs/sink/sink-0.5.0.ebuild b/dev-libs/sink/sink-0.5.0.ebuild
index 06692c9740c7..c9b2a827310e 100644
--- a/dev-libs/sink/sink-0.5.0.ebuild
+++ b/dev-libs/sink/sink-0.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -29,7 +29,9 @@ RDEPEND="
 	net-misc/curl
 	sys-libs/readline:0=
 "
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	$(add_qt_dep qtconcurrent)
+"
 
 # fails to build
 RESTRICT+=" test"
diff --git a/net-misc/freerdp/freerdp-2.0.0_rc2-r1.ebuild b/net-misc/freerdp/freerdp-2.0.0_rc2-r1.ebuild
index c1282f4c1edf..03e8c24e809d 100644
--- a/net-misc/freerdp/freerdp-2.0.0_rc2-r1.ebuild
+++ b/net-misc/freerdp/freerdp-2.0.0_rc2-r1.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} != 9999 ]]; then
 	MY_P=${P/_/-}
 	S="${WORKDIR}/${MY_P}"
 	SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz"
-	KEYWORDS="alpha ~amd64 ~arm ~ppc ~ppc64 x86"
+	KEYWORDS="alpha amd64 ~arm ~ppc ~ppc64 x86"
 else
 	inherit git-r3
 	SRC_URI=""
diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index 797a1d4a7c84..4aad6c2325a0 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -1,6 +1,12 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+Andreas Sturmlechner <asturm@gentoo.org> (18 May 2018)
+# media-libs/libaom not yet keyworded
+# net-libs/libmicrodns not yet keyworded for arm, bug #653800
+# projectm not yet keyworded, bug #314969
+media-video/vlc aom chromaprint microdns opencv projectm
+
 # Michał Górny <mgorny@gentoo.org> (15 Apr 2018)
 # Unkeyworded dep masks moved from default/linux.
 app-admin/diamond mongo
@@ -11,10 +17,6 @@ mail-client/mutt notmuch
 # Requires unkeyworded deps
 >=dev-python/ipython-5.4.1 notebook qt5 smp
 
-# NP-Hardass <NP-Hardass@gentoo.org> (01 Mar 2018)
-# net-libs/libmicrodns not yet keyworded for arm, bug #653800
-media-video/vlc microdns
-
 # Andreas Sturmlechner <asturm@gentoo.org> (04 Feb 2018)
 # Depends on not yet keyworded dev-python/geoip-python. Bug #636860
 net-p2p/deluge geoip
@@ -510,9 +512,6 @@ app-admin/gkrellm ntlm
 # missing keywords
 media-plugins/gst-plugins-meta aac dts dv lame libvisual modplug taglib vcd wavpack dvd
 
-# projectm not keyworded, bug #314969
-media-video/vlc projectm chromaprint opencv
-
 # Ultrabug <ultrabug@gentoo.org> (05 Sept 2011)
 # missing keyword for net-libs/zeromq
 app-admin/rsyslog zeromq
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index d3c000061f82..fadead2adf86 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -1,6 +1,14 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Andreas Sturmlechner <asturm@gentoo.org> (18 May 2018)
+# media-libs/libaom not yet keyworded
+# net-libs/srt not yet keyworded
+# net-libs/libmicrodns not yet keyworded, bug #653800
+# projectm not yet keyworded, bug #314969
+# net-misc/freerdp not yet keyworded
+media-video/vlc aom chromaprint microdns opencv projectm rdp srt
+
 # Mart Raudsepp <leio@gentoo.org> (13 May 2018)
 # Not bothering with otherwise p.masked old gcc for the
 # extra dev-libs/cloog dependency with USE=graphite
@@ -56,10 +64,6 @@ www-client/chromium widevine
 www-servers/lighttpd memcached
 x11-misc/xscreensaver gdm
 
-# NP-Hardass <NP-Hardass@gentoo.org> (01 Mar 2018)
-# net-libs/libmicrodns not yet keyworded for arm64, bug #653800
-media-video/vlc microdns
-
 # Michał Górny <mgorny@gentoo.org> (28 Feb 2018)
 # Requires masked dependent flags.
 dev-lang/php ldap-sasl
@@ -107,10 +111,6 @@ net-libs/glib-networking smartcard
 media-video/ffmpeg sofalizer
 
 # Mart Raudsepp <leio@gentoo.org> (13 Feb 2018)
-# USE=rdp requires net-misc/freerdp that is not keyworded yet.
-media-video/vlc rdp
-
-# Mart Raudsepp <leio@gentoo.org> (13 Feb 2018)
 # USE=upnp-av requires net-misc/dleyna-server that is not keyworded yet.
 >=media-plugins/grilo-plugins-0.3.5 upnp-av
 
@@ -506,9 +506,6 @@ dev-libs/boost mpi
 media-sound/sox ladspa
 media-plugins/gst-plugins-meta aac dts dv lame libvisual taglib vcd wavpack
 
-# projectm not keyworded, bug #314969
-media-video/vlc projectm chromaprint opencv
-
 # Ultrabug <ultrabug@gentoo.org> (05 Sept 2011)
 # missing keyword for net-libs/zeromq
 app-admin/rsyslog zeromq
diff --git a/profiles/arch/powerpc/package.use.mask b/profiles/arch/powerpc/package.use.mask
index 2555d54d3e90..1ee25ab59830 100644
--- a/profiles/arch/powerpc/package.use.mask
+++ b/profiles/arch/powerpc/package.use.mask
@@ -1,6 +1,11 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+Andreas Sturmlechner <asturm@gentoo.org> (18 May 2018)
+# media-libs/libaom not yet keyworded
+# net-libs/libmicrodns not yet keyworded for ppc, bug #653800
+media-video/vlc aom microdns
+
 # Anthony G. Basile <blueness@gentoo.org> (14 Apr 2018)
 # net-vpn/tor, tests are broken on ppc/ppc64, bug #653098
 net-vpn/tor test
@@ -17,10 +22,6 @@ app-emulation/qemu capstone
 # Requires unkeyworded deps
 >=dev-python/ipython-5.4.1 qt5 smp
 
-# NP-Hardass <NP-Hardass@gentoo.org> (01 Mar 2018)
-# net-libs/libmicrodns not yet keyworded for ppc, bug #653800
-media-video/vlc microdns
-
 # Amy Liffey <amynka@gentoo.org (21 Jan 2018)
 # dev-libs/cereal not keyworded for ppc
 media-libs/opencv contrib_dnn
diff --git a/profiles/arch/x86-fbsd/package.use.mask b/profiles/arch/x86-fbsd/package.use.mask
index 334f1e145a39..2517747adedc 100644
--- a/profiles/arch/x86-fbsd/package.use.mask
+++ b/profiles/arch/x86-fbsd/package.use.mask
@@ -1,6 +1,11 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Andreas Sturmlechner <asturm@gentoo.org> (18 May 2018)
+# media-libs/libaom not yet keyworded
+# Requires USE=qt5 that is masked in this profile.
+media-video/vlc aom skins
+
 # Michał Górny <mgorny@gentoo.org> (20 Jan 2018)
 # Needs sys-libs/libomp which is not keyworded. Leaving the decision
 # whether sys-libs/libomp should eventually be keyworded to when new
@@ -12,10 +17,6 @@
 # no longer have the flag, so no point in keywording it for old.
 sys-devel/llvm ocaml
 
-# Michał Górny <mgorny@gentoo.org> (12 Jan 2018)
-# Requires USE=qt5 that is masked in this profile.
-media-video/vlc skins
-
 # Thomas Deutschmann <whissi@gentoo.org> (26 Oct 2017)
 # idn: Needs net-dns/libidn2 which is not keyworded
 # uuid: Needs sys-apps/util-linux which is not keyworded
diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask
index 4ce7a76c9bae..131814c8ceee 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -3,6 +3,10 @@
 
 # This file requires >=portage-2.1.1
 
+# Andreas Sturmlechner <asturm@gentoo.org> (18 May 2018)
+# media-libs/libaom not yet keyworded
+media-video/vlc aom
+
 # Jan Ziak <0xe2.0x9a.0x9b@gmail.com> (14 Mar 2018)
 # Expose SVGA backend for x86 users
 app-emulation/fuse -backend-svga
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index df676fb475aa..53273ad59cb4 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -100,10 +100,6 @@ dev-qt/qtdemo:4 phonon
 dev-python/PyQt4 phonon
 dev-python/pyside:0 phonon
 
-# Andreas Sturmlechner <asturm@gentoo.org> (10 Feb 2018)
-# Depends on unreleased media-libs/libaom, and 9999 is currently broken
-media-video/vlc aom
-
 # Andreas K. Hüttel <dilfridge@gentoo.org> (2 Feb 2018)
 # This feature is not ready yet, see bug 146882 comment 26
 sys-libs/glibc compile-locales