Sync with portage [Wed Apr 29 21:10:41 MSK 2015].

9 years ago · 759b273504
parent 5da9974e29
commit 759b273504
119 changed files with 1468 additions and 581 deletions
--- a/app-arch/cabextract/cabextract-1.6.ebuild
+++ b/app-arch/cabextract/cabextract-1.6.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/cabextract/cabextract-1.6.ebuild,v 1.9 2015/04/21 18:39:24 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/cabextract/cabextract-1.6.ebuild,v 1.10 2015/04/29 09:18:08 ago Exp $

 EAPI=5
 inherit toolchain-funcs
@ -11,7 +11,7 @@ SRC_URI="http://www.cabextract.org.uk/${P}.tar.gz"

 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="extras"

 RDEPEND="extras? ( dev-lang/perl )"
--- a/app-text/poppler/poppler-0.32.0.ebuild
+++ b/app-text/poppler/poppler-0.32.0.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.32.0.ebuild,v 1.10 2015/04/21 18:43:50 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.32.0.ebuild,v 1.11 2015/04/29 09:18:13 ago Exp $

 EAPI=5

@ -9,11 +9,11 @@ inherit cmake-utils toolchain-funcs
 if [[ "${PV}" == "9999" ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="git://git.freedesktop.org/git/${PN}/${PN}"
-	KEYWORDS="alpha arm hppa ia64 ppc ppc64 x86"
+	KEYWORDS="alpha arm hppa ia64 ppc ppc64 sparc x86"
 	SLOT="0/9999"
 else
 	SRC_URI="http://poppler.freedesktop.org/${P}.tar.xz"
-	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	SLOT="0/51"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi

--- a/dev-db/mysql/mysql-5.6.24.ebuild
+++ b/dev-db/mysql/mysql-5.6.24.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.6.24.ebuild,v 1.8 2015/04/28 07:45:54 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.6.24.ebuild,v 1.9 2015/04/29 09:13:23 ago Exp $

 EAPI="5"

@ -13,7 +13,7 @@ inherit toolchain-funcs mysql-multilib
 IUSE="$IUSE"

 # REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"

 # When MY_EXTRAS is bumped, the index should be revised to exclude these.
 EPATCH_EXCLUDE=''
--- a/dev-db/sqlite/sqlite-3.8.9.ebuild
+++ b/dev-db/sqlite/sqlite-3.8.9.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.8.9.ebuild,v 1.8 2015/04/28 07:46:04 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.8.9.ebuild,v 1.9 2015/04/29 09:18:04 ago Exp $

 EAPI="5"

@ -21,7 +21,7 @@ SRC_URI="doc? ( http://sqlite.org/2015/${PN}-doc-${DOC_PV}.zip )

 LICENSE="public-domain"
 SLOT="3"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug doc icu +readline secure-delete static-libs tcl test"

 RDEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )
--- a/dev-lang/php/php-5.4.40.ebuild
+++ b/dev-lang/php/php-5.4.40.ebuild
@ -1,12 +1,12 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.4.40.ebuild,v 1.6 2015/04/28 07:46:22 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.4.40.ebuild,v 1.8 2015/04/29 09:18:31 ago Exp $

 EAPI=5

 inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool systemd

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

 function php_get_uri ()
 {
--- a/dev-lang/php/php-5.5.24.ebuild
+++ b/dev-lang/php/php-5.5.24.ebuild
@ -1,12 +1,12 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.5.24.ebuild,v 1.6 2015/04/28 07:46:22 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.5.24.ebuild,v 1.8 2015/04/29 09:18:31 ago Exp $

 EAPI=5

 inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool systemd

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

 function php_get_uri ()
 {
--- a/dev-lang/ruby/ruby-1.9.3_p551-r1.ebuild
+++ b/dev-lang/ruby/ruby-1.9.3_p551-r1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.9.3_p551-r1.ebuild,v 1.8 2015/04/28 07:46:28 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.9.3_p551-r1.ebuild,v 1.9 2015/04/29 09:18:46 ago Exp $

 EAPI=4

@ -34,7 +34,7 @@ SRC_URI="mirror://ruby/1.9/${MY_P}.tar.bz2
 		 http://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2"

 LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="berkdb debug doc examples gdbm ipv6 +rdoc rubytests socks5 ssl xemacs ncurses +readline +yaml" #libedit

 # libedit support is removed everywhere because of this upstream bug:
--- a/dev-lang/ruby/ruby-2.0.0_p645.ebuild
+++ b/dev-lang/ruby/ruby-2.0.0_p645.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-2.0.0_p645.ebuild,v 1.8 2015/04/28 07:46:28 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-2.0.0_p645.ebuild,v 1.9 2015/04/29 09:18:47 ago Exp $

 EAPI=5

@ -33,7 +33,7 @@ SRC_URI="mirror://ruby/2.0/${MY_P}.tar.xz
 		 http://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2"

 LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="berkdb debug doc examples gdbm ipv6 +rdoc rubytests socks5 ssl xemacs ncurses +readline cpu_flags_x86_sse2"

 RDEPEND="
--- a/dev-libs/libtasn1/libtasn1-4.4.ebuild
+++ b/dev-libs/libtasn1/libtasn1-4.4.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libtasn1/libtasn1-4.4.ebuild,v 1.9 2015/04/21 19:04:40 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libtasn1/libtasn1-4.4.ebuild,v 1.10 2015/04/29 09:18:40 ago Exp $

 EAPI=5

@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"

 LICENSE="GPL-3 LGPL-2.1"
 SLOT="0/6" # subslot = libtasn1 soname version
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc static-libs"

 DEPEND=">=dev-lang/perl-5.6
--- a/dev-ml/ocamlnet/Manifest
+++ b/dev-ml/ocamlnet/Manifest
@ -1,2 +1,3 @@
 DIST ocamlnet-3.7.7.tar.gz 3357674 SHA256 5b8e464a874018c5e48fc1edc752b83e014061f19316b5b14df8422d939e7609 SHA512 b500a92e6c5dc4d96ac26352923d78cb3a8b555deda038c41860aecbd20ee9ccbcfee949014c91f1266c937ae03fadd72c322e3cbe6456d23fd20b871114df6a WHIRLPOOL ceb4a9fc5d43fe89487589ae14c4bdf58d6c3d99d3a9ebc07fa722e894106899a2ae2aca91a47338d8004017fdd0d23632e187d96ec51479b43955daddbbb893
 DIST ocamlnet-4.0.2.tar.gz 4604051 SHA256 586e10b00ab1a60eaa5a10dd9bcf51487c7b657b65f093a2afdf8f24d3389f31 SHA512 d28615fcef5b73d857e9e3f637195dbd787631997c5594a589a5b1192f2cb6e61a3271b4872045dbdee9074ca892731ce66fa5e0d9efcdda6f96319a0c6049a6 WHIRLPOOL f01a2165ebaff143f9cacce28c80721e2f7d11b1577a39bf18ddfa7483d72308d36395c32f12f9cabc3295e1c1eaaa813f4d8f96425cfc4876097656682164b7
+DIST ocamlnet-4.0.3.tar.gz 4334416 SHA256 d3b030715fe2c5f395ff9c08f0a8d3baa8830161300ba29e5aa8fabb92b182c1 SHA512 3d0900bc73325433af59718c0168d7e13f49c3d6d0d330826e9b1fbe8c9b97b5289c3f063e9523e3a25155d8ef54117a1d458509bb0073b05a6442525cd45a86 WHIRLPOOL 7db6ee225a269de5290fd4473b3d61b357a425a2f597e770158e54c9844de5fd2e0c556fb736fd8e0e66606b267251f6c932c79d63e1550f7da36c843767cd11
--- a/dev-ml/ocamlnet/ocamlnet-4.0.3.ebuild
+++ b/dev-ml/ocamlnet/ocamlnet-4.0.3.ebuild
@ -0,0 +1,78 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamlnet/ocamlnet-4.0.3.ebuild,v 1.1 2015/04/29 14:54:33 aballier Exp $
+
+EAPI="5"
+
+inherit eutils findlib
+
+MY_P=${P/_beta/test}
+DESCRIPTION="Modules for OCaml application-level Internet protocols"
+HOMEPAGE="http://projects.camlcity.org/projects/ocamlnet.html"
+SRC_URI="http://download.camlcity.org/download/${MY_P}.tar.gz"
+
+LICENSE="ZLIB GPL-2+"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+IUSE="gtk kerberos tk httpd +ocamlopt +pcre ssl zip"
+RESTRICT="installsources"
+
+# the auth-dh compile flag has been disabled as well, since it depends on
+# ocaml-cryptgps, which is not available.
+
+RDEPEND=">=dev-ml/findlib-1.0
+		pcre? ( >=dev-ml/pcre-ocaml-5:= )
+		>=dev-lang/ocaml-3.10.2:=[ocamlopt?]
+		tk? ( || ( dev-ml/labltk:= <dev-lang/ocaml-4.02[tk] ) )
+		ssl? ( net-libs/gnutls:= )
+		gtk? ( >=dev-ml/lablgtk-2:= )
+		kerberos? ( virtual/krb5 )
+		zip? ( dev-ml/camlzip:= )
+		"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+S=${WORKDIR}/${MY_P}
+
+ocamlnet_use_with() {
+	if use $1; then
+		echo "-with-$2"
+	else
+		echo "-without-$2"
+	fi
+}
+
+ocamlnet_use_enable() {
+	if use $1; then
+		echo "-enable-$2"
+	else
+		echo "-disable-$2"
+	fi
+}
+
+src_configure() {
+	./configure \
+		-bindir /usr/bin \
+		-datadir /usr/share/${PN} \
+		$(ocamlnet_use_enable ssl gnutls) \
+		$(ocamlnet_use_enable gtk gtk2) \
+		$(ocamlnet_use_enable kerberos gssapi) \
+		$(ocamlnet_use_enable pcre pcre) \
+		$(ocamlnet_use_enable tk tcl) \
+		$(ocamlnet_use_enable zip zip) \
+		$(ocamlnet_use_with httpd nethttpd) \
+		|| die "Error : econf failed!"
+}
+
+src_compile() {
+	emake -j1 all
+	if use ocamlopt; then
+		emake -j1 opt
+	fi
+}
+
+src_install() {
+	export STRIP_MASK="*/bin/*"
+	findlib_src_install
+}
--- a/dev-php/PEAR-Archive_Tar/Manifest
+++ b/dev-php/PEAR-Archive_Tar/Manifest
@ -1,3 +1 @@
-DIST Archive_Tar-1.3.11.tgz 18537 SHA256 e77f30899c09503745cca5069a0ee5a09add102c1a9b9113a7bd6d6a9d065174 SHA512 6bfd6f3dea7e48f6f66a335549ef5d85e69fbf3f89137b640cc44b7982575d0eccb5a5b5e600ba5b96f4e5139ba3648f832f2945e36ecbe8008bed4ad4a628e4 WHIRLPOOL 6f2f56fd1f5d047f75203fcf10566429c1ca69d147465921044994d860871db46eb46b787405f3b3eb8e5d77d3cb3b993cf20f24e5b0fe20bed4213474b9fa78
-DIST Archive_Tar-1.3.13.tgz 19891 SHA256 c2a55a70764f0764805e71918312ac1a25fead3cec4282e733c6eba8b3db702e SHA512 4fe3555f676787985e566b348dab89c05fcb6412fd9221242f6b501d23e51a7decf75467711767402cae6db3a0ac935e65af45dd2a4bac259aeddcef5b68cfe3 WHIRLPOOL 5455b42a0997462ec39478c4efc1f8368ac4d8736b1247a5e7cf0b6320b8b3b835ba59d000f6b5dab68e1ac7d950107005864f3218bd77a1da38981bc3da51ed
 DIST Archive_Tar-1.3.15.tgz 19985 SHA256 25e4f296874d208f46a772425e924e9361720b92f6bddb1e1fa0d83669fcb0af SHA512 a4fdbbcc654428242a2123438adfc72b2d24e7d201b2d927a20f4df7952cf23ab9bb395757f4e88f1617a86a2430df4a6508f26b2e3ffdc4eefcbbcf0cf6bd71 WHIRLPOOL c20a77658652316d1a12b1212e54296102fae160bdc64c6a237239dada7f3d0b8aba0d10b823893fabd5937884fbbd525903fca7ee45f935314ffba74a61891b
--- a/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.3.11.ebuild
+++ b/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.3.11.ebuild
@ -1,31 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.3.11.ebuild,v 1.10 2014/11/02 09:03:21 ago Exp $
-
-EAPI="4"
-
-MY_PN="${PN/PEAR-/}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Tar file management class"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
-IUSE=""
-SRC_URI="http://pear.php.net/get/${MY_P}.tgz"
-DEPEND="|| ( <dev-lang/php-5.3[pcre] >=dev-lang/php-5.3 )
-		>=dev-php/PEAR-PEAR-1.8.1
-"
-RDEPEND="${DEPEND}"
-PDEPEND="dev-php/pear"
-HOMEPAGE="http://pear.php.net/package/Archive_Tar"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	insinto /usr/share/php/Archive
-	doins Archive/*
-
-	dodoc docs/*
-}
--- a/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.3.13.ebuild
+++ b/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.3.13.ebuild
@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.3.13.ebuild,v 1.2 2015/02/16 21:48:02 grknight Exp $
-
-EAPI="5"
-
-MY_PN="${PN/PEAR-/}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Tar file management class"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE=""
-SRC_URI="http://pear.php.net/get/${MY_P}.tgz"
-DEPEND="dev-lang/php:*[pcre(+)]
-		>=dev-php/PEAR-PEAR-1.8.1
-"
-RDEPEND="dev-lang/php:*[bzip2,posix,zlib]
-	${DEPEND}"
-PDEPEND="dev-php/pear"
-HOMEPAGE="http://pear.php.net/package/Archive_Tar"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	insinto /usr/share/php/Archive
-	doins Archive/*
-
-	dodoc docs/*
-}
--- a/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.3.15.ebuild
+++ b/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.3.15.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.3.15.ebuild,v 1.4 2015/04/26 17:27:10 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.3.15.ebuild,v 1.5 2015/04/29 09:08:15 ago Exp $

 EAPI="5"

@ -11,7 +11,7 @@ DESCRIPTION="Tar file management class"

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ppc ~ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
 IUSE=""
 SRC_URI="http://pear.php.net/get/${MY_P}.tgz"
 DEPEND="dev-lang/php:*[pcre(+)]
--- a/dev-php/PEAR-XML_Util/Manifest
+++ b/dev-php/PEAR-XML_Util/Manifest
@ -1,2 +1 @@
-DIST XML_Util-1.2.1.tgz 17729 SHA256 10edc563d20d6312cba41649e57e56b78b9330c486e9a8397fd5e109744e7273 SHA512 46ec94696125f53322761923030ddcdeaf47df3767343a59978ca073a6d0f0d6c7f4fad9150247ce573df8835af4bbe63c98f2b50e90858697828ef26c40133c WHIRLPOOL feb6845b5d052a9fc3c44d4ecc6e3e638950ee534eba4ff6721081b7e3eae7c82a20491210c9b8dad6af266c14481150c8984e05f8abd92d257dcf1af7d0ca98
 DIST XML_Util-1.2.3.tgz 17134 SHA256 ddbb99bf9907e1f7b1a4ae1bc340d1bba42960d61fbb93015133099472844705 SHA512 720319bb6c57e7f67ae213768b41727a24bccd5e7cfba88006796edbbed7a351042fcaef85dc1cfd6248daac8b86af5b9d5021290e7e13a5ef679c2a8a2875c3 WHIRLPOOL 29ee4effa8f3349a0d877c8e231bb6a4c4946055c36c96b0649b9cdf0ecbf121b34da6f0e4007b176a5035f26a4d541714c3d82b7e01cd6431c1c72971f98f31
--- a/dev-php/PEAR-XML_Util/PEAR-XML_Util-1.2.1-r2.ebuild
+++ b/dev-php/PEAR-XML_Util/PEAR-XML_Util-1.2.1-r2.ebuild
@ -1,33 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-XML_Util/PEAR-XML_Util-1.2.1-r2.ebuild,v 1.11 2015/03/19 20:56:48 grknight Exp $
-
-EAPI="2"
-
-MY_PN="${PN/PEAR-/}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="XML utility class"
-
-LICENSE="PHP-2.02"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
-IUSE=""
-SRC_URI="http://pear.php.net/get/${MY_P}.tgz"
-
-DEPEND="|| ( <dev-lang/php-5.3[pcre] >=dev-lang/php-5.3 )
-		>=dev-php/PEAR-PEAR-1.8.1"
-RDEPEND="${DEPEND}"
-PDEPEND="dev-php/pear"
-
-HOMEPAGE="http://pear.php.net/package/XML_Util"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	insinto /usr/share/php/XML
-	doins Util.php
-
-	insinto /usr/share/php/docs/${MY_PN}
-	doins examples/*
-}
--- a/dev-php/PEAR-XML_Util/PEAR-XML_Util-1.2.3-r1.ebuild
+++ b/dev-php/PEAR-XML_Util/PEAR-XML_Util-1.2.3-r1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-XML_Util/PEAR-XML_Util-1.2.3-r1.ebuild,v 1.4 2015/04/26 17:00:06 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-XML_Util/PEAR-XML_Util-1.2.3-r1.ebuild,v 1.5 2015/04/29 09:07:17 ago Exp $

 EAPI="5"

@ -11,7 +11,7 @@ DESCRIPTION="XML utility class"

 LICENSE="PHP-2.02"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ppc ~ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
 IUSE=""
 SRC_URI="http://pear.php.net/get/${MY_P}.tgz"

--- a/dev-php/YAML/YAML-1.0.6-r1.ebuild
+++ b/dev-php/YAML/YAML-1.0.6-r1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/YAML/YAML-1.0.6-r1.ebuild,v 1.3 2015/04/26 16:41:41 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/YAML/YAML-1.0.6-r1.ebuild,v 1.4 2015/04/29 09:05:55 ago Exp $

 EAPI=5

@ -15,5 +15,5 @@ HOMEPAGE="http://pear.symfony-project.com/"

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 hppa x86"
+KEYWORDS="amd64 hppa x86"
 IUSE=""
--- a/dev-php/YAML/YAML-1.0.6.ebuild
+++ b/dev-php/YAML/YAML-1.0.6.ebuild
@ -1,23 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/YAML/YAML-1.0.6.ebuild,v 1.6 2014/08/10 20:58:43 slyfox Exp $
-
-EAPI=4
-
-PEAR_PV="1.0.6"
-PHP_PEAR_PKG_NAME="YAML"
-
-inherit php-pear-r1
-
-DESCRIPTION="The Symfony YAML Component"
-HOMEPAGE="http://pear.symfony-project.com"
-SRC_URI="http://pear.symfony-project.com//get/YAML-1.0.6.tgz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 hppa x86"
-IUSE=""
-
-DEPEND=">=dev-lang/php-5.2.4
-	>=dev-php/pear-1.4.1"
-RDEPEND="${DEPEND}"
--- a/dev-python/requests/requests-2.6.0.ebuild
+++ b/dev-python/requests/requests-2.6.0.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/requests/requests-2.6.0.ebuild,v 1.8 2015/04/28 07:46:13 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/requests/requests-2.6.0.ebuild,v 1.9 2015/04/29 09:18:36 ago Exp $

 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"

 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""

 # bundles dev-python/urllib3 snapshot
--- a/dev-tex/chktex/Manifest
+++ b/dev-tex/chktex/Manifest
@ -1,3 +1,4 @@
 DIST chktex-1.7.1.tar.gz 349551 SHA256 be01222e819c00bdf0fb411c232e585fd6a116adc76ba33f7f45a46d1239317b SHA512 88b8b6b20a2242557d253e690ad7a7b5a41497e3c96ee44798997b83ccbfd4e37203aea9c557c7b25fc0b6223bd08a590b464af674f7558547393c2af0a86926 WHIRLPOOL ba4ff573c60fc4d07f56207b878359655622d32fdc21aac3ecf6b29223ca79bcd1fedad2958e6279097a23a2d0d3c1bac2a89c4fc9eeb0f774be303cb3350791
 DIST chktex-1.7.2.tar.gz 356981 SHA256 d7f37985e3a122990f2a29fe7cac5d1f31acb1e50035457ef7ceb07c30550158 SHA512 f0ac3ed74471d33da55591e6ca2a4b6847340540ef1911eef37bfad38ffc7c64ca4709966d52a22f871268edf893bf360c8429e1be7f62157d2fac9e58ea40af WHIRLPOOL b32e1927734ee1ba6af77bbe2a0e64ec640718ea26ebcd89a54c06555ec3b0c275fee3e81809b846b25f440f32397536d12eb85b3dde49bf55a7def09a19658a
 DIST chktex-1.7.3.tar.gz 150801 SHA256 22a2a1af8d6c8b901a66b3729c114080f722b3ba59a73ca000035686590c98dd SHA512 29018229176d3bfd7bff92e68739d32262b01414d7df3d379ef1604abcd28c28abdeb83a2513f6d439e5c888a05e5a636e4a7ab34275d40d20fc63a275985c4a WHIRLPOOL 6fcb533ce1bf0f5dede29825a6477f8961e08fe0e03a596fab76492fd97b5a5179bffc70bf7fdf3e8caffa15b2722ec1be46d58f304000760f4c9f3a6871d82b
+DIST chktex-1.7.4.tar.gz 150839 SHA256 77ed995eabe7088dacf53761933da23e6bf8be14d461f364bd06e090978bf6d2 SHA512 d5bf056f67ca520d9df95237b777380d9b98c792d5e20c16bcec2d78a4c68ec3c35308e4525eab33efa2abaf8f2d67ad62e65988b8885f30d1a3f29d27975a1f WHIRLPOOL e0cba6f01526d97304bd27804508c38a2ea1ca843f459d6e88dd7db84ba1745e8f37372f1b8aa393dbbe5fa1a62a71956849b2222859b36e125f24cdbc5333f3
--- a/dev-tex/chktex/chktex-1.7.3.ebuild
+++ b/dev-tex/chktex/chktex-1.7.3.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/chktex/chktex-1.7.3.ebuild,v 1.1 2015/04/13 09:13:40 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/chktex/chktex-1.7.3.ebuild,v 1.2 2015/04/29 15:13:50 aballier Exp $

 EAPI=4
 AUTOTOOLS_AUTORECONF=true
@ -29,6 +29,8 @@ PATCHES=( "${FILESDIR}/${PN}-1.7.1-asneeded.patch" )
 DOCS=( NEWS )

 src_configure() {
+	export VARTEXFONTS="${T}/fonts" #538672
+
 	local myeconfargs=(
 		$(use_enable debug debug-info)
 		$(use_enable pcre)
--- a/dev-tex/chktex/chktex-1.7.4.ebuild
+++ b/dev-tex/chktex/chktex-1.7.4.ebuild
@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/chktex/chktex-1.7.4.ebuild,v 1.1 2015/04/29 15:15:35 aballier Exp $
+
+EAPI=4
+AUTOTOOLS_AUTORECONF=true
+
+inherit autotools-utils
+
+DESCRIPTION="Checks latex source for common mistakes"
+HOMEPAGE="http://www.nongnu.org/chktex/"
+SRC_URI="http://download.savannah.gnu.org/releases/chktex/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="debug doc +pcre test"
+# Tests fail without pcre. Enable pcre by default and make tests depend on it.
+REQUIRED_USE="test? ( pcre )"
+
+RDEPEND="virtual/latex-base
+	dev-lang/perl
+	pcre? ( dev-libs/libpcre )"
+DEPEND="${RDEPEND}
+	sys-apps/groff
+	doc? ( dev-tex/latex2html )"
+
+PATCHES=( "${FILESDIR}/${PN}-1.7.1-asneeded.patch" )
+DOCS=( NEWS )
+
+src_configure() {
+	export VARTEXFONTS="${T}/fonts" #538672
+
+	local myeconfargs=(
+		$(use_enable debug debug-info)
+		$(use_enable pcre)
+	)
+	autotools-utils_src_configure
+}
+
+src_compile() {
+	autotools-utils_src_compile
+	use doc && autotools-utils_src_compile html
+}
+
+src_install() {
+	if use doc ; then
+		HTML_DOCS=("${AUTOTOOLS_BUILD_DIR}/HTML/ChkTeX/")
+		DOCS+=("${AUTOTOOLS_BUILD_DIR}/HTML/ChkTeX.tex")
+	fi
+	autotools-utils_src_install
+	doman *.1
+}
--- a/dev-tex/cjk-latex/Manifest
+++ b/dev-tex/cjk-latex/Manifest
@ -1,6 +1,6 @@
-DIST cjk-4.8.2-doc.tar.gz 2243205 SHA256 d4eb32896e9f0e69c6f8ae81fd9d0aa0257390eb1d2b028173625995bcb9c00c SHA512 596fb87fed66c6a3866b4f6aea647787dbb45040da15a9c82f4e8c6b8bba4d80c6df106e9d68b01dfe670d80925b61079cc7cbfac304c5c83732c00ca40d67ea WHIRLPOOL 99ffa575936d9290a25ddc216b102304b8b3fd34b6307fb8f49cfb5cca52dbd00868f2ed15eab60e905c258f5cd96f1e6837f566e4927d3fd094e4869eedd2aa
-DIST cjk-4.8.2-fonts.zip 20384230 SHA256 1625582b13a5f46532b5f7d0b0f25a9f72960017ad9b1074fbcf70cbbf45efb4 SHA512 ec55aa604f1e8b19936d0e22949f8100f6442c6c93a5f240a78c9891289d838dd29350dcb4d20998c3e7a13ba05d451934ed29a2d7e7cbbaf517db06a92204d1 WHIRLPOOL 0876b7908b1f0c164a3e28888e97b4b7d8f251ea56e84f0268053bd6b3cc7877ca4e1543c9afb4534b1a5a4860187bb038ef08a9d66567b4937eb46ee8ae0a45
-DIST cjk-4.8.2.tar.gz 553425 SHA256 2108856bafbf6eb44b65500122ae540d863fb1e4196485682be4d88244f16dd6 SHA512 39c4e3c65fe759e437dd88be9ebe1c91df89c4025440bdd420cbbac9c0cb1b0a105c2ba42f9b89cd2e196519224194f7c0071f110b65dd710b233f08b62a7f32 WHIRLPOOL 6611f8eec5acc31b730c51e5ce530b3a79276d67192cd27d1f97fc311dd5ff7c452cee4efb700991b29409693e2f807b913e002b02484c4da342b99cc376ed06
 DIST cjk-4.8.3-doc.tar.gz 2045004 SHA256 d7a39b532f318b210ee650be0389145973029ffaebcb3e731a3e1fd90440d8b5 SHA512 06cab391ebd7d92a120dc493101bd3f9aef585e9f8be26d5c510c1b2266fe8dd6dd83aa6b41a4a58b8a97b294431193e05350485d4480019acab388b4a25f0a7 WHIRLPOOL 566db0371595a25352e36a35b294aa19f0df7c704e36c3a682bec25d2f5edaa6517f84e0791433e0e457015f4d0444cf2a1babb7e0a39f64a27711eec3d2a63b
 DIST cjk-4.8.3-fonts.zip 20384230 SHA256 1625582b13a5f46532b5f7d0b0f25a9f72960017ad9b1074fbcf70cbbf45efb4 SHA512 ec55aa604f1e8b19936d0e22949f8100f6442c6c93a5f240a78c9891289d838dd29350dcb4d20998c3e7a13ba05d451934ed29a2d7e7cbbaf517db06a92204d1 WHIRLPOOL 0876b7908b1f0c164a3e28888e97b4b7d8f251ea56e84f0268053bd6b3cc7877ca4e1543c9afb4534b1a5a4860187bb038ef08a9d66567b4937eb46ee8ae0a45
 DIST cjk-4.8.3.tar.gz 562787 SHA256 fd8847d7494110a318f222276f8026bc9723f4728ad1fd5ec72e0494a20f4837 SHA512 b3ff2761f86de900abcf678cb85886fa3bd2ec80a205e042ccdf44d432f699b0e8fb45e56aff4368b534b187c46de2eb4e2657098bab877b11a2bc13d099bee9 WHIRLPOOL 00ab9a67bccc2bcc3737b1e739b6526a0ef0dc33bf997f89e42245f243b1f711b24dd570d41470b8cba135369feddca349c86d7d9f84b4c58fb17ab271c0fc0a
+DIST cjk-4.8.4-doc.tar.gz 2152418 SHA256 73775aec5a9006acecca45acaf7f3f59cbdeab7f3d2dfe3a1d983d6791fbf987 SHA512 453ff48554d950eeba53481e0643dcd96214627a12e685e1c39476e19aee9f5284ae347cf694df583c43cc273be44a5b56511bfc622144552f07e51d9e1e0877 WHIRLPOOL 494c1a7fa00e73fdbafe503842b44dc928edf6fd19426a7a5c623427a6e4a7e77edc5944a31ce7ef1b4a4e02d39f2e37c1a91b8918018791171240fe2fea0ea0
+DIST cjk-4.8.4-fonts.zip 20384230 SHA256 1625582b13a5f46532b5f7d0b0f25a9f72960017ad9b1074fbcf70cbbf45efb4 SHA512 ec55aa604f1e8b19936d0e22949f8100f6442c6c93a5f240a78c9891289d838dd29350dcb4d20998c3e7a13ba05d451934ed29a2d7e7cbbaf517db06a92204d1 WHIRLPOOL 0876b7908b1f0c164a3e28888e97b4b7d8f251ea56e84f0268053bd6b3cc7877ca4e1543c9afb4534b1a5a4860187bb038ef08a9d66567b4937eb46ee8ae0a45
+DIST cjk-4.8.4.tar.gz 556197 SHA256 17b3978a1558dbcb23a041076673c4b26856bfe975839a17363e35cd2f93a6ea SHA512 d1dc754c176331d0694561158554072083e6b8f2bbeb2516915c8bc8b15bbcedff81f2a14655cc9d77d832121971a5f9792e3c477336f9b5bcb77c8f15f8cfa3 WHIRLPOOL 9c1d94f676b86f91bf0496047b7bc3fd9f5ae70eae49390dc1e52a313fad8e342ed9cc254f58e7b5ba109ddbfc027145fe1caae1659fd2cd2234a10de5dc0871
--- a/dev-tex/cjk-latex/cjk-latex-4.8.2.ebuild
+++ b/dev-tex/cjk-latex/cjk-latex-4.8.2.ebuild
@ -1,161 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/cjk-latex/cjk-latex-4.8.2.ebuild,v 1.11 2012/07/25 14:07:54 ottxor Exp $
-
-EAPI=4
-
-inherit latex-package elisp-common toolchain-funcs multilib eutils autotools
-
-MY_P="${P/-latex/}"
-
-DESCRIPTION="A LaTeX 2e macro package which enables the use of CJK scripts in various encodings"
-HOMEPAGE="http://cjk.ffii.org/"
-# fonts are taken from ftp://ftp.ctan.org/tex-archive/fonts/CJK.zip
-SRC_URI="ftp://ftp.ffii.org/pub/cjk/${MY_P}.tar.gz
-	mirror://gentoo/${MY_P}-fonts.zip
-	doc? ( ftp://ftp.ffii.org/pub/cjk/${MY_P}-doc.tar.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="doc emacs"
-
-DEPEND="virtual/latex-base
-	emacs? ( virtual/emacs )"
-RDEPEND="${DEPEND}
-	app-arch/unzip"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	for i in "${WORKDIR}"/CJK/*.tar.gz; do
-		tar -xzf ${i} || die "failed to unpack $i"
-	done
-	find texmf/fonts/hbf -type f -exec cp {} "${T}" \; || die
-	sed -i -e "/^pk_files/s/no/yes/" \
-		-e "/^dpi_x/s/300/500/" \
-		texmf/hbf2gf/*.cfg || die
-	epatch "${FILESDIR}/${P}-kpathsea_version.patch"
-	cd "${S}/utils/hbf2gf"
-	eautoreconf
-}
-
-src_configure() {
-	cd utils
-	for d in *conv; do
-		cd $d
-		local f=`echo $d | tr '[:upper:]' '[:lower:]'`
-		echo "all: $f" >> Makefile
-		if [ $d = CEFconv ] ; then
-			echo "all: cef5conv cefsconv" >> Makefile
-		fi
-		cd -
-	done
-	cd hbf2gf
-	econf --with-kpathsea-lib="${EPREFIX}"/usr/$(get_libdir) \
-		--with-kpathsea-include="${EPREFIX}"/usr/include/kpathsea
-}
-
-src_compile() {
-	tc-export CC
-	cd utils
-	for d in *conv; do
-		cd $d
-		emake || die
-		cd -
-	done
-	cd hbf2gf
-	emake || die
-	cd -
-
-	if use emacs ; then
-		cd lisp
-		elisp-compile *.el
-		cd emacs
-		elisp-compile *.el
-		cd ../mule-2.3
-		elisp-compile *.el
-	fi
-
-	cd "${T}"
-
-	for f in "${S}"/texmf/hbf2gf/*.cfg ; do
-	env TEXMFCNF="${EPREFIX}/etc/texmf/web2c" HBF_TARGET="${S}/texmf/fonts" "${S}/utils/hbf2gf/hbf2gf" $f || die
-	done
-
-	einfo "Generating pk fonts"
-	for gf in *.gf ; do
-		gftopk $gf || die
-	done
-}
-
-src_install() {
-	cd utils
-	for d in *conv; do
-		cd $d
-		local f=`echo $d | tr '[:upper:]' '[:lower:]'`
-		dobin *latex *conv
-		doman *.1
-		cd -
-	done
-	cd hbf2gf
-	einstall || die "einstall failed"
-
-	cd "${S}"
-
-	# Install pk fonts
-	for d in texmf/fonts/pk/modeless/*/* ; do
-		insinto /usr/share/${d}
-		for f in "${T}"/${d##*/}*.pk ; do
-			newins $f `basename ${f/.pk/.500pk}` || die "newins failed"
-		done
-	done
-
-	insinto "${TEXMF}/tex/latex/${PN}"
-	doins -r texinput/* || die "installing texinput files failed"
-	doins -r contrib/wadalab || die "installing wadalab failed"
-
-	if use emacs ; then
-		cd utils/lisp
-		elisp-install ${PN} *.el{,c} emacs/*.el{,c} mule-2.3/*.el{,c}
-	fi
-
-	cd "${S}"
-
-	# uwpatch stuff
-	insinto ${TEXMF}/scripts/uwpatch
-	doins uwpatch/uwpatchold.sh
-	insinto ${TEXMF}/fonts/afm/uwpatch
-	doins uwpatch/*.afm
-
-	# jisksp40 stuff
-	insinto ${TEXMF}
-	doins -r jisksp40/texmf/*
-
-	# kanji48 stuff
-	insinto ${TEXMF}
-	doins -r kanji48/texmf/*
-
-	use doc || rm -rf texmf/doc
-	insinto ${TEXMF}
-	doins -r texmf/* || die "installing texmf failed"
-
-	# Move fonts because hbf2gf expects them in MISCFONTS
-	mv "${ED}/${TEXMF}/fonts/hbf" "${ED}/${TEXMF}/fonts/misc" || die "mv font failed"
-
-	insinto ${TEXMF}/hbf2gf
-	doins utils/hbf2gf/cfg/*
-
-	insinto ${TEXMF}/scripts/subfonts
-	doins utils/subfonts/*
-
-	rm -f doc/COPYING doc/INSTALL
-	dodoc ChangeLog README
-	if use doc ; then
-		insinto /usr/share/doc/${PF}
-		doins -r doc/*
-		doins -r examples
-	fi
-	docinto uwpatch
-	dodoc uwpatch/README
-}
--- a/dev-tex/cjk-latex/cjk-latex-4.8.4.ebuild
+++ b/dev-tex/cjk-latex/cjk-latex-4.8.4.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/cjk-latex/cjk-latex-4.8.3.ebuild,v 1.13 2013/07/06 00:54:04 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/cjk-latex/cjk-latex-4.8.4.ebuild,v 1.1 2015/04/29 15:38:32 aballier Exp $

 EAPI=4

@ -17,7 +17,7 @@ SRC_URI="ftp://ftp.ffii.org/pub/cjk/${MY_P}.tar.gz

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="doc emacs"

 DEPEND="virtual/latex-base
--- a/dev-tex/cjk-latex/files/cjk-latex-4.8.2-kpathsea_version.patch
+++ b/dev-tex/cjk-latex/files/cjk-latex-4.8.2-kpathsea_version.patch
@ -1,36 +0,0 @@
-Include kpathsea/version.h when available. Fixes a build failure with TeX Live
-2010.
-
-Index: cjk-4.8.2/utils/hbf2gf/configure.ac
-===================================================================
--- cjk-4.8.2.orig/utils/hbf2gf/configure.ac
-+++ cjk-4.8.2/utils/hbf2gf/configure.ac
-@@ -79,6 +79,7 @@ if test -n "$kpathsea_include" -o -n "$k
- 
-   AC_CHECK_HEADER(kpathsea/c-auto.h, ,[
-                   AC_MSG_ERROR([Can't find kpathsea include files! Use --with-kpathsea-include option.])])
-+  AC_CHECK_HEADERS([kpathsea/version.h])
- else
-   CPPFLAGS="$CPPFLAGS -I$srcdir"
- fi
-Index: cjk-4.8.2/utils/hbf2gf/hbf2gf.w
-===================================================================
--- cjk-4.8.2.orig/utils/hbf2gf/hbf2gf.w
-+++ cjk-4.8.2/utils/hbf2gf/hbf2gf.w
-@@ -2500,12 +2500,16 @@ be used instead.
- @
- @<Global variables@>=
- #if defined(HAVE_LIBKPATHSEA)
-+#if defined(HAVE_KPATHSEA_VERSION_H)
-+#include <kpathsea/version.h>
-+#else
- #ifdef KPSEDLL
- /* this is kpathsea 3.3 and newer */
- extern KPSEDLL char *kpathsea_version_string;
- #else
- extern DllImport char *kpathsea_version_string;
- #endif
-+#endif
- #elif defined(HAVE_EMTEXDIR)
- char emtex_version_string[] = "emTeXdir";
- #elif !defined(HAVE_MIKTEX)
--- a/dev-tex/latexmk/Manifest
+++ b/dev-tex/latexmk/Manifest
@ -1,4 +1,3 @@
 DIST latexmk-435.zip 386766 SHA256 9de9ebdafd5e0cf5c29235ec6316aae2a039a5a6eb6d55e83b4cfbb7374d7fc3 SHA512 ff8f88c261e2b90663d979ddcb373f777fd3ad4b125ab703052867b4896257b34033ed2a07fd4574da526d839449512ccc898bcb9aaf81ae5afb442dcb8622be WHIRLPOOL 0bbf295edd8eb079160af834057abe2e02f536868b3815c265a2f7320eb8122701f062f8c784bf087e1cba9391ff755118c516a9ed1455fbbebab6334c41db6f
-DIST latexmk-437.zip 416907 SHA256 e9872988e5bddc61f73c6c409c4fa0de71437a8d3230329eed9436e3fca1d669 SHA512 a5ec732eb110681b3594ad51e8166d163aca5b8044fd3a56cb60ef78a3602042ef3975b3b2dbb28293236443b37b1aa48cdbec8dbdac62f02578a8e8770b3a22 WHIRLPOOL 21fb66dcbd22a3a9501399bf846135d56b518a27bfdd946dd46cfbef066db433a7e85167f9ddab488e5ce4585108d8c1389342761ccc0a8472811066e67fc2fd
-DIST latexmk-439.zip 418242 SHA256 1a098812a9757b5fd8d0bbd7136a494b81e5c1a359a737c34a8fb127014f5797 SHA512 500c06ec6ae7c64d18a83aea78f2acab88839e63133b84f599eefd00c3de867098c5209ca3edd6f69a214daf3d5b46726de1089b72364628d8aa20457bb8b08e WHIRLPOOL f7e3d05f751afe744a0a5705c49b77a177d0e204367985f86788292601e61a27a27fd011bd5ca6377515dc4b114ba3a4f279aea2bbb6f848c7655d3ca831ab9b
 DIST latexmk-441.zip 425737 SHA256 564b56414ab3a71ab39d01becce95deed4f262e061de167d0cca03c8ba8e5d46 SHA512 b9b65ebda1edc6f1f2692f7c8f02eeeac07dc2bd2f5d96c763615a9e27918069ba65809e5e61580e541420bf1f8d7edc451ad3f1753d43e9596175fdb3571a73 WHIRLPOOL bd48511ebf823709e66be3b82d6b0e8038a8450dfc3217b7e4f0612e6f4ee9d286e38696171337e165fb246464160290cd82e35f7a7e74962037821989e32634
+DIST latexmk-443a.zip 434070 SHA256 e410d295c0a47327b953ece5b582c294359bdf89138ef990d5621b020ff2bbe5 SHA512 9791bea6341f92988b6a7bdc4cd1587d1b8c6e013d9e7a3be219ea4045a8f95971072cf6633998839c35a462b2e5843adf3d5893519f1f6c2bd4ecf81314b2c0 WHIRLPOOL 9662ac695de7c3ead43f23abcc92bb611cb089ddaa475b36ab8b3b957cf7e8c864e9cc0d8d037e8fafedc44161112ff868ec3612f84bc3d338c5e2422f49e246
--- a/dev-tex/latexmk/latexmk-437.ebuild
+++ b/dev-tex/latexmk/latexmk-437.ebuild
@ -1,30 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/latexmk/latexmk-437.ebuild,v 1.2 2014/08/10 21:26:39 slyfox Exp $
-
-EAPI=5
-
-inherit bash-completion-r1
-
-DESCRIPTION="Perl script for automatically building LaTeX documents"
-HOMEPAGE="http://www.phys.psu.edu/~collins/software/latexmk/"
-SRC_URI="http://www.phys.psu.edu/~collins/software/latexmk/${P}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-RDEPEND="virtual/latex-base
-	dev-lang/perl"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S=${WORKDIR}
-
-src_install() {
-	newbin latexmk.pl latexmk
-	doman latexmk.1
-	dodoc CHANGES README latexmk.pdf latexmk.ps latexmk.txt
-	dodoc -r example_rcfiles extra-scripts
-	newbashcomp "${FILESDIR}"/completion.bash-2 ${PN}
-}
--- a/dev-tex/latexmk/latexmk-443a.ebuild
+++ b/dev-tex/latexmk/latexmk-443a.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/latexmk/latexmk-439.ebuild,v 1.2 2014/08/10 21:26:39 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/latexmk/latexmk-443a.ebuild,v 1.1 2015/04/29 15:26:16 aballier Exp $

 EAPI=5

@ -19,7 +19,7 @@ RDEPEND="virtual/latex-base
 DEPEND="${RDEPEND}
 	app-arch/unzip"

-S=${WORKDIR}
+S="${WORKDIR}/${PN}"

 src_install() {
 	newbin latexmk.pl latexmk
--- a/dev-util/meld/meld-3.12.2.ebuild
+++ b/dev-util/meld/meld-3.12.2.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-3.12.2.ebuild,v 1.3 2014/12/19 13:36:58 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-3.12.2.ebuild,v 1.4 2015/04/29 14:54:50 leio Exp $

 EAPI="5"
 GCONF_DEBUG="no"
@ -20,7 +20,7 @@ IUSE=""

 RDEPEND="
 	${PYTHON_DEPS}
-	>=dev-libs/glib-2.34:2
+	>=dev-libs/glib-2.36:2
 	dev-python/dbus-python[${PYTHON_USEDEP}]
 	>=dev-python/pygobject-3.8:3[cairo,${PYTHON_USEDEP}]
 	gnome-base/gsettings-desktop-schemas
--- a/dev-util/meld/meld-3.12.3.ebuild
+++ b/dev-util/meld/meld-3.12.3.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-3.12.3.ebuild,v 1.3 2015/03/15 13:20:06 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-3.12.3.ebuild,v 1.4 2015/04/29 14:54:50 leio Exp $

 EAPI="5"
 GCONF_DEBUG="no"
@ -20,7 +20,7 @@ IUSE=""

 RDEPEND="
 	${PYTHON_DEPS}
-	>=dev-libs/glib-2.34:2
+	>=dev-libs/glib-2.36:2
 	dev-python/dbus-python[${PYTHON_USEDEP}]
 	>=dev-python/pygobject-3.8:3[cairo,${PYTHON_USEDEP}]
 	gnome-base/gsettings-desktop-schemas
--- a/dev-vcs/mercurial/mercurial-3.3.2.ebuild
+++ b/dev-vcs/mercurial/mercurial-3.3.2.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-3.3.2.ebuild,v 1.10 2015/04/21 18:44:42 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/mercurial/mercurial-3.3.2.ebuild,v 1.11 2015/04/29 09:18:18 ago Exp $

 EAPI=5

@ -15,7 +15,7 @@ SRC_URI="http://mercurial.selenic.com/release/${P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="bugzilla emacs gpg test tk"

 RDEPEND="bugzilla? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
--- a/kde-frameworks/kxmlrpcclient/kxmlrpcclient-5.8.0.ebuild
+++ b/kde-frameworks/kxmlrpcclient/kxmlrpcclient-5.8.0.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-frameworks/kxmlrpcclient/kxmlrpcclient-5.8.0.ebuild,v 1.1 2015/03/21 17:31:08 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-frameworks/kxmlrpcclient/kxmlrpcclient-5.8.0.ebuild,v 1.2 2015/04/29 16:21:49 kensington Exp $

 EAPI=5

@ -18,5 +18,6 @@ RDEPEND="
 	$(add_frameworks_dep ki18n)
 	$(add_frameworks_dep kio)
 	dev-qt/qtxml:5
+	!<kde-plasma/plasma-workspace-5.2.95
 "
 DEPEND="${RDEPEND}"
--- a/kde-frameworks/kxmlrpcclient/kxmlrpcclient-5.9.0.ebuild
+++ b/kde-frameworks/kxmlrpcclient/kxmlrpcclient-5.9.0.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-frameworks/kxmlrpcclient/kxmlrpcclient-5.9.0.ebuild,v 1.1 2015/04/11 17:09:49 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-frameworks/kxmlrpcclient/kxmlrpcclient-5.9.0.ebuild,v 1.2 2015/04/29 16:21:49 kensington Exp $

 EAPI=5

@ -18,5 +18,6 @@ RDEPEND="
 	$(add_frameworks_dep ki18n)
 	$(add_frameworks_dep kio)
 	dev-qt/qtxml:5
+	!<kde-plasma/plasma-workspace-5.2.95
 "
 DEPEND="${RDEPEND}"
--- a/kde-misc/plasma-nm/files/plasma-nm-0.9.3.5-openconnect.patch
+++ b/kde-misc/plasma-nm/files/plasma-nm-0.9.3.5-openconnect.patch
@ -0,0 +1,221 @@
+From: David Woodhouse <David.Woodhouse@intel.com>
+Date: Wed, 03 Dec 2014 14:10:44 +0000
+Subject: Update OpenConnect support for library version 5
+X-Git-Url: http://quickgit.kde.org/?p=plasma-nm.git&a=commitdiff&h=3e6585fa4dd2fb3d9b59c7704bd3d7ae5b2c4167
+---
+Update OpenConnect support for library version 5
+
+String ownership rules are now very simple: the library never takes ownership
+of a string it's passed. It always takes its *own* copy and is responsible
+for freeing that. Mostly driven by Windows DLL Hell where it's painful to
+allocate in one library and free in another because they might actually be
+using different heaps.
+
+Also adapt to the changes in server certificate hash handling. We are no
+longer supposed to just compare strings, and must call the relevant function
+to check a hash against the server's certificate. This gives better matching
+and allows libopenconnect to upgrade the hash in future when it becomes
+necessary.
+---
+Backported from upstream
+
+Signed-off-by: Markos Chandras <hwoarang@gentoo.org>
+X-Gentoo-Bugzilla: https://bugs.gentoo.org/show_bug.cgi?id=532294
+---
+--- a/vpn/openconnect/CMakeLists.txt
+++ b/vpn/openconnect/CMakeLists.txt
+@@ -15,6 +15,8 @@
+ 
+     if (${OPENCONNECT_VERSION} VERSION_GREATER ${MINIMUM_OPENCONNECT_VERSION_REQUIRED} OR
+         ${OPENCONNECT_VERSION} VERSION_EQUAL ${MINIMUM_OPENCONNECT_VERSION_REQUIRED})
+
+        include_directories(${OPENCONNECT_INCLUDE_DIRS})
+ 
+         set(openconnect_SRCS
+         openconnectui.cpp
+
+--- a/vpn/openconnect/openconnectauth.cpp
+++ b/vpn/openconnect/openconnectauth.cpp
+@@ -161,7 +161,7 @@
+     }
+     if (!dataMap[NM_OPENCONNECT_KEY_CACERT].isEmpty()) {
+         const QByteArray crt = QFile::encodeName(dataMap[NM_OPENCONNECT_KEY_CACERT]);
+-        openconnect_set_cafile(d->vpninfo, strdup(crt.data()));
+        openconnect_set_cafile(d->vpninfo, OC3DUP(crt.data()));
+     }
+     if (dataMap[NM_OPENCONNECT_KEY_CSD_ENABLE] == "yes") {
+         char *wrapper;
+@@ -174,12 +174,12 @@
+     }
+     if (!dataMap[NM_OPENCONNECT_KEY_PROXY].isEmpty()) {
+         const QByteArray proxy = QFile::encodeName(dataMap[NM_OPENCONNECT_KEY_PROXY]);
+-        openconnect_set_http_proxy(d->vpninfo, strdup(proxy.data()));
+        openconnect_set_http_proxy(d->vpninfo, OC3DUP(proxy.data()));
+     }
+     if (!dataMap[NM_OPENCONNECT_KEY_USERCERT].isEmpty()) {
+         const QByteArray crt = QFile::encodeName(dataMap[NM_OPENCONNECT_KEY_USERCERT]);
+         const QByteArray key = QFile::encodeName(dataMap[NM_OPENCONNECT_KEY_PRIVKEY]);
+-        openconnect_set_client_cert (d->vpninfo, strdup(crt.data()), strdup(key.data()));
+        openconnect_set_client_cert (d->vpninfo, OC3DUP(crt.data()), OC3DUP(key.data()));
+ 
+         if (!crt.isEmpty() && dataMap[NM_OPENCONNECT_KEY_PEM_PASSPHRASE_FSID] == "yes") {
+             openconnect_passphrase_from_fsid(d->vpninfo);
+@@ -276,10 +276,10 @@
+     const VPNHost &host = d->hosts.at(i);
+     if (openconnect_parse_url(d->vpninfo, host.address.toAscii().data())) {
+         kWarning() << "Failed to parse server URL" << host.address;
+-        openconnect_set_hostname(d->vpninfo, strdup(host.address.toAscii().data()));
+        openconnect_set_hostname(d->vpninfo, OC3DUP(host.address.toAscii().data()));
+     }
+     if (!openconnect_get_urlpath(d->vpninfo) && !host.group.isEmpty())
+-        openconnect_set_urlpath(d->vpninfo, strdup(host.group.toAscii().data()));
+        openconnect_set_urlpath(d->vpninfo, OC3DUP(host.group.toAscii().data()));
+     d->secrets["lasthost"] = host.name;
+     addFormInfo(QLatin1String("dialog-information"), i18n("Contacting host, please wait..."));
+     d->worker->start();
+@@ -301,9 +301,13 @@
+     secrets.insert(QLatin1String(NM_OPENCONNECT_KEY_COOKIE), QLatin1String(openconnect_get_cookie(d->vpninfo)));
+     openconnect_clear_cookie(d->vpninfo);
+ 
+#if OPENCONNECT_CHECK_VER(5,0)
+    const char *fingerprint = openconnect_get_peer_cert_hash(d->vpninfo);
+#else
+     OPENCONNECT_X509 *cert = openconnect_get_peer_cert(d->vpninfo);
+     char fingerprint[41];
+     openconnect_get_cert_sha1(d->vpninfo, cert, fingerprint);
+#endif
+     secrets.insert(QLatin1String(NM_OPENCONNECT_KEY_GWCERT), QLatin1String(fingerprint));
+     secrets.insert(QLatin1String("certsigs"), d->certificateFingerprints.join("\t"));
+     secrets.insert(QLatin1String("autoconnect"), d->ui.chkAutoconnect->isChecked() ? "yes" : "no");
+@@ -578,14 +582,14 @@
+             if (opt->type == OC_FORM_OPT_PASSWORD || opt->type == OC_FORM_OPT_TEXT) {
+                 KLineEdit *le = qobject_cast<KLineEdit*>(widget);
+                 QByteArray text = le->text().toUtf8();
+-                opt->value = strdup(text.data());
+                openconnect_set_option_value(opt, text.data());
+                 if (opt->type == OC_FORM_OPT_TEXT) {
+                     d->secrets.insert(key,le->text());
+                 }
+             } else if (opt->type == OC_FORM_OPT_SELECT) {
+                 KComboBox *cbo = qobject_cast<KComboBox*>(widget);
+                 QByteArray text = cbo->itemData(cbo->currentIndex()).toString().toAscii();
+-                opt->value = strdup(text.data());
+                openconnect_set_option_value(opt, text.data());
+                 d->secrets.insert(key,cbo->itemData(cbo->currentIndex()).toString());
+             }
+         }
+
+--- a/vpn/openconnect/openconnectauthworkerthread.cpp
+++ b/vpn/openconnect/openconnectauthworkerthread.cpp
+@@ -43,6 +43,20 @@
+ class OpenconnectAuthStaticWrapper
+ {
+ public:
+#if OPENCONNECT_CHECK_VER(5,0)
+    static int writeNewConfig(void *obj, const char *str, int num)
+    {
+        if (obj)
+            return static_cast<OpenconnectAuthWorkerThread*>(obj)->writeNewConfig(str, num);
+        return -1;
+    }
+    static int validatePeerCert(void *obj, const char *str)
+    {
+        if (obj)
+            return static_cast<OpenconnectAuthWorkerThread*>(obj)->validatePeerCert(NULL, str);
+        return -1;
+    }
+#else
+     static int writeNewConfig(void *obj, char *str, int num)
+     {
+         if (obj)
+@@ -55,7 +69,8 @@
+             return static_cast<OpenconnectAuthWorkerThread*>(obj)->validatePeerCert(cert, str);
+         return -1;
+     }
+-    static int processAuthForm(void *obj, struct oc_auth_form *form)
+#endif
+	static int processAuthForm(void *obj, struct oc_auth_form *form)
+     {
+         if (obj)
+             return static_cast<OpenconnectAuthWorkerThread*>(obj)->processAuthFormP(form);
+@@ -108,7 +123,7 @@
+     return m_openconnectInfo;
+ }
+ 
+-int OpenconnectAuthWorkerThread::writeNewConfig(char *buf, int buflen)
+int OpenconnectAuthWorkerThread::writeNewConfig(const char *buf, int buflen)
+ {
+     Q_UNUSED(buflen)
+     if (*m_userDecidedToQuit)
+@@ -139,10 +154,16 @@
+ }
+ #endif
+ 
+-int OpenconnectAuthWorkerThread::validatePeerCert(OPENCONNECT_X509 *cert, const char *reason)
+-{
+-    if (*m_userDecidedToQuit)
+-        return -EINVAL;
+int OpenconnectAuthWorkerThread::validatePeerCert(void *cert, const char *reason)
+{
+    if (*m_userDecidedToQuit)
+        return -EINVAL;
+
+#if OPENCONNECT_CHECK_VER(5,0)
+    (void)cert;
+    const char *fingerprint = openconnect_get_peer_cert_hash(m_openconnectInfo);
+    char *details = openconnect_get_peer_cert_details(m_openconnectInfo);
+#else
+     char fingerprint[41];
+     int ret = 0;
+ 
+@@ -151,7 +172,7 @@
+         return ret;
+ 
+     char *details = openconnect_get_cert_details(m_openconnectInfo, cert);
+-
+#endif
+     bool accepted = false;
+     m_mutex->lock();
+     QString qFingerprint(fingerprint);
+@@ -160,7 +181,7 @@
+     emit validatePeerCert(qFingerprint, qCertinfo, qReason, &accepted);
+     m_waitForUserInput->wait(m_mutex);
+     m_mutex->unlock();
+-    ::free(details);
+    openconnect_free_cert_info(m_openconnectInfo, details);
+     if (*m_userDecidedToQuit)
+         return -EINVAL;
+ 
+
+--- a/vpn/openconnect/openconnectauthworkerthread.h
+++ b/vpn/openconnect/openconnectauthworkerthread.h
+@@ -59,6 +59,17 @@
+ #define OC_FORM_RESULT_NEWGROUP	2
+ #endif
+ 
+#if OPENCONNECT_CHECK_VER(4,0)
+#define OC3DUP(x)			(x)
+#else
+#define openconnect_set_option_value(opt, val) do { \
+		struct oc_form_opt *_o = (opt);				\
+		free(_o->value); _o->value = strdup(val);		\
+	} while (0)
+#define openconnect_free_cert_info(v, x) ::free(x)
+#define OC3DUP(x)			strdup(x)
+#endif
+
+ #include <QThread>
+ 
+ class QMutex;
+@@ -85,8 +96,8 @@
+     void run();
+ 
+ private:
+-    int writeNewConfig(char *, int);
+-    int validatePeerCert(OPENCONNECT_X509 *, const char *);
+    int writeNewConfig(const char *, int);
+    int validatePeerCert(void *, const char *);
+     int processAuthFormP(struct oc_auth_form *);
+     void writeProgress(int level, const char *, va_list);
+ 
+
--- a/kde-misc/plasma-nm/plasma-nm-0.9.3.5.ebuild
+++ b/kde-misc/plasma-nm/plasma-nm-0.9.3.5.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/plasma-nm/plasma-nm-0.9.3.5.ebuild,v 1.3 2014/11/24 16:41:07 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/plasma-nm/plasma-nm-0.9.3.5.ebuild,v 1.4 2015/04/29 17:23:53 hwoarang Exp $

 EAPI=5

@ -39,6 +39,8 @@ DEPEND="${RDEPEND}
 	sys-devel/gettext
 "

+PATCHES=( "${FILESDIR}"/${P}-openconnect.patch )
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use !modemmanager DISABLE_MODEMMANAGER_SUPPORT)
--- a/mail-client/thunderbird/thunderbird-31.6.0.ebuild
+++ b/mail-client/thunderbird/thunderbird-31.6.0.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-31.6.0.ebuild,v 1.4 2015/04/25 09:24:38 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-31.6.0.ebuild,v 1.5 2015/04/29 09:13:06 ago Exp $

 EAPI=5
 WANT_AUTOCONF="2.1"
@ -36,7 +36,7 @@ inherit flag-o-matic toolchain-funcs mozconfig-v5.31 makeedit multilib autotools
 DESCRIPTION="Thunderbird Mail Client"
 HOMEPAGE="http://www.mozilla.com/en-US/thunderbird/"

-KEYWORDS="~alpha amd64 ~arm ~ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 SLOT="0"
 LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
 IUSE="bindist crypt hardened ldap +lightning +minimal mozdom selinux"
--- a/media-gfx/pstoedit/Manifest
+++ b/media-gfx/pstoedit/Manifest
@ -1,2 +1,3 @@
 DIST pstoedit-3.61.tar.gz 989480 SHA256 e9935f5510fc5a3227bd31a74e88911f02a4c8516f3e0fe9fbc0dc780f2460db SHA512 fa7ca567ea5acc95000b9d7582c22605725f5893d2f00412f6e9e59ead1efc6cafbbb019df0a4ae4f849ed50df59cf1f4d187fdd3b560d62173287d6f7e3db72 WHIRLPOOL cf7b252afce0c65ccb9d739df5e4c4b419f7f39f9a76a5ad3f1dfc78cb9a0549b4ac0881dde7400fa51d9f75d479aa0669da76d8c01a628c2d4676cbe56e5287
 DIST pstoedit-3.62.tar.gz 1013477 SHA256 8074c44637d48fa1a9253b263b18a61258bab904df473f803d8a639b6a038148 SHA512 f8c8643c873066026d0ef15a845006cf13928410e1c4b822bdd9a727d5d80f703d3ddabbcde249c72395c3b013dd2e1ef020f4a74f239b118035372ba5e4dda4 WHIRLPOOL 1cd36f55786e060bb66b5f41461edd38b40a5222c0abe9442a7b7223b781922f875271cda99397928ddc137725e236ef53cfb15f070510a770364d822df90ec9
+DIST pstoedit-3.70.tar.gz 1013949 SHA256 06b86113f7847cbcfd4e0623921a8763143bbcaef9f9098e6def650d1ff8138c SHA512 63668ea039fdf988ba007bafb8dc1f23f06d4eb430a92b97fb93c71b819f63e2708b99476ec9b096598db2ddd30d29a69101f078e7d4fdfec314677f50293cf9 WHIRLPOOL b1538ddc6fdebd150e79e3c574b41941077863e14eff1b9e74baf0bffe6d4ef8419bff551bf88e6e4e98550648d7a050e18b0df8627373351074ff434de8a571
--- a/media-gfx/pstoedit/pstoedit-3.70.ebuild
+++ b/media-gfx/pstoedit/pstoedit-3.70.ebuild
@ -0,0 +1,59 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pstoedit/pstoedit-3.70.ebuild,v 1.1 2015/04/29 15:22:52 aballier Exp $
+
+EAPI=5
+
+inherit autotools eutils
+
+DESCRIPTION="Translate PostScript and PDF graphics into other vector formats"
+HOMEPAGE="http://sourceforge.net/projects/pstoedit/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="emf flash imagemagick plotutils pptx static-libs"
+
+RDEPEND="
+	>=media-libs/gd-2.0.35-r1
+	>=app-text/ghostscript-gpl-8.71-r1
+	emf? ( >=media-libs/libemf-1.0.3 )
+	flash? ( >=media-libs/ming-0.4.3 )
+	imagemagick? ( >=media-gfx/imagemagick-6.6.1.2[cxx] )
+	plotutils? ( media-libs/plotutils )
+	pptx? ( dev-libs/libzip )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	sed -i \
+		-e '/CXXFLAGS="-g"/d' \
+		-e 's:-pedantic::' \
+		configure.ac || die
+
+	epatch "${FILESDIR}"/${PN}-3.60-libdl.patch
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		$(use_with emf) \
+		$(use_with imagemagick magick) \
+		$(use_with plotutils libplot) \
+		$(use_with flash swf) \
+		$(use_with pptx)
+}
+
+src_install() {
+	default
+	doman doc/pstoedit.1
+	dodoc doc/*.txt
+	dohtml doc/*.htm
+
+	find "${ED}" -name '*.la' -delete
+}
--- a/media-libs/liblo/Manifest
+++ b/media-libs/liblo/Manifest
@ -1,2 +1,3 @@
 DIST liblo-0.26.tar.gz 519750 SHA256 a636fb09f8178ad0d5303e94fec37b182d3062a0e3daee85eed2a39ab6232258 SHA512 5bc720be216b796587ee020cc32bdea760c65ee063a1248a44bb7c800c1a91b5e5a1321b55c61fd3b219aecb0d8cfb4d6bf53a6440d46fd59e8697c63e542215 WHIRLPOOL 4fcfa3dbfe8bbb8887eb18a17c3d3e3d532b9386dd83bbe9fd0d1c075fbf556b7abca626f415b60d69e92df49d7dafc2874d43e83f14bec8990b609ca4f5fe3e
 DIST liblo-0.27.tar.gz 533684 SHA256 67b48e1e63fddea60bb4a0f0c25fba32ea42d2a55877752aa342c478b59374b6 SHA512 079f12d349d7fb58d4f7393d2ad72ca6844570524992c56ce87b23531620c2387ac6ba5316f92684b3fae72c7a5abe03e49fcbd97196efdb35d11a2422b065bc WHIRLPOOL efce8f9fca4828338778e120a795cc998cf8dee9bb17477891907d77cf3a5e9c203bca7f0ef201810a0e148e4fabe7086d1093d781d05e31cfa52c863dc476dd
+DIST liblo-0.28.tar.gz 591659 SHA256 da94a9b67b93625354dd89ff7fe31e5297fc9400b6eaf7378c82ee1caf7db909 SHA512 05818218d2d6a7042714b8fa905e7242fb9707795ad53ea27b2a1af3661f0822d25585ce17d286aa269c534ef24e19e377e041bf7fe194c8e47c0046fefcb85f WHIRLPOOL 5de1592d2fe8aee191115ed5b094dd8bb0ca5ec442c94e785c2bc74bef93f3df0dd8804c8aa2a1c3b1a1ce70729fa87c73cd4b09f3535300548999687b9a1ab5
--- a/media-libs/liblo/liblo-0.28.ebuild
+++ b/media-libs/liblo/liblo-0.28.ebuild
@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/liblo/liblo-0.28.ebuild,v 1.1 2015/04/29 14:59:51 aballier Exp $
+
+EAPI=5
+inherit eutils autotools
+
+DESCRIPTION="Lightweight OSC (Open Sound Control) implementation"
+HOMEPAGE="http://plugin.org.uk/liblo"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~ppc-macos"
+IUSE="doc ipv6 static-libs"
+
+RESTRICT="test"
+
+DEPEND="doc? ( app-doc/doxygen )"
+
+src_prepare() {
+	# don't build examples by default
+	sed -i '/^SUBDIRS =/s/examples//' Makefile.am || die
+
+	eautoreconf
+}
+
+src_configure() {
+	use doc || export ac_cv_prog_HAVE_DOXYGEN=false
+
+	# switching threads on/off breaks ABI, bugs #473282, #473286 and #473356
+	econf \
+		$(use_enable static-libs static) \
+		$(use_enable ipv6) \
+		--enable-threads
+}
+
+src_install() {
+	default
+	prune_libtool_files
+}
--- a/media-libs/nas/files/nas-1.9.4-remove-abs-fabs.patch
+++ b/media-libs/nas/files/nas-1.9.4-remove-abs-fabs.patch
@ -0,0 +1,36 @@
+From 212309075d26668f6e25f30754e646952843cf61 Mon Sep 17 00:00:00 2001
+From: "Anthony G. Basile" <blueness@gentoo.org>
+Date: Tue, 28 Apr 2015 18:56:46 -0600
+Subject: [PATCH] 
+
+On a uClibc system, the macro definitions of abs() and fabs()
+ cause the build to fail.  Since these are specified by POSIX, it is safe to
+ just drop their definition.  This has been tested on uClibc, glibc and musl.
+
+See: https://bugs.gentoo.org/show_bug.cgi?id=510766
+
+Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
+---
+ server/include/misc.h | 6 ------
+ 1 file changed, 6 deletions(-)
+
+diff --git a/server/include/misc.h b/server/include/misc.h
+index 2267ae0..fb904c8 100644
+--- a/server/include/misc.h
+++ b/server/include/misc.h
+@@ -71,12 +71,6 @@ typedef int Bool;
+ 
+ #define min(a, b) (((a) < (b)) ? (a) : (b))
+ #define max(a, b) (((a) > (b)) ? (a) : (b))
+-#ifndef abs
+-#define abs(a) ((a) > 0 ? (a) : -(a))
+-#endif
+-#ifndef fabs
+-#define fabs(a) ((a) > 0.0 ? (a) : -(a))        /* floating absolute value */
+-#endif
+ #define sign(x) ((x) < 0 ? -1 : ((x) > 0 ? 1 : 0))
+ /* this assumes b > 0 */
+ #define modulus(a, b, d)    if (((d) = (a) % (b)) < 0) (d) += (b)
+-- 
+2.0.5
+
--- a/media-libs/nas/nas-1.9.4-r1.ebuild
+++ b/media-libs/nas/nas-1.9.4-r1.ebuild
@ -0,0 +1,100 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/nas/nas-1.9.4-r1.ebuild,v 1.1 2015/04/29 16:40:13 blueness Exp $
+
+EAPI=5
+inherit eutils multilib toolchain-funcs multilib-minimal
+
+DESCRIPTION="Network Audio System"
+HOMEPAGE="http://radscan.com/nas.html"
+SRC_URI="mirror://sourceforge/${PN}/${P}.src.tar.gz"
+
+LICENSE="HPND MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="doc static-libs"
+
+RDEPEND="x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	>=x11-libs/libXau-1.0.7-r1[${MULTILIB_USEDEP}]
+	x11-libs/libXaw
+	x11-libs/libXext
+	x11-libs/libXmu
+	x11-libs/libXpm
+	>=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	app-text/rman
+	sys-devel/bison
+	sys-devel/flex
+	x11-misc/gccmakedep
+	x11-misc/imake
+	>=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]"
+
+DOCS=( BUILDNOTES FAQ HISTORY README RELEASE TODO )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.9.2-asneeded.patch
+	epatch "${FILESDIR}"/${PN}-1.9.4-remove-abs-fabs.patch
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	xmkmf -a || die
+}
+
+multilib_src_compile() {
+	# EXTRA_LDOPTIONS, SHLIBGLOBALSFLAGS #336564#c2
+	local emakeopts=(
+		AR="$(tc-getAR) clq"
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		CDEBUGFLAGS="${CFLAGS}"
+		CXX="$(tc-getCXX)"
+		CXXDEBUFLAGS="${CXXFLAGS}"
+		EXTRA_LDOPTIONS="${LDFLAGS}"
+		LD="$(tc-getLD)"
+		MAKE="${MAKE:-gmake}"
+		RANLIB="$(tc-getRANLIB)"
+		SHLIBGLOBALSFLAGS="${LDFLAGS}"
+		WORLDOPTS=
+	)
+
+	if multilib_is_native_abi ; then
+		# dumb fix for parallel make issue wrt #446598, Imake sux
+		emake "${emakeopts[@]}" -C server/dia all
+		emake "${emakeopts[@]}" -C server/dda/voxware all
+		emake "${emakeopts[@]}" -C server/os all
+	else
+		sed -i \
+			-e 's/SUBDIRS =.*/SUBDIRS = include lib config/' \
+			Makefile || die
+	fi
+
+	emake "${emakeopts[@]}" World
+}
+
+multilib_src_install() {
+	# ranlib is used at install phase too wrt #446600
+	emake RANLIB="$(tc-getRANLIB)" \
+		DESTDIR="${D}" USRLIBDIR=/usr/$(get_libdir) \
+		install install.man
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	if use doc; then
+		docinto doc
+		dodoc doc/{actions,protocol.txt,README}
+		docinto pdf
+		dodoc doc/pdf/*.pdf
+	fi
+
+	mv -vf "${D}"/etc/nas/nasd.conf{.eg,} || die
+
+	newconfd "${FILESDIR}"/nas.conf.d nas
+	newinitd "${FILESDIR}"/nas.init.d nas
+
+	use static-libs || rm -f "${D}"/usr/lib*/libaudio.a
+}
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@ -1 +1 @@
-Wed, 29 Apr 2015 07:07:05 +0000
+Wed, 29 Apr 2015 17:37:00 +0000
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@ -1 +1 @@
-Wed, 29 Apr 2015 07:07:05 +0000
+Wed, 29 Apr 2015 17:37:00 +0000
--- a/metadata/md5-cache/app-arch/cabextract-1.6
+++ b/metadata/md5-cache/app-arch/cabextract-1.6
@ -3,10 +3,10 @@ DESCRIPTION=Extracts files from Microsoft cabinet archive files
 EAPI=5
 HOMEPAGE=http://www.cabextract.org.uk/
 IUSE=extras
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=extras? ( dev-lang/perl )
 SLOT=0
 SRC_URI=http://www.cabextract.org.uk/cabextract-1.6.tar.gz
 _eclasses_=multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=444d3225df6f3f5d8a0600f9b3529c4b
+_md5_=4e1fee93b3325ccea52f1c263b6e152c
--- a/metadata/md5-cache/app-text/poppler-0.32.0
+++ b/metadata/md5-cache/app-text/poppler-0.32.0
@ -4,11 +4,11 @@ DESCRIPTION=PDF rendering library based on the xpdf-3.0 code base
 EAPI=5
 HOMEPAGE=http://poppler.freedesktop.org/
 IUSE=cairo cjk curl cxx debug doc +introspection +jpeg jpeg2k +lcms png qt4 qt5 tiff +utils
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=media-libs/fontconfig-2.6.0 >=media-libs/freetype-2.3.9 sys-libs/zlib cairo? ( dev-libs/glib:2 >=x11-libs/cairo-1.10.0 introspection? ( >=dev-libs/gobject-introspection-1.32.1 ) ) curl? ( net-misc/curl ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:0 ) lcms? ( media-libs/lcms:2 ) png? ( media-libs/libpng:0= ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtxml:5 ) tiff? ( media-libs/tiff:0 ) cjk? ( >=app-text/poppler-data-0.4.4 )
 RESTRICT=test
 SLOT=0/51
 SRC_URI=http://poppler.freedesktop.org/poppler-0.32.0.tar.xz
 _eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=41c99da79b1cb3f5cb9c81747881e815
+_md5_=9552aacae001a9f7d87791f7c03e4a23
--- a/metadata/md5-cache/dev-db/mysql-5.6.24
+++ b/metadata/md5-cache/dev-db/mysql-5.6.24
@ -4,7 +4,7 @@ DESCRIPTION=A fast, multi-threaded, multi-user SQL database server
 EAPI=5
 HOMEPAGE=http://www.mysql.com/
 IUSE=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 +community cluster debug embedded extraengine jemalloc latin1 minimal +perl profiling selinux ssl systemtap static static-libs tcmalloc test
-KEYWORDS=alpha amd64 ~arm hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) ~virtual/mysql-5.6
 RDEPEND=ssl? ( >=dev-libs/openssl-1.0.0:0=[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(-)?,static-libs?] ) kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) sys-libs/ncurses >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/zlib-1.2.3:0=[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(-)?,static-libs?] !dev-db/mariadb-native-client[mysqlcompat] jemalloc? ( dev-libs/jemalloc:0=[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(-)?] ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) !dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql ) abi_x86_32? ( !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] )
@ -12,4 +12,4 @@ REQUIRED_USE=tcmalloc? ( !jemalloc ) jemalloc? ( !tcmalloc ) minimal? ( !extraen
 SLOT=0
 SRC_URI=http://downloads.mysql.com/archives/mysql-5.6/mysql-5.6.24.tar.gz mirror://mysql/Downloads/MySQL-5.6/mysql-5.6.24.tar.gz mirror://gentoo/mysql-extras-20150410-1944Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20150410-1944Z.tar.bz2 http://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20150410-1944Z.tar.bz2 http://dev.gentoo.org/~grknight/distfiles/mysql-extras-20150410-1944Z.tar.bz2
 _eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	mysql-cmake	0b183f1f008c40a3df7ab3dbfdfc14d5	mysql-multilib	693edca2a8bbc4b0938bd2f675cd80c3	mysql_fx	ab94d85c3c822792c72f7eeff96f2365	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=affebc474bbc032d987a398b4c2c19cd
+_md5_=4197d832f8a38748f4c48d5e1f65d7ef
--- a/metadata/md5-cache/dev-db/sqlite-3.8.9
+++ b/metadata/md5-cache/dev-db/sqlite-3.8.9
@ -4,10 +4,10 @@ DESCRIPTION=A SQL Database Engine in a C Library
 EAPI=5
 HOMEPAGE=http://sqlite.org/
 IUSE=debug doc icu +readline secure-delete static-libs tcl 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=alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=public-domain
 RDEPEND=icu? ( dev-libs/icu:0=[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(-)?] ) readline? ( sys-libs/readline:0=[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(-)?] ) tcl? ( dev-lang/tcl:0=[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? ( !<=app-emulation/emul-linux-x86-baselibs-20131008-r14 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=3
 SRC_URI=doc? ( http://sqlite.org/2015/sqlite-doc-3080900.zip ) tcl? ( http://sqlite.org/2015/sqlite-src-3080900.zip ) !tcl? ( test? ( http://sqlite.org/2015/sqlite-src-3080900.zip ) !test? ( http://sqlite.org/2015/sqlite-autoconf-3080900.tar.gz ) )
 _eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=3efc0dfebd0bce812d79d3ce1b5137d1
+_md5_=5972e568c3a9d387e887bf75dfacd240
--- a/metadata/md5-cache/dev-lang/php-5.4.40
+++ b/metadata/md5-cache/dev-lang/php-5.4.40
@ -4,11 +4,11 @@ DESCRIPTION=The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and
 EAPI=5
 HOMEPAGE=http://php.net/
 IUSE=embed +cli cgi fpm apache2 threads bcmath berkdb bzip2 calendar cdb cjk crypt +ctype curl curlwrappers debug enchant exif +fileinfo +filter firebird flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash mssql mysql mysqlnd mysqli nls oci8-instant-client odbc pcntl pdo +phar +posix postgres qdbm readline recode selinux +session sharedmem +simplexml snmp soap sockets spell sqlite ssl sybase-ct sysvipc systemd tidy +tokenizer truetype unicode wddx +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib apache2
-KEYWORDS=alpha amd64 ~arm hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=PHP-3
 RDEPEND=>=app-eselect/eselect-php-0.7.1-r3[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) berkdb? ( =sys-libs/db-4* ) bzip2? ( app-arch/bzip2 ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) cjk? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( >=dev-libs/gmp-4.1.2 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) !mysqlnd? ( mysql? ( virtual/mysql ) mysqli? ( >=virtual/mysql-4.1 ) ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-0.9.7 ) sybase-ct? ( dev-db/freetds ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) unicode? ( dev-libs/oniguruma ) wddx? ( >=dev-libs/libxml2-2.6.8 ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib ) zlib? ( sys-libs/zlib ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) ) apache2? ( =www-servers/apache-2* )
 REQUIRED_USE=truetype? ( gd ) cjk? ( gd ) exif? ( gd ) xpm? ( gd ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) mysqlnd? ( || ( mysql mysqli pdo ) ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysql !mysqli ) sharedmem? ( !threads ) !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )
 SLOT=5.4
 SRC_URI=http://www.php.net/distributions/php-5.4.40.tar.bz2 http://dev.gentoo.org/~olemarkus/php/php-patchset-5.4-r2.tar.bz2
 _eclasses_=apache-module	5c4c90da2d68c2dc8391666824f1293c	autotools	999c8f6cf5d91495cb0779588f20716c	db-use	82d0e62839f20e1e0d5a2259abd5316f	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=28e4380c48907a940e7d054058913bdd
+_md5_=2fd961537ba02700301fbab344185f42
--- a/metadata/md5-cache/dev-lang/php-5.5.24
+++ b/metadata/md5-cache/dev-lang/php-5.5.24
@ -4,11 +4,11 @@ DESCRIPTION=The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and
 EAPI=5
 HOMEPAGE=http://php.net/
 IUSE=embed +cli cgi fpm apache2 threads bcmath berkdb bzip2 calendar cdb cjk crypt +ctype curl debug enchant exif frontbase +fileinfo +filter firebird flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash mssql mysql libmysqlclient mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline recode selinux +session sharedmem +simplexml snmp soap sockets spell sqlite ssl sybase-ct sysvipc systemd tidy +tokenizer truetype unicode vpx wddx +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib apache2
-KEYWORDS=alpha amd64 ~arm hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=PHP-3
 RDEPEND=>=app-eselect/eselect-php-0.7.1-r3[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) berkdb? ( =sys-libs/db-4* ) bzip2? ( app-arch/bzip2 ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) cjk? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( >=dev-libs/gmp-4.1.2 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) libmysqlclient? ( mysql? ( virtual/mysql ) mysqli? ( >=virtual/mysql-4.1 ) ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-0.9.7 ) sybase-ct? ( dev-db/freetds ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) unicode? ( dev-libs/oniguruma ) vpx? ( media-libs/libvpx ) wddx? ( >=dev-libs/libxml2-2.6.8 ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib ) zlib? ( sys-libs/zlib ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) ) apache2? ( =www-servers/apache-2* )
 REQUIRED_USE=truetype? ( gd ) vpx? ( gd ) cjk? ( gd ) exif? ( gd ) xpm? ( gd ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) libmysqlclient? ( || ( mysql mysqli pdo ) ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysql !mysqli ) sharedmem? ( !threads ) !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )
 SLOT=5.5
 SRC_URI=http://www.php.net/distributions/php-5.5.24.tar.bz2
 _eclasses_=apache-module	5c4c90da2d68c2dc8391666824f1293c	autotools	999c8f6cf5d91495cb0779588f20716c	db-use	82d0e62839f20e1e0d5a2259abd5316f	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=8874449986031b46b34ff54aaacbb552
+_md5_=15463071075723eda16afd0d0ab5f0b8
--- a/metadata/md5-cache/dev-lang/ruby-1.9.3_p551-r1
+++ b/metadata/md5-cache/dev-lang/ruby-1.9.3_p551-r1
@ -4,11 +4,11 @@ DESCRIPTION=An object-oriented scripting language
 EAPI=4
 HOMEPAGE=http://www.ruby-lang.org/
 IUSE=berkdb debug doc examples gdbm ipv6 +rdoc rubytests socks5 ssl xemacs ncurses +readline +yaml
-KEYWORDS=alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=|| ( Ruby-BSD BSD-2 )
 PDEPEND=virtual/rubygems[ruby_targets_ruby19] rdoc? ( >=dev-ruby/rdoc-3.9.4[ruby_targets_ruby19] ) xemacs? ( app-xemacs/ruby-modes )
 RDEPEND=berkdb? ( sys-libs/db ) gdbm? ( sys-libs/gdbm ) ssl? ( dev-libs/openssl ) socks5? ( >=net-proxy/dante-1.1.13 ) ncurses? ( sys-libs/ncurses ) readline? ( sys-libs/readline ) yaml? ( dev-libs/libyaml ) virtual/libffi sys-libs/zlib >=app-eselect/eselect-ruby-20100402 !<dev-ruby/rdoc-3.9.4 !<dev-ruby/rubygems-1.8.10-r1
 SLOT=1.9
 SRC_URI=mirror://ruby/1.9/ruby-1.9.3-p551.tar.bz2 http://dev.gentoo.org/~flameeyes/ruby-team/ruby-patches-1.9.3_p551-r1.tar.bz2
 _eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=e3fff59955a23b7b8dedc149698c4bb1
+_md5_=a629875222d248b7d8c7fe609ba17eb2
--- a/metadata/md5-cache/dev-lang/ruby-2.0.0_p645
+++ b/metadata/md5-cache/dev-lang/ruby-2.0.0_p645
@ -4,11 +4,11 @@ DESCRIPTION=An object-oriented scripting language
 EAPI=5
 HOMEPAGE=http://www.ruby-lang.org/
 IUSE=berkdb debug doc examples gdbm ipv6 +rdoc rubytests socks5 ssl xemacs ncurses +readline cpu_flags_x86_sse2
-KEYWORDS=alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=|| ( Ruby-BSD BSD-2 )
 PDEPEND=virtual/rubygems[ruby_targets_ruby20] >=dev-ruby/json-1.7.7[ruby_targets_ruby20] >=dev-ruby/rake-0.9.6[ruby_targets_ruby20] rdoc? ( >=dev-ruby/rdoc-4.0.0[ruby_targets_ruby20] ) xemacs? ( app-xemacs/ruby-modes )
 RDEPEND=berkdb? ( sys-libs/db ) gdbm? ( sys-libs/gdbm ) ssl? ( dev-libs/openssl ) socks5? ( >=net-proxy/dante-1.1.13 ) ncurses? ( sys-libs/ncurses ) readline? ( sys-libs/readline ) dev-libs/libyaml virtual/libffi sys-libs/zlib >=app-eselect/eselect-ruby-20100402 !<dev-ruby/rdoc-3.9.4 !<dev-ruby/rubygems-1.8.10-r1
 SLOT=2.0
 SRC_URI=mirror://ruby/2.0/ruby-2.0.0-p645.tar.xz http://dev.gentoo.org/~flameeyes/ruby-team/ruby-patches-2.0.0_p645.tar.bz2
 _eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=053ec2882c19c468043350fd2e9a482e
+_md5_=37ecbbb037273e85c3b610a3530565f7
--- a/metadata/md5-cache/dev-libs/libtasn1-4.4
+++ b/metadata/md5-cache/dev-libs/libtasn1-4.4
@ -4,10 +4,10 @@ DESCRIPTION=ASN.1 library
 EAPI=5
 HOMEPAGE=http://www.gnu.org/software/libtasn1/
 IUSE=doc static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=GPL-3 LGPL-2.1
 RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20131008-r16 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0/6
 SRC_URI=mirror://gnu/libtasn1/libtasn1-4.4.tar.gz
 _eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	3727db64c7b960903d5033280f108080	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=c83db7878fc70e0b6c2ad3d164f15955
+_md5_=79f1eb2a49584d28a26c3619b3fcc8bb
--- a/metadata/md5-cache/dev-ml/ocamlnet-4.0.3
+++ b/metadata/md5-cache/dev-ml/ocamlnet-4.0.3
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install
+DEPEND=>=dev-ml/findlib-1.0 pcre? ( >=dev-ml/pcre-ocaml-5:= ) >=dev-lang/ocaml-3.10.2:=[ocamlopt?] tk? ( || ( dev-ml/labltk:= <dev-lang/ocaml-4.02[tk] ) ) ssl? ( net-libs/gnutls:= ) gtk? ( >=dev-ml/lablgtk-2:= ) kerberos? ( virtual/krb5 ) zip? ( dev-ml/camlzip:= ) virtual/pkgconfig >=dev-ml/findlib-1.0.4-r1
+DESCRIPTION=Modules for OCaml application-level Internet protocols
+EAPI=5
+HOMEPAGE=http://projects.camlcity.org/projects/ocamlnet.html
+IUSE=gtk kerberos tk httpd +ocamlopt +pcre ssl zip
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=ZLIB GPL-2+
+RDEPEND=>=dev-ml/findlib-1.0 pcre? ( >=dev-ml/pcre-ocaml-5:= ) >=dev-lang/ocaml-3.10.2:=[ocamlopt?] tk? ( || ( dev-ml/labltk:= <dev-lang/ocaml-4.02[tk] ) ) ssl? ( net-libs/gnutls:= ) gtk? ( >=dev-ml/lablgtk-2:= ) kerberos? ( virtual/krb5 ) zip? ( dev-ml/camlzip:= )
+RESTRICT=installsources
+SLOT=0/4.0.3
+SRC_URI=http://download.camlcity.org/download/ocamlnet-4.0.3.tar.gz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	findlib	9cf6020ee5481f39f1aa566a323f9868	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
+_md5_=ba172e29f9e033d0087487fa383653a6
--- a/metadata/md5-cache/dev-php/PEAR-Archive_Tar-1.3.11
+++ b/metadata/md5-cache/dev-php/PEAR-Archive_Tar-1.3.11
@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=|| ( <dev-lang/php-5.3[pcre] >=dev-lang/php-5.3 ) >=dev-php/PEAR-PEAR-1.8.1
-DESCRIPTION=Tar file management class
-EAPI=4
-HOMEPAGE=http://pear.php.net/package/Archive_Tar
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86
-LICENSE=BSD
-PDEPEND=dev-php/pear
-RDEPEND=|| ( <dev-lang/php-5.3[pcre] >=dev-lang/php-5.3 ) >=dev-php/PEAR-PEAR-1.8.1
-SLOT=0
-SRC_URI=http://pear.php.net/get/Archive_Tar-1.3.11.tgz
-_md5_=b2acf9842aed17877c610caca129fffb
--- a/metadata/md5-cache/dev-php/PEAR-Archive_Tar-1.3.13
+++ b/metadata/md5-cache/dev-php/PEAR-Archive_Tar-1.3.13
@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-lang/php:*[pcre(+)] >=dev-php/PEAR-PEAR-1.8.1
-DESCRIPTION=Tar file management class
-EAPI=5
-HOMEPAGE=http://pear.php.net/package/Archive_Tar
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=BSD
-PDEPEND=dev-php/pear
-RDEPEND=dev-lang/php:*[bzip2,posix,zlib] dev-lang/php:*[pcre(+)] >=dev-php/PEAR-PEAR-1.8.1
-SLOT=0
-SRC_URI=http://pear.php.net/get/Archive_Tar-1.3.13.tgz
-_md5_=46dadca63ce0ec4d1d204faf4060bd6f
--- a/metadata/md5-cache/dev-php/PEAR-Archive_Tar-1.3.15
+++ b/metadata/md5-cache/dev-php/PEAR-Archive_Tar-1.3.15
@ -3,10 +3,10 @@ DEPEND=dev-lang/php:*[pcre(+)] >=dev-php/PEAR-PEAR-1.8.1
 DESCRIPTION=Tar file management class
 EAPI=5
 HOMEPAGE=http://pear.php.net/package/Archive_Tar
-KEYWORDS=~alpha ~amd64 ~arm hppa ~ia64 ppc ~ppc64 ~s390 ~sh ~sparc x86
+KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86
 LICENSE=BSD
 PDEPEND=dev-php/pear
 RDEPEND=dev-lang/php:*[bzip2,posix,zlib] dev-lang/php:*[pcre(+)] >=dev-php/PEAR-PEAR-1.8.1
 SLOT=0
 SRC_URI=http://pear.php.net/get/Archive_Tar-1.3.15.tgz
-_md5_=6770be6f35e336d540e37e282c5b4081
+_md5_=3664271186b2b7edd4f35c49b26b0b81
--- a/metadata/md5-cache/dev-php/PEAR-XML_Util-1.2.1-r2
+++ b/metadata/md5-cache/dev-php/PEAR-XML_Util-1.2.1-r2
@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=|| ( <dev-lang/php-5.3[pcre] >=dev-lang/php-5.3 ) >=dev-php/PEAR-PEAR-1.8.1
-DESCRIPTION=XML utility class
-EAPI=2
-HOMEPAGE=http://pear.php.net/package/XML_Util
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86
-LICENSE=PHP-2.02
-PDEPEND=dev-php/pear
-RDEPEND=|| ( <dev-lang/php-5.3[pcre] >=dev-lang/php-5.3 ) >=dev-php/PEAR-PEAR-1.8.1
-SLOT=0
-SRC_URI=http://pear.php.net/get/XML_Util-1.2.1.tgz
-_md5_=3cf7f4f297a2402cfaceedab316c8fc5
--- a/metadata/md5-cache/dev-php/PEAR-XML_Util-1.2.3-r1
+++ b/metadata/md5-cache/dev-php/PEAR-XML_Util-1.2.3-r1
@ -3,10 +3,10 @@ DEPEND=dev-lang/php:*[pcre(+)] >=dev-php/PEAR-PEAR-1.8.1
 DESCRIPTION=XML utility class
 EAPI=5
 HOMEPAGE=http://pear.php.net/package/XML_Util
-KEYWORDS=~alpha ~amd64 ~arm hppa ~ia64 ppc ~ppc64 ~s390 ~sh ~sparc x86
+KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86
 LICENSE=PHP-2.02
 PDEPEND=dev-php/pear
 RDEPEND=dev-lang/php:*[pcre(+)] >=dev-php/PEAR-PEAR-1.8.1
 SLOT=0
 SRC_URI=http://pear.php.net/get/XML_Util-1.2.3.tgz
-_md5_=7fc927f67637ce0c8aaef2371b21d42a
+_md5_=1e7ef77a2c46d52c33005f0213009ec0
--- a/metadata/md5-cache/dev-php/YAML-1.0.6
+++ b/metadata/md5-cache/dev-php/YAML-1.0.6
@ -1,12 +0,0 @@
-DEFINED_PHASES=install setup
-DEPEND=>=dev-lang/php-5.2.4 >=dev-php/pear-1.4.1 dev-lang/php >=dev-php/pear-1.8.1
-DESCRIPTION=The Symfony YAML Component
-EAPI=4
-HOMEPAGE=http://pear.symfony-project.com
-KEYWORDS=amd64 hppa x86
-LICENSE=MIT
-RDEPEND=>=dev-lang/php-5.2.4 >=dev-php/pear-1.4.1 dev-lang/php >=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=http://pear.symfony-project.com//get/YAML-1.0.6.tgz
-_eclasses_=multilib	3bf24e6abb9b76d9f6c20600f0b716bf	php-pear-r1	6199074ba0005674c2291a5a8d0274e2	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=618806dafeb56446d3683f5822ceeec4
--- a/metadata/md5-cache/dev-php/YAML-1.0.6-r1
+++ b/metadata/md5-cache/dev-php/YAML-1.0.6-r1
@ -3,10 +3,10 @@ DEPEND=dev-lang/php:* >=dev-php/pear-1.9.0
 DESCRIPTION=The Symfony YAML Component
 EAPI=5
 HOMEPAGE=http://pear.symfony-project.com/
-KEYWORDS=~amd64 hppa x86
+KEYWORDS=amd64 hppa x86
 LICENSE=MIT
 RDEPEND=dev-lang/php:* >=dev-php/pear-1.9.0
 SLOT=0
 SRC_URI=http://pear.symfony-project.com/get/YAML-1.0.6.tgz
 _eclasses_=multilib	3bf24e6abb9b76d9f6c20600f0b716bf	php-pear-lib-r1	d953dd90cfa8143851da6736f3fd4c76	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=147509a278df3e97a4d5f8b334c517b7
+_md5_=c72a69e597fd733a7aaa54af545952e7
--- a/metadata/md5-cache/dev-python/requests-2.6.0
+++ b/metadata/md5-cache/dev-python/requests-2.6.0
@ -4,7 +4,7 @@ DESCRIPTION=HTTP library for human beings
 EAPI=5
 HOMEPAGE=http://python-requests.org/ http://pypi.python.org/pypi/requests
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy python_targets_pypy3
-KEYWORDS=alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=Apache-2.0
 RDEPEND=app-misc/ca-certificates >=dev-python/chardet-2.2.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,python_targets_pypy3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-),-python_single_target_pypy3(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy python_targets_pypy3 )
@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/r/requests/requests-2.6.0.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=9cc73c4673efb2d8aef2fd2735c23885
+_md5_=17219c6bbc3733cb08f3c39e5b4a10ca
--- a/metadata/md5-cache/dev-tex/chktex-1.7.3
+++ b/metadata/md5-cache/dev-tex/chktex-1.7.3
@ -11,4 +11,4 @@ REQUIRED_USE=test? ( pcre )
 SLOT=0
 SRC_URI=http://download.savannah.gnu.org/releases/chktex/chktex-1.7.3.tar.gz
 _eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	autotools-utils	3727db64c7b960903d5033280f108080	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=6f36556f059607eb2c681878ebdd82fc
+_md5_=9b96709917df6ed934cd1b0f6b3451a2
--- a/metadata/md5-cache/dev-tex/chktex-1.7.4
+++ b/metadata/md5-cache/dev-tex/chktex-1.7.4
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/latex-base dev-lang/perl pcre? ( dev-libs/libpcre ) sys-apps/groff doc? ( dev-tex/latex2html ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Checks latex source for common mistakes
+EAPI=4
+HOMEPAGE=http://www.nongnu.org/chktex/
+IUSE=debug doc +pcre test
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=GPL-2
+RDEPEND=virtual/latex-base dev-lang/perl pcre? ( dev-libs/libpcre )
+REQUIRED_USE=test? ( pcre )
+SLOT=0
+SRC_URI=http://download.savannah.gnu.org/releases/chktex/chktex-1.7.4.tar.gz
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	autotools-utils	3727db64c7b960903d5033280f108080	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
+_md5_=e10486d1373fa29c2d23fa5efeb6fab6
--- a/metadata/md5-cache/dev-tex/cjk-latex-4.8.2
+++ b/metadata/md5-cache/dev-tex/cjk-latex-4.8.2
@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare unpack
-DEPEND=virtual/latex-base emacs? ( virtual/emacs ) virtual/latex-base >=sys-apps/texinfo-4.2-r5 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A LaTeX 2e macro package which enables the use of CJK scripts in various encodings
-EAPI=4
-HOMEPAGE=http://cjk.ffii.org/
-IUSE=doc emacs
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=virtual/latex-base emacs? ( virtual/emacs ) app-arch/unzip virtual/latex-base
-SLOT=0
-SRC_URI=ftp://ftp.ffii.org/pub/cjk/cjk-4.8.2.tar.gz mirror://gentoo/cjk-4.8.2-fonts.zip doc? ( ftp://ftp.ffii.org/pub/cjk/cjk-4.8.2-doc.tar.gz )
-_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	base	87f7447ccfc06fd0729ff4684e11e0d6	elisp-common	82fe92893adf25f1e5d0db48b0ec4cb3	eutils	9fb270e417e0e83d64ca52586c4a79de	latex-package	999c52f495ebb8dd3b69bda982bb2817	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=44b09410ed1fcb95e1b954d43e075440
--- a/metadata/md5-cache/dev-tex/cjk-latex-4.8.4
+++ b/metadata/md5-cache/dev-tex/cjk-latex-4.8.4
@ -4,10 +4,10 @@ DESCRIPTION=A LaTeX 2e macro package which enables the use of CJK scripts in var
 EAPI=4
 HOMEPAGE=http://cjk.ffii.org/
 IUSE=doc emacs
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=virtual/latex-base emacs? ( virtual/emacs ) app-arch/unzip virtual/latex-base
 SLOT=0
-SRC_URI=ftp://ftp.ffii.org/pub/cjk/cjk-4.8.3.tar.gz mirror://gentoo/cjk-4.8.3-fonts.zip doc? ( ftp://ftp.ffii.org/pub/cjk/cjk-4.8.3-doc.tar.gz )
+SRC_URI=ftp://ftp.ffii.org/pub/cjk/cjk-4.8.4.tar.gz mirror://gentoo/cjk-4.8.4-fonts.zip doc? ( ftp://ftp.ffii.org/pub/cjk/cjk-4.8.4-doc.tar.gz )
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	elisp-common	82fe92893adf25f1e5d0db48b0ec4cb3	eutils	9fb270e417e0e83d64ca52586c4a79de	latex-package	999c52f495ebb8dd3b69bda982bb2817	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=677bf9f9fdbfe50580c90a0d53e038a4
+_md5_=f59edfa9fc856fbc12b1514dd4dd6738
--- a/metadata/md5-cache/dev-tex/latexmk-437
+++ b/metadata/md5-cache/dev-tex/latexmk-437
@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=virtual/latex-base dev-lang/perl app-arch/unzip
-DESCRIPTION=Perl script for automatically building LaTeX documents
-EAPI=5
-HOMEPAGE=http://www.phys.psu.edu/~collins/software/latexmk/
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=GPL-2
-RDEPEND=virtual/latex-base dev-lang/perl
-SLOT=0
-SRC_URI=http://www.phys.psu.edu/~collins/software/latexmk/latexmk-437.zip
-_eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=0df1415308854f0e6ca5509fed4dc5a2
--- a/metadata/md5-cache/dev-tex/latexmk-443a
+++ b/metadata/md5-cache/dev-tex/latexmk-443a
@ -7,6 +7,6 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=virtual/latex-base dev-lang/perl
 SLOT=0
-SRC_URI=http://www.phys.psu.edu/~collins/software/latexmk/latexmk-439.zip
+SRC_URI=http://www.phys.psu.edu/~collins/software/latexmk/latexmk-443a.zip
 _eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=da3d3daf45a4ff670221a2031a4ac8e4
+_md5_=42ff374bcf75ca3b6910849f436b3662
--- a/metadata/md5-cache/dev-util/meld-3.12.2
+++ b/metadata/md5-cache/dev-util/meld-3.12.2
@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-lang/python-2.7.5-r2:2.7[xml] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=dev-libs/glib-2.34:2 dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=dev-python/pygobject-3.8:3[cairo,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] gnome-base/gsettings-desktop-schemas >=x11-libs/gtk+-3.6:3[introspection] >=x11-libs/gtksourceview-3.6:3.0[introspection] x11-themes/hicolor-icon-theme sys-devel/gettext dev-util/intltool dev-util/itstool app-arch/xz-utils >=sys-apps/sed-4 >=dev-lang/python-2.7.5-r2:2.7[xml] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)]
+DEPEND=>=dev-lang/python-2.7.5-r2:2.7[xml] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=dev-libs/glib-2.36:2 dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=dev-python/pygobject-3.8:3[cairo,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] gnome-base/gsettings-desktop-schemas >=x11-libs/gtk+-3.6:3[introspection] >=x11-libs/gtksourceview-3.6:3.0[introspection] x11-themes/hicolor-icon-theme sys-devel/gettext dev-util/intltool dev-util/itstool app-arch/xz-utils >=sys-apps/sed-4 >=dev-lang/python-2.7.5-r2:2.7[xml] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)]
 DESCRIPTION=A graphical diff and merge tool
 EAPI=5
 HOMEPAGE=http://meldmerge.org/
 IUSE=python_targets_python2_7
 KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
-RDEPEND=>=dev-lang/python-2.7.5-r2:2.7[xml] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=dev-libs/glib-2.34:2 dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=dev-python/pygobject-3.8:3[cairo,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] gnome-base/gsettings-desktop-schemas >=x11-libs/gtk+-3.6:3[introspection] >=x11-libs/gtksourceview-3.6:3.0[introspection] x11-themes/hicolor-icon-theme >=dev-lang/python-2.7.5-r2:2.7[xml] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)]
+RDEPEND=>=dev-lang/python-2.7.5-r2:2.7[xml] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=dev-libs/glib-2.36:2 dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=dev-python/pygobject-3.8:3[cairo,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] gnome-base/gsettings-desktop-schemas >=x11-libs/gtk+-3.6:3[introspection] >=x11-libs/gtksourceview-3.6:3.0[introspection] x11-themes/hicolor-icon-theme >=dev-lang/python-2.7.5-r2:2.7[xml] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)]
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=mirror://gnome/sources/meld/3.12/meld-3.12.2.tar.xz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=8b02dd6f952bc8df866183694a5cacbd
+_md5_=39e32ac3737cac960c077411f7f5a95c
--- a/metadata/md5-cache/dev-util/meld-3.12.3
+++ b/metadata/md5-cache/dev-util/meld-3.12.3
@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-lang/python-2.7.5-r2:2.7[xml] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=dev-libs/glib-2.34:2 dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=dev-python/pygobject-3.8:3[cairo,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] gnome-base/gsettings-desktop-schemas >=x11-libs/gtk+-3.6:3[introspection] >=x11-libs/gtksourceview-3.6:3.0[introspection] x11-themes/hicolor-icon-theme dev-util/intltool dev-util/itstool sys-devel/gettext app-arch/xz-utils >=sys-apps/sed-4 >=dev-lang/python-2.7.5-r2:2.7[xml] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)]
+DEPEND=>=dev-lang/python-2.7.5-r2:2.7[xml] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=dev-libs/glib-2.36:2 dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=dev-python/pygobject-3.8:3[cairo,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] gnome-base/gsettings-desktop-schemas >=x11-libs/gtk+-3.6:3[introspection] >=x11-libs/gtksourceview-3.6:3.0[introspection] x11-themes/hicolor-icon-theme dev-util/intltool dev-util/itstool sys-devel/gettext app-arch/xz-utils >=sys-apps/sed-4 >=dev-lang/python-2.7.5-r2:2.7[xml] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)]
 DESCRIPTION=A graphical diff and merge tool
 EAPI=5
 HOMEPAGE=http://meldmerge.org/
 IUSE=python_targets_python2_7
 KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
-RDEPEND=>=dev-lang/python-2.7.5-r2:2.7[xml] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=dev-libs/glib-2.34:2 dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=dev-python/pygobject-3.8:3[cairo,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] gnome-base/gsettings-desktop-schemas >=x11-libs/gtk+-3.6:3[introspection] >=x11-libs/gtksourceview-3.6:3.0[introspection] x11-themes/hicolor-icon-theme >=dev-lang/python-2.7.5-r2:2.7[xml] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)]
+RDEPEND=>=dev-lang/python-2.7.5-r2:2.7[xml] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=dev-libs/glib-2.36:2 dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] >=dev-python/pygobject-3.8:3[cairo,python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)] gnome-base/gsettings-desktop-schemas >=x11-libs/gtk+-3.6:3[introspection] >=x11-libs/gtksourceview-3.6:3.0[introspection] x11-themes/hicolor-icon-theme >=dev-lang/python-2.7.5-r2:2.7[xml] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_5(-),-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),python_single_target_python2_7(+)]
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=mirror://gnome/sources/meld/3.12/meld-3.12.3.tar.xz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=2c7b2ab9dbbdd5891d131f236ed9c1a8
+_md5_=c1e21e136e9b27f7c0d828850a218047
--- a/metadata/md5-cache/dev-vcs/mercurial-3.3.2
+++ b/metadata/md5-cache/dev-vcs/mercurial-3.3.2
@ -4,11 +4,11 @@ DESCRIPTION=Scalable distributed SCM
 EAPI=5
 HOMEPAGE=http://mercurial.selenic.com/
 IUSE=bugzilla emacs gpg test tk python_targets_python2_7
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=bugzilla? ( dev-python/mysql-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gpg? ( app-crypt/gnupg ) tk? ( dev-lang/tk ) app-misc/ca-certificates python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://mercurial.selenic.com/release/mercurial-3.3.2.tar.gz
 _eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	distutils-r1	c01d5c4af34f4a37a51fc9638299c222	elisp-common	82fe92893adf25f1e5d0db48b0ec4cb3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=7dc75f94eef7d64de9e7a946da8cf998
+_md5_=b922c735b816fdb2981d171dec3727fc
--- a/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.8.0
+++ b/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.8.0
@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.8 >=kde-frameworks/ki18n-5.8 >=kde-frameworks/kio-5.8 dev-qt/qtxml:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.8 doc? ( >=kde-frameworks/kapidox-5.8 app-doc/doxygen ) test? ( >=dev-qt/qttest-5.4.1:5 ) >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kcoreaddons-5.8 >=kde-frameworks/ki18n-5.8 >=kde-frameworks/kio-5.8 dev-qt/qtxml:5 !<kde-plasma/plasma-workspace-5.2.95 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.8 doc? ( >=kde-frameworks/kapidox-5.8 app-doc/doxygen ) test? ( >=dev-qt/qttest-5.4.1:5 ) >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Framework providing client-side support for the XML-RPC protocol
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=doc debug test
 KEYWORDS=~amd64
 LICENSE=BSD-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.8 >=kde-frameworks/ki18n-5.8 >=kde-frameworks/kio-5.8 dev-qt/qtxml:5 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
+RDEPEND=>=kde-frameworks/kcoreaddons-5.8 >=kde-frameworks/ki18n-5.8 >=kde-frameworks/kio-5.8 dev-qt/qtxml:5 !<kde-plasma/plasma-workspace-5.2.95 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
 SLOT=5/5.8
 SRC_URI=mirror://kde/stable/frameworks/5.8/kxmlrpcclient-5.8.0.tar.xz
 _eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	37cffb3dabdcf4e2868319abe52df014	kde5-functions	dfc28407fa320e8dacf9c2f3beefa93f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=c617ecd7c87da115d20aec7a2accc25b
+_md5_=7a311b55037df579d84720c2d792755d
--- a/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.9.0
+++ b/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.9.0
@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.9 >=kde-frameworks/ki18n-5.9 >=kde-frameworks/kio-5.9 dev-qt/qtxml:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.9 doc? ( >=kde-frameworks/kapidox-5.9 app-doc/doxygen ) test? ( >=dev-qt/qttest-5.4.1:5 ) >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kcoreaddons-5.9 >=kde-frameworks/ki18n-5.9 >=kde-frameworks/kio-5.9 dev-qt/qtxml:5 !<kde-plasma/plasma-workspace-5.2.95 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.9 doc? ( >=kde-frameworks/kapidox-5.9 app-doc/doxygen ) test? ( >=dev-qt/qttest-5.4.1:5 ) >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Framework providing client-side support for the XML-RPC protocol
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=doc debug test
 KEYWORDS=~amd64
 LICENSE=BSD-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.9 >=kde-frameworks/ki18n-5.9 >=kde-frameworks/kio-5.9 dev-qt/qtxml:5 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
+RDEPEND=>=kde-frameworks/kcoreaddons-5.9 >=kde-frameworks/ki18n-5.9 >=kde-frameworks/kio-5.9 dev-qt/qtxml:5 !<kde-plasma/plasma-workspace-5.2.95 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
 SLOT=5/5.9
 SRC_URI=mirror://kde/stable/frameworks/5.9/kxmlrpcclient-5.9.0.tar.xz
 _eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	37cffb3dabdcf4e2868319abe52df014	kde5-functions	dfc28407fa320e8dacf9c2f3beefa93f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=93d51f1074aefdcd3ca877fbd8b15b1c
+_md5_=7043a2fdbb294cc6f78dc93bf55997be
--- a/metadata/md5-cache/kde-misc/plasma-nm-0.9.3.5
+++ b/metadata/md5-cache/kde-misc/plasma-nm-0.9.3.5
@ -10,4 +10,4 @@ RDEPEND=>=net-libs/libnm-qt-0.9.8.2[modemmanager?] net-misc/mobile-broadband-pro
 SLOT=4
 SRC_URI=mirror://kde/stable/plasma-nm/plasma-nm-0.9.3.5.tar.xz
 _eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c263990f1b677b0f0be0a3299f179762	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde4-base	7c90856593f1c0e52c66a533c4c9a8b7	kde4-functions	99e770658f27aaf2c8a5850af7598b18	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=8ae961011bc246d298e47c4bc13b13e4
+_md5_=d07cf16d9061ff47e438dafd8147d70f
--- a/metadata/md5-cache/mail-client/thunderbird-31.6.0
+++ b/metadata/md5-cache/mail-client/thunderbird-31.6.0
--- a/metadata/md5-cache/media-gfx/pstoedit-3.70
+++ b/metadata/md5-cache/media-gfx/pstoedit-3.70
@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=>=media-libs/gd-2.0.35-r1 >=app-text/ghostscript-gpl-8.71-r1 emf? ( >=media-libs/libemf-1.0.3 ) flash? ( >=media-libs/ming-0.4.3 ) imagemagick? ( >=media-gfx/imagemagick-6.6.1.2[cxx] ) plotutils? ( media-libs/plotutils ) pptx? ( dev-libs/libzip ) virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Translate PostScript and PDF graphics into other vector formats
+EAPI=5
+HOMEPAGE=http://sourceforge.net/projects/pstoedit/
+IUSE=emf flash imagemagick plotutils pptx static-libs
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=>=media-libs/gd-2.0.35-r1 >=app-text/ghostscript-gpl-8.71-r1 emf? ( >=media-libs/libemf-1.0.3 ) flash? ( >=media-libs/ming-0.4.3 ) imagemagick? ( >=media-gfx/imagemagick-6.6.1.2[cxx] ) plotutils? ( media-libs/plotutils ) pptx? ( dev-libs/libzip )
+SLOT=0
+SRC_URI=mirror://sourceforge/pstoedit/pstoedit-3.70.tar.gz
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
+_md5_=971302e3f72a8bf11af476ee4d717b86
--- a/metadata/md5-cache/media-libs/liblo-0.28
+++ b/metadata/md5-cache/media-libs/liblo-0.28
@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=doc? ( app-doc/doxygen ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Lightweight OSC (Open Sound Control) implementation
+EAPI=5
+HOMEPAGE=http://plugin.org.uk/liblo
+IUSE=doc ipv6 static-libs
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~ppc-macos
+LICENSE=LGPL-2.1
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://sourceforge/liblo/liblo-0.28.tar.gz
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
+_md5_=b2efe5417bfcfb03f31e21944389db56
--- a/metadata/md5-cache/media-libs/nas-1.9.4-r1
+++ b/metadata/md5-cache/media-libs/nas-1.9.4-r1
@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libXau-1.0.7-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(-)?] x11-libs/libXaw x11-libs/libXext x11-libs/libXmu x11-libs/libXpm >=x11-libs/libXt-1.1.4[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(-)?] app-text/rman sys-devel/bison sys-devel/flex x11-misc/gccmakedep x11-misc/imake >=x11-proto/xproto-7.0.24[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(-)?]
+DESCRIPTION=Network Audio System
+EAPI=5
+HOMEPAGE=http://radscan.com/nas.html
+IUSE=doc static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
+LICENSE=HPND MIT
+RDEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libXau-1.0.7-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(-)?] x11-libs/libXaw x11-libs/libXext x11-libs/libXmu x11-libs/libXpm >=x11-libs/libXt-1.1.4[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
+SRC_URI=mirror://sourceforge/nas/nas-1.9.4.src.tar.gz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
+_md5_=56b0e48b969ad8d97a69957351c1d61f
--- a/metadata/md5-cache/net-dns/dnsmasq-2.72-r2
+++ b/metadata/md5-cache/net-dns/dnsmasq-2.72-r2
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare pretend setup
+DEPEND=dbus? ( sys-apps/dbus ) idn? ( net-dns/libidn ) lua? ( || ( dev-lang/lua:0 dev-lang/lua:5.1 ) ) conntrack? ( !s390? ( net-libs/libnetfilter_conntrack ) ) nls? ( sys-devel/gettext net-dns/libidn ) app-arch/xz-utils dnssec? ( dev-libs/nettle[gmp] static? ( dev-libs/nettle[static-libs(+)] ) ) virtual/pkgconfig virtual/pkgconfig
+DESCRIPTION=Small forwarding DNS server
+EAPI=5
+HOMEPAGE=http://www.thekelleys.org.uk/dnsmasq/
+IUSE=auth-dns conntrack dbus +dhcp dhcp-tools dnssec idn ipv6 lua nls script selinux static tftp linguas_de linguas_es linguas_fi linguas_fr linguas_id linguas_it linguas_no linguas_pl linguas_pt_BR linguas_ro
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
+LICENSE=|| ( GPL-2 GPL-3 )
+RDEPEND=dbus? ( sys-apps/dbus ) idn? ( net-dns/libidn ) lua? ( || ( dev-lang/lua:0 dev-lang/lua:5.1 ) ) conntrack? ( !s390? ( net-libs/libnetfilter_conntrack ) ) nls? ( sys-devel/gettext net-dns/libidn ) dnssec? ( !static? ( dev-libs/nettle[gmp] ) ) selinux? ( sec-policy/selinux-dnsmasq )
+REQUIRED_USE=dhcp-tools? ( dhcp ) lua? ( script ) s390? ( !conntrack )
+SLOT=0
+SRC_URI=http://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.72.tar.xz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	user	f54e098dd38ba1c0847a13e685b87747
+_md5_=7b8946f3c72b2831b6afe4d3c5196ba7
--- a/metadata/md5-cache/net-misc/chrony-1.31.1
+++ b/metadata/md5-cache/net-misc/chrony-1.31.1
@ -4,7 +4,7 @@ DESCRIPTION=NTP client and server programs
 EAPI=5
 HOMEPAGE=http://chrony.tuxfamily.org/
 IUSE=caps ipv6 libedit readline +rtc selinux
-KEYWORDS=amd64 ~arm hppa ~mips ppc ppc64 ~sparc x86
+KEYWORDS=amd64 ~arm hppa ~mips ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=caps? ( sys-libs/libcap ) libedit? ( dev-libs/libedit ) readline? ( >=sys-libs/readline-4.1-r4 ) selinux? ( sec-policy/selinux-chronyd )
 REQUIRED_USE=?? ( libedit readline )
@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://download.tuxfamily.org/chrony/chrony-1.31.1.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=7efc8fb370114aeb14e4d2189c218bba
+_md5_=9ad88a7b7d4df6b60402ca954ebd50a9
--- a/metadata/md5-cache/net-misc/curl-7.42.0
+++ b/metadata/md5-cache/net-misc/curl-7.42.0
@ -4,7 +4,7 @@ DESCRIPTION=A Client that groks URLs
 EAPI=5
 HOMEPAGE=http://curl.haxx.se/
 IUSE=adns idn ipv6 kerberos ldap metalink rtmp samba ssh ssl static-libs test threads curl_ssl_axtls curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl curl_ssl_polarssl curl_ssl_winssl elibc_Winnt 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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ldap? ( >=net-nds/openldap-2.4.38-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(-)?] ) ssl? ( curl_ssl_axtls? ( >=net-libs/axtls-1.4.9-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(-)?] app-misc/ca-certificates ) curl_ssl_gnutls? ( || ( ( >=net-libs/gnutls-3.2.15[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/nettle-2.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(-)?] ) ( =net-libs/gnutls-2.12*[nettle,static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/nettle-2.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(-)?] ) ( =net-libs/gnutls-2.12*[-nettle,static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libgcrypt-1.5.3[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) app-misc/ca-certificates ) curl_ssl_openssl? ( >=dev-libs/openssl-1.0.1h-r2[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) curl_ssl_nss? ( >=dev-libs/nss-3.15.4[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(-)?] app-misc/ca-certificates ) curl_ssl_polarssl? ( >=net-libs/polarssl-1.3.4:=[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(-)?] app-misc/ca-certificates ) ) idn? ( >=net-dns/libidn-1.28[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) adns? ( >=net-dns/c-ares-1.10.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(-)?] ) kerberos? ( >=virtual/krb5-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(-)?] ) metalink? ( >=media-libs/libmetalink-0.1.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(-)?] ) rtmp? ( >=media-video/rtmpdump-2.4_p20131018[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(-)?] ) ssh? ( >=net-libs/libssh2-1.4.3[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=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(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r13 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 REQUIRED_USE=curl_ssl_winssl? ( elibc_Winnt ) threads? ( !adns ) ssl? ( ^^ ( curl_ssl_axtls curl_ssl_gnutls curl_ssl_openssl curl_ssl_nss curl_ssl_polarssl curl_ssl_winssl ) )
@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://curl.haxx.se/download/curl-7.42.0.tar.bz2
 _eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=933735f28bd2f2d6684c0b2b58224fd4
+_md5_=0ac0c8d81669a04ed47a9776d4a9fb3a
--- a/metadata/md5-cache/net-misc/curl-7.42.1
+++ b/metadata/md5-cache/net-misc/curl-7.42.1
@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=ldap? ( >=net-nds/openldap-2.4.38-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(-)?] ) ssl? ( curl_ssl_axtls? ( >=net-libs/axtls-1.4.9-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(-)?] app-misc/ca-certificates ) curl_ssl_gnutls? ( || ( ( >=net-libs/gnutls-3.2.15[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/nettle-2.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(-)?] ) ( =net-libs/gnutls-2.12*[nettle,static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/nettle-2.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(-)?] ) ( =net-libs/gnutls-2.12*[-nettle,static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libgcrypt-1.5.3[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) app-misc/ca-certificates ) curl_ssl_openssl? ( >=dev-libs/openssl-1.0.1h-r2[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) curl_ssl_nss? ( >=dev-libs/nss-3.15.4[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(-)?] app-misc/ca-certificates ) curl_ssl_polarssl? ( >=net-libs/polarssl-1.3.4:=[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(-)?] app-misc/ca-certificates ) ) idn? ( >=net-dns/libidn-1.28[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) adns? ( >=net-dns/c-ares-1.10.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(-)?] ) kerberos? ( >=virtual/krb5-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(-)?] ) metalink? ( >=media-libs/libmetalink-0.1.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(-)?] ) rtmp? ( >=media-video/rtmpdump-2.4_p20131018[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(-)?] ) ssh? ( >=net-libs/libssh2-1.4.3[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=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(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r13 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) >=virtual/pkgconfig-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(-)?] test? ( sys-apps/diffutils dev-lang/perl ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=A Client that groks URLs
+EAPI=5
+HOMEPAGE=http://curl.haxx.se/
+IUSE=adns idn ipv6 kerberos ldap metalink rtmp samba ssh ssl static-libs test threads curl_ssl_axtls curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl curl_ssl_polarssl curl_ssl_winssl elibc_Winnt 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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=ldap? ( >=net-nds/openldap-2.4.38-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(-)?] ) ssl? ( curl_ssl_axtls? ( >=net-libs/axtls-1.4.9-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(-)?] app-misc/ca-certificates ) curl_ssl_gnutls? ( || ( ( >=net-libs/gnutls-3.2.15[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/nettle-2.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(-)?] ) ( =net-libs/gnutls-2.12*[nettle,static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/nettle-2.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(-)?] ) ( =net-libs/gnutls-2.12*[-nettle,static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libgcrypt-1.5.3[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) app-misc/ca-certificates ) curl_ssl_openssl? ( >=dev-libs/openssl-1.0.1h-r2[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) curl_ssl_nss? ( >=dev-libs/nss-3.15.4[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(-)?] app-misc/ca-certificates ) curl_ssl_polarssl? ( >=net-libs/polarssl-1.3.4:=[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(-)?] app-misc/ca-certificates ) ) idn? ( >=net-dns/libidn-1.28[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) adns? ( >=net-dns/c-ares-1.10.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(-)?] ) kerberos? ( >=virtual/krb5-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(-)?] ) metalink? ( >=media-libs/libmetalink-0.1.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(-)?] ) rtmp? ( >=media-video/rtmpdump-2.4_p20131018[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(-)?] ) ssh? ( >=net-libs/libssh2-1.4.3[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=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(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r13 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
+REQUIRED_USE=curl_ssl_winssl? ( elibc_Winnt ) threads? ( !adns ) ssl? ( ^^ ( curl_ssl_axtls curl_ssl_gnutls curl_ssl_openssl curl_ssl_nss curl_ssl_polarssl curl_ssl_winssl ) )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://curl.haxx.se/download/curl-7.42.1.tar.bz2
+_eclasses_=autotools	999c8f6cf5d91495cb0779588f20716c	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
+_md5_=5292db161134dcd6f6d46d734962a715
--- a/metadata/md5-cache/sci-mathematics/cado-nfs-2.1.1
+++ b/metadata/md5-cache/sci-mathematics/cado-nfs-2.1.1
@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/gmp dev-lang/perl !sci-mathematics/ggnfs !sci-biology/shrimp sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+DESCRIPTION=Number Field Sieve (NFS) implementation for factoring integers
+EAPI=4
+HOMEPAGE=http://cado-nfs.gforge.inria.fr/
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=dev-libs/gmp dev-lang/perl !sci-mathematics/ggnfs !sci-biology/shrimp
+RESTRICT=test
+SLOT=0
+SRC_URI=https://gforge.inria.fr/frs/download.php/file/34110/cado-nfs-2.1.1.tar.gz
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c263990f1b677b0f0be0a3299f179762	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
+_md5_=e1335722dac7284d08559e43185b10c8
--- a/metadata/md5-cache/sci-mathematics/yafu-9999
+++ b/metadata/md5-cache/sci-mathematics/yafu-9999
@ -8,4 +8,4 @@ LICENSE=public-domain
 RDEPEND=dev-libs/gmp sci-mathematics/gmp-ecm sieve? ( sci-mathematics/msieve sci-mathematics/ggnfs )
 SLOT=0
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	subversion	c12bdf4fcc82f86ad89b14c8f76c4026	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=34a749958884014df9898b54dcca7773
+_md5_=7bdf9461c34af798a721d77c1340c5fc
--- a/metadata/md5-cache/sys-fs/udev-init-scripts-9999
+++ b/metadata/md5-cache/sys-fs/udev-init-scripts-9999
@ -8,4 +8,4 @@ RDEPEND=>=virtual/udev-180 !<sys-fs/udev-186 !<sys-apps/openrc-0.13
 RESTRICT=test
 SLOT=0
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	git-r3	3a2bd0ae504c33a50061885480f3def3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92
-_md5_=7d534e13d1a9e6f20e1c5e3df539eef2
+_md5_=3575975763bea0bc521682f01c55e870
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-3.14.40
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-3.14.40
@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 3.14 kernel tree
+EAPI=5
+HOMEPAGE=http://dev.gentoo.org/~mpagano/genpatches
+IUSE=deblob experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 freedist
+PDEPEND=!build? ( virtual/dev-manager )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=3.14.40
+SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.14.tar.xz mirror://gentoo/genpatches-3.14-46.base.tar.xz mirror://gentoo/genpatches-3.14-46.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.14-46.experimental.tar.xz )
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	d38b702cdd3e6429d33d00f4a4f660cb	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=ec18e62a1b18a073aca03eb01c5fbbb8
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-3.19.6
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-3.19.6
@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 3.19 kernel tree
+EAPI=5
+HOMEPAGE=http://dev.gentoo.org/~mpagano/genpatches
+IUSE=deblob experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 freedist
+PDEPEND=!build? ( virtual/dev-manager )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=3.19.6
+SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.19.tar.xz mirror://gentoo/genpatches-3.19-7.base.tar.xz mirror://gentoo/genpatches-3.19-7.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.19-7.experimental.tar.xz )
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	d38b702cdd3e6429d33d00f4a4f660cb	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=2f0a478164792a368b7c8cea29de8669
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.0.1
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.0.1
@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.0 kernel tree
+EAPI=5
+HOMEPAGE=http://dev.gentoo.org/~mpagano/genpatches
+IUSE=deblob experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 freedist
+PDEPEND=!build? ( virtual/dev-manager )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=4.0.1
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.0.tar.xz mirror://gentoo/genpatches-4.0-2.base.tar.xz mirror://gentoo/genpatches-4.0-2.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.0-2.experimental.tar.xz )
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	d38b702cdd3e6429d33d00f4a4f660cb	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=f03baf5ce3a889f8b1aeba5af822f5e1
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-3.10.76
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-3.10.76
@ -9,7 +9,7 @@ LICENSE=GPL-2 freedist
 PDEPEND=!build? ( virtual/dev-manager )
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
-SLOT=3.10.75
-SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.10.75.xz mirror://kernel/linux/kernel/v3.x/linux-3.10.tar.xz
+SLOT=3.10.76
+SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.10.76.xz mirror://kernel/linux/kernel/v3.x/linux-3.10.tar.xz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	d38b702cdd3e6429d33d00f4a4f660cb	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=79ec5729b8cc10188b0950491ce40a83
+_md5_=86b66b2643a09651c509019604150332
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-3.14.40
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-3.14.40
@ -9,7 +9,7 @@ LICENSE=GPL-2 freedist
 PDEPEND=!build? ( virtual/dev-manager )
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
-SLOT=3.14.39
-SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.14.39.xz mirror://kernel/linux/kernel/v3.x/linux-3.14.tar.xz
+SLOT=3.14.40
+SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.14.40.xz mirror://kernel/linux/kernel/v3.x/linux-3.14.tar.xz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	d38b702cdd3e6429d33d00f4a4f660cb	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=d340ac8b7c5083ff5ae80ce47c96fa01
+_md5_=cc41b1991178c243426d8d2560202c82
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-3.19.6
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-3.19.6
@ -9,7 +9,7 @@ LICENSE=GPL-2 freedist
 PDEPEND=!build? ( virtual/dev-manager )
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
-SLOT=3.19.5
-SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.19.5.xz mirror://kernel/linux/kernel/v3.x/linux-3.19.tar.xz
+SLOT=3.19.6
+SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.19.6.xz mirror://kernel/linux/kernel/v3.x/linux-3.19.tar.xz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	d38b702cdd3e6429d33d00f4a4f660cb	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=d19fcddc66dd3d59bbff5a4ff5425767
+_md5_=555e3f29921a4e4b8a482c03118c8c13
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.0.1
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.0.1
@ -9,7 +9,7 @@ LICENSE=GPL-2 freedist
 PDEPEND=!build? ( virtual/dev-manager )
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
-SLOT=4.0.0
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.0.tar.xz
+SLOT=4.0.1
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.0.1.xz mirror://kernel/linux/kernel/v4.x/linux-4.0.tar.xz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	d38b702cdd3e6429d33d00f4a4f660cb	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	c961250d50160cd37d6b7fd9e8429c92	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=82273e62f87dfebd6ce79ce07c23a937
+_md5_=ce248b3279e6890977791859a6451865
--- a/metadata/md5-cache/www-client/firefox-31.6.0
+++ b/metadata/md5-cache/www-client/firefox-31.6.0
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@ -1 +1 @@
-Wed, 29 Apr 2015 07:07:08 +0000
+Wed, 29 Apr 2015 17:37:03 +0000
--- a/metadata/timestamp
+++ b/metadata/timestamp
@ -1 +1 @@
-Wed Apr 29 07:07:05 UTC 2015
+Wed Apr 29 17:36:59 UTC 2015
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@ -1 +1 @@
-Wed, 29 Apr 2015 07:30:01 +0000
+Wed, 29 Apr 2015 18:00:01 +0000
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@ -1 +1 @@
-1430291101 Wed 29 Apr 2015 07:05:01 AM UTC
+1430328901 Wed 29 Apr 2015 05:35:01 PM UTC
--- a/Show More
+++ b/Show More