Sync with portage [Sun Mar 13 23:34:16 MSK 2016].

8 years ago · 6e13d9c846
parent 93e954fd8f
commit 6e13d9c846
2584 changed files with 18067 additions and 13666 deletions
--- a/app-admin/calamares/Manifest
+++ b/app-admin/calamares/Manifest
@ -1 +1 @@
-DIST calamares-1.1.2.tar.gz 3642991 SHA256 6adf5777f51998a88b19f37c3dd4bb8256be4464106ffbd5d1393ef67109d49c SHA512 567bfae24691576fb814297d7db66f61b39a639b71b2191defb43fd0d2e56b9ccf70dfd666e1fd1faaa1b954c349aea96ad2b5d1b5d59bdc5a351cde6bbdcea6 WHIRLPOOL e6b88ec952d31088c138a6467b98bd66f739ee48daf7689b5e8356274565beddd602ae02df559d6aa9f6483f797da3b7e284d04071eb3e54cf7b8679abe3730a
+DIST calamares-2.1.tar.gz 2000234 SHA256 77bfdc8fe202cd1c068680d41d3df113bd9ee28362aeded63a113bdbaa76d362 SHA512 3e90376ea7d7cc2d2bf6d7b5efffcd74c486c366964bb25e9d7243a2139f5b04007de28a1c5d60463342ed4ad2beda60360a9f117ab94aee20cb49e3d2202bb6 WHIRLPOOL d8934c6043278f292f1b4dbad14038f9afc66d77bd089fb9258dbb080d2a4a5dddea03a3527a056856413ce8f18d0af8c77287147ffd5e38231a290249d43b22
--- a/app-admin/calamares/calamares-1.1.2-r1.ebuild
+++ b/app-admin/calamares/calamares-1.1.2-r1.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

 PYTHON_COMPAT=( python{3_3,3_4} )
 inherit kde5 python-r1
@ -26,8 +26,10 @@ DEPEND="${PYTHON_DEPS}
 	>=dev-cpp/yaml-cpp-0.5.1
 	>=dev-libs/boost-1.55:=[${PYTHON_USEDEP}]
 	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep ki18n)
 	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
 	$(add_frameworks_dep solid)
 	dev-qt/linguist-tools:5
 	dev-qt/qtdbus:5
@ -38,6 +40,7 @@ DEPEND="${PYTHON_DEPS}
 	sys-apps/dbus
 	sys-apps/dmidecode
 	sys-auth/polkit-qt[qt5]
+	>=sys-libs/kpmcore-2.1.0
 "

 RDEPEND="${DEPEND}
@ -61,7 +64,8 @@ src_prepare() {
 	       PYTHON_INCLUDE_PATH="$(python_get_library_path)"\
 	       PYTHON_CFLAGS="$(python_get_CFLAGS)"\
 	       PYTHON_LIBS="$(python_get_LIBS)"
-	export QT_SELECT=qt5
+
+	eapply_user
 }

 src_configure() {
--- a/app-admin/keepass/Manifest
+++ b/app-admin/keepass/Manifest
@ -1,2 +1,3 @@
 DIST KeePass-2.30-Source.zip 4767753 SHA256 4a3c3c217bc05b13bf903612b89a09b67ed1df68fdecd83324f2ef372313e9e4 SHA512 05404f273f6a7df33887b036aa0dba335124a7b2ae30b61957f8dc9c959cdd3342fdfa22a7d59ba5e9180f039fed5ecbac0a3154eb9d342a5a3a8a057d763182 WHIRLPOOL 4ddec9e592724b60724a2deaaf959dacc91f77d1ae97dd07af940f8efd882a008b4424ba68a4fcbd9ebe8d75c2b8a9a644ff7144ed593cfb3f0e361c0364a780
 DIST KeePass-2.31-Source.zip 4714301 SHA256 555b1a30f374f7077bf15906b09ab36b40fd3fc5753673a3c0ee3f30f0ed7881 SHA512 e2e81e7d60bc58a18ea3b9a82741bdd6e5be88bcfcf447ae587f6177a8ff97e7c82c02fb0695142f8321c7b5f92aa982254629928dd0c12393d659380f46026d WHIRLPOOL b8b572bd7db7ce9bc67ae0a241c71cd30595753d06bfed85efafece2b3cce4893c5cc213ee44cabd81c6ff12fc2fc98234d845ed94d0068d8111d116ccc39333
+DIST KeePass-2.32-Source.zip 4721787 SHA256 7c49b62c8de758dee7e9c2d6108c169d468b4e65f21e297649d3dd8c2b757385 SHA512 6c6345cedc505eaaec28c6e89e225bdad5d5ac169c364a7e04b06bbdef4223829662f6e12a7432a3785f73cbc6798ba578468be04ab1063eb96135346570c7c3 WHIRLPOOL 6ba1bff9df311950068e34f9044f5b9e29e6e571e1928093f7ad6dc23c8b7ad26a89371fc425df0f5b41d3781aa29c0c6ad4d8c0c0f077248e4ee7f9022dabe3
--- a/app-admin/keepass/keepass-2.32.ebuild
+++ b/app-admin/keepass/keepass-2.32.ebuild
@ -0,0 +1,113 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils fdo-mime gnome2-utils mono-env multilib
+
+MY_PN="KeePass"
+DESCRIPTION="A free, open source, light-weight and easy-to-use password manager"
+HOMEPAGE="http://keepass.info/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-${PV}-Source.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="aot"
+
+COMMON_DEPEND=">=dev-lang/mono-2.10.5"
+RDEPEND="${COMMON_DEPEND}
+	dev-dotnet/libgdiplus[cairo]"
+DEPEND="${COMMON_DEPEND}
+	app-arch/unzip"
+
+S=${WORKDIR}
+
+src_prepare() {
+	# Force text mode for >grep-2.21 (bug #574480)
+	epatch "${FILESDIR}/${PN}-2.31-force-text-grep.patch"
+
+	# Remove Windows-specific things
+	pushd Build > /dev/null || die
+	. PrepMonoDev.sh || die
+	popd > /dev/null || die
+
+	# KeePass looks for some XSL files in the same folder as the executable,
+	# we prefer to have it in /usr/share/KeePass
+	epatch "${FILESDIR}/${PN}-2.20-xsl-path-detection.patch"
+	# bug # 558094
+	if has_version ">=dev-lang/mono-4" ; then
+		sed -i -e 's! ToolsVersion="3.5"!!g' Translation/TrlUtil/TrlUtil.csproj || die
+		sed -i -e 's/Format Version 10.00/Format Version 11.00/' KeePass.sln || die
+	fi
+}
+
+src_compile() {
+	# Build with Release target
+	xbuild /target:KeePass /property:Configuration=Release || die
+
+	# Run Ahead Of Time compiler on the binary
+	if use aot; then
+		cp Ext/KeePass.exe.config Build/KeePass/Release/
+		mono --aot -O=all Build/KeePass/Release/KeePass.exe || die
+	fi
+}
+
+src_install() {
+	# Wrapper script to launch mono
+	make_wrapper ${PN} "mono /usr/$(get_libdir)/${PN}/KeePass.exe"
+
+	# Some XSL files
+	insinto /usr/share/${PN}/XSL
+	doins Ext/XSL/*
+
+	insinto /usr/$(get_libdir)/${PN}/
+	exeinto /usr/$(get_libdir)/${PN}/
+	doins Ext/KeePass.exe.config
+	# Default configuration, simply says to use user-specific configuration
+	doins Ext/KeePass.config.xml
+
+	# The actual executable
+	doexe Build/KeePass/Release/KeePass.exe
+
+	# Copy the AOT compilation result
+	if use aot; then
+		doexe Build/KeePass/Release/KeePass.exe.so
+	fi
+
+	# Prepare the icons
+	newicon -s 256 Ext/Icons_04_CB/Finals/plockb.png "${PN}.png"
+	newicon -s 256 -t gnome -c mimetypes Ext/Icons_04_CB/Finals/plockb.png "application-x-${PN}2.png"
+
+	# Create a desktop entry and associate it with the KeePass mime type
+	make_desktop_entry ${PN} ${MY_PN} ${PN} "System;Security" "MimeType=application/x-keepass2;"
+
+	# MIME descriptor for .kdbx files
+	insinto /usr/share/mime/packages/
+	doins "${FILESDIR}/${PN}.xml"
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	fdo-mime_mime_database_update
+	fdo-mime_desktop_database_update
+
+	if ! has_version x11-misc/xdotool ; then
+		elog "Optional dependencies:"
+		elog "	x11-misc/xdotool (enables autotype)"
+	fi
+
+	elog "Some systems may experience issues with copy and paste operations."
+	elog "If you encounter this, please install x11-misc/xsel."
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	fdo-mime_mime_database_update
+	fdo-mime_desktop_database_update
+}
--- a/app-admin/rsyslog/files/8-stable/50-rsyslog-8.16.0-fix-leap-year-handling.patch
+++ b/app-admin/rsyslog/files/8-stable/50-rsyslog-8.16.0-fix-leap-year-handling.patch
@ -0,0 +1,86 @@
+From ffb321f1698a971e0acda48cafa97bb344cf0829 Mon Sep 17 00:00:00 2001
+From: Rainer Gerhards <rgerhards@adiscon.com>
+Date: Wed, 2 Mar 2016 11:43:09 +0100
+Subject: [PATCH] bugfix: unixtimestamp was incorrectly computed
+
+The problem happened in leap year from March til then end
+of year and healed itself at the begining of the next year.
+During the problem period, the timestamp was 24 hours too
+low.
+
+This is primarily a simple fix that can also be applied to
+older rsyslog versions. However, we will see if we can
+refactor the code to make use of mktime(). Originally, that
+was not done for some issues seen, which may no longer
+apply.
+
+fixes https://github.com/rsyslog/rsyslog/issues/830
+---
+ runtime/datetime.c | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/runtime/datetime.c b/runtime/datetime.c
+index efb4c81..a07c1b7 100644
+--- a/runtime/datetime.c
+++ b/runtime/datetime.c
+@@ -1054,6 +1054,11 @@ time_t syslogTime2time_t(struct syslogTime *ts)
+ 			MonthInDays = 0;	/* any value fits ;) */
+ 			break;
+ 	}	
+	/* adjust for leap years */
+	if((ts->year % 100 != 0 && ts->year % 4 == 0) || (ts->year == 2000)) {
+		if(ts->month > 2)
+			MonthInDays++;
+	}
+ 
+ 
+ 	/*	1) Counting how many Years have passed since 1970
+@@ -1064,7 +1069,7 @@ time_t syslogTime2time_t(struct syslogTime *ts)
+ 
+ 	NumberOfYears = ts->year - yearInSec_startYear - 1;
+ 	NumberOfDays = MonthInDays + ts->day - 1;
+-	TimeInUnixFormat = yearInSecs[NumberOfYears] + NumberOfDays * 86400;
+	TimeInUnixFormat = (yearInSecs[NumberOfYears] + 1) + NumberOfDays * 86400;
+ 
+ 	/*Add Hours, minutes and seconds */
+ 	TimeInUnixFormat += ts->hour*60*60;
+From 5cb41f748329986d5e2aa8d5e87f224bb9cb8234 Mon Sep 17 00:00:00 2001
+From: Rainer Gerhards <rgerhards@adiscon.com>
+Date: Wed, 2 Mar 2016 15:58:18 +0100
+Subject: [PATCH] timestamp handling: guard against invalid dates
+
+We do not permit dates outside of the year 1970..2100
+interval. Note that network-receivers do already guard
+against this, so the new guard only guards against invalid
+system time. Still good to have (especially when things are
+extended...)
+---
+ runtime/datetime.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/runtime/datetime.c b/runtime/datetime.c
+index 9641363..87290c9 100644
+--- a/runtime/datetime.c
+++ b/runtime/datetime.c
+@@ -1023,6 +1023,13 @@ time_t syslogTime2time_t(struct syslogTime *ts)
+ 	int utcOffset;
+ 	time_t TimeInUnixFormat;
+ 
+	if(ts->year < 1970 || ts->year > 2100) {
+		TimeInUnixFormat = 0;
+		errmsg.LogError(0, RS_RET_ERR, "syslogTime2time_t: invalid year %d "
+			"in timestamp - returning 1970-01-01 instead", ts->year);
+		goto done;
+	}
+
+ 	/* Counting how many Days have passed since the 01.01 of the
+ 	 * selected Year (Month level), according to the selected Month*/
+ 
+@@ -1096,6 +1103,7 @@ time_t syslogTime2time_t(struct syslogTime *ts)
+ 	if(ts->OffsetMode == '+')
+ 		utcOffset *= -1; /* if timestamp is ahead, we need to "go back" to UTC */
+ 	TimeInUnixFormat += utcOffset;
+done:
+ 	return TimeInUnixFormat;
+ }
+ 
--- a/app-admin/rsyslog/rsyslog-8.16.0-r1.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.16.0-r1.ebuild
@ -15,6 +15,7 @@ PATCHES=(
 	"${FILESDIR}"/8-stable/50-rsyslog-8.15.0-imtcp-tls-basic-vg-test-workaround.patch
 	"${FILESDIR}"/8-stable/50-rsyslog-8.15.0-imfile-readmode2-vg-test-workaround.patch
 	"${FILESDIR}"/8-stable/50-rsyslog-8.16.0-fix-queue-engine-issue-262.patch
+	"${FILESDIR}"/8-stable/50-rsyslog-8.16.0-fix-leap-year-handling.patch
 )

 if [[ ${PV} == "9999" ]]; then
--- a/app-admin/supervisor/Manifest
+++ b/app-admin/supervisor/Manifest
@ -1,2 +1,3 @@
 DIST supervisor-3.1.3.tar.gz 391529 SHA256 e32c546fe8d2a6e079ec4819c49fd24534d4075a58af39118d04367918b3c282 SHA512 40795bfd1aee3eba9e51b6dc1bfcff20c42c0a42ca7ceecc35c428f7840d5d631303b7f0c4eee85375296fd4e9a48f6b405a87caf038f8ffbfe227b5160e7aa5 WHIRLPOOL da8f41907857c46633e93e1806449babd9230994a528c73946276c10387e380763b7b9fb884bb3376537d6eb55428e5873ed8e9a11cd410a3d6c8d7593907552
 DIST supervisor-3.2.1.tar.gz 410461 SHA256 d6b54903aab4214664b6f2c6400f673bee3e21aec7b14d08940ed431a3ead630 SHA512 a4fa8b1729a578c36c989e91a87c0ff4d2e5487b1beb58bd0695729553b5005cf4a282c6a193330c5b352d2467597bae330a28d6e42305c8108593fbf24b1b80 WHIRLPOOL 36f798f87a73e76b8cd79d4c417a64246e77b3114142a82fc322f302deb285f625f6a1bab738cb437116665b6172a1b643fa8c765e57591500c53ed6823b3372
+DIST supervisor-3.2.2.tar.gz 410884 SHA256 67b07b75bdf4529af0ed99f3940bac73d8bcdd8acb1b7cadb7314152e73b8c5f SHA512 2a4beba2bb707ce0ec90a80e212d7edc5e3a74e36675bb483100d97f75e2826538c3bf604faf07fe435e7f4c89608694a22f59293f272ea1e03f8859c0bf9da2 WHIRLPOOL 48795b0e61f9c7a295c0a807db81362d00012a91c3f37f4d2ccfa4f6c171d89219ec24c74e1ea53885353c2ae55c208ba6b6441345e89379c6159145f889a4de
--- a/app-admin/supervisor/supervisor-3.2.2.ebuild
+++ b/app-admin/supervisor/supervisor-3.2.2.ebuild
@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )	# py2 only
+# xml.etree.ElementTree module required.
+PYTHON_REQ_USE="xml"
+
+inherit distutils-r1
+
+MY_PV="${PV/_beta/b}"
+
+DESCRIPTION="A system for controlling process state under UNIX"
+HOMEPAGE="http://supervisord.org/ https://pypi.python.org/pypi/supervisor"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${PN}-${MY_PV}.tar.gz"
+
+LICENSE="repoze ZPL BSD HPND GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+# ALL versions of meld3 match to >=meld3-0.6.5
+RDEPEND="dev-python/meld3[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( dev-python/mock[${PYTHON_USEDEP}] )
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+python_compile_all() {
+	# Somehow the test phase is called and run on invoking a doc build; harmless
+	use doc && emake -C docs html
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	newinitd "${FILESDIR}/init.d-r1" supervisord
+	newconfd "${FILESDIR}/conf.d" supervisord
+	use doc && local HTML_DOCS=( docs/.build/html/. )
+	distutils-r1_python_install_all
+}
--- a/app-admin/swatch/swatch-3.2.3-r2.ebuild
+++ b/app-admin/swatch/swatch-3.2.3-r2.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -16,7 +16,7 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE=""

-RDEPEND="dev-perl/DateManip
+RDEPEND="dev-perl/Date-Manip
 		dev-perl/Date-Calc
 		dev-perl/File-Tail
 		dev-perl/TimeDate
--- a/app-arch/innoextract/files/innoextract-1.4-cmake-3.5.patch
+++ b/app-arch/innoextract/files/innoextract-1.4-cmake-3.5.patch
@ -0,0 +1,31 @@
+From 01705758dd04d937160c99c8b87c6fa2057db894 Mon Sep 17 00:00:00 2001
+From: Daniel Scharrer <daniel@constexpr.org>
+Date: Tue, 23 Feb 2016 05:45:50 +0100
+Subject: [PATCH] CMake: Disable variable expansion for quoted strings in if()
+
+This makes the build system more rubust against stray variables
+coming from included CMake scripts provided by the system.
+
+Fixes build with CMake 3.5 (tested with 3.5.0-rc3).
+
+Fixes: issue #50
+---
+ CMakeLists.txt | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 02e0308..8653b93 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -2,6 +2,11 @@ project(innoextract)
+ 
+ cmake_minimum_required(VERSION 2.8)
+ 
+if(POLICY CMP0054)
+	# CMake 3.1+: Only interpret if() arguments as variables or keywords when unquoted.
+	cmake_policy(SET CMP0054 NEW)
+endif()
+
+ 
+ # Define configuration options
+ 
--- a/app-arch/innoextract/innoextract-1.4.ebuild
+++ b/app-arch/innoextract/innoextract-1.4.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -34,6 +34,11 @@ DEPEND="${RDEPEND}

 DOCS=( README.md CHANGELOG )

+PATCHES=(
+	"${FILESDIR}"/${P}-cmake.patch
+	"${FILESDIR}"/${P}-cmake-3.5.patch
+)
+
 pkg_pretend() {
 	if [[ ${MERGE_TYPE} != binary ]]; then
 		# not sure about minimum clang req
@ -46,10 +51,6 @@ pkg_pretend() {
 	fi
 }

-src_prepare() {
-	epatch "${FILESDIR}"/${P}-cmake.patch
-}
-
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_use lzma LZMA)
--- a/app-arch/innoextract/innoextract-1.5.ebuild
+++ b/app-arch/innoextract/innoextract-1.5.ebuild
@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

 EAPI=5

-inherit cmake-utils
+inherit eutils cmake-utils

 DESCRIPTION="A tool to unpack installers created by Inno Setup"
 HOMEPAGE="http://constexpr.org/innoextract/"
@ -23,6 +23,10 @@ DEPEND="${RDEPEND}"

 DOCS=( README.md CHANGELOG )

+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4-cmake-3.5.patch
+)
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_use lzma LZMA)
--- a/app-arch/innoextract/metadata.xml
+++ b/app-arch/innoextract/metadata.xml
@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>hasufell@gentoo.org</email>
-		<name>Julian Ospald</name>
-		<description>Maintainer. Assign bugs to him</description>
-	</maintainer>
 	<maintainer type="person">
 		<email>daniel@constexpr.org</email>
 		<name>Daniel Scharrer</name>
 		<description>Proxy maintainer. CC him on bugs</description>
 	</maintainer>
+	<maintainer type="project">
+		  <email>proxy-maint@gentoo.org</email>
+		  <name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="debug">Enable debug logging and the --debug command-line option.</flag>
 		<flag name="lzma">Enable support for extracting lzma-compressed installers using <pkg>app-arch/xz-utils</pkg>.</flag>
--- a/app-backup/qt4-fsarchiver/qt4-fsarchiver-0.6.19.6.ebuild
+++ b/app-backup/qt4-fsarchiver/qt4-fsarchiver-0.6.19.6.ebuild
@ -61,6 +61,6 @@ pkg_postinst() {
 	elog "  sys-fs/ntfs3g[ntfsprogs]"
 	elog "  sys-fs/reiser4progs"
 	elog "  sys-fs/reiserfsprogs"
-	elog "  sys-fs/sshfs-fuse"
+	elog "  sys-fs/sshfs"
 	elog "  sys-fs/xfsprogs"
 }
--- a/app-backup/qt4-fsarchiver/qt4-fsarchiver-0.6.19.7.ebuild
+++ b/app-backup/qt4-fsarchiver/qt4-fsarchiver-0.6.19.7.ebuild
@ -61,6 +61,6 @@ pkg_postinst() {
 	elog "  sys-fs/ntfs3g[ntfsprogs]"
 	elog "  sys-fs/reiser4progs"
 	elog "  sys-fs/reiserfsprogs"
-	elog "  sys-fs/sshfs-fuse"
+	elog "  sys-fs/sshfs"
 	elog "  sys-fs/xfsprogs"
 }
--- a/app-backup/tsm/tsm-7.1.3.1-r1.ebuild
+++ b/app-backup/tsm/tsm-7.1.3.1-r1.ebuild
@ -0,0 +1,244 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit versionator multilib eutils readme.gentoo rpm systemd user pax-utils
+
+DESCRIPTION="Tivoli Storage Manager (TSM) Backup/Archive (B/A) Client and API"
+HOMEPAGE="http://www.tivoli.com/"
+
+MY_PV_MAJOR=$(get_major_version)
+MY_PV_MINOR=$(get_version_component_range 2)
+MY_PV_TINY=$(get_version_component_range 3)
+MY_PV_PATCH=$(get_version_component_range 4)
+
+MY_PV_NODOTS="${MY_PV_MAJOR}${MY_PV_MINOR}${MY_PV_TINY}"
+MY_PVR_ALLDOTS=${PV}
+
+if [[ ${MY_PV_PATCH} == 0 ]]; then
+	MY_RELEASE_PATH=maintenance
+else
+	MY_RELEASE_PATH=patches
+fi
+BASE_URI="ftp://ftp.software.ibm.com/storage/tivoli-storage-management/"
+BASE_URI+="${MY_RELEASE_PATH}/client/v${MY_PV_MAJOR}r${MY_PV_MINOR}/"
+BASE_URI+="Linux/LinuxX86/BA/v${MY_PV_NODOTS}/"
+SRC_TAR="${MY_PVR_ALLDOTS}-TIV-TSMBAC-LinuxX86.tar"
+SRC_URI="${BASE_URI}${SRC_TAR}"
+
+RESTRICT="strip" # Breaks libPiIMG.so and libPiSNAP.so
+LICENSE="Apache-1.1 Apache-2.0 JDOM BSD-2 CC-PD Boost-1.0 MIT CPL-1.0 HPND Exolab
+	dom4j EPL-1.0 FTL icu unicode IBM Info-ZIP LGPL-2 LGPL-2.1 openafs-krb5-a
+	ZLIB MPL-1.0 MPL-1.1 NPL-1.1 openssl OPENLDAP RSA public-domain W3C
+	|| ( BSD GPL-2+ ) gSOAP libpng tsm"
+
+SLOT="0"
+KEYWORDS="~amd64 -*"
+IUSE="acl java +tsm_cit +tsm_hw"
+QA_PREBUILT="*"
+
+# not available (yet?)
+#MY_LANGS="cs:CS_CZ de:DE_DE es:ES_ES fr:FR_FR hu:HU_HU it:IT_IT
+#	ja:JA_JP ko:KO_KR pl:PL_PL pt:PT_BR ru:RU_RU zh:ZH_CN zh_TW:ZH_TW"
+MY_LANG_PV="${MY_PVR_ALLDOTS}-"
+for lang in ${MY_LANGS}; do
+	IUSE="${IUSE} linguas_${lang%:*}"
+	SRC_URI="${SRC_URI} linguas_${lang%:*}? ( \
+${BASE_URI}TIVsm-msg.${lang#*:}.x86_64.rpm -> \
+${MY_LANG_PV}TIVsm-msg.${lang#*:}.x86_64.rpm )"
+done
+unset lang
+
+DEPEND=""
+RDEPEND="
+	dev-libs/expat
+	dev-libs/libxml2
+	=sys-fs/fuse-2*
+	acl? ( sys-apps/acl )
+	java? ( virtual/jre:1.7 )
+"
+
+S="${WORKDIR}"
+
+pkg_setup() {
+	enewgroup tsm
+	DOC_CONTENTS="
+		Note that you have to be either root or member of the group tsm to
+		be able to use the Tivoli Storage Manager client."
+}
+
+src_unpack() {
+	local rpm rpms lang
+	unpack ${SRC_TAR}
+
+	for rpm in *.rpm; do
+		case ${rpm} in
+			TIVsm-APIcit.*|TIVsm-BAcit.*)
+				use tsm_cit && rpms="${rpms} ./${rpm}"
+				;;
+			TIVsm-BAhdw.*)
+				use tsm_hw && rpms="${rpms} ./${rpm}"
+				;;
+			TIVsm-JBB.*|*-filepath-*)
+				# "journal based backup" for all filesystems
+				# requires a kernel module.
+				# "Linux Filepath source code" available
+				# by request from vendor
+				;;
+			*)
+				rpms="${rpms} ./${rpm}"
+				;;
+		esac
+	done
+	for rpm in ${A}; do
+		case ${rpm} in
+			*.rpm)
+				rpms="${rpms} ${rpm}"
+				;;
+		esac
+	done
+
+	rpm_unpack ${rpms}
+
+	# Avoid strange error messages caused by read-only files
+	chmod -R u+w "${S}" || die
+}
+
+src_prepare() {
+	# Avoid unnecessary dependency on ksh
+	sed -i 's:^#!/usr/bin/ksh:#!/bin/bash:' \
+		opt/tivoli/tsm/client/ba/bin/dsmj || die
+}
+
+src_install() {
+	cp -a opt "${D}" || die
+	cp -a usr "${D}" || die
+
+	# The RPM files contain postinstall scripts which can be extracted
+	# e.g. using https://bugs.gentoo.org/attachment.cgi?id=234663 .
+	# Below we try to mimic the behaviour of these scripts.
+	# We don't deal with SELinux compliance (yet), though.
+	local RPM_INSTALL_PREFIX CLIENTDIR i
+	RPM_INSTALL_PREFIX=/opt
+	CLIENTDIR=$RPM_INSTALL_PREFIX/tivoli/tsm/client
+
+	# We don't bother setting timestamps to build dates.
+	# But we should delete the corresponding files.
+	rm -f "${D}"$CLIENTDIR/api/bin*/.buildDate || die
+	rm -f "${D}"$CLIENTDIR/ba/bin*/.buildDate || die
+	rm -f "${D}"$CLIENTDIR/lang/.buildDate || die
+
+	# Create links for messages; this is spread over several postin scripts.
+	for i in $(cd "${D}"${CLIENTDIR}/lang; ls -1d ??_??); do
+		dosym ../../lang/${i} $CLIENTDIR/ba/bin/${i}
+		dosym ../../lang/${i} $CLIENTDIR/api/bin64/${i}
+	done
+
+	# Mimic TIVsm-API64 postinstall script
+	for i in libgpfs.so libdmapi.so; do
+		dosym ../..$CLIENTDIR/api/bin64/${i} /usr/lib64/${i}
+	done
+
+	# The TIVsm-BA postinstall script only does messages and ancient upgrades
+
+	# The gscrypt64 postinstall script only deals with s390[x] SELinux
+	# and the symlink for the iccs library which we handle in the loop below.
+
+	# Move stuff from /usr/local to /opt, #452332
+	mv "${D}"/usr/local/ibm "${D}"/opt/ || die
+	rmdir "${D}"/usr/local || die
+
+	# Mimic gskssl64 postinstall script
+	for i in sys p11 km ssl drld kicc ldap cms acmeidup valn dbfl iccs; do
+		dosym ../../opt/ibm/gsk8_64/lib64/libgsk8${i}_64.so \
+			/usr/lib64/libgsk8${i}_64.so
+	done
+	for i in capicmd ver; do
+		dosym ../../opt/ibm/gsk8_64/bin/gsk8${i}_64 /usr/bin/gsk${i}_64
+	done
+
+	# Done with the postinstall scripts as the RPMs contain them.
+	# Now on to some more Gentoo-specific installation.
+
+	[[ -d "${D}usr/lib" ]] && die "Using 32bit lib dir in 64bit only system"
+
+	# Avoid "QA Notice: Found an absolute symlink in a library directory"
+	local target
+	find "${D}"usr/lib* -lname '/*' | while read i; do
+		target=$(readlink "${i}")
+		rm -v "${i}" || die
+		dosym "../..${target}" "${i#${D}}"
+	done
+
+	# Install symlinks for sonames of libraries, bug #416503
+	dosym libvixMntapi.so.1.1.0 $CLIENTDIR/ba/bin/libvixMntapi.so.1
+	dosym libvixDiskLibVim.so.5.5.0 $CLIENTDIR/ba/bin/libvixDiskLibVim.so.5
+	dosym libvixDiskLib.so.5.5.0 $CLIENTDIR/ba/bin/libvixDiskLib.so.5
+
+	fowners :tsm /opt/tivoli/tsm/client/ba/bin/dsmtca
+	fperms 4710 /opt/tivoli/tsm/client/ba/bin/dsmtca
+
+	keepdir /var/log/tsm
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/tsm.logrotate" tsm
+
+	keepdir /etc/tivoli
+
+	cp -a "${S}/opt/tivoli/tsm/client/ba/bin/dsm.sys.smp" "${D}/etc/tivoli/dsm.sys" || die
+	echo '	 PasswordDir "/etc/tivoli/"' >> ${D}/etc/tivoli/dsm.sys
+	echo '	 PasswordAccess generate' >> ${D}/etc/tivoli/dsm.sys
+
+	# Added the hostname to be more friendly, the admin will need to edit this file anyway
+	echo '	 NodeName' `hostname` >> ${D}/etc/tivoli/dsm.sys
+	echo '	 ErrorLogName "/var/log/tsm/dsmerror.log"' >> ${D}/etc/tivoli/dsm.sys
+	echo '	 SchedLogName "/var/log/tsm/dsmsched.log"' >> ${D}/etc/tivoli/dsm.sys
+	dosym ../../../../../../etc/tivoli/dsm.sys /opt/tivoli/tsm/client/ba/bin/dsm.sys
+
+	cp -a "${S}/opt/tivoli/tsm/client/ba/bin/dsm.opt.smp" "${D}/etc/tivoli/dsm.opt"
+	dosym ../../../../../../etc/tivoli/dsm.opt /opt/tivoli/tsm/client/ba/bin/dsm.opt
+
+	# Setup the env
+	dodir /etc/env.d
+	ENV_FILE="${D}/etc/env.d/80tivoli"
+	echo 'DSM_CONFIG="/etc/tivoli/dsm.opt"' >> ${ENV_FILE}
+	echo 'DSM_DIR="/opt/tivoli/tsm/client/ba/bin"' >> ${ENV_FILE}
+	echo 'DSM_LOG="/var/log/tsm"' >> ${ENV_FILE}
+	echo 'ROOTPATH="/opt/tivoli/tsm/client/ba/bin"' >> ${ENV_FILE}
+
+	newconfd "${FILESDIR}/dsmc.conf.d" dsmc
+	newinitd "${FILESDIR}/dsmc.init.d" dsmc
+	newinitd "${FILESDIR}/dsmcad.init.d-r1" dsmcad
+
+	# Need this for hardened, otherwise a cryptic "connection to server lost" message appears
+	pax-mark -m "${D}/opt/tivoli/tsm/client/ba/bin/dsmc"
+
+	systemd_dounit "${FILESDIR}/dsmc.service"
+	systemd_dounit "${FILESDIR}/dsmcad.service"
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	local i dirs
+	for i in /var/log/tsm/dsm{error,sched,j,webcl}.log; do
+		if [[ ! -e $i ]]; then
+			touch $i || die
+			chown :tsm $i || die
+			chmod 0660 $i || die
+		fi
+	done
+
+	# Bug #375041: the log directory itself should not be world writable.
+	# Have to do this in postinst due to bug #141619
+	chown root:tsm /var/log/tsm || die
+	chmod 0750 /var/log/tsm || die
+
+	# Bug 508052: directories used to be too restrictive, have to widen perms.
+	dirs=( /opt/tivoli $(find /opt/tivoli/tsm -type d) )
+	chown root:root "${dirs[@]}" || die
+	chmod 0755 "${dirs[@]}" || die
+
+	readme.gentoo_print_elog
+}
--- a/app-crypt/mit-krb5/mit-krb5-1.14.1.ebuild
+++ b/app-crypt/mit-krb5/mit-krb5-1.14.1.ebuild
@ -15,7 +15,7 @@ SRC_URI="http://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}.tar.gz"

 LICENSE="openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="doc +keyutils libressl openldap +pkinit selinux +threads test xinetd"

 CDEPEND="
--- a/app-doc/diveintopython/Manifest
+++ b/app-doc/diveintopython/Manifest
@ -0,0 +1,4 @@
+DIST diveintopython-2-pdf.zip 782047 SHA256 fc7249731166362a91267e5ff74f63f11ec44bafe9af86cb0b8f99105789e9c4 SHA512 24857e22b587878e22b8347bb53ca60697b3940ea2d2f9ea7fe5eabc5d8d2b3d580b278379436f4282f515a25a285f3f558f461daa9edaae6f565c246154978c WHIRLPOOL bcd4f0c268318219f80a9d427373fd0038a25e0f94aaaaf21823f9b5f46b9cf918387c50ea0c513223f3836ed065838af55602bd0de22e91b5201c5264b86133
+DIST diveintopython-2.zip 865555 SHA256 cf51555500b77c51f6a35c59eaf049b23c8729ef3bef31fc445b6aea45d150a6 SHA512 9c57a9e228d30186b1e6fc10a47d4fa69704fd83ea68bba030d7909ad8df2b9cfeee942caf359b1dd1fd8f9459fee58ea8ddb3813759b17f06b93b3ccf4ca296 WHIRLPOOL 6af00e6d36c8240867b8753478ad749737adffafee2d7641759a1e269981292288b27360f936663716a7cdca5fd1bb27bbdae94b70b497837a6bdda1261cba20
+DIST diveintopython-3-pdf.tar.gz 2235256 SHA256 2bd23e41f0621a386699066d2a8e25b7bf22aca3be7c2c9dd7c39ac44b6263cc SHA512 ecca7ba1540a48eb41b5bfd7ca878962939b9ec47eac6100f13d75eb24c6cae20177110877d34e6d1de47bed6883f9a25b379ced5c03b8c220103774a00a54b4 WHIRLPOOL 697b6b446f35fae0259ec3aea34c1336238f01648c8515a883ed848d1fff5d89437eba93c0bde581cf4821f0e0730869c38a7ff01dfdfaeec3774f2a08a68bb3
+DIST diveintopython-3.tar.gz 9958889 SHA256 01d0d1f0b53252e0eb8bdf5ff7857d8f5e871574751eadfcfe13d011fb114c3f SHA512 19a8498e4d91fc2ea2c899400336696732dae73da48faf55de43507e41e72a68c6ac25cea0acfdf3ca783344cd12c41326190ac9bbaf7ebdc113833e8bfea3a4 WHIRLPOOL 719607af0abcf4d1ca74c7450cb6402c8263d542d5940f9b33d9323005f1f05ba4dc537423f5d83f87be9f0bb4714ffb4806babae6cbcd5065067375d8e8066e
--- a/app-doc/diveintopython/diveintopython-2.ebuild
+++ b/app-doc/diveintopython/diveintopython-2.ebuild
@ -0,0 +1,42 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit eutils
+
+MY_PV="5.4"
+MY_P="${PN}-${MY_PV}"
+
+IUSE="pdf"
+
+DESCRIPTION="'Dive Into Python' by Mark Pilgrim - Python 2"
+HOMEPAGE="http://www.diveintopython.net/"
+
+SRC_URI="http://www.diveintopython.net/download/${PN}-html-${MY_PV}.zip -> ${P}.zip
+	pdf? (
+		http://www.diveintopython.net/download/${PN}-pdf-${MY_PV}.zip -> ${P}-pdf.zip
+	)"
+
+LICENSE="FDL-1.1"
+SLOT="2"
+
+KEYWORDS="~amd64 ~ppc64 ~ppc ~x86"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+}
+
+src_install() {
+	insinto "/usr/share/doc/${PN}-${SLOT}"
+	use pdf && dodoc "${PN}.pdf"
+	doins -r html/*
+	insinto "/usr/share/doc/${PN}-${SLOT}"/examples
+	doins -r py
+}
--- a/app-doc/diveintopython/diveintopython-3.ebuild
+++ b/app-doc/diveintopython/diveintopython-3.ebuild
@ -0,0 +1,35 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit eutils
+
+DESCRIPTION="'Dive Into Python' by Mark Pilgrim - Python 3"
+HOMEPAGE="http://www.diveintopython3.net/"
+
+SRC_URI="http://dev.gentoo.org/~monsieurp/packages/${P}.tar.gz
+	pdf? (
+		http://dev.gentoo.org/~monsieurp/packages/${P}-pdf.tar.gz
+	)"
+
+LICENSE="CC-BY-SA-3.0"
+SLOT="3"
+
+KEYWORDS="~amd64 ~ppc64 ~ppc ~x86"
+
+IUSE="pdf"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+}
+
+src_install() {
+	insinto /usr/share/doc/${PN}-${SLOT}
+	use pdf && dodoc "${P}.pdf"
+	doins -r *
+}
--- a/app-doc/diveintopython/metadata.xml
+++ b/app-doc/diveintopython/metadata.xml
@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <maintainer type="person">
+	  <email>monsieurp@gentoo.org</email>
+	  <name>Patrice Clement</name>
+  </maintainer>
+  <longdescription lang="en">
+	  Dive Into Python is a free Python book for experienced programmers.
+  </longdescription>
+</pkgmetadata>
--- a/app-editors/padre/padre-0.980.0-r1.ebuild
+++ b/app-editors/padre/padre-0.980.0-r1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -87,7 +87,7 @@ RDEPEND="
 	>=virtual/perl-threads-shared-1.33
 	>=virtual/perl-Time-HiRes-1.97.18
 	>=dev-perl/URI-0
-	>=dev-perl/wxperl-0.990.100
+	>=dev-perl/Wx-0.990.100
 	>=dev-perl/Wx-Perl-ProcessStream-0.28
 	>=dev-perl/Wx-Scintilla-0.340.0
 	>=dev-perl/YAML-Tiny-1.32
--- a/app-editors/padre/padre-1.0.0.ebuild
+++ b/app-editors/padre/padre-1.0.0.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -87,7 +87,7 @@ RDEPEND="
 	>=virtual/perl-threads-shared-1.33
 	>=virtual/perl-Time-HiRes-1.97.18
 	>=dev-perl/URI-0
-	>=dev-perl/wxperl-0.990.100
+	>=dev-perl/Wx-0.990.100
 	>=dev-perl/Wx-Perl-ProcessStream-0.28
 	>=dev-perl/Wx-Scintilla-0.340.0
 	>=dev-perl/YAML-Tiny-1.32
--- a/app-emacs/nxml-gentoo-schemas/Manifest
+++ b/app-emacs/nxml-gentoo-schemas/Manifest
@ -1,3 +1,2 @@
-DIST nxml-gentoo-schemas-20111129.tar.bz2 10795 SHA256 654b72aee0f27c034ff351e5f9549abf4489d8c42590124aa95ea46538f9b8c7 SHA512 5ed86f6d72d8ab91d0473c1104458223f6b7ae9c03331638ee6d802706d18338dcf75a38dc82de237f2810bf3ef228f65f49d322527641618fa6e910e4ee3fbb WHIRLPOOL 5d94fac30df20cc94da0cae29bc631aa8f0364e9cd55b56265ee0cbcab460e3f3850e7247f798282a617ca0ac60b398e20c10310661df02b065b2e79fb7a5aa9
-DIST nxml-gentoo-schemas-20150428.tar.xz 11100 SHA256 79436da79a4e75a2e70855fa9c98410c7dced30525e72c23520c4a6231388b6b SHA512 a43b21f03072f31709499d9d7a5aca578c8c23d1fe9ab9658d973298a471cfd3408072298dfb467a69b50a26a10b86860cd9109e26cb6237b1e50bc943ef54d2 WHIRLPOOL 37cddfbb719982b0d4471aff21d3a2a429c266bec7ce663106a9978482392306622cad4b24108a20253ef21e1523f2cd9d896391ff2d8327d2c1446320c71b6c
 DIST nxml-gentoo-schemas-20160125.tar.xz 11920 SHA256 2db910f6391663953838bf4acee56b4f28a03abf56089cba0c0f7ea8844cfe4a SHA512 bf1aabc2275e6a4ff9a736385b8cb97ded63ac44a43608991012ea818e4f9e908e451b781f15d32a8dc744e73cadf032637e44ad93a08c6fcad2912c5d755789 WHIRLPOOL 09b6580f2af817db6db6023c901f4f7f50daa1bad228e0e2c619d3a4b99f08d5c717de514ee99beeb26266c631e596e3e1fa985b6b787ec8641fa44035b737b2
+DIST nxml-gentoo-schemas-20160312.tar.xz 11460 SHA256 ab19cccfacaadf96d881cebd065d16526affa2f85a7cab4d104d4350c45d2a68 SHA512 91d8ab4849bef6a54981c205cfd215f3e9bb1fb3c86fcd70a7ac2c6272fa58c29db08f4a1671487299c5ccbcfd388f0d2cd5953d13bf949798f135b230fa764a WHIRLPOOL b0495a1e1c25674efc60bfcd8256b3a9b47ee37a19eecb3b8bedeebb2394f86aee5221eddc03045414bbed7dea873cff283f2f75e84329d76101896514f9bd10
--- a/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20111129.ebuild
+++ b/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20111129.ebuild
@ -1,26 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit elisp
-
-DESCRIPTION="Extension for nxml-mode with Gentoo-specific schemas"
-HOMEPAGE="https://dev.gentoo.org/~flameeyes/nxml-gentoo-schemas/"
-SRC_URI="https://dev.gentoo.org/~flameeyes/${PN}/${P}.tar.bz2"
-
-LICENSE="HPND"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
-
-SITEFILE="60${PN}-gentoo.el"
-
-src_compile() { :; }
-
-src_install() {
-	insinto "${SITEETC}/${PN}"
-	doins schemas.xml *.rnc
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	dodoc DONATING
-}
--- a/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20160312.ebuild
+++ b/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20160312.ebuild
@ -1,13 +1,13 @@
-# 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 elisp

 DESCRIPTION="Extension for nxml-mode with Gentoo-specific schemas"
-HOMEPAGE="https://dev.gentoo.org/~flameeyes/nxml-gentoo-schemas/"
+HOMEPAGE="https://gitweb.gentoo.org/proj/nxml-gentoo-schemas.git/"
 SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"

 LICENSE="HPND"
--- a/app-emulation/docker-swarm/Manifest
+++ b/app-emulation/docker-swarm/Manifest
@ -1 +1,2 @@
 DIST docker-swarm-1.0.1.tar.gz 1187966 SHA256 33c6566af395affbf9861d1491613c48a70e6c61c532910cef2210be7b1323f7 SHA512 ed5e6a37cd0f5a816367cab451d21ac20183f8ce767a30dc3086f849da8e0d2662c9f9b7e56d826e7e8cf5d4ec3d9f1ee8c159cca294af7ec45c2c1a21eaaf80 WHIRLPOOL e17705a3bef077e5fed552131aa7cd4891934a537dc93bbb8dfe81bf2e82c281d7f74a5150febdde26f492cf5ad4eec8417aac9a7edc6e48812f4af3ed1b624e
+DIST docker-swarm-1.1.3.tar.gz 4144842 SHA256 bf9d7a2fe2cc69e34ead33952f38b621dd3bb006ec28e0185f9f7b18956a64e5 SHA512 661b7a1f2a663a18ef5dfe07cf2e1bb4e496e42709f986f8f6d78ecaccea5b3fd5d67d54db5154ec2ad0f1ac791dc3602d2451816b331c29e6d41a3a076cbc60 WHIRLPOOL 0c14ebea9c0ed90fa3b4eaae79fea1de83bbc83bbe2e54418f73cce105c1daa42aefd0a0216f619ed4e0593ec3a11b441cbcb1b94dd243be146acdcce6c3f831
--- a/app-emulation/docker-swarm/docker-swarm-1.1.3.ebuild
+++ b/app-emulation/docker-swarm/docker-swarm-1.1.3.ebuild
@ -0,0 +1,38 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+EGO_PN=github.com/docker/${PN##*-}/...
+
+if [[ ${PV} = *9999* ]]; then
+	inherit golang-vcs
+else
+	KEYWORDS="~amd64"
+	EGIT_COMMIT="v${PV}"
+	SRC_URI="https://${EGO_PN%/*}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	inherit golang-vcs-snapshot
+fi
+inherit golang-build
+
+DESCRIPTION="A Docker-native clustering system"
+HOMEPAGE="https://docs.docker.com/${PN##*-}/"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+RESTRICT="test"
+DEPEND="!!<app-admin/consul-0.6.3-r1"
+RDEPEND=""
+S=${WORKDIR}/${P}/src/${EGO_PN%/*}
+
+src_compile() {
+	GOPATH="${WORKDIR}/${P}:${S}/Godeps/_workspace:$(get_golibdir_gopath)" \
+		go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}" || die
+}
+
+src_install() {
+	dobin "${WORKDIR}/${P}/bin/${PN#docker-}"
+	dosym swarm /usr/bin/docker-swarm
+	dodoc CHANGELOG.md CONTRIBUTING.md README.md ROADMAP.md
+}
--- a/app-emulation/libvirt/files/libvirt-1.2.21-avoid_deprecated_pc_file.patch
+++ b/app-emulation/libvirt/files/libvirt-1.2.21-avoid_deprecated_pc_file.patch
@ -0,0 +1,24 @@
+From Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=779775
+
+From: Michael Biebl <biebl@debian.org>
+Date: Tue, 11 Aug 2015 07:25:01 +0200
+Subject: libsystemd
+
+Use libsystemd instead of deprecated libsystemd-daemon
+---
+ m4/virt-systemd-daemon.m4 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/m4/virt-systemd-daemon.m4 b/m4/virt-systemd-daemon.m4
+index 8516e41..c9708ec 100644
+--- a/m4/virt-systemd-daemon.m4
+++ b/m4/virt-systemd-daemon.m4
+@@ -18,7 +18,7 @@ dnl <http://www.gnu.org/licenses/>.
+ dnl
+ 
+ AC_DEFUN([LIBVIRT_CHECK_SYSTEMD_DAEMON],[
+-  LIBVIRT_CHECK_PKG([SYSTEMD_DAEMON], [libsystemd-daemon], [0.27.1])
+  LIBVIRT_CHECK_PKG([SYSTEMD_DAEMON], [libsystemd], [209])
+ 
+     old_CFLAGS="$CFLAGS"
+     old_LIBS="$LIBS"
--- a/app-emulation/libvirt/libvirt-1.2.21-r2.ebuild
+++ b/app-emulation/libvirt/libvirt-1.2.21-r2.ebuild
@ -220,7 +220,8 @@ src_prepare() {
 	epatch \
 		"${FILESDIR}"/${PN}-1.2.9-do_not_use_sysconf.patch \
 		"${FILESDIR}"/${PN}-1.2.16-fix_paths_in_libvirt-guests_sh.patch \
-		"${FILESDIR}"/${PN}-1.2.17-fix_paths_for_apparmor.patch
+		"${FILESDIR}"/${PN}-1.2.17-fix_paths_for_apparmor.patch \
+		"${FILESDIR}"/${P}-avoid_deprecated_pc_file.patch

 	[[ -n ${BACKPORTS} ]] &&
 		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" \
--- a/app-emulation/libvirt/libvirt-1.3.0-r1.ebuild
+++ b/app-emulation/libvirt/libvirt-1.3.0-r1.ebuild
@ -220,7 +220,8 @@ src_prepare() {
 	epatch \
 		"${FILESDIR}"/${P}-do_not_use_sysconf.patch \
 		"${FILESDIR}"/${PN}-1.2.16-fix_paths_in_libvirt-guests_sh.patch \
-		"${FILESDIR}"/${PN}-1.2.17-fix_paths_for_apparmor.patch
+		"${FILESDIR}"/${PN}-1.2.17-fix_paths_for_apparmor.patch \
+		"${FILESDIR}"/${PN}-1.2.21-avoid_deprecated_pc_file.patch

 	[[ -n ${BACKPORTS} ]] &&
 		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" \
--- a/app-emulation/libvirt/libvirt-1.3.1.ebuild
+++ b/app-emulation/libvirt/libvirt-1.3.1.ebuild
@ -220,7 +220,8 @@ src_prepare() {
 	epatch \
 		"${FILESDIR}"/${PN}-1.3.0-do_not_use_sysconf.patch \
 		"${FILESDIR}"/${PN}-1.2.16-fix_paths_in_libvirt-guests_sh.patch \
-		"${FILESDIR}"/${P}-fix_paths_for_apparmor.patch
+		"${FILESDIR}"/${P}-fix_paths_for_apparmor.patch \
+		"${FILESDIR}"/${PN}-1.2.21-avoid_deprecated_pc_file.patch

 	[[ -n ${BACKPORTS} ]] &&
 		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" \
--- a/app-emulation/virtualbox/files/virtualbox-5.0.4-x86_buildfix_1.patch
+++ b/app-emulation/virtualbox/files/virtualbox-5.0.4-x86_buildfix_1.patch
@ -1,17 +0,0 @@
-fix VirtualBox-5.0.4/src/VBox/ExtPacks/VNC/VBoxVNC.cpp:339:30: error: invalid conversion from 'rfbNewClientAction (__attribute__((regparm(0), cdecl)) *)(rfbClientPtr) {aka rfbNewClientAction (__attribute__((regparm(0), cdecl)) *)(_rfbClientRec*)}' to 'rfbNewClientHookPtr {aka rfbNewClientAction (*)(_rfbClientRec*)}' [-fpermissive]
-error for 32-bit build
-
-See:
-https://www.virtualbox.org/ticket/14564
-
--- VirtualBox-5.0.4/src/VBox/ExtPacks/VNC/VBoxVNC.cpp
-+++ VirtualBox-5.0.4/src/VBox/ExtPacks/VNC/VBoxVNC.cpp
-@@ -104,6 +104,6 @@
-     unsigned char *mFrameBuffer;
-     uint32_t uClients;
-    static DECLCALLBACK(enum rfbNewClientAction) rfbNewClientEvent(rfbClientPtr cl);
-    static DECLCALLBACK(void) vncMouseEvent(int buttonMask, int x, int y, rfbClientPtr cl);
-+    static enum rfbNewClientAction rfbNewClientEvent(rfbClientPtr cl);
-+    static void vncMouseEvent(int buttonMask, int x, int y, rfbClientPtr cl);
-     static void vncKeyboardEvent(rfbBool down, rfbKeySym keySym, rfbClientPtr cl);
-     static void clientGoneHook(rfbClientPtr cl);
--- a/app-emulation/virtualbox/files/virtualbox-5.0.4-x86_buildfix_2.patch
+++ b/app-emulation/virtualbox/files/virtualbox-5.0.4-x86_buildfix_2.patch
@ -1,12 +0,0 @@
-fix VirtualBox-5.0.4/src/VBox/Additions/linux/lightdm-greeter/vbox-greeter.cpp:929:64: error: invalid conversion from 'void (*)(PRTLOGGER, RTLOGPHASE, PFNRTLOGPHASEMSG) {aka void (*)(RTLOGGER*, RTLOGPHASE, void (__attribute__((regparm(0), cdecl)) *)(RTLOGGER*, const char*, ...))}' to 'PFNRTLOGPHASE {aka void (__attribute__((regparm(0), cdecl)) *)(RTLOGGER*, RTLOGPHASE, void (__attribute__((regparm(0), cdecl)) *)(RTLOGGER*, const char*, ...))}' [-fpermissive]
-for 32-bit build
-
--- VirtualBox-5.0.4/src/VBox/Additions/linux/lightdm-greeter/vbox-greeter.cpp
-+++ VirtualBox-5.0.4/src/VBox/Additions/linux/lightdm-greeter/vbox-greeter.cpp
-@@ -843,5 +843,5 @@
-  * @param   pfnLog
-  */
-static void vboxGreeterLogHeaderFooter(PRTLOGGER pLoggerRelease, RTLOGPHASE enmPhase, PFNRTLOGPHASEMSG pfnLog)
-+static DECLCALLBACK(void) vboxGreeterLogHeaderFooter(PRTLOGGER pLoggerRelease, RTLOGPHASE enmPhase, PFNRTLOGPHASEMSG pfnLog)
- {
-     /* Some introductory information. */
--- a/app-emulation/virtualbox/files/virtualbox-ose-5-wrapper
+++ b/app-emulation/virtualbox/files/virtualbox-ose-5-wrapper
@ -0,0 +1,113 @@
+#!/bin/sh
+## @file
+# Oracle VM VirtualBox startup script, Linux hosts.
+#
+
+#
+# Copyright (C) 2006-2015 Oracle Corporation
+#
+# This file is part of VirtualBox Open Source Edition (OSE), as
+# available from http://www.virtualbox.org. This file is free software;
+# you can redistribute it and/or modify it under the terms of the GNU
+# General Public License (GPL) as published by the Free Software
+# Foundation, in version 2 as it comes in the "COPYING" file of the
+# VirtualBox OSE distribution. VirtualBox OSE is distributed in the
+# hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
+#
+
+PATH="/usr/bin:/bin:/usr/sbin:/sbin"
+CONFIG="/etc/vbox/vbox.cfg"
+
+test -r "${CONFIG}" &&
+    . "${CONFIG}"
+test -z "${INSTALL_DIR}" &&
+    if test -f /usr/lib/virtualbox/VirtualBox &&
+        test -x /usr/lib/virtualbox/VirtualBox; then
+        INSTALL_DIR=/usr/lib/virtualbox
+    else
+        echo "Could not find VirtualBox installation. Please reinstall."
+        exit 1
+    fi
+
+# Note: This script must not fail if the module was not successfully installed
+#       because the user might not want to run a VM but only change VM params!
+
+if [ "$1" = "shutdown" ]; then
+    SHUTDOWN="true"
+elif ! lsmod|grep -q vboxdrv; then
+    cat << EOF
+WARNING: The vboxdrv kernel module is not loaded. Either there is no module
+         available for the current kernel (`uname -r`) or it failed to
+         load. Please recompile the kernel module and install it by
+
+           for m in vbox{drv,netadp,netflt}; do modprobe \$m; done
+
+         You will not be able to start VMs until this problem is fixed.
+EOF
+elif [ ! -c /dev/vboxdrv ]; then
+    cat << EOF
+WARNING: The character device /dev/vboxdrv does not exist.
+         Please try to reload all the needed kernel modules by:
+
+           for m in vbox{netflt,netadp,drv}; do rmmod \$m; done
+           for m in vbox{drv,netadp,netflt}; do modprobe \$m; done
+
+         and if that is not successful, try to re-install the package by:
+
+           emerge -1av app-emulation/virtualbox-modules
+
+         You will not be able to start VMs until this problem is fixed.
+EOF
+fi
+
+SERVER_PID=`ps -U \`whoami\` | grep VBoxSVC | awk '{ print $1 }'`
+if [ -z "$SERVER_PID" ]; then
+    # Server not running yet/anymore, cleanup socket path.
+    # See IPC_GetDefaultSocketPath()!
+    if [ -n "$LOGNAME" ]; then
+        rm -rf /tmp/.vbox-$LOGNAME-ipc > /dev/null 2>&1
+    else
+        rm -rf /tmp/.vbox-$USER-ipc > /dev/null 2>&1
+    fi
+fi
+
+if [ "$SHUTDOWN" = "true" ]; then
+    if [ -n "$SERVER_PID" ]; then
+        kill -TERM $SERVER_PID
+        sleep 2
+    fi
+    exit 0
+fi
+
+APP=`basename $0`
+case "$APP" in
+    VirtualBox|virtualbox)
+        exec "$INSTALL_DIR/VirtualBox" "$@"
+        ;;
+    VBoxManage|vboxmanage)
+        exec "$INSTALL_DIR/VBoxManage" "$@"
+        ;;
+    VBoxSDL|vboxsdl)
+        exec "$INSTALL_DIR/VBoxSDL" "$@"
+        ;;
+    VBoxVRDP|VBoxHeadless|vboxheadless)
+        exec "$INSTALL_DIR/VBoxHeadless" "$@"
+        ;;
+    VBoxAutostart|vboxautostart)
+        exec "$INSTALL_DIR/VBoxAutostart" "$@"
+        ;;
+    VBoxBalloonCtrl|vboxballoonctrl)
+        exec "$INSTALL_DIR/VBoxBalloonCtrl" "$@"
+        ;;
+    VBoxDTrace|vboxdtrace)
+        exec "$INSTALL_DIR/VBoxDTrace" "$@"
+        ;;
+    vboxwebsrv)
+        exec "$INSTALL_DIR/vboxwebsrv" "$@"
+        ;;
+    *)
+        echo "Unknown application - $APP"
+        exit 1
+        ;;
+esac
+exit 0
--- a/app-emulation/virtualbox/metadata.xml
+++ b/app-emulation/virtualbox/metadata.xml
@ -9,6 +9,7 @@
 	<flag name="additions">Install Guest System Tools ISO</flag>
 	<flag name="extensions">Install extension module packages</flag>
 	<flag name="headless">Build without any graphic frontend</flag>
+	<flag name="lvm">Build VBoxVolInfo that needs devicemapper from <pkg>sys-fs/lvm2</pkg>.</flag>
 	<flag name="sdk">Enable building of SDK</flag>
 	<flag name="udev">Controls installation of special USB udev rules.</flag>
 	<flag name="vboxwebsrv">Build and install the VirtualBox webservice</flag>
--- a/app-emulation/virtualbox/virtualbox-5.0.16-r1.ebuild
+++ b/app-emulation/virtualbox/virtualbox-5.0.16-r1.ebuild
@ -0,0 +1,430 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit eutils fdo-mime flag-o-matic java-pkg-opt-2 linux-info multilib pax-utils python-single-r1 toolchain-funcs udev
+
+MY_PV="${PV/beta/BETA}"
+MY_PV="${MY_PV/rc/RC}"
+MY_P=VirtualBox-${MY_PV}
+SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2
+	https://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-5.0.16-patches-01.tar.xz"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Family of powerful x86 virtualization products for enterprise as well as home use"
+HOMEPAGE="http://www.virtualbox.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa doc headless java libressl lvm pam pulseaudio +opengl python +qt4 +sdk +udev vboxwebsrv vnc"
+
+RDEPEND="!app-emulation/virtualbox-bin
+	~app-emulation/virtualbox-modules-${PV}
+	dev-libs/libIDL
+	>=dev-libs/libxslt-1.1.19
+	net-misc/curl
+	dev-libs/libxml2
+	media-libs/libpng:0=
+	media-libs/libvpx:0=
+	sys-libs/zlib
+	!headless? (
+		media-libs/libsdl:0[X,video]
+		x11-libs/libX11
+		x11-libs/libXcursor
+		x11-libs/libXext
+		x11-libs/libXmu
+		x11-libs/libXt
+		opengl? ( virtual/opengl media-libs/freeglut )
+		qt4? (
+			dev-qt/qtgui:4
+			dev-qt/qtcore:4
+			opengl? ( dev-qt/qtopengl:4 )
+			x11-libs/libXinerama
+		)
+	)
+	java? ( >=virtual/jre-1.6:= )
+	libressl? ( dev-libs/libressl:= )
+	!libressl? ( dev-libs/openssl:0= )
+	lvm? ( sys-fs/lvm2 )
+	udev? ( >=virtual/udev-171 )
+	vnc? ( >=net-libs/libvncserver-0.9.9 )"
+DEPEND="${RDEPEND}
+	>=dev-util/kbuild-0.1.9998_pre20131130
+	>=dev-lang/yasm-0.6.2
+	sys-devel/bin86
+	sys-libs/libcap
+	sys-power/iasl
+	virtual/pkgconfig
+	alsa? ( >=media-libs/alsa-lib-1.0.13 )
+	doc? (
+		dev-texlive/texlive-basic
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexrecommended
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-fontsextra
+	)
+	!headless? ( x11-libs/libXinerama )
+	java? ( >=virtual/jre-1.6:= )
+	pam? ( sys-libs/pam )
+	pulseaudio? ( media-sound/pulseaudio )
+	vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] )
+	${PYTHON_DEPS}"
+
+QA_TEXTRELS_x86="usr/lib/virtualbox-ose/VBoxGuestPropSvc.so
+	usr/lib/virtualbox/VBoxSDL.so
+	usr/lib/virtualbox/VBoxSharedFolders.so
+	usr/lib/virtualbox/VBoxDD2.so
+	usr/lib/virtualbox/VBoxOGLrenderspu.so
+	usr/lib/virtualbox/VBoxPython.so
+	usr/lib/virtualbox/VBoxDD.so
+	usr/lib/virtualbox/VBoxDDU.so
+	usr/lib/virtualbox/VBoxREM64.so
+	usr/lib/virtualbox/VBoxSharedClipboard.so
+	usr/lib/virtualbox/VBoxHeadless.so
+	usr/lib/virtualbox/VBoxRT.so
+	usr/lib/virtualbox/VBoxREM.so
+	usr/lib/virtualbox/VBoxSettings.so
+	usr/lib/virtualbox/VBoxKeyboard.so
+	usr/lib/virtualbox/VBoxSharedCrOpenGL.so
+	usr/lib/virtualbox/VBoxVMM.so
+	usr/lib/virtualbox/VirtualBox.so
+	usr/lib/virtualbox/VBoxOGLhosterrorspu.so
+	usr/lib/virtualbox/components/VBoxC.so
+	usr/lib/virtualbox/components/VBoxSVCM.so
+	usr/lib/virtualbox/components/VBoxDDU.so
+	usr/lib/virtualbox/components/VBoxRT.so
+	usr/lib/virtualbox/components/VBoxREM.so
+	usr/lib/virtualbox/components/VBoxVMM.so
+	usr/lib/virtualbox/VBoxREM32.so
+	usr/lib/virtualbox/VBoxPython2_7.so
+	usr/lib/virtualbox/VBoxXPCOMC.so
+	usr/lib/virtualbox/VBoxOGLhostcrutil.so
+	usr/lib/virtualbox/VBoxNetDHCP.so
+	usr/lib/virtualbox/VBoxNetNAT.so"
+
+REQUIRED_USE="
+	java? ( sdk )
+	python? ( sdk )
+	vboxwebsrv? ( java )
+	${PYTHON_REQUIRED_USE}
+"
+
+pkg_setup() {
+	if ! use headless && ! use qt4 ; then
+		einfo "No USE=\"qt4\" selected, this build will not include"
+		einfo "any Qt frontend."
+	elif use headless && use qt4 ; then
+		einfo "You selected USE=\"headless qt4\", defaulting to"
+		einfo "USE=\"headless\", this build will not include any X11/Qt frontend."
+	fi
+
+	if ! use opengl ; then
+		einfo "No USE=\"opengl\" selected, this build will lack"
+		einfo "the OpenGL feature."
+	fi
+	if ! use python ; then
+		einfo "You have disabled the \"python\" USE flag. This will only"
+		einfo "disable the python bindings being installed."
+	fi
+	java-pkg-opt-2_pkg_setup
+	python-single-r1_pkg_setup
+
+	tc-ld-disable-gold #bug 488176
+	tc-export CC CXX LD AR RANLIB
+	export HOST_CC="$(tc-getBUILD_CC)"
+}
+
+src_prepare() {
+	# Remove shipped binaries (kBuild,yasm), see bug #232775
+	rm -r kBuild/bin tools || die
+
+	# Disable things unused or split into separate ebuilds
+	sed -e "s@MY_LIBDIR@$(get_libdir)@" \
+		"${FILESDIR}"/${PN}-5-localconfig > LocalConfig.kmk || die
+
+	# Respect LDFLAGS
+	sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \
+		-i Config.kmk src/libs/xpcom18a4/Config.kmk || die
+
+	# Do not use hard-coded ld (related to bug #488176)
+	sed -e '/QUIET)ld /s@ld @$(LD) @' \
+		-i src/VBox/Devices/PC/ipxe/Makefile.kmk || die
+
+	# Use PAM only when pam USE flag is enbaled (bug #376531)
+	if ! use pam ; then
+		elog "Disabling PAM removes the possibility to use the VRDP features."
+		sed -i 's@^.*VBOX_WITH_PAM@#VBOX_WITH_PAM@' Config.kmk || die
+		sed -i 's@\(.*/auth/Makefile.kmk.*\)@#\1@' \
+			src/VBox/HostServices/Makefile.kmk || die
+	fi
+
+	# add correct java path
+	if use java ; then
+		sed "s@/usr/lib/jvm/java-6-sun@$(java-config -O)@" \
+			-i "${S}"/Config.kmk || die
+		java-pkg-opt-2_src_prepare
+	fi
+
+	if ! gcc-specs-pie ; then
+		rm "${WORKDIR}/patches/050_${PN}-5.0.2-nopie.patch" || die
+	fi
+
+	eapply "${WORKDIR}/patches"
+
+	eapply_user
+}
+
+src_configure() {
+	local myconf
+	use alsa       || myconf+=( --disable-alsa )
+	use doc        || myconf+=( --disable-docs )
+	use java       || myconf+=( --disable-java )
+	use lvm        || myconf+=( --disable-devmapper )
+	use opengl     || myconf+=( --disable-opengl )
+	use pulseaudio || myconf+=( --disable-pulse )
+	use python     || myconf+=( --disable-python )
+	use vboxwebsrv && myconf+=( --enable-webservice )
+	use vnc        && myconf+=( --enable-vnc )
+	if ! use headless ; then
+		use qt4 || myconf+=( --disable-qt4 )
+	else
+		myconf+=( --build-headless --disable-opengl )
+	fi
+	if use amd64 && ! has_multilib_profile ; then
+		myconf+=( --disable-vmmraw )
+	fi
+	# not an autoconf script
+	./configure \
+		--with-gcc="$(tc-getCC)" \
+		--with-g++="$(tc-getCXX)" \
+		--disable-dbus \
+		--disable-kmods \
+		${myconf[@]} \
+		|| die "configure failed"
+}
+
+src_compile() {
+	source ./env.sh || die
+
+	# Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
+	# and strip all flags
+	# strip-flags
+
+	MAKEJOBS=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+')
+	MAKELOAD=$(echo ${MAKEOPTS} | egrep -o '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+') #'
+	MAKEOPTS="${MAKEJOBS} ${MAKELOAD}"
+	MAKE="kmk" emake \
+		VBOX_BUILD_PUBLISHER=_Gentoo \
+		TOOL_GCC3_CC="$(tc-getCC)" TOOL_GCC3_CXX="$(tc-getCXX)" \
+		TOOL_GCC3_AS="$(tc-getCC)" TOOL_GCC3_AR="$(tc-getAR)" \
+		TOOL_GCC3_LD="$(tc-getCXX)" TOOL_GCC3_LD_SYSMOD="$(tc-getLD)" \
+		TOOL_GCC3_CFLAGS="${CFLAGS}" TOOL_GCC3_CXXFLAGS="${CXXFLAGS}" \
+		VBOX_GCC_OPT="${CXXFLAGS}" \
+		TOOL_YASM_AS=yasm KBUILD_VERBOSE=2 \
+		all
+}
+
+src_install() {
+	cd "${S}"/out/linux.${ARCH}/release/bin || die
+
+	local vbox_inst_path="/usr/$(get_libdir)/${PN}" each fwfile
+
+	vbox_inst() {
+		local binary="${1}"
+		local perms="${2:-0750}"
+		local path="${3:-${vbox_inst_path}}"
+
+		[[ -n "${binary}" ]] || die "vbox_inst: No binray given!"
+		[[ ${perms} =~ ^[[:digit:]]+{4}$ ]] || die "vbox_inst: perms must consist of four digits."
+
+		insinto ${path}
+		doins ${binary}
+		fowners root:vboxusers ${path}/${binary}
+		fperms ${perms} ${path}/${binary}
+	}
+
+	# Create configuration files
+	insinto /etc/vbox
+	newins "${FILESDIR}/${PN}-4-config" vbox.cfg
+
+	# Set the right libdir
+	sed -i \
+		-e "s@MY_LIBDIR@$(get_libdir)@" \
+		"${D}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed"
+
+	# Install the wrapper script
+	exeinto ${vbox_inst_path}
+	newexe "${FILESDIR}/${PN}-ose-5-wrapper" "VBox"
+	fowners root:vboxusers ${vbox_inst_path}/VBox
+	fperms 0750 ${vbox_inst_path}/VBox
+
+	# Install binaries and libraries
+	insinto ${vbox_inst_path}
+	doins -r components
+
+	# *.rc files for x86_64 are only available on multilib systems
+	local rcfiles="*.rc"
+	if use amd64 && ! has_multilib_profile ; then
+		rcfiles=""
+	fi
+	for each in VBox{ExtPackHelperApp,Manage,SVC,Tunctl,XPCOMIPCD} *so *r0 ${rcfiles} ; do
+		vbox_inst ${each}
+	done
+
+	# These binaries need to be suid root in any case.
+	for each in VBox{Headless,Net{AdpCtl,DHCP,NAT}} ; do
+		vbox_inst ${each} 4750
+	done
+
+	# Install EFI Firmware files (bug #320757)
+	pushd "${S}"/src/VBox/Devices/EFI/FirmwareBin &>/dev/null || die
+	for fwfile in VBoxEFI{32,64}.fd ; do
+		vbox_inst ${fwfile} 0644
+	done
+	popd &>/dev/null || die
+
+	# VBoxSVC and VBoxManage need to be pax-marked (bug #403453)
+	# VBoxXPCOMIPCD (bug #524202)
+	for each in VBox{Headless,Manage,SVC,XPCOMIPCD} ; do
+		pax-mark -m "${D}"${vbox_inst_path}/${each}
+	done
+
+	# Symlink binaries to the shipped wrapper
+	for each in vbox{headless,manage} VBox{Headless,Manage,VRDP} ; do
+		dosym ${vbox_inst_path}/VBox /usr/bin/${each}
+	done
+	dosym ${vbox_inst_path}/VBoxTunctl /usr/bin/VBoxTunctl
+
+	# VRDPAuth only works with this (bug #351949)
+	dosym VBoxAuth.so ${vbox_inst_path}/VRDPAuth.so
+
+	# set an env-variable for 3rd party tools
+	echo -n "VBOX_APP_HOME=${vbox_inst_path}" > "${T}/90virtualbox"
+	doenvd "${T}/90virtualbox"
+
+	if ! use headless ; then
+		vbox_inst VBoxSDL 4750
+		pax-mark -m "${D}"${vbox_inst_path}/VBoxSDL
+
+		for each in vboxsdl VBoxSDL ; do
+			dosym ${vbox_inst_path}/VBox /usr/bin/${each}
+		done
+
+		if use opengl && use qt4 ; then
+			vbox_inst VBoxTestOGL
+			pax-mark -m "${D}"${vbox_inst_path}/VBoxTestOGL
+		fi
+
+		if use qt4 ; then
+			vbox_inst VirtualBox 4750
+			pax-mark -m "${D}"${vbox_inst_path}/VirtualBox
+
+			for each in virtualbox VirtualBox ; do
+				dosym ${vbox_inst_path}/VBox /usr/bin/${each}
+			done
+
+			insinto /usr/share/${PN}
+			doins -r nls
+
+			newmenu "${FILESDIR}"/${PN}-ose.desktop-2 ${PN}.desktop
+		fi
+
+		pushd "${S}"/src/VBox/Artwork/OSE &>/dev/null || die
+		for size in 16 32 48 64 128 ; do
+			newicon -s ${size} ${PN}-${size}px.png ${PN}.png
+		done
+		newicon ${PN}-48px.png ${PN}.png
+		doicon -s scalable ${PN}.svg
+		popd &>/dev/null || die
+	fi
+
+
+	if use lvm ; then
+		vbox_inst VBoxVolInfo 4750
+		dosym ${vbox_inst_path}/VBoxVolInfo /usr/bin/VBoxVolInfo
+	fi
+
+	if use sdk ; then
+		insinto ${vbox_inst_path}
+		doins -r sdk
+
+		if use java ; then
+			java-pkg_regjar "${D}${vbox_inst_path}/sdk/bindings/xpcom/java/vboxjxpcom.jar"
+			java-pkg_regso "${D}${vbox_inst_path}/libvboxjxpcom.so"
+		fi
+	fi
+
+	if use udev ; then
+		# New way of handling USB device nodes for VBox (bug #356215)
+		local udevdir="$(get_udevdir)"
+		insinto ${udevdir}
+		doins VBoxCreateUSBNode.sh
+		fowners root:vboxusers ${udevdir}/VBoxCreateUSBNode.sh
+		fperms 0750 ${udevdir}/VBoxCreateUSBNode.sh
+		insinto ${udevdir}/rules.d
+		sed "s@%UDEVDIR%@${udevdir}@" "${FILESDIR}"/10-virtualbox.rules \
+			> "${T}"/10-virtualbox.rules || die
+		doins "${T}"/10-virtualbox.rules
+	fi
+
+	if use vboxwebsrv ; then
+		vbox_inst vboxwebsrv
+		dosym ${vbox_inst_path}/VBox /usr/bin/vboxwebsrv
+		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
+		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
+	fi
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+
+	if use udev ; then
+		udevadm control --reload-rules \
+			&& udevadm trigger --subsystem-match=usb
+	fi
+
+	if ! use headless && use qt4 ; then
+		elog "To launch VirtualBox just type: \"virtualbox\"."
+	fi
+	elog "You must be in the vboxusers group to use VirtualBox."
+	elog ""
+	elog "The latest user manual is available for download at:"
+	elog "http://download.virtualbox.org/virtualbox/${PV}/UserManual.pdf"
+	elog ""
+	elog "For advanced networking setups you should emerge:"
+	elog "net-misc/bridge-utils and sys-apps/usermode-utilities"
+	elog ""
+	elog "IMPORTANT!"
+	elog "If you upgrade from app-emulation/virtualbox-ose make sure to run"
+	elog "\"env-update\" as root and logout and relogin as the user you wish"
+	elog "to run ${PN} as."
+	elog ""
+	elog "Starting with version 4.0.0, ${PN} has USB-1 support."
+	elog "For USB-2 support, PXE-boot ability and VRDP support please emerge"
+	elog "  app-emulation/virtualbox-extpack-oracle"
+	elog "package."
+	elog "Starting with version 5.0.0, ${PN} no longer has the \"additions\" and"
+	elog "the \"extension\" USE flag. For installation of the guest additions ISO"
+	elog "image, please emerge"
+	elog "  app-emulation/virtualbox-additions"
+	elog "and for the USB2, USB3, VRDP and PXE boot ROM modules, please emerge"
+	elog "  app-emulation/virtualbox-extpack-oracle"
+	if ! use udev ; then
+		elog ""
+		elog "WARNING!"
+		elog "Without USE=udev, USB devices will likely not work in ${PN}."
+	elif [ -e "${ROOT}/etc/udev/rules.d/10-virtualbox.rules" ] ; then
+		elog ""
+		elog "Please remove \"${ROOT}/etc/udev/rules.d/10-virtualbox.rules\""
+		elog "or else USB in ${PN} won't work."
+	fi
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@ -44,6 +44,7 @@ DIST wine-1.7.8.tar.bz2 21463503 SHA256 30e17f5f863a09416f3d229666566b318dbb40f6
 DIST wine-1.7.9.tar.bz2 21323337 SHA256 79f99ecc24696915439c474c4953bb77652ab53f16b41daa4da270fe43279c5a SHA512 29f8aa715ebe47c8a06bd5f6a80cac3fb75b2ca7aa81648cc8aed5461cfd825e4da68b6209ca672dce42b968521cfd9bffffaadd2d85b904b55d99687a1c83d0 WHIRLPOOL 333fee72b2a0e9d6ab8a003712c38166bd27aaff384a2b940c089ecc846f7669c59efbeb5cdc2fc87a46d63b0d29d0335873bb7c22f05913bad430b81990241a
 DIST wine-1.8.tar.bz2 22843418 SHA256 f33b45c18112b2071fbf9edee0e8c575407f9e2a9855ca4ee918ed33efa7c6f4 SHA512 34308e82e04dee714fdbd10f29cd6cf6326e5e6e9134f7076e58b09988211065b8c6584881b7e5dcbc9b3906a819ab8a72b612b060cb9aa50b5b67f03bdab089 WHIRLPOOL 335a48f1b34cd1038d62290e52c3189b842d4077b7cf0bcb9d003595992360dc36eac1c592d31db44598de68010f3934daa1f4bcd0a2ca74aa130a39a74f7ce3
 DIST wine-1.9.4.tar.bz2 22974777 SHA256 75c1eab6b980870b367a73db6e57eb0dc9242c2be8546f94084577a0ed0bbbb8 SHA512 e7b35290ec8f451163a08e841c559698a6b7264b320058e38ac788bdde66042efbb88511b30fa38383844425eaf0b6f4ed4b8412feb843ed405cb510a4a9000c WHIRLPOOL 875e11e9163df8c3473aa7b79deb5c6783a2068e678c4008cacf730d81c2f141490264a10f4345ceadd7aba100d3fc71bdfda7858f89d966d339cc2772cd8190
+DIST wine-1.9.5.tar.bz2 23034629 SHA256 fb526308e7ac5e202c0f0b663d4c7a943419d9eec766af6831caf23914300f09 SHA512 cae779353bff61c215d0969288afe6e6e5192cdf0f86f8b15073861f0a22cb6b508ceb084e9b2cb5c5c658abfec5751edf9cb48930bc97c43ecbd6953427fc07 WHIRLPOOL 7f0c29b13b67660d364b2bbc86982a92f73409cfca3e8a31817c39df36d9ad476a9762f135d85fbb947746367277576a97fb6a012f346c11454c43ef75ac9fa7
 DIST wine-gentoo-2013.06.24.tar.bz2 85442 SHA256 bfbf6b25e98f717320de2ede467e3628fbc749d936b8449f8477c9dc6f41e04b SHA512 b6819889314f6a6ea16c1332f4b177c43623116763969c31b23b61754cd304dd085f5d3eafbe847159331eb97dddd9b4c10699430129ea4a71da418c1fe175f0 WHIRLPOOL 227e0ac6569736d4ad5813cef49f775dae956f4fc9255de95753d5d3cba1bf6cf3db31d23d3702bb54d2e60c5a6f779b602f0efb2096e4c827c924565b273d00
 DIST wine-gentoo-2015.03.07.tar.bz2 85419 SHA256 f13f93dc49bbc33a294c4d511b6e01aec2d38bff77a1e44d07668291add1ab04 SHA512 bae1d2d5575d340d01f44008104f0e5ec0c4a4982995dec37d501594cd21d07a2b4ad4465c4273646d5bf6521996b4b82471097864be75342abe3e7d478a56bd WHIRLPOOL 0f254dd692e87a1f71dd19f6c1c8c59b8a91b994e75912a2e6e3ba5e875b85119fe497a331a95c2ce33bbf5f064143d23ee00275da92c494227de0807c9abb06
 DIST wine-mono-0.0.8.msi 46967296 SHA256 3dfc23bbc29015e4e538dab8b83cb825d3248a0e5cf3b3318503ee7331115402 SHA512 d3009f2301b0a006136e880025a736f24612faa7a954956896124ec7282d35b678f02658e8be12b1c02ee217e594a2c728a9258c36ccb346b186a4781951adbd WHIRLPOOL 1d4b2e88ebab1f603326a238cc908982c7e135a33340087e8645572838d2b6034764e9fe787bb890792dea4c0531d26f9a6a811a7c200edb99ab82f975179389
@ -80,6 +81,7 @@ DIST wine-staging-1.7.54.tar.gz 9647030 SHA256 b244ab05326e0a4c149beba0684afc100
 DIST wine-staging-1.7.55.tar.gz 9604441 SHA256 856b630fe95250e3d2dfc80588529e42e92e37f2e974ce8d3da37b39bf5cc3c3 SHA512 a6fbfa01b6d6efc75f79235aea86091c32ddf91ca300c73325c8347949c627f53ceb0fe085d6c212602797b0496d36c0a79f08eae4644a17774e95906332032d WHIRLPOOL ad232568c9df5d436a79a3557c82e231eed121356d8db1f5a3c0e7249b6c2760d87bb433ff30d6db53ce190b2d49401aa387b06f0c3f74925aefea7b1d73f112
 DIST wine-staging-1.8.tar.gz 9632566 SHA256 c66f3dd6a760d516affe7467c4fb2d15ea8e2f0c72bcda1982219948dcdff11b SHA512 7b030b217ed0b37b8037d782406f75fcdb681c81371eafcab87175c0e6ac8b50fc58fe364e933e79eff168c1755412276fae3f914b7c36a6937aea1f6e35b022 WHIRLPOOL 8cff5d1d4c23405b820dbf9e7f73f7bba785e04ec2d9087b0977bb7aa1e6b84c2e6c3ac2f9cc72ba3c16f2b9c8c3607ea02ef1cd52d428a2b441333a424d9a21
 DIST wine-staging-1.9.4.tar.gz 9719676 SHA256 1b3c6bb3e21e549fb8657cd9a2117946b7e78140b400c614dd41b041b6dc2674 SHA512 2c81b9f0315ed4f68d1874482805c9b6d3f2f9611f6dd1477ad0632d17f66e7f5e75720e5c7cef3a873876541c9d7d212fa8803a57cbec415aca32793a734634 WHIRLPOOL 0a66f53327976dd63532b9350d64461df3dcb0ea2fdc63d3498eac94d92387cf4bd53054c693c4a902f7fbba8ad0f2fdf59682e8622f3920a9a426344c656f54
+DIST wine-staging-1.9.5.tar.gz 9889302 SHA256 e12c5fb741e6c5b55b99c37d6bba1746b0f40317f27198406e63f260ede3600c SHA512 aaaf08449e956f5f2b42440f8becf7233a22f2f807041b5524fae3c25c80078b86a84e6000803e014a5d2fc089e3df78cb66f0d1fe35675ae0f4ffdfa7ba3f10 WHIRLPOOL 692da1ec383b7efbcb12c8fa4078ed9b4143eb101baa06523f5bd85c749f0b87fe9a550e4d60e3c33e3d896782c9bc957f61171d01dcadbc8847ecbbc57c40ff
 DIST wine_gecko-2.21-x86.msi 20871680 SHA256 f01fafa6d7aab995c38add77315c4cbc2f32f52d5d6a9350056f42b62d631fd8 SHA512 f4ca9ca5b876dc39e906991e58c6da8ef4103782f83ba781ff27556c0ebdab7fe10c14f0551e900442a5d57a2c619da6e5ed6ed42323edcdd55ce9789c4c83ac WHIRLPOOL d1db97175b047652499c97c968b71c08c5b44774423f22ae626f89b4dde3d03b46295e5caae228f1f8614209e943e8246854b478eef3abb186e8de4c341b0a0d
 DIST wine_gecko-2.21-x86_64.msi 21646336 SHA256 bc370bdc899f66d98f31c4d410a6952aa82c0c9c0a0ec27f2a11243c9b412c3f SHA512 2a48a7697beba4e45816a9eff09e181de353d8c93e02a70108fa77d27136cd5cd75b21c42caa7702a09f86544669ae2bbfc6975b1fc0d7fcb20150a4bc4ea514 WHIRLPOOL 2fce9b9a190a52c173551d47428dd8b8dc54d5878682733e0006a3f06f216cd9f47a88ada49f92fa5697ece8b2942a88f937bd2722b4cb85d2c35c19bda29b85
 DIST wine_gecko-2.24-x86.msi 22373888 SHA256 6e38acae87ea66e2c1e8f2f0afe88f89eed3e6e0b431cd3da38dea814b71202c SHA512 f158d28ca09bc900a2680892e7ac10770e06050a9251e1ec3a953fee0bf9b1c326e166f92fb88a4648297b6587c91a5ef5af35f267bb2ba5f679da4c8fdb6898 WHIRLPOOL bbe7a2572d89dc5e0347ba11b2014bac79fc4427d7551655313a46b147a79c1607b7f46596877c459ddaa0e202337fb3d217429ddd6a4df49ee33b373a788487
--- a/app-emulation/wine/files/pr69140.c
+++ b/app-emulation/wine/files/pr69140.c
@ -0,0 +1,24 @@
+/* { dg-do compile { target lp64 } } */
+/* { dg-options "-O2 -mincoming-stack-boundary=3" } */
+
+typedef struct {
+  unsigned int buf[4];
+  unsigned char in[64];
+} MD4_CTX;
+
+static void
+MD4Transform (unsigned int buf[4], const unsigned int in[16])
+{
+  unsigned int a, b, c, d;
+  (b) += ((((c)) & ((d))) | ((~(c)) & ((a)))) + (in[7]);
+  (a) += ((((b)) & ((c))) | ((~(b)) & ((d)))) + (in[8]);
+  (d) += ((((a)) & ((b))) | ((~(a)) & ((c)))) + (in[9]);
+  buf[3] += d;
+}
+
+void __attribute__((ms_abi))
+MD4Update (MD4_CTX *ctx, const unsigned char *buf)
+{
+  MD4Transform( ctx->buf, (unsigned int *)ctx->in);
+  MD4Transform( ctx->buf, (unsigned int *)ctx->in);
+}
--- a/app-emulation/wine/wine-1.9.4.ebuild
+++ b/app-emulation/wine/wine-1.9.4.ebuild
@ -174,6 +174,20 @@ wine_build_environment_check() {
 			return 1
 		fi
 	fi
+	# bug #574044
+	if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
+		einfo "Checking for gcc-5-3 stack realignment compiler bug ..."
+		$(tc-getCC) -O2 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 || die
+		# Run in subshell to prevent "Aborted" message
+		if ! ( "${T}"/69140 || false ) >/dev/null 2>&1; then
+			eerror "Wine cannot be built with this version of gcc-5.3"
+			eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
+			eerror "or use gcc-config to select a different compiler version."
+			eerror "See https://bugs.gentoo.org/574044"
+			eerror
+			return 1
+		fi
+	fi

 	if use abi_x86_64 && [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]]; then
 		eerror "You need gcc-4.4+ to build 64-bit wine"
--- a/app-emulation/wine/wine-1.9.5.ebuild
+++ b/app-emulation/wine/wine-1.9.5.ebuild
@ -0,0 +1,442 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+AUTOTOOLS_AUTORECONF=1
+PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
+PLOCALE_BACKUP="en"
+
+inherit autotools-utils eutils fdo-mime flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://source.winehq.org/git/wine.git http://source.winehq.org/git/wine.git"
+	EGIT_BRANCH="master"
+	inherit git-r3
+	SRC_URI=""
+	#KEYWORDS=""
+else
+	MAJOR_V=$(get_version_component_range 1-2)
+	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}/${P}.tar.bz2"
+	KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+fi
+
+GV="2.44"
+MV="4.6.0"
+STAGING_P="wine-staging-${PV}"
+STAGING_DIR="${WORKDIR}/${STAGING_P}"
+WINE_GENTOO="wine-gentoo-2015.03.07"
+DESCRIPTION="Free implementation of Windows(tm) on Unix"
+HOMEPAGE="http://www.winehq.org/"
+SRC_URI="${SRC_URI}
+	gecko? (
+		abi_x86_32? ( https://dl.winehq.org/wine/wine-gecko/${GV}/wine_gecko-${GV}-x86.msi )
+		abi_x86_64? ( https://dl.winehq.org/wine/wine-gecko/${GV}/wine_gecko-${GV}-x86_64.msi )
+	)
+	mono? ( https://dl.winehq.org/wine/wine-mono/${MV}/wine-mono-${MV}.msi )
+	https://dev.gentoo.org/~tetromino/distfiles/${PN}/${WINE_GENTOO}.tar.bz2"
+
+if [[ ${PV} == "9999" ]] ; then
+	STAGING_EGIT_REPO_URI="git://github.com/wine-compholio/wine-staging.git"
+else
+	SRC_URI="${SRC_URI}
+	staging? ( https://github.com/wine-compholio/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz )"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes s3tc samba scanner selinux +ssl staging test +threads +truetype +udisks v4l vaapi +X +xcomposite xinerama +xml"
+REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
+	test? ( abi_x86_32 )
+	elibc_glibc? ( threads )
+	pipelight? ( staging )
+	s3tc? ( staging )
+	vaapi? ( staging )
+	osmesa? ( opengl )" #286560
+
+# FIXME: the test suite is unsuitable for us; many tests require net access
+# or fail due to Xvfb's opengl limitations.
+RESTRICT="test"
+
+COMMON_DEPEND="
+	truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
+	capi? ( net-dialup/capi4k-utils )
+	ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] )
+	udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+	fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
+	gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
+	openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
+	gstreamer? (
+		media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
+		media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
+	)
+	X? (
+		x11-libs/libXcursor[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr[${MULTILIB_USEDEP}]
+		x11-libs/libXi[${MULTILIB_USEDEP}]
+		x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
+	)
+	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+	cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
+	opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
+	opengl? (
+		virtual/glu[${MULTILIB_USEDEP}]
+		virtual/opengl[${MULTILIB_USEDEP}]
+	)
+	gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
+	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
+	ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
+	lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
+	mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
+	netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
+	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
+	odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
+	osmesa? ( media-libs/mesa[osmesa,${MULTILIB_USEDEP}] )
+	pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
+	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
+	staging? ( sys-apps/attr[${MULTILIB_USEDEP}] )
+	xml? (
+		dev-libs/libxml2[${MULTILIB_USEDEP}]
+		dev-libs/libxslt[${MULTILIB_USEDEP}]
+	)
+	scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
+	ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
+	png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
+	v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
+	vaapi? ( x11-libs/libva[X,${MULTILIB_USEDEP}] )
+	xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
+	abi_x86_32? (
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-baselibs-20140508-r14
+		!app-emulation/emul-linux-x86-db[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-db-20140508-r3
+		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-medialibs-20140508-r6
+		!app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-opengl-20140508-r1
+		!app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-sdl-20140508-r1
+		!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-soundlibs-20140508
+		!app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
+		!<app-emulation/emul-linux-x86-xlibs-20140508
+	)"
+
+RDEPEND="${COMMON_DEPEND}
+	dos? ( games-emulation/dosbox )
+	perl? ( dev-lang/perl dev-perl/XML-Simple )
+	s3tc? ( >=media-libs/libtxc_dxtn-1.0.1-r1[${MULTILIB_USEDEP}] )
+	samba? ( >=net-fs/samba-3.0.25 )
+	selinux? ( sec-policy/selinux-wine )
+	udisks? ( sys-fs/udisks:2 )
+	pulseaudio? ( realtime? ( sys-auth/rtkit ) )"
+
+# tools/make_requests requires perl
+DEPEND="${COMMON_DEPEND}
+	staging? ( dev-lang/perl dev-perl/XML-Simple )
+	X? (
+		x11-proto/inputproto
+		x11-proto/xextproto
+		x11-proto/xf86vidmodeproto
+	)
+	xinerama? ( x11-proto/xineramaproto )
+	prelink? ( sys-devel/prelink )
+	>=sys-kernel/linux-headers-2.6
+	virtual/pkgconfig
+	virtual/yacc
+	sys-devel/flex"
+
+# These use a non-standard "Wine" category, which is provided by
+# /etc/xdg/applications-merged/wine.menu
+QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
+usr/share/applications/wine-notepad.desktop
+usr/share/applications/wine-uninstaller.desktop
+usr/share/applications/wine-winecfg.desktop"
+
+wine_build_environment_check() {
+	[[ ${MERGE_TYPE} = "binary" ]] && return 0
+
+	# bug #549768
+	if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
+		einfo "Checking for gcc-5 ms_abi compiler bug ..."
+		$(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die
+		# Run in subshell to prevent "Aborted" message
+		if ! ( "${T}"/pr66838 || false ) >/dev/null 2>&1; then
+			eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
+			eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
+			eerror "or use gcc-config to select a different compiler version."
+			eerror "See https://bugs.gentoo.org/549768"
+			eerror
+			return 1
+		fi
+	fi
+	# bug #574044
+	if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
+		einfo "Checking for gcc-5-3 stack realignment compiler bug ..."
+		$(tc-getCC) -O2 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 || die
+		# Run in subshell to prevent "Aborted" message
+		if ! ( "${T}"/69140 || false ) >/dev/null 2>&1; then
+			eerror "Wine cannot be built with this version of gcc-5.3"
+			eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
+			eerror "or use gcc-config to select a different compiler version."
+			eerror "See https://bugs.gentoo.org/574044"
+			eerror
+			return 1
+		fi
+	fi
+
+	if use abi_x86_64 && [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]]; then
+		eerror "You need gcc-4.4+ to build 64-bit wine"
+		eerror
+		return 1
+	fi
+
+	if use abi_x86_32 && use opencl && [[ x$(eselect opencl show 2> /dev/null) = "xintel" ]]; then
+		eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
+		eerror "See https://bugs.gentoo.org/487864 for more details."
+		eerror
+		return 1
+	fi
+}
+
+pkg_pretend() {
+	wine_build_environment_check || die
+}
+
+pkg_setup() {
+	wine_build_environment_check || die
+}
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]] ; then
+		git-r3_src_unpack
+		if use staging; then
+			local WINE_COMMIT=${EGIT_VERSION}
+
+			EGIT_REPO_URI=${STAGING_EGIT_REPO_URI}
+			unset ${PN}_LIVE_REPO;
+			unset EGIT_COMMIT;
+
+			EGIT_CHECKOUT_DIR=${STAGING_DIR} git-r3_src_unpack
+
+			local STAGING_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die
+
+			if [[ "${WINE_COMMIT}" != "${STAGING_COMMIT}" ]]; then
+				einfo "The current Staging patchset is not guaranteed to apply on this WINE commit."
+				einfo "If src_prepare fails, try emerging with the env var EGIT_COMMIT."
+				einfo "Example: EGIT_COMMIT=${STAGING_COMMIT} emerge -1 wine"
+			fi
+		fi
+	else
+		unpack ${P}.tar.bz2
+		use staging && unpack "${STAGING_P}.tar.gz"
+	fi
+
+	unpack "${WINE_GENTOO}.tar.bz2"
+
+	l10n_find_plocales_changes "${S}/po" "" ".po"
+}
+
+src_prepare() {
+	local md5="$(md5sum server/protocol.def)"
+	local PATCHES=(
+		"${FILESDIR}"/${PN}-1.5.26-winegcc.patch #260726
+		"${FILESDIR}"/${PN}-1.9.5-multilib-portage.patch #395615
+		"${FILESDIR}"/${PN}-1.7.12-osmesa-check.patch #429386
+		"${FILESDIR}"/${PN}-1.6-memset-O3.patch #480508
+	)
+	if use staging; then
+		ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
+		ewarn "Wine bugzilla should explicitly state that staging was used."
+
+		local STAGING_EXCLUDE=""
+		use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W Pipelight"
+
+		#577198 1.9.5 only
+		STAGING_EXCLUDE="${STAGING_EXCLUDE} -W makefiles-Disabled_Rules"
+
+		# Launch wine-staging patcher in a subshell, using epatch as a backend, and gitapply.sh as a backend for binary patches
+		ebegin "Running Wine-Staging patch installer"
+		(
+			set -- DESTDIR="${S}" --backend=epatch --no-autoconf --all ${STAGING_EXCLUDE}
+			cd "${STAGING_DIR}/patches"
+			source "${STAGING_DIR}/patches/patchinstall.sh"
+		)
+		eend $?
+	fi
+	autotools-utils_src_prepare
+
+	# Modification of the server protocol requires regenerating the server requests
+	if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
+		einfo "server/protocol.def was patched; running tools/make_requests"
+		tools/make_requests || die #432348
+	fi
+	sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
+	if ! use run-exes; then
+		sed -i '/^MimeType/d' loader/wine.desktop || die #117785
+	fi
+
+	# hi-res default icon, #472990, http://bugs.winehq.org/show_bug.cgi?id=24652
+	cp "${WORKDIR}"/${WINE_GENTOO}/icons/oic_winlogo.ico dlls/user32/resources/ || die
+
+	l10n_get_locales > po/LINGUAS # otherwise wine doesn't respect LINGUAS
+}
+
+src_configure() {
+	export LDCONFIG=/bin/true
+	use custom-cflags || strip-flags
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--sysconfdir=/etc/wine
+		$(use_with alsa)
+		$(use_with capi)
+		$(use_with lcms cms)
+		$(use_with cups)
+		$(use_with ncurses curses)
+		$(use_with udisks dbus)
+		$(use_with fontconfig)
+		$(use_with ssl gnutls)
+		$(use_enable gecko mshtml)
+		$(use_with gphoto2 gphoto)
+		$(use_with gsm)
+		$(use_with gstreamer)
+		--without-hal
+		$(use_with jpeg)
+		$(use_with ldap)
+		$(use_enable mono mscoree)
+		$(use_with mp3 mpg123)
+		$(use_with netapi)
+		$(use_with nls gettext)
+		$(use_with openal)
+		$(use_with opencl)
+		$(use_with opengl)
+		$(use_with osmesa)
+		$(use_with oss)
+		$(use_with pcap)
+		$(use_with png)
+		$(use_with pulseaudio pulse)
+		$(use_with threads pthread)
+		$(use_with scanner sane)
+		$(use_enable test tests)
+		$(use_with truetype freetype)
+		$(use_with v4l)
+		$(use_with X x)
+		$(use_with xcomposite)
+		$(use_with xinerama)
+		$(use_with xml)
+		$(use_with xml xslt)
+	)
+
+	use staging && myconf+=(
+		--with-xattr
+		$(use_with vaapi va)
+	)
+
+	local PKG_CONFIG AR RANLIB
+	# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
+	# set AR and RANLIB to make QA scripts happy; #483342
+	tc-export PKG_CONFIG AR RANLIB
+
+	if use amd64; then
+		if [[ ${ABI} == amd64 ]]; then
+			myconf+=( --enable-win64 )
+		else
+			myconf+=( --disable-win64 )
+		fi
+
+		# Note: using --with-wine64 results in problems with multilib.eclass
+		# CC/LD hackery. We're using separate tools instead.
+	fi
+
+	ECONF_SOURCE=${S} \
+	econf "${myconf[@]}"
+	emake depend
+}
+
+multilib_src_test() {
+	# FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
+	if [[ ${ABI} == x86 ]]; then
+		if [[ $(id -u) == 0 ]]; then
+			ewarn "Skipping tests since they cannot be run under the root user."
+			ewarn "To run the test ${PN} suite, add userpriv to FEATURES in make.conf"
+			return
+		fi
+
+		WINEPREFIX="${T}/.wine-${ABI}" \
+		Xemake test
+	fi
+}
+
+multilib_src_install_all() {
+	local DOCS=( ANNOUNCE AUTHORS README )
+	local l
+	add_locale_docs() {
+		local locale_doc="documentation/README.$1"
+		[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
+	}
+	l10n_for_each_locale_do add_locale_docs
+
+	einstalldocs
+	prune_libtool_files --all
+
+	emake -C "../${WINE_GENTOO}" install DESTDIR="${D}" EPREFIX="${EPREFIX}"
+	if use gecko ; then
+		insinto /usr/share/wine/gecko
+		use abi_x86_32 && doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi
+		use abi_x86_64 && doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi
+	fi
+	if use mono ; then
+		insinto /usr/share/wine/mono
+		doins "${DISTDIR}"/wine-mono-${MV}.msi
+	fi
+	if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
+		rm "${D}"usr/bin/{wine{dump,maker},function_grep.pl} "${D}"usr/share/man/man1/wine{dump,maker}.1 || die
+	fi
+
+	use abi_x86_32 && pax-mark psmr "${D}"usr/bin/wine{,-preloader} #255055
+	use abi_x86_64 && pax-mark psmr "${D}"usr/bin/wine64{,-preloader}
+
+	if use abi_x86_64 && ! use abi_x86_32; then
+		dosym /usr/bin/wine{64,} # 404331
+		dosym /usr/bin/wine{64,}-preloader
+	fi
+
+	# respect LINGUAS when installing man pages, #469418
+	for l in de fr pl; do
+		use linguas_${l} || rm -r "${D}"usr/share/man/${l}*
+	done
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+
+	if ! use gecko; then
+		ewarn "Without Wine Gecko, wine prefixes will not have a default"
+		ewarn "implementation of iexplore.  Many older windows applications"
+		ewarn "rely upon the existence of an iexplore implementation, so"
+		ewarn "you will likely need to install an external one, like via winetricks"
+	fi
+	if ! use mono; then
+		ewarn "Without Wine Mono, wine prefixes will not have a default"
+		ewarn "implementation of .NET.  Many windows applications rely upon"
+		ewarn "the existence of a .NET implementation, so you will likely need"
+		ewarn "to install an external one, like via winetricks"
+	fi
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+}
--- a/app-emulation/wine/wine-9999.ebuild
+++ b/app-emulation/wine/wine-9999.ebuild
@ -50,7 +50,6 @@ IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fon
 REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
 	test? ( abi_x86_32 )
 	elibc_glibc? ( threads )
-	mono? ( abi_x86_32 )
 	pipelight? ( staging )
 	s3tc? ( staging )
 	vaapi? ( staging )
@ -174,6 +173,20 @@ wine_build_environment_check() {
 			return 1
 		fi
 	fi
+	# bug #574044
+	if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
+		einfo "Checking for gcc-5-3 stack realignment compiler bug ..."
+		$(tc-getCC) -O2 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 || die
+		# Run in subshell to prevent "Aborted" message
+		if ! ( "${T}"/69140 || false ) >/dev/null 2>&1; then
+			eerror "Wine cannot be built with this version of gcc-5.3"
+			eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
+			eerror "or use gcc-config to select a different compiler version."
+			eerror "See https://bugs.gentoo.org/574044"
+			eerror
+			return 1
+		fi
+	fi

 	if use abi_x86_64 && [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]]; then
 		eerror "You need gcc-4.4+ to build 64-bit wine"
--- a/app-forensics/sleuthkit/sleuthkit-4.0.2.ebuild
+++ b/app-forensics/sleuthkit/sleuthkit-4.0.2.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -19,7 +19,7 @@ DEPEND="dev-db/sqlite:3
 	ewf? ( app-forensics/libewf )
 	aff? ( app-forensics/afflib )"
 RDEPEND="${DEPEND}
-	dev-perl/DateManip"
+	dev-perl/Date-Manip"

 DOCS=( NEWS.txt README.txt )

--- a/app-forensics/sleuthkit/sleuthkit-4.1.0.ebuild
+++ b/app-forensics/sleuthkit/sleuthkit-4.1.0.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -21,7 +21,7 @@ DEPEND="dev-db/sqlite:3
 	ewf? ( app-forensics/libewf )
 	aff? ( app-forensics/afflib )"
 RDEPEND="${DEPEND}
-	dev-perl/DateManip"
+	dev-perl/Date-Manip"

 DOCS=( NEWS.txt README.txt )

--- a/app-forensics/sleuthkit/sleuthkit-4.1.2.ebuild
+++ b/app-forensics/sleuthkit/sleuthkit-4.1.2.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -21,7 +21,7 @@ DEPEND="dev-db/sqlite:3
 	ewf? ( app-forensics/libewf )
 	aff? ( app-forensics/afflib )"
 RDEPEND="${DEPEND}
-	dev-perl/DateManip"
+	dev-perl/Date-Manip"

 DOCS=( NEWS.txt README.txt )

--- a/app-forensics/sleuthkit/sleuthkit-4.1.3.ebuild
+++ b/app-forensics/sleuthkit/sleuthkit-4.1.3.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -21,7 +21,7 @@ DEPEND="dev-db/sqlite:3
 	ewf? ( app-forensics/libewf )
 	aff? ( app-forensics/afflib )"
 RDEPEND="${DEPEND}
-	dev-perl/DateManip"
+	dev-perl/Date-Manip"

 DOCS=( NEWS.txt README.txt )

--- a/app-laptop/dispad/Manifest
+++ b/app-laptop/dispad/Manifest
@ -1,2 +1 @@
 DIST dispad-0.3.1.tar.gz 97952 SHA256 507ec8ab213db38dcef81df9df776b8dad1ec9e8aa5ea52cff1cd2c29a32c647 SHA512 fa9666e79de31f79f3567ae3b529c6df3cf56c134c1fe30d62b7d863d623c89abd6b1153de972507a3795c20001f11caf1e49926a402d145a048014aa97cd400 WHIRLPOOL 8cdc48bd58db72d49a1e794bd858b74cfac88867f0a2612ba7a1d8c85d443f177425c32752babbbae4fd8517d621d66bd0bd2dec9c449ff8f170c345bab559f6
-DIST dispad-0.3.tar.gz 20062 SHA256 fac39c50cdae5d6a2dee5ceaf3c6e6bea95b65b72b5bf5e1829ac08f91b696a0 SHA512 c0d548a2218200f435f25d1837bf9fe1b9fe19fc4f52f19832d1b5718699f1d5af2eabe36a669a382c614902fa174c7d06b3ee15cc6e5cc2124d8423c2804965 WHIRLPOOL 42a6dacd7d4ab9bd74a3f97e94e4dfdad0ce7e7b83c6bcbeaf47ed73b4328e01017ec5e1a660d89e8f76f243666b9fe3af6b9771c689c560f08e0af33c54a055
--- a/app-laptop/dispad/dispad-0.3.ebuild
+++ b/app-laptop/dispad/dispad-0.3.ebuild
@ -1,26 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-inherit autotools
-
-DESCRIPTION="Daemon to disable trackpads while typing"
-HOMEPAGE="https://github.com/BlueDragonX/dispad"
-SRC_URI="https://github.com/BlueDragonX/dispad/tarball/v${PV/_/-} -> ${P}.tar.gz"
-
-S="${WORKDIR}/BlueDragonX-dispad-6e96d0d"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-DEPEND="x11-libs/libX11
-	x11-libs/libXi
-	dev-libs/confuse"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	eautoreconf -i
-}
--- a/app-laptop/laptop-mode-tools/Manifest
+++ b/app-laptop/laptop-mode-tools/Manifest
@ -2,3 +2,4 @@ DIST laptop-mode-tools_1.66.tar.gz 111175 SHA256 0e8488d6112fa7edfa7e4b1084b16f8
 DIST laptop-mode-tools_1.67.tar.gz 111730 SHA256 5205e5b4fa0eddcbb14e06a496a9e405cf3873eb5065e03e6a1237e29c8f3cd0 SHA512 a0f8f5c6c2616bbdbe86f82b0dc7ad1bd4b4315fc074b7b97ad29a9dec4e63164d625da732f6b6b9a73dd039d415c06da51c83c5aa1056e7893b65691da1437f WHIRLPOOL 03fd0f7bc7300d7357d6b1f27a38aed54c7b77a7f8633910d3bfa6aede862f24238bde9322398cedea0e6b9d1bcd85b988e56ff1f2aeb62d691a209aa6f2acab
 DIST laptop-mode-tools_1.68.1.tar.gz 113137 SHA256 08d08f3d7ad76fb5f48232428584481a8e160421671533ece2648e968b519ba6 SHA512 68e230e3215631cff31157865eac6e73c08534e5481016425a41e1c166746e0df987a21cc158edc4dac5b1469c515eb23c89a51084b4f993debd28befc82064a WHIRLPOOL b421b48627fa2c80af0024c4c8705643330ddcfce5cbcdb0b71462fea466ebbac2b5a254855dba315ca0ab5b056a23a9f5ab5e66c84b15d17e2fcdbefe816589
 DIST laptop-mode-tools_1.68.tar.gz 112695 SHA256 a9ceca49a623fecf0d8067cd71d11610a254af7e87a3a462cb4277527a905558 SHA512 1870c0400b32f4bb95f407db64f9e8920391c0758f37fa493545865ba0801ed6d67491c8d69bd7565d72a3437fe01524153fdd4dcf2cd69b49e7f1b0a54ff0c4 WHIRLPOOL 28b5e9fe7744824c4b562e8123e9403020a6096e32960f23592cc4393fce1379cc359602e83ff959187a953965e353d85c42c901c7ec6e382dd1ff67e0fb5699
+DIST laptop-mode-tools_1.69.tar.gz 115026 SHA256 7028a646532d30d27cb8ee13a87d6b2f0045b6d8b7fbea3af77f167dd22ccca5 SHA512 5dda4170473b62af1e49cc5d07298c7c5036b5f0fa9ad8b6f01265257a266c52f36a1e02c252544a10a87c7417393b54db98278b8a5bd6c1bd62f9f980e10831 WHIRLPOOL 5b9e48cb90b5da41a0d9864aa5ef2446f933e2b17841c2be9a89337a14150999330e50814642e8ddc648516d3c2c9ef64ce599e4513b8ed61046bfb121063e17
--- a/app-laptop/laptop-mode-tools/laptop-mode-tools-1.69.ebuild
+++ b/app-laptop/laptop-mode-tools/laptop-mode-tools-1.69.ebuild
@ -0,0 +1,93 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils multilib systemd udev
+
+MY_P=${PN}_${PV}
+
+DESCRIPTION="Linux kernel laptop_mode user-space utilities"
+HOMEPAGE="https://github.com/rickysarraf/laptop-mode-tools/wiki"
+SRC_URI="https://github.com/rickysarraf/${PN}/releases/download/${PV}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="+acpi apm bluetooth scsi"
+
+RDEPEND="net-wireless/wireless-tools
+	sys-apps/iproute2
+	sys-apps/ethtool
+	sys-apps/hdparm
+	sys-apps/which
+	acpi? ( sys-power/acpid )
+	apm? ( sys-apps/apmd )
+	bluetooth? ( net-wireless/bluez:= )
+	scsi? ( sys-apps/sdparm )"
+DEPEND=""
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	# This should avoid conflict with pm-powersave wrt #327443 and #396703
+	cat <<-EOF > "${T}"/${PN}
+	HOOK_BLACKLIST="00powersave"
+	EOF
+}
+
+src_compile() { :; }
+
+src_install() {
+	DESTDIR="${D}" \
+		INIT_D="none" \
+		MAN_D="/usr/share/man" \
+		LIB_D="/usr/$(get_libdir)" \
+		UDEV_D="$(get_udevdir)" \
+		SYSTEMD_UNIT_D="$(systemd_get_unitdir)" \
+		TMPFILES_D="/usr/lib/tmpfiles.d" \
+		ACPI="$(use acpi && echo force || echo disabled)" \
+		PMU="$(false && echo force || echo disabled)" \
+		APM="$(use apm && echo force || echo disabled)" \
+		SYSTEMD=yes \
+		sh ./install.sh || die
+
+	dodoc Documentation/*.txt README.md
+	newinitd "${FILESDIR}"/laptop_mode.init-1.4 laptop_mode
+
+	# See src_prepare()
+	insinto /etc/pm/config.d
+	doins "${T}"/${PN}
+}
+
+pkg_postinst() {
+	if use acpi || use apm; then
+		if use acpi; then
+			daemon_name="acpid"
+		elif use apm; then
+			deamon_name="apmd"
+		fi
+		if [ "$(rc-config list default | grep laptop_mode)" = "" ] || [ "$(rc-config list default | grep ${daemon_name} )" = "" ]; then
+			ewarn "To enable automatic power state event handling,"
+			ewarn "e.g. enabling laptop_mode after unplugging the battery,"
+			ewarn "both laptop_mode and the ${daemon_name} daemon must be"
+			ewarn "added to default runlevel:"
+			if [ "$(rc-config list default | grep laptop_mode)" = "" ]; then
+				ewarn "# rc-update add laptop_mode default"
+			fi
+			if [ "$(rc-config list default | grep ${daemon_name} )" = "" ]; then
+				ewarn "# rc-update add ${daemon_name} default"
+			fi
+		fi
+	else
+		ewarn "Without USE=\"acpi\" or USE=\"apm\" ${PN} can not"
+		ewarn "automatically disable laptop_mode on low battery."
+		ewarn
+		ewarn "This means you can lose up to 10 minutes of work if running"
+		ewarn "out of battery while laptop_mode is enabled."
+		ewarn
+		ewarn "Please see laptop-mode.txt in /usr/share/doc/${PF} for further"
+		ewarn "information."
+		ewarn
+	fi
+}
--- a/app-misc/beancounter/beancounter-0.8.10-r1.ebuild
+++ b/app-misc/beancounter/beancounter-0.8.10-r1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="mysql postgres sqlite"

-DEPEND="dev-perl/DateManip
+DEPEND="dev-perl/Date-Manip
 	dev-perl/Statistics-Descriptive
 	dev-perl/Finance-YahooQuote
 	dev-perl/libwww-perl
--- a/app-misc/carbon-c-relay/Manifest
+++ b/app-misc/carbon-c-relay/Manifest
@ -1,3 +1,3 @@
-DIST carbon-c-relay-1.5.tar.gz 71236 SHA256 59a64e9567204a6bf2e294123a3b31b483ea3cf6bf1395d3a17272d7ee9ad0b0 SHA512 ca8709a72aaa78de9aedd26a7b953be4550c226d8afaf494d96cb6de683bec871bc7e3d7e8c1ec593dc59783b8ca3c6dff46d83b208c1ffaf86edaa09e44c357 WHIRLPOOL ce328538515cd433d016f24fb11f3b90ef959414d2c3f47c6acab3101893ef42df6de73eebf4a6291d9b471c87e4bc5ec1e046ef50aaf737cc7f08d56cdeda2a
+DIST carbon-c-relay-1.10.tar.gz 72045 SHA256 2322e137644f08682796489c79bac9879362b4ac094d08f2f29e1c0de264bca5 SHA512 4f8c2f82a2902f475c93f6e6791f668c323331f04c2e48e65fcd4a806642b0475533da6283fe3613032400d332fe662cbde117f9898c871f132422c1e123deae WHIRLPOOL 560758ac67b46c6352dc781966d27c4fcde9474d7d01290db89cc9d8d703abb24a3c14d7632af7a000286d0558425995a673d7fe40c2c9de96f5e7019e2c557b
 DIST carbon-c-relay-1.7.tar.gz 71240 SHA256 5cc3c14fa6d466143bd97bcde2c79e0d497e441378178e38da496ccdcde09111 SHA512 2820d9fe83ee5dd0f0ff4a7855951ff1ea1ccb23e585fd2b0932975335a8121b7578a3de9d78a09619689e70262db6a31099471f49b861cec2fa87ffee35a737 WHIRLPOOL 13fb7516a9b594c0d819c00b267a9f12cb428de005d16094a7d6bbc910c8a6d15ce2be3253fe7105dec2b96d91363fce86e37d63cf7a6d683f4757ba6a61a728
 DIST carbon-c-relay-1.8.tar.gz 72017 SHA256 e284b6cf2cb12996e41ee0a8e25f1e17a3b4510bdae3b3a549f22875507f5646 SHA512 1865507cd5404bb74715eeffc4bc2ff2e77668ea477566e4391d2fb695d4cd8dbf8222acaa2b9db39c12110fe2e18b4482ed378c5eb6c5ec95193e4c1cd4b550 WHIRLPOOL 1a8bc8e1504ed9e126d6609cf6c28d812d6a6cd29a6bf88e98b6213c277a1bd29430eeb5f0a39aac22548108d3fcbeb8e4ec3f1a79c92d5c5297a4c8d15e9105
--- a/app-misc/carbon-c-relay/carbon-c-relay-1.10.ebuild
+++ b/app-misc/carbon-c-relay/carbon-c-relay-1.10.ebuild
@ -23,9 +23,8 @@ pkg_preinst() {
 	enewuser carbon -1 -1 -1 carbon
 }

-src_prepare() {
+src_configure() {
 	tc-export CC
-	tc-has-openmp || export OPENMP_FLAGS=
 }

 src_install() {
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@ -1,2 +1,3 @@
 DIST mc-4.8.14.tar.xz 2305788 SHA256 6b1f74efbdf394bfab084f4d2ea2e72173de5f12cd42be2533ca2c3b72edb8e6 SHA512 656a15d117db9a831dcd6f59965a643199cf533d744db3bb6dfaba59854eb07213fa54a3aeb1878abb179d836b434d84490ba505e05c7d829b4ae2ac46e5e724 WHIRLPOOL 6a59dbb517960e39c52c4eaa04b295e17af97cc121ffd2f93f35ad42940dc870f39c3a8c2c310051807ef5649b11fab05e46567b1a635b4e0e192924bd0ae0aa
 DIST mc-4.8.15.tar.xz 2304812 SHA256 cf4e8f5dfe419830d56ca7e5f2495898e37ebcd05da1e47ff7041446c87fba16 SHA512 b8e05e1bcadcb766a43269a4724e36b77221b004d53783718fe455167693ff029e3e54cde47740d0c0ecd5adacfb3960a8ecce76eeaea234bbbcfd54db3b1760 WHIRLPOOL 6ddf2f5b88825584653a7027d515bfc84caba003408df31b4b8257a3f8c81a179e39a7bb7cc8571976537983f5dac7d6c06ddfbd6142ef0b31639a914f56c0f1
+DIST mc-4.8.16.tar.xz 2387724 SHA256 bbbcbe3097d3160f865d24aa38ff122f1c59752b5ef153ca4ade5ac0f82b7020 SHA512 209a4f92f493d1df5d9976bbd2547b92172270fd35c221e4d4d99630b3530a5cc849bfdff842b47f35e32d215d5af35aadd5cd02bd12567f3736ad4915abb944 WHIRLPOOL 88ec84c10c7f0137b799f7754f25beb372326856107b32fa80f5ecc73dcc9ce6249a8ddc528d2d3e6f723d396828c30dd056b5a3b9b79eb33a0230e9a0c79454
--- a/app-misc/mc/files/mc-4.8.15-ebuild_syntax_EAPI-6.patch
+++ b/app-misc/mc/files/mc-4.8.15-ebuild_syntax_EAPI-6.patch
@ -0,0 +1,11 @@
+--- mc-4.8.15/misc/syntax/ebuild.syntax
+++ mc-4.8.15/misc/syntax/ebuild.syntax
+@@ -75,6 +75,8 @@
+     keyword whole dosed yellow
+     keyword whole dosym yellow
+     keyword whole eaclocal yellow
+    keyword whole eapply yellow
+    keyword whole eapply_user yellow
+     keyword whole eautoconf yellow
+     keyword whole eautoreconf yellow
+     keyword whole eautomake yellow
--- a/app-misc/mc/mc-4.8.16.ebuild
+++ b/app-misc/mc/mc-4.8.16.ebuild
@ -0,0 +1,106 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit autotools eutils flag-o-matic
+
+MY_P=${P/_/-}
+
+DESCRIPTION="GNU Midnight Commander is a text based file manager"
+HOMEPAGE="http://www.midnight-commander.org"
+SRC_URI="http://www.midnight-commander.org/downloads/${MY_P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+IUSE="+edit gpm mclib nls samba sftp +slang spell test X +xdg"
+
+REQUIRED_USE="spell? ( edit )"
+
+RDEPEND=">=dev-libs/glib-2.8:2
+	gpm? ( sys-libs/gpm )
+	kernel_linux? ( sys-fs/e2fsprogs )
+	samba? ( net-fs/samba )
+	sftp? ( net-libs/libssh2 )
+	slang? ( >=sys-libs/slang-2 )
+	!slang? ( sys-libs/ncurses:0= )
+	spell? ( app-text/aspell )
+	X? ( x11-libs/libX11
+		x11-libs/libICE
+		x11-libs/libXau
+		x11-libs/libXdmcp
+		x11-libs/libSM )"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	test? ( dev-libs/check )
+	"
+
+[[ -n ${LIVE_EBUILD} ]] && DEPEND="${DEPEND} dev-vcs/cvs" # needed only for SCM source tree (autopoint uses cvs)
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.8.13-tinfo.patch"
+	"${FILESDIR}/${PN}-4.8.15-ebuild_syntax_EAPI-6.patch"
+)
+
+src_prepare() {
+	[[ -n ${LIVE_EBUILD} ]] && ./autogen.sh
+
+	default
+
+	eautoreconf
+}
+
+S=${WORKDIR}/${MY_P}
+
+src_configure() {
+	local myscreen=ncurses
+	use slang && myscreen=slang
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket"
+
+	local homedir=".mc"
+	use xdg && homedir="XDG"
+
+	econf \
+		--disable-silent-rules \
+		--disable-dependency-tracking \
+		$(use_enable nls) \
+		--enable-vfs \
+		$(use_enable kernel_linux vfs-undelfs) \
+		--enable-charset \
+		$(use_with X x) \
+		$(use_enable samba vfs-smb) \
+		$(use_enable sftp vfs-sftp) \
+		$(use_enable spell aspell) \
+		$(use_with gpm gpm-mouse) \
+		--with-screen=${myscreen} \
+		$(use_with edit internal-edit) \
+		$(use_enable mclib) \
+		$(use_enable test tests) \
+		--with-homedir=${homedir}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS README NEWS
+
+	# fix bug #334383
+	if use kernel_linux && [[ ${EUID} == 0 ]] ; then
+		fowners root:tty /usr/libexec/mc/cons.saver
+		fperms g+s /usr/libexec/mc/cons.saver
+	fi
+
+	if ! use xdg ; then
+		sed 's@MC_XDG_OPEN="xdg-open"@MC_XDG_OPEN="/bin/false"@' \
+			-i "${ED}"/usr/libexec/mc/ext.d/*.sh || die
+	fi
+}
+
+pkg_postinst() {
+	elog "To enable exiting to latest working directory,"
+	elog "put this into your ~/.bashrc:"
+	elog ". ${EPREFIX}/usr/libexec/mc/mc.sh"
+}
--- a/app-misc/smtm/smtm-1.6.10-r1.ebuild
+++ b/app-misc/smtm/smtm-1.6.10-r1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -17,7 +17,7 @@ KEYWORDS="amd64 ppc x86"
 IUSE=""

 DEPEND="dev-perl/perl-tk
-	dev-perl/DateManip
+	dev-perl/Date-Manip
 	dev-perl/HTML-Parser
 	dev-perl/Finance-YahooQuote
 	dev-perl/libwww-perl"
--- a/app-office/gnucash/gnucash-2.6.10.ebuild
+++ b/app-office/gnucash/gnucash-2.6.10.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -40,7 +40,7 @@ RDEPEND="
 		chipcard? ( sys-libs/libchipcard )
 	)
 	python? ( ${PYTHON_DEPS} )
-	quotes? ( dev-perl/DateManip
+	quotes? ( dev-perl/Date-Manip
 		>=dev-perl/Finance-Quote-1.11
 		dev-perl/HTML-TableExtract )
 	sqlite? ( >=dev-db/libdbi-0.9.0
--- a/app-office/gnucash/gnucash-2.6.11.ebuild
+++ b/app-office/gnucash/gnucash-2.6.11.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -40,7 +40,7 @@ RDEPEND="
 		chipcard? ( sys-libs/libchipcard )
 	)
 	python? ( ${PYTHON_DEPS} )
-	quotes? ( dev-perl/DateManip
+	quotes? ( dev-perl/Date-Manip
 		>=dev-perl/Finance-Quote-1.11
 		dev-perl/HTML-TableExtract )
 	sqlite? ( >=dev-db/libdbi-0.9.0
--- a/app-office/gnucash/gnucash-2.6.9.ebuild
+++ b/app-office/gnucash/gnucash-2.6.9.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -40,7 +40,7 @@ RDEPEND="
 		chipcard? ( sys-libs/libchipcard )
 	)
 	python? ( ${PYTHON_DEPS} )
-	quotes? ( dev-perl/DateManip
+	quotes? ( dev-perl/Date-Manip
 		>=dev-perl/Finance-Quote-1.11
 		dev-perl/HTML-TableExtract )
 	sqlite? ( >=dev-db/libdbi-0.9.0
--- a/app-office/skrooge/Manifest
+++ b/app-office/skrooge/Manifest
@ -1,2 +1,2 @@
 DIST skrooge-1.12.5.tar.xz 11727312 SHA256 8050f8aa767743edf6aad3b4c39bfd8962412e10d9c5578c02d0ce6306a8d3d6 SHA512 5612378a57872065c4ebfff0fabca74a9a0df116fc493643bc01a08c2627a8fb45025221ce5b2123b49d2daffa57ea543312192ecfe96aa3189db7ea4c07fe90 WHIRLPOOL ce99a61896d28699d66f9a17e3ccbccfde0d58cb9106b3919a219dd07a4d5650009e75a965600ec2444e51df43e0d918f1badf484d63b2353838fa490a98be52
-DIST skrooge-2.2.0.tar.xz 16936804 SHA256 c711a63cff0874fdb0c9a1be954d6013dc77cafc30e779252fc50533ebae7eef SHA512 cf341b7d1e2302fbf8da569da42d9f26e0e5c8ce492ba41ffda27593a235d3e15037af9683b506450ebab12ab3129f83ddb4ac58d69b295e54ccb5eada3dfb1b WHIRLPOOL 881dfb2d7a987f51cd7d0819807de6380793f06a2a20e64da3e4e667410bde10c6d25fe53360d13fe03b297b30015dd2ac868af00a8132ed044c283a4a4566e2
+DIST skrooge-2.3.0.tar.xz 17533492 SHA256 76f57e2cede320848f1f1bef41b3be128aec9d59a8e643701b30bcae61f8a11a SHA512 b4ccd3b21852e726a4872b1df76e2a65f031b55dfc4adc7d9dddeb9a26a9b9c61a9a42c94004de2e159646c900a9d343a5b891053d6566f5572f40a18bfd51e3 WHIRLPOOL 3f6d5337af0d7d721cb0e050b1eda7da99e43a5ee0e07db815ce0bd384a98694601ee58f4becfddcbb85d636f1ba47178632c5bbc28ef0b65f3e482049cc6d1c
--- a/app-office/skrooge/files/skrooge-2.3.0-glibc-2.23.patch
+++ b/app-office/skrooge/files/skrooge-2.3.0-glibc-2.23.patch
@ -0,0 +1,74 @@
+From: Stephane Mankowski <stephane@mankowski.fr>
+Date: Wed, 24 Feb 2016 14:07:00 +0000
+Subject: Building the v2.3.0 package on Arch Linux dies with an error 'isnan' was not declared in this scope
+X-Git-Url: http://quickgit.kde.org/?p=skrooge.git&a=commitdiff&h=dacb104d4c803679be744c198c70a871c2078dd0
+---
+Building the v2.3.0 package on Arch Linux dies with an error 'isnan' was not declared in this scope
+BUG:359679
+---
+
+
+--- a/plugins/import/skrooge_import_gnc/skgimportplugingnc.cpp
+++ b/plugins/import/skrooge_import_gnc/skgimportplugingnc.cpp
+@@ -27,7 +27,6 @@
+ 
+ #include <qdom.h>
+ #include <qfileinfo.h>
+-#include <math.h>
+ #include <cmath>
+ 
+ #include "skgtraces.h"
+@@ -36,11 +35,6 @@
+ #include "skgobjectbase.h"
+ #include "skgpayeeobject.h"
+ #include "skgimportexportmanager.h"
+-
+-#ifdef Q_OS_WIN
+-#define isnan(a) _isnan(a)
+-#define isinf(a) !_finite(a)
+-#endif
+ 
+ /**
+  * This plugin factory.
+@@ -386,7 +380,7 @@
+                                         }
+                                     }
+ 
+-                                    if (!isnan(info.value)) {
+                                    if (!std::isnan(info.value)) {
+                                         QChar accountType = mapIdType[info.account.text()];
+                                         if (accountType == 'C') {
+                                             suboperationsList.push_front(info);
+
+--- a/skgbasemodeler/skgdocument.cpp
+++ b/skgbasemodeler/skgdocument.cpp
+@@ -42,7 +42,6 @@
+ #include <qurl.h>
+ 
+ #include <sqlite3.h>
+-#include <math.h>
+ #include <cmath>
+ 
+ #include "skgtraces.h"
+@@ -51,11 +50,6 @@
+ #include "skgpropertyobject.h"
+ #include "skgtransactionmng.h"
+ #include "skgreport.h"
+-
+-#ifdef Q_OS_WIN
+-#define isnan(a) _isnan(a)
+-#define isinf(a) !_finite(a)
+-#endif
+ 
+ #ifdef SKGCIPHER
+ #define SQLDRIVERNAME QStringLiteral("SKGSQLCIPHER")
+@@ -2693,7 +2687,7 @@
+     if (iValue > 0) {
+         p = '+' % p;
+     }
+-    if (p.count() > 10 || isnan(iValue) || isinf(iValue)) {
+    if (p.count() > 10 || std::isnan(iValue) || std::isinf(iValue)) {
+         p = QChar(8734);
+     }
+     return "<font color=\"" %
+
--- a/app-office/skrooge/skrooge-2.3.0.ebuild
+++ b/app-office/skrooge/skrooge-2.3.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

 KDE_GCC_MINIMAL="4.9"
 KDE_HANDBOOK="forceoptional"
@ -40,19 +40,19 @@ COMMON_DEPEND="
 	$(add_frameworks_dep kwallet)
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtconcurrent)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative 'widgets')
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtscript)
+	$(add_qt_dep qtsql)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwebkit)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
 	app-crypt/qca:2[qt5]
 	dev-libs/grantlee:5
-	dev-qt/qtconcurrent:5
-	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtscript:5
-	dev-qt/qtsql:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwebkit:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
 	activities? ( $(add_frameworks_dep kactivities) )
 	crypt? ( dev-db/sqlcipher )
 	!crypt? ( dev-db/sqlite:3 )
@ -63,8 +63,8 @@ DEPEND="${COMMON_DEPEND}
 	$(add_frameworks_dep kguiaddons)
 	$(add_frameworks_dep kjobwidgets)
 	$(add_frameworks_dep kwindowsystem)
+	$(add_qt_dep designer)
 	dev-libs/libxslt
-	dev-qt/designer:5
 	virtual/pkgconfig
 	x11-misc/shared-mime-info
 "
@ -77,6 +77,8 @@ RESTRICT="test"

 DOCS=( AUTHORS CHANGELOG README TODO )

+PATCHES=( "${FILESDIR}/${P}-glibc-2.23.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		-DSKG_BUILD_TEST=$(usex test)
--- a/app-officeext/ooofbtools/ooofbtools-2.38.ebuild
+++ b/app-officeext/ooofbtools/ooofbtools-2.38.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -12,7 +12,7 @@ OFFICE_EXTENSIONS=(

 inherit office-ext-r1

-DESCRIPTION="Extension for converting and processing eBooks in FictionBook2 format with validator"
+DESCRIPTION="OpenOffice extension for the FictionBook2 format with validation"
 HOMEPAGE="https://sourceforge.net/projects/fbtools/"
 SRC_URI="mirror://sourceforge/fbtools/files/release/${MY_PN}-${PV}.zip"

--- a/app-officeext/ooofbtools/ooofbtools-2.39.ebuild
+++ b/app-officeext/ooofbtools/ooofbtools-2.39.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -12,7 +12,7 @@ OFFICE_EXTENSIONS=(

 inherit office-ext-r1

-DESCRIPTION="Extension for converting and processing eBooks in FictionBook2 format with validator"
+DESCRIPTION="OpenOffice extension for the FictionBook2 format with validation"
 HOMEPAGE="https://sourceforge.net/projects/fbtools/"
 SRC_URI="mirror://sourceforge/fbtools/files/release/${MY_PN}-${PV}.zip"

--- a/app-officeext/ooofbtools/ooofbtools-2.42.ebuild
+++ b/app-officeext/ooofbtools/ooofbtools-2.42.ebuild
@ -12,7 +12,7 @@ OFFICE_EXTENSIONS=(

 inherit office-ext-r1

-DESCRIPTION="Extension for converting and processing eBooks in FictionBook2 format with validator"
+DESCRIPTION="OpenOffice extension for the FictionBook2 format with validation"
 HOMEPAGE="https://sourceforge.net/projects/fbtools/"
 SRC_URI="mirror://sourceforge/fbtools/files/release/${MY_PN}-${PV}.zip"

--- a/app-portage/genlop/genlop-0.30.10-r1.ebuild
+++ b/app-portage/genlop/genlop-0.30.10-r1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -16,7 +16,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~s
 IUSE=""

 DEPEND="dev-lang/perl
-	 dev-perl/DateManip
+	 dev-perl/Date-Manip
 	 dev-perl/libwww-perl"
 RDEPEND="${DEPEND}"

--- a/app-portage/genlop/genlop-0.30.10.ebuild
+++ b/app-portage/genlop/genlop-0.30.10.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -16,7 +16,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~spar
 IUSE=""

 DEPEND="dev-lang/perl
-	 dev-perl/DateManip
+	 dev-perl/Date-Manip
 	 dev-perl/libwww-perl"
 RDEPEND="${DEPEND}"

--- a/app-portage/genlop/genlop-0.30.9-r1.ebuild
+++ b/app-portage/genlop/genlop-0.30.9-r1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -16,7 +16,7 @@ KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd6
 IUSE=""

 DEPEND="dev-lang/perl
-	 dev-perl/DateManip
+	 dev-perl/Date-Manip
 	 dev-perl/libwww-perl"
 RDEPEND="${DEPEND}"

--- a/app-portage/genlop/genlop-9999.ebuild
+++ b/app-portage/genlop/genlop-9999.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -17,7 +17,7 @@ KEYWORDS=""
 IUSE=""

 DEPEND="dev-lang/perl
-	 dev-perl/DateManip
+	 dev-perl/Date-Manip
 	 dev-perl/libwww-perl"
 RDEPEND="${DEPEND}"

--- a/app-portage/gentoolkit/gentoolkit-0.3.1-r1.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-0.3.1-r1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -38,11 +38,6 @@ python_prepare_all() {
 python_install_all() {
 	distutils-r1_python_install_all

-	# Create cache directory for revdep-rebuild
-	keepdir /var/cache/revdep-rebuild
-	use prefix || fowners root:0 /var/cache/revdep-rebuild
-	fperms 0700 /var/cache/revdep-rebuild
-
 	# remove on Gentoo Prefix platforms where it's broken anyway
 	if use prefix; then
 		elog "The revdep-rebuild command is removed, the preserve-libs"
@ -55,6 +50,10 @@ python_install_all() {
 }

 pkg_postinst() {
+	# Create cache directory for revdep-rebuild
+	mkdir -p -m 0755 "${EROOT%/}"/var/cache
+	mkdir -p -m 0700 "${EROOT%/}"/var/cache/revdep-rebuild
+
 	# Only show the elog information on a new install
 	if [[ ! ${REPLACING_VERSIONS} ]]; then
 		elog
--- a/app-portage/gentoolkit/gentoolkit-9999.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-9999.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -39,11 +39,6 @@ python_prepare_all() {
 python_install_all() {
 	distutils-r1_python_install_all

-	# Create cache directory for revdep-rebuild
-	keepdir /var/cache/revdep-rebuild
-	use prefix || fowners root:0 /var/cache/revdep-rebuild
-	fperms 0700 /var/cache/revdep-rebuild
-
 	# remove on Gentoo Prefix platforms where it's broken anyway
 	if use prefix; then
 		elog "The revdep-rebuild command is removed, the preserve-libs"
@ -56,6 +51,10 @@ python_install_all() {
 }

 pkg_postinst() {
+	# Create cache directory for revdep-rebuild
+	mkdir -p -m 0755 "${EROOT%/}"/var/cache
+	mkdir -p -m 0700 "${EROOT%/}"/var/cache/revdep-rebuild
+
 	# Only show the elog information on a new install
 	if [[ ! ${REPLACING_VERSIONS} ]]; then
 		elog
--- a/app-shells/push/Manifest
+++ b/app-shells/push/Manifest
@ -1,3 +1,2 @@
-DIST push-1.5.tar.gz 1971 SHA256 7c9068a619bcc49e3e13f819e23e1c05464729df0529753557f23f65e922fdad SHA512 77f4afd1a8226b0b4104008fcea2a61e5c9a7930b08266e069c387c806ef86e8d5641d70ece6dfd02557c956fc916134551d10777e5730973657d767370f8a26 WHIRLPOOL e1d71d7d9369bf23fe9046a34f7c9cd4f7ff79b4db3e13a9cef089113e31f7db2ecb6ff13e899e1db7726359b68260776723f73201d3db0472d267b8db7515b2
 DIST push-1.6.tar.gz 1955 SHA256 713dea172ede55971ff82da932782503c2aa6703eba73c1ac317ec4c8eb22e80 SHA512 4623f51249138bacb7251fb5d5d1ae8dd070de7ce628e42b6eed90a4b6ffd36d28eb58b116f5b1833bc1affa8db539da9b94d104ffe03c6bd1e294b56c393c86 WHIRLPOOL 787f65542e92fd10c411969d03ec17b45a90b35e9c8e17b9fb3e732fb1d97813f04c3a03cc329a469a5bea2a194f879f4c600e2e534dd8c778f7f712d4c171b1
 DIST push-1.8.tar.gz 1942 SHA256 99ae56c932b59b8b74c6a6d0972dfe5b65458d6871581168918264c5aa50bdbd SHA512 518568fc72d161d3abaea0a0c529d94fc9ad6dc46d18d300990de1367617e095befb8436e69267ebc11bd4dcbbbd9bca6375fc184666e442af6e2eaa68a992e5 WHIRLPOOL 5a763560b8afd4593aa1d0afc8f3ed5b053041c63d5aa742e485c25046191e8c733cdaf265117e23726c2c7cc8aeb87d3858a6228932192c2ee87ff4682e626d
--- a/app-shells/push/push-1.5-r1.ebuild
+++ b/app-shells/push/push-1.5-r1.ebuild
@ -1,21 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit vcs-snapshot
-
-DESCRIPTION="A POSIX shell function to treat a variable like an array, quoting args"
-HOMEPAGE="https://github.com/vaeth/push/"
-SRC_URI="https://github.com/vaeth/${PN}/tarball/${PV} -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
-IUSE=""
-
-src_install() {
-	insinto /usr/bin
-	doins push.sh
-	dodoc README
-}
--- a/app-shells/push/push-1.5.ebuild
+++ b/app-shells/push/push-1.5.ebuild
@ -1,21 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit vcs-snapshot
-
-DESCRIPTION="A POSIX shell function to treat a variable like an array, quoting args"
-HOMEPAGE="https://github.com/vaeth/push/"
-SRC_URI="https://github.com/vaeth/${PN}/tarball/release-${PV} -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
-IUSE=""
-
-src_install() {
-	insinto /usr/bin
-	doins push.sh
-	dodoc README
-}
--- a/app-shells/rrs/rrs-1.70.ebuild
+++ b/app-shells/rrs/rrs-1.70.ebuild
@ -1,38 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Reverse Remote Shell"
-HOMEPAGE="http://freecode.com/projects/rrs"
-SRC_URI="http://www.cycom.se/uploads/36/19/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="ssl"
-
-DEPEND="ssl? ( dev-libs/openssl )"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-asneeded.patch
-}
-
-src_compile() {
-	local target=""
-	use ssl || target="-nossl"
-
-	sed -i -e "s/-s //g" Makefile || die
-	emake generic${target} CFLAGS="${CFLAGS}" LDEXTRA="${LDFLAGS}" \
-		CC="$(tc-getCC)" || die "emake failed"
-}
-
-src_install() {
-	dobin rrs || die
-	dodoc CHANGES README
-	doman rrs.1
-}
--- a/app-shells/squirrelsh/Manifest
+++ b/app-shells/squirrelsh/Manifest
@ -1,3 +1 @@
-DIST squirrelsh-1.2.3-src.tar.bz2 613935 SHA256 9fda1b90e157655839690383cf8856b69526df1a6e2345c4339f7b31dfe3efc6 SHA512 94de35e982736d5cc20fa1811a2d3dc89317e1850d862c4539030d152bd83028046256173c207efb9a52f195a75cae2ff1de33b0ab749dffd085f874c60779f4 WHIRLPOOL 1b83e2fc8948b9c799849c7f070cd97fa30a1954eda16ade32e5cba8c3b7824660faed515c4febd0c8c2240570a350e68f376cd8419279a3136946d00a03b729
-DIST squirrelsh-1.2.6-src.tar.bz2 651733 SHA256 ba8ce82853b3bf1610408242ed47f52e36471b95e42cbf75474c37478439ca3a SHA512 428f9640ab22b47245de9806950bd681cac6e5798df47f4820fe6c3897a0615203879dafc3a1feee86a83ba9249a85378f5074f7d6fc28533e418867dddfb492 WHIRLPOOL f5e07feb6b412ab69cbf543df7df1ec5e03cdc14b996e89d003bd4e8d6dcfd93a771893c886b09fc6c2fd5085fb4e92b4db4d9616cc73dc8414e862442966388
 DIST squirrelsh-1.2.7-src.tar.bz2 673462 SHA256 8c4745caf052b754d447dceee5a0bb529b13e9b02a6c48d004636f192a835b60 SHA512 7db82cad969ba209cae6b2d1c4cf76ba10acbf79c051f4340556ae81dc98d36dfb6f1f6993e9198e5a5254eaaab3fbaca3d01fc547c2f303572060b2093af78a WHIRLPOOL 148e324de890cfa82835f0c44ad286c5b3814a0b778816ee24b24d4ceae5e1ab5724d6c9d6205c602a63445f723ee452e0190d092b21a0bc5673911f1e52c274
--- a/app-shells/squirrelsh/squirrelsh-1.2.3-r1.ebuild
+++ b/app-shells/squirrelsh/squirrelsh-1.2.3-r1.ebuild
@ -1,60 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="An advanced, cross-platform object oriented scripting shell based
-on the squirrel scripting language"
-HOMEPAGE="http://squirrelsh.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-DEPEND="dev-libs/libpcre"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	#Fix pre-stripping
-	sed -i -e '/in_LFLAGS="-s $in_LFLAGS"/d' configure || die "sed failed"
-	#Fix multilib issues
-	sed -i -e "s:prefix/lib:prefix/$(get_libdir):" configure || die "sed failed"
-	#Fix CFLAG madness
-	sed -i -e "s:-O2 -Os -Wall -ffast-math:${CFLAGS}:" \
-		configure || die "sed failed"
-	sed -i -e "s:\$c_compiler_flags -fno-rtti:${CXXFLAGS}:" \
-		configure || die "sed failed"
-	sed -i -e "s:-fomit-frame-pointer::" configure || die "sed failed"
-	sed -i -e "797,817d" configure || die "sed failed"
-	#Fix compiler madness
-	sed -i -e "s:c_compiler=\"gcc\":c_compiler=\"$(tc-getCC)\":" \
-		configure || die "sed failed"
-	sed -i -e "s:cpp_compiler=\"g++\":cpp_compiler=\"$(tc-getCXX)\":" \
-		configure || die "sed failed"
-	#Remove autoinstallation of docs
-	sed -i -e "/@INSTALL@/d" Makefile.in || die "sed failed"
-	#Fix --with-libraries in configure
-	sed -i -e "s:arg_option:arg_value:" configure || die "sed failed"
-}
-
-src_configure() {
-	#Not autotools, custom rolled
-	#Use static to prevent collision with dev-lang/squirrel
-	./configure --prefix="${D}"/usr \
-		--with-mime=no \
-		--with-libraries=static || die "configure failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	doman doc/${PN}.1 || die "doman failed"
-	dodoc HISTORY INSTALL README || die "dodoc failed"
-	if use doc ; then
-		dodoc doc/*.pdf || die "dodoc failed"
-	fi
-}
--- a/app-shells/squirrelsh/squirrelsh-1.2.6.ebuild
+++ b/app-shells/squirrelsh/squirrelsh-1.2.6.ebuild
@ -1,48 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="An advanced, cross-platform object oriented scripting shell based
-on the squirrel scripting language"
-HOMEPAGE="http://squirrelsh.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="doc"
-
-RDEPEND="dev-libs/libpcre"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-rename-LDFLAGS.patch
-	epatch "${FILESDIR}"/${PN}-no-strip.patch
-	epatch "${FILESDIR}"/${PN}-fix-in_LDFLAGS.patch
-	epatch "${FILESDIR}"/${PN}-remove-forced-abi.patch
-	epatch "${FILESDIR}"/${PN}-no-docs.patch
-}
-
-src_configure() {
-	#This package uses a custom written configure script
-	./configure --prefix="${D}"/usr \
-		--with-cc="$(tc-getCC)" \
-		--with-cpp="$(tc-getCXX)" \
-		--with-linker="$(tc-getCXX)" \
-		--libdir=/usr/"$(get_libdir)" \
-		--with-pcre="system" \
-		--with-squirrel="local" \
-		--with-mime=no || die "configure failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	doman doc/${PN}.1
-	dodoc HISTORY INSTALL README
-	use doc && dodoc doc/*.pdf
-}
--- a/app-shells/squirrelsh/squirrelsh-1.2.7.ebuild
+++ b/app-shells/squirrelsh/squirrelsh-1.2.7.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -6,8 +6,7 @@ EAPI="4"

 inherit eutils multilib toolchain-funcs

-DESCRIPTION="An advanced, cross-platform object oriented scripting shell based
-on the squirrel scripting language"
+DESCRIPTION="Cross-platform object-oriented scripting shell using the squirrel language"
 HOMEPAGE="http://squirrelsh.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.bz2"

--- a/app-shells/thefuck/Manifest
+++ b/app-shells/thefuck/Manifest
@ -0,0 +1 @@
+DIST thefuck-3.5.tar.gz 782640 SHA256 eaa6b6466634ab4c87506a1404871af5bfd013043157b335165a63da3b14d90e SHA512 b1d5c542e25dc88ddceef98cd067f3bd48023c4ca5ee33ea61c76ad089ca85d0f440b212633ad99f9e7caa2ca56da8ba236c481cacfb50fd07dec44e896a0a71 WHIRLPOOL dd8e7bde96b45e61874f519db52550f82aa269a1e0df94271bb58bd6605e1165e1e6e8682c257ca8129ebff2955c0014b71a0191a360ad035d4de2e17fab4ba8
--- a/app-shells/thefuck/metadata.xml
+++ b/app-shells/thefuck/metadata.xml
@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mrueg@gentoo.org</email>
+		<name>Manuel Rüger</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">nvbn/thefuck</remote-id>
+	</upstream>
+</pkgmetadata>
--- a/app-shells/thefuck/thefuck-3.5.ebuild
+++ b/app-shells/thefuck/thefuck-3.5.ebuild
@ -0,0 +1,35 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=(python{2_7,3_4})
+
+inherit distutils-r1
+
+DESCRIPTION="Magnificent app which corrects your previous console command"
+HOMEPAGE="https://github.com/nvbn/thefuck"
+SRC_URI="https://github.com/nvbn/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="dev-python/pathlib[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/decorator[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]"
+DEPEND="test? ( ${RDEPEND}
+	dev-python/pytest[${PYTHON_USEDEP}] )
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+src_prepare() {
+	sed -i -e "/import pip/s/^/#/" -e "/pip.__version__/,+3 s/^/#/" setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	py.test || die
+}
--- a/app-vim/airline/Manifest
+++ b/app-vim/airline/Manifest
@ -1 +1,2 @@
 DIST airline-0.7.tar.gz 54318 SHA256 5d6b8840ccef133662f420fb1dba132d54bf0f5cc663657945e6cbea7e4b609e SHA512 5e8b072538d8c19083bb4fe6e5f8a5df76cf00735eb8a8a08078fba33d5fc25d89f49b9d9e07276e1661748b04901f1bfdf52d054330931785eab3df71a496b5 WHIRLPOOL c664423ebfbc1e830feb81aa4573c991388756396263fdf3cd0f37b8391b673f94c6eda0cff1c7517ab7fb5de7735ac39a8d066212ea43bd03ef82e2e9aff71c
+DIST airline-0.8.tar.gz 52767 SHA256 5fb1cdcd9a760516a050bd0e3fa4cae04291cfccd2bcf58f2facbd2a07767a14 SHA512 51ae20f7e5b869f714e9c21ab6ab8af4d2de31b3cf4fe9f6bd64e75e87e7796184d41ddd9536f3e41dcc93e9ca6aad684b286df6e5d8d6eae202f91ed8851292 WHIRLPOOL a5ccf7662267c25b6855d6df81c4c3f35bffe5c2001f05808c1e0a861bb6b04b0bc04d979b04a060992626406cd84d7ac8aabd73f29afaf286fbf4dbc3dec47c
--- a/app-vim/airline/airline-0.8.ebuild
+++ b/app-vim/airline/airline-0.8.ebuild
@ -0,0 +1,27 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit vim-plugin
+
+if [[ ${PV} != 9999* ]] ; then
+	MY_PN=vim-${PN}
+	MY_P=${MY_PN}-${PV}
+	SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S=${WORKDIR}/${MY_P}
+else
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/vim-airline/vim-airline.git"
+fi
+
+DESCRIPTION="vim plugin: lean & mean statusline for vim that's light as air"
+HOMEPAGE="https://github.com/vim-airline/vim-airline/ http://www.vim.org/scripts/script.php?script_id=4661"
+LICENSE="MIT"
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+src_prepare() {
+	# remove unwanted files
+	rm -rf t Gemfile Rakefile LICENSE README*
+}
--- a/app-vim/airline/airline-9999.ebuild
+++ b/app-vim/airline/airline-9999.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -8,16 +8,16 @@ inherit vim-plugin
 if [[ ${PV} != 9999* ]] ; then
 	MY_PN=vim-${PN}
 	MY_P=${MY_PN}-${PV}
-	SRC_URI="https://github.com/bling/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 	S=${WORKDIR}/${MY_P}
 else
 	inherit git-r3
-	EGIT_REPO_URI="https://github.com/bling/vim-airline.git"
+	EGIT_REPO_URI="https://github.com/vim-airline/vim-airline.git"
 fi

 DESCRIPTION="vim plugin: lean & mean statusline for vim that's light as air"
-HOMEPAGE="https://github.com/bling/vim-airline/ http://www.vim.org/scripts/script.php?script_id=4661"
+HOMEPAGE="https://github.com/vim-airline/vim-airline/ http://www.vim.org/scripts/script.php?script_id=4661"
 LICENSE="MIT"
 VIM_PLUGIN_HELPFILES="${PN}.txt"

--- a/app-vim/ansiesc/ansiesc-12.ebuild
+++ b/app-vim/ansiesc/ansiesc-12.ebuild
@ -1,9 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

-EAPI=3
-VIM_PLUGIN_VIM_VERSION="7.3"
+EAPI=5

 inherit vim-plugin

@ -11,9 +10,7 @@ DESCRIPTION="vim plugin: ansi escape sequences concealed, but highlighted as spe
 HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=302"
 LICENSE="public-domain"
 KEYWORDS="amd64 x86"
-IUSE=""

-DEPEND=""
 RDEPEND="app-vim/cecutil"

 VIM_PLUGIN_HELPFILES="AnsiEsc.txt"
--- a/app-vim/brainfuck-syntax/Manifest
+++ b/app-vim/brainfuck-syntax/Manifest
@ -1,3 +1,2 @@
-DIST brainfuck-syntax-1.0.1.tar.bz2 874 SHA256 86b25c5953e69cba70b310680f1a05465d90139352d97414566138b3f18d2a8d SHA512 2c18bffdb9255392f88d2155fe73300e13e50856d72a84424d52699572b7dbad658759d8e5ee16baa4eedd5ca666fcb0f8085d6cbd760c938b160b952999a29d WHIRLPOOL fd14de34633cd87a8cb3c5c807b6a87d62c39f8e06c62d421d71edbb11d607db97774401b93db981ffcd3779dddaf032050b3c480d6715923b87ab189d99c45e
 DIST brainfuck-syntax-1.0.2.tar.bz2 916 SHA256 256a0f43be2da9af5a3f7bc8af34083a374cf711186d9ca921b63a7dd5f9c84a SHA512 d01e544e45d4ada1c7ed8ca02e72d888fdcd374be8ee45c01d7797fc1e32457be94e0429dc3fc88f12fee063bd70d06af8ab4238795154a82793b6abb42dd974 WHIRLPOOL 71b8be951bd07d9df149a5ef4f205a196fb4153d33087414fc3df4d0436dae1526134a65de7dc6355ba3a34a25f92b3f2e82c02339f148b5076e4bf09f9bf9ed
 DIST brainfuck-syntax-1.0.3.tar.bz2 926 SHA256 10f52e0d1d017f78479bb4c131440fc7d8789fdf24261431b586969f9663e23b SHA512 42dbcbe916b19bcb30cadf929cb71aadb7032ebe38c26b1d5fa2fc9d8513d3dda275df289cc5fdf094f9fccd5f4e720e6c24d006d431fd3668f73d2c44e8b82a WHIRLPOOL 9e0094b1d3d8b1b93f70240edca5409f08f701d0e6acac3e5541074cc71c107490b27d0bbe9206f1a034f4826dd03f3cd33394abf8bcd4d66ce4519879008eb4
--- a/app-vim/brainfuck-syntax/brainfuck-syntax-1.0.1.ebuild
+++ b/app-vim/brainfuck-syntax/brainfuck-syntax-1.0.1.ebuild
@ -1,14 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit vim-plugin
-
-DESCRIPTION="vim plugin: BrainFuck source file syntax highlighting"
-HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=716"
-LICENSE="vim.org"
-KEYWORDS="amd64 ~mips ppc ppc64 x86"
-IUSE=""
-
-VIM_PLUGIN_HELPTEXT=\
-"This plugin provides syntax highlighting for BrainFuck source files."
--- a/app-vim/calendar/Manifest
+++ b/app-vim/calendar/Manifest
@ -1,2 +1 @@
-DIST calendar-2.5.tar.bz2 9787 SHA256 ff7b505a6e818f09c47a2cdd32060e8b6095f9162169e34f93ac82de7ef85af4 SHA512 b99b6b5f461a46386d43af442895aaffd502a1cfe272fa75433a8f6afc77cdae91c9c4529ef12b56b1ff003b79e75b12577ba4cef3a399c04ed1b06d027aae24 WHIRLPOOL 956fa3d69814e60bb1b89f84a0afa84267794ed35c94b9b52668706338d5d66e1e61e71c54a8c9b5ad867c1517f9241646dcb29e087fa91c073bb3752829f55b
 DIST calendar-2.9.tar.bz2 11070 SHA256 144a657523f20514290092b4e17b307622e259838f1ba6f59c0bacb4a0bd3c52 SHA512 8d1c29cb1e7b8189447d60bb5e8940b7ed52837c9039bd8ff8e3ce19c5fd7a9a8060291bb8a0c0bd2a2bb677fce388bb7f807f25358f3903c28b07c715ae1a07 WHIRLPOOL 703075efc70b13d19e925ab395a94940cb242c56184c2d30c3e83fe834b8188b977706207128b115c623d591e41ecc85a46c5fdec2649472d4b1504d830263de
--- a/app-vim/calendar/calendar-2.5.ebuild
+++ b/app-vim/calendar/calendar-2.5.ebuild
@ -1,17 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=3
-
-inherit vim-plugin
-
-DESCRIPTION="vim plugin: calendar window"
-HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=52"
-LICENSE="vim"
-KEYWORDS="amd64 ~mips ppc x86"
-IUSE=""
-
-VIM_PLUGIN_HELPTEXT=\
-"This plugin provides a calendar window for vim. To start it, use the
-:Calendar command."
--- a/app-vim/calendar/calendar-2.9.ebuild
+++ b/app-vim/calendar/calendar-2.9.ebuild
@ -9,6 +9,6 @@ inherit vim-plugin
 DESCRIPTION="vim plugin: calendar window"
 HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=52"
 LICENSE="vim"
-KEYWORDS="~amd64 ~mips ~ppc ~x86"
+KEYWORDS="amd64 ~mips ppc x86"

 VIM_PLUGIN_HELPFILES="${PN}.txt"
--- a/app-vim/cctree/Manifest
+++ b/app-vim/cctree/Manifest
@ -1,2 +1 @@
-DIST cctree-1.60.tar.gz 26501 SHA256 eaf0a5799764ea8da6cf7d66c398ad5c9ebe2419cbf730c3bbc24e50682f90af SHA512 f717c912ffce3b6f6edc4e6dceae7f53ee765b88366f1040e37d2f8f7e477880baf8be8388dcc3c67b1b27766dfd1f13bae2effbbbe9dcdbc18ec4807890eadf WHIRLPOOL db3173fe99edc04cb7b47fe8b642ba2c6e43c307c9011fb6d82e0124cc1eb8d4ad18cff7990f13e276debabe2983369357fd6ff1822541c1e54f3ea6a113f373
 DIST cctree-1.61.tar.bz2 23243 SHA256 b5651bd274c6c7c126c0a5a20579cfd953d1fee1f98989a43baa4e1350e68765 SHA512 9d29c573ef3cdcde1ec91ca34684c84c8beb3b89669654b1f9dafab928a11d8f1df77294af06c7612ba8aa7d65dfba69352f3f74dd11c98d22a300907d8a6b0e WHIRLPOOL 6dd6fc055644d4bc963c2d8adca45cd24f71c319deab6a868e0b542f5076195a99ea0c400593d1bad2f64f50f7b7efbe0ba32bfff166a069dedaf7f50676b3db
--- a/app-vim/cctree/cctree-1.60.ebuild
+++ b/app-vim/cctree/cctree-1.60.ebuild
@ -1,36 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit vim-plugin
-
-MY_PN="CCTree"
-DESCRIPTION="vim plugin: Cscope based source-code browser and code flow analysis tool"
-HOMEPAGE="https://sites.google.com/site/vimcctree/"
-SRC_URI="https://github.com/vim-scripts/${MY_PN}/tarball/${PV} -> ${P}.tar.gz"
-LICENSE="bufexplorer.vim"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-VIM_PLUGIN_HELPFILES="cctree.txt"
-
-RDEPEND="dev-util/cscope"
-
-src_unpack() {
-	unpack ${A}
-	mv *-${MY_PN}-* "${S}"
-}
-
-src_prepare() {
-	# There's good documentation included with the script, but it's not
-	# in a helpfile. Since there's rather too much information to include
-	# in a VIM_PLUGIN_HELPTEXT, we'll sed ourselves a help doc.
-	mkdir doc
-	sed -e '/" Name Of File/,/".\+Community/!d' -e 's/^" \?//' \
-		-e 's/\(Name Of File: \)\([^.]\+\)\.vim/\1*\L\2.txt*/' \
-		ftplugin/cctree.vim > doc/cctree.txt
-
-	rm README
-}
--- a/app-vim/cecutil/cecutil-17.ebuild
+++ b/app-vim/cecutil/cecutil-17.ebuild
@ -1,16 +1,14 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

-VIM_PLUGIN_VIM_VERSION="7.0"
+EAPI=5
+
 inherit vim-plugin

 DESCRIPTION="vim plugin: library used by many of Charles Campbell's plugins"
 HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=1066"
 LICENSE="vim"
 KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
-IUSE=""

-VIM_PLUGIN_HELPTEXT=\
-"This plugin provides library functions and is not intended to be used
-directly by the user. Documentation is available via ':help cecutil.txt'."
+VIM_PLUGIN_HELPFILES="${PN}.txt"
--- a/app-vim/colorsel/colorsel-20100406.ebuild
+++ b/app-vim/colorsel/colorsel-20100406.ebuild
@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

-EAPI=3
+EAPI=5

 inherit vim-plugin

@ -11,11 +11,10 @@ HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=927"
 SRC_URI="http://www.vim.org/scripts/download_script.php?src_id=12789 -> ${P}.zip"
 LICENSE="public-domain"
 KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
-IUSE=""

-VIM_PLUGIN_HELPFILES="${PN}"
+VIM_PLUGIN_HELPFILES="${PN}.txt"

 DEPEND="app-arch/unzip"
 RDEPEND=">=app-editors/gvim-7.0"

-S="${WORKDIR}"
+S=${WORKDIR}
--- a/app-vim/colorv/Manifest
+++ b/app-vim/colorv/Manifest
@ -1,3 +1 @@
-DIST colorv-2.5.3.tar.gz 48636 SHA256 46ae0a4870e18e3358f90efd54e1c98951d5c3f11cb85220f4480d05e9382ded SHA512 a4db26d189756f84339aec32cc406bf9fc8ac8a1fed0ad58c1f5110edc9cfac3d3f4f5af410c8cecbcced7b4c406e9fe78ecbb7d863b7e6ba7fae50b7ba32863 WHIRLPOOL c81c2250146fa20a20a09dd0cd3197d9a249d35cd1e12d8188392a9046c4947cfa2c4ba081fa4ecc97462ece22ba96b9f771db1ba9f18b3e444e336a35d33c32
-DIST colorv-2.5.6.tar.bz2 40591 SHA256 5843d0f5aa5aa4bc71ec281edca3e3391c8ccc0b9025405751edb6b16399f824 SHA512 e6b5e1653080b2045028dd71e5839dda08a042c9970d27d1bfd47417c42020cb2cd68940c80e6f998a3a3adc723ee91c480a8bd55c711086a19d4c24b368e38e WHIRLPOOL 4fef5fb226b00f2f0172493e85df6758dbb007fc36e3dc75758cca7a68928c41467de76c9c8da065456b0c4695bf2bc8c1bed8f9a998c11f41089bbc13953864
 DIST colorv-3.0.2.tar.bz2 47059 SHA256 75a570021678a58225b346fa87aa13919ef84757a4cd5344855d101835ab231b SHA512 cb4a893d65bbada5cec27c0810bf3e78db3c64e64f4179529d5da30402ab65b141f53dd7f2a9e8bbccf3d5f7dc5843afc7cab0d908e66a86fc41a5c38c9a848e WHIRLPOOL 5fd18f5d6686717e628e136c8025041cbc0820ae394e3c7e1a19245fe02142770d911d505c1cc5efcf9ea29739faae31d72ef83543b833f116bd52f4ad9c37f0
--- a/app-vim/colorv/colorv-2.5.3.ebuild
+++ b/app-vim/colorv/colorv-2.5.3.ebuild
@ -1,32 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit vim-plugin
-
-MY_PN="ColorV"
-DESCRIPTION="vim plugin: a color tool for vim"
-HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=3597"
-SRC_URI="https://github.com/vim-scripts/${MY_PN}/tarball/${PV} -> ${P}.tar.gz"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-VIM_PLUGIN_HELPFILES="${PN}"
-
-RDEPEND="
-	|| (
-		app-editors/vim[python]
-		( app-editors/gvim[python] dev-python/pygtk:2 )
-	)"
-
-src_unpack() {
-	unpack ${A}
-	mv *-${MY_PN}-* "${S}"
-}
-
-src_prepare() {
-	rm README* || die
-}
--- a/app-vim/colorv/colorv-2.5.6.ebuild
+++ b/app-vim/colorv/colorv-2.5.6.ebuild
@ -1,26 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit vim-plugin
-
-DESCRIPTION="vim plugin: a color tool for vim"
-HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=3597"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-VIM_PLUGIN_HELPFILES="${PN}.txt"
-
-RDEPEND="
-	|| (
-		app-editors/vim[python]
-		( app-editors/gvim[python] dev-python/pygtk:2 )
-	)"
-
-src_prepare() {
-	# use python colorpicker instead of C-based picker
-	rm autoload/colorv/{colorpicker.c,Makefile} || die
-}
--- a/app-vim/colorv/colorv-3.0.2.ebuild
+++ b/app-vim/colorv/colorv-3.0.2.ebuild
@ -7,7 +7,7 @@ EAPI="5"
 inherit vim-plugin

 DESCRIPTION="vim plugin: a color tool for vim"
-HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=3597"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=3597 https://github.com/Rykka/colorv.vim/"
 LICENSE="MIT"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
--- a/Show More
+++ b/Show More
				`@ -0,0 +1 @@`
				`DIST thefuck-3.5.tar.gz 782640 SHA256 eaa6b6466634ab4c87506a1404871af5bfd013043157b335165a63da3b14d90e SHA512 b1d5c542e25dc88ddceef98cd067f3bd48023c4ca5ee33ea61c76ad089ca85d0f440b212633ad99f9e7caa2ca56da8ba236c481cacfb50fd07dec44e896a0a71 WHIRLPOOL dd8e7bde96b45e61874f519db52550f82aa269a1e0df94271bb58bd6605e1165e1e6e8682c257ca8129ebff2955c0014b71a0191a360ad035d4de2e17fab4ba8`