Merge updates from master

26 files changed, 611 insertions, 67 deletions

diff --git a/app-emulation/vice/Manifest b/app-emulation/vice/Manifest
index dde8136f26e5..6220b7c80c5e 100644
--- a/app-emulation/vice/Manifest
+++ b/app-emulation/vice/Manifest
@@ -1,2 +1,3 @@
 DIST vice-2.4.22.tar.gz 25180343 SHA256 767e00eb9dbd1a9bcc6db8b4cd1697b8bc744b1d507bbac930975ee130378d9d SHA512 b43e609ae2f43717d10e079d3b8ac284e5c4920ed222c7502e9a7b75dfe32784628031ae6cf8672c8d9d50576fb714cecdd1a9292bf53477f4bbd52c10403975 WHIRLPOOL 580de25d739585c0316c91aba44bb17b2cd4cc19f162e3c5e53b8a7a9e3f694e8c5d8d549b232259d5c9ed077549410b220169a3c026ebad55bc7c537922be81
 DIST vice-2.4.27.tar.gz 25561665 SHA256 ce8b8649308b38f5245490c9df13230d075d3e571b538807d4ca8dd1d53e0b47 SHA512 589b9892f3180db6f169e74b863171f08567045862f2f47cac73ef946e81d55dcde5373fc910cfd1659238669f12ee6ad934c7143c87fad736cda77479439bec WHIRLPOOL 44633477e9ec5bf6b950efa6743647304770a44d58c624b623c992d09735446c79185ca410af60768554b62c0db4675e99c9db1a25c49b3b861860d00a298406
+DIST vice-2.4.31.tar.gz 25898329 SHA256 4c38685de5f492463cf1b0a570909bfba0dc5c2ffab3218081b630a47118f4a5 SHA512 eebd25fb808b1837ea8d76b1399d3d7ed80a66ae206ea3e0d51fe0fb9df21f3bfeb3fbe353c1022e02754987116e33d4c6888e61448b3250ebefbbfe1b854e94 WHIRLPOOL 0c0b57f452d3299050811874988ac9909f970ae4230b2268ee8285bfb358c8f58702141059b973d862eb4b7d7e5084d77b62b13b5b7a10e8718864b790f00500
diff --git a/app-emulation/vice/files/vice-31580-ffmpeg-build.patch b/app-emulation/vice/files/vice-31580-ffmpeg-build.patch
new file mode 100644
index 000000000000..82dc3421218a
--- /dev/null
+++ b/app-emulation/vice/files/vice-31580-ffmpeg-build.patch
@@ -0,0 +1,64 @@
+# Patch to fix compiling with ffmpeg-3.
+# Backported from: https://sourceforge.net/p/vice-emu/code/31580/
+
+--- /src/gfxoutputdrv/ffmpeglib.h
++++ /src/gfxoutputdrv/ffmpeglib.h
+@@ -76,6 +76,14 @@
+ #define AVCodecID              CodecID
+ #endif
+
++#if LIBAVUTIL_VERSION_INT < AV_VERSION_INT(55,17,103)
++#define VICE_AV_PIX_FMT_RGB24 PIX_FMT_RGB24
++#define VICE_AV_PixelFormat PixelFormat
++#else
++#define VICE_AV_PIX_FMT_RGB24 AV_PIX_FMT_RGB24
++#define VICE_AV_PixelFormat AVPixelFormat
++#endif
++
+ /* avcodec fucntions */
+ typedef void(*av_init_packet_t)(AVPacket *pkt);
+ typedef int(*avcodec_open2_t)(AVCodecContext*, AVCodec*, AVDictionary **);
+@@ -118,7 +126,7 @@
+
+ /* swscale functions */
+ typedef struct SwsContext * (*sws_getContext_t)(int srcW, int srcH,
+-                                                enum PixelFormat srcFormat, int dstW, int dstH, enum PixelFormat dstFormat,
++                                                enum VICE_AV_PixelFormat srcFormat, int dstW, int dstH, enum VICE_AV_PixelFormat dstFormat,
+                                                 int flags, SwsFilter *srcFilter, SwsFilter *dstFilter, double *param);
+ typedef void (*sws_freeContext_t)(struct SwsContext *swsContext);
+ typedef int (*sws_scale_t)(struct SwsContext *context, uint8_t* srcSlice[],
+
+--- /src/gfxoutputdrv/ffmpegdrv.c
++++ /src/gfxoutputdrv/ffmpegdrv.c
+@@ -671,8 +671,8 @@
+        picture is needed too. It is then converted to the required
+        output format */
+     video_st.tmp_frame = NULL;
+-    if (c->pix_fmt != PIX_FMT_RGB24) {
+-        video_st.tmp_frame = ffmpegdrv_alloc_picture(PIX_FMT_RGB24, c->width, c->height);
++    if (c->pix_fmt != VICE_AV_PIX_FMT_RGB24) {
++        video_st.tmp_frame = ffmpegdrv_alloc_picture(VICE_AV_PIX_FMT_RGB24, c->width, c->height);
+         if (!video_st.tmp_frame) {
+             log_debug("ffmpegdrv: could not allocate temporary picture");
+             return -1;
+@@ -769,9 +769,9 @@
+
+ #ifdef HAVE_FFMPEG_SWSCALE
+     /* setup scaler */
+-    if (c->pix_fmt != PIX_FMT_RGB24) {
++    if (c->pix_fmt != VICE_AV_PIX_FMT_RGB24) {
+         sws_ctx = VICE_P_SWS_GETCONTEXT
+-                      (video_width, video_height, PIX_FMT_RGB24,
++                      (video_width, video_height, VICE_AV_PIX_FMT_RGB24,
+                       video_width, video_height, c->pix_fmt,
+                       SWS_BICUBIC,
+                       NULL, NULL, NULL);
+@@ -948,7 +948,7 @@
+
+     c = video_st.st->codec;
+
+-    if (c->pix_fmt != PIX_FMT_RGB24) {
++    if (c->pix_fmt != VICE_AV_PIX_FMT_RGB24) {
+         ffmpegdrv_fill_rgb_image(screenshot, video_st.tmp_frame);
+
+         if (sws_ctx != NULL) {
diff --git a/app-emulation/vice/vice-2.4.27-r2.ebuild b/app-emulation/vice/vice-2.4.27-r2.ebuild
index 2782d0f66285..0791ebbb7578 100644
--- a/app-emulation/vice/vice-2.4.27-r2.ebuild
+++ b/app-emulation/vice/vice-2.4.27-r2.ebuild
@@ -85,12 +85,18 @@ DEPEND="${RDEPEND}
 	x11-proto/videoproto
 	nls? ( sys-devel/gettext )"
 
-PATCH=(
+PATCHES=(
 	"${FILESDIR}"/${P}-autotools.patch
 )
 	#"${FILESDIR}"/vice_rath.txt
 
 src_prepare() {
+	if use ffmpeg && has_version ">=media-video/ffmpeg-3" ; then
+		PATCHES+=(
+			"${FILESDIR}"/${PN}-31580-ffmpeg-build.patch
+		)
+	fi
+
 	default
 	sed -i \
 		-e 's/building//' \
diff --git a/app-emulation/vice/vice-2.4.31.ebuild b/app-emulation/vice/vice-2.4.31.ebuild
new file mode 100644
index 000000000000..2782d0f66285
--- /dev/null
+++ b/app-emulation/vice/vice-2.4.31.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit autotools eutils toolchain-funcs flag-o-matic
+
+DESCRIPTION="The Versatile Commodore 8-bit Emulator"
+HOMEPAGE="http://vice-emu.sourceforge.net/"
+SRC_URI="mirror://sourceforge/vice-emu/releases/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="Xaw3d alsa ethernet ffmpeg fullscreen +gtk ipv6 lame nls oss png pulseaudio sdl +sdlsound threads vte zlib"
+
+# upstream says gtk3 and sdl2 shouldn't be exposed yet.
+#REQUIRED_USE="?? ( gtk2 gtk3 sdl )"
+REQUIRED_USE="?? ( gtk sdl )"
+
+GTK_COMMON="
+	x11-libs/pango
+	x11-libs/cairo"
+#	gtk3? (
+#		x11-libs/gtk+:3
+#		vte? ( x11-libs/vte:2.90 )
+#		${GTK_COMMON}
+#	)
+RDEPEND="
+	virtual/jpeg:0
+	virtual/opengl
+	media-libs/giflib
+	alsa? ( media-libs/alsa-lib )
+	pulseaudio? ( media-sound/pulseaudio )
+	sdlsound? ( media-libs/libsdl[sound] )
+	ethernet? (
+	    >=net-libs/libpcap-0.9.8
+	    >=net-libs/libnet-1.1.2.1:1.1
+	)
+	ffmpeg? ( virtual/ffmpeg )
+	lame? ( media-sound/lame )
+	nls? ( virtual/libintl )
+	png? ( media-libs/libpng:0 )
+	zlib? ( sys-libs/zlib )
+	sdl? (
+		media-libs/libsdl[joystick,video]
+	)
+	!sdl? (
+		fullscreen? (
+			x11-libs/libXrandr
+			x11-libs/libXxf86vm )
+		x11-libs/libX11
+		x11-libs/libXext
+		sys-libs/readline:0
+	)
+	gtk? (
+		x11-libs/gtk+:2
+		vte? ( x11-libs/vte:0 )
+		x11-libs/gtkglext
+		${GTK_COMMON}
+	)
+	!sdl? ( !gtk? (
+		x11-libs/libXmu
+		x11-libs/libXpm
+		x11-libs/libXt
+		x11-libs/libXv
+		Xaw3d? ( x11-libs/libXaw3d )
+		!Xaw3d? ( x11-libs/libXaw )
+	) )
+	"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	!sdl? (
+		fullscreen? ( x11-proto/xf86vidmodeproto )
+		!gtk? (
+			x11-libs/libICE
+			x11-libs/libSM
+		)
+	)
+	x11-apps/bdftopcf
+	x11-apps/mkfontdir
+	x11-proto/xproto
+	x11-proto/xextproto
+	media-libs/fontconfig
+	x11-proto/videoproto
+	nls? ( sys-devel/gettext )"
+
+PATCH=(
+	"${FILESDIR}"/${P}-autotools.patch
+)
+	#"${FILESDIR}"/vice_rath.txt
+
+src_prepare() {
+	default
+	sed -i \
+		-e 's/building//' \
+		doc/Makefile.am || die
+	sed -i \
+		-e "/^docdir =/s:=.*:=/usr/share/doc/${PF}:" \
+		doc/Makefile.am \
+		doc/readmes/Makefile.am || die
+	sed -i \
+		-e "/^docdir =/s:=.*:=/usr/share/doc/${PF}/html:" \
+		doc/html/Makefile.am || die
+	sed -i \
+		-e "s:/usr/local/lib/VICE:/usr/$(get_libdir)/${PN}:" \
+		man/vice.1 \
+		$(grep -rl --exclude="*texi" /usr/local/lib doc) || die
+	sed -i \
+		-e "/VICEDIR=/s:=.*:=\"/usr/$(get_libdir)/${PN}\";:" \
+		configure.ac || die
+	sed -i \
+		-e "s:\(#define LIBDIR \).*:\1\"/usr/$(get_libdir)/${PN}\":" \
+		-e "s:\(#define DOCDIR \).*:\1\"/usr/share/doc/${PF}\":" \
+		src/arch/unix/archdep.h \
+		src/arch/sdl/archdep_unix.h || die
+	rm -rf src/lib/{libffmpeg,liblame} || die
+	sed -i \
+		-e '/SUBDIRS/s/libffmpeg//;' \
+		-e '/SUBDIRS/s/liblame//;' \
+		src/lib/Makefile.am || die
+	AT_NO_RECURSIVE=1 eautoreconf
+}
+
+src_configure() {
+	local gui_arg snd_arg
+
+	snd_arg+=" $(use_with alsa)"
+	snd_arg+=" $(use_with oss)"
+	snd_arg+=" $(use_with pulseaudio pulse)"
+	snd_arg+=" $(use_with sdlsound)"
+
+	gui_arg+=" $(use_enable sdl sdlui)"
+	# The gtk UI code has raw calls to XOpenDisplay and
+	# is missing -lX11 if vte doesn't pull it in.
+	#if use gtk2 || use gtk3 ; then
+	if use gtk ; then
+		use vte || append-libs -lX11
+	fi
+	gui_arg+=" $(use_enable gtk gnomeui)"
+	#gui_arg+=" $(use_enable gtk3 gnomeui3)"
+	gui_arg+=" $(use_enable Xaw3d xaw3d)"
+
+	# --with-readline is forced to avoid using the embedded copy
+	# don't try to actually run fc-cache (bug #280976)
+	FCCACHE=/bin/true \
+	PKG_CONFIG=$(tc-getPKG_CONFIG) \
+	econf \
+		--enable-parsid \
+		--with-resid \
+		--with-readline \
+		--without-arts \
+		--without-midas \
+		$(use_enable ethernet) \
+		$(use_enable ffmpeg) \
+		$(use_enable ffmpeg external-ffmpeg) \
+		$(use_enable fullscreen) \
+		$(use_enable ipv6) \
+		$(use_enable lame) \
+		$(use_enable nls) \
+		$(use_enable vte) \
+		$(use_with png) \
+		$(use_with threads uithreads) \
+		$(use_with zlib) \
+		${gui_arg} \
+		${snd_arg} \
+		--disable-option-checking
+		# --disable-option-checking has to be last
+}
+
+src_install() {
+	DOCS="FEEDBACK"
+	default
+}
diff --git a/dev-python/sphinx/sphinx-1.1.3-r7.ebuild b/dev-python/sphinx/sphinx-1.1.3-r8.ebuild
index 8a05112b3338..ef08cf4fd8f4 100644
--- a/dev-python/sphinx/sphinx-1.1.3-r7.ebuild
+++ b/dev-python/sphinx/sphinx-1.1.3-r8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -22,7 +22,8 @@ KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbs
 IUSE="doc latex test"
 
 # Split the jinja dep to allow different slots to satisfy it
-RDEPEND=">=dev-python/docutils-0.7[${PYTHON_USEDEP}]
+RDEPEND="
+	<dev-python/docutils-0.13[${PYTHON_USEDEP}]
 	>=dev-python/jinja-2.3[${PYTHON_USEDEP}]
 	>=dev-python/pygments-1.2[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinx/sphinx-1.2.2.ebuild b/dev-python/sphinx/sphinx-1.2.2-r1.ebuild
index 259d5f8a23d2..a7043a6c45d5 100644
--- a/dev-python/sphinx/sphinx-1.2.2.ebuild
+++ b/dev-python/sphinx/sphinx-1.2.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -23,7 +23,7 @@ IUSE="doc latex test"
 
 # Split the jinja dep to allow different slots to satisfy it
 RDEPEND="
-	>=dev-python/docutils-0.7[${PYTHON_USEDEP}]
+	<dev-python/docutils-0.13[${PYTHON_USEDEP}]
 	>=dev-python/jinja-2.3[${PYTHON_USEDEP}]
 	>=dev-python/pygments-1.2[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinx/sphinx-1.2.3.ebuild b/dev-python/sphinx/sphinx-1.2.3-r1.ebuild
index ddf3abdace28..3768f092832f 100644
--- a/dev-python/sphinx/sphinx-1.2.3.ebuild
+++ b/dev-python/sphinx/sphinx-1.2.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -24,7 +24,7 @@ IUSE="doc latex test"
 # Portage has only >= minimum required versions of all rdeps making
 # setting of version borders unnecessary
 RDEPEND="
-	dev-python/docutils[${PYTHON_USEDEP}]
+	<dev-python/docutils-0.13[${PYTHON_USEDEP}]
 	dev-python/jinja[${PYTHON_USEDEP}]
 	dev-python/pygments[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinx/sphinx-1.3.1-r1.ebuild b/dev-python/sphinx/sphinx-1.3.1-r2.ebuild
index 103c5ca89111..746cdf20c082 100644
--- a/dev-python/sphinx/sphinx-1.3.1-r1.ebuild
+++ b/dev-python/sphinx/sphinx-1.3.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -24,6 +24,7 @@ IUSE="doc latex test"
 RDEPEND="
 	=dev-python/alabaster-0.7*[${PYTHON_USEDEP}]
 	>=dev-python/docutils-0.11[${PYTHON_USEDEP}]
+	<dev-python/docutils-0.13[${PYTHON_USEDEP}]
 	>=dev-python/jinja-2.3[${PYTHON_USEDEP}]
 	>=dev-python/pygments-2.0.1-r1[${PYTHON_USEDEP}]
 	>=dev-python/six-1.4[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinx/sphinx-1.3.5.ebuild b/dev-python/sphinx/sphinx-1.3.5-r1.ebuild
index fd88c7f3ae6a..31970748c5ba 100644
--- a/dev-python/sphinx/sphinx-1.3.5.ebuild
+++ b/dev-python/sphinx/sphinx-1.3.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -24,6 +24,7 @@ IUSE="doc latex test"
 RDEPEND="
 	=dev-python/alabaster-0.7*[${PYTHON_USEDEP}]
 	>=dev-python/docutils-0.11[${PYTHON_USEDEP}]
+	<dev-python/docutils-0.13[${PYTHON_USEDEP}]
 	>=dev-python/jinja-2.3[${PYTHON_USEDEP}]
 	>=dev-python/pygments-2.0.1-r1[${PYTHON_USEDEP}]
 	>=dev-python/six-1.4[${PYTHON_USEDEP}]
diff --git a/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-8.ebuild b/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-8-r1.ebuild
index 5eed8d81c4e2..495e02ee7386 100644
--- a/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-8.ebuild
+++ b/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-8-r1.ebuild
@@ -24,11 +24,17 @@ DEPEND="${PYTHON_DEPS}
 	sys-apps/coreutils
 "
 RDEPEND="${PYTHON_DEPS}
-	dev-python/requests[${PYTHON_USEDEP}]
 	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
 	gnome-base/gnome-shell
 "
 
+PATCHES=(
+	"${FILESDIR}/${P}"-enabled-extensions-array.patch
+	"${FILESDIR}/${P}"-metadata-version.patch
+	"${FILESDIR}/${P}"-get_dbus_connection.patch
+)
+
 src_configure() {
 	local mycmakeargs=( -DBUILD_EXTENSION=OFF )
 	cmake-utils_src_configure
diff --git a/gnome-extra/chrome-gnome-shell/files/chrome-gnome-shell-8-enabled-extensions-array.patch b/gnome-extra/chrome-gnome-shell/files/chrome-gnome-shell-8-enabled-extensions-array.patch
new file mode 100644
index 000000000000..7a56ca0256be
--- /dev/null
+++ b/gnome-extra/chrome-gnome-shell/files/chrome-gnome-shell-8-enabled-extensions-array.patch
@@ -0,0 +1,32 @@
+From 1de3c56c636adfdb74970bf9d7a5424af3830d92 Mon Sep 17 00:00:00 2001
+From: Yuri Konotopov <ykonotopov@gnome.org>
+Date: Mon, 23 Jan 2017 19:43:30 +0400
+Subject: [PATCH 3/6] connector: assume that "enabled-extensions" array can
+ contains duplicates
+
+See-Also: https://bugzilla.gnome.org/show_bug.cgi?id=777650
+Fixes: https://github.com/nE0sIghT/chrome-gnome-shell-mirror/issues/26
+---
+ connector/chrome-gnome-shell.py | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/connector/chrome-gnome-shell.py b/connector/chrome-gnome-shell.py
+index 719a347..0b92d83 100755
+--- a/connector/chrome-gnome-shell.py
++++ b/connector/chrome-gnome-shell.py
+@@ -424,9 +424,10 @@ class ChromeGNOMEShell(Gio.Application):
+                     continue
+ 
+                 if extension['enable']:
+-                    uuids.append(extension['uuid'])
++                    if not extension['uuid'] in uuids:
++                        uuids.append(extension['uuid'])
+                 elif extension['uuid'] in uuids:
+-                    uuids.remove(extension['uuid'])
++                    uuids = [value for value in uuids if value != extension['uuid']]
+ 
+             settings.set_strv(ENABLED_EXTENSIONS_KEY, uuids)
+ 
+-- 
+2.10.2
+
diff --git a/gnome-extra/chrome-gnome-shell/files/chrome-gnome-shell-8-get_dbus_connection.patch b/gnome-extra/chrome-gnome-shell/files/chrome-gnome-shell-8-get_dbus_connection.patch
new file mode 100644
index 000000000000..be5f6c4e51d0
--- /dev/null
+++ b/gnome-extra/chrome-gnome-shell/files/chrome-gnome-shell-8-get_dbus_connection.patch
@@ -0,0 +1,91 @@
+From dca4a3538f86d8e2e957945a691430573192716d Mon Sep 17 00:00:00 2001
+From: Yuri Konotopov <ykonotopov@gnome.org>
+Date: Tue, 24 Jan 2017 19:42:19 +0400
+Subject: [PATCH 6/6] connector: do not use get_dbus_connection after
+ GApplication was released.
+
+Fixes: https://github.com/nE0sIghT/chrome-gnome-shell-mirror/issues/27
+---
+ connector/chrome-gnome-shell.py | 22 +++++++++++++---------
+ 1 file changed, 13 insertions(+), 9 deletions(-)
+
+diff --git a/connector/chrome-gnome-shell.py b/connector/chrome-gnome-shell.py
+index 0f6e5f1..ac6740a 100755
+--- a/connector/chrome-gnome-shell.py
++++ b/connector/chrome-gnome-shell.py
+@@ -106,21 +106,26 @@ class ChromeGNOMEShell(Gio.Application):
+             self.hold()
+ 
+     # Is there any way to hook this to shutdown?
+-    def cleanup(self):
+-        debug('Cleanup')
++    def clean_release(self):
++        debug('Release')
+ 
+         if self.shellAppearedId:
+             Gio.bus_unwatch_name(self.shellAppearedId)
+ 
+         if self.shellSignalId:
+-            self.get_dbus_connection().signal_unsubscribe(self.shellSignalId)
++            dbus_connection = self.get_dbus_connection()
++
++            if dbus_connection is not None:
++                dbus_connection.signal_unsubscribe(self.shellSignalId)
++
++        self.release()
+ 
+     def default_exception_hook(self, exception_type, value, tb):
+         log_error("Uncaught exception of type %s occured" % exception_type)
+         traceback.print_tb(tb)
+         log_error("Exception: %s" % value)
+ 
+-        self.release()
++        self.clean_release()
+ 
+     def add_simple_action(self, name, callback, parameter_type):
+         action = Gio.SimpleAction.new(
+@@ -191,7 +196,7 @@ class ChromeGNOMEShell(Gio.Application):
+     # noinspection PyUnusedLocal
+     def on_service_timeout(self, data):
+         debug('On service timeout')
+-        self.release()
++        self.clean_release()
+ 
+         return False
+ 
+@@ -203,7 +208,7 @@ class ChromeGNOMEShell(Gio.Application):
+ 
+         if len(text_length_bytes) == 0:
+             debug('Release condition: %s' % str(condition))
+-            self.release()
++            self.clean_release()
+             return
+ 
+         # Unpack message length as 4 byte integer.
+@@ -255,14 +260,14 @@ class ChromeGNOMEShell(Gio.Application):
+     # noinspection PyUnusedLocal
+     def on_hup(self, source, condition, data):
+         debug('On hup: %s' % str(condition))
+-        self.release()
++        self.clean_release()
+ 
+         return False
+ 
+     # noinspection PyUnusedLocal
+     def on_sigint(self, data):
+         debug('On sigint')
+-        self.release()
++        self.clean_release()
+ 
+         return False
+ 
+@@ -545,6 +550,5 @@ if __name__ == '__main__':
+     app = ChromeGNOMEShell('--gapplication-service' in sys.argv)
+ 
+     app.run(sys.argv)
+-    app.cleanup()
+ 
+     debug('Quit')
+-- 
+2.10.2
+
diff --git a/gnome-extra/chrome-gnome-shell/files/chrome-gnome-shell-8-metadata-version.patch b/gnome-extra/chrome-gnome-shell/files/chrome-gnome-shell-8-metadata-version.patch
new file mode 100644
index 000000000000..238d1fcd1df6
--- /dev/null
+++ b/gnome-extra/chrome-gnome-shell/files/chrome-gnome-shell-8-metadata-version.patch
@@ -0,0 +1,28 @@
+From 48ded6911e60fb8415190b252ca420b994e6c525 Mon Sep 17 00:00:00 2001
+From: Yuri Konotopov <ykonotopov@gnome.org>
+Date: Mon, 23 Jan 2017 22:29:12 +0400
+Subject: [PATCH 4/6] connector: assume version 1 for extensions without
+ version in metadata
+
+Bug: https://github.com/nE0sIghT/chrome-gnome-shell-mirror/issues/27
+See-Also: https://git.gnome.org/browse/extensions-web/commit/?id=214f03ee90f0f391d3d4fdec23feedf45e3d0507
+---
+ connector/chrome-gnome-shell.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/connector/chrome-gnome-shell.py b/connector/chrome-gnome-shell.py
+index 0b92d83..0f6e5f1 100755
+--- a/connector/chrome-gnome-shell.py
++++ b/connector/chrome-gnome-shell.py
+@@ -506,7 +506,7 @@ class ChromeGNOMEShell(Gio.Application):
+                         http_request['installed'][uuid] = {
+                             'version': int(extensions[uuid]['version'])
+                         }
+-                    except ValueError:
++                    except (ValueError, KeyError):
+                         http_request['installed'][uuid] = {
+                             'version': 1
+                         }
+-- 
+2.10.2
+
diff --git a/media-plugins/kodi-pvr-mythtv/Manifest b/media-plugins/kodi-pvr-mythtv/Manifest
index e9a279cbcc06..3a20ad79fc21 100644
--- a/media-plugins/kodi-pvr-mythtv/Manifest
+++ b/media-plugins/kodi-pvr-mythtv/Manifest
@@ -1,2 +1 @@
-DIST kodi-pvr-mythtv-4.12.11.tar.gz 652826 SHA256 3ac4a9ff51f7ae8c3161b350d16ebada262161e3228efc92904e31ec44cb95cf SHA512 2b729dc6ec933ef829ceff48300642f3ee8c9441532bc5024d767196d137d6a567a5e5cff32e9b982b0787aff1c804c2178d56b0b7c3a40a241a8293a203320a WHIRLPOOL dbb035156e306fcc4ddbe713d9243c190d86f51b6a8a38641a21d4e4176e12d5d4925f06433aed29570f86d8daca1f24955e889248ce092abf5c7a938f2e1da2
 DIST kodi-pvr-mythtv-4.12.12.tar.gz 654045 SHA256 596fc11f26574939c5610f82f033808ca8d923543462254e793eab08d6c7d41c SHA512 74c6f984fdc165bbd20be19bce1879fc2d091c497dc5038ae1e0dbdac5a38f7541231fc9931fe863e482bf9ffeb88b9fdd9aabc83897f46099d7a5237bb24d41 WHIRLPOOL c5549e3f71823fb11e0315851c996df6acf9648781f27a193111c8001faed653d50d1a1f7a791b339213313cbfae4562d0db0503293e1f5b82c4a5243c23ff17
diff --git a/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-4.12.11.ebuild b/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-4.12.12-r1.ebuild
index 13bd69041ff9..052ee4ae1733 100644
--- a/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-4.12.11.ebuild
+++ b/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-4.12.12-r1.ebuild
@@ -28,6 +28,7 @@ SLOT="0"
 IUSE=""
 
 DEPEND="
+	sys-libs/zlib
 	media-tv/kodi
 	media-libs/kodi-platform
 	"
diff --git a/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-4.12.12.ebuild b/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-4.12.12.ebuild
deleted file mode 100644
index 13bd69041ff9..000000000000
--- a/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-4.12.12.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit cmake-utils kodi-addon
-
-DESCRIPTION="MythTV PVR for Kodi"
-HOMEPAGE="https://github.com/janbar/pvr.mythtv"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="git://github.com/janbar/pvr.mythtv.git"
-	inherit git-r3
-	;;
-*)
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/janbar/pvr.mythtv/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.mythtv-${PV}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	media-tv/kodi
-	media-libs/kodi-platform
-	"
-RDEPEND="
-	${DEPEND}
-	"
diff --git a/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-9999.ebuild b/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-9999.ebuild
index 13bd69041ff9..052ee4ae1733 100644
--- a/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-9999.ebuild
+++ b/media-plugins/kodi-pvr-mythtv/kodi-pvr-mythtv-9999.ebuild
@@ -28,6 +28,7 @@ SLOT="0"
 IUSE=""
 
 DEPEND="
+	sys-libs/zlib
 	media-tv/kodi
 	media-libs/kodi-platform
 	"
diff --git a/media-video/obs-studio/Manifest b/media-video/obs-studio/Manifest
index 5f89252cbec2..175a1ca39eb2 100644
--- a/media-video/obs-studio/Manifest
+++ b/media-video/obs-studio/Manifest
@@ -1,2 +1,3 @@
 DIST obs-studio-0.16.2.tar.gz 4979287 SHA256 f5b1a5a4e3900a2b2df4ec6f4a51e0816db1ceed432849ed58301da77ccf4f5c SHA512 ef74b20aa3927134d0deb9513af67abe5dc99199626245a93011bd69d41b811695bc1f071dcd6ed826c2bd5f35247906975f74638c9cd0a39b9415ac88aac425 WHIRLPOOL 5576c4da240ea65d84e195decb655b8774b1540bcde7d01060a38b47e1c561b485c24b88b2771a10b94fe8a0d6d77c05d25ee65313278879609474ff451b2628
 DIST obs-studio-17.0.0.tar.gz 5243839 SHA256 5b7d9a6389011c74fec777667edeb1ac7d8ae7faff13f141650d295d7cd9181e SHA512 17c0b400762e4b12dc619ed7ef36bf364f2f7c3f350630dfcfd3b46c72ec488d08dea5a13ef177c24c2f52760170e3c0bef50cec80362e0d542eab096986db7b WHIRLPOOL cda17b9dc5f29084f2eab614136d59deda1dc7f4f6e15b3e9d67907716ecb580b402eddfb3e06ef9bfe76c9e59fa92a07adc16e30ed492f95b44766ad4a67526
+DIST obs-studio-17.0.2.tar.gz 5540286 SHA256 555740290a5eefcc2788174334322ec9bd271f2255730ef947e160cde6858e09 SHA512 932dde63f9648c65bf0ed0459e441113e91b9f7a9debb3b18ca30152395358449b03738499aaf99364cc9c4a21da61abdc5920e7347c040dcfbe0b46d3bf0520 WHIRLPOOL 178f4947cf181f95a0b575bdf5f4e7fcf5cb2d4a8ac96c06d8f14edcd16dca899a9446e3702fcdab7b501f464c758f8651c5f82955742ca55b42ae3e1dfd4c4b
diff --git a/media-video/obs-studio/obs-studio-17.0.2.ebuild b/media-video/obs-studio/obs-studio-17.0.2.ebuild
new file mode 100644
index 000000000000..5a3784f7e735
--- /dev/null
+++ b/media-video/obs-studio/obs-studio-17.0.2.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit cmake-utils gnome2-utils
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/jp9000/obs-studio.git"
+	EGIT_SUBMODULES=()
+else
+	SRC_URI="https://github.com/jp9000/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Software for Recording and Streaming Live Video Content"
+HOMEPAGE="https://obsproject.com"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+alsa fdk imagemagick jack pulseaudio truetype v4l"
+
+DEPEND="
+	>=dev-libs/jansson-2.5
+	dev-qt/qtcore:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtquickcontrols:5
+	dev-qt/qtsql:5
+	dev-qt/qttest:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	media-video/ffmpeg:=[x264]
+	net-misc/curl
+	x11-libs/libXcomposite
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	alsa? ( media-libs/alsa-lib )
+	fdk? ( media-libs/fdk-aac:= )
+	imagemagick? ( media-gfx/imagemagick:= )
+	jack? ( virtual/jack )
+	pulseaudio? ( media-sound/pulseaudio )
+	truetype? (
+		media-libs/fontconfig
+		media-libs/freetype
+	)
+	v4l? ( media-libs/libv4l )
+"
+RDEPEND="${DEPEND}"
+
+CMAKE_REMOVE_MODULES_LIST=( FindFreetype )
+
+src_configure() {
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		-DDISABLE_ALSA=$(usex !alsa)
+		-DDISABLE_FREETYPE=$(usex !truetype)
+		-DDISABLE_JACK=$(usex !jack)
+		-DDISABLE_LIBFDK=$(usex !fdk)
+		-DDISABLE_PULSEAUDIO=$(usex !pulseaudio)
+		-DDISABLE_V4L2=$(usex !v4l)
+		-DLIBOBS_PREFER_IMAGEMAGICK=$(usex imagemagick)
+		-DOBS_MULTIARCH_SUFFIX=${libdir#lib}
+		-DOBS_VERSION_OVERRIDE=${PV}
+		-DUNIX_STRUCTURE=1
+	)
+	cmake-utils_src_configure
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+
+	if ! use alsa && ! use pulseaudio; then
+		elog
+		elog "For the audio capture features to be available,"
+		elog "either the 'alsa' or the 'pulseaudio' USE-flag needs to"
+		elog "be enabled."
+		elog
+	fi
+
+	if ! has_version "sys-apps/dbus"; then
+		elog
+		elog "The 'sys-apps/dbus' package is not installed, but"
+		elog "could be used for disabling hibernating, screensaving,"
+		elog "and sleeping.  Where it is not installed,"
+		elog "'xdg-screensaver reset' is used instead"
+		elog "(if 'x11-misc/xdg-utils' is installed)."
+		elog
+	fi
+
+	if ! has_version "media-libs/speex"; then
+		elog
+		elog "For the speexdsp-based noise suppression filter"
+		elog "to be available, the 'media-libs/speex' package needs"
+		elog "to be installed."
+		elog
+	fi
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/media-video/obs-studio/obs-studio-9999.ebuild b/media-video/obs-studio/obs-studio-9999.ebuild
index 678d13dc8d77..51a70f595481 100644
--- a/media-video/obs-studio/obs-studio-9999.ebuild
+++ b/media-video/obs-studio/obs-studio-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="6"
+EAPI=6
 
-inherit cmake-utils
+inherit cmake-utils gnome2-utils
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
@@ -52,30 +52,31 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-src_prepare() {
-	CMAKE_REMOVE_MODULES_LIST=(FindFreetype)
-
-	cmake-utils_src_prepare
-}
+CMAKE_REMOVE_MODULES_LIST=( FindFreetype )
 
 src_configure() {
-	local libdir="$(get_libdir)"
+	local libdir=$(get_libdir)
 	local mycmakeargs=(
-		-DDISABLE_ALSA="$(usex !alsa)"
-		-DDISABLE_FREETYPE="$(usex !truetype)"
-		-DDISABLE_JACK="$(usex !jack)"
-		-DDISABLE_LIBFDK="$(usex !fdk)"
-		-DDISABLE_PULSEAUDIO="$(usex !pulseaudio)"
-		-DDISABLE_V4L2="$(usex !v4l)"
-		-DLIBOBS_PREFER_IMAGEMAGICK="$(usex imagemagick)"
-		-DOBS_MULTIARCH_SUFFIX="${libdir#lib}"
+		-DDISABLE_ALSA=$(usex !alsa)
+		-DDISABLE_FREETYPE=$(usex !truetype)
+		-DDISABLE_JACK=$(usex !jack)
+		-DDISABLE_LIBFDK=$(usex !fdk)
+		-DDISABLE_PULSEAUDIO=$(usex !pulseaudio)
+		-DDISABLE_V4L2=$(usex !v4l)
+		-DLIBOBS_PREFER_IMAGEMAGICK=$(usex imagemagick)
+		-DOBS_MULTIARCH_SUFFIX=${libdir#lib}
 		-DUNIX_STRUCTURE=1
 	)
-
 	cmake-utils_src_configure
 }
 
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
 pkg_postinst() {
+	gnome2_icon_cache_update
+
 	if ! use alsa && ! use pulseaudio; then
 		elog
 		elog "For the audio capture features to be available,"
@@ -102,3 +103,7 @@ pkg_postinst() {
 		elog
 	fi
 }
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/net-p2p/airdcpp-webclient/airdcpp-webclient-1.4.1.ebuild b/net-p2p/airdcpp-webclient/airdcpp-webclient-1.4.1-r1.ebuild
index ccfa4e59f1cf..8d68bde7f669 100644
--- a/net-p2p/airdcpp-webclient/airdcpp-webclient-1.4.1.ebuild
+++ b/net-p2p/airdcpp-webclient/airdcpp-webclient-1.4.1-r1.ebuild
@@ -36,6 +36,12 @@ DEPEND="
 "
 PDEPEND="webui? ( www-apps/airdcpp-webui )"
 
+# Fix errors with zlib >= 1.2.10
+# https://bugs.launchpad.net/dcplusplus/+bug/1656050
+# https://github.com/airdcpp/airdcpp-core/commit/5b48aa785a2d6248971423fd5b7e07af32a6c289
+# https://github.com/airdcpp/airdcpp-core/commit/e80e3d2f6492b5c4f56489338bc2825583526831
+PATCHES=( "${FILESDIR}/${P}-fix-zlib-errors.patch" )
+
 pkg_setup() {
 	python-any-r1_pkg_setup
 	enewgroup airdcppd
diff --git a/net-p2p/airdcpp-webclient/files/airdcpp-webclient-1.4.1-fix-zlib-errors.patch b/net-p2p/airdcpp-webclient/files/airdcpp-webclient-1.4.1-fix-zlib-errors.patch
new file mode 100644
index 000000000000..ad5a379c201a
--- /dev/null
+++ b/net-p2p/airdcpp-webclient/files/airdcpp-webclient-1.4.1-fix-zlib-errors.patch
@@ -0,0 +1,23 @@
+diff --git a/airdcpp-core/airdcpp/ZUtils.cpp b/airdcpp-core/airdcpp/ZUtils.cpp
+index 73217f71..8dbbf293 100644
+--- a/airdcpp-core/airdcpp/ZUtils.cpp
++++ b/airdcpp-core/airdcpp/ZUtils.cpp
+@@ -33,7 +33,7 @@ const double ZFilter::MIN_COMPRESSION_LEVEL = 0.9;
+ ZFilter::ZFilter() : totalIn(0), totalOut(0), compressing(true) {
+ 	memset(&zs, 0, sizeof(zs));
+ 
+-	if(deflateInit(&zs, 3) != Z_OK) {
++	if(deflateInit(&zs, SETTING(MAX_COMPRESSION)) != Z_OK) {
+ 		throw Exception(STRING(COMPRESSION_ERROR));
+ 	}
+ }
+@@ -54,7 +54,8 @@ bool ZFilter::operator()(const void* in, size_t& insize, void* out, size_t& outs
+ 	if(compressing && insize > 0 && outsize > 16 && (totalIn > (64*1024)) && ((static_cast<double>(totalOut) / totalIn) > 0.95)) {
+ 		zs.avail_in = 0;
+ 		zs.avail_out = outsize;
+-		if(deflateParams(&zs, 0, Z_DEFAULT_STRATEGY) != Z_OK) {
++		auto err = ::deflateParams(&zs, 0, Z_DEFAULT_STRATEGY);
++		if (err == Z_STREAM_ERROR) {
+ 			throw Exception(STRING(COMPRESSION_ERROR));
+ 		}
+ 		zs.avail_in = insize;
diff --git a/net-p2p/syncthing/Manifest b/net-p2p/syncthing/Manifest
index 5eaf151d1aca..21bd5d878637 100644
--- a/net-p2p/syncthing/Manifest
+++ b/net-p2p/syncthing/Manifest
@@ -1,2 +1,2 @@
-DIST syncthing-0.14.15.tar.gz 5947702 SHA256 3e28e80ada8efc0c7ee5ddffc950befcea7d87aa2b456ce60df8e681baa80cc9 SHA512 489d78d1cbf4ec56515ced721904ebafad7d7f6b2e62936d98fc1f30ed1457295a6b6882822fb4a0481c3bbc60e824dd5785730cbcfa76afdd6b53401bdff1ac WHIRLPOOL 16ed5cb58308de777c455e96b3bade0d9f54e0b47c75441b0db67c2b03772756d7c1391c87fd5efe79296f2e119baabfc75dd2ecd59718db6aba081b42d032ca
 DIST syncthing-0.14.19.tar.gz 6759312 SHA256 356b91e9d0badb9ba026484fd1eaa79046775779532160dde139b726e45c076b SHA512 d7a6a3ee9f0ca90f284b1a7e9b8c5b3a30d1bb49cc72fc2393cadcdb044530a4209ee77be3f6992039c6c4fcae0505b0c1571d7615f2ce6c586099ae1aa46803 WHIRLPOOL 279d52fa0db97d82b5ae10458e533896e1fd9746eecc9222ae9fe2a372e9de57f6192eefcc7a1c023c5f010815b4c5e168fbca21c3d42e156f3a5009e8d17e61
+DIST syncthing-0.14.21.tar.gz 6771897 SHA256 b46e67e16f64631b956b6724afd229876a1fee95c12dae4ae211d2623e35fdf6 SHA512 f1fe3c3fd56e1832341e74213dfbbe82ae731bdad49053a9c8d36eac8fd74a77189f1dc524cd61978092a06d355930082307bbd0aab57705c8e69f5aaf34b598 WHIRLPOOL edb9f409fa9e11501b46d3da9f22390c2a6e86f8227d35a786b9e2ce036cb54040466e810c41ce95a3e6019c30d7fea75b65528fb58c1d588a665e3374b66597
diff --git a/net-p2p/syncthing/syncthing-0.14.15.ebuild b/net-p2p/syncthing/syncthing-0.14.21.ebuild
index ca243eeb355a..a77c264d2919 100644
--- a/net-p2p/syncthing/syncthing-0.14.15.ebuild
+++ b/net-p2p/syncthing/syncthing-0.14.21.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
diff --git a/sys-apps/qdirstat/Manifest b/sys-apps/qdirstat/Manifest
index 014cb28539b1..fc73d946bc66 100644
--- a/sys-apps/qdirstat/Manifest
+++ b/sys-apps/qdirstat/Manifest
@@ -1 +1,2 @@
 DIST qdirstat-1.0.tar.gz 805110 SHA256 b8404af004606a9d0e7f3a35bb28f6629a8c84620549fcab8898a551cc07b3a4 SHA512 9e98ea690fd84b435f1b4078c79350a7c0ee6b48560dc500fc9410633a650539c2db16f0526e181700580de0ee8b3044d1219eafc9870cd7e421511159b6d11d WHIRLPOOL 222945223109e9fc6bc2ae1dedeb5e55da4833be688abc14fc884bdd7ed566446d328142b770cebb0438aef52bcc1b48609f45790fc8efdbe36d96b609f9db29
+DIST qdirstat-1.2.tar.gz 1022084 SHA256 d79734915768ae858c784142c7a07b7599178329b40c73894bf575decaf1a911 SHA512 cc340ab9cacdd1ec7edb9baa45302cc9d43b0389b9e0b5dd542b2fa98e8c5a0872350a01790107db4f95e57c9bc45107d019f00841a88fc4a9778178a4f84feb WHIRLPOOL 77e45a215bdeba0cdf71ecc430b8e7d909b21cbd0d02f18f366573be5007eb7addcbf40d1dd3fe4f0b35b270804638b7e92da4ed123cc9ac4c1aa8ace7e7c2ec
diff --git a/sys-apps/qdirstat/qdirstat-1.2.ebuild b/sys-apps/qdirstat/qdirstat-1.2.ebuild
new file mode 100644
index 000000000000..cb2cc92ee7ef
--- /dev/null
+++ b/sys-apps/qdirstat/qdirstat-1.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit qmake-utils
+
+DESCRIPTION="Qt app to show where your disk space has gone and to help you clean it up"
+HOMEPAGE="https://github.com/shundhammer/qdirstat"
+SRC_URI="https://github.com/shundhammer/qdirstat/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-qt/qtgui:5
+	dev-qt/qtcore:5
+	dev-qt/qtwidgets:5"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	eqmake5
+}
+
+src_install() {
+	emake INSTALL_ROOT="${ED}" install
+}