Sync with portage [Wed Jan 4 18:27:14 MSK 2017].

7 years ago · 535506be09
parent 54408d755d
commit 535506be09
133 changed files with 1120 additions and 2033 deletions
--- a/app-crypt/gnupg/files/gnupg-2.1.17-dirmngr-Strip-root-zone-suffix-from-libdns-cname-res.patch
+++ b/app-crypt/gnupg/files/gnupg-2.1.17-dirmngr-Strip-root-zone-suffix-from-libdns-cname-res.patch
@ -0,0 +1,46 @@
+From b200e636ab20d2aa93d9f71f3789db5a04af0a56 Mon Sep 17 00:00:00 2001
+From: Werner Koch <wk@gnupg.org>
+Date: Mon, 2 Jan 2017 10:00:33 +0100
+Subject: [PATCH] dirmngr: Strip root zone suffix from libdns cname results.
+
+* dirmngr/dns-stuff.c (resolve_name_libdns): Strip trailing dot.
+(get_dns_cname_libdns): Ditto.
+--
+
+Signed-off-by: Werner Koch <wk@gnupg.org>
+---
+ dirmngr/dns-stuff.c | 11 +++++++++++
+ 1 file changed, 11 insertions(+)
+
+diff --git a/dirmngr/dns-stuff.c b/dirmngr/dns-stuff.c
+index a31b073..f2e1df9 100644
+--- a/dirmngr/dns-stuff.c
+++ b/dirmngr/dns-stuff.c
+@@ -732,6 +732,10 @@ resolve_name_libdns (const char *name, unsigned short port,
+               err = gpg_error_from_syserror ();
+               goto leave;
+             }
+          /* Libdns appends the root zone part which is problematic
+           * for most other functions - strip it.  */
+          if (**r_canonname && (*r_canonname)[strlen (*r_canonname)-1] == '.')
+            (*r_canonname)[strlen (*r_canonname)-1] = 0;
+         }
+ 
+       dai = xtrymalloc (sizeof *dai + ent->ai_addrlen -1);
+@@ -1899,6 +1903,13 @@ get_dns_cname_libdns (const char *name, char **r_cname)
+   *r_cname = xtrystrdup (cname.host);
+   if (!*r_cname)
+     err = gpg_error_from_syserror ();
+  else
+    {
+      /* Libdns appends the root zone part which is problematic
+       * for most other functions - strip it.  */
+      if (**r_cname && (*r_cname)[strlen (*r_cname)-1] == '.')
+        (*r_cname)[strlen (*r_cname)-1] = 0;
+    }
+ 
+  leave:
+   dns_free (ans);
+-- 
+2.8.1
+
--- a/app-crypt/gnupg/gnupg-2.1.17-r1.ebuild
+++ b/app-crypt/gnupg/gnupg-2.1.17-r1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -50,7 +50,8 @@ S="${WORKDIR}/${MY_P}"

 src_prepare() {
 	default
-	epatch "${FILESDIR}/${PN}-2.1.16-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch"
+	epatch "${FILESDIR}/${PN}-2.1.16-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch" \
+		   "${FILESDIR}/${P}-dirmngr-Strip-root-zone-suffix-from-libdns-cname-res.patch"
 	epatch_user
 }

@ -81,7 +82,6 @@ src_configure() {
 		--enable-gpg \
 		--enable-gpgsm \
 		--enable-large-secmem \
-		--without-adns \
 		"${myconf[@]}" \
 		$(use_enable bzip2) \
 		$(use_enable gnutls) \
--- a/app-emulation/docker-compose/Manifest
+++ b/app-emulation/docker-compose/Manifest
@ -1,2 +1,3 @@
+DIST docker-compose-1.10.0_pre20161220.tar.gz 219218 SHA256 3e5e0a4dbe52979f32170e9572a6574ff0de97969fdc647f013f8ad4b383aa4f SHA512 5c6ad437228916d8ae713a553c73b9aeb10302fd4ea21b01911718f593eacd6b6a9c439a9a239f754daaafda6363a67300f60b5d9cb820679574b3a3b6a2df75 WHIRLPOOL da8b85e9275c716083b1688cbc067da26e6547bc9fe5eb90ced191f1313830fe7ffa25ad67b4f4cff9534425bbc3224ba80d6bc6d5087128b52af8fa4ad09a5f
 DIST docker-compose-1.8.1.tar.gz 151478 SHA256 1c72725a0a5cd41f56021cb51c6cba86932fb5b4155378ce883500d2644efc84 SHA512 8b33bf5b1fa3eeb5c5724e7ada8c61cf054a5cc1af68c9c9ab40955958f0f6a537f5bad8d54367dddc5ae66930d0555c83da47a48fc43f623d92fd60ad01cb62 WHIRLPOOL 5dca7ff3303833a45b0e7f462a375c58f68f4a19659e66b93bfc564701df8dfba70311151eb674a84c5a3b81703ddcc8809c6c7b89574c738ac9db96a32c93e6
 DIST docker-compose-1.9.0.tar.gz 156392 SHA256 98fb664c79c06a0777af2540b83eaa63c6a05ae7eb9e7417193899df2f96e27f SHA512 9d145807406ce4de3e91245bba4f774d80e0a39a81115fc111624e1a56b7e8a7505d49700df68b062efc65f8de661c8dca08067615a7504b3d7adf6c15d156d0 WHIRLPOOL ca64f1e8e9c830c3cab01193be0d809cbb80fbea2a451dd7f51ff688d76a376a047bdc781471b292de06a275f933ebf755c4b24cc60fe19fe77fb4729101b9e5
--- a/app-emulation/docker-compose/docker-compose-1.10.0_pre20161220.ebuild
+++ b/app-emulation/docker-compose/docker-compose-1.10.0_pre20161220.ebuild
@ -0,0 +1,67 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4} )
+
+inherit bash-completion-r1 distutils-r1 vcs-snapshot
+
+GIT_COMMIT="09690e1758d39f1213a9f44ab027ad69e1de0653"
+
+DESCRIPTION="Multi-container orchestration for Docker"
+HOMEPAGE="https://www.docker.com/"
+SRC_URI="https://github.com/docker/compose/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+CDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}]
+	<dev-python/cached-property-2[${PYTHON_USEDEP}]
+	>=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}]
+	<dev-python/dockerpty-0.5[${PYTHON_USEDEP}]
+	>=dev-python/docker-py-2.0.0[${PYTHON_USEDEP}]
+	<dev-python/docker-py-3.0[${PYTHON_USEDEP}]
+	>=dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
+	<dev-python/docopt-0.7[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.5.1[${PYTHON_USEDEP}]
+	<dev-python/jsonschema-3[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
+	<dev-python/pyyaml-4[${PYTHON_USEDEP}]
+	!~dev-python/requests-2.11.0[${PYTHON_USEDEP}]
+	<dev-python/requests-2.12[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.6.1[${PYTHON_USEDEP}]
+	>=dev-python/six-1.3.0[${PYTHON_USEDEP}]
+	<dev-python/six-2[${PYTHON_USEDEP}]
+	>=dev-python/texttable-0.8.1[${PYTHON_USEDEP}]
+	<dev-python/texttable-0.9[${PYTHON_USEDEP}]
+	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
+	<dev-python/websocket-client-1.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '>=dev-python/enum34-1.0.4[${PYTHON_USEDEP}]' 'python2_7' )
+	$(python_gen_cond_dep '<dev-python/enum34-2[${PYTHON_USEDEP}]' 'python2_7' )
+"
+DEPEND="
+	${CDEPEND}
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]' 'python2_7' )
+	)
+"
+RDEPEND="${CDEPEND}"
+
+python_test() {
+	${PYTHON} -m pytest tests/unit || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	newbashcomp contrib/completion/bash/docker-compose ${PN}
+
+	insinto /usr/share/zsh/site-functions
+	doins contrib/completion/zsh/*
+
+	distutils-r1_python_install_all
+}
--- a/app-misc/wcd/Manifest
+++ b/app-misc/wcd/Manifest
@ -1,3 +1,3 @@
 DIST wcd-5.2.7.tar.gz 622613 SHA256 e5f56824e054c6726186271b20a5de3c5b167116b97785a925907981cf3e3b39 SHA512 9f5b89d8160f685b729234cc8c03f16b795797dd6eaf2d9e1bbf1949b27ef971908b78642679d3bf1d99b128b390cd5dbd211e4ff03b0539dd287c578088e02e WHIRLPOOL 3354e380dceaed394e0eb9bac3f474edc819270a117baf5812a1e7252b2cef207862746af2b21dd71de837459bc6281a45a9099f5a6351def49e3c1ce780960d
-DIST wcd-5.3.2.tar.gz 595071 SHA256 a16434cb7a177ec8e9be67a1cfe7f6406a7c9190726d0ead5c44afdc4b8d3612 SHA512 3bc8fc27f170576530066bdd0af66887a4ffdd8824c36985d55588c575729b25b4c713cf67f2d70c820fdb7ed7fdaef89375673bc96c7251e74f786fb9501c08 WHIRLPOOL eb198f8ea14fd5d9d4f092abce00ece7e7428afe26bb7a4cdb43ee487ad4bc5fae27e0a3c7b357007037ab2d8d4cad6f63f08f9ca2ff90db7b64cf09521fe51b
 DIST wcd-5.3.3.tar.gz 598963 SHA256 4976545e50601eb47635f230804a7e654a83b9c6ad35c0a7b44d2b3ca264f6eb SHA512 df9b2fffa0bd3c558b2c61633d30a092e79aa8c7a08a64281cff6f0b9b7de5fc4a632d16f74ec5b4166922cf5da6048edfc8a73e0ddae308d3f986f3bd8a0f67 WHIRLPOOL f287d5583c03113201b8a43b9b59f55bf1dc30428cd436586ccbaf6dfc086480dd2ccdb7c6e972d766c85603149d08561abd0d28d5a52742f895b9b23098772d
+DIST wcd-5.3.4.tar.gz 610630 SHA256 8c56a76016ff6b5a4be656dd563bf8f58c7be3a6101cef5485e544b12211dae6 SHA512 fdb6e000876fffbc7bce6e6157282c2b8ef9929c896e5dbd8533314d575cf31656df76cd5c408bb2e495a1fda7f179b122ea2a58da94d5d55d1e2b9c658adc94 WHIRLPOOL adb42aae240fd3ae40fc03418d2ace7ea9d72f0aaec38ab37a231b27ba630dd3a00d0e0af3bca8d05932cfb29019bfeed1ad0dcbbb1998c86b324c20d211d87b
--- a/app-misc/wcd/files/wcd-5.3.4-gentoo.patch
+++ b/app-misc/wcd/files/wcd-5.3.4-gentoo.patch
@ -0,0 +1,67 @@
+--- wcd-5.3.4/src/Makefile
+++ wcd-5.3.4/src/Makefile
+@@ -46,12 +46,12 @@
+ 
+ CC		?= gcc
+ STATIC		=
+-STRIP		= strip
+STRIP		=
+ 
+ ENABLE_NLS = 1
+ 
+ PACKAGE		= wcd
+-EXT		= .exe
+EXT		=
+ PROGRAM         = $(PACKAGE)$(EXT)
+ BIN		= $(PROGRAM)
+ 
+@@ -334,9 +334,9 @@
+ # possible values: ncurses, curses, pdcurses, pdcursesw or <empty>
+ 
+ ifdef UCS
+-	CURSES = ncursesw
+	CURSES = $(shell pkg-config --libs ncursesw)
+ else
+-	CURSES = ncurses
+	CURSES = $(shell pkg-config --libs ncurses)
+ endif
+ 
+ 
+@@ -366,7 +366,7 @@
+ 
+ ifneq (,$(CURSES))
+ 	DEFS_CURSES = -DWCD_USECURSES
+-	LIB_CURSES  = -l$(CURSES)
+	LIB_CURSES  = $(CURSES)
+ ifeq (os/2,$(OS))
+ 	LIB_CURSES  += -ltinfo
+ endif
+@@ -456,15 +456,15 @@
+ endif
+ 
+ LDFLAGS_USER   =
+-LDFLAGS		= $(RPM_OPT_FLAGS) \
+LIBS		= $(RPM_OPT_FLAGS) \
+ 	          $(LDFLAGS_EXTRA) \
+ 		  $(NLFLAG) \
+ 		  $(LDFLAG_STATIC) \
+ 		  $(LDFLAGS_USER)
+ 
+-LIBS = $(LIB_CURSES) \
+-       $(LIB_UNISTRING) \
+-       $(LIBS_EXTRA)
+LIBS += $(LIB_CURSES) \
+	$(LIB_UNISTRING) \
+	$(LIBS_EXTRA)
+ 
+ DEFS_USER   =
+ DEFS		= $(DEF_UNIX) $(DEFS_CURSES) $(EXTRA_DEFS) $(DEFS_USER)
+@@ -521,7 +521,7 @@
+ 
+ $(BIN): $(OBJS1)
+ 	$(MAKE) status
+-	$(CC) $(OBJS1) $(LDFLAGS) $(LIBS) -o $@
+	$(CC) $(LDFLAGS) $(OBJS1) -o $@ $(LIBS)
+ 
+ %.o: %.c
+ 	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(DEFS) -c $< -o $@
--- a/app-misc/wcd/wcd-5.3.4.ebuild
+++ b/app-misc/wcd/wcd-5.3.4.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$

@ -25,7 +25,7 @@ RDEPEND="${CDEPEND}"
 S="${WORKDIR}"/${P}/src

 PATCHES=(
-	"${FILESDIR}"/${PN}-5.2.5-gentoo.patch
+	"${FILESDIR}"/${PN}-5.3.4-gentoo.patch
 )

 src_prepare() {
@ -45,7 +45,7 @@ src_compile() {
 }

 src_install() {
-	local DOCS="../README.txt"
+	local DOCS=( ../README.txt )
 	default
 	emake DESTDIR="${D}" DOTWCD=1 install-profile sysconfdir="/etc"
 }
--- a/dev-lang/mujs/Manifest
+++ b/dev-lang/mujs/Manifest
@ -1,2 +1,3 @@
 DIST mujs-0_p20150202.tar.gz 96743 SHA256 c757bfec7ad9864d85d710cd0b413a4909e9dfc418e036e7b0692bb6acd25305 SHA512 28a1b95fcf09098e0882fe0bc989696961c39ae9d4fb2d00f61b84778431b1c9973f1dcc3c9dee277ba4827b2bf1fd323502d9c6469cb5179c6fb1a04bbbd0e1 WHIRLPOOL 17166bad1594bcee38569531ded73abf24f99b98d7434f535775287d1baa16f2106a53a05359d40c504fbf64981e9bd92ccdbab14a41afa03d9a0d34dd553a94
 DIST mujs-0_p20160504.tar.gz 104982 SHA256 8c3bf2bc7a1b0dadf4ef5078aa4234692a98a979890d7866672127b375d3948f SHA512 13ba2bb9c2d6f15787fc2ed79534af511d100b1dadcac92b729a27815e4f8d8eb10e507f010d1be32f927b54e4a41d395de97cbc645ab34db012267410bc6d47 WHIRLPOOL 2f328c7fe7744ded0d13c00dbd5e6813bf05d7f3ef977c4901c02f00764c82d6c06ceb3b8c16a046c93889eb1ac27cb5f5b1f0472de000defdbc54176a1863bd
+DIST mujs-0_p20161202.tar.gz 105413 SHA256 45754e225357d7707905e14a8709057b8089fb3977fad8611f220aececb5507c SHA512 90dd1bce44740715a6f642bdb376be230c4a03c7970c2026479cf014a080b98b56a2131ca7ef8bf9c05b91285fe7dcc21dd4ca83879750351d57088408a62cbc WHIRLPOOL 5450af5567c19903a1548103b0b4a6d0f8cf83a68f3c377be0dd455cea8cf287dbd821db144c03a8322f0064f535a4540aeb234939b3e56c32efd1090624ccaa
--- a/dev-lang/mujs/mujs-0_p20161202.ebuild
+++ b/dev-lang/mujs/mujs-0_p20161202.ebuild
@ -0,0 +1,31 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit flag-o-matic toolchain-funcs vcs-snapshot
+
+DESCRIPTION="lightweight Javascript interpreter"
+HOMEPAGE="http://mujs.com/"
+SRC_URI="http://git.ghostscript.com/?p=mujs.git;a=snapshot;h=fd003eceda531e13fbdd1aeb6e9c73156496e569;sf=tgz -> ${P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0_p20150202-Makefile.patch"
+	# workaround for linkage of app-text/mupdf-1.7a
+	# TODO: generate a shared library and IUSE=static-libs
+)
+
+src_prepare() {
+	default
+	append-cflags -fPIC
+	tc-export CC
+}
--- a/dev-libs/libxml2/libxml2-2.9.4-r1.ebuild
+++ b/dev-libs/libxml2/libxml2-2.9.4-r1.ebuild
@ -13,7 +13,7 @@ HOMEPAGE="http://www.xmlsoft.org/"

 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="debug examples icu ipv6 lzma python readline static-libs test"

 XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite"
--- a/dev-ml/OCaml-ImageMagick/OCaml-ImageMagick-0.34-r1.ebuild
+++ b/dev-ml/OCaml-ImageMagick/OCaml-ImageMagick-0.34-r1.ebuild
@ -1,15 +1,17 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

 EAPI=6

+inherit findlib
+
 DESCRIPTION="Provide the ImageMagick methods to OCaml"
 HOMEPAGE="http://www.linux-nantes.org/~fmonnier/OCaml/ImageMagick/"
 SRC_URI="http://www.linux-nantes.org/~fmonnier/OCaml/ImageMagick/ImageMagick/${P}.tgz"

 LICENSE="MIT"
-SLOT="0"
+SLOT="0/${PV}"
 KEYWORDS="~amd64"
 IUSE=""
 # interactive tests
@ -20,6 +22,7 @@ DEPEND="media-gfx/imagemagick:=
 RDEPEND="${DEPEND}"

 src_install() {
-	emake OCAML_DIR="${D}/$(ocamlc -where)" install
+	findlib_src_preinst
+	emake find_install
 	dodoc README.txt
 }
--- a/dev-ml/lwt/Manifest
+++ b/dev-ml/lwt/Manifest
@ -1,3 +1,4 @@
 DIST lwt-2.4.3.tar.gz 504000 SHA256 efee23937750290d6dee96eed6c0bbdb19817d5be6eefcba61ac5031fac10107 SHA512 725d50a096a43294d49ae2322fdc985c301ce6a8ff5c956925225d7977e787ccb446e36a9db5fdbb50f284b9f1a3a12a52d1aa44d4400feecb59f6f938ed00ad WHIRLPOOL c5999e950008902600b43bf39f174ed0bc2cb3f6dce983d885416969a3bb98170ec8b74c8f5829459c3c96d160e5b4c8491b7057e7efeac035a46c9846ff7764
 DIST lwt-2.5.2.tar.gz 268168 SHA256 b319514cf51656780a8f609a63ead08d3052a442546b218530ce146d37bf6331 SHA512 83c7a9d9798fe12e0bdd618e7f69ac357065a9b26e2abb644240c420cb1d507a3b558549b2f82ecc9c3fbc9ca5952e8d7cb32b6832713bfb6fffcb58975d5449 WHIRLPOOL f0482836988a248b691c332ef7acbeb5121226582cb8ef1e0b301719d35e25fd5d08e6b7b9e9ab02081b4d734ddc399251a31b66a26859542a4484342e517257
 DIST lwt-2.6.0.tar.gz 288385 SHA256 bf7ff0d1c3aa8230f00f55cac149cd335a1a1183b4661c9b098ba8a2d0037cbd SHA512 a30accd39941b421a8afd908129c799bcd178caeabbf36f8a67e07da1e088b4a163a0916738bb11b301972e42800aaf1c194b7eed4d67eb15ea69d04f7cb8abc WHIRLPOOL 963b45a7affa39ceeef209100d293db189fd8bfc21b8c385f92fbbcdeced9df185fca29119af69e72927e628012cff7dd9632067150f4baeeeca967f2616ad74
+DIST lwt-2.7.0.tar.gz 294476 SHA256 00419834e0c5601b3fee6ca9efb0e10ab797a9ff8f695bf2434d89395b7252ec SHA512 9851326a5444f88bcbc03b0fe170285c0155f310d986b1e1e06a550a63ada0121dc818b7723b35741b07679f8c3c7dd391355557cd3a86f8cae985c3448c94d4 WHIRLPOOL 170a66c409f942d3bb6fde73e82b976a3c01e2eb1df564addf0477213fb8541e220a381e091f6053f6d7bd0935f81ac4548aabd411b77c5476d1b89571616288
--- a/dev-ml/lwt/lwt-2.7.0.ebuild
+++ b/dev-ml/lwt/lwt-2.7.0.ebuild
@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+OASIS_BUILD_TESTS=1
+OASIS_BUILD_DOCS=1
+
+inherit oasis
+
+DESCRIPTION="Cooperative light-weight thread library for OCaml"
+SRC_URI="https://github.com/ocsigen/lwt/archive/${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="http://ocsigen.org/lwt"
+
+IUSE="+camlp4 gtk +ppx +react +ssl"
+
+DEPEND="react? ( >=dev-ml/react-1.2:= )
+	dev-libs/libev
+	>=dev-lang/ocaml-4.02:=
+	ssl? ( >=dev-ml/ocaml-ssl-0.4.0:= )
+	gtk? ( dev-ml/lablgtk:= dev-libs/glib:2 )
+	ppx? ( dev-ml/ppx_tools:= )
+	camlp4? ( dev-ml/camlp4:= )"
+
+RDEPEND="${DEPEND}
+	!<www-servers/ocsigen-1.1"
+
+SLOT="0/${PV}"
+LICENSE="LGPL-2.1-with-linking-exception"
+KEYWORDS="~amd64 ~x86-fbsd"
+
+DOCS=( "CHANGES" "README.md" )
+
+src_configure() {
+	oasis_configure_opts="$(use_enable gtk glib)
+		$(use_enable react)
+		$(use_enable ssl)
+		$(use_enable camlp4)
+		$(use_enable ppx)" \
+		oasis_src_configure
+}
--- a/dev-ml/ocaml-safepass/Manifest
+++ b/dev-ml/ocaml-safepass/Manifest
@ -1 +1,2 @@
 DIST ocaml-safepass-1.2.tgz 64021 SHA256 daebb86ad960e46610fdfb17894ee8164640d0467b6eb15752b0e5315d58d375 SHA512 61ff545b069c6e9c298e292785f8478c9872395bbb77a08ddd491586064f49ee70d2fcf080d6ba67af631ba5c50709b203c68128664577348bdfafdc2dcaf0a4 WHIRLPOOL 2398f2e80fe8ef87fa01ddc9e9994712908132d30a64513f4a1062ccc409cc7a7be61c678f959779104dec92e1424bed729de4a445a7a2f28b5a9baaefb5aad3
+DIST ocaml-safepass-2.0.tar.gz 72314 SHA256 bc6e068d7666e2e8b5abe92ba5ee31300475e1f141b0c44bddbdc3ef191fbdff SHA512 a5475b9e1f7233393fc255ae52c44d4f4373fcddf99764bb17dafb86dfbd3b3c5fa01f74254e10fe9a9889e3e5d2ee8d190ed728aad0ed5f0fdfb71856c5754d WHIRLPOOL 98f3f966b17ba60c2b562d11936f36d4fcbe6d0083eecf95f66b740da406f8943696a9711556ded58271ce5bd0f6a107b4e345c9894d3ff03622240d49056a0d
--- a/dev-ml/ocaml-safepass/ocaml-safepass-2.0.ebuild
+++ b/dev-ml/ocaml-safepass/ocaml-safepass-2.0.ebuild
@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+OASIS_BUILD_DOCS=1
+
+inherit oasis
+
+DESCRIPTION="A library offering facilities for the safe storage of user passwords"
+HOMEPAGE="http://ocaml-safepass.forge.ocamlcore.org/ https://github.com/darioteixeira/ocaml-safepass"
+SRC_URI="https://github.com/darioteixeira/ocaml-safepass/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+DOCS=( "README" "CHANGELOG" )
--- a/dev-ml/ocaml-sqlite3/Manifest
+++ b/dev-ml/ocaml-sqlite3/Manifest
@ -1,2 +1,3 @@
 DIST sqlite3-ocaml-4.0.6.tar.gz 70620 SHA256 921be9aab70743d8e56e51fdcc23c0974e54991e416e23d5dd025ca8d1adb269 SHA512 8659207d4ea08d062c465f6ac03f754b3c3eb7a9d17b95bb08a9a578eb45b4683400435ca063ad9b0c52267da060823dcaa4c566e5bcedf9229f24726d32a2b3 WHIRLPOOL c4cb389931682ceca6460281887707cd89e2e6b068499dd7e9b1061123b35279b3ca044bc328e9f4538cfc1d38c6f46f46116f0f62ba01634b0e6eb766267c8f
 DIST sqlite3-ocaml-4.1.0.tar.gz 76762 SHA256 1ab50edeee261da6835bc3b80e3d30172e37f2f230d186ae0099c1539574b79b SHA512 d444534d02039b1b505c1dbe9dcee4e29c3b4b6a4ed1f480552598a59a0748ebba144a54656fdc6d652993a22adaa69434ebf97dca4ab17a379160587d497fec WHIRLPOOL 090ac0f2cc2b8f828e91b076751cc1e6f79206d49d4ca5708dc3cdbac47a45792dfbd637eadda00cce75c3ec33d219cd5c8cf7d13308317dd32a3a591d4847ac
+DIST sqlite3-ocaml-4.1.1.tar.gz 76848 SHA256 8d180fb9753e70508077ddec65a55cd485cdb7106e7eb2ac94ff6356d7dff7da SHA512 79cd4866b56fe75c269d2c912182b6b0d6c8fd84e483d7e63d465af42e3fb658550720de6bb0a26659a84b559b8b91c9d28487f0cb0c68fc18025efa6c2e5453 WHIRLPOOL d7d11b52f82946fa6c36949c94cf4ae499659aaf6a3c69e1587edcaa41ed0f8b240dbcaba686a17297fbd1871ca78ff320c07df00ccb1a3bbf41f8be61718440
--- a/dev-ml/ocaml-sqlite3/ocaml-sqlite3-4.1.1.ebuild
+++ b/dev-ml/ocaml-sqlite3/ocaml-sqlite3-4.1.1.ebuild
@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+OASIS_BUILD_TESTS=1
+OASIS_BUILD_DOCS=1
+
+inherit oasis
+
+MY_PN="sqlite3-ocaml"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A package for ocaml that provides access to SQLite databases"
+HOMEPAGE="http://mmottl.github.io/sqlite3-ocaml/"
+SRC_URI="https://github.com/mmottl/sqlite3-ocaml/releases/download/v${PV}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND=">=dev-db/sqlite-3.3.3
+	>=dev-ml/findlib-1.3.2"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}
+DOCS=( "AUTHORS.txt" "CHANGES.txt" "README.md" "TODO.md" )
--- a/dev-ml/ocsigen-start/files/magick.patch
+++ b/dev-ml/ocsigen-start/files/magick.patch
@ -1,13 +0,0 @@
-Index: ocsigen-start-9999/Makefile.options
-===================================================================
--- ocsigen-start-9999.orig/Makefile.options
-+++ ocsigen-start-9999/Makefile.options
-@@ -39,7 +39,7 @@ TEMPLATE_NAME      := os.pgocaml
- 
- # OCamlfind packages for the server
- SERVER_PACKAGES    := lwt.ppx js_of_ocaml.deriving.ppx calendar safepass \
-                      ocsigen-toolkit.server magick yojson
-+                      ocsigen-toolkit.server libMagick yojson
- 
- SERVER_DB_PACKAGES := pgocaml pgocaml.syntax macaque.syntax calendar safepass
- 
--- a/dev-ml/ocsigen-start/ocsigen-start-0.99.ebuild
+++ b/dev-ml/ocsigen-start/ocsigen-start-0.99.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

-inherit findlib eutils
+inherit findlib

 DESCRIPTION="Eliom Base Application with users, (pre)registration, notifications, etc."
 HOMEPAGE="https://github.com/ocsigen/ocsigen-start"
@ -31,13 +31,10 @@ RDEPEND="dev-lang/ocaml:=
 	dev-ml/ocsigen-toolkit:=
 	dev-ml/ppx_deriving:=
 	dev-ml/yojson:=
+	dev-ml/OCaml-ImageMagick:=
 "
 DEPEND="${RDEPEND}"

-src_prepare() {
-	epatch "${FILESDIR}/magick.patch"
-}
-
 src_install() {
 	findlib_src_preinst
 	DESTDIR="${ED}" OCAMLPATH="${OCAMLFIND_DESTDIR}" emake install
--- a/dev-ml/ocsigen-start/ocsigen-start-9999.ebuild
+++ b/dev-ml/ocsigen-start/ocsigen-start-9999.ebuild
@ -1,10 +1,10 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

 EAPI=5

-inherit findlib eutils
+inherit findlib

 DESCRIPTION="Eliom Base Application with users, (pre)registration, notifications, etc."
 HOMEPAGE="https://github.com/ocsigen/ocsigen-start"
@ -31,13 +31,10 @@ RDEPEND="dev-lang/ocaml:=
 	dev-ml/ocsigen-toolkit:=
 	dev-ml/ppx_deriving:=
 	dev-ml/yojson:=
+	dev-ml/OCaml-ImageMagick:=
 "
 DEPEND="${RDEPEND}"

-src_prepare() {
-	epatch "${FILESDIR}/magick.patch"
-}
-
 src_install() {
 	findlib_src_preinst
 	DESTDIR="${ED}" OCAMLPATH="${OCAMLFIND_DESTDIR}" emake install
--- a/dev-python/neovim-python-client/Manifest
+++ b/dev-python/neovim-python-client/Manifest
@ -2,6 +2,7 @@ DIST neovim-python-client-0.0.37.tar.xz 38008 SHA256 615120048e0bac403fe85dd9bc7
 DIST neovim-python-client-0.0.38.tar.xz 38524 SHA256 40599735f14dc6f715fbdc3b8e91ec4e1dd7e4a184ee0b4c7f4d69e768b557dd SHA512 b6f912802a1807eef4353fb6c8f15f9f43b9a1cde449e2c23a031b099de448dd6a2856dc4545ee33094e7f9e8842fd1101008fe4272d21e3fcf6eb38a3c144df WHIRLPOOL 218d46cc61b8e8a7e386c61fe68958888f46cf0e8da96edcd926e67ad236371d80b2a58ed385cb20526440910488265e6661537f579a2fc37dd8d63d81e98096
 DIST neovim-python-client-0.1.0.tar.gz 43142 SHA256 2a9a1f07bd6d5617b1b85ee1772feed9aabd1f7a6ddb24664a48896c7db6121a SHA512 31d9c7ac32513871d7121a07269c643da97bba76469de0756aa3b71db3ff70b638d56b4da8b91d550ca41be6f53d2bd3e320e9c751ee5a6ce4e6230bd423b41a WHIRLPOOL 9192eff0dec934e949e201e425ee3bb316988078e9887290735b15b7c44f7a27a81556909f963e58414adf65e89354bcc26b9c7e7b1d372f73eff1d27cb6f901
 DIST neovim-python-client-0.1.11.tar.gz 41181 SHA256 7ca99d14aa364efc5d3c8ecefd31af16a9c5c93ebe7cd1b2fa64717b74a76d50 SHA512 f668f6f77c19265c861b839b7d33abb425dfeda1691c0e7bd05d431d2f07d6d9a5862c6b3f92bdb3ce406e72b7e55bb1e0dbc0dd8f25d489471a002aa88956f4 WHIRLPOOL 27b5ebcdd0b83611315fae479bfe25b4dda96bdd31874a857c7e2750905e8d6eea1faf1ec1d8c2fde1d1fcbf4c9e44d4d0dd035f0fc8700407752d9043d2ee81
+DIST neovim-python-client-0.1.12.tar.gz 41255 SHA256 a0ec9d157d385d86c2a07f9f9daa20cc172160d1782bf9a40d8e9724a01026c1 SHA512 8b40aeeec4de687e2a096a89c9a7c72b553f3ff9b73eefa84c1266b18dd46249b7549f43d694bccf181a653f2a1908f26d4cfa7596356a0323043dcbbc94089f WHIRLPOOL 2cc395a039cb564886716f1ff8de316ad37063c9644d87c3e4275737d92ea28569a757b27ea40e8fa8ac96d822ed6e8b2e1e98f74e1cb99a15dbb7df4e36da56
 DIST neovim-python-client-0.1.2.tar.gz 43428 SHA256 2d85a493194b5dfbc08cad1fd2e252f7ad35b65eb826dd61f67f4fecfc8476b2 SHA512 a050cd7fcc3ab9863bd777331a6ebce3b9ac110682c445ca3e18a59ef4296b4da486a2586ae8be36f4fc6c9ac5e0d5513c19d06f2783bdf37554f37ca547c908 WHIRLPOOL d5f08178bc8738fcdae7c50a43d4e58731ce8665e93d6b8e905c6a83e1b6fe0655dabc9c5ee96a1415b84710ec043f25cea72761af3fe4977d96b862ca81bb31
 DIST neovim-python-client-0.1.5.tar.gz 39600 SHA256 e330ad562ae787e85fd881142cb993e80e8dabe6737b40e51a625fb4347e2509 SHA512 fced36987164ae378d79284b4ca1ed198e50ee089fd5f6222b3462405174161a79d1bc27c83ca593626f7635b52c943a15ae338086afc9dab86f5fabb5eb0cd6 WHIRLPOOL a6ce1d19aed92518232d02e1ba47a4243530e28f8d85acfc30604c039084a3764ce350245825380e2ebc59246763c029958bd283afbe59ed7d024f4cd1168d0e
 DIST neovim-python-client-0.1.7.tar.gz 39735 SHA256 398d36c194548d5636eb5d33ba86b083495ab888fc7f03243c8c42d064ec1aa8 SHA512 f1d5f834163eb62338afddbb4d4de418cc6cdec77cfe8c8785a9206bce11016216c0c3e38a4113d75b58f3ea02cd665c916eb30b5a3987c52321b8cfde833e85 WHIRLPOOL 102e56c7b8db49f05014b175a01c648377669b82eb2780351eada741eca8fa31d666b8dce16426dfd70efff62f510faec828b9adca7d49e932ae64a0c497e91b
--- a/dev-python/neovim-python-client/neovim-python-client-0.1.12.ebuild
+++ b/dev-python/neovim-python-client/neovim-python-client-0.1.12.ebuild
@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python client for Neovim"
+HOMEPAGE="https://github.com/neovim/python-client"
+SRC_URI="https://github.com/neovim/python-client/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+	>=dev-python/msgpack-0.4.0[${PYTHON_USEDEP}]
+	virtual/python-greenlet[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/trollius[${PYTHON_USEDEP}]' python2_7)
+"
+
+RDEPEND="
+	${DEPEND}
+	>=app-editors/neovim-0.1.6
+"
+
+S="${WORKDIR}/python-client-${PV}"
--- a/dev-python/pyproj/Manifest
+++ b/dev-python/pyproj/Manifest
@ -1 +1,2 @@
 DIST pyproj-1.9.4.tar.gz 7838454 SHA256 71b4d8c52d781e2b4afe2d3609e9d700cb631ddbf51060bc702644733cc70869 SHA512 96b118e75ba8360ca56176631c44567c7b6596f98189a99bfbdc2d0f8bff1bba814a86d66ac1c54964951a3534c2a5cfb54a0fc4d8eda52c77069a8b64f8db3a WHIRLPOOL 750f466566aab3d2edb155407f37efc7f514901bd782b5be589f1c788059c81c8e17e519d53410be169cec971aa3524268bd86e08f9f90a1e2b742343f6b0ae2
+DIST pyproj-1.9.5.1.tar.gz 4424543 SHA256 53fa54c8fa8a1dfcd6af4bf09ce1aae5d4d949da63b90570ac5ec849efaf3ea8 SHA512 b0e0f85be01a3399cb41c4bf29d1a63ecb519fd45d6092a3558060d93c715afafd12f7532c8665839225ad7243e739a117677f6747bf34a0ccbde5e75c85f324 WHIRLPOOL 5ddb28a2ee6bbc3e50a0d76355f51b93c50c078459a6bc582f6a1538abbe349b45b0fe3bbc195e751b575ef5096a47ee6e88cf8e5dd4c69b9e917589da29ac05
--- a/dev-python/pyproj/pyproj-1.9.5.1.ebuild
+++ b/dev-python/pyproj/pyproj-1.9.5.1.ebuild
@ -0,0 +1,37 @@
+# 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 python3_5 )
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="Python interface to PROJ.4 library"
+HOMEPAGE="https://github.com/jswhit/pyproj"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE="doc"
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+	append-cflags -fno-strict-aliasing
+}
+
+python_test() {
+	einfo "Testruns do not have regular unittest type tests, instead for test.py,"
+	einfo "the output need be compared with a separate file, sample.out."
+	"${PYTHON}" test/test.py || die
+
+	einfo ""; einfo "Now the file test2.py is run to test pickling"; einfo ""
+	"${PYTHON}" test/test2.py || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/. )
+	distutils-r1_python_install_all
+}
--- a/dev-tex/latexdiff/latexdiff-1.2.0.ebuild
+++ b/dev-tex/latexdiff/latexdiff-1.2.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$

@ -15,6 +15,8 @@ KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~am
 IUSE="test"

 RDEPEND=">=dev-lang/perl-5.8
+	virtual/latex-base
+	dev-texlive/texlive-genericrecommended
 	dev-perl/Algorithm-Diff"
 DEPEND="${RDEPEND}
 	dev-perl/Pod-LaTeX
--- a/dev-util/drone-ui/Manifest
+++ b/dev-util/drone-ui/Manifest
@ -1 +1,2 @@
 DIST drone-ui-0_pre20161007.tar.gz 157594 SHA256 47522662f82a0a0cb4f447016b575072b8ce54dd4bc9e532c8e058f442be410e SHA512 eeb69c3fa683773a96593563225b9b34a14ea4e570b56daf7b78fa956538d8cf71152b4badd00db8c0f1194972f67ab7cebdd62fb6feccacae4c9447f5250723 WHIRLPOOL fe2d51c3864247a4d3975c81131272d686ac071532aa1261e0b647e522db12e58e3e900f4cb2499e77fa246a1da1401846e45c4a3afcf0737ac841fa47a4dce1
+DIST drone-ui-0_pre20170103.tar.gz 174314 SHA256 4f30f79266f5639a3354cd7173ff20cfdf5f14bfdce2c82b77f7c3cfe8dec97f SHA512 b50bc46c8ab5972d13c2ef052cb0857a47331b645d8bfaaa5fffbada00476573430c4ec6a9e4d3d2457e63a48b3ff6908db83b9097c308a4574c6693b1ca3fa6 WHIRLPOOL f6e03ef105d0bd590d35ec7966f60ea26aed9f69bd08536f3bc60637ccfb6773cf24827e8eaec1a1b41a8ddf0ede75dd1c23c66acd938e4d38bbae7a7dc3a4a9
--- a/dev-util/drone-ui/drone-ui-0_pre20170103.ebuild
+++ b/dev-util/drone-ui/drone-ui-0_pre20170103.ebuild
@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit golang-build golang-vcs-snapshot
+
+EGO_PN="github.com/drone/drone-ui/..."
+EGIT_COMMIT="fe03fc6e853ec0a9814c8eab0119a34df17d5ff8"
+ARCHIVE_URI="https://${EGO_PN%/*}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="React front-end for the Drone continuous integration server"
+HOMEPAGE="https://github.com/drone/drone-ui"
+SRC_URI="${ARCHIVE_URI}"
+LICENSE="Apache-2.0"
+SLOT="0/${PVR}"
+IUSE=""
+
+DEPEND="dev-go/go-bindata
+	dev-go/go-bindata-assetfs"
--- a/dev-util/pkgconfig/pkgconfig-0.29.1.ebuild
+++ b/dev-util/pkgconfig/pkgconfig-0.29.1.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$

@ -49,6 +49,14 @@ src_prepare() {
 	else
 		elibtoolize # Required for FreeMiNT wrt #333429
 	fi
+
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		# fix standards conflicts
+		sed -i -e 's/\(_XOPEN_SOURCE\(_EXTENDED\)\?\|__EXTENSIONS__\)/  \1_DISABLED/' \
+			glib/configure || die
+		sed -i -e '/#define\s\+_POSIX_SOURCE/d' \
+			glib/glib/giounix.c || die
+	fi
 }

 multilib_src_configure() {
--- a/dev-util/ragel/Manifest
+++ b/dev-util/ragel/Manifest
@ -1,3 +1,4 @@
 DIST ragel-6.7.tar.gz 1182734 SHA256 46df8e3f117a730f8896061c95ea8e8f53e9789cb053c2eea047833724fd7a30 SHA512 a85c1d5d4fd7d903c823c2ddc8b5f1d5dd5f715f11bc04f10fb78ea5632b3aa33c5b4861f89179fa9d6b4944484216ee93bbd25dd0b5958d2419e434b781b78a WHIRLPOOL 52f1614e16390949fe070df46c9929b5871e35923b38e6c277f0d4688e45f610a16a6635240cea0622892c675aebf092e3f6a9c626684ed1a4af8191ff3c6d6f
 DIST ragel-6.8.tar.gz 1211146 SHA256 dd7f7d22f3a58147379bda61334d341c2caa0caf9f71897e3e4ec05c8f398764 SHA512 3c7fa4ca0cfcd5d19e0ff8746ca427f5a1eefb0af09db5d2ee55ced9bcc35c588a5db146dcfdec46b83fb63d94ff9ace117b4cfcb07e2c57aec67a6cbe249458 WHIRLPOOL 540ba0c5a712ae0426982e08e7aa7b1fa1ff33e3d9c2095353939ed2c45e04048ebcdf93292ead8e70abbd8fa230dddbfeea8d485955142d0615ddb94c8a0b9a
 DIST ragel-6.9.tar.gz 1226871 SHA256 6e07be0fab5ca1d9c2d9e177718a018fc666141f594a5d6e7025658620cf660a SHA512 46886a37fa0b785574c03ba6581d99bbeaa11ca65cf4fdc37ceef42f4869bd695694cd69b4b974a25cf539f004cb106e3debda17fc26e1a9a6a4295992733dbd WHIRLPOOL c802e3020842b28ecfe604ca13c8f205ed98fb4c180c65a88be9001e7b73dc4facc6a716f55623da4f9c7cdc43c79d958c4c26fa89622bdabf9b3989e0c9682e
+DIST ragel-7.0.0.9.tar.gz 850078 SHA256 b9e6cac5d388398ac05d8ef15a07628f5e6de292e39f5ad92b8176379e8352f0 SHA512 87de7d41af4a08f09d422a0e58820f9b5b1218acc4733c58690feea4f872790813b5f2d7505ce147a2a6e1bcd341926c35fed7c6b55f543bdf864b119868bcde WHIRLPOOL 0ae6c3d589caf967c30d9ccc30a6801cdf55032aa7f2939dc101e6ca3ef5b3e15df4a311164128bca63f9d2e3500d601739b9296a276de3b3b58755e5db0d646
--- a/dev-util/ragel/ragel-7.0.0.9.ebuild
+++ b/dev-util/ragel/ragel-7.0.0.9.ebuild
@ -0,0 +1,30 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DESCRIPTION="Compiles finite state machines from regular languages into executable code"
+HOMEPAGE="https://www.colm.net/open-source/ragel/"
+SRC_URI="https://www.colm.net/files/ragel/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="vim-syntax"
+
+DEPEND="dev-util/colm"
+RDEPEND="${DEPEND}"
+
+src_test() {
+	cd "${S}"/test || die
+	./runtests.in || die
+}
+
+src_install() {
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins ragel.vim
+	fi
+	default
+}
--- a/media-gfx/nvidia-texture-tools/files/nvidia-texture-tools-2.0.8-cg.patch
+++ b/media-gfx/nvidia-texture-tools/files/nvidia-texture-tools-2.0.8-cg.patch
@ -3,8 +3,8 @@ Date: Thu May  3 20:06:31 UTC 2012

 fix compilation for cg useflag

--- cmake/FindCg.cmake
-+++ cmake/FindCg.cmake
+--- a/cmake/FindCg.cmake
+++ b/cmake/FindCg.cmake
@@ -86,6 +86,7 @@
     FIND_PROGRAM( CG_COMPILER cgc
       /usr/bin
--- a/media-gfx/nvidia-texture-tools/files/nvidia-texture-tools-2.0.8-cpp14.patch
+++ b/media-gfx/nvidia-texture-tools/files/nvidia-texture-tools-2.0.8-cpp14.patch
@ -0,0 +1,58 @@
+This patch fixes cpp14 compilation errors.
+Gentoo-bug: 594938
+
+--- a/src/nvimage/ImageIO.cpp
+++ b/src/nvimage/ImageIO.cpp
+@@ -135,7 +135,7 @@
+ 	StdInputStream stream(fileName);
+ 	
+ 	if (stream.isError()) {
+-		return false;
+		return NULL;
+ 	}
+ 	
+ 	return loadFloat(fileName, stream);
+@@ -233,7 +233,7 @@
+ 		case TGA_TYPE_INDEXED:
+ 			if( tga.colormap_type!=1 || tga.colormap_size!=24 || tga.colormap_length>256 ) {
+ 				nvDebug( "*** ImageIO::loadTGA: Error, only 24bit paletted images are supported.\n" );
+-				return false;
+				return NULL;
+ 			}
+ 			pal = true;
+ 			break;
+@@ -254,7 +254,7 @@
+ 
+ 		default:
+ 			nvDebug( "*** ImageIO::loadTGA: Error, unsupported image type.\n" );
+-			return false;
+			return NULL;
+ 	}
+ 
+ 	const uint pixel_size = (tga.pixel_size/8);
+@@ -621,7 +621,7 @@
+ 	png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
+ 	if (png_ptr == NULL) {
+ 	//	nvDebug( "*** LoadPNG: Error allocating read buffer in file '%s'.\n", name );
+-		return false;
+		return NULL;
+ 	}
+ 
+ 	// Allocate/initialize a memory block for the image information
+@@ -629,14 +629,14 @@
+ 	if (info_ptr == NULL) {
+ 		png_destroy_read_struct(&png_ptr, NULL, NULL);
+ 	//	nvDebug( "*** LoadPNG: Error allocating image information for '%s'.\n", name );
+-		return false;
+		return NULL;
+ 	}
+ 
+ 	// Set up the error handling
+ 	if (setjmp(png_jmpbuf(png_ptr))) {
+ 		png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+ 	//	nvDebug( "*** LoadPNG: Error reading png file '%s'.\n", name );
+-		return false;
+		return NULL;
+ 	}
+ 
+ 	// Set up the I/O functions.
--- a/media-gfx/nvidia-texture-tools/files/nvidia-texture-tools-2.0.8-gcc-4.7.patch
+++ b/media-gfx/nvidia-texture-tools/files/nvidia-texture-tools-2.0.8-gcc-4.7.patch
@ -4,8 +4,8 @@ Subject: fix compilation on gcc 4.7

 https://bugs.gentoo.org/show_bug.cgi?id=423965

--- src/nvcore/nvcore.h
-+++ src/nvcore/nvcore.h
+--- a/src/nvcore/nvcore.h
+++ b/src/nvcore/nvcore.h
@@ -158,6 +158,7 @@
 #elif NV_CC_GNUC
 #	if NV_OS_LINUX
--- a/media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.0.8-r2.ebuild
+++ b/media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.0.8-r2.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -53,6 +53,8 @@ src_prepare() {
 	epatch "${FILESDIR}"/${P}-openexr.patch
 	# fix clang build
 	epatch "${FILESDIR}"/${P}-clang.patch
+	# fix bug #594938
+	epatch "${FILESDIR}/${P}-cpp14.patch"
 }

 src_configure() {
--- a/media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.0.8-r3.ebuild
+++ b/media-gfx/nvidia-texture-tools/nvidia-texture-tools-2.0.8-r3.ebuild
@ -0,0 +1,72 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit cmake-utils eutils
+
+DESCRIPTION="A set of cuda-enabled texture tools and compressors"
+HOMEPAGE="http://developer.nvidia.com/object/texture_tools.html"
+SRC_URI="https://${PN}.googlecode.com/files/${P}-1.tar.gz
+	https://dev.gentoo.org/~ssuominen/${P}-patchset-1.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cg cuda glew glut openexr"
+
+RDEPEND="
+	media-libs/ilmbase:=
+	media-libs/libpng:0=
+	media-libs/tiff:0
+	sys-libs/zlib
+	virtual/jpeg:0
+	virtual/opengl
+	x11-libs/libX11
+	cg? ( media-gfx/nvidia-cg-toolkit )
+	cuda? ( dev-util/nvidia-cuda-toolkit )
+	glew? ( media-libs/glew:0= )
+	glut? ( media-libs/freeglut )
+	openexr? ( media-libs/openexr:= )
+	"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${P}-cg.patch" # fix bug #414509
+	"${FILESDIR}/${P}-gcc-4.7.patch" # fix bug #423965
+	"${FILESDIR}/${P}-openexr.patch" # fix bug #462494
+	"${FILESDIR}/${P}-clang.patch" # fix clang build
+	"${FILESDIR}/${P}-cpp14.patch" # fix bug #594938
+)
+
+S="${WORKDIR}/${PN}"
+
+pkg_setup() {
+	if use cuda; then
+		if [[ $(( $(gcc-major-version) * 10 + $(gcc-minor-version) )) -gt 44 ]] ; then
+			eerror "gcc 4.5 and up are not supported for useflag cuda!"
+			die "gcc 4.5 and up are not supported for useflag cuda!"
+		fi
+	fi
+}
+
+src_prepare() {
+	edos2unix cmake/*
+	EPATCH_SUFFIX=patch epatch "${WORKDIR}/patches"
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLIBDIR=$(get_libdir)
+		-DNVTT_SHARED=TRUE
+		-DCG=$(usex cg)
+		-DCUDA=$(usex cuda)
+		-DGLEW=$(usex glew)
+		-DGLUT=$(usex glut)
+		-DOPENEXR=$(usex openexr)
+	)
+	cmake-utils_src_configure
+}
--- a/media-libs/rubberband/Manifest
+++ b/media-libs/rubberband/Manifest
@ -1,2 +1 @@
-DIST rubberband-1.7.0.tar.bz2 129328 SHA256 8037fe0e435a756f74b524b47943a8db0a4915c8437a8a4f88cb681ed577f682 SHA512 47d45ff6355e8f31f3ef0c0c5f14f27cc952f98597271b6b35b5047293b8dfa5e6576dc2e3ede102c0209507c77d666cf7c049fc65da18f09de84ea90fb2f87d WHIRLPOOL b32abc93a558bfb44bad76e3beb0d3f78bdface1141e0265e3d2720e6667236ee5f2120f3984818f927a0788d1fa6ed0c5dc15dbc3a154ec22b2c4027f054ed4
 DIST rubberband-1.8.1.tar.bz2 177501 SHA256 ff0c63b0b5ce41f937a8a3bc560f27918c5fe0b90c6bc1cb70829b86ada82b75 SHA512 9721eaa36b80574f90b8ae5cfae388159a239e4257b8c85b9e55e7cf0dbbb9a996b857213a6a172a4ada5ff712e6936a16adbe08396e2ab1df3fd8d5a02a3620 WHIRLPOOL 14906711c8599b06ac8d772fd8c83fe8625f7235aafe67ccf505bdbcd43b8a28609f885b2243b22adfee8b1dad0815458253f1c07b728afd1c399e2ddf525dc4
--- a/media-libs/rubberband/rubberband-1.7.0.ebuild
+++ b/media-libs/rubberband/rubberband-1.7.0.ebuild
@ -1,44 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-inherit multilib
-
-DESCRIPTION="An audio time-stretching and pitch-shifting library and utility program"
-HOMEPAGE="http://www.breakfastquay.com/rubberband/"
-SRC_URI="http://code.breakfastquay.com/attachments/download/23/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
-IUSE="static-libs"
-
-RDEPEND="media-libs/vamp-plugin-sdk
-	media-libs/libsamplerate
-	media-libs/libsndfile
-	media-libs/ladspa-sdk
-	sci-libs/fftw:3.0"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	if ! use static-libs ; then
-		sed -i -e '/^all:/s/$(STATIC_TARGET)//' \
-			-e '/^\tcp $(STATIC_TARGET)/d' \
-			Makefile.in || die
-	fi
-}
-
-src_install() {
-	emake INSTALL_BINDIR="${D}/usr/bin" \
-		INSTALL_INCDIR="${D}/usr/include/rubberband" \
-		INSTALL_LIBDIR="${D}/usr/$(get_libdir)" \
-		INSTALL_VAMPDIR="${D}/usr/$(get_libdir)/vamp" \
-		INSTALL_LADSPADIR="${D}/usr/$(get_libdir)/ladspa" \
-		INSTALL_LRDFDIR="${D}/usr/share/ladspa/rdf" \
-		INSTALL_PKGDIR="${D}/usr/$(get_libdir)/pkgconfig" \
-		install
-
-	dodoc CHANGELOG README.txt
-}
--- a/media-libs/rubberband/rubberband-1.8.1.ebuild
+++ b/media-libs/rubberband/rubberband-1.8.1.ebuild
@ -1,44 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit multilib
-
-DESCRIPTION="An audio time-stretching and pitch-shifting library and utility program"
-HOMEPAGE="http://www.breakfastquay.com/rubberband/"
-SRC_URI="http://code.breakfastquay.com/attachments/download/34/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 hppa ppc ppc64 ~x86"
-IUSE="static-libs"
-
-RDEPEND="media-libs/vamp-plugin-sdk
-	media-libs/libsamplerate
-	media-libs/libsndfile
-	media-libs/ladspa-sdk
-	sci-libs/fftw:3.0"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	if ! use static-libs ; then
-		sed -e '/^all:/s/$(STATIC_TARGET)//' \
-			-e '/^\tcp $(STATIC_TARGET)/d' \
-			-i Makefile.in || die
-	fi
-}
-
-src_install() {
-	emake INSTALL_BINDIR="${D}/usr/bin" \
-		INSTALL_INCDIR="${D}/usr/include/rubberband" \
-		INSTALL_LIBDIR="${D}/usr/$(get_libdir)" \
-		INSTALL_VAMPDIR="${D}/usr/$(get_libdir)/vamp" \
-		INSTALL_LADSPADIR="${D}/usr/$(get_libdir)/ladspa" \
-		INSTALL_LRDFDIR="${D}/usr/share/ladspa/rdf" \
-		INSTALL_PKGDIR="${D}/usr/$(get_libdir)/pkgconfig" \
-		install
-
-	dodoc CHANGELOG README.txt
-}
--- a/media-libs/x265/Manifest
+++ b/media-libs/x265/Manifest
@ -1,7 +1,2 @@
-DIST x265-1.5.tar.bz2 588263 SHA256 da226cbe56938f85d5a3d123d1f5ca895795f2eac794e45af4b70047e03d8648 SHA512 e5db8c3428b7b393c5c3049041de152b43821a083bc1988903ade8d6ce5fdc71a2fe0ad9efa0564aa3c2c6f1ec31659fcd2b338f6b53d22a202811be7071f077 WHIRLPOOL 9e1256832a3ece06d68a872b44337285afbbeebbd149ac71fda25524d60310f595adedce1b28f0ed5a59feadef39848d797bd58f4b0d7c7d707bcddca7520f6d
-DIST x265_1.7.tar.gz 844212 SHA256 a52ca95e8e64219c1e8e73a9abf0bb7151ced2c93756a623cf2b7e5cf8226585 SHA512 cf6fce24b008d36bbc79e2488ab5fb3010aa588113645597ffc66959088a73b3ba72f6bb81bd16e36847a73b50b8f264cff0899162552418ae499170c286eb89 WHIRLPOOL 9c932fd85fbc06a63802f8aabdbb5f44fe4bee6bc2d0996df8788acad30be965bde7b56f562e4ca8ae87856fbcf728b6938a701afb397ef2195437b73a60c744
 DIST x265_1.8.tar.gz 918469 SHA256 760e6280c688f1ea90c492d19fc6d4084ca1c4b0ea9b2e3c736d32565c30d857 SHA512 498c25ff6e5c68849db11d1509cc6f7e96d3a2e6594542589ac5b9f6d65a09ab3af590dcc3357f985f218f8d54af364c998cfedfbe95644747835c059214935c WHIRLPOOL ef5c1a31e8ab45c2918e24e97c09809eda735df354d9000e3935b054ca01fd60ef1d1afad6c161c7c62b8b016c2a80155665448a18e4037fab8c56a841488eeb
-DIST x265_1.9.tar.gz 956101 SHA256 3e4654133ed957a98708fdb4cb9a154d9e80922b84e26e43fc462a101c5b15c8 SHA512 1c399101374da58d0661786a6144dd25a2028e25bcb99b3084d8839b0bd9c20bccf5c0e4413882f16b3b1c49f96710746a16cb690f3811dffb08c3befdc8e5f1 WHIRLPOOL 508d21ad0ff7ed8eb2fe9a9a69113dc7dca07306ddace6de22b29e71dad7242fae0b6e4864a409a0279d85adbe054b4ffbc8c95fe915163b506f5bab25245f8c
-DIST x265_2.0.tar.gz 1028299 SHA256 5a7f6797bee33310c690be5d9a6c63125f36663ac3478e98ac6b6142a70bce1f SHA512 4262a32cf9a34c494770c7917fbaba88e8211c332a91932f4cd096ce25394979e1d43ae641be0aa480af1d0580e842ca70f58005dd41361b78dfd25870035a1e WHIRLPOOL c85e42a3bbf3ee9d84a69615b117444088e16c45cea7362956c92dc1097babdc8cb819d101bf17a97bfb0128e93a5c85cf9c8d980dc75de9de90dcf6a3e46b09
-DIST x265_2.1.tar.gz 1037400 SHA256 b3bc83754e91ed5655c8cba5a2ed48e6b9ab39699c9ed6554c670211d5870f9c SHA512 44ad6815efb039054935f2887f0c98604898a6b5bf144f845df92038ef47ea1c21f2942501294514b05e7eaffd988e52ca777da0be97e57fdd77c89ff0fda421 WHIRLPOOL f91e7fffdccb494c32a6a4b18b72e72537c89bc0a1117e26f2030b9f3d5d11a0e642e25faa83c0b59ca117666d1d81a21823b653d3e0d138073478176908f83b
 DIST x265_2.2.tar.gz 1203801 SHA256 b872552535e41fbffa03ba7cbcd3479c42c4053868309292e78e147b7773ac4b SHA512 335bb38cf0892f2c4310033b076d51115c0b7faa9596a4f556dde5e3d1378d04f3d0055cb0bf2441eb725b7f84c246174bdc315eeb4ddde61ef9d79469f44eef WHIRLPOOL 6aa6fb3669abbb6e3fd9dd9ffe38f595805a61beedcfccd509606a9c3a19f79037a518269206ddcac7231de45165f000e59c3b0f279921a6aa8de2cb5b38a7ec
--- a/media-libs/x265/x265-1.5.ebuild
+++ b/media-libs/x265/x265-1.5.ebuild
@ -1,74 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-multilib multilib flag-o-matic
-
-if [[ ${PV} = 9999* ]]; then
-	inherit mercurial
-	EHG_REPO_URI="https://bitbucket.org/multicoreware/x265"
-else
-	SRC_URI="https://bitbucket.org/multicoreware/x265/get/${PV}.tar.bz2 -> ${P}.tar.bz2"
-	KEYWORDS="amd64 arm hppa ~ppc ppc64 x86"
-fi
-
-DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
-HOMEPAGE="http://x265.org/"
-
-LICENSE="GPL-2"
-# subslot = libx265 soname
-SLOT="0/43"
-IUSE="+10bit test"
-
-ASM_DEPEND=">=dev-lang/yasm-1.2.0"
-RDEPEND=""
-DEPEND="${RDEPEND}
-	abi_x86_32? ( ${ASM_DEPEND} )
-	abi_x86_64? ( ${ASM_DEPEND} )"
-
-src_unpack() {
-	if [[ ${PV} = 9999* ]]; then
-		mercurial_src_unpack
-		# Can't set it at global scope due to mercurial.eclass limitations...
-		export S=${WORKDIR}/${P}/source
-	else
-		unpack ${A}
-		export S=$(echo "${WORKDIR}"/*${PN}*/source)
-	fi
-}
-
-multilib_src_configure() {
-	append-cflags -fPIC
-	append-cxxflags -fPIC
-	local mycmakeargs=(
-		$(cmake-utils_use_enable test TESTS)
-		$(multilib_is_native_abi || echo "-DENABLE_CLI=OFF")
-		-DHIGH_BIT_DEPTH=$(usex 10bit "ON" "OFF")
-		-DLIB_INSTALL_DIR="$(get_libdir)"
-	)
-	cmake-utils_src_configure
-}
-
-src_configure() {
-	multilib_parallel_foreach_abi multilib_src_configure
-}
-
-multilib_src_test() {
-	if has ${MULTILIB_ABI_FLAG} abi_x86_32 abi_x86_64 ; then
-		cd "${BUILD_DIR}/test" || die
-		for i in TestBench ; do
-			./${i} || die
-		done
-	fi
-}
-
-src_test() {
-	multilib_foreach_abi multilib_src_test
-}
-
-src_install() {
-	cmake-multilib_src_install
-	dodoc -r "${S}/../doc/"*
-}
--- a/media-libs/x265/x265-1.7.ebuild
+++ b/media-libs/x265/x265-1.7.ebuild
@ -1,82 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-multilib multilib flag-o-matic
-
-if [[ ${PV} = 9999* ]]; then
-	inherit mercurial
-	EHG_REPO_URI="https://bitbucket.org/multicoreware/x265"
-else
-	SRC_URI="
-		https://bitbucket.org/multicoreware/x265/downloads/${PN}_${PV}.tar.gz
-		http://ftp.videolan.org/pub/videolan/x265/${PN}_${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
-fi
-
-DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
-HOMEPAGE="http://x265.org/"
-
-LICENSE="GPL-2"
-# subslot = libx265 soname
-SLOT="0/59"
-IUSE="+10bit test"
-
-ASM_DEPEND=">=dev-lang/yasm-1.2.0"
-RDEPEND=""
-DEPEND="${RDEPEND}
-	abi_x86_32? ( ${ASM_DEPEND} )
-	abi_x86_64? ( ${ASM_DEPEND} )"
-
-src_unpack() {
-	if [[ ${PV} = 9999* ]]; then
-		mercurial_src_unpack
-		# Can't set it at global scope due to mercurial.eclass limitations...
-		export S=${WORKDIR}/${P}/source
-	else
-		unpack ${A}
-		export S="${WORKDIR}/${PN}_${PV}/source"
-	fi
-}
-
-multilib_src_configure() {
-	append-cflags -fPIC
-	append-cxxflags -fPIC
-	local mycmakeargs=(
-		$(cmake-utils_use_enable test TESTS)
-		$(multilib_is_native_abi || echo "-DENABLE_CLI=OFF")
-		-DHIGH_BIT_DEPTH=$(usex 10bit "ON" "OFF")
-		-DLIB_INSTALL_DIR="$(get_libdir)"
-	)
-
-	if [ "${ABI}" = x86 ] ; then
-		use 10bit && ewarn "Disabling 10bit support on x86 as it does not build (or requires to disable assembly optimizations)"
-		mycmakeargs+=( -DHIGH_BIT_DEPTH=OFF )
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_configure() {
-	multilib_parallel_foreach_abi multilib_src_configure
-}
-
-multilib_src_test() {
-	if has ${MULTILIB_ABI_FLAG} abi_x86_32 abi_x86_64 ; then
-		cd "${BUILD_DIR}/test" || die
-		for i in TestBench ; do
-			./${i} || die
-		done
-	fi
-}
-
-src_test() {
-	multilib_foreach_abi multilib_src_test
-}
-
-src_install() {
-	cmake-multilib_src_install
-	dodoc -r "${S}/../doc/"*
-}
--- a/media-libs/x265/x265-1.8.ebuild
+++ b/media-libs/x265/x265-1.8.ebuild
@ -1,94 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-multilib multilib flag-o-matic
-
-if [[ ${PV} = 9999* ]]; then
-	inherit mercurial
-	EHG_REPO_URI="https://bitbucket.org/multicoreware/x265"
-else
-	SRC_URI="
-		https://bitbucket.org/multicoreware/x265/downloads/${PN}_${PV}.tar.gz
-		http://ftp.videolan.org/pub/videolan/x265/${PN}_${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
-fi
-
-DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
-HOMEPAGE="http://x265.org/"
-
-LICENSE="GPL-2"
-# subslot = libx265 soname
-SLOT="0/68"
-IUSE="+10bit pic test"
-
-ASM_DEPEND=">=dev-lang/yasm-1.2.0"
-RDEPEND=""
-DEPEND="${RDEPEND}
-	abi_x86_32? ( ${ASM_DEPEND} )
-	abi_x86_64? ( ${ASM_DEPEND} )"
-
-src_unpack() {
-	if [[ ${PV} = 9999* ]]; then
-		mercurial_src_unpack
-		# Can't set it at global scope due to mercurial.eclass limitations...
-		export S=${WORKDIR}/${P}/source
-	else
-		unpack ${A}
-		export S="$(echo "${WORKDIR}/${PN}_"*"/source")"
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PV}-build-Disable-march-selection-from-CMakeLists.txt.patch"	# bug #510890
-}
-
-multilib_src_configure() {
-	append-cflags -fPIC
-	append-cxxflags -fPIC
-	local mycmakeargs=(
-		$(cmake-utils_use_enable test TESTS)
-		$(multilib_is_native_abi || echo "-DENABLE_CLI=OFF")
-		-DHIGH_BIT_DEPTH=$(usex 10bit "ON" "OFF")
-		-DLIB_INSTALL_DIR="$(get_libdir)"
-	)
-
-	if [[ ${ABI} = x86 ]] ; then
-		use 10bit && ewarn "Disabling 10bit support on x86 as it does not build (or requires to disable assembly optimizations)"
-		mycmakeargs+=( -DHIGH_BIT_DEPTH=OFF )
-		# Bug #528202
-		if use pic ; then
-			ewarn "PIC has been requested but x86 asm is not PIC-safe, disabling it."
-			mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
-		fi
-	elif [[ ${ABI} = x32 ]] ; then
-		# bug #510890
-		mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_configure() {
-	multilib_parallel_foreach_abi multilib_src_configure
-}
-
-multilib_src_test() {
-	if [ -x "${BUILD_DIR}/test/TestBench" ] ; then
-		"${BUILD_DIR}/test/TestBench" || die
-	else
-		einfo "Unit tests check only assembly, and you do not seem to have any."
-		einfo "Skipping tests."
-	fi
-}
-
-src_test() {
-	multilib_foreach_abi multilib_src_test
-}
-
-src_install() {
-	cmake-multilib_src_install
-	dodoc -r "${S}/../doc/"*
-}
--- a/media-libs/x265/x265-1.9.ebuild
+++ b/media-libs/x265/x265-1.9.ebuild
@ -1,171 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils multilib-minimal multilib multibuild flag-o-matic
-
-if [[ ${PV} = 9999* ]]; then
-	inherit mercurial
-	EHG_REPO_URI="https://bitbucket.org/multicoreware/x265"
-else
-	SRC_URI="
-		https://bitbucket.org/multicoreware/x265/downloads/${PN}_${PV}.tar.gz
-		http://ftp.videolan.org/pub/videolan/x265/${PN}_${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
-fi
-
-DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
-HOMEPAGE="http://x265.org/"
-
-LICENSE="GPL-2"
-# subslot = libx265 soname
-SLOT="0/79"
-IUSE="+10bit +12bit numa pic test"
-
-ASM_DEPEND=">=dev-lang/yasm-1.2.0"
-RDEPEND="numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	abi_x86_32? ( ${ASM_DEPEND} )
-	abi_x86_64? ( ${ASM_DEPEND} )"
-
-src_unpack() {
-	if [[ ${PV} = 9999* ]]; then
-		mercurial_src_unpack
-		# Can't set it at global scope due to mercurial.eclass limitations...
-		export S=${WORKDIR}/${P}/source
-	else
-		unpack ${A}
-		export S="$(echo "${WORKDIR}/${PN}_"*"/source")"
-	fi
-}
-
-# By default, the library and the encoder is configured for only one output bit
-# depth. Meaning, one has to rebuild libx265 if (s)he wants to produce HEVC
-# files with a different bit depth, which is annoying. However, upstream
-# supports proper namespacing for 8bits, 10bits & 12bits HEVC and linking all
-# that together so that the resulting library can produce all three of them
-# instead of only one.
-# The API requires the bit depth parameter, so that libx265 can then chose which
-# variant of the encoder to use.
-# To achieve this, we have to build one (static) library for each non-main
-# variant, and link it into the main library.
-# Upstream documents using the 8bit variant as main library, hence we do not
-# allow disabling it: "main" *MUST* come last in the following list.
-
-x265_get_variants() {
-	local variants=""
-	use 12bit && variants+="main12 "
-	use 10bit && variants+="main10 "
-	variants+="main"
-	echo "${variants}"
-}
-
-x265_variant_src_configure() {
-	mkdir -p "${BUILD_DIR}" || die
-	pushd "${BUILD_DIR}" >/dev/null || die
-
-	local mycmakeargs=( "${myabicmakeargs[@]}" )
-	case "${MULTIBUILD_VARIANT}" in
-		"main12")
-			mycmakeargs+=(
-				-DHIGH_BIT_DEPTH=ON
-				-DEXPORT_C_API=OFF
-				-DENABLE_SHARED=OFF
-				-DENABLE_CLI=OFF
-				-DMAIN12=ON
-			)
-			if [[ ${ABI} = x86 ]] ; then
-				mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
-			fi
-			;;
-		"main10")
-			mycmakeargs+=(
-				-DHIGH_BIT_DEPTH=ON
-				-DEXPORT_C_API=OFF
-				-DENABLE_SHARED=OFF
-				-DENABLE_CLI=OFF
-			)
-			if [[ ${ABI} = x86 ]] ; then
-				mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
-			fi
-			;;
-		"main")
-			if (( "${#MULTIBUILD_VARIANTS[@]}" > 1 )) ; then
-				local myvariants=( "${MULTIBUILD_VARIANTS[@]}" )
-				unset myvariants[${#MULTIBUILD_VARIANTS[@]}-1]
-				local liblist=""
-				for v in "${myvariants[@]}" ; do
-					ln -s "${BUILD_DIR%-*}-${v}/libx265.a" "libx265_${v}.a" ||	die
-					liblist+="libx265_${v}.a;"
-				done
-				mycmakeargs+=(
-					-DEXTRA_LIB="${liblist}"
-					-DEXTRA_LINK_FLAGS=-L.
-					-DLINKED_10BIT=$(usex 10bit)
-					-DLINKED_12BIT=$(usex 12bit)
-				)
-			fi
-			;;
-		*)
-			die "Unknown variant: ${MULTIBUILD_VARIANT}";;
-	esac
-	cmake-utils_src_configure
-	popd >/dev/null || die
-}
-
-multilib_src_configure() {
-	append-cflags -fPIC
-	append-cxxflags -fPIC
-	local myabicmakeargs=(
-		$(cmake-utils_use_enable test TESTS)
-		$(multilib_is_native_abi || echo "-DENABLE_CLI=OFF")
-		-DENABLE_LIBNUMA=$(usex numa ON OFF)
-		-DLIB_INSTALL_DIR="$(get_libdir)"
-	)
-
-	if [[ ${ABI} = x86 ]] ; then
-		# Bug #528202
-		if use pic ; then
-			ewarn "PIC has been requested but x86 asm is not PIC-safe, disabling it."
-			myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF )
-		fi
-	elif [[ ${ABI} = x32 ]] ; then
-		# bug #510890
-		myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF )
-	fi
-
-	local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
-	multibuild_foreach_variant x265_variant_src_configure
-}
-
-multilib_src_compile() {
-	local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
-	multibuild_foreach_variant cmake-utils_src_compile
-}
-
-x265_variant_src_test() {
-	if [ -x "${BUILD_DIR}/test/TestBench" ] ; then
-		"${BUILD_DIR}/test/TestBench" || die
-	else
-		einfo "Unit tests check only assembly."
-		einfo "You do not seem to have any for ABI=${ABI}, x265 variant=${MULTIBUILD_VARIANT}"
-		einfo "Skipping tests."
-	fi
-}
-
-multilib_src_test() {
-	local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
-	multibuild_foreach_variant x265_variant_src_test
-}
-
-multilib_src_install() {
-	# Install only "main" variant since the others are already linked into it.
-	local MULTIBUILD_VARIANTS=( "main" )
-	multibuild_foreach_variant cmake-utils_src_install
-}
-
-multilib_src_install_all() {
-	dodoc -r "${S}/../doc/"*
-}
--- a/media-libs/x265/x265-2.0.ebuild
+++ b/media-libs/x265/x265-2.0.ebuild
@ -1,171 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils multilib-minimal multilib multibuild flag-o-matic
-
-if [[ ${PV} = 9999* ]]; then
-	inherit mercurial
-	EHG_REPO_URI="https://bitbucket.org/multicoreware/x265"
-else
-	SRC_URI="
-		https://bitbucket.org/multicoreware/x265/downloads/${PN}_${PV}.tar.gz
-		http://ftp.videolan.org/pub/videolan/x265/${PN}_${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
-fi
-
-DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
-HOMEPAGE="http://x265.org/"
-
-LICENSE="GPL-2"
-# subslot = libx265 soname
-SLOT="0/87"
-IUSE="+10bit +12bit numa pic test"
-
-ASM_DEPEND=">=dev-lang/yasm-1.2.0"
-RDEPEND="numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	abi_x86_32? ( ${ASM_DEPEND} )
-	abi_x86_64? ( ${ASM_DEPEND} )"
-
-src_unpack() {
-	if [[ ${PV} = 9999* ]]; then
-		mercurial_src_unpack
-		# Can't set it at global scope due to mercurial.eclass limitations...
-		export S=${WORKDIR}/${P}/source
-	else
-		unpack ${A}
-		export S="$(echo "${WORKDIR}/${PN}_"*"/source")"
-	fi
-}
-
-# By default, the library and the encoder is configured for only one output bit
-# depth. Meaning, one has to rebuild libx265 if (s)he wants to produce HEVC
-# files with a different bit depth, which is annoying. However, upstream
-# supports proper namespacing for 8bits, 10bits & 12bits HEVC and linking all
-# that together so that the resulting library can produce all three of them
-# instead of only one.
-# The API requires the bit depth parameter, so that libx265 can then chose which
-# variant of the encoder to use.
-# To achieve this, we have to build one (static) library for each non-main
-# variant, and link it into the main library.
-# Upstream documents using the 8bit variant as main library, hence we do not
-# allow disabling it: "main" *MUST* come last in the following list.
-
-x265_get_variants() {
-	local variants=""
-	use 12bit && variants+="main12 "
-	use 10bit && variants+="main10 "
-	variants+="main"
-	echo "${variants}"
-}
-
-x265_variant_src_configure() {
-	mkdir -p "${BUILD_DIR}" || die
-	pushd "${BUILD_DIR}" >/dev/null || die
-
-	local mycmakeargs=( "${myabicmakeargs[@]}" )
-	case "${MULTIBUILD_VARIANT}" in
-		"main12")
-			mycmakeargs+=(
-				-DHIGH_BIT_DEPTH=ON
-				-DEXPORT_C_API=OFF
-				-DENABLE_SHARED=OFF
-				-DENABLE_CLI=OFF
-				-DMAIN12=ON
-			)
-			if [[ ${ABI} = x86 ]] ; then
-				mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
-			fi
-			;;
-		"main10")
-			mycmakeargs+=(
-				-DHIGH_BIT_DEPTH=ON
-				-DEXPORT_C_API=OFF
-				-DENABLE_SHARED=OFF
-				-DENABLE_CLI=OFF
-			)
-			if [[ ${ABI} = x86 ]] ; then
-				mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
-			fi
-			;;
-		"main")
-			if (( "${#MULTIBUILD_VARIANTS[@]}" > 1 )) ; then
-				local myvariants=( "${MULTIBUILD_VARIANTS[@]}" )
-				unset myvariants[${#MULTIBUILD_VARIANTS[@]}-1]
-				local liblist=""
-				for v in "${myvariants[@]}" ; do
-					ln -s "${BUILD_DIR%-*}-${v}/libx265.a" "libx265_${v}.a" ||	die
-					liblist+="libx265_${v}.a;"
-				done
-				mycmakeargs+=(
-					-DEXTRA_LIB="${liblist}"
-					-DEXTRA_LINK_FLAGS=-L.
-					-DLINKED_10BIT=$(usex 10bit)
-					-DLINKED_12BIT=$(usex 12bit)
-				)
-			fi
-			;;
-		*)
-			die "Unknown variant: ${MULTIBUILD_VARIANT}";;
-	esac
-	cmake-utils_src_configure
-	popd >/dev/null || die
-}
-
-multilib_src_configure() {
-	append-cflags -fPIC
-	append-cxxflags -fPIC
-	local myabicmakeargs=(
-		$(cmake-utils_use_enable test TESTS)
-		$(multilib_is_native_abi || echo "-DENABLE_CLI=OFF")
-		-DENABLE_LIBNUMA=$(usex numa ON OFF)
-		-DLIB_INSTALL_DIR="$(get_libdir)"
-	)
-
-	if [[ ${ABI} = x86 ]] ; then
-		# Bug #528202
-		if use pic ; then
-			ewarn "PIC has been requested but x86 asm is not PIC-safe, disabling it."
-			myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF )
-		fi
-	elif [[ ${ABI} = x32 ]] ; then
-		# bug #510890
-		myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF )
-	fi
-
-	local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
-	multibuild_foreach_variant x265_variant_src_configure
-}
-
-multilib_src_compile() {
-	local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
-	multibuild_foreach_variant cmake-utils_src_compile
-}
-
-x265_variant_src_test() {
-	if [ -x "${BUILD_DIR}/test/TestBench" ] ; then
-		"${BUILD_DIR}/test/TestBench" || die
-	else
-		einfo "Unit tests check only assembly."
-		einfo "You do not seem to have any for ABI=${ABI}, x265 variant=${MULTIBUILD_VARIANT}"
-		einfo "Skipping tests."
-	fi
-}
-
-multilib_src_test() {
-	local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
-	multibuild_foreach_variant x265_variant_src_test
-}
-
-multilib_src_install() {
-	# Install only "main" variant since the others are already linked into it.
-	local MULTIBUILD_VARIANTS=( "main" )
-	multibuild_foreach_variant cmake-utils_src_install
-}
-
-multilib_src_install_all() {
-	dodoc -r "${S}/../doc/"*
-}
--- a/media-libs/x265/x265-2.1.ebuild
+++ b/media-libs/x265/x265-2.1.ebuild
@ -1,171 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils multilib-minimal multilib multibuild flag-o-matic
-
-if [[ ${PV} = 9999* ]]; then
-	inherit mercurial
-	EHG_REPO_URI="https://bitbucket.org/multicoreware/x265"
-else
-	SRC_URI="
-		https://bitbucket.org/multicoreware/x265/downloads/${PN}_${PV}.tar.gz
-		http://ftp.videolan.org/pub/videolan/x265/${PN}_${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
-fi
-
-DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
-HOMEPAGE="http://x265.org/"
-
-LICENSE="GPL-2"
-# subslot = libx265 soname
-SLOT="0/95"
-IUSE="+10bit +12bit numa pic test"
-
-ASM_DEPEND=">=dev-lang/yasm-1.2.0"
-RDEPEND="numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	abi_x86_32? ( ${ASM_DEPEND} )
-	abi_x86_64? ( ${ASM_DEPEND} )"
-
-src_unpack() {
-	if [[ ${PV} = 9999* ]]; then
-		mercurial_src_unpack
-		# Can't set it at global scope due to mercurial.eclass limitations...
-		export S=${WORKDIR}/${P}/source
-	else
-		unpack ${A}
-		export S="$(echo "${WORKDIR}/${PN}_"*"/source")"
-	fi
-}
-
-# By default, the library and the encoder is configured for only one output bit
-# depth. Meaning, one has to rebuild libx265 if (s)he wants to produce HEVC
-# files with a different bit depth, which is annoying. However, upstream
-# supports proper namespacing for 8bits, 10bits & 12bits HEVC and linking all
-# that together so that the resulting library can produce all three of them
-# instead of only one.
-# The API requires the bit depth parameter, so that libx265 can then chose which
-# variant of the encoder to use.
-# To achieve this, we have to build one (static) library for each non-main
-# variant, and link it into the main library.
-# Upstream documents using the 8bit variant as main library, hence we do not
-# allow disabling it: "main" *MUST* come last in the following list.
-
-x265_get_variants() {
-	local variants=""
-	use 12bit && variants+="main12 "
-	use 10bit && variants+="main10 "
-	variants+="main"
-	echo "${variants}"
-}
-
-x265_variant_src_configure() {
-	mkdir -p "${BUILD_DIR}" || die
-	pushd "${BUILD_DIR}" >/dev/null || die
-
-	local mycmakeargs=( "${myabicmakeargs[@]}" )
-	case "${MULTIBUILD_VARIANT}" in
-		"main12")
-			mycmakeargs+=(
-				-DHIGH_BIT_DEPTH=ON
-				-DEXPORT_C_API=OFF
-				-DENABLE_SHARED=OFF
-				-DENABLE_CLI=OFF
-				-DMAIN12=ON
-			)
-			if [[ ${ABI} = x86 ]] ; then
-				mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
-			fi
-			;;
-		"main10")
-			mycmakeargs+=(
-				-DHIGH_BIT_DEPTH=ON
-				-DEXPORT_C_API=OFF
-				-DENABLE_SHARED=OFF
-				-DENABLE_CLI=OFF
-			)
-			if [[ ${ABI} = x86 ]] ; then
-				mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
-			fi
-			;;
-		"main")
-			if (( "${#MULTIBUILD_VARIANTS[@]}" > 1 )) ; then
-				local myvariants=( "${MULTIBUILD_VARIANTS[@]}" )
-				unset myvariants[${#MULTIBUILD_VARIANTS[@]}-1]
-				local liblist=""
-				for v in "${myvariants[@]}" ; do
-					ln -s "${BUILD_DIR%-*}-${v}/libx265.a" "libx265_${v}.a" ||	die
-					liblist+="libx265_${v}.a;"
-				done
-				mycmakeargs+=(
-					-DEXTRA_LIB="${liblist}"
-					-DEXTRA_LINK_FLAGS=-L.
-					-DLINKED_10BIT=$(usex 10bit)
-					-DLINKED_12BIT=$(usex 12bit)
-				)
-			fi
-			;;
-		*)
-			die "Unknown variant: ${MULTIBUILD_VARIANT}";;
-	esac
-	cmake-utils_src_configure
-	popd >/dev/null || die
-}
-
-multilib_src_configure() {
-	append-cflags -fPIC
-	append-cxxflags -fPIC
-	local myabicmakeargs=(
-		$(cmake-utils_use_enable test TESTS)
-		$(multilib_is_native_abi || echo "-DENABLE_CLI=OFF")
-		-DENABLE_LIBNUMA=$(usex numa ON OFF)
-		-DLIB_INSTALL_DIR="$(get_libdir)"
-	)
-
-	if [[ ${ABI} = x86 ]] ; then
-		# Bug #528202
-		if use pic ; then
-			ewarn "PIC has been requested but x86 asm is not PIC-safe, disabling it."
-			myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF )
-		fi
-	elif [[ ${ABI} = x32 ]] ; then
-		# bug #510890
-		myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF )
-	fi
-
-	local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
-	multibuild_foreach_variant x265_variant_src_configure
-}
-
-multilib_src_compile() {
-	local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
-	multibuild_foreach_variant cmake-utils_src_compile
-}
-
-x265_variant_src_test() {
-	if [ -x "${BUILD_DIR}/test/TestBench" ] ; then
-		"${BUILD_DIR}/test/TestBench" || die
-	else
-		einfo "Unit tests check only assembly."
-		einfo "You do not seem to have any for ABI=${ABI}, x265 variant=${MULTIBUILD_VARIANT}"
-		einfo "Skipping tests."
-	fi
-}
-
-multilib_src_test() {
-	local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
-	multibuild_foreach_variant x265_variant_src_test
-}
-
-multilib_src_install() {
-	# Install only "main" variant since the others are already linked into it.
-	local MULTIBUILD_VARIANTS=( "main" )
-	multibuild_foreach_variant cmake-utils_src_install
-}
-
-multilib_src_install_all() {
-	dodoc -r "${S}/../doc/"*
-}
--- a/media-video/mkvtoolnix/mkvtoolnix-9.7.1.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-9.7.1.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$

@ -41,6 +41,7 @@ RDEPEND="
 		dev-qt/qtgui:5
 		dev-qt/qtnetwork:5
 		dev-qt/qtwidgets:5
+		dev-qt/qtconcurrent:5
 	)
 "
 DEPEND="${RDEPEND}
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@ -1 +1 @@
-Wed, 04 Jan 2017 11:43:19 +0000
+Wed, 04 Jan 2017 14:43:20 +0000
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@ -1 +1 @@
-Wed, 04 Jan 2017 11:43:19 +0000
+Wed, 04 Jan 2017 14:43:20 +0000
--- a/metadata/md5-cache/app-crypt/gnupg-2.1.17-r1
+++ b/metadata/md5-cache/app-crypt/gnupg-2.1.17-r1
@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/npth-1.2 >=dev-libs/libassuan-2.4.3 >=dev-libs/libgcrypt-1.7.
 SLOT=0
 SRC_URI=mirror://gnupg/gnupg/gnupg-2.1.17.tar.bz2
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=6b0acc482a57091bf91a40760e12f6a0
+_md5_=ba22ee73eb99682bb3aba953b691f7dc
--- a/metadata/md5-cache/app-emulation/docker-compose-1.10.0_pre20161220
+++ b/metadata/md5-cache/app-emulation/docker-compose-1.10.0_pre20161220
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/cached-property-1.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/cached-property-2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/dockerpty-0.4.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/dockerpty-0.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/docker-py-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/docker-py-3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/docopt-0.6.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/docopt-0.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/jsonschema-2.5.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/jsonschema-3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pyyaml-3.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/pyyaml-4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/requests-2.11.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/requests-2.12[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/requests-2.6.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/six-1.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/six-2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/texttable-0.8.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/texttable-0.9[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/websocket-client-0.32.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/websocket-client-1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-python/enum34-1.0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( <dev-python/enum34-2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) test? ( dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-python/mock-1.0.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DESCRIPTION=Multi-container orchestration for Docker
+EAPI=5
+HOMEPAGE=https://www.docker.com/
+IUSE=test python_targets_python2_7 python_targets_python3_4
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/cached-property-1.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/cached-property-2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/dockerpty-0.4.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/dockerpty-0.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/docker-py-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/docker-py-3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/docopt-0.6.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/docopt-0.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/jsonschema-2.5.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/jsonschema-3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pyyaml-3.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/pyyaml-4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/requests-2.11.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/requests-2.12[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/requests-2.6.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/six-1.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/six-2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/texttable-0.8.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/texttable-0.9[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/websocket-client-0.32.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/websocket-client-1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-python/enum34-1.0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( <dev-python/enum34-2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
+SLOT=0
+SRC_URI=https://github.com/docker/compose/archive/09690e1758d39f1213a9f44ab027ad69e1de0653.tar.gz -> docker-compose-1.10.0_pre20161220.tar.gz
+_eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	distutils-r1	583a05d30524485fda6869c772682ecd	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	vcs-snapshot	2b65ecb2d0f91e4322c2ac8d673993bd	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=92bcfa63f20a9b8c331f462a4ece55ab
--- a/metadata/md5-cache/app-misc/wcd-5.3.4
+++ b/metadata/md5-cache/app-misc/wcd-5.3.4
@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses:0=[unicode?] unicode? ( dev-libs/libunistring )
 SLOT=0
-SRC_URI=http://waterlan.home.xs4all.nl/wcd/wcd-5.3.2.tar.gz
+SRC_URI=http://waterlan.home.xs4all.nl/wcd/wcd-5.3.4.tar.gz
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=a89e6248a423273953eac639bd0d4ec0
+_md5_=4293a486fbe7ae264668d66d672470bb
--- a/metadata/md5-cache/dev-lang/mujs-0_p20161202
+++ b/metadata/md5-cache/dev-lang/mujs-0_p20161202
@ -0,0 +1,10 @@
+DEFINED_PHASES=prepare unpack
+DESCRIPTION=lightweight Javascript interpreter
+EAPI=6
+HOMEPAGE=http://mujs.com/
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=AGPL-3
+SLOT=0
+SRC_URI=http://git.ghostscript.com/?p=mujs.git;a=snapshot;h=fd003eceda531e13fbdd1aeb6e9c73156496e569;sf=tgz -> mujs-0_p20161202.tar.gz
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	vcs-snapshot	2b65ecb2d0f91e4322c2ac8d673993bd
+_md5_=5ff4d840c288fe3e0878780e87b89cd6
--- a/metadata/md5-cache/dev-libs/libxml2-2.9.4-r1
+++ b/metadata/md5-cache/dev-libs/libxml2-2.9.4-r1
@ -4,10 +4,10 @@ DESCRIPTION=Version 2 of the library to manipulate XML files
 EAPI=6
 HOMEPAGE=http://www.xmlsoft.org/
 IUSE=debug examples icu ipv6 lzma python readline static-libs test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=MIT
 RDEPEND=>=sys-libs/zlib-1.2.8-r1:=[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(-)?] icu? ( >=dev-libs/icu-51.2-r1:=[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(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[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(-)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) python_targets_python3_5? ( dev-lang/python:3.5[xml] ) >=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(-)] ) readline? ( sys-libs/readline:= )
 SLOT=2
 SRC_URI=ftp://xmlsoft.org/libxml2/libxml2-2.9.4.tar.gz test? ( http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2002-01-16/xsts-2002-01-16.tar.gz http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2004-01-14/xsts-2004-01-14.tar.gz http://www.w3.org/XML/Test/xmlts20080827.tar.gz )
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	prefix	99dcca42e6528d8fe3c214bf5731aaf2	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=ec674af6e22573c62c69414bdb2fbf32
+_md5_=441eec43919de127e630841e81e1012b
--- a/metadata/md5-cache/dev-ml/OCaml-ImageMagick-0.34-r1
+++ b/metadata/md5-cache/dev-ml/OCaml-ImageMagick-0.34-r1
@ -1,5 +1,5 @@
 DEFINED_PHASES=install
-DEPEND=media-gfx/imagemagick:= dev-lang/ocaml:=[ocamlopt]
+DEPEND=media-gfx/imagemagick:= dev-lang/ocaml:=[ocamlopt] >=dev-ml/findlib-1.0.4-r1
 DESCRIPTION=Provide the ImageMagick methods to OCaml
 EAPI=6
 HOMEPAGE=http://www.linux-nantes.org/~fmonnier/OCaml/ImageMagick/
@ -7,6 +7,7 @@ KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=media-gfx/imagemagick:= dev-lang/ocaml:=[ocamlopt]
 RESTRICT=test
-SLOT=0
+SLOT=0/0.34
 SRC_URI=http://www.linux-nantes.org/~fmonnier/OCaml/ImageMagick/ImageMagick/OCaml-ImageMagick-0.34.tgz
-_md5_=27431185c13284d27da7d8ecae5f2ff5
+_eclasses_=findlib	9909e5ca0f77ff5b693885a3d7aeadb7
+_md5_=d71a14700701abd63e8f15fa9ec8a4f3
--- a/metadata/md5-cache/dev-ml/lwt-2.7.0
+++ b/metadata/md5-cache/dev-ml/lwt-2.7.0
@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=react? ( >=dev-ml/react-1.2:= ) dev-libs/libev >=dev-lang/ocaml-4.02:= ssl? ( >=dev-ml/ocaml-ssl-0.4.0:= ) gtk? ( dev-ml/lablgtk:= dev-libs/glib:2 ) ppx? ( dev-ml/ppx_tools:= ) camlp4? ( dev-ml/camlp4:= ) >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] || ( dev-ml/ocamlbuild <dev-lang/ocaml-4.02.3-r1 )
+DESCRIPTION=Cooperative light-weight thread library for OCaml
+EAPI=5
+HOMEPAGE=http://ocsigen.org/lwt
+IUSE=+camlp4 gtk +ppx +react +ssl +ocamlopt debug doc test
+KEYWORDS=~amd64 ~x86-fbsd
+LICENSE=LGPL-2.1-with-linking-exception
+RDEPEND=react? ( >=dev-ml/react-1.2:= ) dev-libs/libev >=dev-lang/ocaml-4.02:= ssl? ( >=dev-ml/ocaml-ssl-0.4.0:= ) gtk? ( dev-ml/lablgtk:= dev-libs/glib:2 ) ppx? ( dev-ml/ppx_tools:= ) camlp4? ( dev-ml/camlp4:= ) !<www-servers/ocsigen-1.1 >=dev-lang/ocaml-3.12:=[ocamlopt?]
+SLOT=0/2.7.0
+SRC_URI=https://github.com/ocsigen/lwt/archive/2.7.0.tar.gz -> lwt-2.7.0.tar.gz
+_eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	b83a2420b796f7c6eff682679d08fe25	findlib	9909e5ca0f77ff5b693885a3d7aeadb7	multilib	165fc17c38d1b11dac2008280dab6e80	oasis	473d7851a239e10730fd5d1f7301e7ca	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
+_md5_=b13562919f0de9199ad0d754b7565a13
--- a/metadata/md5-cache/dev-ml/ocaml-safepass-2.0
+++ b/metadata/md5-cache/dev-ml/ocaml-safepass-2.0
@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] || ( dev-ml/ocamlbuild <dev-lang/ocaml-4.02.3-r1 )
+DESCRIPTION=A library offering facilities for the safe storage of user passwords
+EAPI=5
+HOMEPAGE=http://ocaml-safepass.forge.ocamlcore.org/ https://github.com/darioteixeira/ocaml-safepass
+IUSE=+ocamlopt debug doc
+KEYWORDS=~amd64
+LICENSE=LGPL-2.1-with-linking-exception
+RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?]
+SLOT=0/2.0
+SRC_URI=https://github.com/darioteixeira/ocaml-safepass/archive/v2.0.tar.gz -> ocaml-safepass-2.0.tar.gz
+_eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	b83a2420b796f7c6eff682679d08fe25	findlib	9909e5ca0f77ff5b693885a3d7aeadb7	multilib	165fc17c38d1b11dac2008280dab6e80	oasis	473d7851a239e10730fd5d1f7301e7ca	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
+_md5_=6498b776bc502aba46e6ad1766d91238
--- a/metadata/md5-cache/dev-ml/ocaml-sqlite3-4.1.1
+++ b/metadata/md5-cache/dev-ml/ocaml-sqlite3-4.1.1
@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=dev-db/sqlite-3.3.3 >=dev-ml/findlib-1.3.2 >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] || ( dev-ml/ocamlbuild <dev-lang/ocaml-4.02.3-r1 )
+DESCRIPTION=A package for ocaml that provides access to SQLite databases
+EAPI=5
+HOMEPAGE=http://mmottl.github.io/sqlite3-ocaml/
+IUSE=+ocamlopt debug doc test
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=MIT
+RDEPEND=>=dev-db/sqlite-3.3.3 >=dev-ml/findlib-1.3.2 >=dev-lang/ocaml-3.12:=[ocamlopt?]
+SLOT=0/4.1.1
+SRC_URI=https://github.com/mmottl/sqlite3-ocaml/releases/download/v4.1.1/sqlite3-ocaml-4.1.1.tar.gz
+_eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	b83a2420b796f7c6eff682679d08fe25	findlib	9909e5ca0f77ff5b693885a3d7aeadb7	multilib	165fc17c38d1b11dac2008280dab6e80	oasis	473d7851a239e10730fd5d1f7301e7ca	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
+_md5_=2ecd0ae9c38ce206d9fff9aa25de2f09
--- a/metadata/md5-cache/dev-ml/ocsigen-start-0.99
+++ b/metadata/md5-cache/dev-ml/ocsigen-start-0.99
@ -1,12 +1,12 @@
-DEFINED_PHASES=install prepare
-DEPEND=dev-lang/ocaml:= dev-ml/pgocaml:= dev-ml/macaque:= dev-ml/ocaml-safepass:= dev-ml/eliom:= dev-ml/ocsigen-toolkit:= dev-ml/ppx_deriving:= dev-ml/yojson:= >=dev-ml/findlib-1.0.4-r1
+DEFINED_PHASES=install
+DEPEND=dev-lang/ocaml:= dev-ml/pgocaml:= dev-ml/macaque:= dev-ml/ocaml-safepass:= dev-ml/eliom:= dev-ml/ocsigen-toolkit:= dev-ml/ppx_deriving:= dev-ml/yojson:= dev-ml/OCaml-ImageMagick:= >=dev-ml/findlib-1.0.4-r1
 DESCRIPTION=Eliom Base Application with users, (pre)registration, notifications, etc.
 EAPI=5
 HOMEPAGE=https://github.com/ocsigen/ocsigen-start
 KEYWORDS=~amd64
 LICENSE=LGPL-3
-RDEPEND=dev-lang/ocaml:= dev-ml/pgocaml:= dev-ml/macaque:= dev-ml/ocaml-safepass:= dev-ml/eliom:= dev-ml/ocsigen-toolkit:= dev-ml/ppx_deriving:= dev-ml/yojson:=
+RDEPEND=dev-lang/ocaml:= dev-ml/pgocaml:= dev-ml/macaque:= dev-ml/ocaml-safepass:= dev-ml/eliom:= dev-ml/ocsigen-toolkit:= dev-ml/ppx_deriving:= dev-ml/yojson:= dev-ml/OCaml-ImageMagick:=
 SLOT=0/0.99
 SRC_URI=https://github.com/ocsigen/ocsigen-start/archive/v0.99.tar.gz -> ocsigen-start-0.99.tar.gz
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	findlib	9909e5ca0f77ff5b693885a3d7aeadb7	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=d5d4ab57edae013bce680464f98bb7dc
+_eclasses_=findlib	9909e5ca0f77ff5b693885a3d7aeadb7
+_md5_=ab9c43cffbb4c04742ad8299f9cb36ec
--- a/metadata/md5-cache/dev-ml/ocsigen-start-9999
+++ b/metadata/md5-cache/dev-ml/ocsigen-start-9999
@ -1,10 +1,10 @@
-DEFINED_PHASES=install prepare unpack
-DEPEND=dev-lang/ocaml:= dev-ml/pgocaml:= dev-ml/macaque:= dev-ml/ocaml-safepass:= dev-ml/eliom:= dev-ml/ocsigen-toolkit:= dev-ml/ppx_deriving:= dev-ml/yojson:= >=dev-ml/findlib-1.0.4-r1 >=dev-vcs/git-1.8.2.1
+DEFINED_PHASES=install unpack
+DEPEND=dev-lang/ocaml:= dev-ml/pgocaml:= dev-ml/macaque:= dev-ml/ocaml-safepass:= dev-ml/eliom:= dev-ml/ocsigen-toolkit:= dev-ml/ppx_deriving:= dev-ml/yojson:= dev-ml/OCaml-ImageMagick:= >=dev-ml/findlib-1.0.4-r1 >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Eliom Base Application with users, (pre)registration, notifications, etc.
 EAPI=5
 HOMEPAGE=https://github.com/ocsigen/ocsigen-start
 LICENSE=LGPL-3
-RDEPEND=dev-lang/ocaml:= dev-ml/pgocaml:= dev-ml/macaque:= dev-ml/ocaml-safepass:= dev-ml/eliom:= dev-ml/ocsigen-toolkit:= dev-ml/ppx_deriving:= dev-ml/yojson:=
+RDEPEND=dev-lang/ocaml:= dev-ml/pgocaml:= dev-ml/macaque:= dev-ml/ocaml-safepass:= dev-ml/eliom:= dev-ml/ocsigen-toolkit:= dev-ml/ppx_deriving:= dev-ml/yojson:= dev-ml/OCaml-ImageMagick:=
 SLOT=0/9999
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	findlib	9909e5ca0f77ff5b693885a3d7aeadb7	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=d5d4ab57edae013bce680464f98bb7dc
+_md5_=ab9c43cffbb4c04742ad8299f9cb36ec
--- a/metadata/md5-cache/dev-python/neovim-python-client-0.1.12
+++ b/metadata/md5-cache/dev-python/neovim-python-client-0.1.12
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/msgpack-0.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(-)] virtual/python-greenlet[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-python/trollius[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) 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=Python client for Neovim
+EAPI=6
+HOMEPAGE=https://github.com/neovim/python-client
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/msgpack-0.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(-)] virtual/python-greenlet[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-python/trollius[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=app-editors/neovim-0.1.6 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=https://github.com/neovim/python-client/archive/0.1.12.tar.gz -> neovim-python-client-0.1.12.tar.gz
+_eclasses_=distutils-r1	583a05d30524485fda6869c772682ecd	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=b77486eb6e9d5cc6bf8eb748ac69085f
--- a/metadata/md5-cache/dev-python/pyproj-1.9.5.1
+++ b/metadata/md5-cache/dev-python/pyproj-1.9.5.1
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=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=Python interface to PROJ.4 library
+EAPI=6
+HOMEPAGE=https://github.com/jswhit/pyproj
+IUSE=doc python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64 ~x86 ~amd64-linux
+LICENSE=MIT
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=mirror://pypi/p/pyproj/pyproj-1.9.5.1.tar.gz
+_eclasses_=distutils-r1	583a05d30524485fda6869c772682ecd	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=95228b5b2e7028b5de8e49b3f0499e3e
--- a/metadata/md5-cache/dev-tex/latexdiff-1.2.0
+++ b/metadata/md5-cache/dev-tex/latexdiff-1.2.0
@ -1,12 +1,12 @@
 DEFINED_PHASES=compile install test
-DEPEND=>=dev-lang/perl-5.8 dev-perl/Algorithm-Diff dev-perl/Pod-LaTeX test? ( app-shells/tcsh )
+DEPEND=>=dev-lang/perl-5.8 virtual/latex-base dev-texlive/texlive-genericrecommended dev-perl/Algorithm-Diff dev-perl/Pod-LaTeX test? ( app-shells/tcsh )
 DESCRIPTION=Compare two latex files and mark up significant differences
 EAPI=5
 HOMEPAGE=http://www.ctan.org/tex-archive/support/latexdiff/ https://github.com/ftilmann/latexdiff/
 IUSE=test
 KEYWORDS=~amd64 ~arm ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=GPL-3
-RDEPEND=>=dev-lang/perl-5.8 dev-perl/Algorithm-Diff
+RDEPEND=>=dev-lang/perl-5.8 virtual/latex-base dev-texlive/texlive-genericrecommended dev-perl/Algorithm-Diff
 SLOT=0
 SRC_URI=https://github.com/ftilmann/latexdiff/archive/1.2.0.tar.gz -> latexdiff-1.2.0.tar.gz
-_md5_=e45697ab8cca157c151db02632e65769
+_md5_=0f19a310b8e4dda8c3dcdbbb3552732d
--- a/metadata/md5-cache/dev-util/drone-ui-0_pre20170103
+++ b/metadata/md5-cache/dev-util/drone-ui-0_pre20170103
@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install test unpack
+DEPEND=dev-go/go-bindata dev-go/go-bindata-assetfs >=dev-lang/go-1.4.2:=
+DESCRIPTION=React front-end for the Drone continuous integration server
+EAPI=5
+HOMEPAGE=https://github.com/drone/drone-ui
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+SLOT=0/0_pre20170103
+SRC_URI=https://github.com/drone/drone-ui/archive/fe03fc6e853ec0a9814c8eab0119a34df17d5ff8.tar.gz -> drone-ui-0_pre20170103.tar.gz
+_eclasses_=golang-base	08fe6e0e2b4750daff8887a7f0e1f873	golang-build	a44f10e6bd86ecccf2a07cc0d4cf6bec	golang-vcs-snapshot	1caa6d8238d2378ad688ae068ff22e5a
+_md5_=ef04031944163a336459f821ed5bae59
--- a/metadata/md5-cache/dev-util/pkgconfig-0.29.1
+++ b/metadata/md5-cache/dev-util/pkgconfig-0.29.1
@ -10,4 +10,4 @@ RDEPEND=!internal-glib? ( >=dev-libs/glib-2.34.3[abi_x86_32(-)?,abi_x86_64(-)?,a
 SLOT=0
 SRC_URI=https://pkgconfig.freedesktop.org/releases/pkg-config-0.29.1.tar.gz
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=79fce1d76a2bd5f957a155223f504189
+_md5_=7e24f5aee7c06c60d4e4a93a90576a3c
--- a/metadata/md5-cache/dev-util/ragel-7.0.0.9
+++ b/metadata/md5-cache/dev-util/ragel-7.0.0.9
@ -0,0 +1,12 @@
+DEFINED_PHASES=install test
+DEPEND=dev-util/colm
+DESCRIPTION=Compiles finite state machines from regular languages into executable code
+EAPI=6
+HOMEPAGE=https://www.colm.net/open-source/ragel/
+IUSE=vim-syntax
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=dev-util/colm
+SLOT=0
+SRC_URI=https://www.colm.net/files/ragel/ragel-7.0.0.9.tar.gz
+_md5_=a524c15a465e9e5670ddcabd4ecf509d
--- a/metadata/md5-cache/media-gfx/nvidia-texture-tools-2.0.8-r2
+++ b/metadata/md5-cache/media-gfx/nvidia-texture-tools-2.0.8-r2
@ -10,4 +10,4 @@ RDEPEND=media-libs/libpng:0 media-libs/ilmbase media-libs/tiff:0 sys-libs/zlib v
 SLOT=0
 SRC_URI=https://nvidia-texture-tools.googlecode.com/files/nvidia-texture-tools-2.0.8-1.tar.gz https://dev.gentoo.org/~ssuominen/nvidia-texture-tools-2.0.8-patchset-1.tar.xz
 _eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=393d8648d1c5a2da189d58ee11fc7883
+_md5_=6fc2dcfcf3145a5453110494dcf28658
--- a/metadata/md5-cache/media-gfx/nvidia-texture-tools-2.0.8-r3
+++ b/metadata/md5-cache/media-gfx/nvidia-texture-tools-2.0.8-r3
@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=media-libs/ilmbase:= media-libs/libpng:0= media-libs/tiff:0 sys-libs/zlib virtual/jpeg:0 virtual/opengl x11-libs/libX11 cg? ( media-gfx/nvidia-cg-toolkit ) cuda? ( dev-util/nvidia-cuda-toolkit ) glew? ( media-libs/glew:0= ) glut? ( media-libs/freeglut ) openexr? ( media-libs/openexr:= ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.5.2
+DESCRIPTION=A set of cuda-enabled texture tools and compressors
+EAPI=6
+HOMEPAGE=http://developer.nvidia.com/object/texture_tools.html
+IUSE=cg cuda glew glut openexr
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=media-libs/ilmbase:= media-libs/libpng:0= media-libs/tiff:0 sys-libs/zlib virtual/jpeg:0 virtual/opengl x11-libs/libX11 cg? ( media-gfx/nvidia-cg-toolkit ) cuda? ( dev-util/nvidia-cuda-toolkit ) glew? ( media-libs/glew:0= ) glut? ( media-libs/freeglut ) openexr? ( media-libs/openexr:= )
+SLOT=0
+SRC_URI=https://nvidia-texture-tools.googlecode.com/files/nvidia-texture-tools-2.0.8-1.tar.gz https://dev.gentoo.org/~ssuominen/nvidia-texture-tools-2.0.8-patchset-1.tar.xz
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=ed64d64ebd15571ee3dc4d60e33df4b1
--- a/metadata/md5-cache/media-libs/rubberband-1.7.0
+++ b/metadata/md5-cache/media-libs/rubberband-1.7.0
@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=media-libs/vamp-plugin-sdk media-libs/libsamplerate media-libs/libsndfile media-libs/ladspa-sdk sci-libs/fftw:3.0 virtual/pkgconfig
-DESCRIPTION=An audio time-stretching and pitch-shifting library and utility program
-EAPI=4
-HOMEPAGE=http://www.breakfastquay.com/rubberband/
-IUSE=static-libs
-KEYWORDS=amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=media-libs/vamp-plugin-sdk media-libs/libsamplerate media-libs/libsndfile media-libs/ladspa-sdk sci-libs/fftw:3.0
-SLOT=0
-SRC_URI=http://code.breakfastquay.com/attachments/download/23/rubberband-1.7.0.tar.bz2
-_eclasses_=multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=dfce7516f75118e373436cf15c2eab79
--- a/metadata/md5-cache/media-libs/rubberband-1.8.1
+++ b/metadata/md5-cache/media-libs/rubberband-1.8.1
@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=media-libs/vamp-plugin-sdk media-libs/libsamplerate media-libs/libsndfile media-libs/ladspa-sdk sci-libs/fftw:3.0 virtual/pkgconfig
-DESCRIPTION=An audio time-stretching and pitch-shifting library and utility program
-EAPI=5
-HOMEPAGE=http://www.breakfastquay.com/rubberband/
-IUSE=static-libs
-KEYWORDS=~alpha amd64 hppa ppc ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=media-libs/vamp-plugin-sdk media-libs/libsamplerate media-libs/libsndfile media-libs/ladspa-sdk sci-libs/fftw:3.0
-SLOT=0
-SRC_URI=http://code.breakfastquay.com/attachments/download/34/rubberband-1.8.1.tar.bz2
-_eclasses_=multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=a0a6d95d8f0d62c42c4df3cba179c035
--- a/metadata/md5-cache/media-libs/x265-1.5
+++ b/metadata/md5-cache/media-libs/x265-1.5
@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=abi_x86_32? ( >=dev-lang/yasm-1.2.0 ) abi_x86_64? ( >=dev-lang/yasm-1.2.0 ) sys-devel/make >=dev-util/cmake-3.5.2
-DESCRIPTION=Library for encoding video streams into the H.265/HEVC format
-EAPI=5
-HOMEPAGE=http://x265.org/
-IUSE=+10bit test 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 ppc64 x86
-LICENSE=GPL-2
-SLOT=0/43
-SRC_URI=https://bitbucket.org/multicoreware/x265/get/1.5.tar.bz2 -> x265-1.5.tar.bz2
-_eclasses_=cmake-multilib	273c15f5a0a06438a38bb5c3e98fa2db	cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=17c7ba55bc5a612226ed1f6105791f45
--- a/metadata/md5-cache/media-libs/x265-1.7
+++ b/metadata/md5-cache/media-libs/x265-1.7
@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=abi_x86_32? ( >=dev-lang/yasm-1.2.0 ) abi_x86_64? ( >=dev-lang/yasm-1.2.0 ) sys-devel/make >=dev-util/cmake-3.5.2
-DESCRIPTION=Library for encoding video streams into the H.265/HEVC format
-EAPI=5
-HOMEPAGE=http://x265.org/
-IUSE=+10bit test 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 ~ppc64 ~x86
-LICENSE=GPL-2
-SLOT=0/59
-SRC_URI=https://bitbucket.org/multicoreware/x265/downloads/x265_1.7.tar.gz http://ftp.videolan.org/pub/videolan/x265/x265_1.7.tar.gz
-_eclasses_=cmake-multilib	273c15f5a0a06438a38bb5c3e98fa2db	cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=96f9ed71cb469af750605c6429fb5dfd
--- a/metadata/md5-cache/media-libs/x265-1.8
+++ b/metadata/md5-cache/media-libs/x265-1.8
@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=abi_x86_32? ( >=dev-lang/yasm-1.2.0 ) abi_x86_64? ( >=dev-lang/yasm-1.2.0 ) sys-devel/make >=dev-util/cmake-3.5.2
-DESCRIPTION=Library for encoding video streams into the H.265/HEVC format
-EAPI=5
-HOMEPAGE=http://x265.org/
-IUSE=+10bit pic test 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 ~ppc64 ~x86
-LICENSE=GPL-2
-SLOT=0/68
-SRC_URI=https://bitbucket.org/multicoreware/x265/downloads/x265_1.8.tar.gz http://ftp.videolan.org/pub/videolan/x265/x265_1.8.tar.gz
-_eclasses_=cmake-multilib	273c15f5a0a06438a38bb5c3e98fa2db	cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=d6060764481b62efecfc543808e5c697
--- a/metadata/md5-cache/media-libs/x265-1.9
+++ b/metadata/md5-cache/media-libs/x265-1.9
@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=numa? ( >=sys-process/numactl-2.0.10-r1[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(-)?] ) abi_x86_32? ( >=dev-lang/yasm-1.2.0 ) abi_x86_64? ( >=dev-lang/yasm-1.2.0 ) sys-devel/make >=dev-util/cmake-3.5.2
-DESCRIPTION=Library for encoding video streams into the H.265/HEVC format
-EAPI=5
-HOMEPAGE=http://x265.org/
-IUSE=+10bit +12bit numa pic test 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 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=numa? ( >=sys-process/numactl-2.0.10-r1[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(-)?] )
-SLOT=0/79
-SRC_URI=https://bitbucket.org/multicoreware/x265/downloads/x265_1.9.tar.gz http://ftp.videolan.org/pub/videolan/x265/x265_1.9.tar.gz
-_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=b321bd5015d98259b0d961a7e0828fef
--- a/metadata/md5-cache/media-libs/x265-2.0
+++ b/metadata/md5-cache/media-libs/x265-2.0
@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=numa? ( >=sys-process/numactl-2.0.10-r1[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(-)?] ) abi_x86_32? ( >=dev-lang/yasm-1.2.0 ) abi_x86_64? ( >=dev-lang/yasm-1.2.0 ) sys-devel/make >=dev-util/cmake-3.5.2
-DESCRIPTION=Library for encoding video streams into the H.265/HEVC format
-EAPI=5
-HOMEPAGE=http://x265.org/
-IUSE=+10bit +12bit numa pic test 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 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=numa? ( >=sys-process/numactl-2.0.10-r1[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(-)?] )
-SLOT=0/87
-SRC_URI=https://bitbucket.org/multicoreware/x265/downloads/x265_2.0.tar.gz http://ftp.videolan.org/pub/videolan/x265/x265_2.0.tar.gz
-_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=900effcb724b77d0a58e627fc569a2f9
--- a/metadata/md5-cache/media-libs/x265-2.1
+++ b/metadata/md5-cache/media-libs/x265-2.1
@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=numa? ( >=sys-process/numactl-2.0.10-r1[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(-)?] ) abi_x86_32? ( >=dev-lang/yasm-1.2.0 ) abi_x86_64? ( >=dev-lang/yasm-1.2.0 ) sys-devel/make >=dev-util/cmake-3.5.2
-DESCRIPTION=Library for encoding video streams into the H.265/HEVC format
-EAPI=5
-HOMEPAGE=http://x265.org/
-IUSE=+10bit +12bit numa pic test 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 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=numa? ( >=sys-process/numactl-2.0.10-r1[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(-)?] )
-SLOT=0/95
-SRC_URI=https://bitbucket.org/multicoreware/x265/downloads/x265_2.1.tar.gz http://ftp.videolan.org/pub/videolan/x265/x265_2.1.tar.gz
-_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=34fbd91cdf30cbf2ad241c214016afd4
--- a/metadata/md5-cache/media-video/mkvtoolnix-9.7.1
+++ b/metadata/md5-cache/media-video/mkvtoolnix-9.7.1
@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare pretend test
-DEPEND=>=dev-libs/boost-1.46.0:= >=dev-libs/libebml-1.3.3:= dev-libs/pugixml media-libs/flac >=media-libs/libmatroska-1.4.4:= media-libs/libogg media-libs/libvorbis sys-apps/file sys-libs/zlib qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 ) || ( ( dev-lang/ruby:2.3 virtual/rubygems[ruby_targets_ruby23] ) ( dev-lang/ruby:2.2 virtual/rubygems[ruby_targets_ruby22] ) ( dev-lang/ruby:2.1 virtual/rubygems[ruby_targets_ruby21] ) ) sys-devel/gettext virtual/pkgconfig test? ( dev-cpp/gtest ) !<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
+DEPEND=>=dev-libs/boost-1.46.0:= >=dev-libs/libebml-1.3.3:= dev-libs/pugixml media-libs/flac >=media-libs/libmatroska-1.4.4:= media-libs/libogg media-libs/libvorbis sys-apps/file sys-libs/zlib qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtconcurrent:5 ) || ( ( dev-lang/ruby:2.3 virtual/rubygems[ruby_targets_ruby23] ) ( dev-lang/ruby:2.2 virtual/rubygems[ruby_targets_ruby22] ) ( dev-lang/ruby:2.1 virtual/rubygems[ruby_targets_ruby21] ) ) sys-devel/gettext virtual/pkgconfig test? ( dev-cpp/gtest ) !<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=Tools to create, alter, and inspect Matroska files
 EAPI=6
 HOMEPAGE=http://www.bunkus.org/videotools/mkvtoolnix
 IUSE=curl debug pch test qt5
 KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
-RDEPEND=>=dev-libs/boost-1.46.0:= >=dev-libs/libebml-1.3.3:= dev-libs/pugixml media-libs/flac >=media-libs/libmatroska-1.4.4:= media-libs/libogg media-libs/libvorbis sys-apps/file sys-libs/zlib qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 )
+RDEPEND=>=dev-libs/boost-1.46.0:= >=dev-libs/libebml-1.3.3:= dev-libs/pugixml media-libs/flac >=media-libs/libmatroska-1.4.4:= media-libs/libogg media-libs/libvorbis sys-apps/file sys-libs/zlib qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtconcurrent:5 )
 SLOT=0
 SRC_URI=http://www.bunkus.org/videotools/mkvtoolnix/sources/mkvtoolnix-9.7.1.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	66b3bf714f8cfc1b6494db5269b4666e	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=454f4d5ece4d0002bdb94485f5d3058b
+_md5_=f7674cabac3e1b1a890b1e386be62a53
--- a/metadata/md5-cache/net-analyzer/hexinject-1.5
+++ b/metadata/md5-cache/net-analyzer/hexinject-1.5
@ -0,0 +1,13 @@
+DEFINED_PHASES=install prepare
+DEPEND=net-libs/libpcap
+DESCRIPTION=Network packet sniffer and injector
+EAPI=6
+HOMEPAGE=http://hexinject.sourceforge.net/
+IUSE=+tools experimental
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=net-libs/libpcap experimental? ( dev-lang/tcl )
+SLOT=0
+SRC_URI=http://downloads.sourceforge.net/project/hexinject/hexinject-1.5/hexinject-1.5.tar.gz
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
+_md5_=27725b2e5664abe8eed526e8cde7b80e
--- a/metadata/md5-cache/net-libs/libisds-0.10.6
+++ b/metadata/md5-cache/net-libs/libisds-0.10.6
@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=dev-libs/expat dev-libs/libxml2 curl? ( net-misc/curl[ssl] ) openssl? ( dev-libs/openssl:= ) !openssl? ( app-crypt/gpgme dev-libs/libgcrypt:= ) virtual/pkgconfig nls? ( sys-devel/gettext ) test? ( >=net-libs/gnutls-2.12.0 )
+DESCRIPTION=Client library for accessing ISDS Soap services
+EAPI=6
+HOMEPAGE=http://xpisar.wz.cz/libisds/
+IUSE=+curl debug nls openssl static-libs test
+KEYWORDS=~amd64 ~mips ~x86
+LICENSE=LGPL-3
+RDEPEND=dev-libs/expat dev-libs/libxml2 curl? ( net-misc/curl[ssl] ) openssl? ( dev-libs/openssl:= ) !openssl? ( app-crypt/gpgme dev-libs/libgcrypt:= ) !openssl? ( >=app-crypt/gnupg-2 )
+SLOT=0
+SRC_URI=http://xpisar.wz.cz/libisds/dist/libisds-0.10.6.tar.xz
+_md5_=a4c2db061db0c3e7af9d1c92399f9009
--- a/metadata/md5-cache/net-libs/libisds-0.7
+++ b/metadata/md5-cache/net-libs/libisds-0.7
@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=app-crypt/gpgme dev-libs/expat dev-libs/libgcrypt:0 dev-libs/libxml2 curl? ( net-misc/curl[ssl] ) virtual/pkgconfig nls? ( sys-devel/gettext )
-DESCRIPTION=Client library for accessing ISDS Soap services
-EAPI=5
-HOMEPAGE=http://xpisar.wz.cz/libisds/
-IUSE=+curl debug nls static-libs test
-KEYWORDS=~amd64 ~mips ~x86
-LICENSE=LGPL-3
-RDEPEND=app-crypt/gpgme dev-libs/expat dev-libs/libgcrypt:0 dev-libs/libxml2 curl? ( net-misc/curl[ssl] ) >=app-crypt/gnupg-2
-SLOT=0
-SRC_URI=http://xpisar.wz.cz/libisds/dist/libisds-0.7.tar.xz
-_eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=b169791b13c6178ded559639746308dd
--- a/metadata/md5-cache/net-libs/libisds-9999
+++ b/metadata/md5-cache/net-libs/libisds-9999
@ -1,11 +1,11 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=app-crypt/gpgme dev-libs/expat dev-libs/libgcrypt:0 dev-libs/libxml2 curl? ( net-misc/curl[ssl] ) virtual/pkgconfig nls? ( sys-devel/gettext ) dev-vcs/git !<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
+DEFINED_PHASES=configure install prepare unpack
+DEPEND=app-crypt/gpgme dev-libs/expat dev-libs/libgcrypt:0= dev-libs/libxml2 curl? ( net-misc/curl[ssl] ) virtual/pkgconfig nls? ( sys-devel/gettext ) >=dev-vcs/git-1.8.2.1 !<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=Client library for accessing ISDS Soap services
-EAPI=5
+EAPI=6
 HOMEPAGE=http://xpisar.wz.cz/libisds/
 IUSE=+curl debug nls static-libs test
 LICENSE=LGPL-3
-RDEPEND=app-crypt/gpgme dev-libs/expat dev-libs/libgcrypt:0 dev-libs/libxml2 curl? ( net-misc/curl[ssl] ) >=app-crypt/gnupg-2
+RDEPEND=app-crypt/gpgme dev-libs/expat dev-libs/libgcrypt:0= dev-libs/libxml2 curl? ( net-misc/curl[ssl] ) >=app-crypt/gnupg-2
 SLOT=0
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	b83a2420b796f7c6eff682679d08fe25	git-2	7af5d170bfc02983b4bcd3167dc5edd4	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=b169791b13c6178ded559639746308dd
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	git-r3	e928b84a9f6f1d9076d1d27687876dc6	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
+_md5_=c83c0b34a117612ca190f6ebeb380694
--- a/metadata/md5-cache/sci-misc/boinc-7.2.44
+++ b/metadata/md5-cache/sci-misc/boinc-7.2.44
@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install postinst preinst prepare setup
-DEPEND=!sci-misc/boinc-bin !app-admin/quickswitch >=app-misc/ca-certificates-20080809 net-misc/curl[-curl_ssl_gnutls(-),curl_ssl_libressl(-)=,-curl_ssl_nss(-),curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-),-curl_ssl_polarssl(-)] sys-apps/util-linux sys-libs/zlib cuda? ( >=dev-util/nvidia-cuda-toolkit-2.1 >=x11-drivers/nvidia-drivers-180.22 ) X? ( dev-db/sqlite:3 media-libs/freeglut sys-libs/glibc:2.2 virtual/jpeg:0= x11-libs/gtk+:2 >=x11-libs/libnotify-0.7 x11-libs/wxGTK:2.8[X,opengl] ) sys-devel/gettext app-text/docbook-xml-dtd:4.4 app-text/docbook2X !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=The Berkeley Open Infrastructure for Network Computing
-EAPI=6
-HOMEPAGE=http://boinc.ssl.berkeley.edu/
-IUSE=X cuda curl_ssl_libressl +curl_ssl_openssl static-libs
-KEYWORDS=~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=LGPL-2.1
-RDEPEND=!sci-misc/boinc-bin !app-admin/quickswitch >=app-misc/ca-certificates-20080809 net-misc/curl[-curl_ssl_gnutls(-),curl_ssl_libressl(-)=,-curl_ssl_nss(-),curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-),-curl_ssl_polarssl(-)] sys-apps/util-linux sys-libs/zlib cuda? ( >=dev-util/nvidia-cuda-toolkit-2.1 >=x11-drivers/nvidia-drivers-180.22 ) X? ( dev-db/sqlite:3 media-libs/freeglut sys-libs/glibc:2.2 virtual/jpeg:0= x11-libs/gtk+:2 >=x11-libs/libnotify-0.7 x11-libs/wxGTK:2.8[X,opengl] )
-REQUIRED_USE=^^ ( curl_ssl_libressl curl_ssl_openssl )
-RESTRICT=mirror
-SLOT=0
-SRC_URI=https://github.com/BOINC/boinc/archive/client_release/7.2/7.2.44.tar.gz -> boinc-7.2.44.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	linux-info	af49d8ab3be91bb1d38b7201dc9e5123	multilib	165fc17c38d1b11dac2008280dab6e80	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	wxwidgets	9b34ce3ca77f4e418e8fd9951c4c1cb1
-_md5_=023c8bbcfeabeeebf8346aeb8c535300
--- a/metadata/md5-cache/sci-misc/boinc-7.2.44-r2
+++ b/metadata/md5-cache/sci-misc/boinc-7.2.44-r2
@ -12,4 +12,4 @@ RESTRICT=mirror
 SLOT=0
 SRC_URI=https://github.com/BOINC/boinc/archive/client_release/7.2/7.2.44.tar.gz -> boinc-7.2.44.tar.gz X? ( http://boinc.berkeley.edu/logo/boinc_glossy2_512_F.tif -> boinc.tif )
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	linux-info	af49d8ab3be91bb1d38b7201dc9e5123	multilib	165fc17c38d1b11dac2008280dab6e80	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	wxwidgets	9b34ce3ca77f4e418e8fd9951c4c1cb1
-_md5_=1ce4da53b075075f52b23264818400dc
+_md5_=405853fc9b31da5ddcea8936759568ef
--- a/metadata/md5-cache/sci-misc/boinc-7.4.52
+++ b/metadata/md5-cache/sci-misc/boinc-7.4.52
@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install postinst preinst prepare setup
-DEPEND=!sci-misc/boinc-bin !app-admin/quickswitch >=app-misc/ca-certificates-20080809 net-misc/curl[-curl_ssl_gnutls(-),curl_ssl_libressl(-)=,-curl_ssl_nss(-),curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-),-curl_ssl_polarssl(-)] sys-apps/util-linux sys-libs/zlib cuda? ( >=dev-util/nvidia-cuda-toolkit-2.1 >=x11-drivers/nvidia-drivers-180.22 ) X? ( dev-db/sqlite:3 media-libs/freeglut sys-libs/glibc:2.2 virtual/jpeg:0= x11-libs/gtk+:2 >=x11-libs/libnotify-0.7 x11-libs/wxGTK:3.0[X,opengl,webkit] ) sys-devel/gettext app-text/docbook-xml-dtd:4.4 app-text/docbook2X !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=The Berkeley Open Infrastructure for Network Computing
-EAPI=6
-HOMEPAGE=http://boinc.ssl.berkeley.edu/
-IUSE=X cuda curl_ssl_libressl +curl_ssl_openssl static-libs
-KEYWORDS=~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=LGPL-2.1
-RDEPEND=!sci-misc/boinc-bin !app-admin/quickswitch >=app-misc/ca-certificates-20080809 net-misc/curl[-curl_ssl_gnutls(-),curl_ssl_libressl(-)=,-curl_ssl_nss(-),curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-),-curl_ssl_polarssl(-)] sys-apps/util-linux sys-libs/zlib cuda? ( >=dev-util/nvidia-cuda-toolkit-2.1 >=x11-drivers/nvidia-drivers-180.22 ) X? ( dev-db/sqlite:3 media-libs/freeglut sys-libs/glibc:2.2 virtual/jpeg:0= x11-libs/gtk+:2 >=x11-libs/libnotify-0.7 x11-libs/wxGTK:3.0[X,opengl,webkit] )
-REQUIRED_USE=^^ ( curl_ssl_libressl curl_ssl_openssl )
-RESTRICT=mirror
-SLOT=0
-SRC_URI=https://github.com/BOINC/boinc/archive/client_release/7.4/7.4.52.tar.gz -> boinc-7.4.52.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	linux-info	af49d8ab3be91bb1d38b7201dc9e5123	multilib	165fc17c38d1b11dac2008280dab6e80	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	wxwidgets	9b34ce3ca77f4e418e8fd9951c4c1cb1
-_md5_=ae36edea314a1beb70f592e36a39ecd7
--- a/metadata/md5-cache/sci-misc/boinc-7.4.52-r2
+++ b/metadata/md5-cache/sci-misc/boinc-7.4.52-r2
@ -12,4 +12,4 @@ RESTRICT=mirror
 SLOT=0
 SRC_URI=https://github.com/BOINC/boinc/archive/client_release/7.4/7.4.52.tar.gz -> boinc-7.4.52.tar.gz X? ( http://boinc.berkeley.edu/logo/boinc_glossy2_512_F.tif -> boinc.tif )
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	linux-info	af49d8ab3be91bb1d38b7201dc9e5123	multilib	165fc17c38d1b11dac2008280dab6e80	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	wxwidgets	9b34ce3ca77f4e418e8fd9951c4c1cb1
-_md5_=26ae9ded6214a1f78b9885d63188aeeb
+_md5_=4707004a658fa9ed35daba3486fc3331
--- a/metadata/md5-cache/sci-misc/boinc-7.6.33
+++ b/metadata/md5-cache/sci-misc/boinc-7.6.33
@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install postinst preinst prepare setup
-DEPEND=!sci-misc/boinc-bin !app-admin/quickswitch >=app-misc/ca-certificates-20080809 net-misc/curl[-curl_ssl_gnutls(-),curl_ssl_libressl(-)=,-curl_ssl_nss(-),curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-),-curl_ssl_polarssl(-)] sys-apps/util-linux sys-libs/zlib cuda? ( >=dev-util/nvidia-cuda-toolkit-2.1 >=x11-drivers/nvidia-drivers-180.22 ) X? ( dev-db/sqlite:3 media-libs/freeglut sys-libs/glibc:2.2 virtual/jpeg:0= x11-libs/gtk+:2 >=x11-libs/libnotify-0.7 x11-libs/wxGTK:3.0[X,opengl,webkit] ) sys-devel/gettext app-text/docbook-xml-dtd:4.4 app-text/docbook2X !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=The Berkeley Open Infrastructure for Network Computing
-EAPI=6
-HOMEPAGE=http://boinc.ssl.berkeley.edu/
-IUSE=X cuda curl_ssl_libressl +curl_ssl_openssl static-libs
-KEYWORDS=~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=LGPL-2.1
-RDEPEND=!sci-misc/boinc-bin !app-admin/quickswitch >=app-misc/ca-certificates-20080809 net-misc/curl[-curl_ssl_gnutls(-),curl_ssl_libressl(-)=,-curl_ssl_nss(-),curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-),-curl_ssl_polarssl(-)] sys-apps/util-linux sys-libs/zlib cuda? ( >=dev-util/nvidia-cuda-toolkit-2.1 >=x11-drivers/nvidia-drivers-180.22 ) X? ( dev-db/sqlite:3 media-libs/freeglut sys-libs/glibc:2.2 virtual/jpeg:0= x11-libs/gtk+:2 >=x11-libs/libnotify-0.7 x11-libs/wxGTK:3.0[X,opengl,webkit] )
-REQUIRED_USE=^^ ( curl_ssl_libressl curl_ssl_openssl )
-RESTRICT=mirror
-SLOT=0
-SRC_URI=https://github.com/BOINC/boinc/archive/client_release/7.6/7.6.33.tar.gz -> boinc-7.6.33.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	linux-info	af49d8ab3be91bb1d38b7201dc9e5123	multilib	165fc17c38d1b11dac2008280dab6e80	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	wxwidgets	9b34ce3ca77f4e418e8fd9951c4c1cb1
-_md5_=ae36edea314a1beb70f592e36a39ecd7
--- a/metadata/md5-cache/sci-misc/boinc-7.6.33-r2
+++ b/metadata/md5-cache/sci-misc/boinc-7.6.33-r2
@ -12,4 +12,4 @@ RESTRICT=mirror
 SLOT=0
 SRC_URI=https://github.com/BOINC/boinc/archive/client_release/7.6/7.6.33.tar.gz -> boinc-7.6.33.tar.gz X? ( http://boinc.berkeley.edu/logo/boinc_glossy2_512_F.tif -> boinc.tif )
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	linux-info	af49d8ab3be91bb1d38b7201dc9e5123	multilib	165fc17c38d1b11dac2008280dab6e80	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	wxwidgets	9b34ce3ca77f4e418e8fd9951c4c1cb1
-_md5_=26ae9ded6214a1f78b9885d63188aeeb
+_md5_=4707004a658fa9ed35daba3486fc3331
--- a/metadata/md5-cache/sys-apps/gawk-4.1.4
+++ b/metadata/md5-cache/sys-apps/gawk-4.1.4
@ -10,4 +10,4 @@ RDEPEND=mpfr? ( dev-libs/mpfr:0= ) readline? ( sys-libs/readline:0= )
 SLOT=0
 SRC_URI=mirror://gnu/gawk/gawk-4.1.4.tar.xz
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=532117b969f272cf9cf913b932f8ee83
+_md5_=b0c3f8318c224a9fbd6d658233c48509
--- a/metadata/md5-cache/sys-apps/pcsc-lite-1.8.20
+++ b/metadata/md5-cache/sys-apps/pcsc-lite-1.8.20
@ -4,11 +4,11 @@ DESCRIPTION=PC/SC Architecture smartcard middleware library
 EAPI=6
 HOMEPAGE=http://pcsclite.alioth.debian.org/
 IUSE=python libusb policykit selinux +udev python_targets_python2_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=BSD ISC MIT GPL-3+ GPL-2
 RDEPEND=libusb? ( virtual/libusb:1 ) udev? ( virtual/udev ) policykit? ( >=sys-auth/polkit-0.111 ) python? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) !<app-crypt/ccid-1.4.1-r1 !<sys-apps/baselayout-2 !<sys-apps/openrc-0.11.8 selinux? ( sec-policy/selinux-pcscd )
 REQUIRED_USE=^^ ( udev libusb ) python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://alioth.debian.org/download.php/file/4203/pcsc-lite-1.8.20.tar.bz2
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	udev	73058269b3e70e34e084fa3981282338	user	80aaa71614ced86f02ee1a513821dc87
-_md5_=9c9a32c6aceb8ee917025e0c5e5be224
+_md5_=e1d7994da88e1cac1ac3e60285161db6
--- a/metadata/md5-cache/sys-boot/cromwell-bin-2.31-r1
+++ b/metadata/md5-cache/sys-boot/cromwell-bin-2.31-r1
@ -1,11 +1,11 @@
-DEFINED_PHASES=install postinst postrm preinst prerm
+DEFINED_PHASES=install postinst postrm preinst prerm pretend
 DESCRIPTION=Xbox boot loader precompiled binaries from xbox-linux.org
-EAPI=0
-HOMEPAGE=http://www.xbox-linux.org
+EAPI=6
+HOMEPAGE=https://sourceforge.net/projects/xbox-linux/
 KEYWORDS=-* x86
 LICENSE=GPL-2
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/xbox-linux/cromwell-2.31.tar.gz
 _eclasses_=mount-boot	41ed556fa5641393d5323e421c8e5bcf
-_md5_=161b6ae9dd983389a8a98262677f81cf
+_md5_=d4ba9840af90fb2d38c97fb4d130eaf1
--- a/metadata/md5-cache/sys-boot/cromwell-bin-2.40-r1
+++ b/metadata/md5-cache/sys-boot/cromwell-bin-2.40-r1
@ -1,11 +1,11 @@
-DEFINED_PHASES=install postinst postrm preinst prerm
+DEFINED_PHASES=install postinst postrm preinst prerm pretend
 DESCRIPTION=Xbox boot loader precompiled binaries from xbox-linux.org
-EAPI=0
-HOMEPAGE=http://www.xbox-linux.org
+EAPI=6
+HOMEPAGE=https://sourceforge.net/projects/xbox-linux/
 KEYWORDS=-* x86
 LICENSE=GPL-2
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/xbox-linux/cromwell-2.40.tar.gz
 _eclasses_=mount-boot	41ed556fa5641393d5323e421c8e5bcf
-_md5_=0d2785d01e0cc0bdcd30aa6e3f317a05
+_md5_=3ab103d043487402007943903b20a900
--- a/metadata/md5-cache/www-client/opera-developer-44.0.2463.0
+++ b/metadata/md5-cache/www-client/opera-developer-44.0.2463.0
@ -7,6 +7,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=OPERA-2014
 RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libnotify x11-libs/pango[X]
 SLOT=0
-SRC_URI=amd64? ( http://get.geo.opera.com/pub/opera-developer/43.0.2431.0/linux/opera-developer_43.0.2431.0_amd64.deb ) x86? ( http://get.geo.opera.com/pub/opera-developer/43.0.2431.0/linux/opera-developer_43.0.2431.0_i386.deb )
+SRC_URI=amd64? ( http://get.geo.opera.com/pub/opera-developer/44.0.2463.0/linux/opera-developer_44.0.2463.0_amd64.deb ) x86? ( http://get.geo.opera.com/pub/opera-developer/44.0.2463.0/linux/opera-developer_44.0.2463.0_i386.deb )
 _eclasses_=chromium-2	c30f482b868782938c772c21d9ede135	eutils	b83a2420b796f7c6eff682679d08fe25	linux-info	af49d8ab3be91bb1d38b7201dc9e5123	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	unpacker	45d07319df5f40ee6af58418b0f930be	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=263ae5e27787362c3fd7135321a48a2a
+_md5_=405c058976927c6703053e6d519e8d3d
--- a/metadata/md5-cache/x11-libs/libqxt-0.6.2-r2
+++ b/metadata/md5-cache/x11-libs/libqxt-0.6.2-r2
@ -10,4 +10,4 @@ RDEPEND=dev-qt/designer:4 dev-qt/qtcore:4[ssl] dev-qt/qtgui:4 x11-libs/libXrandr
 SLOT=0
 SRC_URI=http://dev.libqxt.org/libqxt/get/v0.6.2.tar.bz2 -> libqxt-0.6.2.tar.bz2
 _eclasses_=base	3fe4f8980633fd7bc69e9887209ba2fe	eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	qmake-utils	0a242e7177789b0028b4045f336dd4db	qt4-r2	d6c113024bb3086a1facc65cd338930e	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=1b76c29ae37444a2ab4c04a421d9c942
+_md5_=854755eb640b1b4b40dd98e06d1ee6ab
--- a/metadata/md5-cache/x11-libs/libva-1.7.0
+++ b/metadata/md5-cache/x11-libs/libva-1.7.0
@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=x11-libs/libdrm-2.4.46[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(-)?] X? ( >=x11-libs/libX11-1.6.2[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(-)?] >=x11-libs/libXext-1.3.2[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(-)?] >=x11-libs/libXfixes-5.0.1[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(-)?] ) egl? ( >=media-libs/mesa-9.1.6[egl,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(-)?] ) opengl? ( >=virtual/opengl-7.0-r1[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(-)?] ) wayland? ( >=dev-libs/wayland-1.0.6[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(-)?] ) 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=Video Acceleration (VA) API for Linux
-EAPI=5
-HOMEPAGE=https://www.freedesktop.org/wiki/Software/vaapi
-IUSE=+drm egl opengl vdpau wayland X video_cards_dummy video_cards_nvidia video_cards_intel video_cards_fglrx video_cards_nouveau 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 ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-PDEPEND=video_cards_nvidia? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[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(-)?] ) video_cards_nouveau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r3[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(-)?] ) vdpau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[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(-)?] ) video_cards_fglrx? ( || ( >=x11-drivers/ati-drivers-14.12-r3[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(-)?] >=x11-libs/xvba-video-0.8.0-r1[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(-)?] ) ) video_cards_intel? ( >=x11-libs/libva-intel-driver-1.2.2-r1[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(-)?] )
-RDEPEND=>=x11-libs/libdrm-2.4.46[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(-)?] X? ( >=x11-libs/libX11-1.6.2[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(-)?] >=x11-libs/libXext-1.3.2[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(-)?] >=x11-libs/libXfixes-5.0.1[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(-)?] ) egl? ( >=media-libs/mesa-9.1.6[egl,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(-)?] ) opengl? ( >=virtual/opengl-7.0-r1[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(-)?] ) wayland? ( >=dev-libs/wayland-1.0.6[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(-)?] )
-REQUIRED_USE=|| ( drm wayland X ) opengl? ( X )
-SLOT=0
-SRC_URI=https://www.freedesktop.org/software/vaapi/releases/libva/libva-1.7.0.tar.bz2
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-multilib	77afca16a6cb82823eed6366a10e7f75	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	b83a2420b796f7c6eff682679d08fe25	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=05f874a95020f0c4480feccc8c36723c
--- a/metadata/md5-cache/x11-libs/libva-1.7.1
+++ b/metadata/md5-cache/x11-libs/libva-1.7.1
@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=x11-libs/libdrm-2.4.46[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(-)?] X? ( >=x11-libs/libX11-1.6.2[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(-)?] >=x11-libs/libXext-1.3.2[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(-)?] >=x11-libs/libXfixes-5.0.1[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(-)?] ) egl? ( >=media-libs/mesa-9.1.6[egl,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(-)?] ) opengl? ( >=virtual/opengl-7.0-r1[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(-)?] ) wayland? ( >=dev-libs/wayland-1.0.6[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(-)?] ) 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=Video Acceleration (VA) API for Linux
-EAPI=5
-HOMEPAGE=https://www.freedesktop.org/wiki/Software/vaapi
-IUSE=+drm egl opengl vdpau wayland X video_cards_dummy video_cards_nvidia video_cards_intel video_cards_fglrx video_cards_nouveau 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 ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-PDEPEND=video_cards_nvidia? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[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(-)?] ) video_cards_nouveau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r3[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(-)?] ) vdpau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[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(-)?] ) video_cards_fglrx? ( || ( >=x11-drivers/ati-drivers-14.12-r3[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(-)?] >=x11-libs/xvba-video-0.8.0-r1[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(-)?] ) ) video_cards_intel? ( >=x11-libs/libva-intel-driver-1.2.2-r1[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(-)?] )
-RDEPEND=>=x11-libs/libdrm-2.4.46[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(-)?] X? ( >=x11-libs/libX11-1.6.2[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(-)?] >=x11-libs/libXext-1.3.2[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(-)?] >=x11-libs/libXfixes-5.0.1[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(-)?] ) egl? ( >=media-libs/mesa-9.1.6[egl,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(-)?] ) opengl? ( >=virtual/opengl-7.0-r1[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(-)?] ) wayland? ( >=dev-libs/wayland-1.0.6[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(-)?] )
-REQUIRED_USE=|| ( drm wayland X ) opengl? ( X )
-SLOT=0
-SRC_URI=https://www.freedesktop.org/software/vaapi/releases/libva/libva-1.7.1.tar.bz2
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-multilib	77afca16a6cb82823eed6366a10e7f75	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	b83a2420b796f7c6eff682679d08fe25	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=127bc3fe47a49cb2c2853c0e3aa89092
--- a/metadata/md5-cache/x11-libs/libva-1.7.2
+++ b/metadata/md5-cache/x11-libs/libva-1.7.2
@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=x11-libs/libdrm-2.4.46[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(-)?] X? ( >=x11-libs/libX11-1.6.2[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(-)?] >=x11-libs/libXext-1.3.2[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(-)?] >=x11-libs/libXfixes-5.0.1[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(-)?] ) egl? ( >=media-libs/mesa-9.1.6[egl,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(-)?] ) opengl? ( >=virtual/opengl-7.0-r1[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(-)?] ) wayland? ( >=dev-libs/wayland-1.0.6[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(-)?] ) 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=Video Acceleration (VA) API for Linux
-EAPI=5
-HOMEPAGE=https://www.freedesktop.org/wiki/Software/vaapi
-IUSE=+drm egl opengl vdpau wayland X video_cards_dummy video_cards_nvidia video_cards_intel video_cards_fglrx video_cards_nouveau 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 ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-PDEPEND=video_cards_nvidia? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[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(-)?] ) video_cards_nouveau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r3[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(-)?] ) vdpau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[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(-)?] ) video_cards_fglrx? ( || ( >=x11-drivers/ati-drivers-14.12-r3[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(-)?] >=x11-libs/xvba-video-0.8.0-r1[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(-)?] ) ) video_cards_intel? ( >=x11-libs/libva-intel-driver-1.2.2-r1[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(-)?] )
-RDEPEND=>=x11-libs/libdrm-2.4.46[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(-)?] X? ( >=x11-libs/libX11-1.6.2[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(-)?] >=x11-libs/libXext-1.3.2[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(-)?] >=x11-libs/libXfixes-5.0.1[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(-)?] ) egl? ( >=media-libs/mesa-9.1.6[egl,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(-)?] ) opengl? ( >=virtual/opengl-7.0-r1[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(-)?] ) wayland? ( >=dev-libs/wayland-1.0.6[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(-)?] )
-REQUIRED_USE=|| ( drm wayland X ) opengl? ( X )
-SLOT=0
-SRC_URI=https://www.freedesktop.org/software/vaapi/releases/libva/libva-1.7.2.tar.bz2
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-multilib	77afca16a6cb82823eed6366a10e7f75	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	b83a2420b796f7c6eff682679d08fe25	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=127bc3fe47a49cb2c2853c0e3aa89092
--- a/metadata/md5-cache/x11-libs/libva-1.7.3
+++ b/metadata/md5-cache/x11-libs/libva-1.7.3
@ -3,13 +3,13 @@ DEPEND=>=x11-libs/libdrm-2.4.46[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,ab
 DESCRIPTION=Video Acceleration (VA) API for Linux
 EAPI=5
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/vaapi
-IUSE=+drm egl opengl vdpau wayland X video_cards_dummy video_cards_nvidia video_cards_intel video_cards_fglrx video_cards_nouveau 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
+IUSE=+drm egl opengl vdpau wayland X video_cards_dummy video_cards_nvidia video_cards_intel video_cards_i965 video_cards_fglrx video_cards_nouveau 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 ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
-PDEPEND=video_cards_nvidia? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[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(-)?] ) video_cards_nouveau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r3[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(-)?] ) vdpau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[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(-)?] ) video_cards_fglrx? ( || ( >=x11-drivers/ati-drivers-14.12-r3[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(-)?] >=x11-libs/xvba-video-0.8.0-r1[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(-)?] ) ) video_cards_intel? ( >=x11-libs/libva-intel-driver-1.2.2-r1[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(-)?] )
+PDEPEND=video_cards_nvidia? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[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(-)?] ) video_cards_nouveau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r3[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(-)?] ) vdpau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[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(-)?] ) video_cards_fglrx? ( || ( >=x11-drivers/ati-drivers-14.12-r3[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(-)?] >=x11-libs/xvba-video-0.8.0-r1[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(-)?] ) ) video_cards_intel? ( >=x11-libs/libva-intel-driver-1.2.2-r1[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(-)?] ) video_cards_i965? ( >=x11-libs/libva-intel-driver-1.2.2-r1[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(-)?] )
 RDEPEND=>=x11-libs/libdrm-2.4.46[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(-)?] X? ( >=x11-libs/libX11-1.6.2[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(-)?] >=x11-libs/libXext-1.3.2[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(-)?] >=x11-libs/libXfixes-5.0.1[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(-)?] ) egl? ( >=media-libs/mesa-9.1.6[egl,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(-)?] ) opengl? ( >=virtual/opengl-7.0-r1[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(-)?] ) wayland? ( >=dev-libs/wayland-1.0.6[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(-)?] )
 REQUIRED_USE=|| ( drm wayland X ) opengl? ( X )
 SLOT=0
 SRC_URI=https://www.freedesktop.org/software/vaapi/releases/libva/libva-1.7.3.tar.bz2
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-multilib	77afca16a6cb82823eed6366a10e7f75	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	b83a2420b796f7c6eff682679d08fe25	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=6fc41afe8b308055426eb3474f15a616
+_md5_=d1af6022664ffd2236928c23dcc435e1
--- a/metadata/md5-cache/x11-libs/libva-9999
+++ b/metadata/md5-cache/x11-libs/libva-9999
@ -3,11 +3,11 @@ DEPEND=>=x11-libs/libdrm-2.4.46[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,ab
 DESCRIPTION=Video Acceleration (VA) API for Linux
 EAPI=5
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/vaapi
-IUSE=+drm egl opengl vdpau wayland X video_cards_dummy video_cards_nvidia video_cards_intel video_cards_fglrx video_cards_nouveau 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
+IUSE=+drm egl opengl vdpau wayland X video_cards_dummy video_cards_nvidia video_cards_intel video_cards_i965 video_cards_fglrx video_cards_nouveau 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
 LICENSE=MIT
-PDEPEND=video_cards_nvidia? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[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(-)?] ) video_cards_nouveau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r3[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(-)?] ) vdpau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[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(-)?] ) video_cards_fglrx? ( || ( >=x11-drivers/ati-drivers-14.12-r3[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(-)?] >=x11-libs/xvba-video-0.8.0-r1[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(-)?] ) ) video_cards_intel? ( >=x11-libs/libva-intel-driver-1.2.2-r1[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(-)?] )
+PDEPEND=video_cards_nvidia? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[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(-)?] ) video_cards_nouveau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r3[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(-)?] ) vdpau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[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(-)?] ) video_cards_fglrx? ( || ( >=x11-drivers/ati-drivers-14.12-r3[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(-)?] >=x11-libs/xvba-video-0.8.0-r1[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(-)?] ) ) video_cards_intel? ( >=x11-libs/libva-intel-driver-1.2.2-r1[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(-)?] ) video_cards_i965? ( >=x11-libs/libva-intel-driver-1.2.2-r1[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(-)?] )
 RDEPEND=>=x11-libs/libdrm-2.4.46[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(-)?] X? ( >=x11-libs/libX11-1.6.2[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(-)?] >=x11-libs/libXext-1.3.2[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(-)?] >=x11-libs/libXfixes-5.0.1[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(-)?] ) egl? ( >=media-libs/mesa-9.1.6[egl,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(-)?] ) opengl? ( >=virtual/opengl-7.0-r1[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(-)?] ) wayland? ( >=dev-libs/wayland-1.0.6[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(-)?] )
 REQUIRED_USE=|| ( drm wayland X ) opengl? ( X )
 SLOT=0
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-multilib	77afca16a6cb82823eed6366a10e7f75	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	b83a2420b796f7c6eff682679d08fe25	git-2	7af5d170bfc02983b4bcd3167dc5edd4	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=05f874a95020f0c4480feccc8c36723c
+_md5_=d28b9ab011694eb2b0b7f8b411de8709
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@ -1 +1 @@
-Wed, 04 Jan 2017 11:43:19 +0000
+Wed, 04 Jan 2017 14:43:20 +0000
--- a/metadata/timestamp
+++ b/metadata/timestamp
@ -1 +1 @@
-Wed Jan  4 11:39:34 UTC 2017
+Wed Jan  4 14:39:33 UTC 2017
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@ -1 +1 @@
-Wed, 04 Jan 2017 12:00:01 +0000
+Wed, 04 Jan 2017 15:00:01 +0000
--- a/Show More
+++ b/Show More