Sync with portage [Sun Feb 5 12:08:59 MSK 2017].

app-crypt/aescrypt/aescrypt-3.0.6b.ebuild

@@ -1,10 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=4
+EAPI=6
 
-inherit eutils toolchain-funcs flag-o-matic
+inherit toolchain-funcs flag-o-matic
 
 DESCRIPTION="Advanced file encryption using AES"
 HOMEPAGE="http://www.aescrypt.com/"
@@ -18,10 +18,10 @@ IUSE="static"
 DEPEND=""
 RDEPEND="${DEPEND}"
 
-src_prepare() {
-	epatch "${FILESDIR}/${P}-build.patch"
-	epatch "${FILESDIR}/${P}-iconv.patch"
-}
+PATCHES=(
+	"${FILESDIR}/${P}-build.patch"
+	"${FILESDIR}/${P}-iconv.patch"
+)
 
 src_compile() {
 	if use static; then

app-crypt/aespipe/aespipe-2.4d.ebuild

@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 inherit flag-o-matic
 

app-crypt/asedriveiiie-serial/asedriveiiie-serial-3.5.ebuild

@@ -1,7 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+EAPI=6
+
 DESCRIPTION="ASEDriveIIIe Serial Card Reader"
 HOMEPAGE="http://www.athena-scs.com"
 SRC_URI="http://www.athena-scs.com/downloads/${P}.tar.bz2"
@@ -14,11 +16,9 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 src_install() {
-	local conf="/etc/reader.conf.d/${PN}.conf"
+	default
 
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc ChangeLog README
+	local conf="/etc/reader.conf.d/${PN}.conf"
 
 	dodir "$(dirname "${conf}")"
 	insinto "$(dirname "${conf}")"

app-crypt/libykneomgr/libykneomgr-0.1.8.ebuild

@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
-inherit autotools-utils udev
+inherit udev
 
 DESCRIPTION="YubiKey NEO CCID Manager C Library"
 HOMEPAGE="https://developers.yubico.com/libykneomgr/"
@@ -23,10 +23,7 @@ RDEPEND="${RDEPEND}
 	>=app-crypt/ccid-1.4.18[usb]"
 
 src_configure() {
-	local myeconfargs=(
-		--with-backend=pcsc
+	econf \
+		--with-backend=pcsc \
 		--disable-static
-	)
-
-	autotools-utils_src_configure
 }

app-crypt/onak/Manifest

@@ -1 +1,2 @@
 DIST onak-0.4.0.tar.gz 230996 SHA256 e402042d2cbcbe34cfac1d737a564054fea84ad5c00386ab0c877698c3076ecd SHA512 0cf8960652cda242fde2e834953581312431136fe380076bc3b76b42ef11ff1c83975d6d4fc8463466ce37b84c71c83fbbdfb08cd5eefb9928814b550c08ce67 WHIRLPOOL 7a56f17a856e297853e3872ac7b7f712c07e44d071d71f198785ddd5e61300b471e70b6829193ec0c01fb883f5668151f157f229d979df883ae9178cb3834177
+DIST onak-0.5.0.tar.xz 240764 SHA256 24cc12b41dec9f8a53baeeaf9ab6f9f82e7d6ea795c48c37421e8d7184a8b1fa SHA512 db38793acc82089089ac0b9fb6db9989b6bb8e94c35c14112d028d12f7bb7553b7409121378346625528c4916506d007bf40963f4a346483f51a23b670680a7d WHIRLPOOL 85cebf7807922d3c1d8c85cce23c960078971c8c74ac29ecfa9379b55fb1f8a9a8333f775935566aa2dfa27636a02d09700642e10d6605f204ab1c984ef47ccf

app-crypt/onak/onak-0.5.0.ebuild

@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="onak is an OpenPGP keyserver"
+HOMEPAGE="http://www.earth.li/projectpurple/progs/onak.html"
+SRC_URI="http://www.earth.li/projectpurple/files/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="berkdb postgres"
+
+DEPEND="berkdb? ( >=sys-libs/db-4 )
+	postgres? ( dev-db/postgresql[server] )"
+
+DOCS=(
+	apache2 README LICENSE onak.sql
+)
+
+# it tries to use all backends?
+RESTRICT="test"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local backend="fs"
+	use berkdb && backend="db4"
+	use postgres && backend="pg"
+	if use berkdb && use postgres; then
+		ewarn "berkdb and postgres requested, postgres was preferred"
+	fi
+	econf --localstatedir=/var --enable-backend="${backend}"
+}
+
+src_install() {
+	default
+	insinto /etc
+	doins onak.ini
+	keepdir /var/lib/onak
+	dodir /usr/lib/cgi-bin/pks
+	insinto /usr/lib/cgi-bin/pks
+	doins add gpgwww lookup
+}

app-crypt/openssl-tpm-engine/openssl-tpm-engine-0.4.2.ebuild

@@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 inherit autotools eutils
 
@@ -21,15 +21,23 @@ RDEPEND="
 	>=app-crypt/trousers-0.2.8"
 DEPEND="${RDEPEND}"
 
+DOCS=(
+	openssl.cnf.sample
+)
+
+PATCHES=(
+	"${FILESDIR}/${P}-build.patch"
+)
+
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
+	default
 	mv configure.in configure.ac || die
-	epatch "${FILESDIR}/${P}-build.patch"
 	eautoreconf
 }
 
 src_install() {
 	default
-	dodoc openssl.cnf.sample
+	prune_libtool_files --modules
 }

app-crypt/rainbowcrack/rainbowcrack-1.6.1.ebuild

@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 inherit eutils
 
 DESCRIPTION="Hash cracker that precomputes plaintext - ciphertext pairs in advance"
@@ -24,12 +24,18 @@ QA_PRESTRIPPED="${RAINBOW_DESTDIR}/.*"
 
 DEPEND="app-arch/unzip"
 
+DOCS=(
+	readme.txt
+)
+
 src_unpack() {
 	unpack ${A}
 	mv ${P}-linux* "${S}"
 }
 
 src_install() {
+	einstalldocs
+
 	local bin bins="rcrack rt2rtc rtc2rt rtgen rtsort"
 
 	exeinto "/${RAINBOW_DESTDIR}"
@@ -41,6 +47,4 @@ src_install() {
 
 	insinto "/${RAINBOW_DESTDIR}"
 	doins charset.txt
-
-	dodoc readme.txt
 }

app-crypt/tinyca/files/tinyca-2.0.7.3-compositefix.patch

@@ -1,4 +1,4 @@
---- tinyca2-0.7.2/./tinyca2.orig	2006-05-28 21:45:03.000000000 +1000
+--- tinyca2-0.7.2/tinyca2	2006-05-28 21:45:03.000000000 +1000
 +++ tinyca2-0.7.2/tinyca2	2006-05-28 21:46:38.000000000 +1000
 @@ -87,6 +87,9 @@
  

app-crypt/tinyca/files/tinyca-2.0.7.5-openssl-1.patch

@@ -1,4 +1,4 @@
---- a/lib/OpenSSL.pm.orig	2013-03-05 15:57:46.332286060 +0100
+--- a/lib/OpenSSL.pm	2013-03-05 15:57:46.332286060 +0100
 +++ b/lib/OpenSSL.pm	2013-03-05 15:57:53.408466038 +0100
 @@ -605,6 +605,8 @@
           # dirty fix (incompleted) --curly

app-crypt/tinyca/files/tinyca-2.0.7.5-perl-5.18.patch

@@ -1,4 +1,4 @@
---- tinyca2-0.7.5.orig/lib/GUI.pm	2006-07-25 16:12:00.000000000 -0400
+--- tinyca2-0.7.5/lib/GUI.pm	2006-07-25 16:12:00.000000000 -0400
 --- tinyca2-0.7.5/lib/GUI.pm	2006-07-25 16:12:00.000000000 -0400
 @@ -978,7 +978,7 @@
     $piter = $store->append($root);

app-crypt/tinyca/tinyca-2.0.7.5-r3.ebuild

@@ -1,14 +1,14 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 inherit eutils
 
 MY_P="${PN}${PV/./-}"
 DESCRIPTION="Simple Perl/Tk GUI to manage a small certification authority"
-HOMEPAGE="http://tinyca.sm-zone.net/"
+HOMEPAGE="https://opsec.eu/src/tinyca/"
 SRC_URI="http://tinyca.sm-zone.net/${MY_P}.tar.bz2"
 
 LICENSE="Artistic"
@@ -30,12 +30,16 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	>=sys-apps/sed-4"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-2.0.7.3-compositefix.patch"
+	"${FILESDIR}/${P}-openssl-1.patch"
+	"${FILESDIR}/${P}-perl-5.18.patch"
+)
+
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
-	epatch "${FILESDIR}/${PN}-2.0.7.3-compositefix.patch"
-	epatch "${FILESDIR}/${P}-openssl-1.patch"
-	epatch "${FILESDIR}/${P}-perl-5.18.patch"
+	default
 	sed -i -e 's:./lib:/usr/share/tinyca/lib:g' \
 		-e 's:./templates:/usr/share/tinyca/templates:g' \
 		-e 's:./locale:/usr/share/locale:g' "${S}/tinyca2" || die
@@ -51,6 +55,7 @@ locale_install() {
 }
 
 src_install() {
+	einstalldocs
 	newbin tinyca2 tinyca
 	insinto /usr/share/tinyca/lib
 	doins lib/*.pm

app-crypt/xca/files/xca-1.0.0-desktop.patch

@@ -1,5 +1,5 @@
---- misc/xca.desktop	2012-05-12 05:37:14.000000000 -0400
-+++ xca.desktop.new	2013-01-03 19:43:35.877856711 -0500
+--- a/misc/xca.desktop	2012-05-12 05:37:14.000000000 -0400
++++ b/misc/xca.desktop	2013-01-03 19:43:35.877856711 -0500
 @@ -7,5 +7,5 @@
  Icon=xca-32x32
  Terminal=false

app-crypt/xca/xca-1.3.2-r2.ebuild

@@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="5"
+EAPI="6"
 
 inherit eutils flag-o-matic toolchain-funcs autotools
 
@@ -25,9 +25,13 @@ RDEPEND="
 	qt4? ( dev-qt/qtgui:4 )"
 DEPEND="${RDEPEND}"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-1.0.0-desktop.patch"
+	"${FILESDIR}/${P}-build.patch"
+)
+
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.0.0-desktop.patch
-	epatch "${FILESDIR}"/${P}-build.patch
+	default
 	AT_M4DIR="m4" eautoreconf
 }
 
@@ -35,7 +39,6 @@ src_configure() {
 	# bug #595440
 	use qt5 && append-cxxflags -std=c++11
 	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
 		--with-qt-version=$(use qt5 && echo 5 || echo 4) \
 		$(use_enable doc) \
 		STRIP=true
@@ -49,6 +52,7 @@ src_compile() {
 src_install() {
 	# non standard destdir
 	emake install destdir="${ED}"
+	einstalldocs
 
 	insinto /etc/xca
 	doins misc/*.txt

app-eselect/eselect-pinentry/eselect-pinentry-0.7.ebuild

@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 DESCRIPTION="Manage /usr/bin/pinentry symlink"
 HOMEPAGE="https://www.gentoo.org/proj/en/eselect/"
@@ -15,9 +15,10 @@ IUSE=""
 
 RDEPEND=">=app-eselect/eselect-lib-bin-symlink-0.1.1"
 
-S=${FILESDIR}
+S="${FILESDIR}"
 
 src_install() {
+	default
 	insinto /usr/share/eselect/modules
 	newins pinentry.eselect-${PV} pinentry.eselect
 }

dev-java/protobuf-java/protobuf-java-3.0.0_beta3_p1.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/google/protobuf/archive/v${MY_PV}.tar.gz -> protobuf
 
 LICENSE="Apache-2.0"
 SLOT="0/10b3"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc64 ~sh ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sh ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="nano"
 
 # Protobuf is only a build-time dep, but depend on the exact same version

dev-java/protobuf-java/protobuf-java-3.0.2.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/google/protobuf/archive/v${MY_PV}.tar.gz -> protobuf
 
 LICENSE="Apache-2.0"
 SLOT="0/10"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc64 ~sh ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sh ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="nano"
 
 # Protobuf is only a build-time dep, but depends on the exact same version

dev-java/protobuf-java/protobuf-java-3.1.0.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/google/protobuf/archive/v${MY_PV}.tar.gz -> protobuf
 
 LICENSE="Apache-2.0"
 SLOT="0/11"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc64 ~sh ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sh ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="nano"
 
 # Protobuf is only a build-time dep, but depends on the exact same version

dev-lang/orc/Manifest

@@ -1,2 +1 @@
-DIST orc-0.4.25.tar.xz 467184 SHA256 c1b1d54a58f26d483f0b3881538984789fe5d5460ab8fab74a1cacbd3d1c53d1 SHA512 13f636e3ab86e725e15f885462db1944744b8389f263b7afa2279c0e68fb8e71344a646ecb8b7a7fce03e93ab78351a1b79d5eaef106ab8e1d808e82b514316a WHIRLPOOL 4d186f632a828856f73d8174aaea4ac60f4e9d8accbba65da50e8348f06748ea3961fab697f5c44d883711399f7b7af8a46aeecb8d594cc5f1225580c6091011
 DIST orc-0.4.26.tar.xz 465768 SHA256 7d52fa80ef84988359c3434e1eea302d077a08987abdde6905678ebcad4fa649 SHA512 c0b02d4f00b7cc45c5952a4db4f63629bbcbc4d338bbe69fd2743198f2b346bf437742a7a8e1d308f765caf1b43f7fab75add7ebf69897bc0e335a169eef7326 WHIRLPOOL 019891cc9272315666b9b68eb439002192d676794bb7b8b490353991b152a6deadb5171bf46b0e4894c2372b77935e2578b9a0221e6172a8ccfa6f7966983c8c

dev-lang/orc/orc-0.4.25.ebuild

@@ -1,55 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-inherit autotools-multilib flag-o-matic gnome2-utils pax-utils
-
-DESCRIPTION="The Oil Runtime Compiler, a just-in-time compiler for array operations"
-HOMEPAGE="https://gstreamer.freedesktop.org/"
-SRC_URI="https://gstreamer.freedesktop.org/src/${PN}/${P}.tar.xz"
-
-LICENSE="BSD BSD-2"
-SLOT="0"
-KEYWORDS="amd64 arm hppa ppc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="examples pax_kernel static-libs"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	>=dev-util/gtk-doc-am-1.12
-"
-
-src_prepare() {
-	if ! use examples; then
-		sed -e '/SUBDIRS/ s:examples::' \
-			-i Makefile.am Makefile.in || die
-	fi
-
-	gnome2_environment_reset #556160
-}
-
-src_configure() {
-	# any optimisation on PPC/Darwin yields in a complaint from the assembler
-	# Parameter error: r0 not allowed for parameter %lu (code as 0 not r0)
-	# the same for Intel/Darwin, although the error message there is different
-	# but along the same lines
-	[[ ${CHOST} == *-darwin* ]] && filter-flags -O*
-	autotools-multilib_src_configure
-}
-
-src_install() {
-	autotools-multilib_src_install
-	if use pax_kernel; then
-		pax-mark m "${ED}"usr/bin/orc-bugreport
-		pax-mark m "${ED}"usr/bin/orcc
-		pax-mark m "${ED}"usr/$(get_libdir)/liborc*.so*
-	fi
-}
-
-pkg_postinst() {
-	if use pax_kernel; then
-		ewarn "Please run \"revdep-pax\" after installation".
-		ewarn "It's provided by sys-apps/elfix."
-	fi
-}

dev-lang/orc/orc-0.4.26.ebuild

@@ -1,55 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-inherit autotools-multilib flag-o-matic gnome2-utils pax-utils
-
-DESCRIPTION="The Oil Runtime Compiler, a just-in-time compiler for array operations"
-HOMEPAGE="https://gstreamer.freedesktop.org/"
-SRC_URI="https://gstreamer.freedesktop.org/src/${PN}/${P}.tar.xz"
-
-LICENSE="BSD BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="examples pax_kernel static-libs"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	>=dev-util/gtk-doc-am-1.12
-"
-
-src_prepare() {
-	if ! use examples; then
-		sed -e '/SUBDIRS/ s:examples::' \
-			-i Makefile.am Makefile.in || die
-	fi
-
-	gnome2_environment_reset #556160
-}
-
-src_configure() {
-	# any optimisation on PPC/Darwin yields in a complaint from the assembler
-	# Parameter error: r0 not allowed for parameter %lu (code as 0 not r0)
-	# the same for Intel/Darwin, although the error message there is different
-	# but along the same lines
-	[[ ${CHOST} == *-darwin* ]] && filter-flags -O*
-	autotools-multilib_src_configure
-}
-
-src_install() {
-	autotools-multilib_src_install
-	if use pax_kernel; then
-		pax-mark m "${ED}"usr/bin/orc-bugreport
-		pax-mark m "${ED}"usr/bin/orcc
-		pax-mark m "${ED}"usr/$(get_libdir)/liborc*.so*
-	fi
-}
-
-pkg_postinst() {
-	if use pax_kernel; then
-		ewarn "Please run \"revdep-pax\" after installation".
-		ewarn "It's provided by sys-apps/elfix."
-	fi
-}

dev-libs/softhsm/softhsm-2.2.0-r2.ebuild

@@ -43,8 +43,8 @@ src_configure() {
 		--disable-static \
 		--with-crypto-backend=openssl \
 		--disable-p11-kit \
-		$(use bindist && echo --disable-ecc || echo --enable-ecc) \
-		$(use libressl && echo --disable-gost || echo --enable-gost) \
+		$(use_enable !bindist ecc) \
+		$(use_enable !libressl ghost) \
 		$(use_with migration-tool migrate)
 }
 

dev-perl/Crypt-OpenSSL-DSA/Crypt-OpenSSL-DSA-0.190.0.ebuild

@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION='Digital Signature Algorithm using OpenSSL'
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~hppa ~x86"
 IUSE="libressl"
 
 RDEPEND="

dev-perl/Net-DNS-SEC/Net-DNS-SEC-1.20.0.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION='DNSSEC extensions to Net::DNS'
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~x86"
 IUSE="test"
 
 RDEPEND="

dev-perl/pcsc-perl/pcsc-perl-1.4.14.ebuild

@@ -1,10 +1,10 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
-inherit perl-module eutils multilib
+inherit perl-module
 
 DESCRIPTION="A Perl Module for PC/SC SmartCard access"
 HOMEPAGE="http://ludovic.rousseau.free.fr/softwares/pcsc-perl/"
@@ -16,7 +16,3 @@ KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
 IUSE=""
 
 DEPEND=">=sys-apps/pcsc-lite-1.6.0"
-
-pkg_setup() {
-	myconf="-I/usr/include/ -l/usr/$(get_libdir)"
-}

dev-python/backports-shutil_which/Manifest

@@ -0,0 +1 @@
+DIST backports.shutil_which-3.5.1.tar.gz 3020 SHA256 dd439a7b02433e47968c25a45a76704201c4ef2167deb49830281c379b1a4a9b SHA512 066096f6cde0d245f2a8ff27b8e99bcec7088a2c9667c6b3dc73dd8866ea98acfb32c63222e8349eb906460b8ade864b18cf88a627070e20e28d5c00aded3ae4 WHIRLPOOL d5d57ecc6a5d37027079576d6dd1fe405eaba60e07fb7ba83852f23379de398ce8e5fc4c458e4a63860cae8c1e63b19c56fab4817efe7cdee2e256bffe0084ed

dev-python/backports-shutil_which/backports-shutil_which-3.5.1.ebuild

@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+MY_PN="backports.shutil_which"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Backport of shutil.which from Python 3.3"
+HOMEPAGE="https://pypi.python.org/pypi/backports.shutil_which/ https://github.com/minrk/backports.shutil_which"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/backports[${PYTHON_USEDEP}]"
+
+S=${WORKDIR}/${MY_P}
+
+python_install() {
+	distutils-r1_python_install
+
+	# main namespace provided by dev-python/backports
+	rm "${D}$(python_get_sitedir)"/backports/__init__.py* || die
+}

dev-python/backports-shutil_which/metadata.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">backports.shutil_which</remote-id>
+		<remote-id type="github">minrk/backports.shutil_which</remote-id>
+	</upstream>
+</pkgmetadata>

dev-python/nbdime/Manifest

@@ -1 +1,2 @@
 DIST nbdime-0.1.0.tar.gz 3849944 SHA256 5af53ccf5b265546e61fbc096c4dd8122855b2aa02f8b60a99eeee01a8e33043 SHA512 e110e2e3e8b9bfbaafd26e6558ec863eb0a23f3b7a67482e497c4883fa2151ae058582b975aca90392bd2314f5e32ce3e7316db9c2c37e44c336a9fcf88176c8 WHIRLPOOL 074060d867b259b461514e84b21c0f7eb20ff2f787055e03971fd18d0aa1ba56596b15017354c5becd3f1022b5557ec740d4815d4f820af8b54349273ee8b9a4
+DIST nbdime-0.1.2.tar.gz 3864624 SHA256 4adb8ff052a7c778fb5f00872172a3790504de392eb7f23b6ae96b8a8165a695 SHA512 9f704645ef1e64b0da260841769068db6f6aba37f30b3c6506a1876af1276acb452ed78f66b9e6d7029f06ed9fabf01a1484b4b86055f27a451d623a7eda90cf WHIRLPOOL 570891b1f9067abe88009f7160f509f8cba6345742df3d0549a486b8669f84c097487d25855f76ddea3ee8d786131145467ea20bedf3d54bca30a137977b7978

dev-python/nbdime/nbdime-0.1.2.ebuild

@@ -0,0 +1,55 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Diff and merge of Jupyter Notebooks"
+HOMEPAGE="http://jupyter.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+KEYWORDS="~amd64"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="test webtools"
+
+RDEPEND="
+	dev-python/nbformat[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	www-servers/tornado[${PYTHON_USEDEP}]
+	webtools? ( net-libs/nodejs[npm] )
+	"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-cov[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+	)
+	"
+# The package recommonmark is required to build the docs, not in portage yet.
+# Furthermore, backports.shutil_which is required for python2_7.
+
+python_configure_all() {
+	if ! use webtools; then
+		mydistutilsargs=( --skip-npm )
+	fi
+}
+
+python_test() {
+	# user.email and user.name are not configured in the sandbox.
+	git config --global user.email "you@example.com" || die
+	git config --global user.name "Your Name" || die
+
+	distutils_install_for_testing
+
+	py.test -l || die
+}

dev-python/notebook/Manifest

@@ -2,3 +2,4 @@ DIST notebook-4.0.6.tar.gz 6705277 SHA256 f62e7a6afbc00bab3615b927595d27b1874cff
 DIST notebook-4.1.0.tar.gz 9170981 SHA256 b597437ba33538221008e21fea71cd01eda9da1515ca3963d7c74e44f4b03d90 SHA512 745e412a737835956dc4238f70dbaf9c519fea55988941174febdc3ad24962031c3c66cb4ac355a9a639f9a383905e863e8eb0a3c6da62bf72026282154874cb WHIRLPOOL a34501e8e0be300905628e0f0df6914e8491a00924150ff0f5f32d1b7ad99046b84958dc267a229797fb13c98085f7556496a1a8e5fb68a1db503b44cad2b380
 DIST notebook-4.2.3.tar.gz 10092423 SHA256 39a9603d3fe88b60de2903680c965cf643acf2c16fb2c6bac1d905e1042b5851 SHA512 1b54e2a16fdb79b9344c0f73bd48fe438b18c529707b15816a3ab20353b2e320067082d51829c670117d77830a21c5a64a15d37d1970fd30aae31272d9650d97 WHIRLPOOL 9cbcfc80dd818c77f1db5226b729e576f7428184001747eda8780c70b3cfb6b9472b8760073e2891ee40bc90e0398e88250b02c8c2eb6b7c2517fa6eecf2ceba
 DIST notebook-4.3.0.tar.gz 10271381 SHA256 c0d9beb94d7dc4958ec6cc76966c9b63f89092a03823365ae9e2930d38faa7da SHA512 dfbaf022b988b1fe3102dd094243b6ebc8fe9910299ed5b12c0292ff1c1b6ee1b20df0578c4fea47a1f9dfb031a7b329f5ea2684ec6019b49568536c7fa5a532 WHIRLPOOL 099b4354a8444091a880770f21861f1407fdd368253a9418e7833025897a65516d00efac45af17248446739be8661dbd4842169963a38dd3d446431e95846855
+DIST notebook-4.3.2.tar.gz 10375345 SHA256 fc77edf4ec295542172aa66a3e9d527e75038fcaadd3ed20afbf8596e5629aa9 SHA512 8ff9a4852aafbc2761e82cd1cbacfc85dade97ec58386df55eea1e97f513b3d608106a2cc43305968fd990974daf6c8dac8aab4ab2184c56976289e646a62b7b WHIRLPOOL 4921242a8cfe316e835b88879cbc9cd41abff39daaf6f8e5d373609f3cd64f286052041bcc9e496b5a570dc9126892a1163dfef6df1b037f6ed92f101d8c74d5

dev-python/notebook/notebook-4.3.2.ebuild

@@ -0,0 +1,92 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Jupyter Interactive Notebook"
+HOMEPAGE="http://jupyter.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+RDEPEND="
+	>=dev-libs/mathjax-2.4
+	dev-python/jinja[${PYTHON_USEDEP}]
+	>=dev-python/terminado-0.3.3[${PYTHON_USEDEP}]
+	>=www-servers/tornado-4.0[${PYTHON_USEDEP}]
+	dev-python/ipython_genutils[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-4.2.1[${PYTHON_USEDEP}]
+	dev-python/jupyter_core[${PYTHON_USEDEP}]
+	dev-python/jupyter_client[${PYTHON_USEDEP}]
+	dev-python/nbformat[${PYTHON_USEDEP}]
+	>=dev-python/nbconvert-4.2.0[${PYTHON_USEDEP}]
+	dev-python/ipykernel[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' 'python2*')
+		>=dev-python/nose-0.10.1[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+	)
+	doc? (
+		app-text/pandoc
+		>=dev-python/ipython-4.0.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1[${PYTHON_USEDEP}]
+	)
+	"
+
+PATCHES=( "${FILESDIR}/${PN}"-4.2.0-setupbase.py.patch )
+
+python_prepare_all() {
+	sed \
+		-e "/import setup/s:$:\nimport setuptools:g" \
+		-i setup.py || die
+
+	# disable bundled mathjax
+	sed -i 's/^.*MathJax.*$//' bower.json || die
+
+	# Prevent un-needed download during build
+	if use doc; then
+		sed \
+			-e "/^    'sphinx.ext.intersphinx',/d" \
+			-i docs/source/conf.py || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		emake -C docs html
+		HTML_DOCS=( docs/build/html/. )
+	fi
+}
+
+python_test() {
+	nosetests \
+		--verbosity=3 \
+		notebook || die
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	ln -sf \
+		"${EPREFIX}/usr/share/mathjax" \
+		"${D}$(python_get_sitedir)/notebook/static/components/MathJax" || die
+}
+
+pkg_preinst() {
+	# remove old mathjax folder if present
+	rm -rf "${EROOT%/}"/usr/lib*/python*/site-packages/notebook/static/components/MathJax || die
+}

dev-python/pickleshare/Manifest

@@ -1 +1,2 @@
 DIST pickleshare-0.7.3.tar.gz 5930 SHA256 b9710d01f777b1bf3b69c8f889b1d05a5145668f79e980cbd0f849e059edd274 SHA512 c49f41b2778783c0de69838db0c916bbfe88eb651134959bf43a18233a4f1747599e51bdbe4b0cc7f7b13c92fc202c2159a0cdd2331b099034afbfe0df61c19d WHIRLPOOL 53b540170c4a72c70743ae9c472a57fda67646a44c5d3f256a72f95b7f97ebbe1f08dcbb5f1c5de0b9ddfe051bdbd1193abd202aae967ec832c635bd33e4d714
+DIST pickleshare-0.7.4.tar.gz 5981 SHA256 84a9257227dfdd6fe1b4be1319096c20eb85ff1e82c7932f36efccfe1b09737b SHA512 6cd4b70f63378c4f668f3428262aeca66a38ec86ef9069e3fbc5e7b0b8d7a06341e99b387f9cf29502decbb47c188b7b2183fe7d249e68914fead7e6628d7154 WHIRLPOOL 97321c95b8838bb7ed8d4a28f0b8d06e6eb5043d3975f6657eb517c3d9dca04eaebf2141949b9bae897a27dd79d608e9602e9646a2e6543a4d6ccd4f533ebe15

dev-python/pickleshare/pickleshare-0.7.4.ebuild

@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="A small 'shelve' like datastore with concurrency support"
+HOMEPAGE="https://github.com/pickleshare/pickleshare"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	$(python_gen_cond_dep 'dev-python/pathlib[${PYTHON_USEDEP}]' 'python2*')
+	>=dev-python/path-py-6.2[${PYTHON_USEDEP}]"
+
+DEPEND="${RDEPEND}
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+RESTRICT="test"
+
+python_test() {
+	py.test || die
+}

dev-ruby/public_suffix/public_suffix-2.0.5.ebuild

@@ -14,7 +14,7 @@ inherit ruby-fakegem
 DESCRIPTION="Parse and decompose a domain name into top level domain, domain and subdomains"
 HOMEPAGE="https://simonecarletti.com/code/publicsuffix-ruby/"
 
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 LICENSE="MIT"
 SLOT="2"
 IUSE=""

dev-scheme/guile-json/Manifest

@@ -0,0 +1 @@
+DIST guile-json-0.6.0.tar.gz 99122 SHA256 ec51c039ffce91f61df782f829db3c616f645cba74ff365d493cb2b7e879b2e2 SHA512 90ab2a428669b5c2163e9b6b13e6f7fd7452e95d996f3cea44c3fd7bbf35e2d3759416e63a74b2193ba161f8022e845c0f058c3d20e89c18116660427a503d2e WHIRLPOOL f79da6d4f6372703879c4f29e15172ad1518a3a524939d49c9a5c18ed2311e12149ba88b3d9ff9162b7cc03416a141349bc6837545928fa3b803313c7ddb9215

dev-scheme/guile-json/guile-json-0.6.0.ebuild

@@ -0,0 +1,17 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DESCRIPTION="JSON module for Guile"
+HOMEPAGE="http://savannah.nongnu.org/projects/guile-json/"
+SRC_URI="http://download.savannah.gnu.org/releases/guile-json/${P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-scheme/guile"
+DEPEND="${RDEPEND}"

dev-scheme/guile-json/metadata.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
-	<email>prefix@gentoo.org</email>
-	<name>Gentoo Prefix</name>
+	<email>scheme@gentoo.org</email>
+	<name>Gentoo Scheme Project</name>
 </maintainer>
 </pkgmetadata>

dev-tcltk/expect/expect-5.45.ebuild

@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~m68k-mint ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~m68k-mint ~x86-solaris"
 IUSE="debug doc threads"
 
 # We need dejagnu for src_test, but dejagnu needs expect

dev-vcs/git-merge-changelog/Manifest

@@ -1 +1,2 @@
 DIST git-merge-changelog-20140223.tar.xz 298332 SHA256 75a584cee054cafcb1ab7b71dc3beee33b39ea30b50dace48f044ee788560482 SHA512 ea5fcb0a0839e37976e333dc773d0bca43a1fce4821af08c5baba8e5783e129f8b4de4efd4b1b3399a7c1d3796e4094916843ac2d360d81396d67f571e020638 WHIRLPOOL 41182891e268e0ade060cac261d230fda2534fa53aebb40ea2b44e62cef1d5bef69ba9d7a7f6839c4b24135b1012d29f43886b9729fdd801173c2a8c240b3809
+DIST git-merge-changelog-20170131.tar.xz 315000 SHA256 7d72cc6f66cae1b2ff9db36716af16a2ea34987d503ed12315cfceb61489ba71 SHA512 4d7a5d9edf7bf52fcdd0934e842297364fc0ae0972b309d7221059856e0c87abd437edc1451a61ee4a6924f77d95c1c743b3a6a31b3bc039e2278fc38039c786 WHIRLPOOL 58eaa2a965fa2f6c07321d0dbf1308644cbe96ad4fa69d3839fdea6fcdf1bf34003c8a16303be3c5ca944110bd3accb0d53349ce98596ba54197274a7e2678d5

dev-vcs/git-merge-changelog/git-merge-changelog-20170131.ebuild

@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# snapshot extracted from git://git.savannah.gnu.org/gnulib.git using
+# ./gnulib-tool --create-testdir --without-tests --dir=${PN} ${PN};
+# cd ${PN}; ./configure; make maintainer-clean
+
+EAPI=6
+
+DESCRIPTION="Git merge driver for GNU style ChangeLog files"
+HOMEPAGE="https://www.gnu.org/software/gnulib/"
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}/${PN}"
+
+src_install() {
+	emake DESTDIR="${D}" install
+	sed -n "/README/{h;:x;n;/^#/!{H;bx};g;s/\n*$//;\
+		s:/usr/local:${EPREFIX}/usr:g;p;q}" gllib/git-merge-changelog.c \
+		| newdoc - README; assert
+}

eclass/mozconfig-v6.45.eclass

@@ -120,7 +120,7 @@ RDEPEND=">=app-text/hunspell-1.2:=
 	system-cairo? ( >=x11-libs/cairo-1.12[X,xcb] >=x11-libs/pixman-0.19.2 )
 	system-icu? ( >=dev-libs/icu-51.1:= )
 	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
-	system-libevent? ( =dev-libs/libevent-2.0*:0= )
+	system-libevent? ( >=dev-libs/libevent-2.0:0= )
 	system-sqlite? ( >=dev-db/sqlite-3.9.1:3[secure-delete,debug=] )
 	system-harfbuzz? ( >=media-libs/harfbuzz-1.1.3:0=[graphite,icu] >=media-gfx/graphite2-1.3.8 )
 "

eclass/mozconfig-v6.51.eclass

@@ -120,7 +120,7 @@ RDEPEND=">=app-text/hunspell-1.2:=
 	system-cairo? ( >=x11-libs/cairo-1.12[X,xcb] >=x11-libs/pixman-0.19.2 )
 	system-icu? ( >=dev-libs/icu-56.1:= )
 	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
-	system-libevent? ( =dev-libs/libevent-2.0*:0= )
+	system-libevent? ( >=dev-libs/libevent-2.0:0= )
 	system-sqlite? ( >=dev-db/sqlite-3.14.1:3[secure-delete,debug=] )
 	system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] )
 	system-harfbuzz? ( >=media-libs/harfbuzz-1.2.6:0=[graphite,icu] >=media-gfx/graphite2-1.3.8 )

games-util/pogo-manager-bin/Manifest

@@ -1,3 +1 @@
-DIST pogo-manager-bin-0.1.4.zip 7453967 SHA256 1ae061bade7bf3e9e66df028027f408895a6a07a52b80efcb7cb709984163633 SHA512 0fe21b4146d125d281f1aacd405dbc0370d6c5c043e82d4c964ca7df14ac0130459bf4d943268b6efd58a99ef05ca0d22dbf392ecb3853ab32e87fdb074209fa WHIRLPOOL 8c6cb33b788a98fd27a1d66a6292d1f87d0e2bd8678454a7e87d28b465d93e472c07548a045ef75ce9b067adcc2cbd956c5a60ffadfd6b68c7fe0e198775da80
-DIST pogo-manager-bin-0.1.5.zip 7671901 SHA256 3eb0f56e6d749b4df1679a1e8417177fe4d4c2d91fd35e2bfc0a1cfe1dd1151b SHA512 bf4544316b3e859714d61614fdf4d0d67f4707f32c12472122bfd6d3bdde98a0c17b759f55bedbc607ccf69f0098bc93d0c0decaab884af0e1b551352086773c WHIRLPOOL 155f048e0594b9bdb4c339b39f9db4a2c1c6b6aec175a04f49da40a515ec66d2e0603298b7d270e798b13c55931fe02bcdb6f4620184809085a2091f63976987
 DIST pogo-manager-bin-0.1.6.zip 7703380 SHA256 57c019ba56b038c4ee87adcd60d80611b1633a39c5dc15de3c4f7d4bbee63ea9 SHA512 d09e5f905fad659b5f380c25e8ccb7f9423430a1210ebb15e233f7f9436dff0307897ce372fdedf1b44ff48bd682b1f991a5fa3ac28a98af18d2a2bec72b08b0 WHIRLPOOL 94e7ca564f833e4cb23c1542fa2fd6100cfed9d8cbab53b53622db4d8121bca5aacef9dc86f2bfbba11407d345d1a368492e28e6b3aeb66554feebe783205d36

games-util/pogo-manager-bin/pogo-manager-bin-0.1.4.ebuild

@@ -1,35 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-MY_PN="${PN/-bin}"
-
-DESCRIPTION="Pokemon Go manager"
-HOMEPAGE="https://github.com/Wolfsblvt/BlossomsPokemonGoManager"
-SRC_URI="https://github.com/Wolfsblvt/BlossomsPokemonGoManager/releases/download/v${PV}/BPGM_v${PV}.zip -> ${P}.zip"
-
-LICENSE="CC-BY-NC-SA-4.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="|| ( dev-java/oracle-jdk-bin:1.8[javafx] dev-java/oracle-jre-bin:1.8[javafx] )"
-DEPEND="app-arch/unzip"
-
-S="${WORKDIR}/BPGM_v${PV}"
-
-src_install()
-{
-	insinto /opt/${MY_PN}
-	newins BlossomsPogoManager.jar ${MY_PN}.jar
-
-	dobin "${FILESDIR}/pogo-manager"
-}
-
-pkg_postinst()
-{
-	ewarn "Use of this tool is not sanctioned by Niantic and could get you banned."
-	ewarn "You have been warned!"
-}

games-util/pogo-manager-bin/pogo-manager-bin-0.1.5.ebuild

@@ -1,35 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-MY_PN="${PN/-bin}"
-
-DESCRIPTION="Pokemon Go manager"
-HOMEPAGE="https://github.com/Wolfsblvt/BlossomsPokemonGoManager"
-SRC_URI="https://github.com/Wolfsblvt/BlossomsPokemonGoManager/releases/download/v${PV}/BPGM_v${PV}.zip -> ${P}.zip"
-
-LICENSE="CC-BY-NC-SA-4.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="|| ( dev-java/oracle-jdk-bin:1.8[javafx] dev-java/oracle-jre-bin:1.8[javafx] )"
-DEPEND="app-arch/unzip"
-
-S="${WORKDIR}/BPGM_v${PV}"
-
-src_install()
-{
-	insinto /opt/${MY_PN}
-	newins BlossomsPogoManager.jar ${MY_PN}.jar
-
-	dobin "${FILESDIR}/pogo-manager"
-}
-
-pkg_postinst()
-{
-	ewarn "Use of this tool is not sanctioned by Niantic and could get you banned."
-	ewarn "You have been warned!"
-}

games-util/pogo-manager-bin/pogo-manager-bin-0.1.6.ebuild

@@ -12,7 +12,7 @@ SRC_URI="https://github.com/Wolfsblvt/BlossomsPokemonGoManager/releases/download
 
 LICENSE="CC-BY-NC-SA-4.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND="|| ( dev-java/oracle-jdk-bin:1.8[javafx] dev-java/oracle-jre-bin:1.8[javafx] )"

gnome-base/gnome-control-center/gnome-control-center-3.20.2-r1.ebuild

@@ -118,9 +118,11 @@ DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
 
 	gnome-base/gnome-common
+	sys-devel/autoconf-archive
 "
 # Needed for autoreconf
 #	gnome-base/gnome-common
+#	sys-devel/autoconf-archive
 
 src_prepare() {
 	# Make some panels and dependencies optional; requires eautoreconf

mail-client/thunderbird/Manifest

@@ -1,6 +1,6 @@
 DIST enigmail-1.9.1.tar.gz 1736876 SHA256 0393119725fa5931d9888a2a1c9796d440ee7975ca3d005eb63142768b10f993 SHA512 5417d7744ff5b8299d9799059f62013e546fb74206782169e5ce6baa0950d96d1c8996c99ec902ca73b241fd1268966e0a7ad30c032a1706a0efbf06fefc311c WHIRLPOOL 80cff68461edc743851de5a83cd04105f6689eb1289f46b72334a96b091dc430399a91b2ab004a39bd7cb04433ab0471dd07b44d39fc2eb3869487b07841fc5a
 DIST firefox-45.0-patches-07.tar.xz 21016 SHA256 76a70ebb3f9c0515c0632170dfeedf0bfb60f248bee579514940148bb3e2b1c5 SHA512 304d6ed4b4c9ac58f3762263207167a9a32532fd48f17d9cc86f5106f7ec98273f402e3779b810b455ceea77d84313ffc8f236fa6fdc6cd5ef21e8159beec552 WHIRLPOOL a50d54d1e3b5c0fb0e8b32c8d69cdeb99a8fbfa90ac51dfa01163ab0228499b08d3ef37b27391d0d5179d80e937447029c2f976f014bf97d0da3e4bc1b58eaf7
-DIST firefox-45.0-patches-10.tar.xz 22416 SHA256 4e765f9c8047aca453809c66a9256165c308b84e5a61ef48a26fa8e7d6593cca SHA512 658a24da434923299208014d5562ec35eaf4ff3a71ccd707541672a3d62ebee1b03a7fccdad52e855227d43a61e353f89e76488b325ea06fedba81eb53fbded0 WHIRLPOOL d51243c5c148fe1415c8bd5203639de22abaadd3d2c121f2793d89a4eab4c353592f0e36a0895a3cfb960880fad5c0a3580e341303c9891f9ef8bc2e8f4d79c1
+DIST firefox-45.0-patches-11.tar.xz 22864 SHA256 4d599cd6c0c0635b23a918e5219c6e37fe0322a4f94484dd8369a599ea3e6532 SHA512 61fc961b5aa015e42907de273fdbd87fd600d1733966fd6d65dccc4de554ee12c82bd314b2e38865d38ccd2fb453c161074253cfb2f49795e2d46a8f206952d8 WHIRLPOOL f5beb44eecb9002eb7f28c172f7a8e3559e85553ecd4fe79733f6b099119faef8552d744db961dbcd5bcc46e83b9070edea9d7de2ece1e717fd7c00489f2f30c
 DIST gdata-provider-2.6-r1.tar.xz 83836 SHA256 e181d5fe69e66f34719295790301e0d265c855be5f30df516c52dd3708d82158 SHA512 e5fcf60c221590d1d904ce8c6a74da7208b118c2872a26267f4ee6d3e68eea466d44b979b7259a012a21e48eb5b470d52cc9e58584226fe04ce88ff698da495b WHIRLPOOL 0e85fbb321edec0397b42808fd6320e245de35ddd1cf772545c432dbf26d8c28b042ba2c61bbde2abdbf4d5cca076436e6d678d6d636d3bcc562470d485df6c1
 DIST lightning-4.7.6.tar.xz 1933176 SHA256 0494a00f07f8c322432900dfe7e5579972d8df617ca1da1917b100cdafad6646 SHA512 3e615bd9148e10c9418f4e67bb1cdf0b43042d6f58a6c0f288511093023c1860e6c340045027b83b8803a47512da6e1800cf4d04ae25c05fb7920af3fc3627d6 WHIRLPOOL e531ec83fc2db86f00a34a400647d3963005c4b2de99c96b040d00e850397596dc23cb3d060a33bdfbf0c911aa1a1c7091477f94baaad1326c9defc13cc5b013
 DIST lightning-4.7.7.tar.xz 1933692 SHA256 1dd931007ae8ff09601090f7123c793162ff016e0ff494c99d8145e0cce80e0d SHA512 c2c5d4c48a16f8f4286b4a52ba9487e1ae4e9c500708eefdcadb49416e6e687e1f1aa58149839d3e739cb57654c211239f4206a6231c3146e6775ebdf7dd6969 WHIRLPOOL 848ad9a5b2c250f42eca45ca3c019595bbc4ddef953d98f7fab857b0b77170c283dac737943b4dc7ed6e2845bf3f6f19f4ba8c0462b3707e6819f85be71c8798

mail-client/thunderbird/thunderbird-45.7.0.ebuild

@@ -22,7 +22,7 @@ EMVER="1.9.1"
 
 # Patches
 PATCH="thunderbird-38.0-patches-0.1"
-PATCHFF="firefox-45.0-patches-10"
+PATCHFF="firefox-45.0-patches-11"
 
 MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases"
 

media-libs/exiftool/Manifest

@@ -1,3 +1,4 @@
 DIST Image-ExifTool-10.36.tar.gz 4214374 SHA256 2019427b6565e2cff3c1301ab3281a40e602e70eff931448a1601b96ef4a67f3 SHA512 e6075755cd7510166995100459f80fb90d356c7a0d1073d414324c43386fa2487a28588e8035dbdb9815dc0b6df7044643916f85bfd68d659fb30f8350242685 WHIRLPOOL c19fb77f3275c1e9158ab00024352bb914e84bfed7fd9736a8664056000ddf5feee499293fcb34e86f1cc534e54460c713180c05c0027aaa5100782e17bbabc4
 DIST Image-ExifTool-10.38.tar.gz 4219285 SHA256 b94a406f63cff2c0cccc75037076d0f54775c5adfc620ceae7e7523d85c9fc7b SHA512 e8ca1de6807d4ab71bebc8433cc24a77ef06ff81e93835f9c1bb69a7d4c482a4886f07b3f362214e55a817545f2e17efe5fb62020c8951ffc4de7f5c36648c96 WHIRLPOOL 596f29e85dfb9cd126fffc33893941309ce6515ec980ee4f5851eb1dda6ab0156fa4b0767efa50254ef1ffe7ca930ce1de58c5dffc72048d2fc6ea48bf36ea51
 DIST Image-ExifTool-10.40.tar.gz 4220341 SHA256 9e3619e2f9c838b37f67ab55fd541b5472b328d5f464468442367292666a05dc SHA512 c4a091f2d682c1bafd6b41b14c143aeeb7af9c03482f2699435973a417279969fa43a963af9c6283e9fdcacf0f98145c9a46c664b08f93021dd73c9a9eed1a2e WHIRLPOOL b14e64578d710f920ebd4cf65abd4e49570ec709565ff9196f17988d10c62ce5170e93125a42a769b24f63454c9bb98ccfeff152107af402c71a6717412f9705
+DIST Image-ExifTool-10.41.tar.gz 4227582 SHA256 78de898d76343cab4dcba94ef1431871daa7123c7199d4fecab58ac693d83307 SHA512 aeff5939a3b01c9fed4c520733edcd4bd755244a102739914ba76f1275d51966d409d1838a3f119ce5a16d8726a40bd952f26a5fd22e125855eee986f5799fd4 WHIRLPOOL e50f07bbf5cee03f14ee64e82fcbe8219ccbcf5c08e98593579cc4231342c51bbdcfd482abd2e28fc35c4df6e9435538f47e5dbe39a55920cc427a5882d863e8

media-libs/exiftool/exiftool-10.41.ebuild

@@ -0,0 +1,23 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_NAME=Image-ExifTool
+inherit perl-module
+
+DESCRIPTION="Read and write meta information in image, audio and video files"
+HOMEPAGE="http://www.sno.phy.queensu.ca/~phil/exiftool/ ${HOMEPAGE}"
+SRC_URI="http://www.sno.phy.queensu.ca/~phil/exiftool/${DIST_P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x64-macos"
+IUSE="doc"
+
+SRC_TEST="do"
+
+src_install() {
+	perl-module_src_install
+	use doc && dodoc -r html/
+}

media-libs/libmediainfo/Manifest

@@ -1 +1,2 @@
 DIST libmediainfo_0.7.91.tar.xz 1575876 SHA256 28818b88cedc8d5bc6b6c2a32d37ec456cb9784b4bf105416ef1e5821a6769c0 SHA512 7b05ae099cd8fd1f1f4134a16cff407bd6016095bad8769444f14eecd34b3771634c9a59f4fb41b04f5fc0381cf755ef1d5cbd05fd0bee57fcafacbb52293f5c WHIRLPOOL f86664ce7931f08f17370ece5e20669a3762ab9cc51532dfd00ce05b0081335863795bb9de966566bf006076a579b3f23023ab40804f07355e57c4b6ece66c51
+DIST libmediainfo_0.7.92.1.tar.xz 1582960 SHA256 200d4d7c52b6b3c1bed455e75fbc5b899b0c74846eab45e368388c74a2250e2e SHA512 9924eb9f4abdac4ea0ce92808d1fbcd3f40503dead7a1c1fc0a58cc1ce8b4db2e805db5921bc3eaf62a8cfd8b14b41e14e94ec96ae0b22421fab61bbf83eab8b WHIRLPOOL 152d94c9fe42a0ca4643398e7676c56169b477cead53f39dc0b9cfa57f9080251e616cc90f17ed36503e76ef3dabcf3ef8cb7fc4cc6984c9571c69bc98c9ec92

media-libs/libmediainfo/libmediainfo-0.7.92.1.ebuild

@@ -0,0 +1,84 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit autotools eutils flag-o-matic
+
+MY_PN="MediaInfo"
+DESCRIPTION="MediaInfo libraries"
+HOMEPAGE="http://mediaarea.net/mediainfo/"
+SRC_URI="http://mediaarea.net/download/source/${PN}/${PV}/${P/-/_}.tar.xz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="curl doc mms static-libs"
+
+RDEPEND="sys-libs/zlib
+	dev-libs/tinyxml2:=
+	>=media-libs/libzen-0.4.34[static-libs=]
+	curl? ( net-misc/curl )
+	mms? ( >=media-libs/libmms-0.6.1[static-libs=] )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+# tests try to fetch data from online sources
+RESTRICT="test"
+
+S=${WORKDIR}/${MY_PN}Lib/Project/GNU/Library
+
+src_prepare() {
+	eapply -p4 "${FILESDIR}"/${PN}-0.7.63-pkgconfig.patch
+	eapply_user
+
+	sed -i 's:-O2::' configure.ac || die
+	append-cppflags -DMEDIAINFO_LIBMMS_DESCRIBE_SUPPORT=0
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-shared \
+		--with-libtinyxml2 \
+		$(use_with curl libcurl) \
+		$(use_with mms libmms) \
+		$(use_enable static-libs static) \
+		$(use_enable static-libs staticlibs)
+}
+
+src_compile() {
+	default
+
+	if use doc; then
+		cd "${WORKDIR}"/${MY_PN}Lib/Source/Doc
+		doxygen Doxyfile || die
+	fi
+}
+
+src_install() {
+	if use doc; then
+		local HTML_DOCS=( "${WORKDIR}"/${MY_PN}Lib/Doc/*.html )
+	fi
+
+	default
+
+	edos2unix ${PN}.pc #414545
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins ${PN}.pc
+
+	for x in ./ Archive Audio Duplicate Export Image Multiple Reader Tag Text Video; do
+		insinto /usr/include/${MY_PN}/${x}
+		doins "${WORKDIR}"/${MY_PN}Lib/Source/${MY_PN}/${x}/*.h
+	done
+
+	insinto /usr/include/${MY_PN}DLL
+	doins "${WORKDIR}"/${MY_PN}Lib/Source/${MY_PN}DLL/*.h
+
+	dodoc "${WORKDIR}"/${MY_PN}Lib/*.txt
+
+	prune_libtool_files
+}

media-video/mediainfo/Manifest

@@ -1 +1,2 @@
 DIST mediainfo_0.7.91.tar.xz 1309324 SHA256 b501e2776319448a1664371f05498af21db1133b3a8d530f62447d0913bc5996 SHA512 fd62e9ce42ae860630b5a79a226b5361c2225bbb3bb3655500341e77fe4ccb6db5402fdc8c50a67d74b246d3aed23a71f4828eb38c507eaed9f98e5f47ffb843 WHIRLPOOL 83f15525e8e3d9607374d81721e781d1e609aa658dd0f9ceaf428d595e1086f2d3d24a04586d4aa50f695e124b733a4f02f5af53e95e3bc3bd81df73dc41d243
+DIST mediainfo_0.7.92.1.tar.xz 1314708 SHA256 a3553ba26faf71ddef7d2c8e318924097352d4a05726053d9ed2fd0e56199e34 SHA512 12a3661a39f7d0d47c81f353093126927113e9f3aef3fc478d37239799bb6cbc049f662d6c3f7a7ee70bc036a87d1953634c7c9f7704cdf70e0b326bad2f6228 WHIRLPOOL 0879a69208ea72963baee7519ec4c9eb740adb3826174e6f36e14b9330b416a3f82d192397e695b285949044496ca9e4b8a404e2963b71fe61e733eb8c3b879e

media-video/mediainfo/mediainfo-0.7.92.1.ebuild

@@ -0,0 +1,72 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+WX_GTK_VER="3.0"
+
+inherit eutils autotools wxwidgets
+
+DESCRIPTION="MediaInfo supplies technical and tag information about media files"
+HOMEPAGE="http://mediaarea.net/mediainfo/"
+SRC_URI="http://mediaarea.net/download/source/${PN}/${PV}/${P/-/_}.tar.xz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="curl mms wxwidgets"
+
+RDEPEND="sys-libs/zlib
+	>=media-libs/libzen-0.4.34
+	~media-libs/lib${P}[curl=,mms=]
+	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/MediaInfo
+
+pkg_setup() {
+	TARGETS="CLI"
+	use wxwidgets && TARGETS+=" GUI"
+}
+
+src_prepare() {
+	eapply_user
+
+	local target
+	for target in ${TARGETS}; do
+		cd "${S}"/Project/GNU/${target}
+		sed -i -e "s:-O2::" configure.ac
+		eautoreconf
+	done
+}
+
+src_configure() {
+	local target
+	for target in ${TARGETS}; do
+		cd "${S}"/Project/GNU/${target}
+		local args=""
+		[[ ${target} == "GUI" ]] && args="--with-wxwidgets --with-wx-gui"
+		econf ${args}
+	done
+}
+
+src_compile() {
+	local target
+	for target in ${TARGETS}; do
+		cd "${S}"/Project/GNU/${target}
+		default
+	done
+}
+src_install() {
+	local target
+	for target in ${TARGETS}; do
+		cd "${S}"/Project/GNU/${target}
+		default
+		dodoc "${S}"/History_${target}.txt
+		if [[ ${target} == "GUI" ]]; then
+			newicon "${S}"/Source/Resource/Image/MediaInfo.png ${PN}.png
+			make_desktop_entry ${PN}-gui MediaInfo ${PN} "AudioVideo;GTK"
+		fi
+	done
+}

media-video/mpv/Manifest

@@ -1,6 +1,4 @@
 DIST mpv-0.18.0.tar.gz 2758960 SHA256 b656638d4f6bce2621baaacb60d8be384aa492fcd86dfd43996aaa2c16fee02b SHA512 5a899ea680b4da6d668a6e77a254e623bafef16f376ee46639e40f151da5a000de84b382f2b07f3a1e87b60fc8e524132767fdf243e36474966af11a88277437 WHIRLPOOL c491e61cb2d7f453cfc23605120048e81c2b7621b8d9591cad6415d3b550f55db6a6c8c6f90d27c7ce214ff89f92a9861d202b457c2de25c5b7de11d8d1d40af
 DIST mpv-0.22.0.tar.gz 2822645 SHA256 c0f9ac8f0e37a391d19007b333ef8787c2f45d75a0d4401c0098cde52c5082f6 SHA512 6c021bfb79cbedee842bf122ebb29df56e8b1cbfcb038bd54bf6e2f2db2a6550b71fd9fe8998dbd79b4ceeab3fbcab65ec60695f255c5cb36fb1feae17b797c0 WHIRLPOOL 3458dfe646bab65408a7fe45f98ae168f439b4939064b009ba87d0ae08c1f2067bd252558a92f9fdb0822bf5a35b2377bce7f46aeb190d60a4e115394f0506c9
 DIST mpv-0.23.0.tar.gz 2812103 SHA256 8aeefe5970587dfc454d2b89726b603f156bd7a9ae427654eef0d60c68d94998 SHA512 16304a729684ba177cb902e2508bdba09b344228c44ac78b27302ee4e0bcfb344b3522969e834516547bf82825009afd3bef1701327fdcaa42a9696065cca591 WHIRLPOOL fa214186ae80f4b26d967b8d6c68f0c4c56a77caaf06088249d30551e2cd5efbfc4f0a06e1944ef24ac679f1a3d47faa0d6152d192f032b3d279d5ada6567c8e
-DIST mpv-0.9.2.tar.gz 2701306 SHA256 c0148f55dbd17705f49bb496d0ce374419de62e1b17195d91409d7727cbd4751 SHA512 4f652a8e78d65b0ef44a06287b05250dfdfbce4cf5a6e21d3b446eedec268d83cf98afcc687272e2da2cfac9e9f69a303847dffdfd45cecdd4273b943ce50967 WHIRLPOOL 1512bacc2ce50e875770c76106a1bb2bc1d0cc5f6e2bdce91ff8c5cfc8bf13ffb48519858a5fa2a7d57880820dc12e5eb20f34ab71eca5d76ec303618da8f3fe
 DIST waf-1.8.12 97567 SHA256 01bf2beab2106d1558800c8709bc2c8e496d3da4a2ca343fe091f22fca60c98b SHA512 8e47112abb134f965f15a27a600b4453cad3075afb5dadc17f2f6dac33d80ec68b679ac0ebc5f8a0245cbd07ae9fc7b899e69afc1bd021cce74e7af2ab457939 WHIRLPOOL c36d37c2d8c08e4048b4800f511611af5cf534304fcb58388ca491ff308bfcbcdd959d153edfd6ff8c118404e7293d8b786e43b07486139bf915a82aa75d792b
-DIST waf-1.8.4 96179 SHA256 f02035fa5d8814f33f19b2b20d43822ddef6bb39b955ca196c2a247a1f9ffaa8 SHA512 3a132d8b1cba0af0e3df046c0204c5df706fae4e0fac41cf74b53f6cdea6210ed798671c7a3cb3fee70573aacab16d4c0cc699cc4b7aa74c8a416346c5513f4c WHIRLPOOL fe8d7f42e5118a1f9490a0c9add1355c969185376b57d0bab024068dd6e7364632d862bf9432e1209165c5313ae843479ef334f4bd6285db05dfebff9a1b640e

media-video/mpv/files/mpv-rely-on-pkgconfig-for-raspberrypi-compiler-flags.patch

@@ -0,0 +1,97 @@
+commit ea40fa36eef15384b4c0218fb102f92f5cd1cdff
+Author: Ilya Tumaykin <itumaykin@gmail.com>
+Date:   Fri Jan 27 21:20:29 2017 +0300
+
+build: rpi: rely on pkgconfig for compiler flags
+
+Upstream provides pkgconfig files for quite some time now [1,2].
+Use them to determine the required flags instead of hard coding.
+
+This makes cross-compilation easy, which I dare to say is important for
+many raspberry-pi users. This also prevents picking libEGL and libGLESv2
+from mesa when they are present, which can happen with the current code.
+
+Good distros should put these pkgconfig files into default pkg-config
+search path or populate PKG_CONFIG_PATH for users. However, be nice to
+everybody and manually look into '/opt/vc/lib/pkgconfig' just in case.
+Hence the PKG_CONFIG_PATH mangling.
+
+[1]: https://github.com/raspberrypi/userland/issues/245
+[2]: https://github.com/raspberrypi/userland/commit/05d60a01d53dca363bb4286594db1826ffff8762
+
+diff --git a/waftools/checks/custom.py b/waftools/checks/custom.py
+index 50a16ce26..bf8e5a0b0 100644
+--- a/waftools/checks/custom.py
++++ b/waftools/checks/custom.py
+@@ -4,7 +4,7 @@ from waflib import Utils
+ import os
+
+ __all__ = ["check_pthreads", "check_iconv", "check_lua", "check_oss_4front",
+-           "check_cocoa", "check_openal"]
++           "check_cocoa", "check_openal", "check_rpi"]
+
+ pthreads_program = load_fragment('pthreads.c')
+
+@@ -127,3 +127,29 @@ def check_openal(ctx, dependency_identifier):
+         if fn(ctx, dependency_identifier):
+             return True
+     return False
++
++def check_rpi(ctx, dependency_identifier):
++    # We need MMAL/bcm_host/dispmanx APIs.
++    # Upstream keeps pkgconfig files in '/opt/vc/lib/pkgconfig'.
++    # See https://github.com/raspberrypi/userland/issues/245
++    # PKG_CONFIG_SYSROOT_DIR helps with cross compilation.
++    prev_pkg_path = os.getenv('PKG_CONFIG_PATH', '')
++    os.environ['PKG_CONFIG_PATH'] = os.pathsep.join(
++        filter(None, [os.path.join(os.getenv('PKG_CONFIG_SYSROOT_DIR', '/'),
++                                   'opt/vc/lib/pkgconfig'),
++                      prev_pkg_path]))
++
++    checks = [
++        check_pkg_config('bcm_host', uselib_store='bcm_host'),
++        check_pkg_config('egl'),
++        check_pkg_config('glesv2'),
++        check_cc(lib=['mmal_core', 'mmal_util', 'mmal_vc_client'], use=['bcm_host']),
++        # We still need all OpenGL symbols, because the vo_opengl code is
++        # generic and supports anything from GLES2/OpenGL 2.1 to OpenGL 4 core.
++        check_statement('GL/gl.h', '(void)GL_RGB32F'),     # arbitrary OpenGL 3.0 symbol
++        check_statement('GL/gl.h', '(void)GL_LUMINANCE16') # arbitrary OpenGL legacy-only symbol
++    ]
++
++    ret = all((fn(ctx, dependency_identifier) for fn in checks))
++    os.environ['PKG_CONFIG_PATH'] = prev_pkg_path
++    return ret
+diff --git a/wscript b/wscript
+index 81a048df5..ab853e7ad 100644
+--- a/wscript
++++ b/wscript
+@@ -738,27 +738,9 @@ video_output_features = [
+         'desc': 'Android support',
+         'func': check_statement('android/api-level.h', '(void)__ANDROID__'),  # arbitrary android-specific header
+     }, {
+-        # We need MMAL/bcm_host/dispmanx APIs. Also, most RPI distros require
+-        # every project to hardcode the paths to the include directories. Also,
+-        # these headers are so broken that they spam tons of warnings by merely
+-        # including them (compensate with -isystem and -fgnu89-inline).
+         'name': '--rpi',
+         'desc': 'Raspberry Pi support',
+-        'func': compose_checks(
+-            check_cc(cflags="-isystem/opt/vc/include/ "+
+-                            "-isystem/opt/vc/include/interface/vcos/pthreads " +
+-                            "-isystem/opt/vc/include/interface/vmcs_host/linux " +
+-                            "-fgnu89-inline",
+-                     linkflags="-L/opt/vc/lib",
+-                     header_name="bcm_host.h",
+-                     lib=['mmal_core', 'mmal_util', 'mmal_vc_client', 'bcm_host']),
+-            # We still need all OpenGL symbols, because the vo_opengl code is
+-            # generic and supports anything from GLES2/OpenGL 2.1 to OpenGL 4 core.
+-            check_cc(lib="EGL"),
+-            check_cc(lib="GLESv2"),
+-            check_statement('GL/gl.h', '(void)GL_RGB32F'),     # arbitrary OpenGL 3.0 symbol
+-            check_statement('GL/gl.h', '(void)GL_LUMINANCE16') # arbitrary OpenGL legacy-only symbol
+-        ),
++        'func': check_rpi,
+     }, {
+         'name': '--standard-gl',
+         'desc': 'Desktop standard OpenGL support',

media-video/mpv/metadata.xml

@@ -16,12 +16,9 @@
 	<use>
 		<flag name="archive">Enable support for various archive formats via <pkg>app-arch/libarchive</pkg></flag>
 		<flag name="bluray">Enable playback of Blu-ray filesystems</flag>
-		<flag name="bs2b">Enable Bauer stereophonic-to-binaural headphone filter</flag>
-		<flag name="cdio">Enable CDDA support via <pkg>dev-libs/libcdio-paranoia</pkg></flag>
 		<flag name="cli">Build mpv CLI player</flag>
 		<flag name="cplugins">Enable C plugins support</flag>
 		<flag name="cuda">Enable hardware video decoding via Nvidia CUDA</flag>
-		<flag name="doc-pdf">Build documentation in pdf format</flag>
 		<flag name="drm">Enable Kernel Mode Setting / Direct Rendering Manager based video output</flag>
 		<flag name="egl">Enable support for various EGL-based video outputs / backends</flag>
 		<flag name="enca">Enable subtitles charset discovery via <pkg>app-i18n/enca</pkg></flag>
@@ -32,7 +29,6 @@
 		<flag name="libmpv">Build mpv shared library</flag>
 		<flag name="lua">Enable Lua scripting, OSC (On Screen Controller) GUI and <pkg>net-misc/youtube-dl</pkg> hook-script</flag>
 		<flag name="luajit">Use <pkg>dev-lang/luajit</pkg> instead of <pkg>dev-lang/lua</pkg></flag>
-		<flag name="pvr">Enable Video4Linux2 MPEG PVR</flag>
 		<flag name="raspberry-pi">Enable support for the Raspberry Pi</flag>
 		<flag name="rubberband">Enable high quality pitch correction via <pkg>media-libs/rubberband</pkg></flag>
 		<flag name="sdl">Enable <pkg>media-libs/libsdl2</pkg> based video and audio outputs

media-video/mpv/mpv-0.23.0-r1.ebuild

@@ -28,19 +28,22 @@ DOCS+=( README.md )
 # See Copyright in sources and Gentoo bug 506946. Waf is BSD, libmpv is ISC.
 LICENSE="GPL-2+ BSD ISC"
 SLOT="0"
-IUSE="+alsa aqua archive bluray cdda +cli coreaudio doc drm dvb dvd +egl encode
-	gbm +iconv jack jpeg lcms +libass libav libcaca libmpv +lua luajit openal
-	+opengl oss pulseaudio raspberry-pi rubberband samba sdl selinux test tools
-	+uchardet v4l vaapi vdpau vf-dlopen wayland +X xinerama +xscreensaver +xv
-	zsh-completion"
+IUSE="+alsa aqua archive bluray cdda +cli coreaudio cuda doc drm dvb dvd +egl
+	encode gbm +iconv jack jpeg lcms +libass libav libcaca libmpv +lua luajit
+	openal +opengl oss pulseaudio raspberry-pi rubberband samba sdl selinux
+	test tools +uchardet v4l vaapi vdpau vf-dlopen wayland +X xinerama
+	+xscreensaver +xv zsh-completion"
+IUSE+=" cpu_flags_x86_sse4_1"
 
 REQUIRED_USE="
 	|| ( cli libmpv )
 	aqua? ( opengl )
+	cuda? ( !libav || ( opengl egl ) )
 	egl? ( || ( gbm X wayland ) )
 	gbm? ( drm egl )
 	lcms? ( || ( opengl egl ) )
 	luajit? ( lua )
+	opengl? ( || ( aqua X !cli? ( libmpv ) ) )
 	test? ( || ( opengl egl ) )
 	tools? ( cli )
 	uchardet? ( iconv )
@@ -62,8 +65,8 @@ COMMON_DEPEND="
 	archive? ( >=app-arch/libarchive-3.0.0:= )
 	bluray? ( >=media-libs/libbluray-0.3.0 )
 	cdda? ( dev-libs/libcdio-paranoia )
+	cuda? ( >=media-video/ffmpeg-3.3:0 )
 	drm? ( x11-libs/libdrm )
-	dvb? ( virtual/linuxtv-dvb-headers )
 	dvd? (
 		>=media-libs/libdvdnav-4.2.0
 		>=media-libs/libdvdread-4.1.0
@@ -86,17 +89,18 @@ COMMON_DEPEND="
 		luajit? ( dev-lang/luajit:2 )
 	)
 	openal? ( >=media-libs/openal-1.13 )
-	opengl? ( !aqua? ( virtual/opengl ) )
+	opengl? ( X? ( virtual/opengl ) )
 	pulseaudio? ( media-sound/pulseaudio )
 	raspberry-pi? (
 		>=media-libs/raspberrypi-userland-0_pre20160305-r1
-		media-libs/mesa[egl,gles2]
+		virtual/opengl
 	)
 	rubberband? ( >=media-libs/rubberband-1.8.0 )
 	samba? ( net-fs/samba[smbclient(+)] )
 	sdl? ( media-libs/libsdl2[sound,threads,video,X?,wayland?] )
 	v4l? ( media-libs/libv4l )
 	vaapi? ( >=x11-libs/libva-1.4.0[drm?,X?,wayland?] )
+	vdpau? ( >=x11-libs/libvdpau-0.2 )
 	wayland? (
 		>=dev-libs/wayland-1.6.0
 		>=x11-libs/libxkbcommon-0.3.0
@@ -106,7 +110,6 @@ COMMON_DEPEND="
 		x11-libs/libXext
 		>=x11-libs/libXrandr-1.2.0
 		opengl? ( x11-libs/libXdamage )
-		vdpau? ( >=x11-libs/libvdpau-0.2 )
 		xinerama? ( x11-libs/libXinerama )
 		xscreensaver? ( x11-libs/libXScrnSaver )
 		xv? ( x11-libs/libXv )
@@ -117,11 +120,13 @@ DEPEND="${COMMON_DEPEND}
 	dev-python/docutils
 	virtual/pkgconfig
 	doc? ( dev-python/rst2pdf )
+	dvb? ( virtual/linuxtv-dvb-headers )
 	test? ( >=dev-util/cmocka-1.0.0 )
 	v4l? ( virtual/os-headers )
 	zsh-completion? ( dev-lang/perl )
 "
 RDEPEND="${COMMON_DEPEND}
+	cuda? ( x11-drivers/nvidia-drivers[X] )
 	selinux? ( sec-policy/selinux-mplayer )
 	tools? ( ${PYTHON_DEPS} )
 "
@@ -129,11 +134,21 @@ RDEPEND="${COMMON_DEPEND}
 PATCHES=(
 	"${FILESDIR}/${PN}-0.19.0-make-ffmpeg-version-check-non-fatal.patch"
 	"${FILESDIR}/${PN}-0.23.0-make-libavdevice-check-accept-libav.patch"
+	"${FILESDIR}/${PN}-rely-on-pkgconfig-for-raspberrypi-compiler-flags.patch"
 )
 
 mpv_check_compiler() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && use vaapi && use egl && ! tc-has-tls; then
-		die "Your compiler lacks C++11 TLS support. Use GCC>=4.8.0 or Clang>=3.3."
+	if [[ ${MERGE_TYPE} != "binary" ]]; then
+		if tc-is-gcc && ( [[ $(gcc-major-version) -lt 4 ]] || \
+			( [[ $(gcc-major-version) -eq 4 ]] && [[ $(gcc-minor-version) -lt 5 ]] ) ); then
+			die "${PN} requires GCC>=4.5."
+		fi
+		if ( use opengl || use egl ) && ! tc-has-tls; then
+			die "Your compiler lacks C++11 TLS support. Use GCC>=4.8 or Clang>=3.3."
+		fi
+		if use vaapi && use cpu_flags_x86_sse4_1 && ! tc-is-gcc; then
+			die "${PN} requires GCC for SSE4.1 intrinsics."
+		fi
 	fi
 }
 
@@ -153,6 +168,14 @@ src_prepare() {
 }
 
 src_configure() {
+	tc-export CC PKG_CONFIG AR
+
+	if tc-is-cross-compiler && use raspberry-pi; then
+		export EXTRA_PKG_CONFIG_LIBDIR="${SYSROOT%/}${EPREFIX}/opt/vc/lib/pkgconfig"
+		# Drop next line when Gentoo bug 607344 is fixed or if you fixed it locally.
+		die "${PN} can't be cross built with raspberry-pi USE enabled. See Gentoo bug 607344."
+	fi
+
 	local mywafargs=(
 		--confdir="${EPREFIX}/etc/${PN}"
 		--docdir="${EPREFIX}/usr/share/doc/${PF}"
@@ -232,6 +255,7 @@ src_configure() {
 		$(use_enable jpeg)
 		--disable-android
 		$(use_enable raspberry-pi rpi)
+		$(usex opengl "$(use_enable !aqua standard-gl)" '--disable-standard-gl')
 		--disable-ios-gl
 		$(usex libmpv "$(use_enable opengl plain-gl)" '--disable-plain-gl')
 		--disable-mali-fbdev	# Only available in overlays.
@@ -240,7 +264,7 @@ src_configure() {
 		# Automagic Video Toolbox HW acceleration. See Gentoo bug 577332.
 		$(use_enable vaapi vaapi-hwaccel)
 		$(use_enable vdpau vdpau-hwaccel)
-		--disable-cuda-hwaccel	# No support in ffmpeg. See Gentoo bug 595450.
+		$(use_enable cuda cuda-hwaccel)
 
 		# TV features:
 		$(use_enable v4l tv)
@@ -294,23 +318,30 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	local rv softvol_0_18_1=0
+	local rv softvol_0_18_1=0 osc_0_21_0=0
+
 	for rv in ${REPLACING_VERSIONS}; do
-		version_compare ${rv} 0.18.1-r1
+		version_compare ${rv} 0.18.1
 		[[ $? -eq 1 ]] && softvol_0_18_1=1
+		version_compare ${rv} 0.21.0
+		[[ $? -eq 1 ]] && osc_0_21_0=1
 	done
 
 	if [[ ${softvol_0_18_1} -eq 1 ]]; then
-		elog "Starting from version 0.18.1 the software volume control is"
-		elog "enabled by default, see:"
-		elog "https://github.com/mpv-player/mpv/blob/v0.18.1/DOCS/interface-changes.rst"
-		elog "https://github.com/mpv-player/mpv/issues/3322"
-		elog
+		elog "Since version 0.18.1 the software volume control is always enabled."
 		elog "This means that volume controls don't change the system volume,"
 		elog "e.g. per-application volume with PulseAudio."
-		elog "If you want to restore the old behaviour, please refer to"
+		elog "If you want to restore the previous behaviour, please refer to"
+		elog
+		elog "https://wiki.gentoo.org/wiki/Mpv#Volume_in_0.18.1"
+		elog
+	fi
+
+	if [[ ${osc_0_21_0} -eq 1 ]]; then
+		elog "In version 0.21.0 the default OSC layout was changed."
+		elog "If you want to restore the previous layout, please refer to"
 		elog
-		elog "https://bugs.gentoo.org/show_bug.cgi?id=588492#c7"
+		elog "https://wiki.gentoo.org/wiki/Mpv#OSC_in_0.21.0"
 		elog
 	fi
 

media-video/mpv/mpv-0.9.2-r1.ebuild

@@ -1,268 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4} )
-PYTHON_REQ_USE='threads(+)'
-inherit eutils python-any-r1 waf-utils pax-utils fdo-mime gnome2-utils
-
-WAF_V="1.8.4"
-
-DESCRIPTION="Media player based on MPlayer and mplayer2"
-HOMEPAGE="http://mpv.io/"
-SRC_URI="http://ftp.waf.io/pub/release/waf-${WAF_V}"
-DOCS=( README.md etc/example.conf etc/input.conf )
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/mpv-player/mpv.git"
-	inherit git-r3
-else
-	SRC_URI+=" https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="alpha amd64 ~arm hppa ppc ppc64 ~sparc ~x86 ~amd64-linux"
-	DOCS+=( RELEASE_NOTES )
-fi
-
-# See Copyright in source tarball and bug #506946. Waf is BSD, libmpv is ISC.
-LICENSE="GPL-2+ BSD ISC"
-SLOT="0"
-IUSE="+alsa bluray bs2b cdio +cli doc-pdf drm dvb +dvd egl +enca encode +iconv
-jack jpeg ladspa lcms +libass libav libcaca libguess libmpv lua luajit openal
-+opengl oss pulseaudio pvr raspberry-pi rubberband samba sdl selinux v4l vaapi
-vdpau vf-dlopen wayland +X xinerama +xscreensaver xv"
-
-REQUIRED_USE="
-	|| ( cli libmpv )
-	egl? ( opengl X )
-	enca? ( iconv )
-	lcms? ( opengl )
-	libguess? ( iconv )
-	luajit? ( lua )
-	opengl? ( || ( wayland X ) )
-	pvr? ( v4l )
-	vaapi? ( X )
-	vdpau? ( X )
-	wayland? ( opengl )
-	xinerama? ( X )
-	xscreensaver? ( X )
-	xv? ( X )
-"
-
-RDEPEND="
-	libav? ( >=media-video/libav-11:0=[encode?,threads,vaapi?,vdpau?] )
-	!libav? (
-		>=media-video/ffmpeg-2.4.0:0=[encode?,threads,vaapi?,vdpau?]
-		<media-video/ffmpeg-3.0
-	)
-	sys-libs/zlib
-	X? (
-		x11-libs/libX11
-		x11-libs/libXext
-		>=x11-libs/libXrandr-1.2.0
-		opengl? (
-			virtual/opengl
-			egl? ( media-libs/mesa[egl] )
-		)
-		lcms? ( >=media-libs/lcms-2.6:2 )
-		vaapi? ( >=x11-libs/libva-0.34.0[X(+)] )
-		vdpau? ( >=x11-libs/libvdpau-0.2 )
-		xinerama? ( x11-libs/libXinerama )
-		xscreensaver? ( x11-libs/libXScrnSaver )
-		xv? ( x11-libs/libXv )
-	)
-	alsa? ( >=media-libs/alsa-lib-1.0.18 )
-	bluray? ( >=media-libs/libbluray-0.3.0 )
-	bs2b? ( media-libs/libbs2b )
-	cdio? (
-		dev-libs/libcdio
-		dev-libs/libcdio-paranoia
-	)
-	drm? ( x11-libs/libdrm )
-	dvb? ( virtual/linuxtv-dvb-headers )
-	dvd? (
-		>=media-libs/libdvdread-4.1.3
-		>=media-libs/libdvdnav-4.2.0
-	)
-	enca? ( app-i18n/enca )
-	iconv? ( virtual/libiconv )
-	jack? ( media-sound/jack-audio-connection-kit )
-	jpeg? ( virtual/jpeg:0 )
-	ladspa? ( media-libs/ladspa-sdk )
-	libass? (
-		>=media-libs/libass-0.12.1:=[enca?,fontconfig]
-		virtual/ttf-fonts
-	)
-	libcaca? ( >=media-libs/libcaca-0.99_beta18 )
-	libguess? ( >=app-i18n/libguess-1.0 )
-	lua? (
-		!luajit? ( <dev-lang/lua-5.3:= )
-		luajit? ( dev-lang/luajit:2 )
-	)
-	openal? ( >=media-libs/openal-1.13 )
-	pulseaudio? ( media-sound/pulseaudio )
-	rubberband? ( >=media-libs/rubberband-1.8.0 )
-	samba? ( net-fs/samba[smbclient(+)] )
-	sdl? ( media-libs/libsdl2[threads] )
-	v4l? ( media-libs/libv4l )
-	wayland? (
-		>=dev-libs/wayland-1.6.0
-		media-libs/mesa[egl,wayland]
-		>=x11-libs/libxkbcommon-0.3.0
-	)
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	virtual/pkgconfig
-	>=dev-lang/perl-5.8
-	dev-python/docutils
-	doc-pdf? ( dev-python/rst2pdf )
-	X? (
-		x11-proto/videoproto
-		xinerama? ( x11-proto/xineramaproto )
-		xscreensaver? ( x11-proto/scrnsaverproto )
-	)
-"
-RDEPEND+="
-	selinux? ( sec-policy/selinux-mplayer )
-"
-
-pkg_setup() {
-	if ! use libass; then
-		ewarn "You have disabled the libass flag. No OSD or subtitles will be displayed."
-	fi
-
-	if use openal; then
-		ewarn "You have enabled the openal audio output which is a fallback"
-		ewarn "and disabled by upstream."
-	fi
-
-	if use sdl; then
-		ewarn "You have enabled the sdl video and audio outputs which are fallbacks"
-		ewarn "and disabled by upstream."
-	fi
-
-	if use libav; then
-		einfo "You have enabled media-video/libav instead of media-video/ffmpeg."
-		einfo "Upstream recommends media-video/ffmpeg, as some functionality is not"
-		einfo "provided by media-video/libav."
-	fi
-
-	einfo "For additional format support you need to enable the support on your"
-	einfo "libavcodec/libavformat provider:"
-	einfo "    media-video/ffmpeg or media-video/libav"
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	cp "${DISTDIR}"/waf-${WAF_V} "${S}"/waf || die
-	chmod 0755 "${S}"/waf || die
-	epatch_user
-}
-
-src_configure() {
-	local mywafargs=(
-		--confdir="${EPREFIX}"/etc/${PN}
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}
-		$(usex cli '' '--disable-cplayer')
-		$(use_enable libmpv libmpv-shared)
-		--disable-libmpv-static
-		--disable-build-date	# keep build reproducible
-		--disable-optimize	# do not add '-O2' to CFLAGS
-		--disable-debug-build	# do not add '-g' to CFLAGS
-		--disable-test		# avoid dev-util/cmocka automagic
-		$(use_enable doc-pdf pdf-build)
-		$(use_enable vf-dlopen vf-dlopen-filters)
-		$(use_enable cli zsh-comp)
-
-		# optional features
-		$(use_enable iconv)
-		$(use_enable libguess)
-		$(use_enable samba libsmbclient)
-		$(use_enable lua)
-		$(use_enable libass)
-		$(use_enable libass libass-osd)
-		$(use_enable encode encoding)
-		$(use_enable bluray libbluray)
-		$(use_enable dvd dvdread)
-		$(use_enable dvd dvdnav)
-		$(use_enable cdio cdda)
-		$(use_enable enca)
-		$(use_enable ladspa)
-		$(use_enable rubberband)
-		$(use_enable bs2b libbs2b)
-		$(use_enable lcms lcms2)
-		--disable-vapoursynth	# vapoursynth is not packaged
-		--disable-vapoursynth-lazy
-		--enable-libavfilter
-		--enable-libavdevice
-		$(usex luajit '--lua=luajit' '')
-
-		# audio outputs
-		$(use_enable sdl sdl2)	# SDL output is fallback for platforms where nothing better is available
-		--disable-sdl1
-		$(use_enable oss oss-audio)
-		--disable-rsound	# media-sound/rsound is in pro-audio overlay only
-		$(use_enable pulseaudio pulse)
-		$(use_enable jack)
-		$(use_enable openal)
-		$(use_enable alsa)
-
-		# video outputs
-		$(use_enable wayland)
-		$(use_enable X x11)
-		$(use_enable xscreensaver xss)
-		$(use_enable X xext)
-		$(use_enable xv)
-		$(use_enable xinerama)
-		$(use_enable X xrandr)
-		$(usex X "$(use_enable opengl gl-x11)" '--disable-gl-x11')
-		$(use_enable egl egl-x11)
-		$(usex wayland "$(use_enable opengl gl-wayland)" '--disable-gl-wayland')
-		$(use_enable opengl gl)
-		$(use_enable vdpau)
-		$(usex vdpau "$(use_enable opengl vdpau-gl-x11)" '--disable-vdpau-gl-x11')
-		$(use_enable vaapi)
-		$(use_enable vaapi vaapi-vpp)
-		$(usex vaapi "$(use_enable opengl vaapi-glx)" '--disable-vaapi-glx')
-		$(use_enable libcaca caca)
-		$(use_enable drm)
-		$(use_enable jpeg)
-		$(use_enable raspberry-pi rpi)
-		$(use_enable raspberry-pi rpi-gles)
-
-		# hwaccels
-		$(use_enable vaapi vaapi-hwaccel)
-		$(use_enable vdpau vdpau-hwaccel)
-
-		# tv features
-		$(use_enable v4l tv)
-		$(use_enable v4l tv-v4l2)
-		$(use_enable v4l libv4l2)
-		$(use_enable pvr)
-		$(use_enable dvb dvbin)
-	)
-	waf-utils_src_configure "${mywafargs[@]}"
-}
-
-src_install() {
-	waf-utils_src_install
-
-	if use cli && use luajit; then
-		pax-mark -m "${ED}"usr/bin/mpv
-	fi
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}

media-video/mpv/mpv-9999.ebuild

@@ -38,7 +38,7 @@ IUSE+=" cpu_flags_x86_sse4_1"
 REQUIRED_USE="
 	|| ( cli libmpv )
 	aqua? ( opengl )
-	cuda? ( !libav )
+	cuda? ( !libav || ( opengl egl ) )
 	egl? ( || ( gbm X wayland ) )
 	gbm? ( drm egl )
 	lcms? ( || ( opengl egl ) )

metadata/dtd/timestamp.chk

@@ -1 +1 @@
-Sat, 04 Feb 2017 20:43:23 +0000
+Sun, 05 Feb 2017 08:43:21 +0000

metadata/glsa/timestamp.chk

@@ -1 +1 @@
-Sat, 04 Feb 2017 20:43:23 +0000
+Sun, 05 Feb 2017 08:43:22 +0000

metadata/md5-cache/app-crypt/aescrypt-3.0.6b

@@ -1,6 +1,6 @@
-DEFINED_PHASES=compile prepare
+DEFINED_PHASES=compile
 DESCRIPTION=Advanced file encryption using AES
-EAPI=4
+EAPI=6
 HOMEPAGE=http://www.aescrypt.com/
 IUSE=static
 KEYWORDS=~amd64
@@ -8,4 +8,4 @@ LICENSE=BSD GPL-2
 SLOT=0
 SRC_URI=https://www.aescrypt.com/download/v3/aescrypt-3.0.6b.tar.gz
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=c5116d81a72184c59d6a0eb41dde29d0
+_md5_=918dd41f6071707967a27a075bcd6032

metadata/md5-cache/app-crypt/aespipe-2.4d

@@ -1,6 +1,6 @@
 DEFINED_PHASES=configure
 DESCRIPTION=Encrypts data from stdin to stdout
-EAPI=5
+EAPI=6
 HOMEPAGE=http://loop-aes.sourceforge.net
 IUSE=+asm cpu_flags_x86_aes cpu_flags_x86_padlock static
 KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
@@ -9,4 +9,4 @@ RDEPEND=app-arch/sharutils app-crypt/gnupg
 SLOT=0
 SRC_URI=http://loop-aes.sourceforge.net/aespipe/aespipe-v2.4d.tar.bz2
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=5c99d2e34aa08dc3e46b427b78327b13
+_md5_=48fc320cd85c4f769b130b8cd33ad9c2

metadata/md5-cache/app-crypt/asedriveiiie-serial-3.5

@@ -1,11 +1,11 @@
 DEFINED_PHASES=install postinst postrm
 DEPEND=>=sys-apps/pcsc-lite-1.3.0 virtual/pkgconfig
 DESCRIPTION=ASEDriveIIIe Serial Card Reader
-EAPI=0
+EAPI=6
 HOMEPAGE=http://www.athena-scs.com
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=>=sys-apps/pcsc-lite-1.3.0
 SLOT=0
 SRC_URI=http://www.athena-scs.com/downloads/asedriveiiie-serial-3.5.tar.bz2
-_md5_=4d87ea2f4e31c1ac28743a9aba208f25
+_md5_=1c39f2d96c62a6571925bfb6ded01b18

metadata/md5-cache/app-crypt/libykneomgr-0.1.8

@@ -1,7 +1,7 @@
-DEFINED_PHASES=compile configure install prepare test
+DEFINED_PHASES=configure
 DEPEND=sys-apps/pcsc-lite dev-libs/libzip virtual/pkgconfig virtual/pkgconfig
 DESCRIPTION=YubiKey NEO CCID Manager C Library
-EAPI=5
+EAPI=6
 HOMEPAGE=https://developers.yubico.com/libykneomgr/
 IUSE=kernel_linux
 KEYWORDS=~amd64
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=sys-apps/pcsc-lite dev-libs/libzip >=app-crypt/ccid-1.4.18[usb]
 SLOT=0
 SRC_URI=https://developers.yubico.com/libykneomgr/Releases/libykneomgr-0.1.8.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	ea170b525f6a38a006be05c9d9429f13	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	udev	0498b698e76cdc94930b59a00c73dd9c
-_md5_=5e0349d83f61b12d6d0570c540fb2225
+_eclasses_=multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	udev	0498b698e76cdc94930b59a00c73dd9c
+_md5_=ab103fbcee82783ab060ea7e92981d2c

metadata/md5-cache/app-crypt/onak-0.5.0

@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=berkdb? ( >=sys-libs/db-4 ) postgres? ( dev-db/postgresql[server] ) !<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=onak is an OpenPGP keyserver
+EAPI=6
+HOMEPAGE=http://www.earth.li/projectpurple/progs/onak.html
+IUSE=berkdb postgres
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RESTRICT=test
+SLOT=0
+SRC_URI=http://www.earth.li/projectpurple/files/onak-0.5.0.tar.xz
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
+_md5_=ce001e76f235ae62539f2d6cc267f0b5

metadata/md5-cache/app-crypt/openssl-tpm-engine-0.4.2

@@ -1,7 +1,7 @@
 DEFINED_PHASES=install prepare
 DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=app-crypt/trousers-0.2.8 !<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=This provides a OpenSSL engine that uses private keys stored in TPM hardware
-EAPI=5
+EAPI=6
 HOMEPAGE=http://trousers.sourceforge.net
 IUSE=libressl
 KEYWORDS=~amd64 ~x86
@@ -10,4 +10,4 @@ RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=
 SLOT=0
 SRC_URI=mirror://sourceforge/trousers/openssl_tpm_engine-0.4.2.tar.gz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	ea170b525f6a38a006be05c9d9429f13	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=dd7d7182f90899fa6e58a2615feff83c
+_md5_=8955b4711785a1788e855868f3c2bd44

metadata/md5-cache/app-crypt/rainbowcrack-1.6.1

@@ -1,7 +1,7 @@
 DEFINED_PHASES=install unpack
 DEPEND=app-arch/unzip
 DESCRIPTION=Hash cracker that precomputes plaintext - ciphertext pairs in advance
-EAPI=5
+EAPI=6
 HOMEPAGE=http://project-rainbowcrack.com/
 KEYWORDS=~amd64 ~x86 -*
 LICENSE=all-rights-reserved
@@ -9,4 +9,4 @@ RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=amd64? ( http://project-rainbowcrack.com/rainbowcrack-1.6.1-linux64.zip ) x86? ( http://project-rainbowcrack.com/rainbowcrack-1.6.1-linux32.zip )
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=e0628ef527362678c2579facd7ede1cf
+_md5_=4b3ab6b2121d117c9e9810a9fc9da235

metadata/md5-cache/app-crypt/tinyca-2.0.7.5-r3

@@ -1,8 +1,8 @@
 DEFINED_PHASES=compile install prepare
 DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) dev-perl/Locale-gettext >=virtual/perl-MIME-Base64-2.12 >=dev-perl/gtk2-perl-1.072 >=sys-apps/sed-4
 DESCRIPTION=Simple Perl/Tk GUI to manage a small certification authority
-EAPI=5
-HOMEPAGE=http://tinyca.sm-zone.net/
+EAPI=6
+HOMEPAGE=https://opsec.eu/src/tinyca/
 IUSE=libressl linguas_en linguas_de linguas_cs linguas_es linguas_sv
 KEYWORDS=~amd64 ~ppc ~sparc ~x86
 LICENSE=Artistic
@@ -10,4 +10,4 @@ RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) de
 SLOT=0
 SRC_URI=http://tinyca.sm-zone.net/tinyca2-0.7.5.tar.bz2
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=3519c75e896ef3563db69fc98628c5f0
+_md5_=a1924db5d4ceb550b322585dc8b612f2

metadata/md5-cache/app-crypt/xca-1.3.2-r2

@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile configure install prepare
 DEPEND=!libressl? ( dev-libs/openssl:0=[bindist=] ) libressl? ( dev-libs/libressl:0= ) doc? ( app-text/linuxdoc-tools ) qt5? ( dev-qt/qtgui:5 ) qt4? ( dev-qt/qtgui:4 ) !<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=A GUI to OpenSSL, RSA public keys, certificates, signing requests etc
-EAPI=5
+EAPI=6
 HOMEPAGE=http://xca.sourceforge.net
 IUSE=bindist doc libressl qt4 qt5
 KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( qt4 qt5 )
 SLOT=0
 SRC_URI=mirror://sourceforge/xca/xca-1.3.2.tar.gz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=e4ff41a71c231a58e9a023f769cafeed
+_md5_=aa73d350de0f78ba4797673f63dfe871

metadata/md5-cache/app-eselect/eselect-pinentry-0.7

@@ -1,9 +1,9 @@
 DEFINED_PHASES=install
 DESCRIPTION=Manage /usr/bin/pinentry symlink
-EAPI=5
+EAPI=6
 HOMEPAGE=https://www.gentoo.org/proj/en/eselect/
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=app-eselect/eselect-lib-bin-symlink-0.1.1
 SLOT=0
-_md5_=c0ac181ef6bb7ead1356d46275727f53
+_md5_=1437d32ee784bc1d127d4979ac467353

metadata/md5-cache/dev-java/protobuf-java-3.0.0_beta3_p1

@@ -4,10 +4,10 @@ DESCRIPTION=Google's Protocol Buffers - official Java Bindings
 EAPI=5
 HOMEPAGE=https://github.com/google/protobuf/ https://developers.google.com/protocol-buffers/
 IUSE=nano elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc64 ~sh ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~sh ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.7 !<dev-libs/protobuf-3[java(-)] >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0/10b3
 SRC_URI=https://github.com/google/protobuf/archive/v3.0.0-beta-3.1.tar.gz -> protobuf-3.0.0_beta3_p1.tar.gz
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=17e083bc3e700116d6b2eb241e3e3c68
+_md5_=0c54ee6aa98ad7ba3263efb106c6cb63

metadata/md5-cache/dev-java/protobuf-java-3.0.2

@@ -4,10 +4,10 @@ DESCRIPTION=Google's Protocol Buffers - official Java Bindings
 EAPI=6
 HOMEPAGE=https://github.com/google/protobuf/ https://developers.google.com/protocol-buffers/
 IUSE=nano elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc64 ~sh ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~sh ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.7 !<dev-libs/protobuf-3[java(-)] >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0/10
 SRC_URI=https://github.com/google/protobuf/archive/v3.0.2.tar.gz -> protobuf-3.0.2.tar.gz
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=af2ca79360dc08a1a414c435ba61cd47
+_md5_=54a8dfa7d9472610582e65ccd24e5e1e

metadata/md5-cache/dev-java/protobuf-java-3.1.0

@@ -4,10 +4,10 @@ DESCRIPTION=Google's Protocol Buffers - official Java Bindings
 EAPI=6
 HOMEPAGE=https://github.com/google/protobuf/ https://developers.google.com/protocol-buffers/
 IUSE=nano elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc64 ~sh ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~sh ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.7 !<dev-libs/protobuf-3[java(-)] >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0/11
 SRC_URI=https://github.com/google/protobuf/archive/v3.1.0.tar.gz -> protobuf-3.1.0.tar.gz
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=f4a5fc0eeb1e71c3b7a9b62d19482855
+_md5_=b40a1b8e0d73f9dde59d5dbb3b8f9326

metadata/md5-cache/dev-lang/orc-0.4.25

@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=app-arch/xz-utils >=dev-util/gtk-doc-am-1.12 >=sys-apps/sed-4
-DESCRIPTION=The Oil Runtime Compiler, a just-in-time compiler for array operations
-EAPI=5
-HOMEPAGE=https://gstreamer.freedesktop.org/
-IUSE=examples pax_kernel 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=amd64 arm hppa ppc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD BSD-2
-SLOT=0
-SRC_URI=https://gstreamer.freedesktop.org/src/orc/orc-0.4.25.tar.xz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-multilib	77afca16a6cb82823eed6366a10e7f75	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	pax-utils	4c2654a34ebe732e85fda354f6ee642f	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=800b5bdfa30b640218e07968dcfd2613

metadata/md5-cache/dev-lang/orc-0.4.26

@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=app-arch/xz-utils >=dev-util/gtk-doc-am-1.12 >=sys-apps/sed-4
-DESCRIPTION=The Oil Runtime Compiler, a just-in-time compiler for array operations
-EAPI=5
-HOMEPAGE=https://gstreamer.freedesktop.org/
-IUSE=examples pax_kernel 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=~amd64 ~arm ~hppa ~ppc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD BSD-2
-SLOT=0
-SRC_URI=https://gstreamer.freedesktop.org/src/orc/orc-0.4.26.tar.xz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-multilib	77afca16a6cb82823eed6366a10e7f75	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	pax-utils	4c2654a34ebe732e85fda354f6ee642f	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=488b74b9cbda47c45454d2f6d059fb12

metadata/md5-cache/dev-libs/softhsm-2.2.0-r2

@@ -10,4 +10,4 @@ RDEPEND=sys-devel/gcc:=[cxx] dev-db/sqlite:3 !libressl? ( dev-libs/openssl:=[bin
 SLOT=2
 SRC_URI=http://www.opendnssec.org/files/source/softhsm-2.2.0.tar.gz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	ea170b525f6a38a006be05c9d9429f13	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=1912b6cba9624610a0aa7fcd084d7609
+_md5_=cd9295f33b4e98a1a9482110190f3e22

metadata/md5-cache/dev-perl/Crypt-OpenSSL-DSA-0.190.0

@@ -4,10 +4,10 @@ DESCRIPTION=Digital Signature Algorithm using OpenSSL
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Crypt-OpenSSL-DSA/
 IUSE=libressl
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~hppa ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KM/KMX/Crypt-OpenSSL-DSA-0.19.tar.gz
 _eclasses_=multiprocessing	7bb10a841be2368af0c00f27dd67560b	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	f6549146ea31a902e20b5f2e6f244358
-_md5_=586401434d5b3c4664683a7b64da3680
+_md5_=bf6b2dabdc5b6731e677bbb21d2b6e17

metadata/md5-cache/dev-perl/Net-DNS-SEC-1.20.0

@@ -4,10 +4,10 @@ DESCRIPTION=DNSSEC extensions to Net::DNS
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Net-DNS-SEC/
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~x86
+KEYWORDS=~alpha ~amd64 ~hppa ~x86
 LICENSE=MIT
 RDEPEND=>=dev-perl/Crypt-OpenSSL-Bignum-0.40.0 >=dev-perl/Crypt-OpenSSL-DSA-0.140.0 >=dev-perl/Crypt-OpenSSL-RSA-0.270.0 >=virtual/perl-File-Spec-0.860.0 >=virtual/perl-MIME-Base64-2.110.0 >=dev-perl/Net-DNS-1.10.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NL/NLNETLABS/Net-DNS-SEC-1.02.tar.gz
 _eclasses_=multiprocessing	7bb10a841be2368af0c00f27dd67560b	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	f6549146ea31a902e20b5f2e6f244358
-_md5_=e5dc0a48ea0abe4246a02da6c4aa16cd
+_md5_=8b73b67a3bceed3ca9d8c41e28d6fae7

metadata/md5-cache/dev-perl/pcsc-perl-1.4.14

@@ -1,12 +1,12 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=sys-apps/pcsc-lite-1.6.0 dev-lang/perl:=[-build(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=sys-apps/pcsc-lite-1.6.0 dev-lang/perl:=
 DESCRIPTION=A Perl Module for PC/SC SmartCard access
-EAPI=5
+EAPI=6
 HOMEPAGE=http://ludovic.rousseau.free.fr/softwares/pcsc-perl/
 KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86
 LICENSE=GPL-2
-RDEPEND=dev-lang/perl:=[-build(-)]
+RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=http://ludovic.rousseau.free.fr/softwares/pcsc-perl/pcsc-perl-1.4.14.tar.bz2
-_eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	7bb10a841be2368af0c00f27dd67560b	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	f6549146ea31a902e20b5f2e6f244358	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	unpacker	45d07319df5f40ee6af58418b0f930be
-_md5_=f6d5e131eac148502d2481a4f220399e
+_eclasses_=multiprocessing	7bb10a841be2368af0c00f27dd67560b	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	f6549146ea31a902e20b5f2e6f244358
+_md5_=58d3e7166f1409872335c6220dcb428c

metadata/md5-cache/dev-python/backports-shutil_which-3.5.1

@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] 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(-)]
+DESCRIPTION=Backport of shutil.which from Python 3.3
+EAPI=6
+HOMEPAGE=https://pypi.python.org/pypi/backports.shutil_which/ https://github.com/minrk/backports.shutil_which
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=dev-python/backports[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] 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
+SRC_URI=mirror://pypi/b/backports.shutil_which/backports.shutil_which-3.5.1.tar.gz
+_eclasses_=distutils-r1	f1707af2d2ad4cf700a9e690de6ed855	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	7bb10a841be2368af0c00f27dd67560b	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d275302cd06aedef2ba08f81f3104206	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=0b1e747d7e747d4b7ff1b56d78608e0b

metadata/md5-cache/dev-python/nbdime-0.1.2

@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/nbformat[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/six[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/colorama[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/requests[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] www-servers/tornado[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] webtools? ( net-libs/nodejs[npm] ) test? ( dev-python/pytest[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pytest-cov[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pytest-timeout[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/jsonschema[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/mock[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/requests[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DESCRIPTION=Diff and merge of Jupyter Notebooks
+EAPI=6
+HOMEPAGE=http://jupyter.org
+IUSE=test webtools python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-python/nbformat[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/six[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/colorama[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/requests[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] www-servers/tornado[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] webtools? ( net-libs/nodejs[npm] ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=mirror://pypi/n/nbdime/nbdime-0.1.2.tar.gz
+_eclasses_=distutils-r1	f1707af2d2ad4cf700a9e690de6ed855	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	7bb10a841be2368af0c00f27dd67560b	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d275302cd06aedef2ba08f81f3104206	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=4a1d2f0dc086cc85ec769135bb5218fe

metadata/md5-cache/dev-python/notebook-4.3.2

@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install preinst prepare test
+DEPEND=>=dev-libs/mathjax-2.4 dev-python/jinja[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(-)] >=dev-python/terminado-0.3.3[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(-)] >=www-servers/tornado-4.0[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(-)] dev-python/ipython_genutils[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(-)] >=dev-python/traitlets-4.2.1[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(-)] dev-python/jupyter_core[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(-)] dev-python/jupyter_client[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(-)] dev-python/nbformat[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(-)] >=dev-python/nbconvert-4.2.0[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(-)] dev-python/ipykernel[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(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( python_targets_python2_7? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/nose-0.10.1[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(-)] dev-python/requests[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(-)] dev-python/coverage[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) doc? ( app-text/pandoc >=dev-python/ipython-4.0.0[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(-)] >=dev-python/sphinx-1.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DESCRIPTION=Jupyter Interactive Notebook
+EAPI=6
+HOMEPAGE=http://jupyter.org
+IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-libs/mathjax-2.4 dev-python/jinja[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(-)] >=dev-python/terminado-0.3.3[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(-)] >=www-servers/tornado-4.0[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(-)] dev-python/ipython_genutils[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(-)] >=dev-python/traitlets-4.2.1[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(-)] dev-python/jupyter_core[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(-)] dev-python/jupyter_client[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(-)] dev-python/nbformat[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(-)] >=dev-python/nbconvert-4.2.0[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(-)] dev-python/ipykernel[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=mirror://pypi/n/notebook/notebook-4.3.2.tar.gz
+_eclasses_=distutils-r1	f1707af2d2ad4cf700a9e690de6ed855	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	7bb10a841be2368af0c00f27dd67560b	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d275302cd06aedef2ba08f81f3104206	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=5910c5aaee397e0c18f1e360ef179e47

metadata/md5-cache/dev-python/pickleshare-0.7.4

@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python2_7? ( dev-python/pathlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/path-py-6.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DESCRIPTION=A small 'shelve' like datastore with concurrency support
+EAPI=6
+HOMEPAGE=https://github.com/pickleshare/pickleshare
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=python_targets_python2_7? ( dev-python/pathlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/path-py-6.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://pypi/p/pickleshare/pickleshare-0.7.4.tar.gz
+_eclasses_=distutils-r1	f1707af2d2ad4cf700a9e690de6ed855	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	7bb10a841be2368af0c00f27dd67560b	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d275302cd06aedef2ba08f81f3104206	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=a176fd9da10cd38f95a61e9a5584ea5e

metadata/md5-cache/dev-ruby/public_suffix-2.0.5

@@ -4,11 +4,11 @@ DESCRIPTION=Parse and decompose a domain name into top level domain, domain and
 EAPI=5
 HOMEPAGE=https://simonecarletti.com/code/publicsuffix-ruby/
 IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
 REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=2
 SRC_URI=mirror://rubygems/public_suffix-2.0.5.gem
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-fakegem	2b249022d4895a29827658b7d630c461	ruby-ng	934780d41ab18a9ff091703f511371be	ruby-utils	382c3a262907e1219a21618dfd1a01a0	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=e1ba05b8212d655ccd4e48bb6722693d
+_md5_=6a43c60f79cc56c14345fee007ead156

metadata/md5-cache/dev-scheme/guile-json-0.6.0

@@ -0,0 +1,11 @@
+DEFINED_PHASES=-
+DEPEND=dev-scheme/guile
+DESCRIPTION=JSON module for Guile
+EAPI=6
+HOMEPAGE=http://savannah.nongnu.org/projects/guile-json/
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-3+
+RDEPEND=dev-scheme/guile
+SLOT=0
+SRC_URI=http://download.savannah.gnu.org/releases/guile-json/guile-json-0.6.0.tar.gz
+_md5_=e6cc256913f1119ce0c61076bb407ac8

metadata/md5-cache/dev-tcltk/expect-5.45

@@ -4,10 +4,10 @@ DESCRIPTION=tool for automating interactive applications
 EAPI=5
 HOMEPAGE=http://expect.nist.gov/
 IUSE=debug doc threads
-KEYWORDS=alpha amd64 arm hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~m68k-mint ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~m68k-mint ~x86-solaris
 LICENSE=BSD
 RDEPEND=>=dev-lang/tcl-8.2:0[threads?]
 SLOT=0
 SRC_URI=mirror://sourceforge/expect/expect5.45.tar.gz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	ea170b525f6a38a006be05c9d9429f13	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=57304f7e2bc5905448381130ea08c895
+_md5_=b67973b8861c6776c73b2d707586c55f

metadata/md5-cache/dev-vcs/git-merge-changelog-20170131

@@ -0,0 +1,9 @@
+DEFINED_PHASES=install
+DESCRIPTION=Git merge driver for GNU style ChangeLog files
+EAPI=6
+HOMEPAGE=https://www.gnu.org/software/gnulib/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~ulm/distfiles/git-merge-changelog-20170131.tar.xz
+_md5_=17b32e4b97811f75d1c19bf932430170

metadata/md5-cache/games-util/pogo-manager-bin-0.1.4

@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst
-DEPEND=app-arch/unzip
-DESCRIPTION=Pokemon Go manager
-EAPI=6
-HOMEPAGE=https://github.com/Wolfsblvt/BlossomsPokemonGoManager
-KEYWORDS=~amd64 ~x86
-LICENSE=CC-BY-NC-SA-4.0
-RDEPEND=|| ( dev-java/oracle-jdk-bin:1.8[javafx] dev-java/oracle-jre-bin:1.8[javafx] )
-SLOT=0
-SRC_URI=https://github.com/Wolfsblvt/BlossomsPokemonGoManager/releases/download/v0.1.4/BPGM_v0.1.4.zip -> pogo-manager-bin-0.1.4.zip
-_md5_=4218f1023018cb8e14b8ccaa850900ea

metadata/md5-cache/games-util/pogo-manager-bin-0.1.5

@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst
-DEPEND=app-arch/unzip
-DESCRIPTION=Pokemon Go manager
-EAPI=6
-HOMEPAGE=https://github.com/Wolfsblvt/BlossomsPokemonGoManager
-KEYWORDS=~amd64 ~x86
-LICENSE=CC-BY-NC-SA-4.0
-RDEPEND=|| ( dev-java/oracle-jdk-bin:1.8[javafx] dev-java/oracle-jre-bin:1.8[javafx] )
-SLOT=0
-SRC_URI=https://github.com/Wolfsblvt/BlossomsPokemonGoManager/releases/download/v0.1.5/BPGM_v0.1.5.zip -> pogo-manager-bin-0.1.5.zip
-_md5_=4218f1023018cb8e14b8ccaa850900ea

metadata/md5-cache/games-util/pogo-manager-bin-0.1.6

@@ -3,9 +3,9 @@ DEPEND=app-arch/unzip
 DESCRIPTION=Pokemon Go manager
 EAPI=6
 HOMEPAGE=https://github.com/Wolfsblvt/BlossomsPokemonGoManager
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=CC-BY-NC-SA-4.0
 RDEPEND=|| ( dev-java/oracle-jdk-bin:1.8[javafx] dev-java/oracle-jre-bin:1.8[javafx] )
 SLOT=0
 SRC_URI=https://github.com/Wolfsblvt/BlossomsPokemonGoManager/releases/download/v0.1.6/BPGM_v0.1.6.zip -> pogo-manager-bin-0.1.6.zip
-_md5_=4218f1023018cb8e14b8ccaa850900ea
+_md5_=38bb9bb450b7293013137f93a06902ff

metadata/md5-cache/gnome-base/gnome-control-center-3.20.2-r1

@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.44.0:2[dbus] >=x11-libs/gdk-pixbuf-2.23.0:2 >=x11-libs/gtk+-3.20.3:3[X,wayland?] >=gnome-base/gsettings-desktop-schemas-3.19.3 >=gnome-base/gnome-desktop-3.19.93:3= >=gnome-base/gnome-settings-daemon-3.19.1[colord?,policykit] >=dev-libs/libpwquality-1.2.2 dev-libs/libxml2:2 gnome-base/libgtop:2= media-libs/fontconfig >=media-libs/libcanberra-0.13[gtk3] >=media-sound/pulseaudio-2[glib] >=sys-auth/polkit-0.97 >=sys-power/upower-0.99:= >=x11-libs/libnotify-0.7.3:0= virtual/libgudev virtual/opengl x11-apps/xmodmap x11-libs/cairo x11-libs/libX11 x11-libs/libXxf86misc >=x11-libs/libXi-1.2 bluetooth? ( >=net-wireless/gnome-bluetooth-3.18.2:= ) colord? ( net-libs/libsoup:2.4 >=x11-misc/colord-0.1.34:0= >=x11-libs/colord-gtk-0.1.24 ) cups? ( >=net-print/cups-1.4[dbus] >=net-fs/samba-4.0.0[client] ) gnome-online-accounts? ( >=media-libs/grilo-0.3.0:0.3= >=net-libs/gnome-online-accounts-3.15.1:= ) i18n? ( >=app-i18n/ibus-1.5.2 ) kerberos? ( app-crypt/mit-krb5 ) networkmanager? ( >=gnome-extra/nm-applet-0.9.7.995 >=net-misc/networkmanager-0.9.8:=[modemmanager] >=net-misc/modemmanager-0.7.990 ) v4l? ( media-libs/clutter-gtk:1.0 >=media-video/cheese-3.5.91 ) input_devices_wacom? ( >=dev-libs/libwacom-0.7 >=media-libs/clutter-1.11.3:1.0 media-libs/clutter-gtk:1.0 >=x11-libs/libXi-1.2 ) x11-proto/xproto x11-proto/xf86miscproto x11-proto/kbproto dev-libs/libxml2:2 dev-libs/libxslt >=dev-util/intltool-0.40.1 >=sys-devel/gettext-0.17 virtual/pkgconfig gnome-base/gnome-common !<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 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=dev-libs/glib-2.44.0:2[dbus] >=x11-libs/gdk-pixbuf-2.23.0:2 >=x11-libs/gtk+-3.20.3:3[X,wayland?] >=gnome-base/gsettings-desktop-schemas-3.19.3 >=gnome-base/gnome-desktop-3.19.93:3= >=gnome-base/gnome-settings-daemon-3.19.1[colord?,policykit] >=dev-libs/libpwquality-1.2.2 dev-libs/libxml2:2 gnome-base/libgtop:2= media-libs/fontconfig >=media-libs/libcanberra-0.13[gtk3] >=media-sound/pulseaudio-2[glib] >=sys-auth/polkit-0.97 >=sys-power/upower-0.99:= >=x11-libs/libnotify-0.7.3:0= virtual/libgudev virtual/opengl x11-apps/xmodmap x11-libs/cairo x11-libs/libX11 x11-libs/libXxf86misc >=x11-libs/libXi-1.2 bluetooth? ( >=net-wireless/gnome-bluetooth-3.18.2:= ) colord? ( net-libs/libsoup:2.4 >=x11-misc/colord-0.1.34:0= >=x11-libs/colord-gtk-0.1.24 ) cups? ( >=net-print/cups-1.4[dbus] >=net-fs/samba-4.0.0[client] ) gnome-online-accounts? ( >=media-libs/grilo-0.3.0:0.3= >=net-libs/gnome-online-accounts-3.15.1:= ) i18n? ( >=app-i18n/ibus-1.5.2 ) kerberos? ( app-crypt/mit-krb5 ) networkmanager? ( >=gnome-extra/nm-applet-0.9.7.995 >=net-misc/networkmanager-0.9.8:=[modemmanager] >=net-misc/modemmanager-0.7.990 ) v4l? ( media-libs/clutter-gtk:1.0 >=media-video/cheese-3.5.91 ) input_devices_wacom? ( >=dev-libs/libwacom-0.7 >=media-libs/clutter-1.11.3:1.0 media-libs/clutter-gtk:1.0 >=x11-libs/libXi-1.2 ) x11-proto/xproto x11-proto/xf86miscproto x11-proto/kbproto dev-libs/libxml2:2 dev-libs/libxslt >=dev-util/intltool-0.40.1 >=sys-devel/gettext-0.17 virtual/pkgconfig gnome-base/gnome-common sys-devel/autoconf-archive !<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 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=GNOME's main interface to configure various aspects of the desktop
 EAPI=6
 HOMEPAGE=https://git.gnome.org/browse/gnome-control-center/
@@ -11,4 +11,4 @@ RDEPEND=>=dev-libs/glib-2.44.0:2[dbus] >=x11-libs/gdk-pixbuf-2.23.0:2 >=x11-libs
 SLOT=2
 SRC_URI=mirror://gnome/sources/gnome-control-center/3.20/gnome-control-center-3.20.2.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	ea170b525f6a38a006be05c9d9429f13	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	c4ea6f9f250b5355e9e948e7007dead0	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=c148e0a8e208d4701f2f9c5713ed113a
+_md5_=2de4910cc91ee3755b87807bc11ef22d

metadata/md5-cache/media-libs/exiftool-10.41

@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl:=
+DESCRIPTION=Read and write meta information in image, audio and video files
+EAPI=6
+HOMEPAGE=http://www.sno.phy.queensu.ca/~phil/exiftool/ http://search.cpan.org/dist/Image-ExifTool/
+IUSE=doc
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x64-macos
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+SLOT=0
+SRC_URI=http://www.sno.phy.queensu.ca/~phil/exiftool/Image-ExifTool-10.41.tar.gz
+_eclasses_=multiprocessing	7bb10a841be2368af0c00f27dd67560b	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	f6549146ea31a902e20b5f2e6f244358
+_md5_=4601702180ec547ebbe0d32fbc7b8e29

metadata/md5-cache/media-libs/libmediainfo-0.7.92.1

@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=sys-libs/zlib dev-libs/tinyxml2:= >=media-libs/libzen-0.4.34[static-libs=] curl? ( net-misc/curl ) mms? ( >=media-libs/libmms-0.6.1[static-libs=] ) virtual/pkgconfig doc? ( app-doc/doxygen ) !<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=MediaInfo libraries
+EAPI=6
+HOMEPAGE=http://mediaarea.net/mediainfo/
+IUSE=curl doc mms static-libs
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2
+RDEPEND=sys-libs/zlib dev-libs/tinyxml2:= >=media-libs/libzen-0.4.34[static-libs=] curl? ( net-misc/curl ) mms? ( >=media-libs/libmms-0.6.1[static-libs=] )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://mediaarea.net/download/source/libmediainfo/0.7.92.1/libmediainfo_0.7.92.1.tar.xz
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
+_md5_=14f66b2467f6935775d9a157784578f7

metadata/md5-cache/media-video/mediainfo-0.7.92.1

@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup
+DEPEND=sys-libs/zlib >=media-libs/libzen-0.4.34 ~media-libs/libmediainfo-0.7.92.1[curl=,mms=] wxwidgets? ( x11-libs/wxGTK:3.0[X] ) 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
+DESCRIPTION=MediaInfo supplies technical and tag information about media files
+EAPI=6
+HOMEPAGE=http://mediaarea.net/mediainfo/
+IUSE=curl mms wxwidgets
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2
+RDEPEND=sys-libs/zlib >=media-libs/libzen-0.4.34 ~media-libs/libmediainfo-0.7.92.1[curl=,mms=] wxwidgets? ( x11-libs/wxGTK:3.0[X] )
+SLOT=0
+SRC_URI=http://mediaarea.net/download/source/mediainfo/0.7.92.1/mediainfo_0.7.92.1.tar.xz
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	wxwidgets	9b34ce3ca77f4e418e8fd9951c4c1cb1
+_md5_=3972e458c7d9d38be40423894d94e826