Sync with portage [Thu Nov 17 22:33:11 MSK 2016].

8 years ago · 13bfb503bf
parent 5f0d05bdf2
commit 13bfb503bf
79 changed files with 732 additions and 435 deletions
--- a/app-backup/btrbk/btrbk-0.23.3.ebuild
+++ b/app-backup/btrbk/btrbk-0.23.3.ebuild
@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
 	KEYWORDS=""
 else
 	SRC_URI="https://digint.ch/download/btrbk/releases/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="amd64 ~arm ~x86"
 fi

 DESCRIPTION="Tool for creating snapshots and remote backups of btrfs subvolumes"
--- a/dev-python/pillow/pillow-3.4.2.ebuild
+++ b/dev-python/pillow/pillow-3.4.2.ebuild
@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.zip"

 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="doc examples jpeg jpeg2k lcms test tiff tk truetype webp zlib"

 REQUIRED_USE="test? ( jpeg tiff )"
--- a/dev-qt/qtcore/files/qtcore-5.6.2-plugins.patch
+++ b/dev-qt/qtcore/files/qtcore-5.6.2-plugins.patch
@ -0,0 +1,81 @@
+From ca4d93d85ee446c5e30ec8e7814651e45cbf1218 Mon Sep 17 00:00:00 2001
+From: Thiago Macieira <thiago.macieira@intel.com>
+Date: Thu, 12 Nov 2015 10:14:51 -0800
+Subject: Stop unloading plugins in QPluginLoader and QFactoryLoader
+
+QPluginLoader hasn't unloaded in its destructor since Qt 5.0, but we
+missed the equivalent code in QFactoryLoader (which bypasses
+QPluginLoader). Besides, QPluginLoader::unload() was still doing
+unloading, which it won't anymore.
+
+Not unloading plugins is Qt's policy, as decided during the 5.0
+development process and reaffirmed now in 5.6. This is due to static
+data in plugins leaking out and remaining in use past the unloading of
+the plugin, causing crashes.
+
+This does not affect QLibrary and QLibrary::unload(). Those are meant
+for non-Qt loadable modules, so unloading them may be safe.
+
+Task-number: QTBUG-49061
+Discussed-on: http://lists.qt-project.org/pipermail/development/2015-November/023681.html
+Change-Id: I461e9fc7199748faa187ffff1416070f138df8db
+(cherry picked from commit 494376f980e96339b6f1eff7c41336ca4d853065)
+Discussed-again-on: http://lists.qt-project.org/pipermail/development/2016-October/027476.html
+Reviewed-by: Lars Knoll <lars.knoll@qt.io>
+---
+ src/corelib/plugin/qfactoryloader.cpp | 6 ++++--
+ src/corelib/plugin/qpluginloader.cpp  | 5 +++--
+ 2 files changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/src/corelib/plugin/qfactoryloader.cpp b/src/corelib/plugin/qfactoryloader.cpp
+index dcf1b1a..b6558f5 100644
+--- a/src/corelib/plugin/qfactoryloader.cpp
+++ b/src/corelib/plugin/qfactoryloader.cpp
+@@ -208,10 +208,12 @@ void QFactoryLoader::update()
+                     ++keyUsageCount;
+                 }
+             }
+-            if (keyUsageCount || keys.isEmpty())
+            if (keyUsageCount || keys.isEmpty()) {
+                library->setLoadHints(QLibrary::PreventUnloadHint); // once loaded, don't unload
+                 d->libraryList += library;
+-            else
+            } else {
+                 library->release();
+            }
+         }
+     }
+ #else
+diff --git a/src/corelib/plugin/qpluginloader.cpp b/src/corelib/plugin/qpluginloader.cpp
+index 37f2368..0ea8280 100644
+--- a/src/corelib/plugin/qpluginloader.cpp
+++ b/src/corelib/plugin/qpluginloader.cpp
+@@ -148,6 +148,7 @@ QPluginLoader::QPluginLoader(const QString &fileName, QObject *parent)
+     : QObject(parent), d(0), did_load(false)
+ {
+     setFileName(fileName);
+    setLoadHints(QLibrary::PreventUnloadHint);
+ }
+ 
+ /*!
+@@ -342,7 +343,7 @@ static QString locatePlugin(const QString& fileName)
+ void QPluginLoader::setFileName(const QString &fileName)
+ {
+ #if defined(QT_SHARED)
+-    QLibrary::LoadHints lh;
+    QLibrary::LoadHints lh = QLibrary::PreventUnloadHint;
+     if (d) {
+         lh = d->loadHints();
+         d->release();
+@@ -391,7 +392,7 @@ Q_GLOBAL_STATIC(StaticPluginList, staticPluginList)
+     \brief Give the load() function some hints on how it should behave.
+ 
+     You can give hints on how the symbols in the plugin are
+-    resolved. By default, none of the hints are set.
+    resolved. By default since Qt 5.7, QLibrary::PreventUnloadHint is set.
+ 
+     See the documentation of QLibrary::loadHints for a complete
+     description of how this property works.
+-- 
+cgit v1.0-4-g1e03
+
--- a/dev-qt/qtcore/qtcore-5.6.2-r1.ebuild
+++ b/dev-qt/qtcore/qtcore-5.6.2-r1.ebuild
@ -0,0 +1,43 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+QT5_MODULE="qtbase"
+inherit qt5-build
+
+DESCRIPTION="Cross-platform application development framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+fi
+
+IUSE="icu systemd"
+
+DEPEND="
+	dev-libs/glib:2
+	>=dev-libs/libpcre-8.38[pcre16,unicode]
+	>=sys-libs/zlib-1.2.5
+	virtual/libiconv
+	icu? ( dev-libs/icu:= )
+	systemd? ( sys-apps/systemd:= )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-plugins.patch" )
+
+QT5_TARGET_SUBDIRS=(
+	src/tools/bootstrap
+	src/tools/moc
+	src/tools/rcc
+	src/corelib
+	src/tools/qlalr
+)
+
+src_configure() {
+	local myconf=(
+		$(qt_use icu)
+		$(qt_use systemd journald)
+	)
+	qt5-build_src_configure
+}
--- a/dev-util/bazel/Manifest
+++ b/dev-util/bazel/Manifest
@ -1 +1,2 @@
 DIST bazel-0.3.2.tar.gz 145095554 SHA256 9692ac3318a40e8a0530f68bbfc473ae5f6a4a5c0fe08d2f88612ca4d40ba54a SHA512 975faf5830e952bea5d3fa8d127e0d5d9654af83f1fba0d7e26f9e1c2c71dd58542efea2382b0c52c9fd24ae43ec66a3ca7451309f02fd65c0896bbbdb3c79f5 WHIRLPOOL ab487f84e8126ab2badfd84d1fe757170900fbb2f88dff79d6867fb694bbb8adf226b7b89bfdb9cf207595bfd235583a54b8102a1a009f58be7bd3be039e1aaa
+DIST bazel-0.4.0.tar.gz 159192903 SHA256 2370649043b5b3c407016a74946d5c443dd5c8ba43c1ffe28b83553983e5057c SHA512 be5c91b8c8e7061c4992d477d9ffa7eaf11fcc064a54ae2db7ccf8fa931223e758288876b8c191f3d4ddf16dd1858b2c99ce1ef58da71dc2edbcc57b2036f871 WHIRLPOOL 72d720b57241bf5a4769d3e84d6dee787aed9b4bb32353a32f2a3580cd74b6185db2c002c1e403246c511af7072ce24ba3cb71a12fa426f97faf4dbae9dff9d1
--- a/dev-util/bazel/bazel-0.4.0.ebuild
+++ b/dev-util/bazel/bazel-0.4.0.ebuild
@ -0,0 +1,65 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit bash-completion-r1 java-pkg-2
+
+DESCRIPTION="Fast and correct automated build system"
+HOMEPAGE="http://bazel.io/"
+SRC_URI="https://github.com/bazelbuild/bazel/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="examples tools zsh-completion"
+# strip corrupts the bazel binary
+RESTRICT="strip"
+DEPEND="virtual/jdk:1.8"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	echo ${PATH} | grep -q ccache && \
+		ewarn "${PN} usually fails to compile with ccache, you have been warned"
+	java-pkg-2_pkg_setup
+}
+
+src_compile() {
+	VERBOSE=yes ./compile.sh || die
+	# Use standalone strategy to deactivate the bazel sandbox, since it
+	# conflicts with FEATURES=sandbox.
+	echo "build --verbose_failures --spawn_strategy=standalone --genrule_strategy=standalone" \
+		> "${T}/bazelrc" || die
+	output/bazel --bazelrc="${T}/bazelrc" build //scripts:bazel-complete.bash || die
+}
+
+src_test() {
+	output/bazel test \
+		--verbose_failures \
+		--spawn_strategy=standalone \
+		--genrule_strategy=standalone \
+		--verbose_test_summary \
+		examples/cpp:hello-success_test || die
+}
+
+src_install() {
+	dobin output/bazel
+	newbashcomp bazel-bin/scripts/bazel-complete.bash ${PN}
+	if use zsh-completion ; then
+		insinto /usr/share/zsh/site-functions
+		doins scripts/zsh_completion/_bazel
+	fi
+	if use examples; then
+		docinto examples
+		doins -r examples/*
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+	# could really build tools but I don't know which ones
+	# are actually used
+	if use tools; then
+		docinto tools
+		doins -r tools/*
+		docompress -x /usr/share/doc/${PF}/tools
+	fi
+}
--- a/dev-util/drone-ui/Manifest
+++ b/dev-util/drone-ui/Manifest
@ -0,0 +1 @@
+DIST drone-ui-0_pre20161007.tar.gz 157594 SHA256 47522662f82a0a0cb4f447016b575072b8ce54dd4bc9e532c8e058f442be410e SHA512 eeb69c3fa683773a96593563225b9b34a14ea4e570b56daf7b78fa956538d8cf71152b4badd00db8c0f1194972f67ab7cebdd62fb6feccacae4c9447f5250723 WHIRLPOOL fe2d51c3864247a4d3975c81131272d686ac071532aa1261e0b647e522db12e58e3e900f4cb2499e77fa246a1da1401846e45c4a3afcf0737ac841fa47a4dce1
--- a/dev-util/drone-ui/drone-ui-0_pre20161007.ebuild
+++ b/dev-util/drone-ui/drone-ui-0_pre20161007.ebuild
@ -0,0 +1,21 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit golang-build golang-vcs-snapshot
+
+EGO_PN="github.com/drone/drone-ui/..."
+EGIT_COMMIT="9913c868839e709599f3ed659c3e0a137a2e2706"
+ARCHIVE_URI="https://${EGO_PN%/*}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="React front-end for the Drone continuous integration server"
+HOMEPAGE="https://github.com/drone/drone-ui"
+SRC_URI="${ARCHIVE_URI}"
+LICENSE="Apache-2.0"
+SLOT="0/${PVR}"
+IUSE=""
+
+DEPEND="dev-go/go-bindata
+	dev-go/go-bindata-assetfs"
--- a/dev-util/drone-ui/metadata.xml
+++ b/dev-util/drone-ui/metadata.xml
@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<longdescription>
+	</longdescription>
+	<maintainer type="person">
+		<email>mrueg@gentoo.org</email>
+		<name>Manuel Rüger</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">drone/drone-ui</remote-id>
+	</upstream>
+</pkgmetadata>
--- a/dev-util/quilt/files/quilt-0.48-no-graphviz.patch
+++ b/dev-util/quilt/files/quilt-0.48-no-graphviz.patch
@ -1,34 +0,0 @@
--- Makefile.in.orig	2009-02-24 13:49:47.000000000 -0500
-+++ Makefile.in	2009-02-24 13:50:21.000000000 -0500
-@@ -82,8 +82,7 @@ QUILT :=	$(QUILT_IN)
- SRC +=		$(QUILT_SRC:%=quilt/%)
- DIRT +=		$(QUILT_IN:%=quilt/%)
- 
-SCRIPTS_IN :=	patchfns parse-patch inspect dependency-graph edmail	\
-		remove-trailing-ws
-+SCRIPTS_IN :=	patchfns parse-patch inspect edmail	remove-trailing-ws
- 
- SCRIPTS_SRC :=	$(SCRIPTS_IN:%=%.in)
- SCRIPTS :=	$(SCRIPTS_IN)
--- bash_completion.orig	2009-02-24 13:49:52.000000000 -0500
-+++ bash_completion	2009-02-24 13:50:46.000000000 -0500
-@@ -189,19 +189,6 @@ _quilt_completion()
- 	        ;;
- 	   esac
- 	   ;;
-	graph)
-	   case $prev in
-	     -T)
-	     	COMPREPLY=( $( compgen -W "ps" -- $cur ) )
-		;;
-	     --edge-labels)
-	        COMPREPLY=( $( compgen -W "files" -- $cur ) )
-		;;
-	     *)
-		COMPREPLY=( $( compgen -W "-T -h --all --reduce --lines --edge-labels $(quilt applied)" -- $cur ) )
-		;;
-	   esac
-	   ;;
- 	grep)
- 	   _longopt grep
- 	   COMPREPLY=( ${COMPREPLY[@]:-} $( compgen -W "-h" -- $cur ) )
--- a/games-board/gnuchess/gnuchess-6.2.4.ebuild
+++ b/games-board/gnuchess/gnuchess-6.2.4.ebuild
@ -9,7 +9,7 @@ DESCRIPTION="Console based chess interface"
 HOMEPAGE="https://www.gnu.org/software/chess/chess.html"
 SRC_URI="mirror://gnu/chess/${P}.tar.gz"

-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 LICENSE="GPL-3"
 SLOT="0"
 IUSE=""
--- a/games-rpg/manaplus/Manifest
+++ b/games-rpg/manaplus/Manifest
@ -1,2 +1,3 @@
 DIST manaplus-1.6.10.22.tar.xz 11749908 SHA256 dde06c2cf3c7f7d132f3d5ff74f2eafeb17f987115f3625fa2a4dc3d83428b50 SHA512 f335a57ef643a0bd61681182e1d9bf2c6b16d3766b629c8a45904b7e118e6b435d47abacc0804fba03a65ee0a335535d37b589eb78d22bef2e7477d9df7321de WHIRLPOOL 055ccc4a80d21bddd7824d6c122dcb7587eab9eb806c7c47efb4612517ae8b556a6ea3afe57692292959f504804c3015e30a51ae2213648655310a3de6b1f4b6
+DIST manaplus-1.6.11.5.tar.xz 11744332 SHA256 cb5ac8a8df93b9a6698a53048a64e6b6f1d431e8da0c0a3b55b01e5a58dea3c5 SHA512 3b934ec9403a2eefd637d3193f16069d208635eea484ebcbf5780bd0dd42eba1eb179467bc2f616e4c432ae61289f6ed96926c985707885190066c2b17c3b348 WHIRLPOOL e12d69aa4f469b5e66a43feecf62910c742ff957a4a1767f060870fdec098e81743f1166e68cdc6b035fa0b461154e6de5622bb30d3c5e467ae26df4f5755805
 DIST manaplus-1.6.3.26.tar.xz 9721160 SHA256 87aee4fdaec09337fe711ee85e515470374ea9387e45622caa712a6414f5b253 SHA512 f84718c40799c619a2a320e5589dffa05f52ebd7e4710c640947f4083c59146bb2b7c10a429f68f9963086f1a07c92b8a049c0a0092659108cf52c767d834566 WHIRLPOOL 4887d9699378e3fad95f48268234c1279bbfed66138cdbd9875227e9ebc8c598ac6aa530230537cfc79d1d100216f4b3049e5c4b55ae34545ea09c5fdec284dc
--- a/games-rpg/manaplus/manaplus-1.6.11.5.ebuild
+++ b/games-rpg/manaplus/manaplus-1.6.11.5.ebuild
@ -0,0 +1,99 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+[[ ${PV} == 9999 ]] && inherit autotools git-r3
+
+DESCRIPTION="OpenSource 2D MMORPG client for Evol Online and The Mana World"
+HOMEPAGE="http://manaplus.evolonline.org"
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/ManaPlus/ManaPlus.git"
+else
+	SRC_URI="http://download.evolonline.org/manaplus/download/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="mumble nls opengl pugixml +sdl2 test"
+
+RDEPEND="
+	>=dev-games/physfs-1.0.0
+	media-fonts/dejavu
+	media-fonts/liberation-fonts
+	media-fonts/mplus-outline-fonts
+	media-fonts/wqy-microhei
+	media-libs/libpng:0=
+	net-misc/curl
+	sys-libs/zlib
+	x11-apps/xmessage
+	x11-libs/libX11
+	x11-misc/xdg-utils
+	mumble? ( media-sound/mumble )
+	nls? ( virtual/libintl )
+	opengl? ( virtual/opengl )
+	pugixml? ( dev-libs/pugixml )
+	!pugixml? ( dev-libs/libxml2 )
+	sdl2? (
+		media-libs/libsdl2[X,opengl?,video]
+		media-libs/sdl2-gfx
+		media-libs/sdl2-image[png]
+		media-libs/sdl2-mixer[vorbis]
+		media-libs/sdl2-net
+		media-libs/sdl2-ttf
+	)
+	!sdl2? (
+		media-libs/libsdl[X,opengl?,video]
+		media-libs/sdl-gfx
+		media-libs/sdl-image[png]
+		media-libs/sdl-mixer[vorbis]
+		media-libs/sdl-net
+		media-libs/sdl-ttf
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	default
+	if [[ ${PV} == 9999 ]] ; then
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	CONFIG_SHELL=/bin/bash \
+	econf \
+		--localedir=/usr/share/locale \
+		--without-internalsdlgfx \
+		$(use_with mumble) \
+		$(use_enable nls) \
+		$(use_with opengl) \
+		--enable-libxml=$(usex pugixml pugixml libxml) \
+		$(use_with sdl2) \
+		$(use_enable test unittests)
+}
+
+src_install() {
+	default
+
+	local destpath="/usr/share/${PN}"
+	dosym /usr/share/fonts/dejavu/DejaVuSans-Bold.ttf "${destpath}"/data/fonts/dejavusans-bold.ttf
+	dosym /usr/share/fonts/dejavu/DejaVuSans.ttf "${destpath}"/data/fonts/dejavusans.ttf
+	dosym /usr/share/fonts/dejavu/DejaVuSansMono-Bold.ttf "${destpath}"/data/fonts/dejavusansmono-bold.ttf
+	dosym /usr/share/fonts/dejavu/DejaVuSansMono.ttf "${destpath}"/data/fonts/dejavusansmono.ttf
+	dosym /usr/share/fonts/dejavu/DejaVuSerifCondensed-Bold.ttf "${destpath}"/data/fonts/dejavuserifcondensed-bold.ttf
+	dosym /usr/share/fonts/dejavu/DejaVuSerifCondensed.ttf "${destpath}"/data/fonts/dejavuserifcondensed.ttf
+	dosym /usr/share/fonts/liberation-fonts/LiberationMono-Bold.ttf "${destpath}"/data/fonts/liberationsansmono-bold.ttf
+	dosym /usr/share/fonts/liberation-fonts/LiberationMono-Regular.ttf "${destpath}"/data/fonts/liberationsansmono.ttf
+	dosym /usr/share/fonts/liberation-fonts/LiberationSans-Bold.ttf "${destpath}"/data/fonts/liberationsans-bold.ttf
+	dosym /usr/share/fonts/liberation-fonts/LiberationSans-Regular.ttf "${destpath}"/data/fonts/liberationsans.ttf
+	dosym /usr/share/fonts/mplus-outline-fonts/mplus-1p-bold.ttf "${destpath}"/data/fonts/mplus-1p-bold.ttf
+	dosym /usr/share/fonts/mplus-outline-fonts/mplus-1p-regular.ttf "${destpath}"/data/fonts/mplus-1p-regular.ttf
+	dosym /usr/share/fonts/wqy-microhei/wqy-microhei.ttc "${destpath}"/data/fonts/wqy-microhei.ttf
+}
+
+src_test() {
+	make check
+}
--- a/kde-frameworks/kservice/kservice-5.28.0.ebuild
+++ b/kde-frameworks/kservice/kservice-5.28.0.ebuild
@ -1,40 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="Advanced plugin and service introspection"
-LICENSE="LGPL-2 LGPL-2.1+"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+man"
-
-RDEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtxml)
-"
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	sys-devel/flex
-	man? ( $(add_frameworks_dep kdoctools) )
-	test? ( $(add_qt_dep qtconcurrent) )
-"
-
-# requires running kde environment
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		-DAPPLICATIONS_MENU_NAME=kf5-applications.menu
-		$(cmake-utils_use_find_package man KF5DocTools)
-	)
-
-	kde5_src_configure
-}
--- a/media-libs/libsfml/Manifest
+++ b/media-libs/libsfml/Manifest
@ -1,2 +1,3 @@
 DIST libsfml-2.3.2.tar.gz 22203359 SHA256 55e7c864938e03ceb7d6d05c66f8e0dc886e632805d0ae17c222da317ba14e4c SHA512 db491b57595d567e6ce47d081fd6292bff924678fe0a61243f2dfa23df187d2c58f3bd91ea13447e49bec5f888777f338bfa461aec86d9328710623d73aeb424 WHIRLPOOL acef2cc6775ee16151cf5809e78ede2e10f5a5ae51d5d90851a17f8b73b4f599e4eb11bc16bca1db53db507906936f149a38a5670e8a81797ac5a5165d9adc83
 DIST libsfml-2.4.0.tar.gz 24578301 SHA256 712da18445a1dcbb717b010d9b19889222c95b6632c343457aa61712cbe1d76b SHA512 76d1c0421b905c2c04324e591d2c309eb9547eae3917f7df966fc5e462ef4e10198f36c5d089273ec0fcff49fd42b7cb82d166c4134ccd2308b47082d2a3354c WHIRLPOOL d6304e52e280f32a067695f386cea7921aaf203fb28c8d4ad181533130b57bda04334ec0d3bc7013673a7404e0d3e88fb19766840c669118c75544a5956e6deb
+DIST libsfml-2.4.1.tar.gz 24573418 SHA256 f9d1191b02e2df1cbe296601eee20bdf56d98fb69d49fde27c6ca789eb57398e SHA512 50b2bdd914faccb9e44409f7a3b20909efef034be15e298c34710eafc52b36494272e4f5f9c882516fa1312c2e2ff3ebff0dd5246f193724ea6bc5be9ef8530f WHIRLPOOL 2528c1906c085f9b574414476f3f5ec5a85bc358c57dc47b91fe4c8a5398a771893825a6ad1671f8fb144a6f13634bfa5f186a2b34b58e1e405eac25677b71ca
--- a/media-libs/libsfml/libsfml-2.4.1.ebuild
+++ b/media-libs/libsfml/libsfml-2.4.1.ebuild
@ -0,0 +1,70 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit cmake-utils versionator
+
+MY_P=SFML-${PV}
+
+DESCRIPTION="Simple and Fast Multimedia Library (SFML)"
+HOMEPAGE="http://www.sfml-dev.org/ https://github.com/SFML/SFML"
+SRC_URI="https://github.com/SFML/SFML/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0/$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc examples"
+
+RDEPEND="media-libs/freetype:2
+	media-libs/libpng:0=
+	media-libs/mesa
+	media-libs/flac
+	media-libs/libogg
+	media-libs/libvorbis
+	media-libs/openal
+	sys-libs/zlib
+	virtual/jpeg:0
+	virtual/libudev:0
+	virtual/opengl
+	x11-libs/libX11
+	x11-libs/libXrandr
+	x11-libs/libxcb
+	x11-libs/xcb-util-image"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )"
+
+DOCS="changelog.txt readme.txt"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	local PATCHES=( "${FILESDIR}"/${PN}-2.2-no-docs.patch )
+
+	sed -i "s:DESTINATION .*:DESTINATION /usr/share/doc/${PF}:" \
+		doc/CMakeLists.txt || die
+
+	default
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DSFML_BUILD_DOC=$(usex doc)
+		-DSFML_INSTALL_PKGCONFIG_FILES=TRUE
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	insinto /usr/share/cmake/Modules
+	doins cmake/Modules/FindSFML.cmake
+
+	if use examples ; then
+		docompress -x /usr/share/doc/${PF}/examples
+		dodoc -r examples
+		find "${ED}"/usr/share/doc/${PF}/examples -name CMakeLists.txt -delete
+	fi
+}
--- a/media-libs/mutagen/Manifest
+++ b/media-libs/mutagen/Manifest
@ -1,5 +1,5 @@
 DIST mutagen-1.27.tar.gz 875720 SHA256 cc884fe1e20fe220be7ce7c3b269f4cadc69a8310150a3a41162fba1ca9c88bd SHA512 ae15fb3f5d77025a60e25a2ed25e23f7d21160d4e63c49fe7d01508440ff1f6b673cf34d8f4facc834824825ad6f4d3ed9830133db5aba339ac1eae46f7f50d5 WHIRLPOOL ecd44cc7fde15f87a2a31be84b428a49e97d67ce26c700382b4e2ba7cdb995223ea6dfda101dd7039d4c7ce23a2314d7e523b9849f19189a6ed7bcdb18bbd52e
 DIST mutagen-1.31.tar.gz 897785 SHA256 0aa011707785fe30935d8655380052a20ba8b972aa738d4f144c457b35b4d699 SHA512 d603afa049e2223dc1050ee26101add4150f8ca57fcee1bbbfd1233276b15fda5972d58e8472135396e54f2778219462619fbec8dddb97c35a7fb7638fec0c23 WHIRLPOOL afe4977ba2da8d8adbcf1b333105eab9f2c79b6a31eeed6199a33c4ac8c4f23b62e2b45a6322c4058d77c3c8ea5ac8581c18dc9ff29b0368aa07713c5694b8ef
 DIST mutagen-1.34.1.tar.gz 872058 SHA256 aacd667ef1f4fa7b7c201f36b2a6eda1ead3c92331017601d8082af62a7ee461 SHA512 bd3e49b4b176611f673dfc8288def8f7f268077b231df7a4dab93d1cfb14ae4538f9c02c4157e074f3356d0883758d679893c8e4906a612bfb7c9593416cdb2a WHIRLPOOL 5c0ba1b6b1e26c5ea11f0386b4db981f4b99422ae8373e2a88ff971e706503a1e33b0b595d77e2e993279f19e5fe19813310d89d043e5103d46a4e5f96dbde4b
-DIST mutagen-1.34.tar.gz 871691 SHA256 baf089121710c36ce317d9f107d552a3c7ec14dfcaa9618b809c4b25ef775619 SHA512 3aaaf325b5c66a04a442b5cc615079362b21ab8461202376f0af12927c98e945efe7a15c6d457280af9dd510bdb8b8c951680e49dfab24abcd9fe88153b8f301 WHIRLPOOL c72b4925ad96214d142cda1c4d4d7ba62a11c54e9971abf66b46078a7781f4ac94decda1aa14cf93a1ee264e1825d242f5e2a4082de52c035117359904f2ed08
+DIST mutagen-1.35.1.tar.gz 883772 SHA256 49cda72ee5213e60d5d48a80187b0b17d37a6244f37751f72e480c1b1832934e SHA512 e411b86d50a7689589b7d300317dc2a2c4893efe47b66d07bdf5fe92f1d08fcc00c314e3ae1f97d706fcaae6c83c7569bb22b557af2dfc469b1d3c4f0388a260 WHIRLPOOL 6662ed461122fae69cf8844f6460ae8635cc1b7b3e5faf13f83a51d8f02bac927c8d850f727f602ba83b3be41e3c5c28b4ea2dfa2564710d525f5a699992f0e7
 DIST mutagen-1.35.tar.gz 884988 SHA256 ee106f1544e8caf688102afaca2fe95cab4caf144da06128a265a29c8c7f4619 SHA512 68a3d30300bbfbedad39f76798827b70b9dd6bbb72da3b0f537748f76b395866aeaacbb1ca9d64d11d1c97a09e5767bcac98131d62846f91172a1caf8d434a50 WHIRLPOOL 149d27c832527a2cd8986f56b50c5865320aec69bd1452ce71cb96fc47a8a0227e9b7defe05e94aa64e9d9226dd9faf3cfba6af0788f90d073346c3afd219c1b
--- a/media-libs/mutagen/mutagen-1.35.1.ebuild
+++ b/media-libs/mutagen/mutagen-1.35.1.ebuild
@ -19,8 +19,10 @@ IUSE="doc test"

 # TODO: Missing support for >=dev-python/eyeD3-0.7 API
 # test? ( >=dev-python/eyeD3-0.7 )
-DEPEND="
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
 "

 python_compile_all() {
--- a/media-sound/qmmp/Manifest
+++ b/media-sound/qmmp/Manifest
@ -1,9 +1,9 @@
-DIST qmmp-0.10.3.tar.bz2 1341125 SHA256 b48d4f0a125a6cb020e649f3bc2adefbc0335a1d188105fb3234481acff22962 SHA512 b0ca505a946c0c0b9bc20e4ac48dd6c9d0079c612e0b79cd110200ff41deba8b590cc686f5365432eaca500cfb5e42778dcafa4a92f38471eeb1e7277c99e1dd WHIRLPOOL 6137f1a68978cb1c81cf4d084b3fc6517856b9e8bd3caf6ad16efdba4bcfdb423790732b6dd7c4851ceb53253d27c36f543de5168418d0a2848314403b6ae401
 DIST qmmp-0.10.4.tar.bz2 1340614 SHA256 3412fd079af674d4df51cd0fc4a69e1a038de40adf426fcaab12babb3c5144c2 SHA512 06165527e1f631378381b92951d176b8bf084b30c7362a140fce6521270a41d5e6563b9577eba982ff9b273a7bff4a2f5cbe9e75d39227aaa6e72b26cc9c3e4f WHIRLPOOL 40e8fd747cac3b29478f08e3cd9788ac10165478a4c7e59c7c0788c3db2a2a0c502254aa0ab1744a9265bd14892e54196b572599c13ce802c7fc84e38fc86e82
+DIST qmmp-0.10.5.tar.bz2 1342190 SHA256 c1ac6aa5241f0ade901793a2e581183903e6c861a9f275f3f9735753f5e463ac SHA512 24751504101d3cf753f032515b61faf0e7f3b3b70ac1a8f7742e650868be3adb7ecae54c01bc5e7e407c6f3796da0a4347c908d976205448743163b22e211942 WHIRLPOOL 12ba0e0ef6bd3116326af6624628ebf2128d9d882e32ef3474bc4a6d4047c68de404bec07e893f101bdd8b6a0b843f5e3b1941e537fcdf436997a545b19ee027
 DIST qmmp-0.9.10.tar.bz2 1126355 SHA256 a93ca43b2407b917602a47b5728cd4d72d694069a3ea329572c01ff66845f7e1 SHA512 2326ac6ca91b68c0b68888a98bd4f6f6596b50aa7442edca3686bf7516a9947954ad95a6107f74f8ea6e3013325eeb2e59d53d034410e27845208e2486916556 WHIRLPOOL 4716e4f40915a37049195450b005e387069a02171dcfe331d2898f8059c956f4d1e48ea14a8e9258103f21b7728ec4546c6666259b43bbb809d39aa322890464
 DIST qmmp-0.9.2.tar.bz2 1112974 SHA256 90ac69a21779df5073efe71b25f28a7461d6a928deb1afbaa1ef8268f62ae9c5 SHA512 fc6cb0ec4bbf52e2ceb9e87a3585f25bd58b3a323ef07ddb9fd9f21a065ef0f5deb0b014f29b9648fe9e0a8b412f3b04643f8128638558089a25d867577690ad WHIRLPOOL 47a596b0f7d9e516737bfeb10a962f79edb74f61e2985b01f2cee80c8ff252a1709459f5712700784faef824e24ff3567d73f0d5759e2cd2c0c53c267cc6a026
 DIST qmmp-0.9.8.tar.bz2 1125404 SHA256 83ca64e222b8b02a0515511d8187667f1d44a71281cf36eb0fe05560c88b1911 SHA512 1a86cd1c3552f64005d49e2a9baa2fd65bdc8fefad4e72e265cd3afdb45fd22d57c712a9c6e693e0308cd5607f8fe5905bb3a5e51747b11273f3e4eb60c4fd81 WHIRLPOOL 3d036fb3d7dd8ce7282f97d6e89a04e10c71c3bc615d0529ab0ef262f5b0d3d7b2bc9e2ed3f9e29e06be8a6b3b764ba52345b9100ead371985c00ae99c597f6e
 DIST qmmp-1.0.10.tar.bz2 1107784 SHA256 02bcd01b1d8f6ca8b805a5deaeaa059ee44a38fafd20bec7ee3560a021250ee3 SHA512 45231ef8b1f0a0825336752fe9314cc0df1b937ebcf85b18c89c66e52f38cf69583eccd8ffcf92d89add11643e1f40ccf0fe720fd6279f3cf4f73db336d4d59b WHIRLPOOL 0bb7d873e58b8cdbbb71576af3080031fc0e03cc3fc3153812e2a105bad40f02ac4a3838454aef5551890e278d050bbe04caf0e77ddb1cd3b43f7fd2c77cd5e7
 DIST qmmp-1.0.7.tar.bz2 1107565 SHA256 adb8c4338a22bc80e75aa667e866789b970eb3c7662fdb374f03388f45e5e09b SHA512 d9c5be464ba2c4e2eb4b0ffbb938cb277e8c483fcb1ec97100dc862acfc2f1c6c1110a3d45c5c5713c7e30bd508a7c0828ff48587ea875ac7befe5b23544cabd WHIRLPOOL d766bd45c9bb18a5cec37d23a4ca123021e79dc1ffc275e38c99a9ee88b03120534aa845a0df007b1c93e44d4867e883fd6720079333b85420e4ca4b1364e992
-DIST qmmp-1.1.3.tar.bz2 1132277 SHA256 68076361efd4d3f9d0b103311a5a413aa043e460e9ff10677bfdd3a115575bdf SHA512 5e02486ac22117193b3be2ecc81c643fec5075e69271b1647e6c027e19a6f64f36ee0944012d1d928ed8f0241c2d12396dea033b19dcdb747ff61bea0bced1eb WHIRLPOOL 5ef073d55f479a7042afb2c339bdf68d3948d6bf199488b436864a3a87206ac4f715379a6ec11111dc26ef1d38d6dacb33e588555666c5d8125a26381b323c70
 DIST qmmp-1.1.4.tar.bz2 1132606 SHA256 8b48bd208506a9e98428480b1aa21daa96e3866b4cc3a11e8cb008ef564c13aa SHA512 b9a84968e4279c16b7f613256de61bbfd34dd85d4790d1b2b1078a841ea38e99778cad6b40005b49f98bc6a6bf048d4dbb2b027eb5c4bc9dc1011e9153c2c17a WHIRLPOOL e2a0cf1c2fa4633eb59b29da30f37d011d5c86c955c4cadf33c76976fb79a83a46164d920cf8b4158639e2042fbf4b5fffe82c0a813adc201e53e574c3c53095
+DIST qmmp-1.1.5.tar.bz2 1132552 SHA256 9b1288f432799980a5d58d131b56b4b590055d7e66c5fe50e9199b9daa35ddbd SHA512 9117e42fe3e74eb28c147ec98db5a5825b6c027b91ff5a9e9db48edc23b98745cfdeaf15139a48465e7607028d0a1835ab707f2e0b3749487c2e204a0ca511a7 WHIRLPOOL 0a8e75ccd0932f7e2dd95401849eb7ec88cdaa2a79b62d470319364b3e319640417359425da56cda7c31021c0a4247bca2984462fedfdc9b9edf082ce74bfbcc
--- a/media-sound/qmmp/qmmp-0.10.5.ebuild
+++ b/media-sound/qmmp/qmmp-0.10.5.ebuild
--- a/media-sound/qmmp/qmmp-1.1.5.ebuild
+++ b/media-sound/qmmp/qmmp-1.1.5.ebuild
--- a/media-video/ffmpegthumbnailer/Manifest
+++ b/media-video/ffmpegthumbnailer/Manifest
@ -1,4 +1,4 @@
 DIST ffmpegthumbnailer-2.0.10.tar.bz2 2154028 SHA256 a3022c86aa3e704849e424147bd4a319867e18930d66a4a4c93c0baefdd1fc60 SHA512 1fcfcfe9457a3e3e70a749f3234f79d080fbbb40d4d1f65b84e1c46a7051c75368afaffb25a39b43f8e205ffdbc2e156e6fb5848514fce4a1a3f5222458c1b9d WHIRLPOOL fe60513d2a26db622d02f6f38f04009590337415aeb02b441757949e4402cdfeb33d37cb295720f8dd66ebae9dcfdba9304c88256ccda4800e015fa40650151b
 DIST ffmpegthumbnailer-2.0.8.tar.gz 367186 SHA256 2c8bbefa838d38ea42fc8ac78258cda36865d974c991624b14cffdb92a3bc68b SHA512 6062d4b8f5326bde96c8c6dceaac52e1fabcec93f0a0ee4be19e203050e6c80426a006076a27e4a12582e05daceebd37beef008154fdd92a87f365fdff68ca83 WHIRLPOOL 6b0bd942777515f690f212df5616dffc4fc1c6e0e0e5be67128b376347b18d75eb144d25e9f8ac841b41099703092af5784edc31f34d7dbf81b742d678233e79
-DIST ffmpegthumbnailer-2.1.1.tar.bz2 1448731 SHA256 51bca83c0cfae283e8e2f323aa49e0c6ced206c5a068332b4be974d3905cf055 SHA512 2ac9e8b904e73086d0bf0f586a971bf3807d41bd394505164461731099c17570b45d71374e2bbf6fa2d0d7d47011564e06230b360255535120a9969fde3888a4 WHIRLPOOL 35e42062a50a0c5e3e669fc513b2e1219f77ec3681880a65ac503ff8dd463ada0c56206bb70c76460ff4d3592a40d26361b05b8ee8fe9b54269e30c4127e8e07
 DIST ffmpegthumbnailer-2.1.2.tar.bz2 1221508 SHA256 f536035c3f2c2455b3180559e3fb3082db275d9264565271053028221dc6d2cd SHA512 e297708df4cbefdbead89af0499881b17128dc47c8403f84862343822113354de61450f63e932ab4b5b2414826a3fe5ff72ac2bec22ee3bb507801ee0d065d7b WHIRLPOOL 3775e071380936f447b880ee051e8c9fe6ec50735b46cd352600ee7125b0744847a5547378bba25a65d3829f25ccee6843c1559a917e50aa6e02c1a6727c6b8a
+DIST ffmpegthumbnailer-2.2.0.tar.bz2 1223895 SHA256 e5c31299d064968198cd378f7488e52cd5e738fac998eea780bc77d7f32238c2 SHA512 526d15b2c754fcb1415e69fb54cb6e7d0102b6d73a32a7e8528df81e32633dfe3786898984fdb988c93daee7218956c75c096ef657c9b3a42399d2d1d27c7bbf WHIRLPOOL 8634c8c33ae61a2b50cc8bc30e666b2c814a589758d83805f11710651a834439564c4702778e385eca3c63a76f1cf1a066d3ba2b6685df51f21acfe3bd5b4c4c
--- a/media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.2.0.ebuild
+++ b/media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.2.0.ebuild
@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

-EAPI=5
+EAPI=6

 inherit cmake-utils eutils

--- a/media-video/smplayer/Manifest
+++ b/media-video/smplayer/Manifest
@ -1,6 +1,5 @@
 DIST smplayer-14.9.0.tar.bz2 3716434 SHA256 429ad4edd6df1fcedd5ea4fa2b024eb5a61c9412f52762e9d9a9c2245b7ddf13 SHA512 78cecdad7e5f18c221a2f08a0472da01eb14db6230733616b805b6fccf2929c3f5b4dd92fd037362890a308967fa6602b89318c5376c3ce3a38d0dd9a1a17e43 WHIRLPOOL d7e621cd9ebcee450ce7aa9beaf1240c3d2f91271d2a6f043688c8688d77e8ad4761777a05ae77230966d050d647e700aa5bc8d3b566adc3fb724eaf9e315399
 DIST smplayer-16.1.0.tar.bz2 3966243 SHA256 d25c9b62d36c5ee63fb360e9a45566601d49d707e1364294a54967b956bdd8c9 SHA512 2c240a6cc392b84c7d6f725a02af33788ce7dbfae9d765d309e3b958fa9e2475e45c56b260e056118362848f64e478aa0ef9c67478fc44d9e42c568b4892e6ed WHIRLPOOL 8a7c989e3c77e6e7a696a958f848e8649f49131be80f26139b2aef17f3534cc18ab778def5083fee5a12c1e8291891e6c9d90ae26395c13a04e889ab2e4f616e
+DIST smplayer-16.11.0.tar.bz2 4254170 SHA256 e53a5d8b4d66fb0b7eb73053ef0bfdd2d942b79a16f8cc8d3d0b0771c7c80b5a SHA512 13776ff134c4c91747fa9432080a4ea876d5d5a134b91dde48d0f0e75c280ef6d19067906e4e850da3b1b2287214914528743495cccf7cbda310bc51682b478c WHIRLPOOL eadbf8af0247892dcaa38fd278b2316457626d573f10319d986e77aa0a58ef42cdc783efa95feffe292a38ebbb4b65d7203cabbc57f0332be711f9683c161139
 DIST smplayer-16.4.0.tar.bz2 4020567 SHA256 de4169c7e3a1d8bf6f3c9a77fa0a8c24c1f63db3f2b8a325bc6761c0a9d2d2ec SHA512 a75b1ff935912a5193854a12d0777e0c5883d4513b09869acdae9149dbc022ea77b0b2106f6c820401090127e1dcd585c74b6beb9af3abb36a0abfb58165246a WHIRLPOOL 18709aa1abbec5811a0e60295af68e42700760ec74890b7c85a36eab91d21bbf82efdcd42af5083da174a486910a691d9b957c8fbea0cea13b62a23167e4680c
-DIST smplayer-16.7.0.tar.bz2 4163002 SHA256 6989972d5c2d8bacdf66b6db669b3be015a55ba6db0bfdc4180790c02dc4e218 SHA512 d385f068bed1f95111d9564f37ba565611ecd2c738df0192d5bcab6da7b25e5db06f5594c04740b82cd07c13145a8b996d922bc353c16cdf551419b66d025124 WHIRLPOOL d1d8463ff35a7c96f38f79586ebee354c45ee3539ab9687e70d2091fd8174fa20706db4b66fb6df03b82ecf0fccee1bc9ec549aa5819a3c1fb77a37bc39d8228
-DIST smplayer-16.8.0.tar.bz2 4166064 SHA256 3ced2085808798bd2cdb1ca623686dbde3ac6b7acccee9de4786a2d5f96d9c81 SHA512 0609fd6147502f43e4e2f8f5df6854f0aaab9b165663882254a0b5e8e3d8b0f15ad6ababd13869eb829f265dde9062827cb738ed4cc79e488321f90c50de9980 WHIRLPOOL 2b7b8bd91da9e3ef9e1e3f5bc4aaf4ef9a30ff39c8d56023432bb8ad5827f96cc451c64385ea02ae9d8427b9b53b37d7607f153e7182b22307fa473f9d977adb
 DIST smplayer-16.9.0.tar.bz2 4205771 SHA256 692e49fbfbcedaecf9e41f40e3f49905ec4d967e0b99b2c8c5fec1b6810ccdbe SHA512 ec424b583372df599c4785ae63d33dccbf963e6dd560faaf2159ca2aa47891f8a7797c3f0091ede8802d039ed97c5fdf6b944085abc7d50580f10fc8218e1902 WHIRLPOOL 076dbd5eb61fe94999a51737e621d7a507519a84a705c264911bedee56c4a79038d4e227e1d6612f53b9b9ea8423dace80e46eb5fbfa0c51c975498d3a48ee39
--- a/media-video/smplayer/smplayer-16.11.0.ebuild
+++ b/media-video/smplayer/smplayer-16.11.0.ebuild
@ -66,9 +66,9 @@ PATCHES=(
 )

 src_prepare() {
-	default
+	use bidi || PATCHES+=( "${FILESDIR}"/${PN}-16.4.0-zero-bidi.patch )

-	use bidi || eapply "${FILESDIR}"/${PN}-16.4.0-zero-bidi.patch
+	default

 	# Upstream Makefile sucks
 	sed -i -e "/^PREFIX=/ s:/usr/local:${EPREFIX}/usr:" \
--- a/media-video/smplayer/smplayer-16.7.0.ebuild
+++ b/media-video/smplayer/smplayer-16.7.0.ebuild
@ -1,147 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-PLOCALES="am ar ar_SY bg ca cs da de el_GR en_GB en_US es et eu fa fi fr gl
-he_IL hr hu id it ja ka ko ku lt mk ms_MY nl nn_NO pl pt pt_BR ro_RO ru_RU
-sk sl_SI sq_AL sr sv th tr uk_UA uz vi_VN zh_CN zh_TW"
-PLOCALE_BACKUP="en_US"
-
-inherit l10n qmake-utils
-
-DESCRIPTION="Great Qt GUI front-end for mplayer/mpv"
-HOMEPAGE="http://www.smplayer.eu/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2+ BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux"
-IUSE="autoshutdown bidi debug mpris qt5 streaming"
-
-COMMON_DEPEND="
-	sys-libs/zlib
-	!qt5? (
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
-		dev-qt/qtsingleapplication[X,qt4]
-		autoshutdown? ( dev-qt/qtdbus:4 )
-		mpris? ( dev-qt/qtdbus:4 )
-		streaming? (
-			dev-qt/qtcore:4[ssl]
-			dev-qt/qtscript:4
-		)
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtsingleapplication[X,qt5]
-		dev-qt/qtwidgets:5
-		dev-qt/qtxml:5
-		autoshutdown? ( dev-qt/qtdbus:5 )
-		mpris? ( dev-qt/qtdbus:5 )
-		streaming? (
-			dev-qt/qtnetwork:5[ssl]
-			dev-qt/qtscript:5
-		)
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	qt5? ( dev-qt/linguist-tools:5 )
-"
-RDEPEND="${COMMON_DEPEND}
-	|| (
-		media-video/mplayer[bidi?,libass,png,X]
-		(
-			>=media-video/mpv-0.10.0[libass,X]
-			streaming? ( >=net-misc/youtube-dl-2014.11.26 )
-		)
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-14.9.0.6966-unbundle-qtsingleapplication.patch" # bug 487544
-)
-
-src_prepare() {
-	default
-
-	use bidi || eapply "${FILESDIR}"/${PN}-16.4.0-zero-bidi.patch
-
-	# Upstream Makefile sucks
-	sed -i -e "/^PREFIX=/ s:/usr/local:${EPREFIX}/usr:" \
-		-e "/^DOC_PATH=/ s:packages/smplayer:${PF}:" \
-		-e '/\.\/get_svn_revision\.sh/,+2c\
-	cd src && $(DEFS) $(MAKE)' \
-		Makefile || die
-
-	# Turn off online update checker, bug #479902
-	sed -e 's:DEFINES += UPDATE_CHECKER:#&:' \
-		-e 's:DEFINES += CHECK_UPGRADED:#&:' \
-		-i src/smplayer.pro || die
-
-	# Turn off intrusive share widget
-	sed -e 's:DEFINES += SHARE_WIDGET:#&:' \
-		-i src/smplayer.pro || die
-
-	# Toggle autoshutdown option which pulls in dbus, bug #524392
-	if ! use autoshutdown ; then
-		sed -e 's:DEFINES += AUTO_SHUTDOWN_PC:#&:' \
-			-i src/smplayer.pro || die
-	fi
-
-	# Turn debug message flooding off
-	if ! use debug ; then
-		sed -e 's:#\(DEFINES += NO_DEBUG_ON_CONSOLE\):\1:' \
-			-i src/smplayer.pro || die
-	fi
-
-	# MPRIS2 pulls in dbus, bug #553710
-	if ! use mpris ; then
-		sed -e 's:DEFINES += MPRIS2:#&:' \
-			-i src/smplayer.pro || die
-	fi
-
-	# Turn off youtube support (which pulls in extra dependencies) if unwanted
-	if ! use streaming ; then
-		sed -e 's:DEFINES += YOUTUBE_SUPPORT:#&:' \
-			-i src/smplayer.pro || die
-	fi
-
-	# Commented out because it gives false positives
-	#l10n_find_plocales_changes "${S}"/src/translations ${PN}_ .ts
-}
-
-src_configure() {
-	cd src || die
-	use qt5 && eqmake5 || eqmake4
-}
-
-gen_translation() {
-	local mydir="$(qt4_get_bindir)"
-	if use qt5; then
-		mydir="$(qt5_get_bindir)"
-	fi
-
-	ebegin "Generating $1 translation"
-	"${mydir}"/lrelease ${PN}_${1}.ts
-	eend $? || die "failed to generate $1 translation"
-}
-
-src_compile() {
-	default
-
-	cd src/translations || die
-	l10n_for_each_locale_do gen_translation
-}
-
-src_install() {
-	# remove unneeded copies of the GPL
-	rm -f Copying* docs/*/gpl.html || die
-	# don't install empty dirs
-	rmdir --ignore-fail-on-non-empty docs/* || die
-
-	default
-}
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@ -1 +1 @@
-Thu, 17 Nov 2016 12:43:13 +0000
+Thu, 17 Nov 2016 18:43:16 +0000
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@ -1 +1 @@
-Thu, 17 Nov 2016 12:43:13 +0000
+Thu, 17 Nov 2016 18:43:17 +0000
--- a/metadata/md5-cache/app-backup/btrbk-0.23.3
+++ b/metadata/md5-cache/app-backup/btrbk-0.23.3
@ -4,10 +4,10 @@ DESCRIPTION=Tool for creating snapshots and remote backups of btrfs subvolumes
 EAPI=6
 HOMEPAGE=https://digint.ch/btrbk/
 IUSE=+pv
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm ~x86
 LICENSE=GPL-3+
 RDEPEND=dev-lang/perl net-misc/openssh pv? ( sys-apps/pv ) >=sys-fs/btrfs-progs-3.18.2
 SLOT=0
 SRC_URI=https://digint.ch/download/btrbk/releases/btrbk-0.23.3.tar.xz
 _eclasses_=multilib	165fc17c38d1b11dac2008280dab6e80	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=f4a0e2f629c4caf139939fe2f980493d
+_md5_=c1f55a54b93cf838478988e62ae08b89
--- a/metadata/md5-cache/dev-python/pillow-3.4.2
+++ b/metadata/md5-cache/dev-python/pillow-3.4.2
@ -4,11 +4,11 @@ DESCRIPTION=Python Imaging Library (fork)
 EAPI=6
 HOMEPAGE=https://github.com/python-imaging/Pillow https://pypi.python.org/pypi/Pillow
 IUSE=doc examples jpeg jpeg2k lcms test tiff tk truetype webp zlib python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=HPND
 RDEPEND=jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:2= ) lcms? ( media-libs/lcms:2= ) tiff? ( media-libs/tiff:0= ) truetype? ( media-libs/freetype:2= ) webp? ( media-libs/libwebp:0= ) zlib? ( sys-libs/zlib:0= ) python_targets_pypy? ( virtual/pypy:0=[tk?,threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?,threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[tk?,threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[tk?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=test? ( jpeg tiff ) || ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/P/Pillow/Pillow-3.4.2.zip
 _eclasses_=distutils-r1	583a05d30524485fda6869c772682ecd	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=5ef3e3dc49aa8648762c81a850b6e272
+_md5_=8d289cb9442142d6e88cef15a1defcbd
--- a/metadata/md5-cache/dev-qt/qtcore-5.6.2-r1
+++ b/metadata/md5-cache/dev-qt/qtcore-5.6.2-r1
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=dev-libs/glib:2 >=dev-libs/libpcre-8.38[pcre16,unicode] >=sys-libs/zlib-1.2.5 virtual/libiconv icu? ( dev-libs/icu:= ) systemd? ( sys-apps/systemd:= ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.6.2 )
+DESCRIPTION=Cross-platform application development framework
+EAPI=6
+HOMEPAGE=https://www.qt.io/
+IUSE=icu systemd debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
+RDEPEND=dev-libs/glib:2 >=dev-libs/libpcre-8.38[pcre16,unicode] >=sys-libs/zlib-1.2.5 virtual/libiconv icu? ( dev-libs/icu:= ) systemd? ( sys-apps/systemd:= ) dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.6
+SRC_URI=https://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtbase-opensource-src-5.6.2.tar.xz
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	qt5-build	c08fc6c5028076eb1a42b7edc5847f42	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96
+_md5_=15bd28f704dd75dcc3f4e251df97db27
--- a/metadata/md5-cache/dev-util/bazel-0.4.0
+++ b/metadata/md5-cache/dev-util/bazel-0.4.0
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=virtual/jdk:1.8 >=dev-java/java-config-2.2.0-r3
+DESCRIPTION=Fast and correct automated build system
+EAPI=6
+HOMEPAGE=http://bazel.io/
+IUSE=examples tools zsh-completion elibc_FreeBSD
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=virtual/jdk:1.8 >=dev-java/java-config-2.2.0-r3
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/bazelbuild/bazel/archive/0.4.0.tar.gz -> bazel-0.4.0.tar.gz
+_eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=e5026c88f566cb49e2acbb0859dbb36a
--- a/metadata/md5-cache/dev-util/drone-ui-0_pre20161007
+++ b/metadata/md5-cache/dev-util/drone-ui-0_pre20161007
@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install test unpack
+DEPEND=dev-go/go-bindata dev-go/go-bindata-assetfs >=dev-lang/go-1.4.2:=
+DESCRIPTION=React front-end for the Drone continuous integration server
+EAPI=5
+HOMEPAGE=https://github.com/drone/drone-ui
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+SLOT=0/0_pre20161007
+SRC_URI=https://github.com/drone/drone-ui/archive/9913c868839e709599f3ed659c3e0a137a2e2706.tar.gz -> drone-ui-0_pre20161007.tar.gz
+_eclasses_=golang-base	08fe6e0e2b4750daff8887a7f0e1f873	golang-build	a44f10e6bd86ecccf2a07cc0d4cf6bec	golang-vcs-snapshot	1caa6d8238d2378ad688ae068ff22e5a
+_md5_=82d12eeaf1f2cc227016e433ed4a1d23
--- a/metadata/md5-cache/games-board/gnuchess-6.2.4
+++ b/metadata/md5-cache/games-board/gnuchess-6.2.4
@ -2,9 +2,9 @@ DEFINED_PHASES=configure
 DESCRIPTION=Console based chess interface
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/chess/chess.html
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=mirror://gnu/chess/gnuchess-6.2.4.tar.gz
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=3ddf45e3366253d3aaaf5137e805de14
+_md5_=a33a3bf988b36a81899d74ea31c6bd27
--- a/metadata/md5-cache/games-rpg/manaplus-1.6.11.5
+++ b/metadata/md5-cache/games-rpg/manaplus-1.6.11.5
@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install prepare test
+DEPEND=>=dev-games/physfs-1.0.0 media-fonts/dejavu media-fonts/liberation-fonts media-fonts/mplus-outline-fonts media-fonts/wqy-microhei media-libs/libpng:0= net-misc/curl sys-libs/zlib x11-apps/xmessage x11-libs/libX11 x11-misc/xdg-utils mumble? ( media-sound/mumble ) nls? ( virtual/libintl ) opengl? ( virtual/opengl ) pugixml? ( dev-libs/pugixml ) !pugixml? ( dev-libs/libxml2 ) sdl2? ( media-libs/libsdl2[X,opengl?,video] media-libs/sdl2-gfx media-libs/sdl2-image[png] media-libs/sdl2-mixer[vorbis] media-libs/sdl2-net media-libs/sdl2-ttf ) !sdl2? ( media-libs/libsdl[X,opengl?,video] media-libs/sdl-gfx media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis] media-libs/sdl-net media-libs/sdl-ttf ) virtual/pkgconfig nls? ( sys-devel/gettext )
+DESCRIPTION=OpenSource 2D MMORPG client for Evol Online and The Mana World
+EAPI=6
+HOMEPAGE=http://manaplus.evolonline.org
+IUSE=mumble nls opengl pugixml +sdl2 test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-games/physfs-1.0.0 media-fonts/dejavu media-fonts/liberation-fonts media-fonts/mplus-outline-fonts media-fonts/wqy-microhei media-libs/libpng:0= net-misc/curl sys-libs/zlib x11-apps/xmessage x11-libs/libX11 x11-misc/xdg-utils mumble? ( media-sound/mumble ) nls? ( virtual/libintl ) opengl? ( virtual/opengl ) pugixml? ( dev-libs/pugixml ) !pugixml? ( dev-libs/libxml2 ) sdl2? ( media-libs/libsdl2[X,opengl?,video] media-libs/sdl2-gfx media-libs/sdl2-image[png] media-libs/sdl2-mixer[vorbis] media-libs/sdl2-net media-libs/sdl2-ttf ) !sdl2? ( media-libs/libsdl[X,opengl?,video] media-libs/sdl-gfx media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis] media-libs/sdl-net media-libs/sdl-ttf )
+SLOT=0
+SRC_URI=http://download.evolonline.org/manaplus/download/1.6.11.5/manaplus-1.6.11.5.tar.xz
+_md5_=279d93e14b716d0807e7653c83f1f6b1
--- a/metadata/md5-cache/kde-frameworks/kservice-5.28.0
+++ b/metadata/md5-cache/kde-frameworks/kservice-5.28.0
@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.28:5 >=kde-frameworks/kcoreaddons-5.28:5 >=kde-frameworks/kcrash-5.28:5 >=kde-frameworks/kdbusaddons-5.28:5 >=kde-frameworks/ki18n-5.28:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 sys-devel/bison sys-devel/flex man? ( >=kde-frameworks/kdoctools-5.28:5 ) test? ( >=dev-qt/qtconcurrent-5.6.1:5 ) sys-devel/make >=dev-util/cmake-2.8.12 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.28:5 test? ( >=dev-qt/qttest-5.6.1:5 ) >=dev-qt/qtcore-5.6.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Advanced plugin and service introspection
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=+man debug test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=LGPL-2 LGPL-2.1+
-RDEPEND=>=kde-frameworks/kconfig-5.28:5 >=kde-frameworks/kcoreaddons-5.28:5 >=kde-frameworks/kcrash-5.28:5 >=kde-frameworks/kdbusaddons-5.28:5 >=kde-frameworks/ki18n-5.28:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 >=kde-frameworks/kf-env-3 !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
-RESTRICT=test
-SLOT=5/5.28
-SRC_URI=mirror://kde/stable/frameworks/5.28/kservice-5.28.0.tar.xz
-_eclasses_=cmake-utils	f3d38665b0a86e08ba3a5473cdbfafd3	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	b80ab2c131e6011994cf3b553fc21f63	kde5-functions	391cd05771548da2a3942eb1992669b1	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=364df84b7092655aca0df57b4e818a69
--- a/metadata/md5-cache/media-libs/libsfml-2.4.1
+++ b/metadata/md5-cache/media-libs/libsfml-2.4.1
@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=media-libs/freetype:2 media-libs/libpng:0= media-libs/mesa media-libs/flac media-libs/libogg media-libs/libvorbis media-libs/openal sys-libs/zlib virtual/jpeg:0 virtual/libudev:0 virtual/opengl x11-libs/libX11 x11-libs/libXrandr x11-libs/libxcb x11-libs/xcb-util-image doc? ( app-doc/doxygen ) sys-devel/make >=dev-util/cmake-2.8.12
+DESCRIPTION=Simple and Fast Multimedia Library (SFML)
+EAPI=6
+HOMEPAGE=http://www.sfml-dev.org/ https://github.com/SFML/SFML
+IUSE=debug doc examples
+KEYWORDS=~amd64 ~x86
+LICENSE=ZLIB
+RDEPEND=media-libs/freetype:2 media-libs/libpng:0= media-libs/mesa media-libs/flac media-libs/libogg media-libs/libvorbis media-libs/openal sys-libs/zlib virtual/jpeg:0 virtual/libudev:0 virtual/opengl x11-libs/libX11 x11-libs/libXrandr x11-libs/libxcb x11-libs/xcb-util-image
+SLOT=0/2.4
+SRC_URI=https://github.com/SFML/SFML/archive/2.4.1.tar.gz -> libsfml-2.4.1.tar.gz
+_eclasses_=cmake-utils	f3d38665b0a86e08ba3a5473cdbfafd3	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=f6811d08f815d02176fdc22ecbdab403
--- a/metadata/md5-cache/media-libs/mutagen-1.34
+++ b/metadata/md5-cache/media-libs/mutagen-1.34
@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=Audio metadata tag reader and writer implemented in pure Python
-EAPI=6
-HOMEPAGE=https://bitbucket.org/lazka/mutagen https://pypi.python.org/pypi/mutagen
-IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=https://bitbucket.org/lazka/mutagen/downloads/mutagen-1.34.tar.gz
-_eclasses_=distutils-r1	583a05d30524485fda6869c772682ecd	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=a91939c80e8d78b7249c06da98abdbd3
--- a/metadata/md5-cache/media-libs/mutagen-1.35.1
+++ b/metadata/md5-cache/media-libs/mutagen-1.35.1
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DESCRIPTION=Audio metadata tag reader and writer implemented in pure Python
+EAPI=6
+HOMEPAGE=https://bitbucket.org/lazka/mutagen https://pypi.python.org/pypi/mutagen
+IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=https://bitbucket.org/lazka/mutagen/downloads/mutagen-1.35.1.tar.gz
+_eclasses_=distutils-r1	583a05d30524485fda6869c772682ecd	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=ae03e43469642a1211ddf4ee289d1193
--- a/metadata/md5-cache/media-sound/qmmp-0.10.5
+++ b/metadata/md5-cache/media-sound/qmmp-0.10.5
@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=media-libs/taglib dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 dev-qt/qtmultimedia:4 alsa? ( media-libs/alsa-lib ) bs2b? ( media-libs/libbs2b ) cdda? ( dev-libs/libcdio-paranoia ) cue? ( media-libs/libcue ) curl? ( net-misc/curl ) aac? ( media-libs/faad2 ) enca? ( app-i18n/enca ) flac? ( media-libs/flac ) game? ( media-libs/game-music-emu ) ladspa? ( media-libs/ladspa-cmt ) mad? ( media-libs/libmad ) midi? ( media-sound/wildmidi ) mms? ( media-libs/libmms ) mplayer? ( media-video/mplayer ) musepack? ( >=media-sound/musepack-tools-444 ) modplug? ( >=media-libs/libmodplug-0.8.4 ) vorbis? ( media-libs/libvorbis media-libs/libogg ) jack? ( media-sound/jack-audio-connection-kit media-libs/libsamplerate ) ffmpeg? ( virtual/ffmpeg ) opus? ( media-libs/opusfile ) projectm? ( media-libs/libprojectm dev-qt/qtopengl:4 ) pulseaudio? ( >=media-sound/pulseaudio-0.9.9 ) wavpack? ( media-sound/wavpack ) scrobbler? ( net-misc/curl ) sndfile? ( media-libs/libsndfile ) soxr? ( media-libs/soxr ) udisks? ( sys-fs/udisks:2 )
 SLOT=0
-SRC_URI=http://qmmp.ylsoftware.com/files/qmmp-0.10.3.tar.bz2
+SRC_URI=http://qmmp.ylsoftware.com/files/qmmp-0.10.5.tar.bz2
 _eclasses_=cmake-utils	f3d38665b0a86e08ba3a5473cdbfafd3	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c563dd641a7e374204d3895a04a0b434
--- a/metadata/md5-cache/media-sound/qmmp-1.1.5
+++ b/metadata/md5-cache/media-sound/qmmp-1.1.5
@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=media-libs/taglib dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 alsa? ( media-libs/alsa-lib ) bs2b? ( media-libs/libbs2b ) cdda? ( dev-libs/libcdio-paranoia ) cue? ( media-libs/libcue ) curl? ( net-misc/curl ) aac? ( media-libs/faad2 ) enca? ( app-i18n/enca ) flac? ( media-libs/flac ) game? ( media-libs/game-music-emu ) ladspa? ( media-libs/ladspa-cmt ) mad? ( media-libs/libmad ) midi? ( media-sound/wildmidi ) mms? ( media-libs/libmms ) mplayer? ( media-video/mplayer ) mpris? ( dev-qt/qtdbus:5 ) musepack? ( >=media-sound/musepack-tools-444 ) modplug? ( >=media-libs/libmodplug-0.8.4 ) vorbis? ( media-libs/libvorbis media-libs/libogg ) jack? ( media-sound/jack-audio-connection-kit media-libs/libsamplerate ) ffmpeg? ( virtual/ffmpeg ) opus? ( media-libs/opusfile ) projectm? ( media-libs/libprojectm dev-qt/qtopengl:5 dev-qt/qtgui:5[-gles2] ) pulseaudio? ( >=media-sound/pulseaudio-0.9.9 ) wavpack? ( media-sound/wavpack ) scrobbler? ( net-misc/curl ) sndfile? ( media-libs/libsndfile ) soxr? ( media-libs/soxr ) udisks? ( sys-fs/udisks:2 )
 SLOT=0
-SRC_URI=http://qmmp.ylsoftware.com/files/qmmp-1.1.3.tar.bz2
+SRC_URI=http://qmmp.ylsoftware.com/files/qmmp-1.1.5.tar.bz2
 _eclasses_=cmake-utils	f3d38665b0a86e08ba3a5473cdbfafd3	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e5268b362098a1bcc50908b8489c3c5e
--- a/metadata/md5-cache/media-video/ffmpegthumbnailer-2.2.0
+++ b/metadata/md5-cache/media-video/ffmpegthumbnailer-2.2.0
@ -1,7 +1,7 @@
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=gtk? ( dev-libs/glib:2= ) jpeg? ( virtual/jpeg:0= ) !libav? ( >=media-video/ffmpeg-2.7:0= ) libav? ( >=media-video/libav-11:0= ) png? ( media-libs/libpng:0= ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-2.8.12
 DESCRIPTION=Lightweight video thumbnailer that can be used by file managers
-EAPI=5
+EAPI=6
 HOMEPAGE=https://github.com/dirkvdb/ffmpegthumbnailer
 IUSE=gnome gtk jpeg libav png test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
@ -9,6 +9,6 @@ LICENSE=GPL-2
 RDEPEND=gtk? ( dev-libs/glib:2= ) jpeg? ( virtual/jpeg:0= ) !libav? ( >=media-video/ffmpeg-2.7:0= ) libav? ( >=media-video/libav-11:0= ) png? ( media-libs/libpng:0= )
 REQUIRED_USE=gnome? ( gtk )
 SLOT=0
-SRC_URI=https://github.com/dirkvdb/ffmpegthumbnailer/releases/download/2.1.1/ffmpegthumbnailer-2.1.1.tar.bz2
+SRC_URI=https://github.com/dirkvdb/ffmpegthumbnailer/releases/download/2.2.0/ffmpegthumbnailer-2.2.0.tar.bz2
 _eclasses_=cmake-utils	f3d38665b0a86e08ba3a5473cdbfafd3	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=a6c7d3d2ddb045d60ef0a389cce3bbe3
+_md5_=e76bd9d27de150d7a35b2fa23ed5fe19
--- a/metadata/md5-cache/media-video/smplayer-16.11.0
+++ b/metadata/md5-cache/media-video/smplayer-16.11.0
@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux
 LICENSE=GPL-2+ BSD-2
 RDEPEND=sys-libs/zlib !qt5? ( dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtsingleapplication[X,qt4] autoshutdown? ( dev-qt/qtdbus:4 ) mpris? ( dev-qt/qtdbus:4 ) streaming? ( dev-qt/qtcore:4[ssl] dev-qt/qtscript:4 ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsingleapplication[X,qt5] dev-qt/qtwidgets:5 dev-qt/qtxml:5 autoshutdown? ( dev-qt/qtdbus:5 ) mpris? ( dev-qt/qtdbus:5 ) streaming? ( dev-qt/qtnetwork:5[ssl] dev-qt/qtscript:5 ) ) || ( media-video/mplayer[bidi?,libass,png,X] ( >=media-video/mpv-0.10.0[libass,X] streaming? ( >=net-misc/youtube-dl-2014.11.26 ) ) )
 SLOT=0
-SRC_URI=mirror://sourceforge/smplayer/smplayer-16.8.0.tar.bz2
+SRC_URI=mirror://sourceforge/smplayer/smplayer-16.11.0.tar.bz2
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	l10n	e26ea0642846685782f1813642e7ff0f	multilib	165fc17c38d1b11dac2008280dab6e80	qmake-utils	0a242e7177789b0028b4045f336dd4db	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=84abe8a8c324d7d3d5cb6f89915388e1
+_md5_=ae9496aff832f8684795ca216f97054f
--- a/metadata/md5-cache/media-video/smplayer-16.7.0
+++ b/metadata/md5-cache/media-video/smplayer-16.7.0
@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=sys-libs/zlib !qt5? ( dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtsingleapplication[X,qt4] autoshutdown? ( dev-qt/qtdbus:4 ) mpris? ( dev-qt/qtdbus:4 ) streaming? ( dev-qt/qtcore:4[ssl] dev-qt/qtscript:4 ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsingleapplication[X,qt5] dev-qt/qtwidgets:5 dev-qt/qtxml:5 autoshutdown? ( dev-qt/qtdbus:5 ) mpris? ( dev-qt/qtdbus:5 ) streaming? ( dev-qt/qtnetwork:5[ssl] dev-qt/qtscript:5 ) ) qt5? ( dev-qt/linguist-tools:5 )
-DESCRIPTION=Great Qt GUI front-end for mplayer/mpv
-EAPI=6
-HOMEPAGE=http://www.smplayer.eu/
-IUSE=autoshutdown bidi debug mpris qt5 streaming linguas_am linguas_ar linguas_ar_SY linguas_bg linguas_ca linguas_cs linguas_da linguas_de linguas_el_GR linguas_en_GB linguas_en_US linguas_es linguas_et linguas_eu linguas_fa linguas_fi linguas_fr linguas_gl linguas_he_IL linguas_hr linguas_hu linguas_id linguas_it linguas_ja linguas_ka linguas_ko linguas_ku linguas_lt linguas_mk linguas_ms_MY linguas_nl linguas_nn_NO linguas_pl linguas_pt linguas_pt_BR linguas_ro_RO linguas_ru_RU linguas_sk linguas_sl_SI linguas_sq_AL linguas_sr linguas_sv linguas_th linguas_tr linguas_uk_UA linguas_uz linguas_vi_VN linguas_zh_CN linguas_zh_TW
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux
-LICENSE=GPL-2+ BSD-2
-RDEPEND=sys-libs/zlib !qt5? ( dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtsingleapplication[X,qt4] autoshutdown? ( dev-qt/qtdbus:4 ) mpris? ( dev-qt/qtdbus:4 ) streaming? ( dev-qt/qtcore:4[ssl] dev-qt/qtscript:4 ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsingleapplication[X,qt5] dev-qt/qtwidgets:5 dev-qt/qtxml:5 autoshutdown? ( dev-qt/qtdbus:5 ) mpris? ( dev-qt/qtdbus:5 ) streaming? ( dev-qt/qtnetwork:5[ssl] dev-qt/qtscript:5 ) ) || ( media-video/mplayer[bidi?,libass,png,X] ( >=media-video/mpv-0.10.0[libass,X] streaming? ( >=net-misc/youtube-dl-2014.11.26 ) ) )
-SLOT=0
-SRC_URI=mirror://sourceforge/smplayer/smplayer-16.7.0.tar.bz2
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	l10n	e26ea0642846685782f1813642e7ff0f	multilib	165fc17c38d1b11dac2008280dab6e80	qmake-utils	0a242e7177789b0028b4045f336dd4db	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=2e41aa043735e71c73393cb04248371b
--- a/metadata/md5-cache/net-analyzer/wireshark-2.2.2
+++ b/metadata/md5-cache/net-analyzer/wireshark-2.2.2
@ -4,11 +4,11 @@ DESCRIPTION=A network protocol analyzer formerly known as ethereal
 EAPI=5
 HOMEPAGE=http://www.wireshark.org/
 IUSE=adns androiddump +caps ciscodump cpu_flags_x86_sse4_2 crypt doc doc-pdf geoip +gtk kerberos lua +netlink +pcap portaudio +qt4 qt5 sbc selinux smi libssh randpkt randpktdump sshdump ssl tfshark zlib +filecaps
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.14:2 netlink? ( dev-libs/libnl:3 ) adns? ( >=net-dns/c-ares-1.5 ) crypt? ( dev-libs/libgcrypt:0 ) caps? ( sys-libs/libcap ) geoip? ( dev-libs/geoip ) gtk? ( x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango x11-misc/xdg-utils ) kerberos? ( virtual/krb5 ) libssh? ( >=net-libs/libssh-0.6 ) lua? ( >=dev-lang/lua-5.1:* ) pcap? ( net-libs/libpcap ) portaudio? ( media-libs/portaudio ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4[accessibility] x11-misc/xdg-utils ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) smi? ( net-libs/libsmi ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 ) gtk? ( virtual/freedesktop-icon-theme ) qt4? ( virtual/freedesktop-icon-theme ) qt5? ( virtual/freedesktop-icon-theme ) selinux? ( sec-policy/selinux-wireshark )
 REQUIRED_USE=?? ( qt4 qt5 ) ciscodump? ( libssh ) sshdump? ( libssh ) ssl? ( crypt )
 SLOT=0/2.2.2
 SRC_URI=http://www.wireshark.org/download/src/all-versions/wireshark-2.2.2.tar.bz2
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	b83a2420b796f7c6eff682679d08fe25	fcaps	6a1091a98b1dde01cc26ab3252da1a9b	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	qmake-utils	0a242e7177789b0028b4045f336dd4db	qt4-r2	d6c113024bb3086a1facc65cd338930e	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87
-_md5_=c26bed5a1fa2ac3257dd7b15244c1de2
+_md5_=53f6301a21c2caf93870a018cb21a259
--- a/metadata/md5-cache/net-libs/gsoap-2.8.38
+++ b/metadata/md5-cache/net-libs/gsoap-2.8.38
@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 gSOAP
 RDEPEND=sys-libs/zlib gnutls? ( net-libs/gnutls ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) )
 SLOT=0
-SRC_URI=mirror://sourceforge/gsoap2/gsoap_2.8.36.zip
+SRC_URI=mirror://sourceforge/gsoap2/gsoap_2.8.38.zip
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
 _md5_=1885e2fbc07e19c44a62afb6c26fa04e
--- a/metadata/md5-cache/sci-astronomy/astrometry-0.67-r2
+++ b/metadata/md5-cache/sci-astronomy/astrometry-0.67-r2
@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install prepare setup test
-DEPEND=dev-python/astropy[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] sci-astronomy/wcslib:0= sci-libs/cfitsio:0= sci-libs/gsl:0= sys-libs/zlib:0= extra? ( media-libs/libpng:0 media-libs/netpbm virtual/jpeg:0 x11-libs/cairo ) dev-lang/swig:0 virtual/pkgconfig
+DEPEND=dev-python/astropy[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] media-libs/libpng:0 media-libs/netpbm sci-astronomy/wcslib:0= sci-libs/cfitsio:0= sci-libs/gsl:0= sys-libs/zlib:0= virtual/jpeg:0 x11-libs/cairo dev-lang/swig:0 virtual/pkgconfig
 DESCRIPTION=Automated astrometric calibration programs and service
 EAPI=6
 HOMEPAGE=http://astrometry.net/
-IUSE=examples extra python_targets_python2_7
+IUSE=examples python_targets_python2_7
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD GPL-2 GPL-3
-RDEPEND=dev-python/astropy[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] sci-astronomy/wcslib:0= sci-libs/cfitsio:0= sci-libs/gsl:0= sys-libs/zlib:0= extra? ( media-libs/libpng:0 media-libs/netpbm virtual/jpeg:0 x11-libs/cairo )
+RDEPEND=dev-python/astropy[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] media-libs/libpng:0 media-libs/netpbm sci-astronomy/wcslib:0= sci-libs/cfitsio:0= sci-libs/gsl:0= sys-libs/zlib:0= virtual/jpeg:0 x11-libs/cairo
 SLOT=0
-SRC_URI=http://astrometry.net//downloads/astrometry.net-0.67.tar.gz
+SRC_URI=https://github.com/dstndstn/astrometry.net/releases/download/0.67/astrometry.net-0.67.tar.gz
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=7d25825ee3cbf7babdc80f7bee6c5fc9
+_md5_=dea604c93ef309dcc9a80b4ef33a9d5b
--- a/metadata/md5-cache/sci-astronomy/esomidas-15.09
+++ b/metadata/md5-cache/sci-astronomy/esomidas-15.09
@ -9,4 +9,4 @@ RDEPEND=sys-libs/readline:0= x11-libs/motif:0= x11-libs/libX11:= x11-libs/libXt:
 SLOT=0/8
 SRC_URI=ftp://ftp.eso.org/pub/midaspub/15SEP/sources/15SEPpl1.0.tar.gz -> esomidas-15.09.tar.gz
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	fortran-2	8200fc942c3b3c1fc75d4d5bfd0ba7a2	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=235c70d5e0e03c386fa4edde90c7930d
+_md5_=35c52455183864891c1f7a20e9e5e2c8
--- a/metadata/md5-cache/x11-drivers/xf86-video-amdgpu-0.0.01_pre20150814
+++ b/metadata/md5-cache/x11-drivers/xf86-video-amdgpu-0.0.01_pre20150814
@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libdrm[video_cards_amdgpu] x11-base/xorg-server[glamor(-)?] !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 virtual/pkgconfig x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess
-DESCRIPTION=Accelerated Open Source driver for AMDGPU cards
-EAPI=5
-HOMEPAGE=http://xorg.freedesktop.org/
-IUSE=glamor
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=x11-libs/libdrm[video_cards_amdgpu] x11-base/xorg-server[glamor(-)?] x11-base/xorg-server:= x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess
-SLOT=0
-SRC_URI=mirror://gentoo/xf86-video-amdgpu-0.0.01_pre20150814.tar.xz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xorg-2	b41f09eee8d441f780b7413dba7e120b
-_md5_=335b9f78db6037f109b3e57281859aad
--- a/metadata/md5-cache/x11-drivers/xf86-video-amdgpu-1.2.0
+++ b/metadata/md5-cache/x11-drivers/xf86-video-amdgpu-1.2.0
@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=x11-libs/libdrm[video_cards_amdgpu] x11-base/xorg-server[glamor(-)?] x11-base/xorg-server:= x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess
 SLOT=0
-SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-amdgpu-1.0.1.tar.bz2
+SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-amdgpu-1.2.0.tar.bz2
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xorg-2	b41f09eee8d441f780b7413dba7e120b
 _md5_=0f939fd0d9732dc7770f27dcd9bd247f
--- a/metadata/md5-cache/x11-drivers/xf86-video-ati-6.14.6-r1
+++ b/metadata/md5-cache/x11-drivers/xf86-video-ati-6.14.6-r1
@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=x11-libs/libdrm-2.4.36[video_cards_radeon] !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 virtual/pkgconfig x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess
-DESCRIPTION=ATI video driver
-EAPI=4
-HOMEPAGE=http://xorg.freedesktop.org/
-KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=MIT
-RDEPEND=>=x11-libs/libdrm-2.4.36[video_cards_radeon] x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess
-SLOT=0
-SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-ati-6.14.6.tar.bz2
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xorg-2	b41f09eee8d441f780b7413dba7e120b
-_md5_=8fe60199e252519956dd85d65c516f42
--- a/metadata/md5-cache/x11-drivers/xf86-video-ati-7.8.0
+++ b/metadata/md5-cache/x11-drivers/xf86-video-ati-7.8.0
@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
+DEPEND=>=x11-libs/libdrm-2.4.58[video_cards_radeon] >=x11-libs/libpciaccess-0.8.0 glamor? ( x11-base/xorg-server[glamor] ) udev? ( virtual/udev ) x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xf86driproto x11-proto/xproto !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig x11-proto/xf86driproto x11-proto/glproto x11-proto/dri2proto x11-proto/fontsproto x11-proto/randrproto x11-proto/renderproto x11-proto/videoproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess
+DESCRIPTION=ATI video driver
+EAPI=5
+HOMEPAGE=http://www.x.org/wiki/ati/
+IUSE=+glamor udev
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+LICENSE=MIT
+RDEPEND=>=x11-libs/libdrm-2.4.58[video_cards_radeon] >=x11-libs/libpciaccess-0.8.0 glamor? ( x11-base/xorg-server[glamor] ) udev? ( virtual/udev ) x11-base/xorg-server:= x11-base/xorg-server[-minimal] x11-libs/libdrm x11-base/xorg-server[xorg] x11-libs/libpciaccess
+SLOT=0
+SRC_URI=http://xorg.freedesktop.org/releases/individual/driver/xf86-video-ati-7.8.0.tar.bz2
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xorg-2	b41f09eee8d441f780b7413dba7e120b
+_md5_=1f78682b207d0445f5bec8e9f5a2f96a
--- a/metadata/md5-cache/x11-misc/qlipper-5.0.0
+++ b/metadata/md5-cache/x11-misc/qlipper-5.0.0
@ -9,4 +9,4 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 x11-libs/libX11
 SLOT=0
 SRC_URI=https://github.com/pvanek/qlipper/archive/5.0.0.tar.gz -> qlipper-5.0.0.tar.gz
 _eclasses_=cmake-utils	f3d38665b0a86e08ba3a5473cdbfafd3	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=1cecac449e4f74d323c6bc083a84ea08
+_md5_=c0c96a446c1a7f9c8203e1414d50ecc0
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@ -1 +1 @@
-Thu, 17 Nov 2016 12:43:13 +0000
+Thu, 17 Nov 2016 18:43:17 +0000
--- a/metadata/timestamp
+++ b/metadata/timestamp
@ -1 +1 @@
-Thu Nov 17 12:39:24 UTC 2016
+Thu Nov 17 18:39:25 UTC 2016
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@ -1 +1 @@
-Thu, 17 Nov 2016 13:00:01 +0000
+Thu, 17 Nov 2016 19:00:01 +0000
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@ -1 +1 @@
-1479386401 Thu 17 Nov 2016 12:40:01 PM UTC
+1479408001 Thu 17 Nov 2016 06:40:01 PM UTC
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@ -1 +1 @@
-Thu, 17 Nov 2016 12:43:13 +0000
+Thu, 17 Nov 2016 18:43:16 +0000
--- a/net-analyzer/wireshark/wireshark-2.2.2.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.2.2.ebuild
@ -11,7 +11,7 @@ SRC_URI="${HOMEPAGE}download/src/all-versions/${P/_/}.tar.bz2"

 LICENSE="GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="
 	adns androiddump +caps ciscodump cpu_flags_x86_sse4_2 crypt doc doc-pdf
 	geoip +gtk kerberos lua +netlink +pcap portaudio +qt4 qt5 sbc selinux smi
--- a/net-libs/gsoap/Manifest
+++ b/net-libs/gsoap/Manifest
@ -1,4 +1,4 @@
 DIST gsoap_2.7.17.zip 10224444 SHA256 d3af1ce9464b28cacdf1dfbe09b689f8927cbcf3948479996aef52a39afa2c16 SHA512 efb5332e90cbed6013ac2f16b940404cc4de9e84bc85e671cb3588bc6620cd86c8db646a4f3cd77bb3b866dfcc8a793186736ab2241bb8cbaca8d313345d14ac WHIRLPOOL 955e845b5a8b9af1697ca8bcdbb77813f149f7ff162ec51e680c398dab9934c36418572004b7bd24200476b6d45b623f294053b932da2fce94f415becd369af7
 DIST gsoap_2.8.23.zip 22482000 SHA256 e1c30743f1c2cf40b2760568127e14af1b2a00c3026b2e5f0750e8c33d94c061 SHA512 cc90aadfe09aa6406172c9ffa07696851ff594ca7c5b40819494badd8ce978d908d66de63a5831e7aec1bca18ee8b51ed02187057688a3b36eb0a21fe6e0f5a4 WHIRLPOOL e5cfc9c5758847d1fc94cbd38108b80c7548abc0316fe201b58604a3b22d30b9748c81d4aec13f53356593f3ddc2dcba14170a53d63795eab9229ec49d4bc585
-DIST gsoap_2.8.36.zip 33403319 SHA256 20f70db768062e094ec3749073bfc4103cacaac8cab2cdbd624634ae496eef21 SHA512 6ebe479b91a1df92a7ac9019762d0a225f255ce9a772d56a50bccfe9b16645d1ee3bb38e4d2dd2fd960a3f9feee152204158e8002813db8d9ed6b2453c096287 WHIRLPOOL eef71f207e0b1665b50111f18245d1aea057464d198c0e448661503ceea17885d5d39b8030d1becfbc94598149559f9161c1e09bb764e0e8a5dc9176c3afb5fb
 DIST gsoap_2.8.37.zip 33414035 SHA256 a3cb4807151b9a3f8e019a633e3109f5cb644a6178d8f51b7e2a38c71f2c6edb SHA512 b131e4fb45933566b1b35038a375daf9f13ec1e4f4a42fcfdfab12bab8190ca0c73a6e664c1723d23f81b8ebce01de153636f7cc9e19df167954cffb73a38199 WHIRLPOOL 93fff8ab2e73663974873bb5d193b77b40c58c0e4852fbd20552fc0c52173a698a8adf01a5687552acc13c16edd769f13007f742ef081a6948f1157ecebae73a
+DIST gsoap_2.8.38.zip 33516822 SHA256 354167c54bb55517afd2cc625a0bd35dd33e2a24c62cf178b1be046ae63bee8c SHA512 7bd561f5cb4290c52051c5cee353fad3ef9df012794cae57c9c4b7aa56458a9b6c245fe6ee713e271466a08f15a10c00e30f44bb2f5d3b02bbc8c721166a9455 WHIRLPOOL 3e984e0011daef1e09536efedf9f9ec079ac794f44e2ddccdfa66c2e920057bb990a24eaecb54d81412be9f6cc7a8ba554761e3ae47fafcb8f636744207d4f0b
--- a/net-libs/gsoap/gsoap-2.8.38.ebuild
+++ b/net-libs/gsoap/gsoap-2.8.38.ebuild
--- a/profiles/arch/amd64/package.use
+++ b/profiles/arch/amd64/package.use
@ -2,6 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

+# Mike Gilbert <floppym@gentoo.org> (17 Nov 2016)
+# Enable both efi and pc by default.
+# https://bugs.gentoo.org/600110
+sys-boot/grub:2 grub_platforms_efi-64 grub_platforms_pc
+
 # Michał Górny <mgorny@gentoo.org> (24 Sep 2016)
 # Enable the GPU targets matching the default VIDEO_CARDS
 sys-devel/clang llvm_targets_AMDGPU llvm_targets_NVPTX
--- a/profiles/arch/ia64/package.use.mask
+++ b/profiles/arch/ia64/package.use.mask
@ -112,10 +112,6 @@ dev-libs/libpeas lua jit
 dev-libs/efl physics sdl
 media-libs/elementary sdl

-# Michał Górny <mgorny@gentoo.org> (08 Mar 2015)
-# Dependency not keyworded on this arch, bug #542570.
-xfce-base/xfce4-settings libinput
-
 # Alexis Ballier <aballier@gentoo.org> (11 Feb 2015)
 # Missing ffmpeg deps, bug #510340
 media-video/ffmpeg x265 gme ssh
--- a/profiles/arch/ia64/use.stable.mask
+++ b/profiles/arch/ia64/use.stable.mask
@ -5,10 +5,6 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in use.mask

-# Brian Evans <grknight@gentoo.org> (24 Oct 2016)
-# Remove when x11-drivers/xf86-input-libinput is stable
-input_devices_libinput
-
 # Not stable
 mkl

--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@ -6711,7 +6711,6 @@ net-wireless/yatebts:bladerf - Build bladeRF transceiver
 net-wireless/yatebts:rad1 - Build RAD1 transceiver
 net-wireless/yatebts:uhd - Build UHD transceiver
 net-wireless/yatebts:usrp1 - Build USRP1 transceiver
-sci-astronomy/astrometry:extra - Add extra tools for astrometry.net, specifically for plots
 sci-astronomy/casacore:c++11 - Build casacore using the C++11 standard
 sci-astronomy/casacore:data - Installs measures and data (pulls sci-astronomy/casa-data)
 sci-astronomy/cpl:gasgano - Enable support for sci-astronomy/gasgano file organizer
--- a/sci-astronomy/astrometry/astrometry-0.67-r2.ebuild
+++ b/sci-astronomy/astrometry/astrometry-0.67-r2.ebuild
@ -12,25 +12,24 @@ MYP=${PN}.net-${PV}

 DESCRIPTION="Automated astrometric calibration programs and service"
 HOMEPAGE="http://astrometry.net/"
-SRC_URI="${HOMEPAGE}/downloads/${MYP}.tar.gz"
+SRC_URI="https://github.com/dstndstn/astrometry.net/releases/download/${PV}/${MYP}.tar.gz"

 LICENSE="BSD GPL-2 GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples extra"
+IUSE="examples"

 RDEPEND="
 	dev-python/astropy[${PYTHON_USEDEP}]
 	dev-python/numpy[${PYTHON_USEDEP}]
+	media-libs/libpng:0
+	media-libs/netpbm
 	sci-astronomy/wcslib:0=
 	sci-libs/cfitsio:0=
 	sci-libs/gsl:0=
 	sys-libs/zlib:0=
-	extra? (
-		media-libs/libpng:0
-		media-libs/netpbm
-		virtual/jpeg:0
-		x11-libs/cairo )"
+	virtual/jpeg:0
+	x11-libs/cairo"
 DEPEND="${RDEPEND}
 	dev-lang/swig:0
 	virtual/pkgconfig"
@ -38,8 +37,9 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${MYP}"

 PATCHES=(
-	"${FILESDIR}/${P}-soname.patch"
-	"${FILESDIR}/${P}-dynlink.patch"
+	"${FILESDIR}"/${P}-soname.patch
+	"${FILESDIR}"/${P}-dynlink.patch
+	"${FILESDIR}"/${P}-qsortr.patch
 )

 src_prepare() {
@ -54,15 +54,16 @@ src_prepare() {
 	# respect use compilation flags
 	sed -e '/-O3/d' -e '/-fomit-frame-pointer/d' -i util/makefile.common || die
 	# as-needed
-	sed -e "s|-lm|$(pkg-config --libs wcslib gsl)|" -i util/Makefile || die
+	sed -e "s|-lm|-lm $($(tc-getPKG_CONFIG) --libs wcslib gsl)|" -i util/Makefile || die
 	export SYSTEM_GSL=yes
 }

 src_compile() {
 	tc-export CC RANLIB AR
+	# fragile makefiles, build targets sequentially
 	emake
 	emake py
-	use extra && emake extra
+	emake extra
 	emake report.txt
 }

@ -78,30 +79,29 @@ src_test() {

 ap_make() {
 	emake \
-		INSTALL_DIR="${ED}usr" \
-		DATA_INSTALL_DIR="${ED}usr/share/astrometry" \
-		LIB_INSTALL_DIR="${ED}usr/$(get_libdir)" \
-		ETC_INSTALL_DIR="${ED}etc" \
-		MAN1_INSTALL_DIR="${ED}usr/share/man/man1" \
-		DOC_INSTALL_DIR="${ED}usr/share/doc/${PF}" \
-		EXAMPLE_INSTALL_DIR="${ED}usr/share/doc/${PF}/examples" \
-		PY_BASE_INSTALL_DIR="${ED}$(python_get_sitedir)/astrometry" \
+		INSTALL_DIR="${ED%/}/usr" \
+		DATA_INSTALL_DIR="${ED%/}/usr/share/astrometry" \
+		LIB_INSTALL_DIR="${ED%/}/usr/$(get_libdir)" \
+		ETC_INSTALL_DIR="${ED%/}/etc" \
+		MAN1_INSTALL_DIR="${ED%/}/usr/share/man/man1" \
+		DOC_INSTALL_DIR="${ED%/}/usr/share/doc/${PF}" \
+		EXAMPLE_INSTALL_DIR="${ED%/}/usr/share/doc/${PF}/examples" \
+		PY_BASE_INSTALL_DIR="${ED%/}$(python_get_sitedir)/astrometry" \
 		PY_BASE_LINK_DIR="../$(python_get_sitedir | sed -e 's|/usr/||')/astrometry" \
-		FINAL_DIR="${EPREFIX}usr" \
-		DATA_FINAL_DIR="${EPREFIX}usr/share/astrometry" \
+		FINAL_DIR="${EPREFIX%/}/usr" \
+		DATA_FINAL_DIR="${EPREFIX%/}/usr/share/astrometry" \
 		$@
 }

 src_install() {
 	ap_make install-core
 	ap_make -C util install
-	use extra && ap_make -C blind install-extra
+	ap_make -C blind install-extra

-	# remove cfitsio duplicates and non installable libraries
+	# remove duplicates and non installable libraries
 	rm "${ED}"/usr/bin/{fitscopy,imcopy,listhead} || die
 	rm "${ED}"/usr/$(get_libdir)/lib*.a || die
-
-	# remove license file
 	rm "${ED}"/usr/share/doc/${PF}/LICENSE || die
+
 	use examples || rm -r "${ED}"/usr/share/doc/${PF}/examples
 }
--- a/sci-astronomy/astrometry/files/astrometry-0.67-qsortr.patch
+++ b/sci-astronomy/astrometry/files/astrometry-0.67-qsortr.patch
@ -0,0 +1,10 @@
+--- a/util/test_qsort_r.c	2016-11-17 00:21:29.211561563 +0000
+++ b/util/test_qsort_r.c	2016-11-17 00:21:43.281493095 +0000
+@@ -5,6 +5,7 @@
+ #include <stdio.h>
+ #include <string.h>
+ #include <stdarg.h>
+#include <stdlib.h>
+ 
+ #include "cutest.h"
+ 
--- a/sci-astronomy/astrometry/metadata.xml
+++ b/sci-astronomy/astrometry/metadata.xml
@ -12,7 +12,7 @@
  calibration meta-data, plus lists of known objects falling inside
  the field of view.
 </longdescription>
-  <use>
-    <flag name="extra">Add extra tools for astrometry.net, specifically for plots</flag>
-  </use>
+<upstream>
+  <remote-id type="github">dstndstn/astrometry.net</remote-id>
+</upstream>
 </pkgmetadata>
--- a/sci-astronomy/esomidas/esomidas-15.09.ebuild
+++ b/sci-astronomy/esomidas/esomidas-15.09.ebuild
@ -34,10 +34,12 @@ PATCHES=(
 	"${FILESDIR}/${PN}-fitswdb.patch"
 	"${FILESDIR}/${PN}-fitswdm_c.patch"
 	"${FILESDIR}/${PN}-log-stdout.patch"
+	"${FILESDIR}/${PN}-madrid.patch"
 	"${FILESDIR}/${PN}-manpages.patch"
 	"${FILESDIR}/${PN}-mdb_put.patch"
 	"${FILESDIR}/${PN}-no-sp_pty.patch"
 	"${FILESDIR}/${PN}-no-strip.patch"
+	"${FILESDIR}/${PN}-nonlinux.patch"
 	"${FILESDIR}/${PN}-rarthm_for.patch"
 	"${FILESDIR}/${PN}-selechar_c.patch"
 	"${FILESDIR}/${PN}-system-readline.patch"
--- a/sci-astronomy/esomidas/files/esomidas-madrid.patch
+++ b/sci-astronomy/esomidas/files/esomidas-madrid.patch
@ -0,0 +1,25 @@
+Author: Ole Streicher <olebole@debian.org>
+Description: Fix size of MADRID array in test
+ When gfortran-6 is called with an optimization (-O1 or higher), arrays with a
+ length 1 seem to be converted to a scalar and assumed to always return the same
+ value.
+ .
+ This fails with the MADRID array, which is a placeholder for an array.
+ Specifically ftoc_commf.for fails then, which leads to a missing ftoc_comm.h.
+ .
+ The simple workaround is to use a size > 1 here.
+ .
+ Note that the MADRID array is defined with a length=1 in ~350 places all over
+ eso-midas. They are not changed yet since the verification succeeds. If we get
+ strange bugreports, this may be considered as the problem.
+--- a/system/ftoc-new/ftoc_commf.for
+++ b/system/ftoc-new/ftoc_commf.for
+@@ -34,7 +34,7 @@
+ C
+       PROGRAM F2CCOM
+ C 
+-      INTEGER    MADRID(1)
+      INTEGER    MADRID(3)
+       INTEGER    VALUE(3)
+       INTEGER    STAT,MANY,NOPIX,NOBYT
+       INTEGER*8    PNTR
--- a/sci-astronomy/esomidas/files/esomidas-nonlinux.patch
+++ b/sci-astronomy/esomidas/files/esomidas-nonlinux.patch
@ -0,0 +1,23 @@
+Author: Ole Streicher <olebole@debian.org>
+Description: Fixes for non-linux (kFreeBSD, Hurd)
+--- a/system/unix/inmidas
+++ b/system/unix/inmidas
+@@ -425,7 +425,7 @@
+ #
+ os=`uname`
+ case "$os" in
+-    "SunOS"|"Linux")
+    SunOS|Linux|GNU|GNU/*)
+ 	if [ -z "$LD_LIBRARY_PATH" ] ; then
+ 	  LD_LIBRARY_PATH=$MIDASHOME/$MIDVERS/lib
+ 	else
+--- a/test/prim/veriall.prg
+++ b/test/prim/veriall.prg
+@@ -204,6 +204,7 @@
+       write/keyw in_b MID_WORK:veriall_{out_b(1:{inputi})}.{inputc}
+    endif
+ endif
+write/keyw in_b  MID_WORK:veriall_debian.{inputc}
+ open/file {in_b} write  fc
+ if fc(1) .lt. 0 then
+    write/out Could not create file: "MID_WORK:veriall_{out_b}.{inputc} ..."
--- a/x11-drivers/xf86-video-amdgpu/Manifest
+++ b/x11-drivers/xf86-video-amdgpu/Manifest
@ -1,4 +1,3 @@
-DIST xf86-video-amdgpu-0.0.01_pre20150814.tar.xz 58024 SHA256 5654e22fcb051e04f5862576c84e8e7ab765f1097586874d3be75fefd49e159c SHA512 4885f92febd6ab1663c3b27b7db8af98eaa0d7f4c91c65e7ce8d9a8756ea0a051c65183d2d5fec3ed29b90d18de4bb81956bf585128f417a7e4471a12e2e9222 WHIRLPOOL 9b98505f0f9823661c084eaaad2e91bb2fb0956c07cf0cf22f6e4849ad9464134417f7caef9ab92c34e7881a24fabe8e6caa55300eebb3d887b04b150d42495d
-DIST xf86-video-amdgpu-1.0.1.tar.bz2 374443 SHA256 730fb959fc7a96643df10dc500bb645a94ac98fdfe021172a537a57c9cb3915e SHA512 ebc5822c615cb2ca9a058b222d3425a6d387b008ad9918454045a66b3985c596cba7df414972b99c1d30711b3c74739e6d74ab62ec25c469d880e0adcf833f80 WHIRLPOOL dc5a576bfea4a04152b7a745d913fdc317f0fd13df73a37a1909968eaea8edc0fff71cc71023e9fd74c60fed7976cfca58c221c55893026e858973970e9236a7
 DIST xf86-video-amdgpu-1.1.0.tar.bz2 379970 SHA256 69f5d0ded9f4d5ce529099b6b581268e8f4dcff5608f1441d4ebc110ebc57931 SHA512 a795a048987de49a9a4809ed6efd6089c0685290b86b61156ae0766fa86934f99c8abf61ed8ca56cc215a84931b2f68431547a1a7250a09e1649c4ac8ada870e WHIRLPOOL dcdbbc17efcec2bbc79093e06ed3ba06ec53d264ca937b245cf3d367709aa2efa41523fff020586c334b56b7908f34598a3c9aff02fe189251da2561241c12d7
 DIST xf86-video-amdgpu-1.1.2.tar.bz2 383690 SHA256 6ee87fed6d70d12353ca7ac02f8321a30d770626bf56f62f0e27970a33690779 SHA512 c381120000ba7ec1651f01e77e4093ccb939eb0e8925ea76532d6204b1072f3240cef412136ac4cf2a67268dfa9fda9bb455fe29874a4fd4a3be07d9a04b17ba WHIRLPOOL a8635d6624971d1459de50f5376da2f11eb5b970cddab5fa8ff14744e0b02eb18af7bfe737d09d3a68aa3c5f196fc45261bbf8c66d053775cf0ea53a48f20aa4
+DIST xf86-video-amdgpu-1.2.0.tar.bz2 388108 SHA256 275b1aac5f127f55ba3d7480a1df89eace1d02650e24e46908067fc875e76c8f SHA512 92253848e81e41ec971f0a706639eda4b5231b6944148e21bc0f58ac1d10b963a76a5f10f8ca7ec4b3a631306636ec31efa3e62433f5b95ebdb26e2b0561d0f2 WHIRLPOOL 5437497626f443abda8bdc1d98fea5e0b37874ccd81150b8299a8d5c6393e67e1829c4b14cb017a415da5f7d500f475bc4accc9b8a7d9eaf0dfcf98147c24dcd
--- a/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-0.0.01_pre20150814.ebuild
+++ b/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-0.0.01_pre20150814.ebuild
@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-XORG_DRI="always"
-XORG_EAUTORECONF=yes
-inherit xorg-2
-
-if [[ ${PV} == 9999* ]]; then
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="mirror://gentoo/${P}.tar.xz"
-	KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="Accelerated Open Source driver for AMDGPU cards"
-
-IUSE="glamor"
-
-RDEPEND="x11-libs/libdrm[video_cards_amdgpu]
-	x11-base/xorg-server[glamor(-)?]"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	XORG_CONFIGURE_OPTIONS="$(use_enable glamor)"
-	xorg-2_src_configure
-}
--- a/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-1.2.0.ebuild
+++ b/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-1.2.0.ebuild
--- a/x11-drivers/xf86-video-ati/Manifest
+++ b/x11-drivers/xf86-video-ati/Manifest
@ -1,5 +1,5 @@
-DIST xf86-video-ati-6.14.6.tar.bz2 1139495 SHA256 aa5286b3e4f0187d7df14785c06dd800255d9405205dbf061da5d77df86bec36 SHA512 7ed64bb3596703f7c575aec37a6918bac251819fe638acc66a29aab7648d8a81dedd8d416f970faa1f757fa8e9e3ccdc43e4499d06271cc2751288040d1d957e WHIRLPOOL 9b72e873c3108daeb10cfc68523eb9bc2c12f5525096f9a2639a7dbeb58fd2912b474b8820172ffc9351458d2e046b43e0d064bb4f4189bb99b06a995f3204e8
 DIST xf86-video-ati-7.5.0.tar.bz2 809756 SHA256 ec3e6f06b6cf9a40c72aafa3448aae8b034c80b37410ca9442d5cf6806e07936 SHA512 51ea3934285c579314614e336cee0d5c079a466cdc94f2c8649d9499515af3dfb37a7ac87ed69c6dbf6befa5bfca27f8305bbc028ff722e2f87143da5f101f7c WHIRLPOOL ba132708f423cebde7398cc6c9c18334a544ebaef4a60104ea27abeb4afa4a01b9a3dffa00c89e01a6cbf858cc410041d102c8327bc2167ebca5e941d4463f23
 DIST xf86-video-ati-7.6.1.tar.bz2 823043 SHA256 2516d9eeb8da8bcd3a01365ed1314919777910fa904ab268af342b5693e1d34c SHA512 b829b1db2088161a2486f396a9b36afd6fbbc765fb495450fb1c2de33951e6270c7ef6665c8275c66dfc6509af71b9882c342d236fc0537ff0dde117683c4891 WHIRLPOOL 91787a77590fbbf30b73fd1c4f7e427ea3eee25b4ba16f52ae2d9d0967b596b33a2bb04bbc8edc83baf48db6cabb459cf81b43da644dd0c1ee415fc650105ffc
 DIST xf86-video-ati-7.7.0.tar.bz2 836902 SHA256 844d1c577b145c90dc8ef027678f0c27f554363f782cd696a3aea26415b2c1c3 SHA512 002ae681c35c8293d7b11b1fe7ec7fad569a18bcb2091ae54e682de3878ffc681780d802a450f51cf4bcb81a7f137fb6b1c739c467e8f15f4ab8640fb2e472df WHIRLPOOL 69552ee1d715eaf9c0f65da15aa7d0cc1a2a2befe1d8c098b7a8ead11e7201c90b39a9e87811d59026af335532be2da62fe0deb784f8c8c509addcdaf33a5414
 DIST xf86-video-ati-7.7.1.tar.bz2 837869 SHA256 00a58588db62ee309095c5c5920bbd248d965e8627f88affe68a73b18865078d SHA512 d8d05b59165cf835231694f190d7fd35d30e28f155d54a537b6ef4c6e60b15099a10d9f2ba4bd13ad9773248a7c3e8099703750129d758cb9c4478ec52d5a1ad WHIRLPOOL 02f8bb7d070042065fdacc4affdb9a1aaef59a827f4feecd590df011e629887a60427ad51d49aa6195118c9520e239e76c393986fb50e8d54afc39ad17c09e72
+DIST xf86-video-ati-7.8.0.tar.bz2 845702 SHA256 401f5de772928f3dc4ce43a885adb0a47a2f61aa4a9e45d2ab3d184136a9d6fa SHA512 e09b7aca819656359d32b11f4314f2ad77b7a28d481b2cf17ea62f2e2385f9b40f568d5c76360c800c60c00671f0262277cdefde4c0744f2ed9b3b2fa90a37a9 WHIRLPOOL b5e8a4cf546bb56f1e481e9dc7da8dc850c4fb231d10c592a7e2ffbfb9da0a64edb1b208b326283a6a94e4c0c5aefe5e4a04a984475e7ac5a5bab757ad0f990b
--- a/x11-drivers/xf86-video-ati/xf86-video-ati-6.14.6-r1.ebuild
+++ b/x11-drivers/xf86-video-ati/xf86-video-ati-6.14.6-r1.ebuild
@ -1,32 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-XORG_DRI=always
-XORG_EAUTORECONF=yes
-inherit xorg-2
-
-DESCRIPTION="ATI video driver"
-
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=x11-libs/libdrm-2.4.36[video_cards_radeon]"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	# disable XAA to allow building against >=xorg-server-1.12.99.902, bug #428094
-	sed -i '/USE_XAA, 1/d' configure.ac || die
-	xorg-2_src_prepare
-}
-
-pkg_setup() {
-	xorg-2_pkg_setup
-	XORG_CONFIGURE_OPTIONS=(
-		--enable-dri
-		--enable-kms
-		--enable-exa
-	)
-}
--- a/x11-drivers/xf86-video-ati/xf86-video-ati-7.8.0.ebuild
+++ b/x11-drivers/xf86-video-ati/xf86-video-ati-7.8.0.ebuild
@ -0,0 +1,46 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_DRI=always
+inherit linux-info xorg-2
+
+DESCRIPTION="ATI video driver"
+HOMEPAGE="http://www.x.org/wiki/ati/"
+
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+IUSE="+glamor udev"
+
+RDEPEND=">=x11-libs/libdrm-2.4.58[video_cards_radeon]
+	>=x11-libs/libpciaccess-0.8.0
+	glamor? ( x11-base/xorg-server[glamor] )
+	udev? ( virtual/udev )"
+DEPEND="${RDEPEND}
+	x11-proto/fontsproto
+	x11-proto/randrproto
+	x11-proto/renderproto
+	x11-proto/videoproto
+	x11-proto/xextproto
+	x11-proto/xf86driproto
+	x11-proto/xproto"
+
+pkg_pretend() {
+	if use kernel_linux ; then
+		if kernel_is -ge 3 9; then
+			CONFIG_CHECK="~!DRM_RADEON_UMS ~!FB_RADEON"
+		else
+			CONFIG_CHECK="~DRM_RADEON_KMS ~!FB_RADEON"
+		fi
+	fi
+	check_extra_config
+}
+
+src_configure() {
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable glamor)
+		$(use_enable udev)
+	)
+	xorg-2_src_configure
+}
--- a/x11-misc/qlipper/files/qlipper-5.0.0-build.patch
+++ b/x11-misc/qlipper/files/qlipper-5.0.0-build.patch
@ -0,0 +1,54 @@
+From b3cb6a08c82deacb905459b66f16eda35f0c3779 Mon Sep 17 00:00:00 2001
+From: Michael Palimaka <kensington@gentoo.org>
+Date: Wed, 9 Nov 2016 21:42:08 +1100
+Subject: [PATCH] Fix build with ENABLE_NETWORK_CLIPBOARD_SHARING enabled.
+
+qlippernetwork.cpp expects network-related variables to be available if
+ENABLE_NETWORK_CLIPBOARD_SHARING is defined, but qlippernetwork.h defined those
+variables if ENABLE_NETWORK_CLIPBOARD_SHARING was *un*defined.
+
+This also adds a missing include that is no longer available transitively via
+QtNetwork/QUdpSocket.
+---
+ src/qlippernetwork.h | 4 ++--
+ src/qlippertypes.h   | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/qlippernetwork.h b/src/qlippernetwork.h
+index 9163cf8..ce1ac9a 100644
+--- a/src/qlippernetwork.h
+++ b/src/qlippernetwork.h
+@@ -21,7 +21,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
+ #define QLIPPERNETWORK_H
+ 
+ #include <QtCore/QObject>
+-#ifndef ENABLE_NETWORK_CLIPBOARD_SHARING
+#ifdef ENABLE_NETWORK_CLIPBOARD_SHARING
+ #include <QtNetwork/QUdpSocket>
+ #endif
+ #include "qlippertypes.h"
+@@ -38,7 +38,7 @@ public slots:
+     void sendData(const ClipboardContent &value);
+ 
+ private:
+-#ifndef ENABLE_NETWORK_CLIPBOARD_SHARING
+#ifdef ENABLE_NETWORK_CLIPBOARD_SHARING
+     QUdpSocket *m_socket;
+     QString m_id;
+ #endif
+diff --git a/src/qlippertypes.h b/src/qlippertypes.h
+index b55f0e1..c97c311 100644
+--- a/src/qlippertypes.h
+++ b/src/qlippertypes.h
+@@ -2,7 +2,7 @@
+ #define QLIPPERTYPES_H
+ 
+ #include <QMetaType>
+-
+#include <QHashIterator>
+ 
+ typedef QHash<QString,QByteArray> ClipboardContent;
+ typedef QHashIterator<QString,QByteArray> ClipboardContentIterator;
+-- 
+2.7.3
+
--- a/x11-misc/qlipper/qlipper-5.0.0.ebuild
+++ b/x11-misc/qlipper/qlipper-5.0.0.ebuild
@ -26,6 +26,8 @@ DEPEND="${RDEPEND}
 	dev-qt/linguist-tools:5
 "

+PATCHES=( "${FILESDIR}/${P}-build.patch" )
+
 pkg_preinst() {
 	gnome2_icon_savelist
 }
				`@ -0,0 +1 @@`
				`DIST drone-ui-0_pre20161007.tar.gz 157594 SHA256 47522662f82a0a0cb4f447016b575072b8ce54dd4bc9e532c8e058f442be410e SHA512 eeb69c3fa683773a96593563225b9b34a14ea4e570b56daf7b78fa956538d8cf71152b4badd00db8c0f1194972f67ab7cebdd62fb6feccacae4c9447f5250723 WHIRLPOOL fe2d51c3864247a4d3975c81131272d686ac071532aa1261e0b647e522db12e58e3e900f4cb2499e77fa246a1da1401846e45c4a3afcf0737ac841fa47a4dce1`