Sync with portage [Thu Sep 29 22:59:21 MSK 2016].

8 years ago · 5dc8feed4f
parent 4c127f3d25
commit 5dc8feed4f
191 changed files with 1835 additions and 4369 deletions
--- a/app-admin/augeas/Manifest
+++ b/app-admin/augeas/Manifest
@ -1,5 +1,3 @@
-DIST augeas-0.10.0.tar.gz 1676906 SHA256 ec111af06186216930176ebe5ecccdf7bf528528aee9acde1d5d70088484afca SHA512 4b23c69ce92971ad63cd5829044051a53b7976a7e3ccb9006282333a2dd06789e7c5da671450eb81904d237c36d449ac0924b06d9690dc7e5de4b8b40a58ec8c WHIRLPOOL 8b542cfa1bdcad3508cfd3cf25803ed27304ecdaaab4c9e7ce6ae2b7798c4cdc3d344ab4793cb2a0fd7b1b276eee20385b129d9fcf3b5b3b4596c3b0c96424cc
-DIST augeas-1.1.0.tar.gz 1940928 SHA256 9d81e4228329e2d5cccb018ab06bc8b734fb2dede2c4d9b5c02303d4a690b76b SHA512 ddb06f71993079330fc5b134ccd45476c1ab24f475b7a859c5920a7af3bd00d4dae31bf8110841ded4c4f5197e72911c298d7fcfe32d1d3e6821bca74aa67e26 WHIRLPOOL be1c83ecb1c8c7378374132bdd56be641e1200950e6e6d46e94ef35fc97be98157214b994071cf56f2aaafda29d91993c9a023ded5256c36364abbc9cbb498ca
 DIST augeas-1.3.0.tar.gz 1983656 SHA256 80763031af76515a8ea66013ddc3c466742a15d2e907c7c8e2e3b7410262e2af SHA512 92cc2cf83faa42e83621fe0f73fe9f7247d802f17da781e51d068056d20b1645de1f0ea0d5070c0d5729a3f6554d64a95e31111bf3e44b959386559619843e79 WHIRLPOOL 4e4c3374adca662ce90f94eb204028526ec0c3a9b0bc6644515994b88e289f3e1aa5f2b6ce7c28103a2a64e5185c8ba64d55e1a448e14f745d53aec4bf20e8b3
 DIST augeas-1.5.0.tar.gz 2072169 SHA256 223bb6e6fe3e9e92277dafd5d34e623733eb969a72a382998d204feab253f73f SHA512 4683668c6562e14cd39bda69f2fa7f6db5f5a76386521a9b10c41fa2031c10ff158f682b56066d0525554c4229677c64e92f6453f75d185d367bc7481fc10695 WHIRLPOOL e4bd492320cdfcf5c8470b8e4c0fb35077b1190bb8c18b245d54f532badc4975ac564fca97ec6f8f039a77a771b16d0354ef53d02ccd5c912ab9f91ca391d282
 DIST augeas-1.6.0.tar.gz 2076723 SHA256 8ba0d9bf059e7ef52118826d1285f097b399fc7a56756ce28e053da0b3ab69b5 SHA512 c07f8638b9d22ceedb2951d658eb578d5757376e0cda8d7d0e075ae0c3347ef98542fb99e18956d404588befe1c92702388cf33337f4b4ee45f830d85c04b06d WHIRLPOOL 39698ab73e2828e906b9a508643e25ed08beea1464821fb56012ed3c0b721aa8c2feacdfa6254f93eae1963d1d2ecdf2b3aeb75897722243f6b9662ecff8bf7f
--- a/app-admin/augeas/augeas-0.10.0-r2.ebuild
+++ b/app-admin/augeas/augeas-0.10.0-r2.ebuild
@ -1,50 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit autotools-utils
-
-DESCRIPTION="A library for changing configuration files"
-HOMEPAGE="http://augeas.net/"
-SRC_URI="http://augeas.net/download/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS="alpha amd64 hppa ~ia64 ppc ~ppc64 sparc x86"
-IUSE="static-libs test"
-
-RDEPEND="
-	dev-libs/libxml2
-	sys-libs/readline"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=app-doc/NaturalDocs-1.40
-	test? ( dev-lang/ruby )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gets.patch
-	"${FILESDIR}"/${P}-test.patch
-	"${FILESDIR}"/${P}-test2.patch
-	"${FILESDIR}"/${P}-libxml2-pkgconfig.patch
-	"${FILESDIR}/cve-bunch-of-them-symlink.patch"
-	)
-
-src_prepare() {
-	if [ -f /usr/share/NaturalDocs/Config/Languages.txt ] ; then
-		addwrite /usr/share/NaturalDocs/Config/Languages.txt
-	fi
-	if [ -f /usr/share/NaturalDocs/Config/Topics.txt ] ; then
-		addwrite /usr/share/NaturalDocs/Config/Topics.txt
-	fi
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	# Needs to implemented
-	local myeconfargs=( --without-selinux )
-	autotools-utils_src_configure
-}
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
--- a/app-admin/augeas/augeas-1.1.0.ebuild
+++ b/app-admin/augeas/augeas-1.1.0.ebuild
@ -1,49 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit autotools-utils
-
-DESCRIPTION="A library for changing configuration files"
-HOMEPAGE="http://augeas.net/"
-SRC_URI="http://download.augeas.net/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS="alpha amd64 hppa ia64 ppc ~ppc64 sparc x86"
-IUSE="static-libs test"
-
-RDEPEND="
-	dev-libs/libxml2
-	sys-libs/readline"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=app-doc/NaturalDocs-1.40
-	test? ( dev-lang/ruby )"
-
-#PATCHES=(
-#	"${FILESDIR}"/${P}-gets.patch
-#	"${FILESDIR}"/${P}-test.patch
-#	"${FILESDIR}"/${P}-test2.patch
-#	"${FILESDIR}"/${P}-libxml2-pkgconfig.patch
-#	)
-
-src_prepare() {
-	if [ -f /usr/share/NaturalDocs/Config/Languages.txt ] ; then
-		addwrite /usr/share/NaturalDocs/Config/Languages.txt
-	fi
-	if [ -f /usr/share/NaturalDocs/Config/Topics.txt ] ; then
-		addwrite /usr/share/NaturalDocs/Config/Topics.txt
-	fi
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	# Needs to implemented
-	local myeconfargs=( --without-selinux )
-	autotools-utils_src_configure
-}
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
--- a/app-admin/rsyslog/rsyslog-8.19.0.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.19.0.ebuild
@ -46,7 +46,7 @@ else
 		unset _tmp_last_index
 		unset _tmp_suffix
 	else
-		KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
+		KEYWORDS="~amd64 ~arm ~arm64 hppa ~x86"
 	fi

 	SRC_URI="
--- a/app-emulation/rkt/rkt-1.11.0.ebuild
+++ b/app-emulation/rkt/rkt-1.11.0.ebuild
@ -17,7 +17,7 @@ PXE_FILE="${PN}-pxe-${PXE_VERSION}.img"

 SRC_URI="https://github.com/coreos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 rkt_stage1_coreos? ( $PXE_URI -> $PXE_FILE )
-rkt_stage1_kvm? (
+rkt_stage1_kvm_lkvm? (
 	https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+archive/${KVMTOOL_VERSION}.tar.gz -> kvmtool-${KVMTOOL_VERSION}.tar.gz
 	mirror://kernel/linux/kernel/v4.x/linux-${KVM_LINUX_VERSION}.tar.xz
 	${PXE_URI} -> ${PXE_FILE}
@ -29,8 +29,8 @@ HOMEPAGE="https://github.com/coreos/rkt"

 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="doc examples +rkt_stage1_coreos +rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm rkt_stage1_src +actool systemd"
-REQUIRED_USE="|| ( rkt_stage1_coreos rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm rkt_stage1_src ) rkt_stage1_host? ( systemd )"
+IUSE="doc examples +rkt_stage1_coreos +rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm rkt_stage1_kvm_lkvm rkt_stage1_src +actool systemd"
+REQUIRED_USE="|| ( rkt_stage1_coreos rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm_lkvm rkt_stage1_src ) rkt_stage1_host? ( systemd ) !rkt_stage1_kvm"

 DEPEND=">=dev-lang/go-1.5
 	app-arch/cpio
@ -117,7 +117,7 @@ src_configure() {
 	use rkt_stage1_src && flavors+=",src"
 	use rkt_stage1_coreos && flavors+=",coreos"
 	use rkt_stage1_fly && flavors+=",fly"
-	use rkt_stage1_kvm && flavors+=",kvm"
+	use rkt_stage1_kvm_lkvm && flavors+=",kvm"
 	myeconfargs+=( --with-stage1-flavors="${flavors#,}" )

 	if use rkt_stage1_src; then
@ -127,7 +127,7 @@ src_configure() {
 		)
 	fi

-	if use rkt_stage1_coreos || use rkt_stage1_kvm; then
+	if use rkt_stage1_coreos || use rkt_stage1_kvm_lkvm; then
 		myeconfargs+=(
 			--with-coreos-local-pxe-image-path="${DISTDIR}/${PXE_FILE}"
 			--with-coreos-local-pxe-image-systemd-version="${PXE_SYSTEMD_VERSION}"
@ -179,7 +179,7 @@ src_install() {
 		dosym stage1-coreos.aci "${STAGE1_DEFAULT_LOCATION}"
 	elif use rkt_stage1_fly; then
 		dosym stage1-fly.aci "${STAGE1_DEFAULT_LOCATION}"
-	elif use rkt_stage1_kvm; then
+	elif use rkt_stage1_kvm_lkvm; then
 		dosym stage1-kvm.aci "${STAGE1_DEFAULT_LOCATION}"
 	fi

--- a/app-emulation/rkt/rkt-1.12.0.ebuild
+++ b/app-emulation/rkt/rkt-1.12.0.ebuild
@ -17,7 +17,7 @@ PXE_FILE="${PN}-pxe-${PXE_VERSION}.img"

 SRC_URI="https://github.com/coreos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 rkt_stage1_coreos? ( $PXE_URI -> $PXE_FILE )
-rkt_stage1_kvm? (
+rkt_stage1_kvm_lkvm? (
 	https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+archive/${KVMTOOL_VERSION}.tar.gz -> kvmtool-${KVMTOOL_VERSION}.tar.gz
 	mirror://kernel/linux/kernel/v4.x/linux-${KVM_LINUX_VERSION}.tar.xz
 	${PXE_URI} -> ${PXE_FILE}
@ -29,8 +29,8 @@ HOMEPAGE="https://github.com/coreos/rkt"

 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="doc examples +rkt_stage1_coreos +rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm rkt_stage1_src +actool systemd"
-REQUIRED_USE="|| ( rkt_stage1_coreos rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm rkt_stage1_src ) rkt_stage1_host? ( systemd )"
+IUSE="doc examples +rkt_stage1_coreos +rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm rkt_stage1_kvm_lkvm rkt_stage1_src +actool systemd"
+REQUIRED_USE="|| ( rkt_stage1_coreos rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm_lkvm rkt_stage1_src ) rkt_stage1_host? ( systemd ) !rkt_stage1_kvm"

 DEPEND=">=dev-lang/go-1.5
 	app-arch/cpio
@ -124,7 +124,7 @@ src_configure() {
 	use rkt_stage1_src && flavors+=",src"
 	use rkt_stage1_coreos && flavors+=",coreos"
 	use rkt_stage1_fly && flavors+=",fly"
-	use rkt_stage1_kvm && flavors+=",kvm"
+	use rkt_stage1_kvm_lkvm && flavors+=",kvm"
 	myeconfargs+=( --with-stage1-flavors="${flavors#,}" )

 	if use rkt_stage1_src; then
@ -134,7 +134,7 @@ src_configure() {
 		)
 	fi

-	if use rkt_stage1_coreos || use rkt_stage1_kvm; then
+	if use rkt_stage1_coreos || use rkt_stage1_kvm_lkvm; then
 		myeconfargs+=(
 			--with-coreos-local-pxe-image-path="${DISTDIR}/${PXE_FILE}"
 			--with-coreos-local-pxe-image-systemd-version="${PXE_SYSTEMD_VERSION}"
@ -186,7 +186,7 @@ src_install() {
 		dosym stage1-coreos.aci "${STAGE1_DEFAULT_LOCATION}"
 	elif use rkt_stage1_fly; then
 		dosym stage1-fly.aci "${STAGE1_DEFAULT_LOCATION}"
-	elif use rkt_stage1_kvm; then
+	elif use rkt_stage1_kvm_lkvm; then
 		dosym stage1-kvm.aci "${STAGE1_DEFAULT_LOCATION}"
 	fi

--- a/app-emulation/rkt/rkt-1.14.0.ebuild
+++ b/app-emulation/rkt/rkt-1.14.0.ebuild
@ -17,7 +17,7 @@ PXE_FILE="${PN}-pxe-${PXE_VERSION}.img"

 SRC_URI="https://github.com/coreos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 rkt_stage1_coreos? ( $PXE_URI -> $PXE_FILE )
-rkt_stage1_kvm? (
+rkt_stage1_kvm_lkvm? (
 	https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+archive/${KVMTOOL_VERSION}.tar.gz -> kvmtool-${KVMTOOL_VERSION}.tar.gz
 	mirror://kernel/linux/kernel/v4.x/linux-${KVM_LINUX_VERSION}.tar.xz
 	${PXE_URI} -> ${PXE_FILE}
@ -29,8 +29,8 @@ HOMEPAGE="https://github.com/coreos/rkt"

 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="doc examples +rkt_stage1_coreos +rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm rkt_stage1_src +actool systemd"
-REQUIRED_USE="|| ( rkt_stage1_coreos rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm rkt_stage1_src ) rkt_stage1_host? ( systemd )"
+IUSE="doc examples +rkt_stage1_coreos +rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm rkt_stage1_kvm_lkvm rkt_stage1_src +actool systemd"
+REQUIRED_USE="|| ( rkt_stage1_coreos rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm_lkvm rkt_stage1_src ) rkt_stage1_host? ( systemd ) !rkt_stage1_kvm"

 DEPEND=">=dev-lang/go-1.5
 	app-arch/cpio
@ -124,7 +124,7 @@ src_configure() {
 	use rkt_stage1_src && flavors+=",src"
 	use rkt_stage1_coreos && flavors+=",coreos"
 	use rkt_stage1_fly && flavors+=",fly"
-	use rkt_stage1_kvm && flavors+=",kvm"
+	use rkt_stage1_kvm_lkvm && flavors+=",kvm"
 	myeconfargs+=( --with-stage1-flavors="${flavors#,}" )

 	if use rkt_stage1_src; then
@ -134,7 +134,7 @@ src_configure() {
 		)
 	fi

-	if use rkt_stage1_coreos || use rkt_stage1_kvm; then
+	if use rkt_stage1_coreos || use rkt_stage1_kvm_lkvm; then
 		myeconfargs+=(
 			--with-coreos-local-pxe-image-path="${DISTDIR}/${PXE_FILE}"
 			--with-coreos-local-pxe-image-systemd-version="${PXE_SYSTEMD_VERSION}"
@ -186,7 +186,7 @@ src_install() {
 		dosym stage1-coreos.aci "${STAGE1_DEFAULT_LOCATION}"
 	elif use rkt_stage1_fly; then
 		dosym stage1-fly.aci "${STAGE1_DEFAULT_LOCATION}"
-	elif use rkt_stage1_kvm; then
+	elif use rkt_stage1_kvm_lkvm; then
 		dosym stage1-kvm.aci "${STAGE1_DEFAULT_LOCATION}"
 	fi

--- a/app-misc/ddctool/Manifest
+++ b/app-misc/ddctool/Manifest
@ -1 +1,2 @@
 DIST ddctool-0.5.0.tar.gz 322864 SHA256 8773b98f7ca226f8b9cdca3c681ddf0f8aacb5d2c1591764e2a9080a14fe518d SHA512 5fc55a4363335eb8468a73f6e617cba7efcb454f8cefa081c6d13d9c2ac35cc191001a466c61ecfc9c944aea5b837b993646b4b2c78dfb63057ef01c3c05fed5 WHIRLPOOL 66679e7f2a81dab012e38aad24961b5aa3f3860f64b49e0818362c3ac5f5bab2a1a4e0528cf27540041e4f8a548342a1d7f4bd1b422c4185a83721dc6720b218
+DIST ddctool-0.5.3.tar.gz 323620 SHA256 8ad0d4d2ff2a8206ee42eec691f20a97492cf58e56b8b1282a90db0890bf3c27 SHA512 f96609083d2afb1e2792ff0977128b39b7fb7f9f88d63db2ed38f5d764a14930a7ae363e0d01a3b1fe336c234a2b9174ba14326460166d7047c16b1fa2c663a8 WHIRLPOOL 1499ed473f68a7b22d8438b61caf8ce8a70266c495ef52260283bb0347d057597b3ccfcf49fe03dce398a98d56399c9131032502f5b9243b974e1f7704c82a1b
--- a/app-misc/ddctool/ddctool-0.5.3.ebuild
+++ b/app-misc/ddctool/ddctool-0.5.3.ebuild
@ -0,0 +1,100 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit autotools linux-info udev user
+
+DESCRIPTION="Program for querying and changing monitor settings"
+HOMEPAGE="http://www.ddctool.com/"
+
+SRC_URI="https://github.com/rockowitz/ddctool/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+# Binary drivers need special instructions compared to the open source counterparts.
+# If a user switches drivers, they will need to set different use flags for
+# Xorg or Wayland or Mesa, so this will trigger the rebuild against
+# the different drivers.
+IUSE="usb-monitor user-permissions video_cards_fglrx video_cards_nvidia"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="x11-libs/libXrandr
+	 sys-apps/i2c-tools
+	 virtual/udev
+	 usb-monitor? (
+		dev-libs/hidapi
+		virtual/libusb:1
+		sys-apps/usbutils )"
+DEPEND="video_cards_fglrx? ( x11-libs/amd-adl-sdk )
+	virtual/pkgconfig
+	${RDEPEND}"
+
+pkg_pretend() {
+	# This program needs /dev/ic2-* devices to communicate with the monitor.
+	CONFIG_CHECK="~I2C_CHARDEV"
+	ERROR_I2C_CHARDEV="You must enable I2C_CHARDEV in your kernel to continue"
+	if use usb-monitor; then
+		CONFIG_CHECK+="~HIDRAW ~USB_HIDDEV"
+		ERROR_HIDRAW="HIDRAW is needed to support USB monitors"
+		ERROR_I2C_CHARDEV="USB_HIDDEV is needed to support USB monitors"
+	fi
+
+	# Now do the actual checks setup above
+	check_extra_config
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(usex video_cards_fglrx "--with-adl-headers=/usr/include/ADL" "")
+		$(use_enable usb-monitor usb)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	if use user-permissions; then
+		udev_dorules data/etc/udev/rules.d/45-ddctool-i2c.rules
+		if use usb-monitor; then
+			udev_dorules data/etc/udev/rules.d/45-ddctool-usb.rules
+		fi
+	fi
+}
+
+pkg_postinst() {
+	if use user-permissions; then
+		enewgroup i2c
+		einfo "To allow non-root users access to the /dev/i2c-* devices, add those"
+		einfo "users to the i2c group: usermod -aG i2c user"
+		einfo "Restart the computer or reload the i2c-dev module to activate"
+		einfo "the new udev rule."
+		einfo "For more information read: http://www.ddctool.com/i2c_permissions/"
+
+		if use usb-monitor; then
+			enewgroup video
+			einfo "To allow non-root users access to USB monitors, add those users"
+			einfo "to the video group: usermod -aG video user"
+			einfo "Restart the computer, reload the hiddev and hidraw modules, or replug"
+			einfo "the monitor to activate the new udev rule."
+			einfo "For more information read: http://www.ddctool.com/usb/"
+		fi
+
+		udev_reload
+	fi
+
+	if use video_cards_nvidia; then
+		einfo "=================================================================="
+		einfo "Please read the following webpage on proper usage with the nVidia "
+		einfo "binary drivers, or it may not work: http://www.ddctool.com/nvidia/"
+		einfo "=================================================================="
+	fi
+}
--- a/app-text/xapian-omega/Manifest
+++ b/app-text/xapian-omega/Manifest
@ -1,4 +1,5 @@
 DIST xapian-omega-1.2.22.tar.xz 437556 SHA256 a7d4b00f6830d003490c0f727fc03584e703cd6e96738e03930f135cd966381b SHA512 c90ef3658cfb7f0337aa946ad04a7173d0aa89e5179c8b9edbfd78156c11d93d6a9ef6055142d26ecd95af8b0cbdf3b061e505c75f37f5e1e3b2ffc272fbaa3b WHIRLPOOL fa500c681fe1c8b82c3d469183ce987b38cd91f110ed1cd7b4e5372525a503c28e310abb15afc31892f2fa4fbd8e74bce07c1b618996541500b3f8d114b06920
 DIST xapian-omega-1.2.23.tar.xz 437912 SHA256 55c790204fc0b1ddbd4bdae73aa55eed40671475e13252a71a53a01f80d172ef SHA512 1ea2b090b75f7ab530bbb6af79eb26931684796f9b0a987530f44e7f7f9527929644880f7528198e0ea22f69feabd014783c0b01edaa6673b54f83091e9a5428 WHIRLPOOL 522833f6dc47693885238caac1da80141d909a2c7c89bc5f302e064f5ebded132329000a223f9a11b412adea25c412ff4a99c0f5de9cf25582e62dca02a3bae6
+DIST xapian-omega-1.2.24.tar.xz 438104 SHA256 45fca431b812ddacbd592b522389474317af386b3ab554908edd36fc5918da53 SHA512 df483ed1410ca04df3b1ec4248442c91b03bd407737d022e494ffe3e14d62a41ee73b27114a979f59825e0ea2f2d16e0eea3c518a8db0094d697f0093e21f6a7 WHIRLPOOL af7a01659a48cf63a63dfe231cd39bc9d1dabb4e3e097262d21b73d3b99145ba3fe348c3126103dc3c91f4b9a2a1a61c1a4a80b0a0830580bcdf1b5a0cd8c393
 DIST xapian-omega-1.3.7.tar.xz 490156 SHA256 3d3064289dc891c774a6be8b6e2f0f21691b88ab57ec7a5d16141179027c7453 SHA512 87aea7e59a612b6757d6c826b328542f5696d544906e85009063b8a7206a9cbf50457f7a03e3d2c25ebfd95d37e3c2a75ee70d2da7c3e1bd021e6c15092a1755 WHIRLPOOL 5da58ff0e30c0341b7f653b30be12770fea82d3f6e6041d8fd82be1ca75b3e058336854a4a651d430c71dbacfebb91b9b0eb4b95ced99ba983bddcd690acb92b
 DIST xapian-omega-1.4.0.tar.xz 490224 SHA256 10fc0635b5009bbe726461a62867abf6761bd8cfb812c2ead9646a166a20431f SHA512 973c456e6d6f5b0818ec6ae1fe8e2ad221ddb5f497a0e51ea552b3e634414f0110311de848276904cff9712dcde7f6468f7152e802a912477e087a17d254d65e WHIRLPOOL 94d3d8bf591dd1cba33b6ab5c09159d596d422a822537890a04106feabd2604c19986f2c5a40800d656090c76e224b25a061b61f84c219b457ea19c350d9bd97
--- a/app-text/xapian-omega/xapian-omega-1.2.24.ebuild
+++ b/app-text/xapian-omega/xapian-omega-1.2.24.ebuild
@ -0,0 +1,46 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+DESCRIPTION="An application built on Xapian, consisting of indexers and a CGI search frontend"
+SRC_URI="http://www.oligarchy.co.uk/xapian/${PV}/xapian-omega-${PV}.tar.xz"
+HOMEPAGE="http://www.xapian.org/"
+S="${WORKDIR}/xapian-omega-${PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND="dev-libs/xapian:0/1.2.22
+	dev-lang/perl
+	dev-libs/libpcre
+	sys-libs/zlib"
+RDEPEND="${DEPEND}"
+
+src_install () {
+	emake DESTDIR="${D}" install
+
+	# Protect /etc/omega.conf
+	echo "CONFIG_PROTECT=\"/etc/omega.conf\"" > "${T}"/20xapian-omega
+	doenvd "${T}"/20xapian-omega
+	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
+
+	#move docs to /usr/share/doc/${PF}.
+	mv "${D}/usr/share/doc/xapian-omega" "${D}/usr/share/doc/${PF}" || die
+
+	# Directory containing Xapian databases:
+	keepdir /var/lib/omega/data
+
+	# Directory containing OmegaScript templates:
+	keepdir /var/lib/omega/templates
+	mv "${S}"/templates/* "${D}"/var/lib/omega/templates || die
+
+	# Directory to write Omega logs to:
+	keepdir /var/log/omega
+
+	# Directory containing any cdb files for the $lookup OmegaScript command:
+	keepdir /var/lib/omega/cdb
+}
--- a/dev-db/postgresql/Manifest
+++ b/dev-db/postgresql/Manifest
@ -23,4 +23,4 @@ DIST postgresql-9.5.1.tar.bz2 18441638 SHA256 6b309d8506a39773a752ff074f47656e54
 DIST postgresql-9.5.2.tar.bz2 18446616 SHA256 f8d132e464506b551ef498719f18cfe9d777709c7a1589dc360afc0b20e47c41 SHA512 ba31dddee8a960a4b1a97394eae5ea7efaa5e74e21c755882efcef90404676c6052dff55f40b585932e4f752cbcda5ceac0e29d601ea6651cfbab7a49190381a WHIRLPOOL 0b9abe3a5b3933485e5d0b2c08daa20d421e5920ae5b4640b36971463915d7e7b2767575564d80bb5dfa3a353c646c9c4ca8e483dfd64df39370774e76fa1cee
 DIST postgresql-9.5.3.tar.bz2 18455394 SHA256 7385c01dc58acba8d7ac4e6ad42782bd7c0b59272862a3a3d5fe378d4503a0b4 SHA512 7275dbde0c1b795f3a491d45464c69a97fbfd0e66a7fe62ba00e97747908df0df19bf65e104e10e049e31a8cf484c9d9f29eb75ff6a3875cb087559e25744c29 WHIRLPOOL 60536e8e244ecdd1e307a8daa1bcd5728bd070b5c08063bf48fbcb93673c012497e257fe3c4f15019b0674e82724e48105d2799926572910370efb17dbbd6e21
 DIST postgresql-9.5.4.tar.bz2 18496299 SHA256 cf5e571164ad66028ecd7dd8819e3765470d45bcd440d258b686be7e69c76ed0 SHA512 e5220bc967443d54b9dcff7ba5aefccedbe1c219f953eb0d67254c709d52b0e647d1dc473446640804165b596fc5b75fa4ff8d63696123b87d8096c3a7795c34 WHIRLPOOL d429d853062b2d2f8e999db1733b3206020f2d521401e0510376213ecaa2049b6d87987b9ee999ab81faacf6ce65ddfdcf43b0922fc23e91961594956c556e0d
-DIST postgresql-9.6rc1.tar.bz2 19161063 SHA256 9e260252f04b7f6abe3877eb1cb8affa4ecc2abbadadf9bd874ad257e9a01a1d SHA512 cb73ea9c7e42f427ac817d7b11ff6b413280993d491412986afcb0d986c966b288f1183f94c336d4e9a3f8d7c523bc695321f9392fee74193fb8f5ce3e85ad0b WHIRLPOOL 339535acc3e2bb08bb3d3556c38cb2cd43d485e8e25886a161aaf8df7de4e71ac8b3a207909d5c782c3cc713f6d74e514b31e651565732d68a54fb68d6047e62
+DIST postgresql-9.6.0.tar.bz2 19157472 SHA256 3b5fe9634b80a4511aac1832a087586a7caa8c3413619562bdda009a015863ce SHA512 46ec903eed13bf5fb5510d56e4814405ba4510c9e5f43c533189b6ed07c7955dba326107ae0dbeebb5abdd00b7007971ca5d7213274bd653d8d4295f93e6cbf8 WHIRLPOOL aa5d30d41aca14eee3a00d5f3805b28187278a538c0f00b9cb70fad9e2c401dedc797512b9851a04c67f21e7b8cfbcf6d2f85c1486795803840b7111cccb2b19
--- a/dev-db/postgresql/postgresql-9.6_rc1.ebuild
+++ b/dev-db/postgresql/postgresql-9.6_rc1.ebuild
@ -9,7 +9,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator

-KEYWORDS=""
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"

 SLOT="$(get_version_component_range 1-2)"

--- a/dev-libs/gecode/gecode-4.4.0-r1.ebuild
+++ b/dev-libs/gecode/gecode-4.4.0-r1.ebuild
@ -49,8 +49,6 @@ src_prepare() {
 src_configure() {
 	 # --disable-examples prevents COMPILING the examples.
 	econf \
-		--docdir="/usr/share/doc/${PF}" \
-		--htmldir="/usr/share/doc/${PF}" \
 		--disable-examples \
 		$(use_enable doc doc-dot) \
 		$(use_enable doc doc-tagfile) \
--- a/dev-libs/leatherman/Manifest
+++ b/dev-libs/leatherman/Manifest
@ -4,7 +4,6 @@ DIST leatherman-0.6.3.tar.gz 387644 SHA256 8951713aff2dd9a4e38016faa6fa6bd5634f1
 DIST leatherman-0.7.2.tar.gz 389242 SHA256 ed4b887c6fe53987ea04c44382f60ff13cb245abbb0298455da5731a4636398f SHA512 3a9548caf9585ef52d54354cab19104c74235e0eb6c895ed47df9ba6a03dc108a9775fe7d3041c6f01c4f71e84769e94a090fb92281c1e592a0db9684ff60e6c WHIRLPOOL 97926560b8752f6065f1276be720d88b5c913b2a506f6bef63167d2274ba3ba1f7d02ad77bd4c4c47cd101853953e3049ce79eb8419036483e0af10577961f8b
 DIST leatherman-0.7.3.tar.gz 388947 SHA256 64658b37bdbb24e85fd6be99c80e7d9daff510cb251ea89b7ed9eae5f7efdc47 SHA512 318ed8fcf6b515d5e89c3f1e9aee12b39413725941890620ad54cb937afdb39a3f1a55c072fb55435a9ab7d5121ff83cdb2e6af47827a7f65f4d999fe11932ee WHIRLPOOL fdf8567e747ce6e30878e52de602b6f49e3cb0e87377299fedbf30e37e3bacc2703048e418624a10ffbcdbb2618963be6fc394d41eabfe712512ec69be52c981
 DIST leatherman-0.7.4.tar.gz 389081 SHA256 96f3791ffc4f0ce780bd533b69739420b470e90a400d5de34eb8539c11f502c4 SHA512 71b84a6934f46de4a9e6181e5cfc796fe25cac6bd8580fe618e3693bf22879e6597ecdc7bee0c8817beb3470934e06b4372d68e60575353029b795f013963b95 WHIRLPOOL cc61b8f996acbf2eb931a60b5fb1c237cb784165902e127e50e1a84da0d16928fd7720ec97df9db7985f0c6f221e64e1947f6ef84d69710bc6cc0eb352b60cdb
-DIST leatherman-0.7.5.tar.gz 389795 SHA256 a54fd92a939fbf48d57d248010ed41cf373f826855222b30ec16289be586c1ac SHA512 70f6ad91647aaa049720af02110706ea7492bd00d2f742c203f7da22bb3928c677008e035144e3cbd9caa9e0ceec4abf89ce50567eaa9eaf4550908c5c8ba7da WHIRLPOOL 04d87ee2edcdb03938a26adebd2a37118370ab11b98ec6bea541c8df4d31c654a01579f81f164bedfea648210ef55bcfc6c1804bd4835f12308f9e262eb269fb
 DIST leatherman-0.8.1.tar.gz 391075 SHA256 e5cd0b9893711495abfc004403e657c9a4f3ee46486c1fc7a60b4eb6787b3f49 SHA512 c10b0a8cee580cdd2c963dc21c445084eab5c70e5cb43d6550ac3b5681aa1edb772937a4fc7c0143b7523c0508056047b87d3c9b98bc4c9c5c59d8e63dcfc9e8 WHIRLPOOL 88bb92d59b86be1480a4f10559140cad66f8fa7c94d217fe527f7f27f53550df0f30bfb6f2d93512fa6e874a311da8990b44585982031bc69c49dacbe8583d1d
 DIST leatherman-0.9.0.tar.gz 392308 SHA256 8d79a998caa47047bfc52093e6a50618458b5c0aa502a6cf61f9fb7a6451c3bb SHA512 25c5edd58abad4e20d36ec7badb94aacc0f9a9e44200e710dcb3da116685396bba5b12ae806f9865e48d5d50c43a31486d8aa39fd853551ccf2c3eaa28859c8d WHIRLPOOL 492ae8971368a8c7e3527a875c8cb4a46d5a767b80b45d32b33fa2f1c66a7d2ea4825c923a6993b1147ac8e68bb111c682ef5315c13a11a68bd583b3423e6656
 DIST leatherman-0.9.1.tar.gz 417376 SHA256 dc436230edd65f5244a72d290c598a3889787c917c4aa1a10f4559149408de81 SHA512 93fcb374eeac37a1e1009def0b94de8e7017764db7d18967da0409c34397e32249894de13e23509ecb37907388d7019e08e021db1d6909b1e8fe8b7b6e535c28 WHIRLPOOL 4e2c89322d349780624dff0670e353b923c159df9db20cf20272a8d7e80a899b85f949c2bbfc05e7a587ff845a5a342fc690be5dd3457d185b2d6850bf97ac47
--- a/dev-libs/leatherman/leatherman-0.7.5-r2.ebuild
+++ b/dev-libs/leatherman/leatherman-0.7.5-r2.ebuild
@ -1,51 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby21 ruby22"
-
-inherit cmake-utils multilib ruby-ng
-
-DESCRIPTION="A C++ toolkit"
-HOMEPAGE="https://github.com/puppetlabs/leatherman"
-SRC_URI="https://downloads.puppetlabs.com/facter/${P}.tar.gz"
-SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${S}/all/${P}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="debug test"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
-
-CDEPEND="
-	>=sys-devel/gcc-4.8:*
-	>=dev-libs/boost-1.54[nls]
-	<net-misc/curl-7.50.0"
-
-RDEPEND+=" ${CDEPEND}"
-DEPEND+=" test? ( ${CDEPEND} )"
-
-src_prepare() {
-	sed -i 's/\-Werror\ //g' "cmake/cflags.cmake" || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_VERBOSE_MAKEFILE=ON
-		-DCMAKE_BUILD_TYPE=None
-		-DCMAKE_INSTALL_PREFIX=/usr
-		-DCMAKE_INSTALL_SYSCONFDIR=/etc
-		-DCMAKE_INSTALL_LOCALSTATEDIR=/var
-	)
-	if use debug; then
-		mycmakeargs+=(
-		  -DCMAKE_BUILD_TYPE=Debug
-		)
-	fi
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-}
--- a/dev-libs/libatasmart/libatasmart-0.19.ebuild
+++ b/dev-libs/libatasmart/libatasmart-0.19.ebuild
@ -1,32 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils
-
-DESCRIPTION="A small and lightweight parser library for ATA S.M.A.R.T. hard disks"
-HOMEPAGE="http://0pointer.de/blog/projects/being-smart.html"
-SRC_URI="http://0pointer.de/public/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86"
-IUSE="static-libs"
-
-RDEPEND="virtual/udev"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS="README"
-
-src_configure() {
-	econf \
-		--docdir=/usr/share/doc/${PF} \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	prune_libtool_files --all
-}
--- a/dev-libs/libgamin/Manifest
+++ b/dev-libs/libgamin/Manifest
@ -1,5 +1,4 @@
 DIST gamin-0.1.10.tar.bz2 452194 SHA256 a59948b20ce2f14136c013f155abb8c8d51db2ea167c063ff33461e453fec10a SHA512 ccdbc06eeb958ed2d888aee3fcadbadf00e9e6566802adee82035e0762ac3351ed2a2983eabe07503ddde2ddf035185c6cd98cbece2feadaaa36e8f656a38306 WHIRLPOOL 49ca0e192d8f5e28d6ffbb201b98b0f2c736554447b37c50eaa6e76e499ab77d696cf585c96c6a38f94c2589c634e694daf2e4969ffddbbb245b07b8a6e7b2d8
 DIST gamin-0.1.9-freebsd.patch.bz2 4635 SHA256 fcd1a6655d1c7cd86db6102931a4da1c22bc85f1c4692959c1a966fec5231723 SHA512 a9d9a8e4d85b289df6f87bf2b966ff262281db0d7e6094deb4f2c179f12c6cc3e387c1e1c28306a9fb54f2eb2837f9bdd3a34b2bb68db8abfdbecc7492e9730b WHIRLPOOL 462173a33e8f804b71c6991aa5925a5c9a6ee83f80b13967369c5c45721069e629c052e5daebfc3fb03bbad4d3054b523afb6e430db997581f3ff942f7da3180
 DIST libgamin-0.1.10-opensolaris.patch.bz2 16955 SHA256 9cb1bde5a34888ce4de4c4894c7d31dbfdbfb3279007b9eddf2da35510f6a9b5 SHA512 fd1cfc5a6b5ba429622f8d426cfba0e3c1c05c3677fb58c53af39b4030ae56f3f71caf63eb5ecb16169c2f7e8c79a32d7d440857c2c7fd3a259cf8312a9b2004 WHIRLPOOL 3efbf3781a55f44f383e573db4a3b3df731e9f77608d73db4ff3027eae0bda6abb6eae022c094735c0d8d2a85e224a980436d8557f9350bb1558b40d99280701
-DIST pkg-config-0.26.tar.gz 396399 SHA256 94c1936a797c930fb3e4e5a154165b6268caba22b32d24083dd4c492a533c8af SHA512 9390d5918dd4ac520b914d2330aa7cae2587ca7b21b03bc88372fd5dbbd78e33eeb3fca39fcdb6dd10113658f03118a1c8829149c7029eb0dd80348d100170a4 WHIRLPOOL f535946a02192a9bffc7be0fae454e25aa86af8bac7f47622d52ed13f77f1ba05ff9b5693b2a501981e3991e4e1595eced22dee4ab748b310baa7d57267a62a7
 DIST pkg-config-0.28.tar.gz 1931203 SHA256 6b6eb31c6ec4421174578652c7e141fdaae2dabad1021f420d8713206ac1f845 SHA512 6eafa5ca77c5d44cd15f48457a5e96fcea2555b66d8e35ada5ab59864a0aa03d441e15f54ab9c6343693867b3b490f392c75b7d9312f024c9b7ec6a0194d8320 WHIRLPOOL db4ddb4ce61724e629931c5ffccb4d7a551b4dc0f4efed5a966822307e4b5a786adee5705dd80ec0a9aa32cb1af9ad9615e307360e131fc34688207216161486
--- a/dev-libs/libgamin/libgamin-0.1.10-r4.ebuild
+++ b/dev-libs/libgamin/libgamin-0.1.10-r4.ebuild
@ -1,151 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-PYTHON_DEPEND="python? 2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython"
-GNOME_ORG_MODULE="gamin"
-GNOME_TARBALL_SUFFIX="bz2"
-
-inherit autotools eutils flag-o-matic libtool python gnome.org multilib-minimal
-
-DESCRIPTION="Library providing the FAM File Alteration Monitor API"
-HOMEPAGE="https://www.gnome.org/~veillard/gamin/"
-SRC_URI="${SRC_URI}
-	mirror://gentoo/gamin-0.1.9-freebsd.patch.bz2
-	https://dev.gentoo.org/~grobian/patches/libgamin-0.1.10-opensolaris.patch.bz2
-	https://pkgconfig.freedesktop.org/releases/pkg-config-0.26.tar.gz" # pkg.m4 for eautoreconf
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="debug kernel_linux python static-libs"
-
-RESTRICT="test" # needs gam-server
-
-RDEPEND="!app-admin/fam
-	!<app-admin/gamin-0.1.10"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	if use python; then
-		python_pkg_setup
-	fi
-}
-
-src_prepare() {
-	mv -vf "${WORKDIR}"/pkg-config-*/pkg.m4 "${WORKDIR}"/ || die
-
-	# Fix QA warnings, bug #257281, upstream #466791
-	epatch "${FILESDIR}"/${PN}-0.1.10-compilewarnings.patch
-
-	if [[ ${CHOST} != *-solaris* ]] ; then
-		# Fix compile warnings; bug #188923
-		epatch "${DISTDIR}"/gamin-0.1.9-freebsd.patch.bz2
-	else
-		# (Open)Solaris necessary patches (changes configure.in), unfortunately
-		# conflicts with freebsd patch and breaks some linux installs so it must
-		# only be applied if on solaris.
-		epatch "${DISTDIR}"/${P}-opensolaris.patch.bz2
-	fi
-
-	# Fix collision problem due to intermediate library, upstream bug #530635
-	epatch "${FILESDIR}"/${PN}-0.1.10-noinst-lib.patch
-
-	# Fix compilation with latest glib, bug #382783
-	epatch "${FILESDIR}/${PN}-0.1.10-G_CONST_RETURN-removal.patch"
-
-	# Fix crosscompilation issues, bug #267604
-	epatch "${FILESDIR}/${PN}-0.1.10-crosscompile-fix.patch"
-
-	# Enable linux specific features on armel, upstream bug #588338
-	epatch "${FILESDIR}/${P}-armel-features.patch"
-
-	# Fix possible server deadlock in ih_sub_cancel, upstream bug #667230
-	epatch "${FILESDIR}/${PN}-0.1.10-deadlock.patch"
-
-	# Drop DEPRECATED flags
-	sed -i -e 's:-DG_DISABLE_DEPRECATED:$(NULL):g' server/Makefile.am || die
-
-	# Build only shared version of Python module.
-	epatch "${FILESDIR}"/${PN}-0.1.10-disable_python_static_library.patch
-
-	# Python bindings are built/installed manually.
-	sed -e "/SUBDIRS += python/d" -i Makefile.am
-
-	sed -i \
-		-e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
-		-e 's:AM_PROG_CC_STDC:AC_PROG_CC:' \
-		configure.in || die #466962
-
-	# autoconf is required as the user-cflags patch modifies configure.in
-	# however, elibtoolize is also required, so when the above patch is
-	# removed, replace the following call with a call to elibtoolize
-	AT_M4DIR="${WORKDIR}" eautoreconf
-
-	use python && python_clean_py-compile_files
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable static-libs static) \
-		--disable-debug \
-		--disable-server \
-		$(use_enable kernel_linux inotify) \
-		$(use_enable debug debug-api) \
-		$(use_with python)
-}
-
-multilib_src_compile() {
-	default
-
-	if multilib_is_native_abi && use python; then
-		python_copy_sources python
-
-		building() {
-			emake \
-				PYTHON_INCLUDES="${EPREFIX}$(python_get_includedir)" \
-				PYTHON_SITE_PACKAGES="${EPREFIX}$(python_get_sitedir)" \
-				PYTHON_VERSION="$(python_get_version)"
-		}
-		S="${BUILD_DIR}" python_execute_function -s --source-dir python building
-	fi
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-
-	if multilib_is_native_abi && use python; then
-		installation() {
-			emake \
-				DESTDIR="${D}" \
-				PYTHON_SITE_PACKAGES="${EPREFIX}$(python_get_sitedir)" \
-				PYTHON_VERSION="$(python_get_version)" \
-				install
-		}
-		S="${BUILD_DIR}" python_execute_function -s --source-dir python installation
-
-		python_clean_installation_image
-	fi
-}
-
-multilib_src_instal_all() {
-	dodoc AUTHORS ChangeLog README TODO NEWS doc/*txt
-	dohtml doc/*
-
-	find "${D}" -name '*.la' -exec rm -f {} +
-}
-
-pkg_postinst() {
-	if use python; then
-		python_mod_optimize gamin.py
-	fi
-}
-
-pkg_postrm() {
-	if use python; then
-		python_mod_cleanup gamin.py
-	fi
-}
--- a/dev-libs/liboil/liboil-0.3.17-r1.ebuild
+++ b/dev-libs/liboil/liboil-0.3.17-r1.ebuild
@ -1,57 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-inherit eutils flag-o-matic multilib
-
-DESCRIPTION="Library of simple functions that are optimized for various CPUs"
-HOMEPAGE="https://liboil.freedesktop.org/"
-SRC_URI="https://liboil.freedesktop.org/download/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0.3"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="+examples static-libs test"
-
-RDEPEND="examples? ( dev-libs/glib:2 )"
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc-am
-	virtual/pkgconfig"
-
-src_prepare() {
-	if ! use examples; then
-		sed "s/^\(SUBDIRS =.*\)examples\(.*\)$/\1\2/" \
-			-i Makefile.am Makefile.in || die
-	fi
-
-	if ! use test; then
-		sed "s/^\(SUBDIRS =.*\)testsuite\(.*\)$/\1\2/" \
-			-i Makefile.am Makefile.in || die
-	fi
-
-	epatch "${FILESDIR}/${P}-amd64-cpuid.patch"
-	has x32 $(get_all_abis) && epatch "${FILESDIR}"/${PN}-0.3.17-x32.patch
-}
-
-src_configure() {
-	strip-flags
-	filter-flags -O?
-	append-flags -O2
-
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	DOCS="AUTHORS BUG-REPORTING HACKING NEWS README"
-	default
-	prune_libtool_files
-}
-
-pkg_postinst() {
-	if ! use examples; then
-		ewarn "You have disabled examples USE flag. Beware that upstream might"
-		ewarn "want the output of some utilities that are only built with"
-		ewarn "USE='examples' if you report bugs to them."
-	fi
-}
--- a/dev-libs/liboil/liboil-0.3.17.ebuild
+++ b/dev-libs/liboil/liboil-0.3.17.ebuild
@ -1,58 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=2
-inherit eutils flag-o-matic multilib
-
-DESCRIPTION="Library of simple functions that are optimized for various CPUs"
-HOMEPAGE="https://liboil.freedesktop.org/"
-SRC_URI="https://liboil.freedesktop.org/download/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0.3"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="doc +examples test"
-
-RDEPEND="examples? ( dev-libs/glib:2 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-src_prepare() {
-	if ! use examples; then
-		sed "s/^\(SUBDIRS =.*\)examples\(.*\)$/\1\2/" \
-			-i Makefile.am Makefile.in || die
-	fi
-
-	if ! use test; then
-		sed "s/^\(SUBDIRS =.*\)testsuite\(.*\)$/\1\2/" \
-			-i Makefile.am Makefile.in || die
-	fi
-
-	has x32 $(get_all_abis) && epatch "${FILESDIR}"/${PN}-0.3.17-x32.patch
-}
-
-src_configure() {
-	strip-flags
-	filter-flags -O?
-	append-flags -O2
-
-	econf \
-		--disable-dependency-tracking \
-		$(use_enable doc gtk-doc) \
-		--with-html-dir=/usr/share/doc/${PF}/html
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS BUG-REPORTING HACKING NEWS README || die
-}
-
-pkg_postinst() {
-	if ! use examples; then
-		ewarn "You have disabled examples USE flag. Beware that upstream might"
-		ewarn "want the output of some utilities that are only built with"
-		ewarn "USE='examples' if you report bugs to them."
-	fi
-}
--- a/dev-libs/xapian-bindings/Manifest
+++ b/dev-libs/xapian-bindings/Manifest
@ -1,4 +1,5 @@
 DIST xapian-bindings-1.2.22.tar.xz 844040 SHA256 b15ca7984980a1d2aedd3378648ef5f3889cb39a047bac1522a8e5d04f0a8557 SHA512 0eec204ebb92f1230b9dbd080ad2b56ea5fa8e6170eb4354556e5790c7a7da7ba4c8475aaf86fb8f10f102a461d91590184271220626315f55c0631e73e122e0 WHIRLPOOL 05ac5b31d73f9de0c101da832ef289f6a505baa68216eba6fa0cf80df1709feef7e42c7b8f4cf9af35f775e8514c6d4b944c2acebffff10bc558a83305a637ce
 DIST xapian-bindings-1.2.23.tar.xz 885888 SHA256 19b4b56c74863c51733d8c2567272ef7f004b898cf44016711ae25bc524b2215 SHA512 4be9d103a4073a08d2481e9ddc347156d4028a1517f313861ad3664e6103e052dc1a0d07a992da3ca02599505c002d09d77c4fd886c144918aab72977e69994c WHIRLPOOL 1323e51dcd8f18f573f9338d9a013bfd370870c1fd2c0b0e3ff9d1f6b3b9154a0512d7442d7c7b1b00a70757faa218e8894a0f4fe56da88bca12ba2259cd35de
+DIST xapian-bindings-1.2.24.tar.xz 886148 SHA256 0c2a0df0a4616e2bd8e578d372c9bb4684780573abebbd1ac515502177229965 SHA512 aaedac02ec9fb192ef8b45b07bef5584bc60aff7068c2e3fa0008430ed8296a653780cad04176431d81fe014802df333a3090469dce63204923eead15e6bbaef WHIRLPOOL 996b960727a79dbe669ae8139863c3896c6efdbe781177098d00960982b86a43739433c69db32e62b6660dd4751736d859f5d950d26d6b635c310c35d75a8a0f
 DIST xapian-bindings-1.3.7.tar.xz 1021176 SHA256 f014bb0281fdaa08fd9293ee187af0c2165f4fd2de91a67b76d9327b64677717 SHA512 3dc7eac68c4f3010e5cb831b4baad7bea4d47e0a8dc492ac16f2437057da351caad008aa7bcf3f2bbdaffda7d2524e8b5a945b651dc02deadeb110073ef06ad8 WHIRLPOOL f68a81a37b9c298ad6b061f597806b0823ba01ee02c0921e90988c984ac2f60ec0cb09dba8bdecb43c412517eebd72490196923db474e5362d17c47af4b4fdd2
 DIST xapian-bindings-1.4.0.tar.xz 1021244 SHA256 3aec7a009d0bf0b95968420bf68683176c05d63140eaf1cf265d39afe8fa6253 SHA512 16523be4f2cd576819771e387d469c91cd03b27522808eebc9275ac3281e55c5d40a5c620ad37f96c2dbc89cc2b13808579e29d737eb63584b8c209597b0f7ce WHIRLPOOL 26a31b8a2ca8bd08a45e79fb5f926e917db8e65d8ee1f07c9291c573b8efa647c9ff7bc1c6c3130ae69538ffa1789a0ad60d940f00b758066e55f4835ec20433
--- a/dev-libs/xapian-bindings/xapian-bindings-1.2.24.ebuild
+++ b/dev-libs/xapian-bindings/xapian-bindings-1.2.24.ebuild
@ -0,0 +1,203 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads"
+
+USE_PHP="php5-5 php5-6"
+
+PHP_EXT_NAME="xapian"
+PHP_EXT_INI="yes"
+PHP_EXT_OPTIONAL_USE="php"
+
+#mono violates sandbox, we disable it until we figure this out
+#inherit java-pkg-opt-2 mono-env php-ext-source-r2 python
+inherit java-pkg-opt-2 php-ext-source-r2 python-r1 toolchain-funcs
+
+DESCRIPTION="SWIG and JNI bindings for Xapian"
+HOMEPAGE="http://www.xapian.org/"
+SRC_URI="http://oligarchy.co.uk/xapian/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+#IUSE="java lua mono perl php python ruby tcl"
+#REQUIRED_USE="|| ( java lua mono perl php python ruby tcl )"
+IUSE="java lua perl php python ruby tcl"
+REQUIRED_USE="|| ( java lua perl php python ruby tcl )"
+
+COMMONDEPEND="dev-libs/xapian:0/1.2.22
+	lua? ( dev-lang/lua:0 )
+	perl? ( dev-lang/perl:= )
+	ruby? ( dev-lang/ruby:= )
+	tcl? ( >=dev-lang/tcl-8.1:0= )"
+#	mono? ( >=dev-lang/mono-1.0.8 )
+DEPEND="${COMMONDEPEND}
+	virtual/pkgconfig
+	java? ( >=virtual/jdk-1.3 )"
+RDEPEND="${COMMONDEPEND}
+	java? ( >=virtual/jre-1.3 )"
+
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+}
+
+src_unpack() {
+	default
+}
+
+src_prepare() {
+	java-pkg-opt-2_src_prepare
+	if use java; then
+		sed \
+			-e 's/$(JAVAC)/$(JAVAC) $(JAVACFLAGS)/' \
+			-i java{/,/org/xapian/errors/,/org/xapian/}Makefile.in || die "sed failed"
+	fi
+
+	if use python; then
+		sed \
+			-e 's:\(^pkgpylib_DATA = xapian/__init__.py\).*:\1:' \
+			-e 's|\(^xapian/__init__.py: modern/xapian.py\)|\1 xapian/_xapian.so|' \
+			-i python/Makefile.in || die "sed failed"
+	fi
+}
+
+src_configure() {
+	if use java; then
+		CXXFLAGS="${CXXFLAGS} $(java-pkg_get-jni-cflags)"
+	fi
+
+	if use perl; then
+		export PERL_ARCH="$(perl -MConfig -e 'print $Config{installvendorarch}')"
+		export PERL_LIB="$(perl -MConfig -e 'print $Config{installvendorlib}')"
+	fi
+
+	if use lua; then
+		export LUA_LIB="$($(tc-getPKG_CONFIG) --variable=INSTALL_CMOD lua)"
+	fi
+
+	econf \
+		$(use_with java) \
+		$(use_with lua) \
+		$(use_with perl) \
+		$(use_with php) \
+		$(use_with python) \
+		$(use_with ruby) \
+		$(use_with tcl)
+#		$(use_with mono csharp) \
+
+	# PHP and Python bindings are built/tested/installed manually.
+	sed -e "/SUBDIRS =/s/ php//" -i Makefile || die "sed Makefile"
+	sed -e "/SUBDIRS =/s/ python//" -i Makefile || die "sed Makefile"
+}
+
+src_compile() {
+	default
+
+	if use php; then
+		local php_slot
+		for php_slot in $(php_get_slots); do
+			cp -r php php-${php_slot}
+			emake -C php-${php_slot} \
+				PHP="${EPREFIX}/usr/$(get_libdir)/${php_slot}/bin/php" \
+				PHP_CONFIG="${EPREFIX}/usr/$(get_libdir)/${php_slot}/bin/php-config" \
+				PHP_EXTENSION_DIR="$("${EPREFIX}/usr/$(get_libdir)/${php_slot}/bin/php-config" --extension-dir)" \
+				PHP_INC="$("${EPREFIX}/usr/$(get_libdir)/${php_slot}/bin/php-config" --includes)"
+		done
+	fi
+
+	if use python; then
+		python_copy_sources
+#		building() {
+#			emake -C python \
+#				PYTHON="$(PYTHON)" \
+#				PYTHON_INC="$(python_get_includedir)" \
+#				PYTHON_LIB="$(python_get_libdir)" \
+#				PYTHON_SO="$("$(PYTHON)" -c 'import distutils.sysconfig; print(distutils.sysconfig.get_config_vars("SO")[0])')" \
+#				pkgpylibdir="$(python_get_sitedir)/xapian"
+#		}
+		building() {
+			emake -C python \
+				PYTHON_INC="$(python_get_includedir)" \
+				pkgpylibdir="$(python_get_sitedir)/xapian"
+				VERBOSE="1"
+		}
+		python_foreach_impl building
+	fi
+}
+
+src_test() {
+	default
+
+	if use php; then
+		local php_slot
+		for php_slot in $(php_get_slots); do
+			emake -C php-${php_slot} \
+				PHP="${EPREFIX}/usr/$(get_libdir)/${php_slot}/bin/php" \
+				PHP_CONFIG="${EPREFIX}/usr/$(get_libdir)/${php_slot}/bin/php-config" \
+				PHP_EXTENSION_DIR="$("${EPREFIX}/usr/$(get_libdir)/${php_slot}/bin/php-config" --extension-dir)" \
+				PHP_INC="$("${EPREFIX}/usr/$(get_libdir)/${php_slot}/bin/php-config" --includes)" \
+				check
+		done
+	fi
+
+	if use python; then
+		testing() {
+			emake -C python \
+				PYTHON_INC="$(python_get_includedir)" \
+				pkgpylibdir="$(python_get_sitedir)/xapian" \
+				VERBOSE="1" \
+				check
+		}
+		python_foreach_impl testing
+	fi
+}
+
+src_install () {
+	emake DESTDIR="${D}" install
+
+	if use java; then
+		java-pkg_dojar java/built/xapian_jni.jar
+		# TODO: make the build system not install this...
+		java-pkg_doso "${D}/${S}/java/built/libxapian_jni.so"
+		rm "${D}/${S}/java/built/libxapian_jni.so"
+		rmdir -p "${D}/${S}/java/built"
+		rmdir -p "${D}/${S}/java/native"
+	fi
+
+	if use php; then
+		local php_slot
+		for php_slot in $(php_get_slots); do
+			emake DESTDIR="${D}" -C php-${php_slot} \
+				PHP="${EPREFIX}/usr/$(get_libdir)/${php_slot}/bin/php" \
+				PHP_CONFIG="${EPREFIX}/usr/$(get_libdir)/${php_slot}/bin/php-config" \
+				PHP_EXTENSION_DIR="$("${EPREFIX}/usr/$(get_libdir)/${php_slot}/bin/php-config" --extension-dir)" \
+				PHP_INC="$("${EPREFIX}/usr/$(get_libdir)/${php_slot}/bin/php-config" --includes)" \
+				install
+		done
+
+		php-ext-source-r2_createinifiles
+	fi
+
+	if use python; then
+		installation() {
+			emake -C python \
+				DESTDIR="${D}" \
+				PYTHON_INC="$(python_get_includedir)" \
+				pkgpylibdir="$(python_get_sitedir)/xapian" \
+				VERBOSE="1" \
+				install
+		}
+		python_foreach_impl installation
+	fi
+
+	# For some USE combinations this directory is not created
+	if [[ -d "${D}/usr/share/doc/xapian-bindings" ]]; then
+		mv "${D}/usr/share/doc/xapian-bindings" "${D}/usr/share/doc/${PF}"
+	fi
+
+	dodoc AUTHORS HACKING NEWS TODO README
+}
--- a/dev-libs/xapian/Manifest
+++ b/dev-libs/xapian/Manifest
@ -1,4 +1,5 @@
 DIST xapian-core-1.2.22.tar.xz 3204096 SHA256 269b87ca3faf79d444e8bb82ed58a96f1955008d7702f9966dec68608588527f SHA512 cb6bd565eb307f9bc8f801fc9cda0cc6ad5d7cb8bf0af2ab6e42d48ca4ea4169f08621db810ab87d15957d0f873bcb0336e16b12fdb6026375d9c0192781e0d6 WHIRLPOOL 580c16889a6c3e99a00f8bb791f878a08ff3522c3dffb18ace18d54575247332f0fff8866f46475513dde7544205fe08971cbd284ec3714ce0d6b9b445e8746e
 DIST xapian-core-1.2.23.tar.xz 3206452 SHA256 9783aeae4e1a6d06e5636b270db4b458a7d0804a31da158269f57fa5dc86347d SHA512 df3fa71150575faf982d6b90f2364962d61012dd45ed7ef4945a0623ed7056c32ea3cbc423f2016415a80779251ecb5080b6a34c5b66b823cf8d92fe6b5b3d30 WHIRLPOOL a5498117b060218455946948c119e52ed0639a2c2d5f1fd60e416ab06ad2cd483814039801d1fa29e097a994927d482a2bd10ab18bca28a413198ea1adb4187b
+DIST xapian-core-1.2.24.tar.xz 3210192 SHA256 57a82717ba07e9777958b6ef48d94b81ea41ac4c74d544f74da597fab1e1f87b SHA512 1f8ae5848f94b5f0bee03024f12ae8c336b6d85e58f7b36e885fe604f9fb962c0525e1f44e6cfcd183e811226c61b23f0f2fcc35c7d2e63544b19347a0f96c80 WHIRLPOOL fef6db7f393d4563828e1650eecd02e30d37f5837042b6a8992cfddb962593675f9c3af4eb5d387db71f99468235905bdbe5666f91975b260cb649fd422425ae
 DIST xapian-core-1.3.7.tar.xz 2607044 SHA256 cfbbd8d42512690bc9867ed88a6a80723fe4193b6c4b97597f8fdf49026b94e7 SHA512 c12714fa77afd524fea084758006a00d2ff74ca23925cff3f4313024f7e103e12e2fd525480c1f9ec707c3282ee4de85c45cd38d5cc8244bf2a60f7d6e703069 WHIRLPOOL 4425d1e9ac9b73b255e1abdcf7d69f5fd70f547519fa448a4876f953e330ebb2abb7ad08b16da360ca7ced50c6d60e6ea2bec127d788f44f0725ac84bb41f3f6
 DIST xapian-core-1.4.0.tar.xz 2613272 SHA256 10584f57112aa5e9c0e8a89e251aecbf7c582097638bfee79c1fe39a8b6a6477 SHA512 e37868e80187718995fd5b0f92a47c801b76c7bef129e01928d1de925b5f655ffe7c6907218809469ad4b89bf81c67ce9c9b5cc0646f2b8d629d6afd629a621e WHIRLPOOL 8d25bfbc4f872bed8e3512c85db568ab9a53166bc82a40874d61bad4599b6a4c23bbc16897c674669413a52c329bc718c00298392f19e1c99130b931c5d0b6ef
--- a/dev-libs/xapian/xapian-1.2.24.ebuild
+++ b/dev-libs/xapian/xapian-1.2.24.ebuild
@ -0,0 +1,67 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils
+
+MY_P="${PN}-core-${PV}"
+
+DESCRIPTION="Xapian Probabilistic Information Retrieval library"
+HOMEPAGE="http://www.xapian.org/"
+SRC_URI="http://oligarchy.co.uk/xapian/${PV}/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0/1.2.22" # ABI version of libxapian.so, prefixed with 1.2.
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc static-libs -cpu_flags_x86_sse +cpu_flags_x86_sse2 +brass +chert +inmemory"
+
+DEPEND="sys-libs/zlib"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	local myconf=""
+
+	einfo
+	if use cpu_flags_x86_sse2; then
+		einfo "Using sse2"
+		myconf="${myconf} --enable-sse=sse2"
+	else
+		if use cpu_flags_x86_sse; then
+			einfo "Using sse"
+			myconf="${myconf} --enable-sse=sse"
+		else
+			einfo "Disabling sse and sse2"
+			myconf="${myconf} --disable-sse"
+		fi
+	fi
+	einfo
+
+	myconf="${myconf} $(use_enable static-libs static)"
+
+	use brass || myconf="${myconf} --disable-backend-brass"
+	use chert || myconf="${myconf} --disable-backend-chert"
+	use inmemory || myconf="${myconf} --disable-backend-inmemory"
+
+	myconf="${myconf} --enable-backend-flint --enable-backend-remote"
+
+	econf $myconf
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	mv "${D}usr/share/doc/xapian-core" "${D}usr/share/doc/${PF}" || die
+	use doc || rm -rf "${D}usr/share/doc/${PF}"
+
+	dodoc AUTHORS HACKING PLATFORMS README NEWS
+
+	prune_libtool_files --all
+}
+
+src_test() {
+	emake check VALGRIND=
+}
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
--- a/dev-python/lit/lit-9999.ebuild
+++ b/dev-python/lit/lit-9999.ebuild
@ -0,0 +1,23 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit distutils-r1 git-r3
+
+DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
+HOMEPAGE="http://llvm.org/"
+SRC_URI=""
+EGIT_REPO_URI="http://llvm.org/git/llvm.git
+	https://github.com/llvm-mirror/llvm.git"
+
+LICENSE="UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+S=${WORKDIR}/${P}/utils/lit
+
+# TODO: move the manpage generation here (from sys-devel/llvm)
--- a/dev-python/lit/metadata.xml
+++ b/dev-python/lit/metadata.xml
@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>llvm@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
--- a/dev-scheme/guile-cairo/files/1.3.90-various-fixes-20070601.patch
+++ b/dev-scheme/guile-cairo/files/1.3.90-various-fixes-20070601.patch
@ -1,72 +0,0 @@
-=== modified file 'ChangeLog'
--- ChangeLog	2007-05-18 17:38:56 +0000
-+++ ChangeLog	2007-05-20 22:36:42 +0000
-@@ -1,3 +1,15 @@
-+2007-05-21  Andy Wingo  <wingo@pobox.com>
-+
-+	* guile-cairo/guile-cairo-enum-types.h: Include <cairo-svg.h> if
-+	we are wrapping cairo_svg_version_t.
-+
-+2007-05-20  Andy Wingo  <wingo@pobox.com>
-+
-+	* guile-cairo/guile-cairo.c (scm_init_cairo): Add guard against
-+	multiple instantiations.
-+
-+	* guile-cairo/guile-cairo.h: Include cairo.h header.
-+
- 2007-05-18  Andy Wingo  <wingo@pobox.com>
- 
- 	* configure.ac: Change version to 1.3.90.
-
-=== modified file 'guile-cairo/guile-cairo-enum-types.h'
--- guile-cairo/guile-cairo-enum-types.h	2007-05-18 14:05:17 +0000
-+++ guile-cairo/guile-cairo-enum-types.h	2007-05-20 22:36:42 +0000
-@@ -24,6 +24,10 @@
- #ifndef __GUILE_CAIRO_ENUM_TYPES_H__
- #define __GUILE_CAIRO_ENUM_TYPES_H__
- 
-+#if CAIRO_HAS_SVG_SURFACE
-+#include <cairo-svg.h>
-+#endif
-+
- 
- 
- SCM scm_from_cairo_status (cairo_status_t cval);
-
-=== modified file 'guile-cairo/guile-cairo.c'
--- guile-cairo/guile-cairo.c	2007-05-18 16:27:47 +0000
-+++ guile-cairo/guile-cairo.c	2007-05-20 18:32:44 +0000
-@@ -2281,6 +2281,11 @@
- void
- scm_init_cairo (void)
- {
-+    static int initialized = 0;
-+
-+    if (initialized)
-+        return;
-+
- #ifndef SCM_MAGIC_SNARFER
- #include "guile-cairo.x"
- #endif
-@@ -2288,5 +2293,6 @@
-     scm_init_cairo_smob_types ();
-     scm_init_cairo_vector_types ();
-     scm_init_cairo_enum_types ();
-    scm_c_export (NULL);
-+
-+    initialized = 1;
- }
-
-=== modified file 'guile-cairo/guile-cairo.h'
--- guile-cairo/guile-cairo.h	2007-05-18 11:39:11 +0000
-+++ guile-cairo/guile-cairo.h	2007-05-20 17:30:53 +0000
-@@ -24,6 +24,8 @@
- #ifndef __GUILE_CAIRO_H__
- #define __GUILE_CAIRO_H__
- 
-+#include <cairo.h>
-+
- #include <guile-cairo-smob-types.h>
- #include <guile-cairo-enum-types.h>
- #include <guile-cairo-vector-types.h>
-
--- a/dev-scheme/guile-gnome-platform/files/2.15.92-add-atk-overrides.patch
+++ b/dev-scheme/guile-gnome-platform/files/2.15.92-add-atk-overrides.patch
@ -1,12 +0,0 @@
-diff -urN guile-gnome-platform-2.15.92.orig/atk/gnome/Makefile.am guile-gnome-platform-2.15.92/atk/gnome/Makefile.am
--- guile-gnome-platform-2.15.92.orig/atk/gnome/Makefile.am	2007-06-01 13:50:55.000000000 -0700
-+++ guile-gnome-platform-2.15.92/atk/gnome/Makefile.am	2007-06-01 13:51:52.000000000 -0700
-@@ -6,7 +6,7 @@
- 
- if HAVE_PANGO
- guilemodule_DATA += atk.scm
-SUBDIRS += gw
-+SUBDIRS += gw overrides
- endif
- 
- EXTRA_DIST = atk.scm
--- a/dev-scheme/guile-gnome-platform/files/2.15.92-add-cairo-fix-from-bzr.patch
+++ b/dev-scheme/guile-gnome-platform/files/2.15.92-add-cairo-fix-from-bzr.patch
@ -1,91 +0,0 @@
-=== modified file 'ChangeLog'
--- ChangeLog	2007-05-24 15:14:46 +0000
-+++ ChangeLog	2007-05-25 15:49:00 +0000
-@@ -1,3 +1,16 @@
-+2007-05-25  Andy Wingo  <wingo@pobox.com>
-+
-+	* gnome/gw/cairo-spec.scm: Now that we are actually making a
-+	shlib, init guile-cairo in the shlib instead of in every dependant
-+	wrapset.
-+
-+	* gnome/gw/Makefile.am: I tried really hard to avoid making a
-+	shared library for this g-wrap wrapset, since it is not necessary
-+	at all, but I have failed for the moment: other wrapsets depending
-+	on this one will check to see that something has registered the
-+	"guile-cairo" wrapset with the C g-wrap runtime, which will fail
-+	unless we actually have a shlib that registers the wrapset. Suck.
-+
- 2007-05-24  Andy Wingo  <wingo@pobox.com>
- 
- 	* == Released guile-gnome-platform version 2.15.92 ==
-
-=== modified file 'gnome/gw/Makefile.am'
--- gnome/gw/Makefile.am	2007-05-20 17:43:35 +0000
-+++ gnome/gw/Makefile.am	2007-05-25 15:49:00 +0000
-@@ -1,5 +1,27 @@
- include $(top_srcdir)/common.mk
- 
-guilegwmodule_DATA = cairo-spec.scm
-+guilegwmodule_DATA = cairo-spec.scm cairo.scm
- 
- EXTRA_DIST = cairo-spec.scm
-+
-+CLEANFILES = $(wildcard gnome-*.log)
-+
-+# I wanted to avoid having a cairo shlib, because there is no need, but
-+# fighting g-wrap is too difficult for the moment.
-+
-+guilegnomelib_LTLIBRARIES = libgw-guile-gnome-cairo.la
-+
-+########################################################################
-+## cairo
-+nodist_libgw_guile_gnome_cairo_la_SOURCES = guile-gnome-gw-cairo.c
-+
-+libgw_guile_gnome_cairo_la_CFLAGS = $(GUILE_GLIB_CFLAGS) $(GLIB_CFLAGS) \
-+	$(AM_CFLAGS) $(GUILE_CAIRO_CFLAGS) $(GUILE_CFLAGS) \
-+	$(G_WRAP_CFLAGS)
-+libgw_guile_gnome_cairo_la_LIBADD = $(GUILE_CAIRO_LIBS) $(GUILE_LIBS) \
-+	$(G_WRAP_LIBS) $(GUILE_GLIB_LIBS)
-+libgw_guile_gnome_cairo_la_LDFLAGS = -module
-+
-+CLEANFILES += $(wildcard guile-gnome-gw-cairo.*) cairo.scm
-+
-+BUILT_SOURCES = guile-gnome-gw-cairo.c
-
-=== modified file 'gnome/gw/cairo-spec.scm'
--- gnome/gw/cairo-spec.scm	2007-05-20 22:39:45 +0000
-+++ gnome/gw/cairo-spec.scm	2007-05-25 15:49:00 +0000
-@@ -27,7 +27,7 @@
- (define-module (gnome gw cairo-spec)
-   #:use-module (oop goops)
-   #:use-module (gnome gw support g-wrap)
-  #:use-module (gnome gw support defs)
-+  #:use-module (gnome gw gobject-spec)
-   #:use-module (gnome gw support gobject))
- 
- ;; G-Wrap inelegance
-@@ -116,8 +116,6 @@
- (define-class <client-actions> (<gw-item>))
- (define-method (global-declarations-cg (ws <gw-guile-wrapset>) (a <client-actions>))
-   '("#include <guile-cairo.h>\n"))
-(define-method (initializations-cg (wrapset <gw-guile-wrapset>) (a <client-actions>) err)
-  (list "scm_init_cairo ();\n"))
- 
- (define-class <cairo-wrapset> (<gobject-wrapset-base>)
-   #:id 'gnome-cairo
-@@ -144,6 +142,14 @@
-                   #:take "scm_take_cairo_font_options"))
-   (add-type-alias! ws "cairo_font_options_t*" 'cairo-font-options-t))
- 
-+(define-method (global-declarations-cg (ws <cairo-wrapset>))
-+  (list (next-method)
-+        "#include <guile-cairo.h>\n"))
-+
-+(define-method (initializations-cg (wrapset <cairo-wrapset>) err)
-+  (list (next-method)
-+        "scm_init_cairo ();\n"))
-+
- ;; pango-cairo
- ;; cairo_t, cairo_font_options_t
- 
-
--- a/dev-scheme/guile-www/files/guile-www-2.30-alive.test.patch
+++ b/dev-scheme/guile-www/files/guile-www-2.30-alive.test.patch
@ -1,74 +0,0 @@
-From f41bf9380f7b08f5e8c07c9c58d66cd5da7bc356 Mon Sep 17 00:00:00 2001
-From: Thien-Thi Nguyen <ttn@gnuvola.org>
-Date: Thu, 28 Apr 2011 05:13:52 +0000
-Subject: [v] Make alive.test avoid (mis-)loading the .scm files, if possible.
-
-Reported by Bernardo Ezequiel Contreras:
-<https://savannah.nongnu.org/bugs/?33175>
-
-* source/alive.test: If guile has ‘%load-extensions’, create a
-preload file that removes ".scm" from it; use that file for
-all invocations; and delete it when done.  If in debug mode,
-display ponderings, as well as ‘guile --version’ output.
---
-diff --git a/source/ChangeLog b/source/ChangeLog
-index 2b5bd1b..2de79f4 100644
--- a/source/ChangeLog
-+++ b/source/ChangeLog
-@@ -1,3 +1,15 @@
-+2011-04-28  Thien-Thi Nguyen  <ttn@gnuvola.org>
-+
-+	[v] Make alive.test avoid (mis-)loading the .scm files, if possible.
-+
-+	Reported by Bernardo Ezequiel Contreras:
-+	<https://savannah.nongnu.org/bugs/?33175>
-+
-+	* alive.test: If guile has ‘%load-extensions’, create a
-+	preload file that removes ".scm" from it; use that file for
-+	all invocations; and delete it when done.  If in debug mode,
-+	display ponderings, as well as ‘guile --version’ output.
-+
- 2011-01-24  Thien-Thi Nguyen  <ttn@gnuvola.org>
- 
- 	Release: 2.29
-diff --git a/source/alive.test b/source/alive.test
-index 3521fcc..76e91c8 100755
--- a/source/alive.test
-+++ b/source/alive.test
-@@ -35,6 +35,25 @@ decho ()
-     if $debug ; then echo "$1" ; fi
- }
- 
-+decho 'guile:'
-+if $debug ; then ${GUILE-guile} --version ; fi
-+
-+if $guile -c '%load-extensions' >/dev/null 2>&1 ; then
-+    preload=alive.preload
-+    echo '(set! %load-extensions (delete ".scm" %load-extensions))' > $preload
-+    if $debug ; then
-+        decho 'preload:'
-+        cat $preload
-+        decho 'before:'
-+        $guile -c '(begin (write %load-extensions) (newline))'
-+    fi
-+    guile="$guile -l $preload"
-+    if $debug ; then
-+        decho 'after:'
-+        $guile -c '(begin (write %load-extensions) (newline))'
-+    fi
-+fi
-+
- decho 'indivdually:'
- { while read m ;
-     do
-@@ -48,4 +67,8 @@ all="`cat $all`"
- decho "$guile -c '(use-modules $all)'"
- $guile -c "(use-modules $all)"
- 
-+if [ "$preload" ] ; then rm $preload ; fi
-+
-+exit 0
-+
- # alive.test ends here
--
-cgit v0.9.0.2
--- a/dev-scheme/guile-www/files/guile-www-2.30-alive.test2.patch
+++ b/dev-scheme/guile-www/files/guile-www-2.30-alive.test2.patch
@ -1,51 +0,0 @@
-From cfabb94ca727d63f5712860c3fe4132926e498c9 Mon Sep 17 00:00:00 2001
-From: Thien-Thi Nguyen <ttn@gnuvola.org>
-Date: Mon, 02 May 2011 08:32:02 +0000
-Subject: [v] Refine preload: Prioritize "" instead of deleting ".scm".
-
-The 2011-04-28 change goes too far; it impedes
-loading system modules used by Guile-WWW modules.
-Reported by (Savannah user) vonbecmann:
-<https://savannah.nongnu.org/bugs/?33175>.
-
-* source/alive.test: Don't delete ".scm" from ‘%load-extensions’;
-instead, ensure only that "" is at the beginning of the list.
---
-diff --git a/source/ChangeLog b/source/ChangeLog
-index 2de79f4..ece831e 100644
--- a/source/ChangeLog
-+++ b/source/ChangeLog
-@@ -1,3 +1,15 @@
-+2011-05-02  Thien-Thi Nguyen  <ttn@gnuvola.org>
-+
-+	[v] Refine preload: Prioritize "" instead of deleting ".scm".
-+
-+	The 2011-04-28 change goes too far; it impedes
-+	loading system modules used by Guile-WWW modules.
-+	Reported by (Savannah user) vonbecmann:
-+	<https://savannah.nongnu.org/bugs/?33175>.
-+
-+	* alive.test: Don't delete ".scm" from ‘%load-extensions’;
-+	instead, ensure only that "" is at the beginning of the list.
-+
- 2011-04-28  Thien-Thi Nguyen  <ttn@gnuvola.org>
- 
- 	[v] Make alive.test avoid (mis-)loading the .scm files, if possible.
-diff --git a/source/alive.test b/source/alive.test
-index 76e91c8..6e430f4 100755
--- a/source/alive.test
-+++ b/source/alive.test
-@@ -39,8 +39,10 @@ decho 'guile:'
- if $debug ; then ${GUILE-guile} --version ; fi
- 
- if $guile -c '%load-extensions' >/dev/null 2>&1 ; then
-+    # Make sure "" is at head of list.
-     preload=alive.preload
-    echo '(set! %load-extensions (delete ".scm" %load-extensions))' > $preload
-+    echo '(set! %load-extensions (delete "" %load-extensions))' > $preload
-+    echo '(set! %load-extensions (cons "" %load-extensions))' >> $preload
-     if $debug ; then
-         decho 'preload:'
-         cat $preload
--
-cgit v0.9.0.2
--- a/dev-scheme/kawa/files/kawa-1.9.90.patch
+++ b/dev-scheme/kawa/files/kawa-1.9.90.patch
@ -1,12 +0,0 @@
-diff -Naur kawa-1.9.90.orig/bin/Makefile.in kawa-1.9.90/bin/Makefile.in
--- kawa-1.9.90.orig/bin/Makefile.in	2009-08-08 12:20:49.000000000 -0300
-+++ kawa-1.9.90/bin/Makefile.in	2009-09-21 20:15:06.000000000 -0300
-@@ -686,7 +686,7 @@
- install-binPROGRAMS: $(bin_PROGRAMS)
- 	@$(NORMAL_INSTALL)
- 	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
-@ENABLE_KAWA_FRONTEND_TRUE@	$(INSTALL_PROGRAM_ENV) $(LIBTOOL_INSTALL) $(binPROGRAMS_INSTALL) kawa$(EXEEXT) $(DESTDIR)$(bindir)/kawa$(EXEEXT)
-+@ENABLE_KAWA_FRONTEND_TRUE@	$(INSTALL_PROGRAM_ENV) $(LIBTOOL_INSTALL) $(binPROGRAMS_INSTALL) ./kawa$(EXEEXT) $(DESTDIR)$(bindir)/kawa$(EXEEXT)
- @WITH_GCJ_DBTOOL_FALSE@@WITH_GCJ_TRUE@	$(INSTALL_PROGRAM_ENV) $(LIBTOOL_INSTALL) $(binPROGRAMS_INSTALL) kawa-bin$(EXEEXT) $(DESTDIR)$(bindir)/kawa-bin$(EXEEXT)
- @ENABLE_SERVLET_TRUE@	$(INSTALL_PROGRAM_ENV) $(LIBTOOL_INSTALL) $(binPROGRAMS_INSTALL) cgi-servlet$(EXEEXT) $(DESTDIR)$(bindir)/cgi-servlet$(EXEEXT)
- 
--- a/dev-util/duma/duma-2.5.15-r2.ebuild
+++ b/dev-util/duma/duma-2.5.15-r2.ebuild
@ -1,9 +1,9 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

-EAPI=2
-inherit eutils flag-o-matic multilib toolchain-funcs versionator
+EAPI=6
+inherit toolchain-funcs versionator

 MY_P=${PN}_$(replace_all_version_separators '_')

@ -17,19 +17,16 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="examples"

-RDEPEND="app-shells/bash"
-DEPEND="${RDEPEND}"
-
 S=${WORKDIR}/${MY_P}

-src_prepare() {
-	epatch "${DISTDIR}"/${P}-GNUmakefile.patch.bz2
-}
+PATCHES=(
+	"${WORKDIR}"/${P}-GNUmakefile.patch
+	"${FILESDIR}"/${P}-gcc6.patch
+)

-src_compile() {
-	# strip-flags
-	replace-flags O? O0
-	append-flags -Wall -Wextra -U_FORTIFY_SOURCE
+src_configure() {
+	# other flags will break duma
+	export CFLAGS="-O0 -Wall -Wextra -U_FORTIFY_SOURCE"
 	tc-export AR CC CXX LD RANLIB

 	case "${CHOST}" in
@ -56,14 +53,17 @@ src_compile() {
 		elog "Exported DUMA_ALIGNMENT=${DUMA_ALIGNMENT} for x86_64,"
 	fi

-	make reconfig || die "make config failed"
-	# The above must be run first if distcc is enabled, otherwise
+}
+
+src_compile() {
+	# The below must be run first if distcc is enabled, otherwise
 	# the real build breaks on parallel makes.
-	emake || die "emake failed"
+	emake reconfig
+	emake
 }

 src_test() {
-	emake test || die "emake test failed"
+	emake test

 	elog "Please, see the output above to verify all tests have passed."
 	elog "Both static and dynamic confidence tests should say PASSED."
@ -71,16 +71,16 @@ src_test() {

 src_install(){
 	emake prefix="${D}/usr" libdir="${D}/usr/$(get_libdir)" \
-		docdir="${D}/usr/share/doc/${PF}" install || die "emake install failed"
+		docdir="${D}/usr/share/doc/${PF}" install

-	dosed "s|LD_PRELOAD=./libduma|LD_PRELOAD=libduma|" /usr/bin/duma \
-		|| die "dosed failed"
+	sed -i "s|LD_PRELOAD=./libduma|LD_PRELOAD=libduma|" "${D}"/usr/bin/duma \
+		|| die "sed failed"

 	dodoc CHANGELOG TODO GNUmakefile

 	if use examples; then
 		insinto /usr/share/doc/${PF}/examples
-		doins example[1-6].cpp example_makes/ex6/Makefile || die "doins failed"
+		doins example[1-6].cpp example_makes/ex6/Makefile
 	fi
 }

--- a/dev-util/duma/files/duma-2.5.15-gcc6.patch
+++ b/dev-util/duma/files/duma-2.5.15-gcc6.patch
@ -0,0 +1,22 @@
+--- duma_2_5_15/dumapp.cpp.old	2016-09-21 19:28:01.286332961 -0400
+++ duma_2_5_15/dumapp.cpp	2016-09-21 19:28:06.722907238 -0400
+@@ -190,7 +190,9 @@
+  * (11) = (a) ; ASW
+  */
+ void * DUMA_CDECL operator new( DUMA_SIZE_T size )
+#if __cplusplus < 201103L
+ throw(std::bad_alloc)
+#endif
+ {
+   return duma_new_operator(size, EFA_NEW_ELEM, true  DUMA_PARAMS_UK);
+ }
+@@ -254,7 +256,9 @@
+  * (21) = (a) ; AAW
+  */
+ void * DUMA_CDECL operator new[]( DUMA_SIZE_T size )
+#if __cplusplus < 201103L
+ throw(std::bad_alloc)
+#endif
+ {
+   return duma_new_operator(size, EFA_NEW_ARRAY, true  DUMA_PARAMS_UK);
+ }
--- a/dev-util/oprofile/files/oprofile-1.1.0-gcc6.patch
+++ b/dev-util/oprofile/files/oprofile-1.1.0-gcc6.patch
@ -0,0 +1,30 @@
+--- a/libop/op_alloc_counter.c
+++ b/libop/op_alloc_counter.c
+@@ -171,7 +171,7 @@
+ 	/* no counters then probably perfmon managing perfmon hw */
+ 	if (nr_counters <= 0) {
+ 		nr_counters = op_get_nr_counters(cpu_type);
+-		unavailable_counters = (~0) << nr_counters;
+		unavailable_counters = (~0U) << nr_counters;
+ 	}
+ 
+ 	/* Check to see if we have enough physical counters to map events*/
+--- a/libutil++/op_bfd.cpp
+++ b/libutil++/op_bfd.cpp
+@@ -535,15 +535,13 @@
+ {
+ 	op_bfd_symbol const & sym = syms[sym_idx];
+ 
+-	bool const verbose = cverb << (vbfd & vlevel1);
+-
+ 	if (anon_obj)
+ 		start = sym.vma();
+ 	else
+ 		start = sym.filepos();
+ 	end = start + sym.size();
+ 
+-	if (!verbose)
+	if (!(cverb << (vbfd & vlevel1)))
+ 		return;
+ 
+ 	io_state state(cverb << (vbfd & vlevel1));
--- a/dev-util/oprofile/oprofile-0.9.9-r1.ebuild
+++ b/dev-util/oprofile/oprofile-0.9.9-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$

@ -50,6 +50,7 @@ src_prepare() {
 	epatch "${FILESDIR}/${P}-gcc-4.9-non-ppc.patch"
 	epatch "${FILESDIR}/${P}-gcc-4.9-unused.patch"
 	epatch "${FILESDIR}/${PN}-1.0.0-athlon.patch"
+	epatch "${FILESDIR}/${PN}-1.1.0-gcc6.patch"
 	eautoreconf
 }

--- a/dev-util/oprofile/oprofile-0.9.9-r2.ebuild
+++ b/dev-util/oprofile/oprofile-0.9.9-r2.ebuild
@ -51,6 +51,7 @@ src_prepare() {
 	epatch "${FILESDIR}/${P}-gcc-4.9-non-ppc.patch"
 	epatch "${FILESDIR}/${P}-gcc-4.9-unused.patch"
 	epatch "${FILESDIR}/${PN}-1.0.0-athlon.patch"
+	epatch "${FILESDIR}/${PN}-1.1.0-gcc6.patch"
 	eautoreconf
 }

--- a/dev-util/oprofile/oprofile-1.1.0-r1.ebuild
+++ b/dev-util/oprofile/oprofile-1.1.0-r1.ebuild
@ -3,7 +3,7 @@
 # $Id$

 EAPI="5"
-inherit java-pkg-opt-2 linux-info multilib user
+inherit eutils java-pkg-opt-2 linux-info multilib user

 MY_P=${PN}-${PV/_/-}
 DESCRIPTION="A transparent low-overhead system-wide profiler"
@ -43,6 +43,11 @@ pkg_setup() {
 	use java && java-pkg_init
 }

+src_prepare() {
+	# fix bug #594178
+	epatch "${FILESDIR}/${PN}-1.1.0-gcc6.patch"
+}
+
 src_configure() {
 	econf \
 		--disable-werror \
--- a/kde-apps/libkipi/libkipi-16.04.3.ebuild
+++ b/kde-apps/libkipi/libkipi-16.04.3.ebuild
@ -9,7 +9,7 @@ inherit kde5

 DESCRIPTION="A library for image plugins accross KDE applications"
 SLOT="5/31"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""

 DEPEND="
--- a/kde-apps/libkipi/libkipi-16.08.1.ebuild
+++ b/kde-apps/libkipi/libkipi-16.08.1.ebuild
@ -10,7 +10,7 @@ inherit kde5
 DESCRIPTION="A library for image plugins accross KDE applications"
 LICENSE="GPL-2+"
 SLOT="5/31"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE=""

 DEPEND="
--- a/kde-plasma/kde-cli-tools/files/kde-cli-tools-5.6.5-CVE-2016-7787.patch
+++ b/kde-plasma/kde-cli-tools/files/kde-cli-tools-5.6.5-CVE-2016-7787.patch
@ -0,0 +1,44 @@
+From 5eda179a099ba68a20dc21dc0da63e85a565a171 Mon Sep 17 00:00:00 2001
+From: Martin Sandsmark <martin.sandsmark@kde.org>
+Date: Fri, 9 Sep 2016 09:05:57 +0200
+Subject: [PATCH] Make sure people are not trying to sneak invisible characters
+ on the kdesu label
+
+i18n: Sorry for the new string
+
+CCMAIL: kde-i18n-doc@kde.org
+---
+ kdesu/kdesu.cpp | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/kdesu/kdesu.cpp b/kdesu/kdesu.cpp
+index b7a66a2..b0efbc7 100644
+--- a/kdesu/kdesu.cpp
+++ b/kdesu/kdesu.cpp
+@@ -162,6 +162,10 @@ int main(int argc, char *argv[])
+     {
+         KMessageBox::sorry(0, i18n("Cannot execute command '%1'.", QString::fromLocal8Bit(command)));
+     }
+    if (result == -2)
+    {
+        KMessageBox::sorry(0, i18n("Cannot execute command '%1'. It contains invalid characters.", QString::fromLocal8Bit(command)));
+    }
+ 
+     return result;
+ }
+@@ -387,6 +391,12 @@ static int startApp(QCommandLineParser& p)
+         qDebug() << "Don't need password!!\n";
+     }
+ 
+    for (const QChar character : QString::fromLocal8Bit(command)) {
+        if (!character.isPrint() && character.category() != QChar::Other_Surrogate) {
+            return -2;
+        }
+    }
+
+     // Start the dialog
+     QString password;
+     if (needpw)
+-- 
+2.7.3
+
--- a/kde-plasma/kde-cli-tools/kde-cli-tools-5.6.5-r1.ebuild
+++ b/kde-plasma/kde-cli-tools/kde-cli-tools-5.6.5-r1.ebuild
@ -0,0 +1,62 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_HANDBOOK="true"
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Tools based on KDE Frameworks 5 to better interact with the system"
+HOMEPAGE="https://projects.kde.org/projects/kde/workspace/kde-cli-tools"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+kdesu X"
+
+DEPEND="
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	kdesu? ( $(add_frameworks_dep kdesu) )
+	X? (
+		$(add_frameworks_dep kdelibs4support)
+		$(add_qt_dep qtx11extras)
+		x11-libs/libX11
+	)
+"
+RDEPEND="${DEPEND}
+	handbook? ( !kde-apps/kdesu[handbook] )
+"
+
+# requires running kde environment
+RESTRICT="test"
+
+PATCHES=( "${FILESDIR}/${P}-CVE-2016-7787.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package kdesu KF5Su)
+		$(cmake-utils_use_find_package X KF5KDELibs4Support)
+		$(cmake-utils_use_find_package X Qt5X11Extras)
+	)
+
+	kde5_src_configure
+}
+
+src_install() {
+	kde5_src_install
+	use kdesu && dosym /usr/$(get_libdir)/libexec/kf5/kdesu /usr/bin/kdesu5
+}
--- a/media-gfx/blender/blender-2.72b-r4.ebuild
+++ b/media-gfx/blender/blender-2.72b-r4.ebuild
@ -68,7 +68,6 @@ RDEPEND="
 	media-libs/glew
 	media-libs/libpng:0
 	media-libs/libsamplerate
-	sci-libs/ldl
 	sys-libs/zlib
 	virtual/glu
 	virtual/jpeg:0
@ -112,6 +111,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.70-sse2.patch
 	"${FILESDIR}"/${PN}-2.72-T42797.diff
 	"${FILESDIR}"/${P}-fix-util_simd.patch
+	"${FILESDIR}"/${P}-gcc6-fixes.patch
 )

 pkg_pretend() {
--- a/media-gfx/blender/files/blender-2.72b-gcc6-fixes.patch
+++ b/media-gfx/blender/files/blender-2.72b-gcc6-fixes.patch
@ -0,0 +1,126 @@
+diff -purN a/source/blender/imbuf/intern/dds/ColorBlock.cpp b/source/blender/imbuf/intern/dds/ColorBlock.cpp
+--- a/source/blender/imbuf/intern/dds/ColorBlock.cpp	2014-10-20 08:58:23.000000000 +0100
+++ b/source/blender/imbuf/intern/dds/ColorBlock.cpp	2016-09-22 15:50:25.359318967 +0100
+@@ -86,8 +86,8 @@ void ColorBlock::init(const Image *img,
+ 
+ void ColorBlock::init(uint w, uint h, const uint *data, uint x, uint y)
+ {
+-	const uint bw = min(w - x, 4U);
+-	const uint bh = min(h - y, 4U);
+	const uint bw = MIN(w - x, 4U);
+	const uint bh = MIN(h - y, 4U);
+ 
+ 	// Blocks that are smaller than 4x4 are handled by repeating the pixels.
+ 	// @@ Thats only correct when block size is 1, 2 or 4, but not with 3. :(
+@@ -107,8 +107,8 @@ void ColorBlock::init(uint w, uint h, co
+ 
+ void ColorBlock::init(uint w, uint h, const float *data, uint x, uint y)
+ {
+-	const uint bw = min(w - x, 4U);
+-	const uint bh = min(h - y, 4U);
+	const uint bw = MIN(w - x, 4U);
+	const uint bh = MIN(h - y, 4U);
+ 
+ 	// Blocks that are smaller than 4x4 are handled by repeating the pixels.
+ 	// @@ Thats only correct when block size is 1, 2 or 4, but not with 3. :(
+@@ -124,10 +124,10 @@ void ColorBlock::init(uint w, uint h, co
+ 			const uint idx = ((y + by) * w + x + bx);
+ 			
+ 			Color32 & c = color(e, i);
+-			c.r = uint8(255 * clamp(data[idx + 0 * srcPlane], 0.0f, 1.0f)); // @@ Is this the right way to quantize floats to bytes?
+-			c.g = uint8(255 * clamp(data[idx + 1 * srcPlane], 0.0f, 1.0f));
+-			c.b = uint8(255 * clamp(data[idx + 2 * srcPlane], 0.0f, 1.0f));
+-			c.a = uint8(255 * clamp(data[idx + 3 * srcPlane], 0.0f, 1.0f));
+			c.r = uint8(255 * CLAMP(data[idx + 0 * srcPlane], 0.0f, 1.0f)); // @@ Is this the right way to quantize floats to bytes?
+			c.g = uint8(255 * CLAMP(data[idx + 1 * srcPlane], 0.0f, 1.0f));
+			c.b = uint8(255 * CLAMP(data[idx + 2 * srcPlane], 0.0f, 1.0f));
+			c.a = uint8(255 * CLAMP(data[idx + 3 * srcPlane], 0.0f, 1.0f));
+ 		}
+ 	}
+ }
+diff -purN a/source/blender/imbuf/intern/dds/Common.h b/source/blender/imbuf/intern/dds/Common.h
+--- a/source/blender/imbuf/intern/dds/Common.h	2014-10-20 08:58:23.000000000 +0100
+++ b/source/blender/imbuf/intern/dds/Common.h	2016-09-22 15:47:31.327081239 +0100
+@@ -28,14 +28,14 @@
+ #ifndef __COMMON_H__
+ #define __COMMON_H__
+ 
+-#ifndef min
+-#define min(a,b) ((a) <= (b) ? (a) : (b))
+#ifndef MIN
+#define MIN(a,b) ((a) <= (b) ? (a) : (b))
+ #endif
+-#ifndef max
+-#define max(a,b) ((a) >= (b) ? (a) : (b))
+#ifndef MAX
+#define MAX(a,b) ((a) >= (b) ? (a) : (b))
+ #endif
+-#ifndef clamp
+-#define clamp(x,a,b) min(max((x), (a)), (b))
+#ifndef CLAMP
+#define CLAMP(x,a,b) MIN(MAX((x), (a)), (b))
+ #endif
+ 
+ template<typename T>
+diff -purN a/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp b/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
+--- a/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp	2014-10-20 08:58:23.000000000 +0100
+++ b/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp	2016-09-22 16:10:53.985775837 +0100
+@@ -1102,8 +1102,8 @@ void DirectDrawSurface::mipmap(Image *im
+ 	// Compute width and height.
+ 	for (uint m = 0; m < mipmap; m++)
+ 	{
+-		w = max(1U, w / 2);
+-		h = max(1U, h / 2);
+		w = MAX(1U, w / 2);
+		h = MAX(1U, h / 2);
+ 	}
+ 	
+ 	img->allocate(w, h);
+@@ -1223,9 +1223,9 @@ void DirectDrawSurface::readBlockImage(I
+ 			readBlock(&block);
+ 			
+ 			// Write color block.
+-			for (uint y = 0; y < min(4U, h-4*by); y++)
+			for (uint y = 0; y < MIN(4U, h-4*by); y++)
+ 			{
+-				for (uint x = 0; x < min(4U, w-4*bx); x++)
+				for (uint x = 0; x < MIN(4U, w-4*bx); x++)
+ 				{
+ 					img->pixel(4*bx+x, 4*by+y) = block.color(x, y);
+ 				}
+@@ -1240,7 +1240,7 @@ static Color32 buildNormal(uint8 x, uint
+ 	float ny = 2 * (y / 255.0f) - 1;
+ 	float nz = 0.0f;
+ 	if (1 - nx*nx - ny*ny > 0) nz = sqrt(1 - nx*nx - ny*ny);
+-	uint8 z = clamp(int(255.0f * (nz + 1) / 2.0f), 0, 255);
+	uint8 z = CLAMP(int(255.0f * (nz + 1) / 2.0f), 0, 255);
+ 	
+ 	return Color32(x, y, z);
+ }
+@@ -1379,9 +1379,9 @@ uint DirectDrawSurface::mipmapSize(uint
+ 	
+ 	for (uint m = 0; m < mipmap; m++)
+ 	{
+-		w = max(1U, w / 2);
+-		h = max(1U, h / 2);
+-		d = max(1U, d / 2);
+		w = MAX(1U, w / 2);
+		h = MAX(1U, h / 2);
+		d = MAX(1U, d / 2);
+ 	}
+ 
+ 	if (header.pf.flags & DDPF_FOURCC)
+diff -purN a/source/blender/imbuf/intern/dds/FlipDXT.cpp b/source/blender/imbuf/intern/dds/FlipDXT.cpp
+--- a/source/blender/imbuf/intern/dds/FlipDXT.cpp	2014-10-20 08:58:23.000000000 +0100
+++ b/source/blender/imbuf/intern/dds/FlipDXT.cpp	2016-09-22 16:11:35.626829002 +0100
+@@ -246,8 +246,8 @@ int FlipDXTCImage(unsigned int width, un
+ 
+ 		// mip levels are contiguous.
+ 		data += block_bytes * blocks;
+-		mip_width = max(1U, mip_width >> 1);
+-		mip_height = max(1U, mip_height >> 1);
+		mip_width = MAX(1U, mip_width >> 1);
+		mip_height = MAX(1U, mip_height >> 1);
+ 	}
+ 
+ 	return 1;
--- a/media-libs/exempi/Manifest
+++ b/media-libs/exempi/Manifest
@ -1,2 +1 @@
-DIST exempi-2.2.0.tar.gz 3555957 SHA256 710a01a4e879c3a58304021d8a9624cf8b65f79b2b949951a873c91f6d64d102 SHA512 bb477787204bdc2cc8e9949c8407beb5af2aeab8f3e769ce814ee7eaf7476336b68635d6301cfbd600da34b1003c371e624866ec6c3b426d06076ec90c663f82 WHIRLPOOL 4c4b9a69f24c0ea792062e27a25688cc70a58baa6853a7b2a078732e33281c5ee9d9e21488d90a86a1fe28b6f227cfeb64a7e1524a815fa7a30a955fde2e4983
 DIST exempi-2.2.1.tar.gz 3566843 SHA256 a99e1569047988200e4935cf4395667341a5bd8d6067847a08df4304546cc362 SHA512 f4b97ec7af89924755a0695464bad5081de6a5d6a6f28c06984c051d677f8771c39df12951761ecd28d6ff520ddec4e21179dcba8b58f0ef649bbdad1a53aa9c WHIRLPOOL 622d23cb519f2dda988b7d13dd26be55dd207bfe8ec2f2c0b8b568974571780b51b5284d871a310e461041f1054265efb199cf5c21fcf6eee6619cb85dc335e9
--- a/media-libs/exempi/exempi-2.2.0.ebuild
+++ b/media-libs/exempi/exempi-2.2.0.ebuild
@ -1,50 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-inherit autotools eutils
-
-DESCRIPTION="Exempi is a port of the Adobe XMP SDK to work on UNIX"
-HOMEPAGE="https://libopenraw.freedesktop.org/wiki/Exempi"
-SRC_URI="https://libopenraw.freedesktop.org/download/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd"
-IUSE="examples static-libs"
-
-RDEPEND=">=dev-libs/expat-2
-	virtual/libiconv
-	sys-libs/zlib"
-DEPEND="${RDEPEND}
-	sys-devel/gettext"
-
-RESTRICT="test" #295875
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.1.1-iconv.patch
-	cp /usr/share/gettext/config.rpath . || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		--disable-unittest
-}
-
-src_install() {
-	default
-
-	rm -f "${ED}"usr/lib*/lib*.la
-
-	if use examples; then
-		emake -C samples/source distclean
-		rm -f samples/{,source,testfiles}/Makefile*
-		insinto /usr/share/doc/${PF}/examples
-		doins -r samples/*
-	fi
-}
--- a/media-libs/mesa/mesa-11.2.2.ebuild
+++ b/media-libs/mesa/mesa-11.2.2.ebuild
@ -130,7 +130,10 @@ RDEPEND="${RDEPEND}

 DEPEND="${RDEPEND}
 	llvm? (
-		video_cards_radeonsi? ( sys-devel/llvm[video_cards_radeon] )
+		video_cards_radeonsi? ( || (
+			sys-devel/llvm[llvm_targets_AMDGPU]
+			sys-devel/llvm[video_cards_radeon]
+		) )
 	)
 	opencl? (
 				>=sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}]
--- a/media-libs/mesa/mesa-12.0.1.ebuild
+++ b/media-libs/mesa/mesa-12.0.1.ebuild
@ -133,7 +133,10 @@ RDEPEND="${RDEPEND}

 DEPEND="${RDEPEND}
 	llvm? (
-		video_cards_radeonsi? ( sys-devel/llvm[video_cards_radeon] )
+		video_cards_radeonsi? ( || (
+			sys-devel/llvm[llvm_targets_AMDGPU]
+			sys-devel/llvm[video_cards_radeon]
+		) )
 	)
 	opencl? (
 				>=sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}]
--- a/media-libs/mesa/mesa-12.0.2.ebuild
+++ b/media-libs/mesa/mesa-12.0.2.ebuild
@ -133,7 +133,10 @@ RDEPEND="${RDEPEND}

 DEPEND="${RDEPEND}
 	llvm? (
-		video_cards_radeonsi? ( sys-devel/llvm[video_cards_radeon] )
+		video_cards_radeonsi? ( || (
+			sys-devel/llvm[llvm_targets_AMDGPU]
+			sys-devel/llvm[video_cards_radeon]
+		) )
 	)
 	opencl? (
 				>=sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}]
--- a/media-libs/mesa/mesa-12.0.3.ebuild
+++ b/media-libs/mesa/mesa-12.0.3.ebuild
@ -131,9 +131,14 @@ RDEPEND="${RDEPEND}
 	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
 "

+# FIXME: kill the sys-devel/llvm[video_cards_radeon] compat once
+# LLVM < 3.9 is out of the game
 DEPEND="${RDEPEND}
 	llvm? (
-		video_cards_radeonsi? ( sys-devel/llvm[video_cards_radeon] )
+		video_cards_radeonsi? ( || (
+			sys-devel/llvm[llvm_targets_AMDGPU]
+			sys-devel/llvm[video_cards_radeon]
+		) )
 	)
 	opencl? (
 				>=sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}]
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@ -131,9 +131,14 @@ RDEPEND="${RDEPEND}
 	video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
 "

+# FIXME: kill the sys-devel/llvm[video_cards_radeon] compat once
+# LLVM < 3.9 is out of the game
 DEPEND="${RDEPEND}
 	llvm? (
-		video_cards_radeonsi? ( sys-devel/llvm[video_cards_radeon] )
+		video_cards_radeonsi? ( || (
+			sys-devel/llvm[llvm_targets_AMDGPU]
+			sys-devel/llvm[video_cards_radeon]
+		) )
 	)
 	opencl? (
 				>=sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}]
--- a/media-radio/flrig/files/flrig-1.3.26-gcc6.patch
+++ b/media-radio/flrig/files/flrig-1.3.26-gcc6.patch
@ -0,0 +1,130 @@
+--- src/support/xml_io.cxx.orig	2016-09-29 17:43:03.299747587 +0000
+++ src/support/xml_io.cxx	2016-09-29 17:43:41.639222816 +0000
+@@ -85,7 +85,7 @@
+ 
+ bool ptt_on = false;
+ 
+-int ignore = 0; // skip next "ignore" read loops
+int xml_ignore = 0; // skip next "xml_ignore" read loops
+ 
+ int try_count = CHECK_UPDATE_COUNT;
+ 
+@@ -155,7 +155,7 @@
+ 
+ 	try {
+ 		execute(rig_set_modes, modes, res);
+-		ignore = 2;
+		xml_ignore = 2;
+ 		err_count = 5;
+ 	} catch (const XmlRpc::XmlRpcException& e) {
+ 		err_count--;
+@@ -176,7 +176,7 @@
+ 
+ 	try {
+ 		execute(rig_set_bandwidths, bandwidths, res);
+-		ignore = 2;
+		xml_ignore = 2;
+ 		err_count = 5;
+ 	} catch (const XmlRpc::XmlRpcException& e) {
+ 		err_count--;
+@@ -190,7 +190,7 @@
+ 	try {
+ 		XmlRpcValue res;
+ 		execute(rig_set_name, XmlRpcValue(selrig->name_), res);
+-		ignore = 2;
+		xml_ignore = 2;
+ 		err_count = 5;
+ 	} catch (const XmlRpc::XmlRpcException& e) {
+ 		err_count--;
+@@ -204,7 +204,7 @@
+ 	try {
+ 		XmlRpcValue res;
+ 		execute((PTT ? main_set_tx : main_set_rx), XmlRpcValue(), res);
+-		ignore = 2;
+		xml_ignore = 2;
+ 		err_count = 5;
+ 	} catch (const XmlRpc::XmlRpcException& e) {
+ 		err_count--;
+@@ -219,7 +219,7 @@
+ 		xmlvfo.freq = freq;
+ 		XmlRpcValue f((double)freq), res;
+ 		execute(rig_set_frequency, f, res);
+-		ignore = 2;
+		xml_ignore = 2;
+ 		err_count = 5;
+ 	} catch (const XmlRpc::XmlRpcException& e) {
+ 		err_count--;
+@@ -233,7 +233,7 @@
+ 	try {
+ 		XmlRpcValue mval((int)val), res;
+ 		execute(rig_set_smeter, mval, res);
+-		ignore = 2;
+		xml_ignore = 2;
+ 		err_count = 5;
+ 	} catch (const XmlRpc::XmlRpcException& e) {
+ 		err_count--;
+@@ -247,7 +247,7 @@
+ 	try {
+ 		XmlRpcValue mval((int)val), res;
+ 		execute(rig_set_pwrmeter, mval, res);
+-		ignore = 2;
+		xml_ignore = 2;
+ 		err_count = 5;
+ 	} catch (const XmlRpc::XmlRpcException& e) {
+ 		err_count--;
+@@ -261,7 +261,7 @@
+ 	try {
+ 		XmlRpcValue i(freq), res;
+ 		execute(rig_set_notch, i, res);
+-		ignore = 2;
+		xml_ignore = 2;
+ 		err_count = 5;
+ 		if (freq == 0)
+ 			xml_notch_on = false;
+@@ -299,7 +299,7 @@
+ 		xmlvfo.imode = md;
+ 		XmlRpcValue mode(selrig->modes_[md]), res;
+ 		execute(rig_set_mode, mode, res);
+-		ignore = 2;
+		xml_ignore = 2;
+ 		err_count = 5;
+ 	} catch (const XmlRpc::XmlRpcException& e) {
+ 		err_count--;
+@@ -315,7 +315,7 @@
+ 		int selbw = (bw > 0x80) ? (bw >> 8 & 0x7F) : bw;
+ 		XmlRpcValue bandwidth(selrig->bandwidths_[selbw]), res;
+ 		execute(rig_set_bandwidth, bandwidth, res);
+-		ignore = 2;
+		xml_ignore = 2;
+ 		err_count = 5;
+ 	} catch (const XmlRpc::XmlRpcException& e) {
+ 		err_count--;
+@@ -329,7 +329,7 @@
+ 	try {
+ 		XmlRpcValue sideband(selrig->get_modetype(vfo.imode) == 'U' ? "USB" : "LSB"), res;
+ 		execute(main_set_wf_sideband, sideband, res);
+-		ignore = 2;
+		xml_ignore = 2;
+ 		err_count = 5;
+ 	} catch (const XmlRpc::XmlRpcException& e) {
+ 		err_count--;
+@@ -501,7 +501,7 @@
+ 		LOG_ERROR("Connected");
+ 		Fl::awake(set_fldigi_connect, (void *)1);
+ 		err_count = 5;
+-		ignore = 2;
+		xml_ignore = 2;
+ 	} catch (const XmlRpc::XmlRpcException& e) {
+ 		throw e;
+ 	}
+@@ -526,8 +526,8 @@
+ 
+ static void get_fldigi_status()
+ {
+-	if (ignore) {
+-		--ignore;
+	if (xml_ignore) {
+		--xml_ignore;
+ 		return;
+ 	}
+ 	XmlRpcValue status;
--- a/media-radio/flrig/flrig-1.3.26.ebuild
+++ b/media-radio/flrig/flrig-1.3.26.ebuild
@ -23,6 +23,7 @@ DEPEND="${RDEPEND}

 src_prepare() {
 	epatch "${FILESDIR}"/fix-bashism.patch
+	epatch "${FILESDIR}"/${P}-gcc6.patch
 	eautoreconf
 }

--- a/media-video/ffmpeg/ffmpeg-3.1.3.ebuild
+++ b/media-video/ffmpeg/ffmpeg-3.1.3.ebuild
@ -294,6 +294,7 @@ src_prepare() {
 	if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot
 		export revision=git-N-${FFMPEG_REVISION}
 	fi
+	epatch "${FILESDIR}/openjpeg2.patch" #595318
 	default
 }

--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@ -65,7 +65,7 @@ fi
 FFMPEG_FLAG_MAP=(
 		+bzip2:bzlib cpudetection:runtime-cpudetect debug gcrypt gnutls gmp
 		+gpl +hardcoded-tables +iconv lzma +network openssl +postproc
-		samba:libsmbclient sdl:ffplay sdl vaapi vdpau X:xlib xcb:libxcb
+		samba:libsmbclient sdl:ffplay sdl:sdl2 vaapi vdpau X:xlib xcb:libxcb
 		xcb:libxcb-shm xcb:libxcb-xfixes +zlib
 		# libavdevice options
 		cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal
@ -221,7 +221,7 @@ RDEPEND="
 	rubberband? ( >=media-libs/rubberband-1.8.1-r1[${MULTILIB_USEDEP}] )
 	samba? ( >=net-fs/samba-3.6.23-r1[${MULTILIB_USEDEP}] )
 	schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] )
-	sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,${MULTILIB_USEDEP}] )
+	sdl? ( media-libs/libsdl2[sound,video,${MULTILIB_USEDEP}] )
 	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
 	ssh? ( >=net-libs/libssh-0.5.5[${MULTILIB_USEDEP}] )
 	truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
--- a/media-video/ffmpeg/files/openjpeg2.patch
+++ b/media-video/ffmpeg/files/openjpeg2.patch
@ -0,0 +1,39 @@
+https://bugs.gentoo.org/show_bug.cgi?id=595318
+https://trac.ffmpeg.org/ticket/5694
+
+diff -rupN ffmpeg-3.1.1/configure ffmpeg-3.1.1-new/configure
+--- ffmpeg-3.1.1/configure	2016-06-27 01:54:28.000000000 +0200
+++ ffmpeg-3.1.1-new/configure	2016-07-27 22:25:36.585141648 +0200
+@@ -5669,7 +5669,7 @@ enabled libopencv         && { check_hea
+                                  require opencv opencv2/core/core_c.h cvCreateImageHeader -lopencv_core -lopencv_imgproc; } ||
+                                require_pkg_config opencv opencv/cxcore.h cvCreateImageHeader; }
+ enabled libopenh264       && require_pkg_config openh264 wels/codec_api.h WelsGetCodecVersion
+-enabled libopenjpeg       && { check_lib openjpeg-2.1/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC ||
+enabled libopenjpeg       && { check_lib openjpeg-2.1/openjpeg.h opj_version -lopenjp2 ||
+                                check_lib openjpeg-2.0/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC ||
+                                check_lib openjpeg-1.5/openjpeg.h opj_version -lopenjpeg -DOPJ_STATIC ||
+                                check_lib openjpeg.h opj_version -lopenjpeg -DOPJ_STATIC ||
+diff -rupN ffmpeg-3.1.1/libavcodec/libopenjpegdec.c ffmpeg-3.1.1-new/libavcodec/libopenjpegdec.c
+--- ffmpeg-3.1.1/libavcodec/libopenjpegdec.c	2016-06-27 01:54:29.000000000 +0200
+++ ffmpeg-3.1.1-new/libavcodec/libopenjpegdec.c	2016-07-27 22:25:45.509327071 +0200
+@@ -24,8 +24,6 @@
+  * JPEG 2000 decoder using libopenjpeg
+  */
+
+-#define  OPJ_STATIC
+-
+ #include "libavutil/common.h"
+ #include "libavutil/imgutils.h"
+ #include "libavutil/intreadwrite.h"
+diff -rupN ffmpeg-3.1.1/libavcodec/libopenjpegenc.c ffmpeg-3.1.1-new/libavcodec/libopenjpegenc.c
+--- ffmpeg-3.1.1/libavcodec/libopenjpegenc.c	2016-06-27 01:54:29.000000000 +0200
+++ ffmpeg-3.1.1-new/libavcodec/libopenjpegenc.c	2016-07-27 22:25:40.298218807 +0200
+@@ -24,8 +24,6 @@
+  * JPEG 2000 encoder using libopenjpeg
+  */
+
+-#define  OPJ_STATIC
+-
+ #include "libavutil/avassert.h"
+ #include "libavutil/common.h"
+ #include "libavutil/imgutils.h"
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@ -1 +1 @@
-Thu, 29 Sep 2016 14:10:38 +0000
+Thu, 29 Sep 2016 19:10:38 +0000
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@ -1 +1 @@
-Thu, 29 Sep 2016 14:10:38 +0000
+Thu, 29 Sep 2016 19:10:38 +0000
--- a/metadata/md5-cache/app-admin/augeas-0.10.0-r2
+++ b/metadata/md5-cache/app-admin/augeas-0.10.0-r2
@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/libxml2 sys-libs/readline virtual/pkgconfig >=app-doc/NaturalDocs-1.40 test? ( dev-lang/ruby )
-DESCRIPTION=A library for changing configuration files
-EAPI=5
-HOMEPAGE=http://augeas.net/
-IUSE=static-libs test
-KEYWORDS=alpha amd64 hppa ~ia64 ppc ~ppc64 sparc x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-libs/libxml2 sys-libs/readline
-SLOT=0
-SRC_URI=http://augeas.net/download/augeas-0.10.0.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	b83a2420b796f7c6eff682679d08fe25	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=5f23b93df8f409bf0f2bbd85fa7ecb3b
--- a/metadata/md5-cache/app-admin/augeas-1.1.0
+++ b/metadata/md5-cache/app-admin/augeas-1.1.0
@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/libxml2 sys-libs/readline virtual/pkgconfig >=app-doc/NaturalDocs-1.40 test? ( dev-lang/ruby )
-DESCRIPTION=A library for changing configuration files
-EAPI=5
-HOMEPAGE=http://augeas.net/
-IUSE=static-libs test
-KEYWORDS=alpha amd64 hppa ia64 ppc ~ppc64 sparc x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-libs/libxml2 sys-libs/readline
-SLOT=0
-SRC_URI=http://download.augeas.net/augeas-1.1.0.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	b83a2420b796f7c6eff682679d08fe25	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=ed086e909a0b37705e2f49046120a83c
--- a/metadata/md5-cache/app-admin/rsyslog-8.19.0
+++ b/metadata/md5-cache/app-admin/rsyslog-8.19.0
@ -4,10 +4,10 @@ DESCRIPTION=An enhanced multi-threaded syslogd with database support and more
 EAPI=6
 HOMEPAGE=http://www.rsyslog.com/
 IUSE=dbi debug doc elasticsearch +gcrypt grok jemalloc kafka kerberos libressl mongodb mysql normalize omhttpfs omudpspoof postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools zeromq
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~x86
+KEYWORDS=~amd64 ~arm ~arm64 hppa ~x86
 LICENSE=GPL-3 LGPL-3 Apache-2.0
 RDEPEND=>=dev-libs/libfastjson-0.99.2:= >=dev-libs/libestr-0.1.9 >=dev-libs/liblogging-1.0.1:=[stdlog] >=sys-libs/zlib-1.2.5 dbi? ( >=dev-db/libdbi-0.8.3 ) elasticsearch? ( >=net-misc/curl-7.35.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) grok? ( >=dev-libs/grok-0.9.2 ) jemalloc? ( >=dev-libs/jemalloc-3.3.1:= ) kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) kerberos? ( virtual/krb5 ) mongodb? ( >=dev-libs/libmongo-client-0.1.4 ) mysql? ( virtual/mysql ) normalize? ( >=dev-libs/libee-0.4.0 >=dev-libs/liblognorm-2.0.1:= ) omhttpfs? ( >=net-misc/curl-7.35.0 ) omudpspoof? ( >=net-libs/libnet-1.1.6 ) postgres? ( >=dev-db/postgresql-8.4.20:= ) rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= ) redis? ( >=dev-libs/hiredis-0.11.0 ) relp? ( >=dev-libs/librelp-1.2.5:= ) rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) rfc5424hmac? ( !libressl? ( >=dev-libs/openssl-0.9.8y:0= ) libressl? ( dev-libs/libressl:= ) ) snmp? ( >=net-analyzer/net-snmp-5.7.2 ) ssl? ( >=net-libs/gnutls-2.12.23:0= ) systemd? ( >=sys-apps/systemd-208 ) zeromq? ( >=net-libs/zeromq-4.1.1:= >=net-libs/czmq-3.0.0 )
 SLOT=0
 SRC_URI=http://www.rsyslog.com/files/download/rsyslog/rsyslog-8.19.0.tar.gz -> rsyslog-8.19.0.tar.gz doc? ( http://www.rsyslog.com/files/download/rsyslog/rsyslog-doc-8.19.0.tar.gz -> rsyslog-docs-8.19.0.tar.gz )
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	libtool	4890219c51da247200223277f993e054	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multilib	165fc17c38d1b11dac2008280dab6e80	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=f7896e2692b19129735e9a84ad7c03c9
+_md5_=327a6a92bcb55adad714ed5259b012fc
--- a/metadata/md5-cache/app-emulation/rkt-1.11.0
+++ b/metadata/md5-cache/app-emulation/rkt-1.11.0
@ -3,12 +3,12 @@ DEPEND=>=dev-lang/go-1.5 app-arch/cpio app-crypt/trousers sys-fs/squashfs-tools
 DESCRIPTION=rkt is an App Container runtime for Linux
 EAPI=6
 HOMEPAGE=https://github.com/coreos/rkt
-IUSE=doc examples +rkt_stage1_coreos +rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm rkt_stage1_src +actool systemd
+IUSE=doc examples +rkt_stage1_coreos +rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm rkt_stage1_kvm_lkvm rkt_stage1_src +actool systemd
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
 RDEPEND=!app-emulation/rocket rkt_stage1_host? ( systemd? ( >=sys-apps/systemd-222 app-shells/bash:0 ) )
-REQUIRED_USE=|| ( rkt_stage1_coreos rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm rkt_stage1_src ) rkt_stage1_host? ( systemd )
+REQUIRED_USE=|| ( rkt_stage1_coreos rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm_lkvm rkt_stage1_src ) rkt_stage1_host? ( systemd ) !rkt_stage1_kvm
 SLOT=0
-SRC_URI=https://github.com/coreos/rkt/archive/v1.11.0.tar.gz -> rkt-1.11.0.tar.gz rkt_stage1_coreos? ( http://alpha.release.core-os.net/amd64-usr/1097.0.0/coreos_production_pxe_image.cpio.gz -> rkt-pxe-1097.0.0.img ) rkt_stage1_kvm? ( https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+archive/d62653e177597251c24494a6dda60acd6d846671.tar.gz -> kvmtool-d62653e177597251c24494a6dda60acd6d846671.tar.gz mirror://kernel/linux/kernel/v4.x/linux-4.3.1.tar.xz http://alpha.release.core-os.net/amd64-usr/1097.0.0/coreos_production_pxe_image.cpio.gz -> rkt-pxe-1097.0.0.img ) rkt_stage1_src? ( https://github.com/systemd/systemd/archive/v229.tar.gz -> systemd-229.tar.gz )
+SRC_URI=https://github.com/coreos/rkt/archive/v1.11.0.tar.gz -> rkt-1.11.0.tar.gz rkt_stage1_coreos? ( http://alpha.release.core-os.net/amd64-usr/1097.0.0/coreos_production_pxe_image.cpio.gz -> rkt-pxe-1097.0.0.img ) rkt_stage1_kvm_lkvm? ( https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+archive/d62653e177597251c24494a6dda60acd6d846671.tar.gz -> kvmtool-d62653e177597251c24494a6dda60acd6d846671.tar.gz mirror://kernel/linux/kernel/v4.x/linux-4.3.1.tar.xz http://alpha.release.core-os.net/amd64-usr/1097.0.0/coreos_production_pxe_image.cpio.gz -> rkt-pxe-1097.0.0.img ) rkt_stage1_src? ( https://github.com/systemd/systemd/archive/v229.tar.gz -> systemd-229.tar.gz )
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=716616bb70ea9a9d3972eefdb0ee93ac
+_md5_=88464bcea5415799ddc315bbc97e40b1
--- a/metadata/md5-cache/app-emulation/rkt-1.12.0
+++ b/metadata/md5-cache/app-emulation/rkt-1.12.0
@ -3,12 +3,12 @@ DEPEND=>=dev-lang/go-1.5 app-arch/cpio app-crypt/trousers sys-fs/squashfs-tools
 DESCRIPTION=rkt is an App Container runtime for Linux
 EAPI=6
 HOMEPAGE=https://github.com/coreos/rkt
-IUSE=doc examples +rkt_stage1_coreos +rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm rkt_stage1_src +actool systemd
+IUSE=doc examples +rkt_stage1_coreos +rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm rkt_stage1_kvm_lkvm rkt_stage1_src +actool systemd
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
 RDEPEND=!app-emulation/rocket rkt_stage1_host? ( systemd? ( >=sys-apps/systemd-222 app-shells/bash:0 ) )
-REQUIRED_USE=|| ( rkt_stage1_coreos rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm rkt_stage1_src ) rkt_stage1_host? ( systemd )
+REQUIRED_USE=|| ( rkt_stage1_coreos rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm_lkvm rkt_stage1_src ) rkt_stage1_host? ( systemd ) !rkt_stage1_kvm
 SLOT=0
-SRC_URI=https://github.com/coreos/rkt/archive/v1.12.0.tar.gz -> rkt-1.12.0.tar.gz rkt_stage1_coreos? ( http://alpha.release.core-os.net/amd64-usr/1097.0.0/coreos_production_pxe_image.cpio.gz -> rkt-pxe-1097.0.0.img ) rkt_stage1_kvm? ( https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+archive/d62653e177597251c24494a6dda60acd6d846671.tar.gz -> kvmtool-d62653e177597251c24494a6dda60acd6d846671.tar.gz mirror://kernel/linux/kernel/v4.x/linux-4.3.1.tar.xz http://alpha.release.core-os.net/amd64-usr/1097.0.0/coreos_production_pxe_image.cpio.gz -> rkt-pxe-1097.0.0.img ) rkt_stage1_src? ( https://github.com/systemd/systemd/archive/v229.tar.gz -> systemd-229.tar.gz )
+SRC_URI=https://github.com/coreos/rkt/archive/v1.12.0.tar.gz -> rkt-1.12.0.tar.gz rkt_stage1_coreos? ( http://alpha.release.core-os.net/amd64-usr/1097.0.0/coreos_production_pxe_image.cpio.gz -> rkt-pxe-1097.0.0.img ) rkt_stage1_kvm_lkvm? ( https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+archive/d62653e177597251c24494a6dda60acd6d846671.tar.gz -> kvmtool-d62653e177597251c24494a6dda60acd6d846671.tar.gz mirror://kernel/linux/kernel/v4.x/linux-4.3.1.tar.xz http://alpha.release.core-os.net/amd64-usr/1097.0.0/coreos_production_pxe_image.cpio.gz -> rkt-pxe-1097.0.0.img ) rkt_stage1_src? ( https://github.com/systemd/systemd/archive/v229.tar.gz -> systemd-229.tar.gz )
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	user	80aaa71614ced86f02ee1a513821dc87
-_md5_=ddb3102a710e95af13ee4575cc56b247
+_md5_=c208410ae293cf00ca01f6b5484ce763
--- a/metadata/md5-cache/app-emulation/rkt-1.14.0
+++ b/metadata/md5-cache/app-emulation/rkt-1.14.0
@ -3,12 +3,12 @@ DEPEND=>=dev-lang/go-1.5 app-arch/cpio app-crypt/trousers sys-fs/squashfs-tools
 DESCRIPTION=rkt is an App Container runtime for Linux
 EAPI=6
 HOMEPAGE=https://github.com/coreos/rkt
-IUSE=doc examples +rkt_stage1_coreos +rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm rkt_stage1_src +actool systemd
+IUSE=doc examples +rkt_stage1_coreos +rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm rkt_stage1_kvm_lkvm rkt_stage1_src +actool systemd
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
 RDEPEND=!app-emulation/rocket rkt_stage1_host? ( systemd? ( >=sys-apps/systemd-222 app-shells/bash:0 ) )
-REQUIRED_USE=|| ( rkt_stage1_coreos rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm rkt_stage1_src ) rkt_stage1_host? ( systemd )
+REQUIRED_USE=|| ( rkt_stage1_coreos rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm_lkvm rkt_stage1_src ) rkt_stage1_host? ( systemd ) !rkt_stage1_kvm
 SLOT=0
-SRC_URI=https://github.com/coreos/rkt/archive/v1.14.0.tar.gz -> rkt-1.14.0.tar.gz rkt_stage1_coreos? ( http://alpha.release.core-os.net/amd64-usr/1151.0.0/coreos_production_pxe_image.cpio.gz -> rkt-pxe-1151.0.0.img ) rkt_stage1_kvm? ( https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+archive/d62653e177597251c24494a6dda60acd6d846671.tar.gz -> kvmtool-d62653e177597251c24494a6dda60acd6d846671.tar.gz mirror://kernel/linux/kernel/v4.x/linux-4.3.1.tar.xz http://alpha.release.core-os.net/amd64-usr/1151.0.0/coreos_production_pxe_image.cpio.gz -> rkt-pxe-1151.0.0.img ) rkt_stage1_src? ( https://github.com/systemd/systemd/archive/v231.tar.gz -> systemd-231.tar.gz )
+SRC_URI=https://github.com/coreos/rkt/archive/v1.14.0.tar.gz -> rkt-1.14.0.tar.gz rkt_stage1_coreos? ( http://alpha.release.core-os.net/amd64-usr/1151.0.0/coreos_production_pxe_image.cpio.gz -> rkt-pxe-1151.0.0.img ) rkt_stage1_kvm_lkvm? ( https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+archive/d62653e177597251c24494a6dda60acd6d846671.tar.gz -> kvmtool-d62653e177597251c24494a6dda60acd6d846671.tar.gz mirror://kernel/linux/kernel/v4.x/linux-4.3.1.tar.xz http://alpha.release.core-os.net/amd64-usr/1151.0.0/coreos_production_pxe_image.cpio.gz -> rkt-pxe-1151.0.0.img ) rkt_stage1_src? ( https://github.com/systemd/systemd/archive/v231.tar.gz -> systemd-231.tar.gz )
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	user	80aaa71614ced86f02ee1a513821dc87
-_md5_=e1b3db994c43fec80d612824aff2fe1c
+_md5_=0301867e62542651107dfa1ae74f7405
--- a/metadata/md5-cache/app-misc/ddctool-0.5.3
+++ b/metadata/md5-cache/app-misc/ddctool-0.5.3
@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst prepare pretend setup
+DEPEND=video_cards_fglrx? ( x11-libs/amd-adl-sdk ) virtual/pkgconfig x11-libs/libXrandr sys-apps/i2c-tools virtual/udev usb-monitor? ( dev-libs/hidapi virtual/libusb:1 sys-apps/usbutils ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DESCRIPTION=Program for querying and changing monitor settings
+EAPI=6
+HOMEPAGE=http://www.ddctool.com/
+IUSE=usb-monitor user-permissions video_cards_fglrx video_cards_nvidia
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=x11-libs/libXrandr sys-apps/i2c-tools virtual/udev usb-monitor? ( dev-libs/hidapi virtual/libusb:1 sys-apps/usbutils )
+SLOT=0
+SRC_URI=https://github.com/rockowitz/ddctool/archive/v0.5.3.tar.gz -> ddctool-0.5.3.tar.gz
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	libtool	4890219c51da247200223277f993e054	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	udev	73058269b3e70e34e084fa3981282338	user	80aaa71614ced86f02ee1a513821dc87	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=58900da07c28b6f6b7ded2613de560f4
--- a/metadata/md5-cache/app-text/xapian-omega-1.2.24
+++ b/metadata/md5-cache/app-text/xapian-omega-1.2.24
@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DEPEND=dev-libs/xapian:0/1.2.22 dev-lang/perl dev-libs/libpcre sys-libs/zlib
+DESCRIPTION=An application built on Xapian, consisting of indexers and a CGI search frontend
+EAPI=5
+HOMEPAGE=http://www.xapian.org/
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/xapian:0/1.2.22 dev-lang/perl dev-libs/libpcre sys-libs/zlib
+SLOT=0
+SRC_URI=http://www.oligarchy.co.uk/xapian/1.2.24/xapian-omega-1.2.24.tar.xz
+_md5_=6b041a85248a5e5cf65aa57f0683287a
--- a/metadata/md5-cache/dev-db/postgresql-9.6_rc1
+++ b/metadata/md5-cache/dev-db/postgresql-9.6_rc1
@ -4,9 +4,10 @@ DESCRIPTION=PostgreSQL RDBMS
 EAPI=5
 HOMEPAGE=http://www.postgresql.org/
 IUSE=doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python +readline selinux +server ssl static-libs tcl threads uuid xml zlib linguas_af linguas_cs linguas_de linguas_en linguas_es linguas_fa linguas_fr linguas_hr linguas_hu linguas_it linguas_ko linguas_nb linguas_pl linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sl linguas_sv linguas_tr linguas_zh_CN linguas_zh_TW elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris
 LICENSE=POSTGRESQL GPL-2
 RDEPEND=>=app-eselect/eselect-postgresql-1.2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( virtual/pam ) perl? ( >=dev-lang/perl-5.8 ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !dev-db/postgresql-docs:9.6 !dev-db/postgresql-base:9.6 !dev-db/postgresql-server:9.6 selinux? ( sec-policy/selinux-postgresql )
 SLOT=9.6
-SRC_URI=mirror://postgresql/source/v9.6rc1/postgresql-9.6rc1.tar.bz2
+SRC_URI=mirror://postgresql/source/v9.6.0/postgresql-9.6.0.tar.bz2
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multilib	165fc17c38d1b11dac2008280dab6e80	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	prefix	99dcca42e6528d8fe3c214bf5731aaf2	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	user	80aaa71614ced86f02ee1a513821dc87	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=6dabc9e14882b8edab66db8ab0518b40
+_md5_=109d2cf96eabe9533723679761b22947
--- a/metadata/md5-cache/dev-libs/gecode-4.4.0-r1
+++ b/metadata/md5-cache/dev-libs/gecode-4.4.0-r1
@ -10,4 +10,4 @@ RDEPEND=gist? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) gmp? ( dev-libs/gmp:0 dev-libs/
 SLOT=0
 SRC_URI=http://www.gecode.org/download/gecode-4.4.0.tar.gz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	qmake-utils	0a242e7177789b0028b4045f336dd4db	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=ed16b6573f15477293d09d690fa68096
+_md5_=2513e0a6cda8bd508f0e2e5514e5be56
--- a/metadata/md5-cache/dev-libs/leatherman-0.7.5-r2
+++ b/metadata/md5-cache/dev-libs/leatherman-0.7.5-r2
@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( >=sys-devel/gcc-4.8:* >=dev-libs/boost-1.54[nls] <net-misc/curl-7.50.0 ) sys-devel/make >=dev-util/cmake-2.8.12 ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
-DESCRIPTION=A C++ toolkit
-EAPI=5
-HOMEPAGE=https://github.com/puppetlabs/leatherman
-IUSE=debug test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22
-KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=sys-devel/gcc-4.8:* >=dev-libs/boost-1.54[nls] <net-misc/curl-7.50.0 ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
-SLOT=0
-SRC_URI=https://github.com/puppetlabs/leatherman/archive/0.7.5.tar.gz -> leatherman-0.7.5.tar.gz
-_eclasses_=cmake-utils	f3d38665b0a86e08ba3a5473cdbfafd3	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	java-utils-2	9a25f292ff66f8c2c00100ac0b15c54f	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-ng	3b6431b487e69b5070a45ea20d1c4c6c	ruby-utils	2f896785ed65442d7e84ab5f5eef3bd3	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=42a8ba852145a2d98798515477b6c19a
--- a/metadata/md5-cache/dev-libs/libatasmart-0.19
+++ b/metadata/md5-cache/dev-libs/libatasmart-0.19
@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=virtual/udev virtual/pkgconfig
-DESCRIPTION=A small and lightweight parser library for ATA S.M.A.R.T. hard disks
-EAPI=5
-HOMEPAGE=http://0pointer.de/blog/projects/being-smart.html
-IUSE=static-libs
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86
-LICENSE=LGPL-2.1
-RDEPEND=virtual/udev
-SLOT=0
-SRC_URI=http://0pointer.de/public/libatasmart-0.19.tar.xz
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=66f6f4e50d96302be4facb1f7304dc13
--- a/metadata/md5-cache/dev-libs/libgamin-0.1.10-r4
+++ b/metadata/md5-cache/dev-libs/libgamin-0.1.10-r4
@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=!app-admin/fam !<app-admin/gamin-0.1.10 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 python? ( =dev-lang/python-2* )
-DESCRIPTION=Library providing the FAM File Alteration Monitor API
-EAPI=5
-HOMEPAGE=https://www.gnome.org/~veillard/gamin/
-IUSE=debug kernel_linux python static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=LGPL-2
-RDEPEND=!app-admin/fam !<app-admin/gamin-0.1.10 python? ( =dev-lang/python-2* )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://gnome/sources/gamin/0.1/gamin-0.1.10.tar.bz2 mirror://gentoo/gamin-0.1.9-freebsd.patch.bz2 https://dev.gentoo.org/~grobian/patches/libgamin-0.1.10-opensolaris.patch.bz2 https://pkgconfig.freedesktop.org/releases/pkg-config-0.26.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	python	efc1c55fc44c5b7272fc2ffba73c3e6f	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=42e58154cffa5cb7ea1d2dfe6512fa49
--- a/metadata/md5-cache/dev-libs/liboil-0.3.17
+++ b/metadata/md5-cache/dev-libs/liboil-0.3.17
@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=examples? ( dev-libs/glib:2 ) virtual/pkgconfig doc? ( >=dev-util/gtk-doc-1 )
-DESCRIPTION=Library of simple functions that are optimized for various CPUs
-EAPI=2
-HOMEPAGE=https://liboil.freedesktop.org/
-IUSE=doc +examples test
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd
-LICENSE=BSD-2
-RDEPEND=examples? ( dev-libs/glib:2 )
-SLOT=0.3
-SRC_URI=https://liboil.freedesktop.org/download/liboil-0.3.17.tar.gz
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=71030162d98d0f73dff004a283d39741
--- a/metadata/md5-cache/dev-libs/liboil-0.3.17-r1
+++ b/metadata/md5-cache/dev-libs/liboil-0.3.17-r1
@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=examples? ( dev-libs/glib:2 ) dev-util/gtk-doc-am virtual/pkgconfig
-DESCRIPTION=Library of simple functions that are optimized for various CPUs
-EAPI=4
-HOMEPAGE=https://liboil.freedesktop.org/
-IUSE=+examples static-libs test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD-2
-RDEPEND=examples? ( dev-libs/glib:2 )
-SLOT=0.3
-SRC_URI=https://liboil.freedesktop.org/download/liboil-0.3.17.tar.gz
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=f3adfcc5d88d2e689af24ec4318d8a82
--- a/metadata/md5-cache/dev-libs/xapian-1.2.24
+++ b/metadata/md5-cache/dev-libs/xapian-1.2.24
@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install test
+DEPEND=sys-libs/zlib
+DESCRIPTION=Xapian Probabilistic Information Retrieval library
+EAPI=5
+HOMEPAGE=http://www.xapian.org/
+IUSE=doc static-libs -cpu_flags_x86_sse +cpu_flags_x86_sse2 +brass +chert +inmemory
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=sys-libs/zlib
+SLOT=0/1.2.22
+SRC_URI=http://oligarchy.co.uk/xapian/1.2.24/xapian-core-1.2.24.tar.xz
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
+_md5_=9b542cc854b7bb46a4ba6ecb97662216
--- a/metadata/md5-cache/dev-libs/xapian-bindings-1.2.24
+++ b/metadata/md5-cache/dev-libs/xapian-bindings-1.2.24
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install preinst prepare setup test unpack
+DEPEND=dev-libs/xapian:0/1.2.22 lua? ( dev-lang/lua:0 ) perl? ( dev-lang/perl:= ) ruby? ( dev-lang/ruby:= ) tcl? ( >=dev-lang/tcl-8.1:0= ) virtual/pkgconfig java? ( >=virtual/jdk-1.3 ) java? ( >=dev-java/java-config-2.2.0-r3 ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php? ( php_targets_php5-5? ( dev-lang/php:5.5 ) php_targets_php5-6? ( dev-lang/php:5.6 ) )
+DESCRIPTION=SWIG and JNI bindings for Xapian
+EAPI=5
+HOMEPAGE=http://www.xapian.org/
+IUSE=java lua perl php python ruby tcl elibc_FreeBSD java php_targets_php5-5 php_targets_php5-6 python_targets_python2_7
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/xapian:0/1.2.22 lua? ( dev-lang/lua:0 ) perl? ( dev-lang/perl:= ) ruby? ( dev-lang/ruby:= ) tcl? ( >=dev-lang/tcl-8.1:0= ) java? ( >=virtual/jre-1.3 ) java? ( >=dev-java/java-config-2.2.0-r3 ) php? ( php_targets_php5-5? ( dev-lang/php:5.5 ) php_targets_php5-6? ( dev-lang/php:5.6 ) )
+REQUIRED_USE=|| ( java lua perl php python ruby tcl ) php? ( || ( php_targets_php5-5 php_targets_php5-6 ) )
+SLOT=0
+SRC_URI=http://oligarchy.co.uk/xapian/1.2.24/xapian-bindings-1.2.24.tar.xz
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	9a25f292ff66f8c2c00100ac0b15c54f	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	php-ext-source-r2	d3d06f8b11fb8481e555b58df7360663	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=603bcba90b9f65b0a013d4e2fca8aa7d
--- a/metadata/md5-cache/dev-python/lit-9999
+++ b/metadata/md5-cache/dev-python/lit-9999
@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1
+DESCRIPTION=A stand-alone install of the LLVM suite testing tool
+EAPI=6
+HOMEPAGE=http://llvm.org/
+IUSE=python_targets_python2_7
+LICENSE=UoI-NCSA
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	git-r3	00f60a84fc7b499c99edfe99caea9f95	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=790e9f13b97b4df0655dd3f79d5347b2
--- a/metadata/md5-cache/dev-util/duma-2.5.15-r1
+++ b/metadata/md5-cache/dev-util/duma-2.5.15-r1
@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare test
-DEPEND=app-shells/bash
-DESCRIPTION=DUMA (Detect Unintended Memory Access) is a memory debugging library
-EAPI=2
-HOMEPAGE=http://duma.sourceforge.net
-IUSE=examples
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=app-shells/bash
-SLOT=0
-SRC_URI=mirror://sourceforge/duma/duma_2_5_15.tar.gz mirror://gentoo/duma-2.5.15-GNUmakefile.patch.bz2
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=7e875b74e15d6ba6461416327e440c1c
--- a/metadata/md5-cache/dev-util/duma-2.5.15-r2
+++ b/metadata/md5-cache/dev-util/duma-2.5.15-r2
@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install postinst test
+DESCRIPTION=DUMA (Detect Unintended Memory Access) is a memory debugging library
+EAPI=6
+HOMEPAGE=http://duma.sourceforge.net
+IUSE=examples
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=mirror://sourceforge/duma/duma_2_5_15.tar.gz mirror://gentoo/duma-2.5.15-GNUmakefile.patch.bz2
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=d40c2ff71976a422fd7068be46b9e379
--- a/metadata/md5-cache/dev-util/oprofile-0.9.9-r1
+++ b/metadata/md5-cache/dev-util/oprofile-0.9.9-r1
@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/popt-1.7-r1 >=sys-devel/binutils-2.14.90.0.6-r3:* >=sys-libs/
 SLOT=0
 SRC_URI=mirror://sourceforge/oprofile/oprofile-0.9.9.tar.gz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	9a25f292ff66f8c2c00100ac0b15c54f	libtool	4890219c51da247200223277f993e054	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	user	80aaa71614ced86f02ee1a513821dc87	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=22361e14000f7a43acff76ed56f3c53a
+_md5_=afbe17f20014739acfee166630102a27
--- a/metadata/md5-cache/dev-util/oprofile-0.9.9-r2
+++ b/metadata/md5-cache/dev-util/oprofile-0.9.9-r2
@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/popt-1.7-r1 sys-libs/binutils-libs >=sys-libs/glibc-2.3.2-r1
 SLOT=0
 SRC_URI=mirror://sourceforge/oprofile/oprofile-0.9.9.tar.gz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	9a25f292ff66f8c2c00100ac0b15c54f	libtool	4890219c51da247200223277f993e054	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	user	80aaa71614ced86f02ee1a513821dc87	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=aafac4dab103d88aad6c1c3bdf1856a0
+_md5_=fd8a24ec2988c2ead782011687d784b6
--- a/metadata/md5-cache/dev-util/oprofile-1.1.0-r1
+++ b/metadata/md5-cache/dev-util/oprofile-1.1.0-r1
@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/popt-1.7-r1 sys-libs/binutils-libs >=sys-libs/glibc-2.3.2-r1
 SLOT=0
 SRC_URI=mirror://sourceforge/oprofile/oprofile-1.1.0.tar.gz
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	9a25f292ff66f8c2c00100ac0b15c54f	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	user	80aaa71614ced86f02ee1a513821dc87	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=9a8b64c7b1a996cca3adb9dd7410b0b1
+_md5_=d231aeb0a5dbebaf66d332aee0bb3250
--- a/metadata/md5-cache/kde-apps/libkipi-16.04.3
+++ b/metadata/md5-cache/kde-apps/libkipi-16.04.3
@ -4,10 +4,10 @@ DESCRIPTION=A library for image plugins accross KDE applications
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=debug
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.23.0:5 >=kde-frameworks/kcoreaddons-5.23.0:5 >=kde-frameworks/kservice-5.23.0:5 >=kde-frameworks/kxmlgui-5.23.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 !<kde-apps/libkipi-15.08.3-r1:4 !kde-base/legacy-icons >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/31
 SRC_URI=mirror://kde/stable/applications/16.04.3/src/libkipi-16.04.3.tar.xz
 _eclasses_=cmake-utils	f3d38665b0a86e08ba3a5473cdbfafd3	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	e93658f249f8a4533bec25fd7b32155c	kde5-functions	88f6106f109af6607cdcec5d3fa5ce69	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=d364aaa3a98824ad16ea34396eb8b04d
+_md5_=9aa871575268dffceb4ab20f9c87a0ec
--- a/metadata/md5-cache/kde-apps/libkipi-16.08.1
+++ b/metadata/md5-cache/kde-apps/libkipi-16.08.1
@ -4,10 +4,10 @@ DESCRIPTION=A library for image plugins accross KDE applications
 EAPI=6
 HOMEPAGE=https://www.kde.org/
 IUSE=debug
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.23.0:5 >=kde-frameworks/kcoreaddons-5.23.0:5 >=kde-frameworks/kservice-5.23.0:5 >=kde-frameworks/kxmlgui-5.23.0:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 !<kde-apps/libkipi-15.08.3-r1:4 !kde-base/legacy-icons >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.6.1:5
 SLOT=5/31
 SRC_URI=mirror://kde/stable/applications/16.08.1/src/libkipi-16.08.1.tar.xz
 _eclasses_=cmake-utils	f3d38665b0a86e08ba3a5473cdbfafd3	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	e93658f249f8a4533bec25fd7b32155c	kde5-functions	88f6106f109af6607cdcec5d3fa5ce69	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=f2f477e6e45c29a43db2c3a1dbf78cc5
+_md5_=12e1acc65ee405191a9d225f9cbb53f7
--- a/metadata/md5-cache/kde-plasma/kde-cli-tools-5.6.5-r1
+++ b/metadata/md5-cache/kde-plasma/kde-cli-tools-5.6.5-r1
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.23.0:5 >=kde-frameworks/kcompletion-5.23.0:5 >=kde-frameworks/kconfig-5.23.0:5 >=kde-frameworks/kconfigwidgets-5.23.0:5 >=kde-frameworks/kcoreaddons-5.23.0:5 >=kde-frameworks/ki18n-5.23.0:5 >=kde-frameworks/kiconthemes-5.23.0:5 >=kde-frameworks/kio-5.23.0:5 >=kde-frameworks/kservice-5.23.0:5 >=kde-frameworks/kwidgetsaddons-5.23.0:5 >=kde-frameworks/kwindowsystem-5.23.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtsvg-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 kdesu? ( >=kde-frameworks/kdesu-5.23.0:5 ) X? ( >=kde-frameworks/kdelibs4support-5.23.0:5 >=dev-qt/qtx11extras-5.6.1:5 x11-libs/libX11 ) sys-devel/make >=dev-util/cmake-2.8.12 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.23.0:5 handbook? ( >=kde-frameworks/kdoctools-5.23.0:5 ) test? ( >=dev-qt/qttest-5.6.1:5 ) >=dev-qt/qtcore-5.6.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Tools based on KDE Frameworks 5 to better interact with the system
+EAPI=6
+HOMEPAGE=https://projects.kde.org/projects/kde/workspace/kde-cli-tools
+IUSE=+kdesu X test debug +handbook test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcmutils-5.23.0:5 >=kde-frameworks/kcompletion-5.23.0:5 >=kde-frameworks/kconfig-5.23.0:5 >=kde-frameworks/kconfigwidgets-5.23.0:5 >=kde-frameworks/kcoreaddons-5.23.0:5 >=kde-frameworks/ki18n-5.23.0:5 >=kde-frameworks/kiconthemes-5.23.0:5 >=kde-frameworks/kio-5.23.0:5 >=kde-frameworks/kservice-5.23.0:5 >=kde-frameworks/kwidgetsaddons-5.23.0:5 >=kde-frameworks/kwindowsystem-5.23.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtsvg-5.6.1:5 >=dev-qt/qtwidgets-5.6.1:5 kdesu? ( >=kde-frameworks/kdesu-5.23.0:5 ) X? ( >=kde-frameworks/kdelibs4support-5.23.0:5 >=dev-qt/qtx11extras-5.6.1:5 x11-libs/libX11 ) handbook? ( !kde-apps/kdesu[handbook] ) >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal(+)] !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.6.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.6.5/kde-cli-tools-5.6.5.tar.xz
+_eclasses_=cmake-utils	f3d38665b0a86e08ba3a5473cdbfafd3	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	e93658f249f8a4533bec25fd7b32155c	kde5-functions	88f6106f109af6607cdcec5d3fa5ce69	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=5d53a17e7557bcbb7a0386c05b5d9b82
--- a/metadata/md5-cache/media-gfx/blender-2.72b-r4
+++ b/metadata/md5-cache/media-gfx/blender-2.72b-r4
@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
-DEPEND=dev-lang/python:3.4 >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_5(-),python_single_target_python3_4(+)] dev-python/numpy[python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_5(-),python_single_target_python3_4(+)] dev-python/requests[python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_5(-),python_single_target_python3_4(+)] >=media-libs/freetype-2.0:2 media-libs/glew media-libs/libpng:0 media-libs/libsamplerate sci-libs/ldl sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/libintl virtual/opengl x11-libs/libX11 x11-libs/libXi x11-libs/libXxf86vm boost? ( >=dev-libs/boost-1.44[nls?,threads(+)] ) collada? ( >=media-libs/opencollada-1.6.18 ) colorio? ( >=media-libs/opencolorio-1.0.9-r2 ) cycles? ( media-libs/openimageio ) ffmpeg? ( media-video/ffmpeg:0=[x264,mp3,encode,theora,jpeg2k?] ) libav? ( >=media-video/libav-11.3:0=[x264,mp3,encode,theora,jpeg2k?] ) fftw? ( sci-libs/fftw:3.0 ) jack? ( media-sound/jack-audio-connection-kit ) jpeg2k? ( media-libs/openjpeg:0 ) ndof? ( app-misc/spacenavd dev-libs/libspnav ) nls? ( virtual/libiconv ) openal? ( >=media-libs/openal-1.6.372 ) openimageio? ( media-libs/openimageio ) openexr? ( media-libs/ilmbase media-libs/openexr ) sdl? ( media-libs/libsdl[sound,joystick] ) sndfile? ( media-libs/libsndfile ) tiff? ( media-libs/tiff:0 ) doc? ( app-doc/doxygen[-nodot(-),dot(+)] dev-python/sphinx ) nls? ( sys-devel/gettext ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12
+DEPEND=dev-lang/python:3.4 >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_5(-),python_single_target_python3_4(+)] dev-python/numpy[python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_5(-),python_single_target_python3_4(+)] dev-python/requests[python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_5(-),python_single_target_python3_4(+)] >=media-libs/freetype-2.0:2 media-libs/glew media-libs/libpng:0 media-libs/libsamplerate sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/libintl virtual/opengl x11-libs/libX11 x11-libs/libXi x11-libs/libXxf86vm boost? ( >=dev-libs/boost-1.44[nls?,threads(+)] ) collada? ( >=media-libs/opencollada-1.6.18 ) colorio? ( >=media-libs/opencolorio-1.0.9-r2 ) cycles? ( media-libs/openimageio ) ffmpeg? ( media-video/ffmpeg:0=[x264,mp3,encode,theora,jpeg2k?] ) libav? ( >=media-video/libav-11.3:0=[x264,mp3,encode,theora,jpeg2k?] ) fftw? ( sci-libs/fftw:3.0 ) jack? ( media-sound/jack-audio-connection-kit ) jpeg2k? ( media-libs/openjpeg:0 ) ndof? ( app-misc/spacenavd dev-libs/libspnav ) nls? ( virtual/libiconv ) openal? ( >=media-libs/openal-1.6.372 ) openimageio? ( media-libs/openimageio ) openexr? ( media-libs/ilmbase media-libs/openexr ) sdl? ( media-libs/libsdl[sound,joystick] ) sndfile? ( media-libs/libsndfile ) tiff? ( media-libs/tiff:0 ) doc? ( app-doc/doxygen[-nodot(-),dot(+)] dev-python/sphinx ) nls? ( sys-devel/gettext ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12
 DESCRIPTION=3D Creation/Animation/Publishing System
 EAPI=6
 HOMEPAGE=http://www.blender.org
 IUSE=+boost +bullet collada colorio cycles +dds debug doc +elbeem ffmpeg fftw +game-engine jack jpeg2k libav ndof nls openal openimageio +opennl openmp +openexr player redcode sdl sndfile cpu_flags_x86_sse cpu_flags_x86_sse2 tiff python_targets_python3_4
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( GPL-2 BL )
-RDEPEND=dev-lang/python:3.4 >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_5(-),python_single_target_python3_4(+)] dev-python/numpy[python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_5(-),python_single_target_python3_4(+)] dev-python/requests[python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_5(-),python_single_target_python3_4(+)] >=media-libs/freetype-2.0:2 media-libs/glew media-libs/libpng:0 media-libs/libsamplerate sci-libs/ldl sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/libintl virtual/opengl x11-libs/libX11 x11-libs/libXi x11-libs/libXxf86vm boost? ( >=dev-libs/boost-1.44[nls?,threads(+)] ) collada? ( >=media-libs/opencollada-1.6.18 ) colorio? ( >=media-libs/opencolorio-1.0.9-r2 ) cycles? ( media-libs/openimageio ) ffmpeg? ( media-video/ffmpeg:0=[x264,mp3,encode,theora,jpeg2k?] ) libav? ( >=media-video/libav-11.3:0=[x264,mp3,encode,theora,jpeg2k?] ) fftw? ( sci-libs/fftw:3.0 ) jack? ( media-sound/jack-audio-connection-kit ) jpeg2k? ( media-libs/openjpeg:0 ) ndof? ( app-misc/spacenavd dev-libs/libspnav ) nls? ( virtual/libiconv ) openal? ( >=media-libs/openal-1.6.372 ) openimageio? ( media-libs/openimageio ) openexr? ( media-libs/ilmbase media-libs/openexr ) sdl? ( media-libs/libsdl[sound,joystick] ) sndfile? ( media-libs/libsndfile ) tiff? ( media-libs/tiff:0 )
+RDEPEND=dev-lang/python:3.4 >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_5(-),python_single_target_python3_4(+)] dev-python/numpy[python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_5(-),python_single_target_python3_4(+)] dev-python/requests[python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_5(-),python_single_target_python3_4(+)] >=media-libs/freetype-2.0:2 media-libs/glew media-libs/libpng:0 media-libs/libsamplerate sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/libintl virtual/opengl x11-libs/libX11 x11-libs/libXi x11-libs/libXxf86vm boost? ( >=dev-libs/boost-1.44[nls?,threads(+)] ) collada? ( >=media-libs/opencollada-1.6.18 ) colorio? ( >=media-libs/opencolorio-1.0.9-r2 ) cycles? ( media-libs/openimageio ) ffmpeg? ( media-video/ffmpeg:0=[x264,mp3,encode,theora,jpeg2k?] ) libav? ( >=media-video/libav-11.3:0=[x264,mp3,encode,theora,jpeg2k?] ) fftw? ( sci-libs/fftw:3.0 ) jack? ( media-sound/jack-audio-connection-kit ) jpeg2k? ( media-libs/openjpeg:0 ) ndof? ( app-misc/spacenavd dev-libs/libspnav ) nls? ( virtual/libiconv ) openal? ( >=media-libs/openal-1.6.372 ) openimageio? ( media-libs/openimageio ) openexr? ( media-libs/ilmbase media-libs/openexr ) sdl? ( media-libs/libsdl[sound,joystick] ) sndfile? ( media-libs/libsndfile ) tiff? ( media-libs/tiff:0 )
 REQUIRED_USE=python_targets_python3_4 player? ( game-engine ) redcode? ( jpeg2k ffmpeg ) cycles? ( boost openexr tiff ) nls? ( boost ) colorio? ( boost ) openal? ( boost ) game-engine? ( boost ) ?? ( ffmpeg libav )
 SLOT=0
 SRC_URI=http://download.blender.org/source/blender-2.72b.tar.gz
 _eclasses_=check-reqs	aee25bdf4e2f459af86d17f7c41dcdf6	cmake-utils	f3d38665b0a86e08ba3a5473cdbfafd3	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	multilib	165fc17c38d1b11dac2008280dab6e80	pax-utils	4c2654a34ebe732e85fda354f6ee642f	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=d5cb62e1d9375d796af88afa3219e4a4
+_md5_=0a3f94f1d93dfb31ce281eba6dd8c79e
--- a/metadata/md5-cache/media-libs/exempi-2.2.0
+++ b/metadata/md5-cache/media-libs/exempi-2.2.0
@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/expat-2 virtual/libiconv sys-libs/zlib sys-devel/gettext !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Exempi is a port of the Adobe XMP SDK to work on UNIX
-EAPI=4
-HOMEPAGE=https://libopenraw.freedesktop.org/wiki/Exempi
-IUSE=examples static-libs
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd
-LICENSE=BSD
-RDEPEND=>=dev-libs/expat-2 virtual/libiconv sys-libs/zlib
-RESTRICT=test
-SLOT=2
-SRC_URI=https://libopenraw.freedesktop.org/download/exempi-2.2.0.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=5cd71ec1217b117161578f0f49ec7b0d
--- a/metadata/md5-cache/media-libs/mesa-11.2.2
+++ b/metadata/md5-cache/media-libs/mesa-11.2.2
--- a/metadata/md5-cache/media-libs/mesa-12.0.1
+++ b/metadata/md5-cache/media-libs/mesa-12.0.1
--- a/metadata/md5-cache/media-libs/mesa-12.0.2
+++ b/metadata/md5-cache/media-libs/mesa-12.0.2
--- a/metadata/md5-cache/media-libs/mesa-12.0.3
+++ b/metadata/md5-cache/media-libs/mesa-12.0.3
--- a/metadata/md5-cache/media-libs/mesa-9999
+++ b/metadata/md5-cache/media-libs/mesa-9999
--- a/metadata/md5-cache/media-radio/flrig-1.3.26
+++ b/metadata/md5-cache/media-radio/flrig-1.3.26
@ -10,4 +10,4 @@ RDEPEND=x11-libs/libX11 x11-libs/fltk:1 x11-misc/xdg-utils
 SLOT=0
 SRC_URI=mirror://sourceforge/fldigi/flrig-1.3.26.tar.gz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=128422dbbcba25bb217068be029e5790
+_md5_=ba22fa7a6347614bf02dd8b2f21722d1
--- a/metadata/md5-cache/media-video/ffmpeg-3.1.3
+++ b/metadata/md5-cache/media-video/ffmpeg-3.1.3
@ -12,4 +12,4 @@ RESTRICT=encode? ( faac? ( bindist ) ) gpl? ( openssl? ( bindist ) fdk? ( bindis
 SLOT=0/55.57.57
 SRC_URI=http://ffmpeg.org/releases/ffmpeg-3.1.3.tar.bz2
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=68991b0f6fa3a32a8f4b3de56c8fe4d8
+_md5_=f216e1d9bbcb169e9894f108163e1788
--- a/metadata/md5-cache/media-video/ffmpeg-9999
+++ b/metadata/md5-cache/media-video/ffmpeg-9999
--- a/metadata/md5-cache/net-analyzer/wireshark-2.0.4
+++ b/metadata/md5-cache/net-analyzer/wireshark-2.0.4
@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup unpack
-DEPEND=>=dev-libs/glib-2.14:2 netlink? ( dev-libs/libnl:3 ) adns? ( >=net-dns/c-ares-1.5 ) crypt? ( dev-libs/libgcrypt:0 ) caps? ( sys-libs/libcap ) geoip? ( dev-libs/geoip ) gtk3? ( x11-libs/gdk-pixbuf x11-libs/pango x11-misc/xdg-utils x11-libs/gtk+:3 ) kerberos? ( virtual/krb5 ) lua? ( >=dev-lang/lua-5.1:* ) pcap? ( net-libs/libpcap ) portaudio? ( media-libs/portaudio ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4[accessibility] x11-misc/xdg-utils ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) smi? ( net-libs/libsmi ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 ) dev-lang/perl !<virtual/perl-Pod-Simple-3.170 !<perl-core/Pod-Simple-3.170 doc? ( app-doc/doxygen app-text/asciidoc dev-libs/libxml2 dev-libs/libxslt doc-pdf? ( dev-java/fop ) www-client/lynx ) sys-devel/bison sys-devel/flex virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 filecaps? ( sys-libs/libcap )
-DESCRIPTION=A network protocol analyzer formerly known as ethereal
-EAPI=5
-HOMEPAGE=http://www.wireshark.org/
-IUSE=adns androiddump +caps crypt doc doc-pdf geoip +gtk3 ipv6 kerberos lua +netlink +pcap portaudio +qt4 qt5 selinux sbc smi tfshark cpu_flags_x86_sse4_2 ssl zlib +filecaps
-KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.14:2 netlink? ( dev-libs/libnl:3 ) adns? ( >=net-dns/c-ares-1.5 ) crypt? ( dev-libs/libgcrypt:0 ) caps? ( sys-libs/libcap ) geoip? ( dev-libs/geoip ) gtk3? ( x11-libs/gdk-pixbuf x11-libs/pango x11-misc/xdg-utils x11-libs/gtk+:3 ) kerberos? ( virtual/krb5 ) lua? ( >=dev-lang/lua-5.1:* ) pcap? ( net-libs/libpcap ) portaudio? ( media-libs/portaudio ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4[accessibility] x11-misc/xdg-utils ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) smi? ( net-libs/libsmi ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 ) gtk3? ( virtual/freedesktop-icon-theme ) qt4? ( virtual/freedesktop-icon-theme ) qt5? ( virtual/freedesktop-icon-theme ) selinux? ( sec-policy/selinux-wireshark )
-REQUIRED_USE=ssl? ( crypt ) ?? ( qt4 qt5 )
-SLOT=0/2.0.4
-SRC_URI=http://www.wireshark.org/download/src/all-versions/wireshark-2.0.4.tar.bz2
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	b83a2420b796f7c6eff682679d08fe25	fcaps	6a1091a98b1dde01cc26ab3252da1a9b	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	qmake-utils	0a242e7177789b0028b4045f336dd4db	qt4-r2	d6c113024bb3086a1facc65cd338930e	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	user	80aaa71614ced86f02ee1a513821dc87
-_md5_=63818e229e35fd25e361c0b48b8ae8ba
--- a/metadata/md5-cache/net-libs/czmq-3.0.2
+++ b/metadata/md5-cache/net-libs/czmq-3.0.2
@ -4,11 +4,11 @@ DESCRIPTION=High-level C Binding for ZeroMQ
 EAPI=5
 HOMEPAGE=http://czmq.zeromq.org
 IUSE=doc static-libs test
-KEYWORDS=amd64 arm ~hppa ~x86
+KEYWORDS=amd64 arm hppa ~x86
 LICENSE=LGPL-3
 RDEPEND=sys-apps/util-linux net-libs/zeromq
 RESTRICT=test
 SLOT=0
 SRC_URI=http://download.zeromq.org/czmq-3.0.2.tar.gz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	b83a2420b796f7c6eff682679d08fe25	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=f07027d8d546a6197c2ad59067d9bad0
+_md5_=15d3f2bcf9d1c8a5f9648f2ace70d734
--- a/metadata/md5-cache/net-libs/nodejs-4.6.0
+++ b/metadata/md5-cache/net-libs/nodejs-4.6.0
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test
+DEPEND=icu? ( >=dev-libs/icu-55:= ) npm? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) >=net-libs/http-parser-2.5.2:= >=dev-libs/libuv-1.8.0:= >=dev-libs/openssl-1.0.2g:0=[-bindist] sys-libs/zlib >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] test? ( net-misc/curl )
+DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
+EAPI=5
+HOMEPAGE=https://nodejs.org/
+IUSE=cpu_flags_x86_sse2 debug icu +npm snapshot +ssl test python_targets_python2_7
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos
+LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
+RDEPEND=icu? ( >=dev-libs/icu-55:= ) npm? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) >=net-libs/http-parser-2.5.2:= >=dev-libs/libuv-1.8.0:= >=dev-libs/openssl-1.0.2g:0=[-bindist] sys-libs/zlib
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=https://nodejs.org/dist/v4.6.0/node-v4.6.0.tar.xz
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multilib	165fc17c38d1b11dac2008280dab6e80	pax-utils	4c2654a34ebe732e85fda354f6ee642f	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
+_md5_=ff92b666fd5101cb46a773f2c8356257
--- a/metadata/md5-cache/net-libs/nodejs-6.7.0
+++ b/metadata/md5-cache/net-libs/nodejs-6.7.0
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test
+DEPEND=icu? ( >=dev-libs/icu-56:= ) npm? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) >=net-libs/http-parser-2.6.2:= >=dev-libs/libuv-1.9.0:= >=dev-libs/openssl-1.0.2g:0=[-bindist] sys-libs/zlib >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] test? ( net-misc/curl )
+DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
+EAPI=6
+HOMEPAGE=https://nodejs.org/
+IUSE=cpu_flags_x86_sse2 debug doc icu +npm +snapshot +ssl test python_targets_python2_7
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x64-macos
+LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
+RDEPEND=icu? ( >=dev-libs/icu-56:= ) npm? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) >=net-libs/http-parser-2.6.2:= >=dev-libs/libuv-1.9.0:= >=dev-libs/openssl-1.0.2g:0=[-bindist] sys-libs/zlib
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=https://nodejs.org/dist/v6.7.0/node-v6.7.0.tar.xz
+_eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multilib	165fc17c38d1b11dac2008280dab6e80	pax-utils	4c2654a34ebe732e85fda354f6ee642f	python-single-r1	2ebea8fbab356d63110245129a67a6dd	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
+_md5_=7b2c824dbb1f2961e58063e93f10f968
--- a/Show More
+++ b/Show More