Sync with portage [Fri Dec 9 08:47:00 MSK 2016].

8 years ago · c7563788b0
parent ddb43bc925
commit c7563788b0
114 changed files with 2198 additions and 1058 deletions
--- a/app-emulation/libvirt/libvirt-2.4.0-r1.ebuild
+++ b/app-emulation/libvirt/libvirt-2.4.0-r1.ebuild
@ -284,7 +284,7 @@ src_configure() {
 		$(use_with wireshark-plugins wireshark-dissector)
 		$(use_with xen)
 		$(use_with xen xen-inotify)
-		$(usex xen --with-libxl '')
+		$(use_with xen libxl)
 		$(use_with zeroconf avahi)
 		$(use_with zfs storage-zfs)

--- a/app-emulation/libvirt/metadata.xml
+++ b/app-emulation/libvirt/metadata.xml
@ -92,7 +92,7 @@
 		Enable GlusterFS support via <pkg>sys-cluster/glusterfs</pkg>
 	</flag>
 	<flag name="zfs">
-		Enable ZFS backend storage<pkg>sys-fs/zfs</pkg>
+		Enable ZFS backend storage <pkg>sys-fs/zfs</pkg>
 	</flag>
 </use>
 </pkgmetadata>
--- a/app-shells/mpv-bash-completion/Manifest
+++ b/app-shells/mpv-bash-completion/Manifest
@ -1,2 +1,2 @@
 DIST mpv-bash-completion-0.17.tar.gz 15033 SHA256 a4c3be027ec52fef684a545a43c05f32cf512da93ae4a569d273e6e182b90ab1 SHA512 851a9f2b5e54f176fc7519a5fceace2b3281bef4062a48e108f17b83ccbd53e7b7545969be9cbccd3f093ba9ee65bd6736650f1b4d88997808a8b1df40d769eb WHIRLPOOL ba077f686d2e9ba4e819cf30f17cdca5b98b321e6c39b72a3bd7c1f5269da3d20abe7f610838a51b941fdba8c6636fc3eaae81f07fcd08f8f61f6262d2d0fab5
-DIST mpv-bash-completion-3.3.6.tar.gz 18683 SHA256 81928813f380d2841f56e94471c2c66f2c11c0d39ca5f2c20fbbfb7a7cb47ca5 SHA512 70de2955c8c9f386cf3d7ea0c5f52e4fcf1ce70325556c889a4d07295e591fd557ea60e16906f00ca03c56927853ac8eda6f5e69cbd2b43069ced4c0a06d1008 WHIRLPOOL 9f6347d8fccef5c6adbcd0fb8d87791ecbf090f7cb13219e0565c2bdfe86ea8cd43bc2dc5038257bc0d55ffa4b37a1896dc4b24edb938d22427e496403ad822c
+DIST mpv-bash-completion-3.3.7.tar.gz 18986 SHA256 8eb7f516539b0a1b9221088ba0e6676bda63746432ce1c7ec7a2dd91c3dff766 SHA512 927aae0a720c562046cdeda6cedd1dccda45c27789a421e538039c3e1f99d4dc6825a87b1d4493ca9508f32a7b810ff47a7f65e61ef4e53da1aae4ecfe3a5d8d WHIRLPOOL 9fdf1c857243f6b965f95fe7f4e9cd835808f95b05a8d07c23469d6af06eb5f589b19a4d8685fcb2ef0bdf1386540e3a1b7f106808668a91b2e7c90eeb4da120
--- a/app-shells/mpv-bash-completion/mpv-bash-completion-3.3.7.ebuild
+++ b/app-shells/mpv-bash-completion/mpv-bash-completion-3.3.7.ebuild
--- a/app-shells/scsh-install-lib/scsh-install-lib-1.3.0-r1.ebuild
+++ b/app-shells/scsh-install-lib/scsh-install-lib-1.3.0-r1.ebuild
@ -0,0 +1,30 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit scsh
+
+DESCRIPTION="Installation tool for the Scheme Untergrund Library"
+HOMEPAGE="http://lamp.epfl.ch/~schinz/scsh_packages/"
+SRC_URI="http://lamp.epfl.ch/~schinz/scsh_packages/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=">=app-shells/scsh-0.6.6"
+
+src_prepare() {
+	default
+}
+
+src_install() {
+	dodir "${SCSH_MODULES_PATH}"
+	./install.scm ${SCSH_LAYOUT_CONF} \
+	  --bindir /usr/bin \
+	  --force \
+	  || die "./install.scm failed"
+}
--- a/app-shells/scsh/files/0.6.7-Makefile.in-LDFLAGS.patch
+++ b/app-shells/scsh/files/0.6.7-Makefile.in-LDFLAGS.patch
@ -1,5 +1,5 @@
--- Makefile.in.orig	2010-08-11 16:55:09.246939884 +0200
-+++ Makefile.in	2010-08-11 16:55:31.309819842 +0200
+--- a/Makefile.in.orig	2010-08-11 16:55:09.246939884 +0200
+++ b/Makefile.in	2010-08-11 16:55:31.309819842 +0200
@@ -853,7 +853,7 @@
 cig/libcig.c:		cig/libcig.scm
 
--- a/app-shells/scsh/files/0.6.7-Makefile.in-doc-dir-gentoo.patch
+++ b/app-shells/scsh/files/0.6.7-Makefile.in-doc-dir-gentoo.patch
@ -1,5 +1,5 @@
--- Makefile.in.orig	2004-09-24 01:43:55.743685848 +0200
-+++ Makefile.in	2004-09-24 01:43:55.745685544 +0200
+--- a/Makefile.in.orig	2004-09-24 01:43:55.743685848 +0200
+++ b/Makefile.in	2004-09-24 01:43:55.745685544 +0200
@@ -33,7 +33,7 @@
 host = @host@
 ### End of `configure' section###
--- a/app-shells/scsh/scsh-0.6.7-r2.ebuild
+++ b/app-shells/scsh/scsh-0.6.7-r2.ebuild
@ -0,0 +1,49 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit multilib
+
+MY_PV="${PV%*.*}"
+
+DESCRIPTION="Unix shell embedded in Scheme"
+HOMEPAGE="http://www.scsh.net/"
+SRC_URI="ftp://ftp.scsh.net/pub/scsh/${MY_PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND="!dev-scheme/scheme48"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PV}-Makefile.in-doc-dir-gentoo.patch"
+	"${FILESDIR}/${PV}-Makefile.in-LDFLAGS.patch"
+	"${FILESDIR}/${PV}-Missing-includes.patch"
+)
+
+RESTRICT="test" # some tests don't pass.
+
+src_prepare() {
+	default
+}
+
+src_configure() {
+	use amd64 && multilib_toolchain_setup x86
+	SCSH_LIB_DIRS="/usr/$(get_libdir)/${PN}"
+	econf \
+		--libdir=/usr/$(get_libdir) \
+		--includedir=/usr/include \
+		--with-lib-dirs-list=${SCSH_LIB_DIRS}
+}
+
+src_install() {
+	emake -j1 DESTDIR="${D}" install
+	local ENVD="${T}/50scsh"
+	echo "SCSH_LIB_DIRS=\"${SCSH_LIB_DIRS}\"" > "${ENVD}" || die
+	doenvd "${ENVD}"
+}
--- a/dev-java/protobuf-java/Manifest
+++ b/dev-java/protobuf-java/Manifest
@ -1 +1,3 @@
 DIST protobuf-3.0.0_beta3_p1.tar.gz 3673779 SHA256 494726c9a6a45a20cd085795a26e4f05627e9b3b1fa5ab21a8b0edc5db8173dc SHA512 bebe655ffa6f8dd9bfbf4d2fcce160de6d45f50fd802b8907833cde3f232b7b44186d06fe9cc01ed5dc7b4a040fd3069e2ec7d2704da596e8d3af80f8dba7e8b WHIRLPOOL d35dca8e402741e4d30c9c787f5927c7fe7f22619ddb3ca20d302c27fbeb929cecd55cc7e6785b28acb76c89893d2baf7fce3f685a3f186006e1e30a2901ae1b
+DIST protobuf-3.0.2.tar.gz 3917853 SHA256 b700647e11556b643ccddffd1f41d8cb7704ed02090af54cc517d44d912d11c1 SHA512 28eb8814555b0fe2cd57da6caf46802697a9612fccb3bba3ae7a379352437f81a18c1f6ab7242a22abea59c1ff9b06dcb6e2b52a97aa1a15cea6485ffc3c10c2 WHIRLPOOL 5c70def13be5e61d9405a24fdfc1efe9caee0b63c87f74e12f3d121801ecdc410e142eab80d8d4b49ebfe0c4f3cd13b2d77a17ec303978fec317265991a1f5a8
+DIST protobuf-3.1.0.tar.gz 4051503 SHA256 0a0ae63cbffc274efb573bdde9a253e3f32e458c41261df51c5dbc5ad541e8f7 SHA512 8d3289a16944c255bd1cceab696e515e52467f2bfe1cc10f6b32fabdf082d5acdc248ec9cadc572223a24d04d431f75921076153109cea2f90ee533f502ab47a WHIRLPOOL b8a0bee9ff549c8da45c2b56b12aafbed5807959cdb11b3888a0f30fd0d6df83a72f3c6ef9e266522754b8901792f65235a6e81a8b0f74cee15d59ecbe6dee68
--- a/dev-java/protobuf-java/protobuf-java-3.0.2.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-3.0.2.ebuild
@ -0,0 +1,69 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PV=${PV/_beta/-beta-}
+MY_PV=${MY_PV/_p/.}
+
+DESCRIPTION="Google's Protocol Buffers - official Java Bindings"
+HOMEPAGE="https://github.com/google/protobuf/ https://developers.google.com/protocol-buffers/"
+SRC_URI="https://github.com/google/protobuf/archive/v${MY_PV}.tar.gz -> protobuf-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/10"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc64 ~sh ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="nano"
+
+# Protobuf is only a build-time dep, but depends on the exact same version
+# (excluding revision), since we are using the same tarball.
+# But probably same subslot is sufficient.
+DEPEND=">=virtual/jdk-1.7
+	>=dev-libs/protobuf-3"
+
+RDEPEND=">=virtual/jre-1.7
+	!<dev-libs/protobuf-3[java(-)]"
+
+S="${WORKDIR}/protobuf-${MY_PV}"
+src_prepare() {
+	default
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	pushd "${S}/java" >/dev/null || die
+	einfo "Compiling Java library ..."
+	"${EPREFIX}"/usr/bin/protoc --java_out=core/src/main/java -I../src ../src/google/protobuf/descriptor.proto || die
+	JAVA_SRC_DIR="${S}/java/core/src/main/java"
+	JAVA_JAR_FILENAME="protobuf.jar"
+	java-pkg-simple_src_compile
+	popd >/dev/null || die
+	if use nano; then
+		einfo "Compiling Java Nano library ..."
+		pushd "${S}/javanano" >/dev/null || die
+		"${EPREFIX}"/usr/bin/protoc --java_out=src/main/java -I../src ../src/google/protobuf/descriptor.proto || die
+		JAVA_SRC_DIR="${S}/javanano/src/main/java"
+		JAVA_GENTOO_CLASSPATH_EXTRA="${S}/java/core/src/main/java/"
+		JAVA_JAR_FILENAME="protobuf-nano.jar"
+		java-pkg-simple_src_compile
+		popd >/dev/null || die
+	fi
+}
+
+src_install() {
+	JAVA_JAR_FILENAME="${S}/java/protobuf.jar"
+	JAVA_SRC_DIR="${S}/java/core/src/main/java"
+	if use nano; then
+		JAVA_JAR_FILENAME="${JAVA_JAR_FILENAME} ${S}/javanano/protobuf-nano.jar"
+		JAVA_SRC_DIR="${JAVA_SRC_DIR} ${S}/javanano/src/main/java"
+	fi
+	mv "${S}/java/target" . || die
+	if use nano; then
+		cp -Rvf "${S}/javanano/target" . || die
+	fi
+	java-pkg-simple_src_install
+}
--- a/dev-java/protobuf-java/protobuf-java-3.1.0.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-3.1.0.ebuild
@ -0,0 +1,69 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PV=${PV/_beta/-beta-}
+MY_PV=${MY_PV/_p/.}
+
+DESCRIPTION="Google's Protocol Buffers - official Java Bindings"
+HOMEPAGE="https://github.com/google/protobuf/ https://developers.google.com/protocol-buffers/"
+SRC_URI="https://github.com/google/protobuf/archive/v${MY_PV}.tar.gz -> protobuf-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/11"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc64 ~sh ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="nano"
+
+# Protobuf is only a build-time dep, but depends on the exact same version
+# (excluding revision), since we are using the same tarball.
+# But probably same subslot is sufficient.
+DEPEND=">=virtual/jdk-1.7
+	>=dev-libs/protobuf-3"
+
+RDEPEND=">=virtual/jre-1.7
+	!<dev-libs/protobuf-3[java(-)]"
+
+S="${WORKDIR}/protobuf-${MY_PV}"
+src_prepare() {
+	default
+	java-pkg-2_src_prepare
+}
+
+src_compile() {
+	pushd "${S}/java" >/dev/null || die
+	einfo "Compiling Java library ..."
+	"${EPREFIX}"/usr/bin/protoc --java_out=core/src/main/java -I../src ../src/google/protobuf/descriptor.proto || die
+	JAVA_SRC_DIR="${S}/java/core/src/main/java"
+	JAVA_JAR_FILENAME="protobuf.jar"
+	java-pkg-simple_src_compile
+	popd >/dev/null || die
+	if use nano; then
+		einfo "Compiling Java Nano library ..."
+		pushd "${S}/javanano" >/dev/null || die
+		"${EPREFIX}"/usr/bin/protoc --java_out=src/main/java -I../src ../src/google/protobuf/descriptor.proto || die
+		JAVA_SRC_DIR="${S}/javanano/src/main/java"
+		JAVA_GENTOO_CLASSPATH_EXTRA="${S}/java/core/src/main/java/"
+		JAVA_JAR_FILENAME="protobuf-nano.jar"
+		java-pkg-simple_src_compile
+		popd >/dev/null || die
+	fi
+}
+
+src_install() {
+	JAVA_JAR_FILENAME="${S}/java/protobuf.jar"
+	JAVA_SRC_DIR="${S}/java/core/src/main/java"
+	if use nano; then
+		JAVA_JAR_FILENAME="${JAVA_JAR_FILENAME} ${S}/javanano/protobuf-nano.jar"
+		JAVA_SRC_DIR="${JAVA_SRC_DIR} ${S}/javanano/src/main/java"
+	fi
+	mv "${S}/java/target" . || die
+	if use nano; then
+		cp -Rvf "${S}/javanano/target" . || die
+	fi
+	java-pkg-simple_src_install
+}
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@ -1,5 +1,5 @@
 DIST php-5.5.37.tar.bz2 13699851 SHA256 d2380ebe46caf17f2c4cd055867d00a82e6702dc5f62dc29ce864a5742905d88 SHA512 d2da921f3efd858e1cb8004873e377ca9c5821d5269d5b8e7c9be830b183f4d18f737b14653f65a43c0957bdca994e09a476d77e3a29a11e357abc24618c4c0f WHIRLPOOL 8db12b1d090bc1bfb3f5b20c661ba05588b8f988484d1887a959f943dd6f1756cb62bac811c809af516e6c3582b64388443546a3b4a17f0527a69fcbafc0452c
 DIST php-5.5.38.tar.xz 11077780 SHA256 cb527c44b48343c8557fe2446464ff1d4695155a95601083e5d1f175df95580f SHA512 c2cdb18b2c9edaeff66591e8f58f8ff488260f537cdf9ce09820c163f20ff5209c0def89343d429932c9506ad4ef3daacf224946dac1c59622501092483f30c6 WHIRLPOOL 4380c1daa39f04f90d1457152e366720b295e96aba6859625c6b375a3785b4e0f30fea590c1ee1edb439c2a405446526c702a003d68ea6c817ab8684068a7581
 DIST php-5.6.28.tar.xz 12441072 SHA256 07187ba2870f89cef334cd2ad6cb801aeec5eaf283da0293a9a6be75d6786d11 SHA512 3af54c0533bba23fa74c3815143cb27890900d8b0726ba8ae99a5f7dde4b5411e8eb7f559f73cf41559f11437036da70c7842b64f5555e4fab00d40cf7c35cd1 WHIRLPOOL 6b288cbb8bb005360b67fe998bf024674d685399fa411c03f5feb39a285a639012864c66ab166e2cdb6d468b59c5114f245b172813b5edd384cee598d488306a
-DIST php-7.0.13.tar.xz 12528816 SHA256 357ba7f93975d7d836abed0852dc3ed96a988af539e87750613294cbee82f1bf SHA512 745877913889be629a4b5faefad7949e3634fa3f61fa1d8642ac42196fca187e50fbcc330f1af409a62b2e2a6b5c7f782ddff8022937a61403207439659c3f5a WHIRLPOOL dce465f943c278ae58dc3183ee4a303c21650cc5f3ddabf468d9de5f3a4dc1cc07a230decdbc502d03e6bc7c6f5d6ab2f6965353f1c87e966613223739780856
+DIST php-7.0.14.tar.xz 12534712 SHA256 0f1dff6392a1cc2ed126b9695f580a2ed77eb09d2c23b41cabfb41e6f27a8c89 SHA512 321d07c89873fadcf5a4edf38323cd9e350fb06f9954a16ea2e1b9341590f1047b78d69818d80b376cd8e9f92ed9c3132b79bd5832a3ded99b78d87c291fb9a5 WHIRLPOOL 8283f14e02c763974cc5b9c24cca475030cbfaba8bb667d5e81b41ba9e2de42afd2364c586afbfc688bad03cd3b8de1399036064b8500a5afe614114fcbbe989
 DIST php-7.1.0.tar.xz 12793836 SHA256 a810b3f29c21407c24caa88f50649320d20ba6892ae1923132598b8a0ca145b6 SHA512 bb031fa008cb90475e71df5d48abb4f73660dbd94cb3fa6c768ceb1d3c51ae34a5a1f901758825877ea7e61aa9983bdcb05ad5ad51087a1f17f65cac0bb4d229 WHIRLPOOL b7c0dfb6a71aac07e44c0dd4b4b34b23aa96ffa14501671efcc1372b6b448c12ee6aee69d94c71112cc54e6c4b9ce8d787eaeb0f4010d8967c1fa4439ec82b82
--- a/dev-lang/php/php-5.6.28-r1.ebuild
+++ b/dev-lang/php/php-5.6.28-r1.ebuild
@ -0,0 +1,779 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit autotools flag-o-matic versionator libtool systemd
+
+DESCRIPTION="The PHP language runtime engine"
+HOMEPAGE="http://php.net/"
+SRC_URI="http://php.net/distributions/${P}.tar.xz"
+
+LICENSE="PHP-3.01
+	BSD
+	Zend-2.0
+	bcmath? ( LGPL-2.1+ )
+	fpm? ( BSD-2 )
+	gd? ( gd )
+	unicode? ( BSD-2 LGPL-2.1 )"
+
+SLOT="$(get_version_component_range 1-2)"
+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"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+	${SAPIS/cli/+cli}
+	threads"
+
+IUSE="${IUSE} acl 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 libressl
+	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"
+
+# The supported (that is, autodetected) versions of BDB are listed in
+# the ./configure script. Other versions *work*, but we need to stick to
+# the ones that can be detected to avoid a repeat of bug #564824.
+COMMON_DEPEND="
+	>=app-eselect/eselect-php-0.9.1[apache2?,fpm?]
+	>=dev-libs/libpcre-8.32[unicode]
+	acl? ( sys-apps/acl )
+	apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=]
+		<www-servers/apache-2.4[threads=] ) )
+	berkdb? ( || ( 	sys-libs/db:5.3
+					sys-libs/db:5.1
+					sys-libs/db:4.8
+					sys-libs/db:4.7
+					sys-libs/db:4.6
+					sys-libs/db:4.5 ) )
+	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:0 )
+	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/libmysqlclient:= )
+		mysqli? ( virtual/libmysqlclient:= )
+	)
+	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:0= )
+	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? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl )
+	)
+	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 )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	virtual/mta
+	fpm? (
+		selinux? ( sec-policy/selinux-phpfpm )
+		systemd? ( sys-apps/systemd ) )"
+
+DEPEND="${COMMON_DEPEND}
+	app-arch/xz-utils
+	>=sys-devel/bison-3.0.1
+	sys-devel/flex
+	>=sys-devel/m4-1.4.3
+	>=sys-devel/libtool-1.5.18"
+
+# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
+REQUIRED_USE="
+	cli? ( ^^ ( readline libedit ) )
+	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 ) ) ) ) )"
+
+PHP_MV="$(get_major_version)"
+
+# Allow users to install production version if they want to
+if [[ "${PHP_INI_VERSION}" == "production" ]]; then
+	PHP_INI_UPSTREAM="php.ini-production"
+else
+	PHP_INI_UPSTREAM="php.ini-development"
+fi
+
+php_install_ini() {
+	local phpsapi="${1}"
+
+	# work out where we are installing the ini file
+	php_set_ini_dir "${phpsapi}"
+
+	local phpinisrc="${PHP_INI_UPSTREAM}-${phpsapi}"
+	cp "${PHP_INI_UPSTREAM}" "${phpinisrc}" || die
+
+	# default to /tmp for save_path, bug #282768
+	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
+
+	# Set the extension dir
+	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" -i "${phpinisrc}" || die
+
+	# Set the include path to point to where we want to find PEAR packages
+	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
+
+	dodir "${PHP_INI_DIR#${EPREFIX}}"
+	insinto "${PHP_INI_DIR#${EPREFIX}}"
+	newins "${phpinisrc}" php.ini
+
+	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
+	elog
+
+	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
+	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
+
+	if use opcache; then
+		elog "Adding opcache to $PHP_EXT_INI_DIR"
+		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
+			 "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
+		dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" \
+			  "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
+	fi
+
+	# SAPI-specific handling
+	if [[ "${sapi}" == "fpm" ]] ; then
+		einfo "Installing FPM config file php-fpm.conf"
+		insinto "${PHP_INI_DIR#${EPREFIX}}"
+		doins sapi/fpm/php-fpm.conf
+	fi
+
+	dodoc php.ini-development
+	dodoc php.ini-production
+}
+
+php_set_ini_dir() {
+	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
+	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
+	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
+}
+
+src_prepare() {
+	eapply "${FILESDIR}/php-${SLOT}-no-bison-warnings.patch"
+
+	# Change PHP branding
+	# Get the alpha/beta/rc version
+	sed -re	"s|^(PHP_EXTRA_VERSION=\").*(\")|\1-pl${PR/r/}-gentoo\2|g" \
+		-i configure.in || die "Unable to change PHP branding"
+
+	# Patch PHP to show Gentoo as the server platform
+	sed -e 's/PHP_UNAME=`uname -a | xargs`/PHP_UNAME=`uname -s -n -r -v | xargs`/g' \
+		-i configure.in || die "Failed to fix server platform name"
+
+	# Prevent PHP from activating the Apache config,
+	# as we will do that ourselves
+	sed -i \
+		-e "s,-i -a -n php${PHP_MV},-i -n php${PHP_MV},g" \
+		-e "s,-i -A -n php${PHP_MV},-i -n php${PHP_MV},g" \
+		configure sapi/apache2filter/config.m4 sapi/apache2handler/config.m4 \
+		|| die
+
+	# Patch PHP to support heimdal instead of mit-krb5
+	if has_version "app-crypt/heimdal" ; then
+		sed -e 's|gssapi_krb5|gssapi|g' -i acinclude.m4 \
+			|| die "Failed to fix heimdal libname"
+		sed -e 's|PHP_ADD_LIBRARY(k5crypto, 1, $1)||g' -i acinclude.m4 \
+			|| die "Failed to fix heimdal crypt library reference"
+	fi
+
+	eapply_user
+
+	# Force rebuilding aclocal.m4
+	rm -f aclocal.m4 || die "failed to remove aclocal.m4 in src_prepare"
+	eautoreconf
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# http://bugs.php.net/bug.php?id=48795, bug #343481
+		sed -i -e '/BUILD_CGI="\\$(CC)/s/CC/CXX/' configure || die
+	fi
+}
+
+src_configure() {
+	addpredict /usr/share/snmp/mibs/.index
+	addpredict /var/lib/net-snmp/mib_indexes
+
+	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
+
+	# The php-fpm config file wants localstatedir to be ${EPREFIX}/var
+	# and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
+	local our_conf=(
+		--prefix="${PHP_DESTDIR}"
+		--mandir="${PHP_DESTDIR}/man"
+		--infodir="${PHP_DESTDIR}/info"
+		--libdir="${PHP_DESTDIR}/lib"
+		--with-libdir="$(get_libdir)"
+		--localstatedir="${EPREFIX}/var"
+		--without-pear
+		$(use_enable threads maintainer-zts)
+	)
+
+	our_conf+=(
+		$(use_with acl fpm-acl)
+		$(use_enable bcmath bcmath)
+		$(use_with bzip2 bz2 "${EPREFIX}/usr")
+		$(use_enable calendar calendar)
+		$(use_enable ctype ctype)
+		$(use_with curl curl "${EPREFIX}/usr")
+		$(use_enable xml dom)
+		$(use_with enchant enchant "${EPREFIX}/usr")
+		$(use_enable exif exif)
+		$(use_enable fileinfo fileinfo)
+		$(use_enable filter filter)
+		$(use_enable ftp ftp)
+		$(use_with nls gettext "${EPREFIX}/usr")
+		$(use_with gmp gmp "${EPREFIX}/usr")
+		$(use_enable hash hash)
+		$(use_with mhash mhash "${EPREFIX}/usr")
+		$(use_with iconv iconv \
+			$(use elibc_glibc || use elibc_musl || echo "${EPREFIX}/usr"))
+		$(use_enable intl intl)
+		$(use_enable ipv6 ipv6)
+		$(use_enable json json)
+		$(use_with kerberos kerberos "${EPREFIX}/usr")
+		$(use_enable xml libxml)
+		$(use_with xml libxml-dir "${EPREFIX}/usr")
+		$(use_enable unicode mbstring)
+		$(use_with crypt mcrypt "${EPREFIX}/usr")
+		$(use_with mssql mssql "${EPREFIX}/usr")
+		$(use_with unicode onig "${EPREFIX}/usr")
+		$(use_with ssl openssl "${EPREFIX}/usr")
+		$(use_with ssl openssl-dir "${EPREFIX}/usr")
+		$(use_enable pcntl pcntl)
+		$(use_enable phar phar)
+		$(use_enable pdo pdo)
+		$(use_enable opcache opcache)
+		$(use_with postgres pgsql "${EPREFIX}/usr")
+		$(use_enable posix posix)
+		$(use_with spell pspell "${EPREFIX}/usr")
+		$(use_with recode recode "${EPREFIX}/usr")
+		$(use_enable simplexml simplexml)
+		$(use_enable sharedmem shmop)
+		$(use_with snmp snmp "${EPREFIX}/usr")
+		$(use_enable soap soap)
+		$(use_enable sockets sockets)
+		$(use_with sqlite sqlite3 "${EPREFIX}/usr")
+		$(use_with sybase-ct sybase-ct "${EPREFIX}/usr")
+		$(use_enable sysvipc sysvmsg)
+		$(use_enable sysvipc sysvsem)
+		$(use_enable sysvipc sysvshm)
+		$(use_with systemd fpm-systemd)
+		$(use_with tidy tidy "${EPREFIX}/usr")
+		$(use_enable tokenizer tokenizer)
+		$(use_enable wddx wddx)
+		$(use_enable xml xml)
+		$(use_enable xmlreader xmlreader)
+		$(use_enable xmlwriter xmlwriter)
+		$(use_with xmlrpc xmlrpc)
+		$(use_with xslt xsl "${EPREFIX}/usr")
+		$(use_enable zip zip)
+		$(use_with zlib zlib "${EPREFIX}/usr")
+		$(use_enable debug debug)
+	)
+
+	# DBA support
+	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
+		|| use qdbm ; then
+		our_conf+=( "--enable-dba${shared}" )
+	fi
+
+	# DBA drivers support
+	our_conf+=(
+		$(use_with cdb cdb)
+		$(use_with berkdb db4 "${EPREFIX}/usr")
+		$(use_enable flatfile flatfile)
+		$(use_with gdbm gdbm "${EPREFIX}/usr")
+		$(use_enable inifile inifile)
+		$(use_with qdbm qdbm "${EPREFIX}/usr")
+	)
+
+	# Support for the GD graphics library
+	our_conf+=(
+		$(use_with truetype freetype-dir "${EPREFIX}/usr")
+		$(use_with truetype t1lib "${EPREFIX}/usr")
+		$(use_enable cjk gd-jis-conv)
+		$(use_with gd jpeg-dir "${EPREFIX}/usr")
+		$(use_with gd png-dir "${EPREFIX}/usr")
+		$(use_with xpm xpm-dir "${EPREFIX}/usr")
+		$(use_with vpx vpx-dir "${EPREFIX}/usr")
+	)
+	# enable gd last, so configure can pick up the previous settings
+	our_conf+=( $(use_with gd gd) )
+
+	# IMAP support
+	if use imap ; then
+		our_conf+=(
+			$(use_with imap imap "${EPREFIX}/usr")
+			$(use_with ssl imap-ssl "${EPREFIX}/usr")
+		)
+	fi
+
+	# Interbase/firebird support
+	our_conf+=( $(use_with firebird interbase "${EPREFIX}/usr") )
+
+	# LDAP support
+	if use ldap ; then
+		our_conf+=(
+			$(use_with ldap ldap "${EPREFIX}/usr")
+			$(use_with ldap-sasl ldap-sasl "${EPREFIX}/usr")
+		)
+	fi
+
+	# MySQL support
+	local mysqllib="mysqlnd"
+	local mysqlilib="mysqlnd"
+	use libmysqlclient && mysqllib="${EPREFIX}/usr"
+	use libmysqlclient && mysqlilib="${EPREFIX}/usr/bin/mysql_config"
+
+	our_conf+=( $(use_with mysql mysql "${mysqllib}") )
+	our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") )
+
+	local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
+	if use mysql || use mysqli ; then
+		our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
+	fi
+
+	# ODBC support
+	our_conf+=(
+		$(use_with odbc unixODBC "${EPREFIX}/usr")
+		$(use_with iodbc iodbc "${EPREFIX}/usr")
+	)
+
+	# Oracle support
+	our_conf+=( $(use_with oci8-instant-client oci8) )
+
+	# PDO support
+	if use pdo ; then
+		our_conf+=(
+			$(use_with mssql pdo-dblib)
+			$(use_with mysql pdo-mysql "${mysqllib}")
+			$(use_with postgres pdo-pgsql)
+			$(use_with sqlite pdo-sqlite "${EPREFIX}/usr")
+			$(use_with firebird pdo-firebird "${EPREFIX}/usr")
+			$(use_with odbc pdo-odbc "unixODBC,${EPREFIX}/usr")
+			$(use_with oci8-instant-client pdo-oci)
+		)
+	fi
+
+	# readline/libedit support
+	our_conf+=(
+		$(use_with readline readline "${EPREFIX}/usr")
+		$(use_with libedit libedit "${EPREFIX}/usr")
+	)
+
+	# Session support
+	if use session ; then
+		our_conf+=( $(use_with sharedmem mm "${EPREFIX}/usr") )
+	else
+		our_conf+=( $(use_enable session session) )
+	fi
+
+	# Use pic for shared modules such as apache2's mod_php
+	our_conf+=( --with-pic )
+
+	# we use the system copy of pcre
+	# --with-pcre-regex affects ext/pcre
+	# --with-pcre-dir affects ext/filter and ext/zip
+	our_conf+=(
+		--with-pcre-regex="${EPREFIX}/usr"
+		--with-pcre-dir="${EPREFIX}/usr"
+	)
+
+	# Catch CFLAGS problems
+	# Fixes bug #14067.
+	# Changed order to run it in reverse for bug #32022 and #12021.
+	replace-cpu-flags "k6*" "i586"
+
+	# Support user-passed configuration parameters
+	our_conf+=( ${EXTRA_ECONF:-} )
+
+	# Support the Apache2 extras, they must be set globally for all
+	# SAPIs to work correctly, especially for external PHP extensions
+
+	mkdir -p "${WORKDIR}/sapis-build" || die
+	for one_sapi in $SAPIS ; do
+		use "${one_sapi}" || continue
+		php_set_ini_dir "${one_sapi}"
+
+		# The BUILD_DIR variable is used to determine where to output
+		# the files that autotools creates. This was all originally
+		# based on the autotools-utils eclass.
+		BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
+		cp -a "${S}" "${BUILD_DIR}" || die
+		cd "${BUILD_DIR}" || die
+
+		local sapi_conf=(
+			--with-config-file-path="${PHP_INI_DIR}"
+			--with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
+		)
+
+		for sapi in $SAPIS ; do
+			case "$sapi" in
+				cli|cgi|embed|fpm)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf+=( "--enable-${sapi}" )
+					else
+						sapi_conf+=( "--disable-${sapi}" )
+					fi
+					;;
+
+				apache2)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
+					else
+						sapi_conf+=( --without-apxs2 )
+					fi
+					;;
+			esac
+		done
+
+		# Construct the $myeconfargs array by concatenating $our_conf
+		# (the common args) and $sapi_conf (the SAPI-specific args).
+		local myeconfargs=( "${our_conf[@]}" )
+		myeconfargs+=( "${sapi_conf[@]}" )
+
+		pushd "${BUILD_DIR}" > /dev/null || die
+		econf "${myeconfargs[@]}"
+		popd > /dev/null || die
+	done
+}
+
+src_compile() {
+	# snmp seems to run during src_compile, too (bug #324739)
+	addpredict /usr/share/snmp/mibs/.index
+	addpredict /var/lib/net-snmp/mib_indexes
+
+	for sapi in ${SAPIS} ; do
+		if use "${sapi}"; then
+			cd "${WORKDIR}/sapis-build/$sapi" || \
+				die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
+			emake
+		fi
+	done
+}
+
+src_install() {
+	# see bug #324739 for what happens when we don't have that
+	addpredict /usr/share/snmp/mibs/.index
+
+	# grab the first SAPI that got built and install common files from there
+	local first_sapi=""
+	for sapi in $SAPIS ; do
+		if use $sapi ; then
+			first_sapi=$sapi
+			break
+		fi
+	done
+
+	# Makefile forgets to create this before trying to write to it...
+	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
+
+	# Install php environment (without any sapis)
+	cd "${WORKDIR}/sapis-build/$first_sapi" || die
+	emake INSTALL_ROOT="${D}" \
+		install-build install-headers install-programs
+
+	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
+
+	# Create the directory where we'll put version-specific php scripts
+	keepdir "/usr/share/php${PHP_MV}"
+
+	local sapi="", file=""
+	local sapi_list=""
+
+	for sapi in ${SAPIS}; do
+		if use "${sapi}" ; then
+			einfo "Installing SAPI: ${sapi}"
+			cd "${WORKDIR}/sapis-build/${sapi}" || die
+
+			if [[ "${sapi}" == "apache2" ]] ; then
+				# We're specifically not using emake install-sapi as libtool
+				# may cause unnecessary relink failures (see bug #351266)
+				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
+				newins ".libs/libphp5$(get_libname)" \
+					   "libphp${PHP_MV}$(get_libname)"
+				keepdir "/usr/$(get_libdir)/apache2/modules"
+			else
+				# needed each time, php_install_ini would reset it
+				local dest="${PHP_DESTDIR#${EPREFIX}}"
+				into "${dest}"
+				case "$sapi" in
+					cli)
+						source="sapi/cli/php"
+						;;
+					cgi)
+						source="sapi/cgi/php-cgi"
+						;;
+					fpm)
+						source="sapi/fpm/php-fpm"
+						;;
+					embed)
+						source="libs/libphp${PHP_MV}$(get_libname)"
+						;;
+					*)
+						die "unhandled sapi in src_install"
+						;;
+				esac
+
+				if [[ "${source}" == *"$(get_libname)" ]]; then
+					dolib.so "${source}"
+				else
+					dobin "${source}"
+					local name="$(basename ${source})"
+					dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}"
+				fi
+			fi
+
+			php_install_ini "${sapi}"
+
+			# construct correct SAPI string for php-config
+			# thanks to ferringb for the bash voodoo
+			if [[ "${sapi}" == "apache2" ]]; then
+				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
+			else
+				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
+			fi
+		fi
+	done
+
+	# Installing opcache module
+	if use opcache ; then
+		into "${PHP_DESTDIR#${EPREFIX}}"
+		dolib.so "modules/opcache$(get_libname)"
+	fi
+
+	# Install env.d files
+	newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
+	sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+	sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+
+	# set php-config variable correctly (bug #278439)
+	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
+		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
+
+	if use fpm ; then
+		if use systemd; then
+			systemd_newunit "${FILESDIR}/php-fpm_at.service" \
+							"php-fpm@${SLOT}.service"
+		else
+			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
+							"php-fpm@${SLOT}.service"
+		fi
+	fi
+}
+
+src_test() {
+	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
+	if [[ ! -x "${PHP_BIN}" ]] ; then
+		ewarn "Test phase requires USE=cli, skipping"
+		return
+	else
+		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis/cgi/php-cgi" ]] ; then
+		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis/cgi/php-cgi"
+	fi
+
+	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d \
+					  "session.save_path=${T}" \
+					  "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
+					  "session.save_path=${T}"
+
+	for name in ${EXPECTED_TEST_FAILURES}; do
+		mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
+	done
+
+	local failed="$(find -name '*.out')"
+	if [[ ${failed} != "" ]] ; then
+		ewarn "The following test cases failed unexpectedly:"
+		for name in ${failed}; do
+			ewarn "  ${name/.out/}"
+		done
+	else
+		einfo "No unexpected test failures, all fine"
+	fi
+
+	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
+		local passed=""
+		for name in ${EXPECTED_TEST_FAILURES}; do
+			[[ -f "${name}.diff" ]] && continue
+			passed="${passed} ${name}"
+		done
+		if [[ ${passed} != "" ]] ; then
+			einfo "The following test cases passed unexpectedly:"
+			for name in ${passed}; do
+				ewarn "  ${passed}"
+			done
+		else
+			einfo "None of the known-to-fail tests passed, all fine"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	# Output some general info to the user
+	if use apache2 ; then
+		elog
+		elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
+		elog "your apache2 command. OpenRC users can append that string to"
+		elog "APACHE2_OPTS in /etc/conf.d/apache2."
+		elog
+		elog "The apache module configuration file 70_mod_php.conf is"
+		elog "provided (and maintained) by eselect-php."
+		elog
+	fi
+
+	# Create the symlinks for php
+	for m in ${SAPIS}; do
+		[[ ${m} == 'embed' ]] && continue;
+		if use $m ; then
+			local ci=$(eselect php show $m)
+			if [[ -z $ci ]]; then
+				eselect php set $m php${SLOT} || die
+				einfo "Switched ${m} to use php:${SLOT}"
+				einfo
+			elif [[ $ci != "php${SLOT}" ]] ; then
+				elog "To switch $m to use php:${SLOT}, run"
+				elog "    eselect php set $m php${SLOT}"
+				elog
+			fi
+		fi
+	done
+
+	# Remove dead symlinks for SAPIs that were just disabled. For
+	# example, if the user has the cgi SAPI enabled, then he has an
+	# eselect-php symlink for it. If he later reinstalls PHP with
+	# USE="-cgi", that symlink will break. This call to eselect is
+	# supposed to remove that dead link per bug 572436.
+	eselect php cleanup || die
+
+	if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
+	   elog "To build extensions for this version of PHP, you will need to"
+	   elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
+	   elog
+	fi
+
+	# Only mention PHP_INI_VERSION if the user doesn't have it set.
+	case "${PHP_INI_VERSION}" in
+		production|development)
+		;;
+	*)
+		elog "This ebuild installed a version of php.ini based on"
+		elog "${PHP_INI_UPSTREAM}. You can choose which version of"
+		elog "php.ini to install by default by setting PHP_INI_VERSION"
+		elog "to either 'production' or 'development' in your make.conf."
+		elog "Both versions of php.ini can be found with the PHP docs in"
+		elog "${EPREFIX}/usr/share/doc/${PF}"
+		elog
+		;;
+	esac
+
+	elog "For details on how version slotting works, please see"
+	elog "the wiki:"
+	elog
+	elog "  https://wiki.gentoo.org/wiki/PHP"
+	elog
+}
+
+pkg_postrm() {
+	# This serves two purposes. First, if we have just removed the last
+	# installed version of PHP, then this will remove any dead symlinks
+	# belonging to eselect-php. Second, if a user upgrades slots from
+	# (say) 5.6 to 7.0 and depcleans the old slot, then this will update
+	# his existing symlinks to point to the new 7.0 installation. The
+	# latter is bug 432962.
+	#
+	# Note: the eselect-php package may not be installed at this point,
+	# so we can't die() if this command fails.
+	eselect php cleanup
+}
--- a/dev-lang/php/php-7.0.14.ebuild
+++ b/dev-lang/php/php-7.0.14.ebuild
@ -19,7 +19,7 @@ LICENSE="PHP-3.01
 	unicode? ( BSD-2 LGPL-2.1 )"

 SLOT="$(get_version_component_range 1-2)"
-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"

 # We can build the following SAPIs in the given order
 SAPIS="embed cli cgi fpm apache2 phpdbg"
@ -29,7 +29,7 @@ IUSE="${IUSE}
 	${SAPIS/cli/+cli}
 	threads"

-IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk
+IUSE="${IUSE} acl 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
@ -47,6 +47,7 @@ IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk
 COMMON_DEPEND="
 	>=app-eselect/eselect-php-0.9.1[apache2?,fpm?]
 	>=dev-libs/libpcre-8.32[unicode]
+	acl? ( sys-apps/acl )
 	apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=]
 		<www-servers/apache-2.4[threads=] ) )
 	berkdb? ( || ( 	sys-libs/db:5.3
@ -285,6 +286,7 @@ src_configure() {
 	)

 	our_conf+=(
+		$(use_with acl fpm-acl)
 		$(use_enable bcmath bcmath)
 		$(use_with bzip2 bz2 "${EPREFIX}/usr")
 		$(use_enable calendar calendar)
--- a/dev-lang/php/php-7.1.0-r2.ebuild
+++ b/dev-lang/php/php-7.1.0-r2.ebuild
@ -29,7 +29,7 @@ IUSE="${IUSE}
 	${SAPIS/cli/+cli}
 	threads"

-IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk
+IUSE="${IUSE} acl 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
@ -47,6 +47,7 @@ IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk
 COMMON_DEPEND="
 	>=app-eselect/eselect-php-0.9.1[apache2?,fpm?]
 	>=dev-libs/libpcre-8.32[unicode]
+	acl? ( sys-apps/acl )
 	apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=]
 		<www-servers/apache-2.4[threads=] ) )
 	berkdb? ( || ( 	sys-libs/db:5.3
@ -100,7 +101,7 @@ COMMON_DEPEND="
 		!libressl? ( dev-libs/openssl:0 )
 		libressl? ( dev-libs/libressl )
 	)
-	tidy? ( app-text/tidy-html5 )
+	tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) )
 	truetype? (
 		=media-libs/freetype-2*
 		!gd? (
@ -259,6 +260,7 @@ src_configure() {
 	)

 	our_conf+=(
+		$(use_with acl fpm-acl)
 		$(use_enable bcmath bcmath)
 		$(use_with bzip2 bz2 "${EPREFIX}/usr")
 		$(use_enable calendar calendar)
--- a/dev-libs/DirectFB/DirectFB-1.4.9-r1.ebuild
+++ b/dev-libs/DirectFB/DirectFB-1.4.9-r1.ebuild
@ -25,9 +25,9 @@ IUSE_INPUT_DEVICES=" dynapro elo2300 evdev joystick keyboard lirc mouse mutouch
 IUD=${IUSE_INPUT_DEVICES// / input_devices_}

 DESCRIPTION="Thin library on top of the Linux framebuffer devices"
-HOMEPAGE="http://www.directfb.org/"
-SRC_URI="http://directfb.org/downloads/Core/${PN}-${PV:0:3}/${P}.tar.gz
-	http://directfb.org/downloads/Old/${P}.tar.gz"
+HOMEPAGE="http://www.directfb.net/"
+SRC_URI="http://directfb.net/downloads/Core/${PN}-${PV:0:3}/${P}.tar.gz
+	http://directfb.net/downloads/Old/${P}.tar.gz"

 LICENSE="LGPL-2.1"
 SLOT="0"
--- a/dev-libs/DirectFB/DirectFB-1.7.6.ebuild
+++ b/dev-libs/DirectFB/DirectFB-1.7.6.ebuild
@ -25,9 +25,9 @@ IUSE_INPUT_DEVICES=" dynapro elo2300 evdev joystick keyboard lirc mouse mutouch
 IUD=${IUSE_INPUT_DEVICES// / input_devices_}

 DESCRIPTION="Thin library on top of the Linux framebuffer devices"
-HOMEPAGE="http://www.directfb.org/"
-SRC_URI="http://directfb.org/downloads/Core/${PN}-${PV:0:3}/${P}.tar.gz
-	http://directfb.org/downloads/Old/${P}.tar.gz"
+HOMEPAGE="http://www.directfb.net/"
+SRC_URI="http://directfb.net/downloads/Core/${PN}-${PV:0:3}/${P}.tar.gz
+	http://directfb.net/downloads/Old/${P}.tar.gz"

 LICENSE="LGPL-2.1"
 SLOT="0"
@ -77,7 +77,8 @@ src_prepare() {
 		"${FILESDIR}"/${PN}-1.6.3-setregion.patch \
 		"${FILESDIR}"/${PN}-1.6.3-atomic-fix-compiler-error-when-building-for-thumb2.patch \
 		"${FILESDIR}"/${PN}-1.7.6-cle266.patch \
-		"${FILESDIR}"/${PN}-1.7.6-idivine.patch
+		"${FILESDIR}"/${PN}-1.7.6-idivine.patch \
+		"${FILESDIR}"/${PN}-1.7.6-tslib.patch
 	sed -i \
 		-e '/#define RASPBERRY_PI/d' \
 		systems/egl/egl_system.c || die #497124
--- a/dev-libs/DirectFB/files/DirectFB-1.7.6-tslib.patch
+++ b/dev-libs/DirectFB/files/DirectFB-1.7.6-tslib.patch
@ -0,0 +1,33 @@
+https://github.com/deniskropp/DirectFB/pull/6
+https://bugs.gentoo.org/567294
+
+From 5c7c4b197b9d04587b05624db4cfca6503adb3ff Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Thu, 8 Dec 2016 16:47:34 -0500
+Subject: [PATCH] configure: fix tslib version check
+
+The tslib version is 1.0, not 1.0.0.  Trying to check for the latter
+fails when using pkg-config:
+$ pkg-config --exists --print-errors "tslib-1.0 >= 1.0"
+$ pkg-config --exists --print-errors "tslib-1.0 >= 1.0.0"
+Requested 'tslib-1.0 >= 1.0.0' but version of tslib is 1.0
+---
+ configure.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.in b/configure.in
+index 6143cd393699..12a65fdc4f52 100644
+--- a/configure.in
+++ b/configure.in
+@@ -2561,7 +2561,7 @@ fi
+ 
+ enable_tslib=no
+ if test "$checkfor_tslib" = "yes"; then
+-  PKG_CHECK_MODULES([TSLIB], [tslib-1.0 >= 1.0.0], [enable_tslib=yes], [enable_tslib=no])
+  PKG_CHECK_MODULES([TSLIB], [tslib-1.0 >= 1.0], [enable_tslib=yes], [enable_tslib=no])
+   if test "$enable_tslib" = "no"; then
+      PKG_CHECK_MODULES([TSLIB], [tslib-0.0], [enable_tslib=yes], [enable_tslib=no
+        AC_MSG_WARN([*** no tslib -- tslib driver will not be built.])])
+-- 
+2.11.0.rc2
+
--- a/dev-libs/protobuf/Manifest
+++ b/dev-libs/protobuf/Manifest
@ -1,3 +1,5 @@
 DIST protobuf-2.5.0.tar.bz2 1866763 SHA256 13bfc5ae543cf3aa180ac2485c0bc89495e3ae711fc6fab4f8ffe90dfb4bb677 SHA512 5994b3669808b82fef5c860ecad36358c0767f84acac877e7bfcf722e59d972835a955714149bdd4158fbd1328a51d01397a563991d26475351ee72be48142ee WHIRLPOOL 7e6786e1f20bf253d0e386a95c2bbfe1b443f484d492f97552cadcea62c24461436aa88130e3ff20b4dc9f352c101458cb8c03686f1cc4e6e2133b6e78f5b70d
 DIST protobuf-2.6.1.tar.bz2 2021416 SHA256 ee445612d544d885ae240ffbcbf9267faa9f593b7b101f21d58beceb92661910 SHA512 8b092b87fcd79223db199cd3d330f3d43689b47f345aa4e34028dcf1680d609a5d5a89ab08588e817b566d3b265834c38f1db580bc1c144b512ce74d35f2a174 WHIRLPOOL b8d7f5e6b85670520435fd1107eb67035c822c2dad9689dadc29754de3bf8076ac256cf3fe3e719e99c0ccb03ed78edecb91afbe96b611073b60ae3fb3f29b1a
 DIST protobuf-3.0.0_beta3_p1.tar.gz 3673779 SHA256 494726c9a6a45a20cd085795a26e4f05627e9b3b1fa5ab21a8b0edc5db8173dc SHA512 bebe655ffa6f8dd9bfbf4d2fcce160de6d45f50fd802b8907833cde3f232b7b44186d06fe9cc01ed5dc7b4a040fd3069e2ec7d2704da596e8d3af80f8dba7e8b WHIRLPOOL d35dca8e402741e4d30c9c787f5927c7fe7f22619ddb3ca20d302c27fbeb929cecd55cc7e6785b28acb76c89893d2baf7fce3f685a3f186006e1e30a2901ae1b
+DIST protobuf-3.0.2.tar.gz 3917853 SHA256 b700647e11556b643ccddffd1f41d8cb7704ed02090af54cc517d44d912d11c1 SHA512 28eb8814555b0fe2cd57da6caf46802697a9612fccb3bba3ae7a379352437f81a18c1f6ab7242a22abea59c1ff9b06dcb6e2b52a97aa1a15cea6485ffc3c10c2 WHIRLPOOL 5c70def13be5e61d9405a24fdfc1efe9caee0b63c87f74e12f3d121801ecdc410e142eab80d8d4b49ebfe0c4f3cd13b2d77a17ec303978fec317265991a1f5a8
+DIST protobuf-3.1.0.tar.gz 4051503 SHA256 0a0ae63cbffc274efb573bdde9a253e3f32e458c41261df51c5dbc5ad541e8f7 SHA512 8d3289a16944c255bd1cceab696e515e52467f2bfe1cc10f6b32fabdf082d5acdc248ec9cadc572223a24d04d431f75921076153109cea2f90ee533f502ab47a WHIRLPOOL b8a0bee9ff549c8da45c2b56b12aafbed5807959cdb11b3888a0f30fd0d6df83a72f3c6ef9e266522754b8901792f65235a6e81a8b0f74cee15d59ecbe6dee68
--- a/dev-libs/protobuf/protobuf-3.0.2.ebuild
+++ b/dev-libs/protobuf/protobuf-3.0.2.ebuild
@ -0,0 +1,112 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+inherit autotools elisp-common flag-o-matic python-r1 toolchain-funcs multilib-minimal
+
+# If you bump this package, also consider bumping the official language bindings!
+# At the current time these are java and python.
+MY_PV=${PV/_beta/-beta-}
+MY_PV=${MY_PV/_p/.}
+
+DESCRIPTION="Google's Protocol Buffers -- an efficient method of encoding structured data"
+HOMEPAGE="https://github.com/google/protobuf/ https://developers.google.com/protocol-buffers/"
+SRC_URI="https://github.com/google/protobuf/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/10"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="emacs examples java python static-libs test vim-syntax zlib"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+DEPEND="
+	emacs? ( virtual/emacs )
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+	test? ( dev-cpp/gmock[${MULTILIB_USEDEP}] )"
+
+# This is provided for backwards compatibility due to (likely incorrect) use in consumers.
+PDEPEND="
+	java? ( dev-java/protobuf-java )
+	python? ( dev-python/protobuf-python[${PYTHON_USEDEP}] )"
+
+DOCS=( CHANGES.txt CONTRIBUTORS.txt README.md )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.5.0-emacs-24.4.patch"
+	"${FILESDIR}/${PN}-2.6.1-protoc-cmdline.patch"
+	"${FILESDIR}/${PN}-3.0.0_beta2-disable-local-gmock.patch"
+)
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+src_prepare() {
+	append-cppflags -DGOOGLE_PROTOBUF_NO_RTTI
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		$(use_with zlib)
+	)
+	if tc-is-cross-compiler; then
+		# The build system wants `protoc` when building, so we need a copy that
+		# runs on the host.  This is more hermetic than relying on the version
+		# installed in the host being the exact same version.
+		mkdir -p "${WORKDIR}"/build || die
+		pushd "${WORKDIR}"/build >/dev/null || die
+		ECONF_SOURCE=${S} econf_build "${myeconfargs[@]}"
+		myeconfargs+=( --with-protoc="${PWD}"/src/protoc )
+		popd >/dev/null || die
+	fi
+	ECONF_SOURCE=${S} econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	if tc-is-cross-compiler; then
+		emake -C "${WORKDIR}"/build/src protoc
+	fi
+
+	default
+
+	if use emacs; then
+		elisp-compile "${S}"/editors/protobuf-mode.el
+	fi
+}
+
+multilib_src_test() {
+	emake check
+}
+
+multilib_src_install_all() {
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins editors/proto.vim
+		insinto /usr/share/vim/vimfiles/ftdetect/
+		doins "${FILESDIR}/proto.vim"
+	fi
+
+	if use emacs; then
+		elisp-install "${PN}" editors/protobuf-mode.el*
+		elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el"
+	fi
+
+	if use examples; then
+		DOCS+=( examples )
+		docompress -x /usr/share/doc/"${PF}"/examples
+	fi
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
--- a/dev-libs/protobuf/protobuf-3.1.0.ebuild
+++ b/dev-libs/protobuf/protobuf-3.1.0.ebuild
@ -0,0 +1,111 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+inherit autotools elisp-common flag-o-matic python-r1 toolchain-funcs multilib-minimal
+
+# If you bump this package, also consider bumping the official language bindings!
+# At the current time these are java and python.
+MY_PV=${PV/_beta/-beta-}
+MY_PV=${MY_PV/_p/.}
+
+DESCRIPTION="Google's Protocol Buffers -- an efficient method of encoding structured data"
+HOMEPAGE="https://github.com/google/protobuf/ https://developers.google.com/protocol-buffers/"
+SRC_URI="https://github.com/google/protobuf/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/11"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="emacs examples java python static-libs test vim-syntax zlib"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+DEPEND="
+	emacs? ( virtual/emacs )
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+	test? ( dev-cpp/gmock[${MULTILIB_USEDEP}] )"
+
+# This is provided for backwards compatibility due to (likely incorrect) use in consumers.
+PDEPEND="
+	java? ( dev-java/protobuf-java )
+	python? ( dev-python/protobuf-python[${PYTHON_USEDEP}] )"
+
+DOCS=( CHANGES.txt CONTRIBUTORS.txt README.md )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.6.1-protoc-cmdline.patch"
+	"${FILESDIR}/${PN}-3.0.0_beta2-disable-local-gmock.patch"
+)
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+src_prepare() {
+	append-cppflags -DGOOGLE_PROTOBUF_NO_RTTI
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		$(use_with zlib)
+	)
+	if tc-is-cross-compiler; then
+		# The build system wants `protoc` when building, so we need a copy that
+		# runs on the host.  This is more hermetic than relying on the version
+		# installed in the host being the exact same version.
+		mkdir -p "${WORKDIR}"/build || die
+		pushd "${WORKDIR}"/build >/dev/null || die
+		ECONF_SOURCE=${S} econf_build "${myeconfargs[@]}"
+		myeconfargs+=( --with-protoc="${PWD}"/src/protoc )
+		popd >/dev/null || die
+	fi
+	ECONF_SOURCE=${S} econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	if tc-is-cross-compiler; then
+		emake -C "${WORKDIR}"/build/src protoc
+	fi
+
+	default
+
+	if use emacs; then
+		elisp-compile "${S}"/editors/protobuf-mode.el
+	fi
+}
+
+multilib_src_test() {
+	emake check
+}
+
+multilib_src_install_all() {
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins editors/proto.vim
+		insinto /usr/share/vim/vimfiles/ftdetect/
+		doins "${FILESDIR}/proto.vim"
+	fi
+
+	if use emacs; then
+		elisp-install "${PN}" editors/protobuf-mode.el*
+		elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el"
+	fi
+
+	if use examples; then
+		DOCS+=( examples )
+		docompress -x /usr/share/doc/"${PF}"/examples
+	fi
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
--- a/dev-php/pecl-apcu/Manifest
+++ b/dev-php/pecl-apcu/Manifest
@ -1,4 +1,6 @@
 DIST APCu-4.0.7.tgz 118670 SHA256 178a731ee3435b451f1144bc4a63c9d70d4909a2c434e17c6e07db554df90bd6 SHA512 50db51358c9268cc5fdd0d48fb444be9e9356f1690bc1ae021a9618c8819ce8873bf4502fe87a10467ffda2ef38267ccca2af55152b064400c69a8da92b7e98b WHIRLPOOL 3c721753764d6f3adbf6090710aafdb29d78b3d55e718c0101d7cad993b51d7b335931c61f120f8dad4623fe16cad9f13952367934968599ed15dd9c744b9725
 DIST apcu-4.0.10.tgz 119264 SHA256 8dee6680924107d2aaf827f9cb8ef0e8e09c47bb38712a3439eddabe3ce41b40 SHA512 8aabd51996270cff98b9e329413f9cfcaa9be33a0df8bf9ad50ac2dfd320e348aee6432b8ecd498e077c490714184a82502ea656d825a5fcab70966780064163 WHIRLPOOL c39d4d0953dc4f5168032641c89292c2efcf514c2afca4f9cf65a35564c169021a0a74543556b6e890972904007c7c846a88d8c3ce2ccc0167a1a74e18779b99
+DIST apcu-4.0.11.tgz 119535 SHA256 454f302ec13a6047ca4c39e081217ce5a61bbea815aec9c1091fb849e70b4d00 SHA512 e3b97066240e33850419e96f0fd9df0e66ee3b0fa238c418e07ac639d07439e9edfa1696e56a620e33f1ffc0993c57bde585b0c170b22995e7d5c0ae550b7899 WHIRLPOOL b823ebdc574d13bfb43fbbfc2b5fe238ae1a895dc4fa51b12af9d99f3f8d42d4b4b25c305e203c417de2314cc2be360ea18e2c04f01b83c3c131c68c693f429c
 DIST apcu-4.0.8.tgz 119062 SHA256 bef4f5ae309526a332e0f6b98f0579a45d6000b928991babe684d4c22432d57d SHA512 990fbf3d6f490eeebf1d28eea5e7b0400c8c4badbfcf5ed1c5fc5b7186c5cd6d4ec87a99a8185e9bb27c64ccd371ca7b4324901f35a84644301e32fd9cfa8ef8 WHIRLPOOL 443f0f0a5a742933a19b22a18aa442587f3a7b75fc5e3739ea5dac9d8e31d9e40c41b8107b4d4953cb33f5baa49761a4d1c52a9f472377a5f7a4019750b08f64
 DIST apcu-5.1.5.tgz 109196 SHA256 5f4153fe21745a44f1d92431b05a85c0912bb3235110615db84a4a6e84fb6791 SHA512 ffa3e666f354c8fd2ab163db9c8352066d27a1cd6aebe4d8f374052f14a90dbe752efc27c6e927cbf75fc48b6f673e639b07ceeffc2a68402a778cc6a8b18fbc WHIRLPOOL 53345855c62584f2bcac87c008ac22dc73b330f4ee6df48a9f294b404ceddca476f0187defc8d258a73d254be094845be62def71a8e2087a7506da56b414d9aa
+DIST apcu-5.1.7.tgz 110921 SHA256 e71e12985f52d4f4311beedf54540a16b76cf7d2d8b8c1028ec4491d4c0f962c SHA512 104e5b1b5dbf1febf4f147775f621d867a5ca60a1ddfe56af5f42f148f7913aa54a31c96baf35c1fd9b3278355d6f14289ffda1601b4a2579430d585f79753b3 WHIRLPOOL d8f79290f55368415571e8f16832b91fc446787e60e69d381f5e8e19059235ad54d64772e1bd40fc6d27f89c9aa4c67a2b0f9c5e8bcf4259e0fe0e0b34f2a398
--- a/dev-php/pecl-apcu/pecl-apcu-4.0.11.ebuild
+++ b/dev-php/pecl-apcu/pecl-apcu-4.0.11.ebuild
@ -0,0 +1,77 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PHP_EXT_NAME="apcu"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+DOCS=( NOTICE README.md TECHNOTES.txt TODO )
+
+USE_PHP="php5-6 php7-0 php7-1"
+
+inherit php-ext-pecl-r3
+
+USE_PHP="php5-6"
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="Stripped down version of APC supporting only user cache"
+LICENSE="PHP-3.01"
+SLOT="0"
+IUSE="+mmap"
+
+DEPEND=""
+PDEPEND="
+php_targets_php7-0? ( dev-php/pecl-apcu:7[php_targets_php7-0] )
+php_targets_php7-1? ( dev-php/pecl-apcu:7[php_targets_php7-1] )
+"
+
+LOCKS="pthreadmutex pthreadrw spinlock semaphore"
+
+LUSE=""
+for l in ${LOCKS}; do
+	LUSE+="lock_${l} "
+done
+
+IUSE+=" ${LUSE/lock_pthreadrw/+lock_pthreadrw}"
+
+REQUIRED_USE="^^ ( $LUSE )"
+
+src_prepare() {
+	if use php_targets_php5-6 ; then
+		php-ext-source-r3_src_prepare
+	else
+		eapply_user
+	fi
+}
+
+src_configure() {
+	if use php_targets_php5-6 ; then
+		local PHP_EXT_ECONF_ARGS=(
+			--enable-apcu
+			$(use_enable mmap apcu-mmap)
+			$(use_enable lock_pthreadrw apcu-rwlocks)
+			$(use_enable lock_spinlock apcu-spinlocks)
+		)
+
+		php-ext-source-r3_src_configure
+	fi
+}
+
+src_install() {
+	if use php_targets_php5-6 ; then
+		php-ext-pecl-r3_src_install
+
+		insinto "${PHP_EXT_SHARED_DIR}"
+		doins apc.php
+	fi
+}
+
+pkg_postinst() {
+	if use php_targets_php5-6 ; then
+		elog "The apc.php file shipped with this release of pecl-apcu was"
+		elog "installed into ${PHP_EXT_SHARED_DIR}."
+	fi
+}
--- a/dev-php/pecl-apcu/pecl-apcu-5.1.7.ebuild
+++ b/dev-php/pecl-apcu/pecl-apcu-5.1.7.ebuild
@ -0,0 +1,81 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PHP_EXT_NAME="apcu"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+DOCS=( NOTICE README.md TECHNOTES.txt TODO )
+
+# Define 5.6 here so we get the USE and REQUIRED_USE from the eclass
+# This allows us to depend on the other slot
+USE_PHP="php5-6 php7-0 php7-1"
+
+inherit php-ext-pecl-r3
+
+# However, we only really build for 7.x; so redefine it here
+USE_PHP="php7-0 php7-1"
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="Stripped down version of APC supporting only user cache"
+LICENSE="PHP-3.01"
+SLOT="7"
+IUSE="+mmap"
+
+DEPEND=""
+RDEPEND="${DEPEND} php_targets_php5-6? ( dev-php/pecl-apcu:0[php_targets_php5-6] )"
+
+LOCKS="pthreadmutex pthreadrw spinlock semaphore"
+
+LUSE=""
+for l in ${LOCKS}; do
+	LUSE+="lock_${l} "
+done
+
+IUSE+=" ${LUSE/lock_pthreadrw/+lock_pthreadrw}"
+
+REQUIRED_USE="^^ ( $LUSE )"
+
+src_prepare() {
+	if use php_targets_php7-0 || use php_targets_php7-1 ; then
+		php-ext-source-r3_src_prepare
+	else
+		eapply_user
+	fi
+}
+
+src_configure() {
+	if use php_targets_php7-0 || use php_targets_php7-1 ; then
+		local PHP_EXT_ECONF_ARGS=(
+			--enable-apcu
+			$(use_enable mmap apcu-mmap)
+			$(use_enable lock_pthreadrw apcu-rwlocks)
+			$(use_enable lock_spinlock apcu-spinlocks)
+		)
+
+		php-ext-source-r3_src_configure
+	fi
+}
+
+src_install() {
+	if use php_targets_php7-0 || use php_targets_php7-1 ; then
+		php-ext-pecl-r3_src_install
+
+		insinto /usr/share/php7/apcu
+		doins apc.php
+	fi
+}
+
+pkg_postinst() {
+	if use php_targets_php7-0 || use php_targets_php7-1 ; then
+		elog "The apc.php file shipped with this release of pecl-apcu was"
+		elog "installed into ${EPREFIX}/usr/share/php7/apcu/."
+		elog
+		elog "If you depend on the apc_* functions,"
+		elog "please install dev-php/pecl-apcu_bc as this extension no longer"
+		elog "provides backwards compatibility."
+	fi
+}
--- a/dev-php/pecl-apcu_bc/pecl-apcu_bc-1.0.3-r1.ebuild
+++ b/dev-php/pecl-apcu_bc/pecl-apcu_bc-1.0.3-r1.ebuild
@ -2,16 +2,17 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

-EAPI=5
+EAPI=6

 PHP_EXT_NAME="bc_apc"
 PHP_EXT_INI="yes"
 PHP_EXT_ZENDEXT="no"
-DOCS="README.md"
+PHP_EXT_EXTRA_ECONF=""
+DOCS=( README.md )

-USE_PHP="php7-0"
+USE_PHP="php7-0 php7-1"

-inherit php-ext-pecl-r2
+inherit php-ext-pecl-r3

 KEYWORDS="~amd64 ~x86"

@ -20,7 +21,7 @@ LICENSE="PHP-3.01"
 SLOT="0"
 IUSE=""

-DEPEND="dev-php/pecl-apcu[php_targets_php7-0]"
+DEPEND="dev-php/pecl-apcu:7[php_targets_php7-0?,php_targets_php7-1?]"
 RDEPEND="${DEPEND}"

 src_install() {
@ -30,5 +31,5 @@ src_install() {
 		php_init_slot_env ${slot}
 		mv "modules/apc.so" "modules/${PHP_EXT_NAME}.so" || die
 	done
-	php-ext-pecl-r2_src_install
+	php-ext-pecl-r3_src_install
 }
--- a/dev-python/cython/Manifest
+++ b/dev-python/cython/Manifest
@ -1,3 +1,4 @@
 DIST Cython-0.22.tar.gz 1584483 SHA256 14307e7a69af9a0d0e0024d446af7e51cc0e3e4d0dfb10d36ba837e5e5844015 SHA512 856220fa579e272ac38dcef091760f527431ff3b98df9af6e68416fcf77d9659ac5abe5c7dee41331f359614637a4ff452033085335ee499830ed126ab584267 WHIRLPOOL d9919e1fe33f7ea02833c485e10667d8470d7c69901b2419c6c4c1d464f9ef2444795e14903cc66b6fee40ec5a4c20308c331ad93fd8818f207d0a21cccf9b2b
 DIST Cython-0.24.1.tar.gz 1703756 SHA256 84808fda00508757928e1feadcf41c9f78e9a9b7167b6649ab0933b76f75e7b9 SHA512 c5a3e884edd782c47c81aef29708035bbcd1c14d17e005668da8a4e26fdbba9af9ec283fd46ceaa2cab6fc4ec0d42f7d409832d7cc0a3ec00e84b968b1bf27ea WHIRLPOOL 14224a56c5a6f5cd3f389225c440c65b30a5d1b92c63587c4e9af258b23b1bed1c01330830931c5aba596649d19b0aafd0e559aed5ad7b577a59417463fc3b4a
 DIST Cython-0.25.1.tar.gz 1701919 SHA256 e0941455769335ec5afb17dee36dc3833b7edc2ae20a8ed5806c58215e4b6669 SHA512 cde26de8b7a626ee39e66223e5b9b3d6b2db182531da7c36f1d63bd720693e710f1976eaeaa4745e7a4b7872ec608ba4784569199303bcbabe1cc464da2ad913 WHIRLPOOL ff5176ab6433767af1f44a16d27d35c8bf12dcf6cadcb37372b118a1613855cfeb9b1786e6449d922df9ad6bef6873e4d818fbb36656eaf532468480b42a76e9
+DIST Cython-0.25.2.tar.gz 1703315 SHA256 f141d1f9c27a07b5a93f7dc5339472067e2d7140d1c5a9e20112a5665ca60306 SHA512 1974b9374aeedb030307dc95aa6560ce9d5e1652783cd4552e96ef11663c73dd263e3521b68e7712abbb31628011e2e66320c5ee2577968684e2679eb80726e1 WHIRLPOOL bb12d06fddb30d99527e3a62e8788b7aee92787aec9c46e927658f7ee60c8f3e32acb34b2deee1d0cf6ece7f4b06288008082ac609b8cb4b101a1348b1017865
--- a/dev-python/cython/cython-0.25.2.ebuild
+++ b/dev-python/cython/cython-0.25.2.ebuild
@ -0,0 +1,81 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 flag-o-matic toolchain-funcs elisp-common
+
+MY_PN="Cython"
+MY_P="${MY_PN}-${PV/_/}"
+
+DESCRIPTION="A Python to C compiler"
+HOMEPAGE="http://cython.org https://pypi.python.org/pypi/Cython"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+
+IUSE="doc emacs test"
+
+RDEPEND="
+	emacs? ( virtual/emacs )
+"
+# On testing, setuptools invokes an error in running the testsuite cited in a number of recent bugs
+# spanning several packages. This bug has been fixed in the recent release of version 9.1
+DEPEND="${RDEPEND}
+	>=dev-python/setuptools-9.1[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/numpy[${PYTHON_USEDEP}] )"
+
+SITEFILE=50cython-gentoo.el
+S="${WORKDIR}/${MY_PN}-${PV%_*}"
+
+python_compile() {
+	if ! python_is_python3; then
+		local CFLAGS="${CFLAGS}"
+		local CXXFLAGS="${CXXFLAGS}"
+		append-flags -fno-strict-aliasing
+	fi
+
+	# Python gets confused when it is in sys.path before build.
+	local PYTHONPATH=
+	export PYTHONPATH
+
+	distutils-r1_python_compile
+}
+
+python_compile_all() {
+	use emacs && elisp-compile Tools/cython-mode.el
+
+	use doc && unset XDG_CONFIG_HOME && emake -C docs html
+}
+
+python_test() {
+	tc-export CC
+	"${PYTHON}" runtests.py -vv --work-dir "${BUILD_DIR}"/tests \
+		|| die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	local DOCS=( CHANGES.rst README.txt ToDo.txt USAGE.txt )
+	use doc && local HTML_DOCS=( docs/build/html/. )
+	distutils-r1_python_install_all
+
+	if use emacs; then
+		elisp-install ${PN} Tools/cython-mode.*
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
--- a/dev-python/protobuf-python/Manifest
+++ b/dev-python/protobuf-python/Manifest
@ -1 +1,3 @@
 DIST protobuf-3.0.0_beta3_p1.tar.gz 3673779 SHA256 494726c9a6a45a20cd085795a26e4f05627e9b3b1fa5ab21a8b0edc5db8173dc SHA512 bebe655ffa6f8dd9bfbf4d2fcce160de6d45f50fd802b8907833cde3f232b7b44186d06fe9cc01ed5dc7b4a040fd3069e2ec7d2704da596e8d3af80f8dba7e8b WHIRLPOOL d35dca8e402741e4d30c9c787f5927c7fe7f22619ddb3ca20d302c27fbeb929cecd55cc7e6785b28acb76c89893d2baf7fce3f685a3f186006e1e30a2901ae1b
+DIST protobuf-3.0.2.tar.gz 3917853 SHA256 b700647e11556b643ccddffd1f41d8cb7704ed02090af54cc517d44d912d11c1 SHA512 28eb8814555b0fe2cd57da6caf46802697a9612fccb3bba3ae7a379352437f81a18c1f6ab7242a22abea59c1ff9b06dcb6e2b52a97aa1a15cea6485ffc3c10c2 WHIRLPOOL 5c70def13be5e61d9405a24fdfc1efe9caee0b63c87f74e12f3d121801ecdc410e142eab80d8d4b49ebfe0c4f3cd13b2d77a17ec303978fec317265991a1f5a8
+DIST protobuf-3.1.0.tar.gz 4051503 SHA256 0a0ae63cbffc274efb573bdde9a253e3f32e458c41261df51c5dbc5ad541e8f7 SHA512 8d3289a16944c255bd1cceab696e515e52467f2bfe1cc10f6b32fabdf082d5acdc248ec9cadc572223a24d04d431f75921076153109cea2f90ee533f502ab47a WHIRLPOOL b8a0bee9ff549c8da45c2b56b12aafbed5807959cdb11b3888a0f30fd0d6df83a72f3c6ef9e266522754b8901792f65235a6e81a8b0f74cee15d59ecbe6dee68
--- a/dev-python/protobuf-python/protobuf-python-3.0.2.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-3.0.2.ebuild
@ -0,0 +1,40 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+# pypy fails tests; pypy3 fails even running tests
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+MY_PV=${PV/_beta/-beta-}
+MY_PV=${MY_PV/_p/.}
+
+DESCRIPTION="Google's Protocol Buffers - official Python bindings"
+HOMEPAGE="https://github.com/google/protobuf/ https://developers.google.com/protocol-buffers/"
+SRC_URI="https://github.com/google/protobuf/archive/v${MY_PV}.tar.gz -> protobuf-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/10"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE=""
+
+# Protobuf is only a build-time dep, but depends on the exact same version
+# (excluding revision), since we are using the same tarball.
+# In case of using the (linked) cpp implementation we should be fine with the same subslot.
+RDEPEND="${PYTHON_DEPS}
+	!<dev-libs/protobuf-3[python(-)]"
+
+DEPEND="${RDEPEND}
+	>=dev-libs/protobuf-3
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+
+PATCHES=( "${FILESDIR}/${PN}-3.0.0_beta3-link-against-installed-lib.patch" )
+
+S="${WORKDIR}/protobuf-${MY_PV}/python"
+python_test() {
+	distutils_install_for_testing
+	esetup.py test
+}
--- a/dev-python/protobuf-python/protobuf-python-3.1.0.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-3.1.0.ebuild
@ -0,0 +1,40 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+# pypy fails tests; pypy3 fails even running tests
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+MY_PV=${PV/_beta/-beta-}
+MY_PV=${MY_PV/_p/.}
+
+DESCRIPTION="Google's Protocol Buffers - official Python bindings"
+HOMEPAGE="https://github.com/google/protobuf/ https://developers.google.com/protocol-buffers/"
+SRC_URI="https://github.com/google/protobuf/archive/v${MY_PV}.tar.gz -> protobuf-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/11"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE=""
+
+# Protobuf is only a build-time dep, but depends on the exact same version
+# (excluding revision), since we are using the same tarball.
+# In case of using the (linked) cpp implementation we should be fine with the same subslot.
+RDEPEND="${PYTHON_DEPS}
+	!<dev-libs/protobuf-3[python(-)]"
+
+DEPEND="${RDEPEND}
+	>=dev-libs/protobuf-3
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+
+PATCHES=( "${FILESDIR}/${PN}-3.0.0_beta3-link-against-installed-lib.patch" )
+
+S="${WORKDIR}/protobuf-${MY_PV}/python"
+python_test() {
+	distutils_install_for_testing
+	esetup.py test
+}
--- a/media-sound/lilypond/Manifest
+++ b/media-sound/lilypond/Manifest
@ -1,3 +1,4 @@
 DIST lilypond-2.18.2.tar.gz 16027977 SHA256 329d733765b0ba7be1878ae3f457dbbb875cc2840d2b75af4afc48c9454fba07 SHA512 0692f6eb41733076ba7f610cd1e65762f4dfd67307e2ab9e222b140d58ae3a1bb1c6b3be3bcff778d57f161868cf6d57e99bf43bf20f2663d042a07493942ec6 WHIRLPOOL 95db264992a1e425fd1ee53d980941eef554c1784a1adfc105750d82d11664f61207c2b1897b6e99448790131c0715f08401f45b663c420553925596c6fd4b1c
 DIST lilypond-2.19.49.tar.gz 17037279 SHA256 cd190de273cfef61a76c7dec74700b1e8a5d0b44cc98d8a11b58325706c6a3ee SHA512 1b1cd356f332994855f67a1dd8d0aef02f0b133d3aa9c91ddba0950b78b1cb4dc243b0926f7ce0ac46677c8b3cd267cd03db965cb26f74928a645c9d358c6ba2 WHIRLPOOL e0ffd3cde364d234b2bc1f75a453cf40412accab69852befe5d6cc81e5e8dbf91afbb1f5bb3c05b43ff0444b7854621edf1a95dfad5dc46c869530b086685242
 DIST lilypond-2.19.50.tar.gz 17059560 SHA256 169ad09fac39512c780d917f5b164dc6a1570f19f5516f812df9eb2157224eb3 SHA512 14267d7e0b578b8b32913042438e4087904023860d3ad607faa3a702741176f2cecc019e0b6c5c88132a93696b087f59ede58e96972c877c911d20b89de1ecd2 WHIRLPOOL 1b8f31728541a9fcd1c34f22c544b464dc89c0591938a882097af1f0581e76dfa8ddb7c4f09f31ad4d5df413615f99bc774bd08a0a668879f9449ef9cd8ff8e4
+DIST lilypond-2.19.52.tar.gz 17064855 SHA256 77f4a62b2872f7d6813c7e58b9f8680fc4c3434b86f695117d135b5402e90409 SHA512 afdfa6f277235911b8cfb85985df110d740a580d7d8cb3899e682077674e71faaa050dab16d156d78c0e99243ddb59fb20282a3557309f8679ed457563364020 WHIRLPOOL 54882a8d43ce371ad3a27a955cd464a2296a630b7f274235e24373e08eca746535b0f62b8fca62e82ebed8425d8347a310405ee6134a248dc2e29ff9fd686e73
--- a/media-sound/lilypond/lilypond-2.19.52.ebuild
+++ b/media-sound/lilypond/lilypond-2.19.52.ebuild
@ -0,0 +1,142 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+[[ "${PV}" = "9999" ]] && inherit git-r3
+inherit elisp-common autotools python-single-r1
+
+if [[ "${PV}" = "9999" ]]; then
+	EGIT_REPO_URI="git://git.sv.gnu.org/lilypond.git"
+else
+	SRC_URI="http://download.linuxaudio.org/lilypond/sources/v${PV:0:4}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~x86"
+fi
+
+DESCRIPTION="GNU Music Typesetter"
+HOMEPAGE="http://lilypond.org/"
+
+LICENSE="GPL-3 FDL-1.3"
+SLOT="0"
+LANGS=" ca cs da de el eo es fi fr it ja nl ru sv tr uk vi zh_TW"
+IUSE="debug emacs profile vim-syntax ${LANGS// / linguas_}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND=">=app-text/ghostscript-gpl-8.15
+	>=dev-scheme/guile-1.8.2:12[deprecated,regex]
+	media-fonts/tex-gyre
+	media-libs/fontconfig
+	media-libs/freetype:2
+	>=x11-libs/pango-1.12.3
+	emacs? ( virtual/emacs )
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
+	app-text/t1utils
+	dev-lang/perl
+	dev-libs/kpathsea
+	>=dev-texlive/texlive-metapost-2013
+	|| (
+		>=app-text/texlive-core-2013
+		>=dev-tex/metapost-1.803
+	)
+	virtual/pkgconfig
+	media-gfx/fontforge[png]
+	>=sys-apps/texinfo-4.11
+	>=sys-devel/bison-2.0
+	sys-devel/flex
+	sys-devel/gettext
+	sys-devel/make"
+
+# Correct output data for tests isn't bundled with releases
+RESTRICT="test"
+
+DOCS=( DEDICATION HACKING README.txt ROADMAP )
+
+pkg_setup() {
+	# make sure >=metapost-1.803 is selected if it's installed, bug 498704
+	if [[ ${MERGE_TYPE} != binary ]] && has_version ">=dev-tex/metapost-1.803" ; then
+		if [[ $(readlink "${EROOT}"/usr/bin/mpost) =~ mpost-texlive-* ]] ; then
+			einfo "Updating metapost symlink"
+			eselect mpost update || die
+		fi
+	fi
+
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	if ! use vim-syntax ; then
+		sed -i 's/vim//' GNUmakefile.in || die
+	fi
+
+	# respect CFLAGS
+	sed -i 's/OPTIMIZE -g/OPTIMIZE/' aclocal.m4 || die
+
+	for lang in ${LANGS}; do
+		use linguas_${lang} || rm po/${lang}.po || die
+	done
+
+	# respect AR
+	sed -i "s/^AR=ar/AR=$(tc-getAR)/" stepmake/stepmake/library-vars.make || die
+
+	# remove bundled texinfo file (fixes bug #448560)
+	rm tex/texinfo.tex || die
+
+	eautoreconf
+}
+
+src_configure() {
+	# documentation generation currently not supported since it requires a newer
+	# version of texi2html than is currently in the tree
+
+	local myeconfargs+=(
+		--with-texgyre-dir=/usr/share/fonts/tex-gyre
+		--disable-documentation
+		--disable-optimising
+		--disable-pipe
+		$(use_enable debug debugging)
+		$(use_enable profile profiling)
+	)
+
+	has_version ">=dev-scheme/guile-2" && myeconfargs+=( --enable-guile2 )
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+
+	if use emacs ; then
+		elisp-compile elisp/lilypond-{font-lock,indent,mode,what-beat}.el \
+			|| die "elisp-compile failed"
+	fi
+}
+
+src_install () {
+	emake DESTDIR="${D}" vimdir=/usr/share/vim/vimfiles install
+
+	# remove elisp files since they are in the wrong directory
+	rm -r "${ED}"/usr/share/emacs || die
+
+	if use emacs ; then
+		elisp-install ${PN} elisp/*.{el,elc} elisp/out/*.el \
+			|| die "elisp-install failed"
+		elisp-site-file-install "${FILESDIR}"/50${PN}-gentoo.el
+	fi
+
+	python_fix_shebang "${ED}"
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@ -1 +1 @@
-Thu, 08 Dec 2016 20:43:15 +0000
+Fri, 09 Dec 2016 05:13:18 +0000
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@ -1 +1 @@
-Thu, 08 Dec 2016 20:43:15 +0000
+Fri, 09 Dec 2016 05:13:18 +0000
--- a/metadata/md5-cache/app-emulation/libvirt-2.4.0-r1
+++ b/metadata/md5-cache/app-emulation/libvirt-2.4.0-r1
@ -11,4 +11,4 @@ REQUIRED_USE=firewalld? ( virt-network ) libvirtd? ( || ( lxc openvz qemu uml vi
 SLOT=0/2.4.0
 SRC_URI=http://libvirt.org/sources/libvirt-2.4.0.tar.xz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	b83a2420b796f7c6eff682679d08fe25	libtool	4890219c51da247200223277f993e054	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multilib	165fc17c38d1b11dac2008280dab6e80	readme.gentoo-r1	03878c06495db70bc36bd717383c09f7	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=e0f278cc57cc3590ddd7f2f2e4fe3dfa
+_md5_=0d1d3b94ba7b86ad103382f111bea31f
--- a/metadata/md5-cache/app-shells/mpv-bash-completion-3.3.7
+++ b/metadata/md5-cache/app-shells/mpv-bash-completion-3.3.7
@ -8,6 +8,6 @@ KEYWORDS=~amd64
 LICENSE=GPL-3+
 RDEPEND=>=media-video/mpv-0.14.0[cli] >=app-shells/bash-completion-2.3-r1
 SLOT=0
-SRC_URI=https://github.com/2ion/mpv-bash-completion/archive/3.3.6.tar.gz -> mpv-bash-completion-3.3.6.tar.gz
+SRC_URI=https://github.com/2ion/mpv-bash-completion/archive/3.3.7.tar.gz -> mpv-bash-completion-3.3.7.tar.gz
 _eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
 _md5_=d06b42b755341ddaabe30125382bb600
--- a/metadata/md5-cache/app-shells/scsh-0.6.7-r2
+++ b/metadata/md5-cache/app-shells/scsh-0.6.7-r2
@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=!dev-scheme/scheme48
+DESCRIPTION=Unix shell embedded in Scheme
+EAPI=6
+HOMEPAGE=http://www.scsh.net/
+KEYWORDS=~amd64 ~ppc ~sparc ~x86
+LICENSE=BSD
+RDEPEND=!dev-scheme/scheme48
+RESTRICT=test
+SLOT=0
+SRC_URI=ftp://ftp.scsh.net/pub/scsh/0.6/scsh-0.6.7.tar.gz
+_eclasses_=multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
+_md5_=0fab4350fed51218e7376081407ea994
--- a/metadata/md5-cache/app-shells/scsh-install-lib-1.3.0-r1
+++ b/metadata/md5-cache/app-shells/scsh-install-lib-1.3.0-r1
@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare unpack
+DEPEND=>=app-shells/scsh-0.6.6
+DESCRIPTION=Installation tool for the Scheme Untergrund Library
+EAPI=6
+HOMEPAGE=http://lamp.epfl.ch/~schinz/scsh_packages/
+IUSE=scsh
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+SLOT=0
+SRC_URI=http://lamp.epfl.ch/~schinz/scsh_packages/scsh-install-lib-1.3.0.tar.gz
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	scsh	c32176250adea484e0f57d45fa77d101	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
+_md5_=89707c8494782d29440b41143e70472b
--- a/metadata/md5-cache/dev-java/protobuf-java-3.0.2
+++ b/metadata/md5-cache/dev-java/protobuf-java-3.0.2
@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install preinst prepare setup
+DEPEND=>=virtual/jdk-1.7 >=dev-libs/protobuf-3 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Google's Protocol Buffers - official Java Bindings
+EAPI=6
+HOMEPAGE=https://github.com/google/protobuf/ https://developers.google.com/protocol-buffers/
+IUSE=nano elibc_FreeBSD doc source elibc_FreeBSD
+KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc64 ~sh ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.7 !<dev-libs/protobuf-3[java(-)] >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=0/10
+SRC_URI=https://github.com/google/protobuf/archive/v3.0.2.tar.gz -> protobuf-3.0.2.tar.gz
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=af2ca79360dc08a1a414c435ba61cd47
--- a/metadata/md5-cache/dev-java/protobuf-java-3.1.0
+++ b/metadata/md5-cache/dev-java/protobuf-java-3.1.0
@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install preinst prepare setup
+DEPEND=>=virtual/jdk-1.7 >=dev-libs/protobuf-3 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Google's Protocol Buffers - official Java Bindings
+EAPI=6
+HOMEPAGE=https://github.com/google/protobuf/ https://developers.google.com/protocol-buffers/
+IUSE=nano elibc_FreeBSD doc source elibc_FreeBSD
+KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc64 ~sh ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.7 !<dev-libs/protobuf-3[java(-)] >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=0/11
+SRC_URI=https://github.com/google/protobuf/archive/v3.1.0.tar.gz -> protobuf-3.1.0.tar.gz
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	java-pkg-2	eb1f0d7d874162c70088f5ae32c31ee7	java-pkg-simple	88558e9b1185c8404cf95c1ea077592c	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=f4a5fc0eeb1e71c3b7a9b62d19482855
--- a/metadata/md5-cache/dev-lang/php-5.6.28-r1
+++ b/metadata/md5-cache/dev-lang/php-5.6.28-r1
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] acl? ( sys-apps/acl ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) 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:0 ) 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/libmysqlclient:= ) mysqli? ( virtual/libmysqlclient:= ) ) 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:0= ) 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? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) 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 ) app-arch/xz-utils >=sys-devel/bison-3.0.1 sys-devel/flex >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DESCRIPTION=The PHP language runtime engine
+EAPI=6
+HOMEPAGE=http://php.net/
+IUSE=embed +cli cgi fpm apache2 threads acl 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 libressl 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
+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.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
+RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] acl? ( sys-apps/acl ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) 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:0 ) 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/libmysqlclient:= ) mysqli? ( virtual/libmysqlclient:= ) ) 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:0= ) 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? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) 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 ) )
+REQUIRED_USE=cli? ( ^^ ( readline libedit ) ) 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.6
+SRC_URI=http://php.net/distributions/php-5.6.28.tar.xz
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=489e7938d36ce74809319d87facf9a33
--- a/metadata/md5-cache/dev-lang/php-7.0.13
+++ b/metadata/md5-cache/dev-lang/php-7.0.13
@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=app-eselect/eselect-php-0.9.1[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:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) 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:0 ) 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] ) 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:0= ) 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? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) unicode? ( dev-libs/oniguruma ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp ) 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 ) app-arch/xz-utils >=sys-devel/bison-3.0.1 sys-devel/flex >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=The PHP language runtime engine
-EAPI=6
-HOMEPAGE=http://php.net/
-IUSE=embed +cli cgi fpm apache2 phpdbg 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 libressl mhash mssql mysql 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 sysvipc systemd tidy +tokenizer truetype unicode wddx webp +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib
-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.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
-RDEPEND=>=app-eselect/eselect-php-0.9.1[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:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) 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:0 ) 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] ) 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:0= ) 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? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) unicode? ( dev-libs/oniguruma ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp ) 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 ) )
-REQUIRED_USE=cli? ( ^^ ( readline libedit ) ) truetype? ( gd ) webp? ( 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 ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysqli ) sharedmem? ( !threads ) mysql? ( || ( mysqli pdo ) ) || ( cli cgi fpm apache2 embed phpdbg )
-SLOT=7.0
-SRC_URI=http://php.net/distributions/php-7.0.13.tar.xz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=38e3ab6edde66d43d7591539a29f9578
--- a/metadata/md5-cache/dev-lang/php-7.0.14
+++ b/metadata/md5-cache/dev-lang/php-7.0.14
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] acl? ( sys-apps/acl ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) 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:0 ) 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] ) 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:0= ) 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? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) unicode? ( dev-libs/oniguruma ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp ) 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 ) app-arch/xz-utils >=sys-devel/bison-3.0.1 sys-devel/flex >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DESCRIPTION=The PHP language runtime engine
+EAPI=6
+HOMEPAGE=http://php.net/
+IUSE=embed +cli cgi fpm apache2 phpdbg threads acl 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 libressl mhash mssql mysql 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 sysvipc systemd tidy +tokenizer truetype unicode wddx webp +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib
+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.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
+RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] acl? ( sys-apps/acl ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) 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:0 ) 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] ) 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:0= ) 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? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) unicode? ( dev-libs/oniguruma ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp ) 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 ) )
+REQUIRED_USE=cli? ( ^^ ( readline libedit ) ) truetype? ( gd ) webp? ( 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 ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysqli ) sharedmem? ( !threads ) mysql? ( || ( mysqli pdo ) ) || ( cli cgi fpm apache2 embed phpdbg )
+SLOT=7.0
+SRC_URI=http://php.net/distributions/php-7.0.14.tar.xz
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=5fab1bd5a1db85cba1a552cb003eee43
--- a/metadata/md5-cache/dev-lang/php-7.1.0
+++ b/metadata/md5-cache/dev-lang/php-7.1.0
@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=app-eselect/eselect-php-0.9.1[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:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) 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:0 ) 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] ) 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:0= ) 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? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) tidy? ( app-text/tidy-html5 ) truetype? ( =media-libs/freetype-2* !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) unicode? ( dev-libs/oniguruma ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp ) 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 ) app-arch/xz-utils >=sys-devel/bison-3.0.1 virtual/pkgconfig
-DESCRIPTION=The PHP language runtime engine
-EAPI=6
-HOMEPAGE=http://php.net/
-IUSE=embed +cli cgi fpm apache2 phpdbg 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 libressl mhash mssql mysql 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 sysvipc systemd test tidy +tokenizer truetype unicode wddx webp +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib
-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.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
-RDEPEND=>=app-eselect/eselect-php-0.9.1[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:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) 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:0 ) 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] ) 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:0= ) 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? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) tidy? ( app-text/tidy-html5 ) truetype? ( =media-libs/freetype-2* !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) unicode? ( dev-libs/oniguruma ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp ) 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 ) )
-REQUIRED_USE=cli? ( ^^ ( readline libedit ) ) truetype? ( gd ) webp? ( 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 ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysqli ) sharedmem? ( !threads ) mysql? ( || ( mysqli pdo ) ) || ( cli cgi fpm apache2 embed phpdbg )
-SLOT=7.1
-SRC_URI=http://php.net/distributions/php-7.1.0.tar.xz
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=50d09ed6583f3116f6dadeae86eaf7eb
--- a/metadata/md5-cache/dev-lang/php-7.1.0-r2
+++ b/metadata/md5-cache/dev-lang/php-7.1.0-r2
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] acl? ( sys-apps/acl ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) 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:0 ) 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] ) 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:0= ) 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? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) truetype? ( =media-libs/freetype-2* !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) unicode? ( dev-libs/oniguruma ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp ) 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 ) app-arch/xz-utils >=sys-devel/bison-3.0.1 virtual/pkgconfig
+DESCRIPTION=The PHP language runtime engine
+EAPI=6
+HOMEPAGE=http://php.net/
+IUSE=embed +cli cgi fpm apache2 phpdbg threads acl 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 libressl mhash mssql mysql 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 sysvipc systemd test tidy +tokenizer truetype unicode wddx webp +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib
+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.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )
+RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] acl? ( sys-apps/acl ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.1 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 ) ) 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:0 ) 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] ) 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:0= ) 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? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) ) truetype? ( =media-libs/freetype-2* !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) unicode? ( dev-libs/oniguruma ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp ) 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 ) )
+REQUIRED_USE=cli? ( ^^ ( readline libedit ) ) truetype? ( gd ) webp? ( 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 ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysqli ) sharedmem? ( !threads ) mysql? ( || ( mysqli pdo ) ) || ( cli cgi fpm apache2 embed phpdbg )
+SLOT=7.1
+SRC_URI=http://php.net/distributions/php-7.1.0.tar.xz
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=d17321f04ee2c31c97195247bf51b7bc
--- a/metadata/md5-cache/dev-libs/DirectFB-1.4.9-r1
+++ b/metadata/md5-cache/dev-libs/DirectFB-1.4.9-r1
@ -2,12 +2,12 @@ DEFINED_PHASES=configure install postinst prepare
 DEPEND=sdl? ( media-libs/libsdl ) gif? ( media-libs/giflib ) png? ( media-libs/libpng ) jpeg? ( virtual/jpeg ) zlib? ( sys-libs/zlib ) truetype? ( >=media-libs/freetype-2.0.1 ) X? ( x11-libs/libXext x11-libs/libX11 ) X? ( x11-proto/xextproto x11-proto/xproto )
 DESCRIPTION=Thin library on top of the Linux framebuffer devices
 EAPI=2
-HOMEPAGE=http://www.directfb.org/
+HOMEPAGE=http://www.directfb.net/
 IUSE=debug doc fbcon gif jpeg cpu_flags_x86_mmx png sdl cpu_flags_x86_sse static-libs truetype v4l X zlib video_cards_intel video_cards_mach64 video_cards_mga video_cards_neomagic video_cards_nsc video_cards_nvidia video_cards_r128 video_cards_radeon video_cards_s3 video_cards_savage video_cards_sis video_cards_tdfx video_cards_via video_cards_vmware input_devices_dynapro input_devices_elo2300 input_devices_evdev input_devices_joystick input_devices_keyboard input_devices_lirc input_devices_mouse input_devices_mutouch input_devices_tslib
 KEYWORDS=alpha amd64 arm hppa ia64 -mips ppc ppc64 sh -sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=sdl? ( media-libs/libsdl ) gif? ( media-libs/giflib ) png? ( media-libs/libpng ) jpeg? ( virtual/jpeg ) zlib? ( sys-libs/zlib ) truetype? ( >=media-libs/freetype-2.0.1 ) X? ( x11-libs/libXext x11-libs/libX11 )
 SLOT=0
-SRC_URI=http://directfb.org/downloads/Core/DirectFB-1.4/DirectFB-1.4.9.tar.gz http://directfb.org/downloads/Old/DirectFB-1.4.9.tar.gz
+SRC_URI=http://directfb.net/downloads/Core/DirectFB-1.4/DirectFB-1.4.9.tar.gz http://directfb.net/downloads/Old/DirectFB-1.4.9.tar.gz
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=4eb369576bd1e4b4d1799e851683d8de
+_md5_=34a4da9934ae0e2af5d6c1da0a3afdb6
--- a/metadata/md5-cache/dev-libs/DirectFB-1.7.6
+++ b/metadata/md5-cache/dev-libs/DirectFB-1.7.6
@ -2,13 +2,13 @@ DEFINED_PHASES=configure install postinst prepare
 DEPEND=alsa? ( media-libs/alsa-lib ) cddb? ( media-libs/libcddb ) drmkms? ( x11-libs/libdrm[libkms] ) gif? ( media-libs/giflib ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) imlib2? ( media-libs/imlib2 ) jpeg? ( virtual/jpeg:0= ) jpeg2k? ( media-libs/jasper:=[jpeg] ) mad? ( media-libs/libmad ) mng? ( media-libs/libmng ) mpeg3? ( media-libs/libmpeg3 ) opengl? ( media-libs/mesa[gbm,egl?,gles2?] x11-libs/libdrm ) png? ( media-libs/libpng:0= ) sdl? ( media-libs/libsdl ) tiff? ( media-libs/tiff:0 ) timidity? ( media-libs/libtimidity media-sound/timidity++ ) tremor? ( media-libs/tremor ) truetype? ( >=media-libs/freetype-2.0.1 ) vdpau? ( x11-proto/xproto x11-libs/libX11 x11-libs/libXext x11-libs/libvdpau ) vorbis? ( media-libs/libvorbis ) webp? ( media-libs/libwebp ) X? ( x11-libs/libXext x11-libs/libX11 ) xine? ( media-libs/xine-lib[vdpau?] ) zlib? ( sys-libs/zlib ) X? ( x11-proto/xextproto x11-proto/xproto ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Thin library on top of the Linux framebuffer devices
 EAPI=5
-HOMEPAGE=http://www.directfb.org/
+HOMEPAGE=http://www.directfb.net/
 IUSE=alsa bmp cddb debug divine drmkms +dynload doc egl fbcon fusiondale fusionsound gif gles2 gstreamer imlib2 input_hub jpeg jpeg2k mad cpu_flags_x86_mmx mng mpeg2 mpeg3 multicore opengl oss png pnm sawman sdl cpu_flags_x86_sse static-libs swfdec tiff timidity tremor truetype v4l vdpau vorbis webp X xine zlib video_cards_intel video_cards_mach64 video_cards_mga video_cards_neomagic video_cards_nsc video_cards_nvidia video_cards_r128 video_cards_radeon video_cards_s3 video_cards_sis video_cards_tdfx video_cards_via video_cards_vmware input_devices_dynapro input_devices_elo2300 input_devices_evdev input_devices_joystick input_devices_keyboard input_devices_lirc input_devices_mouse input_devices_mutouch input_devices_tslib
 KEYWORDS=alpha amd64 arm ~hppa ~ia64 -mips ~ppc ~ppc64 ~sh -sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=alsa? ( media-libs/alsa-lib ) cddb? ( media-libs/libcddb ) drmkms? ( x11-libs/libdrm[libkms] ) gif? ( media-libs/giflib ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) imlib2? ( media-libs/imlib2 ) jpeg? ( virtual/jpeg:0= ) jpeg2k? ( media-libs/jasper:=[jpeg] ) mad? ( media-libs/libmad ) mng? ( media-libs/libmng ) mpeg3? ( media-libs/libmpeg3 ) opengl? ( media-libs/mesa[gbm,egl?,gles2?] x11-libs/libdrm ) png? ( media-libs/libpng:0= ) sdl? ( media-libs/libsdl ) tiff? ( media-libs/tiff:0 ) timidity? ( media-libs/libtimidity media-sound/timidity++ ) tremor? ( media-libs/tremor ) truetype? ( >=media-libs/freetype-2.0.1 ) vdpau? ( x11-proto/xproto x11-libs/libX11 x11-libs/libXext x11-libs/libvdpau ) vorbis? ( media-libs/libvorbis ) webp? ( media-libs/libwebp ) X? ( x11-libs/libXext x11-libs/libX11 ) xine? ( media-libs/xine-lib[vdpau?] ) zlib? ( sys-libs/zlib )
 REQUIRED_USE=gles2? ( opengl )
 SLOT=0
-SRC_URI=http://directfb.org/downloads/Core/DirectFB-1.7/DirectFB-1.7.6.tar.gz http://directfb.org/downloads/Old/DirectFB-1.7.6.tar.gz
+SRC_URI=http://directfb.net/downloads/Core/DirectFB-1.7/DirectFB-1.7.6.tar.gz http://directfb.net/downloads/Old/DirectFB-1.7.6.tar.gz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=57aee876c5692cde57c0b942a2cf8755
+_md5_=3b4494fda3366d5f4f6eada7aa82262f
--- a/metadata/md5-cache/dev-libs/protobuf-3.0.2
+++ b/metadata/md5-cache/dev-libs/protobuf-3.0.2
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=emacs? ( virtual/emacs ) zlib? ( >=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(-)?] ) test? ( dev-cpp/gmock[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-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Google's Protocol Buffers -- an efficient method of encoding structured data
+EAPI=6
+HOMEPAGE=https://github.com/google/protobuf/ https://developers.google.com/protocol-buffers/
+IUSE=emacs examples java python static-libs test vim-syntax zlib python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos
+LICENSE=Apache-2.0
+PDEPEND=java? ( dev-java/protobuf-java ) python? ( dev-python/protobuf-python[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
+REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 ) )
+SLOT=0/10
+SRC_URI=https://github.com/google/protobuf/archive/v3.0.2.tar.gz -> protobuf-3.0.2.tar.gz
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
+_md5_=9b4bbae5aaf27f2edb453c35c755e6c0
--- a/metadata/md5-cache/dev-libs/protobuf-3.1.0
+++ b/metadata/md5-cache/dev-libs/protobuf-3.1.0
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=emacs? ( virtual/emacs ) zlib? ( >=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(-)?] ) test? ( dev-cpp/gmock[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-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Google's Protocol Buffers -- an efficient method of encoding structured data
+EAPI=6
+HOMEPAGE=https://github.com/google/protobuf/ https://developers.google.com/protocol-buffers/
+IUSE=emacs examples java python static-libs test vim-syntax zlib python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos
+LICENSE=Apache-2.0
+PDEPEND=java? ( dev-java/protobuf-java ) python? ( dev-python/protobuf-python[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
+REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 ) )
+SLOT=0/11
+SRC_URI=https://github.com/google/protobuf/archive/v3.1.0.tar.gz -> protobuf-3.1.0.tar.gz
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
+_md5_=6df63c5706757fc693c5cb444c1ef1c5
--- a/metadata/md5-cache/dev-php/pecl-apcu-4.0.11
+++ b/metadata/md5-cache/dev-php/pecl-apcu-4.0.11
@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare test unpack
+DEPEND=!<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 )
+DESCRIPTION=Stripped down version of APC supporting only user cache
+EAPI=6
+HOMEPAGE=http://pecl.php.net/apcu
+IUSE=+mmap lock_pthreadmutex +lock_pthreadrw lock_spinlock lock_semaphore php_targets_php5-6 php_targets_php7-0 php_targets_php7-1
+KEYWORDS=~amd64 ~x86
+LICENSE=PHP-3.01
+PDEPEND=php_targets_php7-0? ( dev-php/pecl-apcu:7[php_targets_php7-0] ) php_targets_php7-1? ( dev-php/pecl-apcu:7[php_targets_php7-1] )
+RDEPEND=php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 )
+REQUIRED_USE=^^ ( lock_pthreadmutex lock_pthreadrw lock_spinlock lock_semaphore ) || ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 )
+SLOT=0
+SRC_URI=http://pecl.php.net/get/apcu-4.0.11.tgz
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	php-ext-pecl-r3	362ad55b4b4b63dd1cf7df6cbca082c3	php-ext-source-r3	a30f64f44cd0439913e37281006faaca	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
+_md5_=df2987873233518bc12d965824014220
--- a/metadata/md5-cache/dev-php/pecl-apcu-5.1.7
+++ b/metadata/md5-cache/dev-php/pecl-apcu-5.1.7
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test unpack
+DEPEND=!<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 )
+DESCRIPTION=Stripped down version of APC supporting only user cache
+EAPI=6
+HOMEPAGE=http://pecl.php.net/apcu
+IUSE=+mmap lock_pthreadmutex +lock_pthreadrw lock_spinlock lock_semaphore php_targets_php5-6 php_targets_php7-0 php_targets_php7-1
+KEYWORDS=~amd64 ~x86
+LICENSE=PHP-3.01
+RDEPEND=php_targets_php5-6? ( dev-php/pecl-apcu:0[php_targets_php5-6] ) php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 )
+REQUIRED_USE=^^ ( lock_pthreadmutex lock_pthreadrw lock_spinlock lock_semaphore ) || ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 )
+SLOT=7
+SRC_URI=http://pecl.php.net/get/apcu-5.1.7.tgz
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	php-ext-pecl-r3	362ad55b4b4b63dd1cf7df6cbca082c3	php-ext-source-r3	a30f64f44cd0439913e37281006faaca	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
+_md5_=18e6f84f60a66e8529842b8eeb2efaf2
--- a/metadata/md5-cache/dev-php/pecl-apcu_bc-1.0.3
+++ b/metadata/md5-cache/dev-php/pecl-apcu_bc-1.0.3
@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-php/pecl-apcu[php_targets_php7-0] !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php7-0? ( dev-lang/php:7.0 )
-DESCRIPTION=Provides APC backwards compatibility functions via APCu
-EAPI=5
-HOMEPAGE=http://pecl.php.net/apcu_bc
-IUSE=php_targets_php7-0
-KEYWORDS=~amd64 ~x86
-LICENSE=PHP-3.01
-RDEPEND=dev-php/pecl-apcu[php_targets_php7-0] php_targets_php7-0? ( dev-lang/php:7.0 )
-REQUIRED_USE=|| ( php_targets_php7-0 )
-SLOT=0
-SRC_URI=http://pecl.php.net/get/apcu_bc-1.0.3.tgz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	php-ext-pecl-r2	738a8315cc641f854af2e615c618e70b	php-ext-source-r2	d3d06f8b11fb8481e555b58df7360663	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=65d4d8b5069d203e66ced85134390652
--- a/metadata/md5-cache/dev-php/pecl-apcu_bc-1.0.3-r1
+++ b/metadata/md5-cache/dev-php/pecl-apcu_bc-1.0.3-r1
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-php/pecl-apcu:7[php_targets_php7-0?,php_targets_php7-1?] !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 )
+DESCRIPTION=Provides APC backwards compatibility functions via APCu
+EAPI=6
+HOMEPAGE=http://pecl.php.net/apcu_bc
+IUSE=php_targets_php7-0 php_targets_php7-1
+KEYWORDS=~amd64 ~x86
+LICENSE=PHP-3.01
+RDEPEND=dev-php/pecl-apcu:7[php_targets_php7-0?,php_targets_php7-1?] php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 )
+REQUIRED_USE=|| ( php_targets_php7-0 php_targets_php7-1 )
+SLOT=0
+SRC_URI=http://pecl.php.net/get/apcu_bc-1.0.3.tgz
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	php-ext-pecl-r3	362ad55b4b4b63dd1cf7df6cbca082c3	php-ext-source-r3	a30f64f44cd0439913e37281006faaca	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
+_md5_=3260854b67f4d8bf5f94cceba4c9dc71
--- a/metadata/md5-cache/dev-python/cython-0.25.2
+++ b/metadata/md5-cache/dev-python/cython-0.25.2
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=emacs? ( virtual/emacs ) >=dev-python/setuptools-9.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) test? ( dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DESCRIPTION=A Python to C compiler
+EAPI=6
+HOMEPAGE=http://cython.org https://pypi.python.org/pypi/Cython
+IUSE=doc emacs test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=emacs? ( virtual/emacs ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=mirror://pypi/C/Cython/Cython-0.25.2.tar.gz
+_eclasses_=distutils-r1	583a05d30524485fda6869c772682ecd	elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=1f267a20792076a3adbc058bae536a2b
--- a/metadata/md5-cache/dev-python/protobuf-python-3.0.2
+++ b/metadata/md5-cache/dev-python/protobuf-python-3.0.2
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !<dev-libs/protobuf-3[python(-)] >=dev-libs/protobuf-3 dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DESCRIPTION=Google's Protocol Buffers - official Python bindings
+EAPI=6
+HOMEPAGE=https://github.com/google/protobuf/ https://developers.google.com/protocol-buffers/
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos
+LICENSE=Apache-2.0
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !<dev-libs/protobuf-3[python(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0/10
+SRC_URI=https://github.com/google/protobuf/archive/v3.0.2.tar.gz -> protobuf-3.0.2.tar.gz
+_eclasses_=distutils-r1	583a05d30524485fda6869c772682ecd	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=321900b51a7f9d9fa203fb8cb5fcd38c
--- a/metadata/md5-cache/dev-python/protobuf-python-3.1.0
+++ b/metadata/md5-cache/dev-python/protobuf-python-3.1.0
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !<dev-libs/protobuf-3[python(-)] >=dev-libs/protobuf-3 dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DESCRIPTION=Google's Protocol Buffers - official Python bindings
+EAPI=6
+HOMEPAGE=https://github.com/google/protobuf/ https://developers.google.com/protocol-buffers/
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos
+LICENSE=Apache-2.0
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !<dev-libs/protobuf-3[python(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0/11
+SRC_URI=https://github.com/google/protobuf/archive/v3.1.0.tar.gz -> protobuf-3.1.0.tar.gz
+_eclasses_=distutils-r1	583a05d30524485fda6869c772682ecd	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=4ceb1eb3387e4fb994aecf6620f06234
--- a/metadata/md5-cache/media-sound/lilypond-2.19.52
+++ b/metadata/md5-cache/media-sound/lilypond-2.19.52
@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup
+DEPEND=>=app-text/ghostscript-gpl-8.15 >=dev-scheme/guile-1.8.2:12[deprecated,regex] media-fonts/tex-gyre media-libs/fontconfig media-libs/freetype:2 >=x11-libs/pango-1.12.3 emacs? ( virtual/emacs ) >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] app-text/t1utils dev-lang/perl dev-libs/kpathsea >=dev-texlive/texlive-metapost-2013 || ( >=app-text/texlive-core-2013 >=dev-tex/metapost-1.803 ) virtual/pkgconfig media-gfx/fontforge[png] >=sys-apps/texinfo-4.11 >=sys-devel/bison-2.0 sys-devel/flex sys-devel/gettext sys-devel/make !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=GNU Music Typesetter
+EAPI=6
+HOMEPAGE=http://lilypond.org/
+IUSE=debug emacs profile vim-syntax linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_eo linguas_es linguas_fi linguas_fr linguas_it linguas_ja linguas_nl linguas_ru linguas_sv linguas_tr linguas_uk linguas_vi linguas_zh_TW python_targets_python2_7
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~x86
+LICENSE=GPL-3 FDL-1.3
+RDEPEND=>=app-text/ghostscript-gpl-8.15 >=dev-scheme/guile-1.8.2:12[deprecated,regex] media-fonts/tex-gyre media-libs/fontconfig media-libs/freetype:2 >=x11-libs/pango-1.12.3 emacs? ( virtual/emacs ) >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)]
+REQUIRED_USE=python_targets_python2_7
+RESTRICT=test
+SLOT=0
+SRC_URI=http://download.linuxaudio.org/lilypond/sources/v2.19/lilypond-2.19.52.tar.gz
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
+_md5_=efd9eea8df2dba93e982f4440616f6b1
--- a/metadata/md5-cache/net-dns/nsd-4.1.14
+++ b/metadata/md5-cache/net-dns/nsd-4.1.14
@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=virtual/yacc libevent? ( dev-libs/libevent ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) munin? ( net-analyzer/munin )
 SLOT=0
-SRC_URI=http://www.nlnetlabs.nl/downloads/nsd/nsd-4.1.12.tar.gz
+SRC_URI=http://www.nlnetlabs.nl/downloads/nsd/nsd-4.1.14.tar.gz
 _eclasses_=multilib	165fc17c38d1b11dac2008280dab6e80	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87
 _md5_=f6088265d6e649e542c4522d9816cc86
--- a/metadata/md5-cache/sys-apps/firejail-0.9.42-r1
+++ b/metadata/md5-cache/sys-apps/firejail-0.9.42-r1
@ -1,13 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=apparmor? ( sys-libs/libapparmor )
-DESCRIPTION=Security sandbox for any type of processes
-EAPI=6
-HOMEPAGE=https://firejail.wordpress.com/
-IUSE=apparmor +bind +chroot +file-transfer +network network-restricted +seccomp +userns x11
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=apparmor? ( sys-libs/libapparmor ) x11? ( x11-wm/xpra[client,server] )
-SLOT=0
-SRC_URI=mirror://sourceforge/firejail/firejail-0.9.42.tar.xz
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=249c93051e38563e9672922af5f41e4c
--- a/metadata/md5-cache/sys-apps/firejail-0.9.44.2
+++ b/metadata/md5-cache/sys-apps/firejail-0.9.44.2
@ -8,6 +8,6 @@ KEYWORDS=~amd64
 LICENSE=GPL-2
 RDEPEND=apparmor? ( sys-libs/libapparmor ) x11? ( x11-wm/xpra[client,server] )
 SLOT=0
-SRC_URI=mirror://sourceforge/firejail/firejail-0.9.44.tar.xz
+SRC_URI=mirror://sourceforge/firejail/firejail-0.9.44.2.tar.xz
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
 _md5_=2bd8e6550e9668536ba9bd7a8d2cbc48
--- a/metadata/md5-cache/sys-apps/groff-1.22.2
+++ b/metadata/md5-cache/sys-apps/groff-1.22.2
@ -10,4 +10,4 @@ RDEPEND=X? ( x11-libs/libX11 x11-libs/libXt x11-libs/libXmu x11-libs/libXaw x11-
 SLOT=0
 SRC_URI=mirror://gnu/groff/groff-1.22.2.tar.gz l10n_ja? ( https://dev.gentoo.org/~naota/patch/groff-1.22.1-japanese.patch.bz2 )
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=f3c4d2006f595fa2b3669f94a478517f
+_md5_=26827268ccd47f603f1c7b1d6e5e866a
--- a/metadata/md5-cache/sys-apps/groff-1.22.3
+++ b/metadata/md5-cache/sys-apps/groff-1.22.3
@ -10,4 +10,4 @@ RDEPEND=X? ( x11-libs/libX11 x11-libs/libXt x11-libs/libXmu x11-libs/libXaw x11-
 SLOT=0
 SRC_URI=mirror://gnu/groff/groff-1.22.3.tar.gz
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=2f9b379a7bd0a03836c3441232c6f1b5
+_md5_=a928ce6c4f8ede957c3f18f21eb2b948
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.36-r1
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.4.36-r1
@ -9,7 +9,7 @@ LICENSE=GPL-2 freedist
 PDEPEND==sys-fs/aufs-util-4*
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
-SLOT=4.8.12
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.8.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.8_p20161010.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.8-13.base.tar.xz mirror://gentoo/genpatches-4.8-13.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.8-13.experimental.tar.xz ) )
+SLOT=4.4.36-r1
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.4_p20161010.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.4-40.base.tar.xz mirror://gentoo/genpatches-4.4-40.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-40.experimental.tar.xz ) )
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	kernel-2	f14023dde64246bb606cafe16ea14800	multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	readme.gentoo-r1	03878c06495db70bc36bd717383c09f7	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=ff78cf666b51a17d0cf63b617884bba2
+_md5_=7d2a390a03a2d155f49d6945fb78a9c3
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.8.10
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.8.10
@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare 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 linux kernel tree and aufs4 support
-EAPI=5
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=deblob experimental module vanilla symlink build kdbus
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 freedist
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=4.8.10
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.8.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.8_p20161010.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.8-11.base.tar.xz mirror://gentoo/genpatches-4.8-11.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.8-11.experimental.tar.xz ) )
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	kernel-2	f14023dde64246bb606cafe16ea14800	multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	readme.gentoo-r1	03878c06495db70bc36bd717383c09f7	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=5499f25c02f19ab103e78cd4fbe97641
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.8.11
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.8.11
@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare 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 linux kernel tree and aufs4 support
-EAPI=5
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=deblob experimental module vanilla symlink build kdbus
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 freedist
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=4.8.11
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.8.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.8_p20161010.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.8-12.base.tar.xz mirror://gentoo/genpatches-4.8-12.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.8-12.experimental.tar.xz ) )
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	kernel-2	f14023dde64246bb606cafe16ea14800	multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	readme.gentoo-r1	03878c06495db70bc36bd717383c09f7	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=71449f50a6a1ecf55a215dfe713eb870
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.8.12-r1
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.8.12-r1
@ -9,7 +9,7 @@ LICENSE=GPL-2 freedist
 PDEPEND==sys-fs/aufs-util-4*
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
-SLOT=4.8.3
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.8.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.8_p20161010.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.8-4.base.tar.xz mirror://gentoo/genpatches-4.8-4.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.8-4.experimental.tar.xz ) )
+SLOT=4.8.12-r1
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.8.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.8_p20161010.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.8-14.base.tar.xz mirror://gentoo/genpatches-4.8-14.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.8-14.experimental.tar.xz ) )
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	kernel-2	f14023dde64246bb606cafe16ea14800	multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	readme.gentoo-r1	03878c06495db70bc36bd717383c09f7	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=bb278d96f0900ecc058f3731cea05066
+_md5_=260c3c1397575270a0382ab37dfdaee4
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.8.4
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.8.4
@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare 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 linux kernel tree and aufs4 support
-EAPI=5
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=deblob experimental module vanilla symlink build kdbus
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 freedist
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=4.8.4
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.8.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.8_p20161010.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.8-5.base.tar.xz mirror://gentoo/genpatches-4.8-5.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.8-5.experimental.tar.xz ) )
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	kernel-2	f14023dde64246bb606cafe16ea14800	multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	readme.gentoo-r1	03878c06495db70bc36bd717383c09f7	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=9e2acdfc85f112268f5ba62da7cc90be
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.8.5
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.8.5
@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare 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 linux kernel tree and aufs4 support
-EAPI=5
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=deblob experimental module vanilla symlink build kdbus
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 freedist
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=4.8.5
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.8.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.8_p20161010.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.8-6.base.tar.xz mirror://gentoo/genpatches-4.8-6.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.8-6.experimental.tar.xz ) )
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	kernel-2	f14023dde64246bb606cafe16ea14800	multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	readme.gentoo-r1	03878c06495db70bc36bd717383c09f7	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=112388fcc756164b3b383270be12a284
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.8.6
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.8.6
@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare 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 linux kernel tree and aufs4 support
-EAPI=5
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=deblob experimental module vanilla symlink build kdbus
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 freedist
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=4.8.6
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.8.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.8_p20161010.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.8-7.base.tar.xz mirror://gentoo/genpatches-4.8-7.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.8-7.experimental.tar.xz ) )
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	kernel-2	f14023dde64246bb606cafe16ea14800	multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	readme.gentoo-r1	03878c06495db70bc36bd717383c09f7	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=3263519ce0da0501d6f8e7435dfe3069
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.8.7
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.8.7
@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare 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 linux kernel tree and aufs4 support
-EAPI=5
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=deblob experimental module vanilla symlink build kdbus
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 freedist
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=4.8.7
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.8.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.8_p20161010.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.8-8.base.tar.xz mirror://gentoo/genpatches-4.8-8.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.8-8.experimental.tar.xz ) )
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	kernel-2	f14023dde64246bb606cafe16ea14800	multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	readme.gentoo-r1	03878c06495db70bc36bd717383c09f7	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=1538d089e2b031e3724bf1b56f4f823f
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.8.8
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.8.8
@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare 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 linux kernel tree and aufs4 support
-EAPI=5
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=deblob experimental module vanilla symlink build kdbus
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 freedist
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=4.8.8
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.8.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.8_p20161010.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.8-9.base.tar.xz mirror://gentoo/genpatches-4.8-9.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.8-9.experimental.tar.xz ) )
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	kernel-2	f14023dde64246bb606cafe16ea14800	multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	readme.gentoo-r1	03878c06495db70bc36bd717383c09f7	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=3f2478c761fe261131fce27432819a73
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.8.9
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.8.9
@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare 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 linux kernel tree and aufs4 support
-EAPI=5
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
-IUSE=deblob experimental module vanilla symlink build kdbus
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 freedist
-PDEPEND==sys-fs/aufs-util-4*
-RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
-RESTRICT=binchecks strip
-SLOT=4.8.9
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.8.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.8_p20161010.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.8-10.base.tar.xz mirror://gentoo/genpatches-4.8-10.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.8-10.experimental.tar.xz ) )
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	kernel-2	f14023dde64246bb606cafe16ea14800	multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	readme.gentoo-r1	03878c06495db70bc36bd717383c09f7	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=433bd2a0d683eeb567d00ddb986c61dc
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-3.12.68-r1
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-3.12.68-r1
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare 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.12 kernel tree
+EAPI=5
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 freedist
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=3.12.68-r1
+SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.12.tar.xz mirror://gentoo/genpatches-3.12-66.base.tar.xz mirror://gentoo/genpatches-3.12-66.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.12-66.experimental.tar.xz )
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	kernel-2	f14023dde64246bb606cafe16ea14800	multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=3a877335d47afff2d638dac3d439b65a
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-3.18.45-r1
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-3.18.45-r1
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare 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.18 kernel tree
+EAPI=5
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 -hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 freedist
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=3.18.45-r1
+SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.18.tar.xz mirror://gentoo/genpatches-3.18-45.base.tar.xz mirror://gentoo/genpatches-3.18-45.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.18-45.experimental.tar.xz )
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	kernel-2	f14023dde64246bb606cafe16ea14800	multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=5f22de94895fa50a2bb3dc285734c664
--- a/metadata/md5-cache/www-apps/drupal-7.53
+++ b/metadata/md5-cache/www-apps/drupal-7.53
@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=dev-lang/php[gd,hash,pdo,postgres?,simplexml,xml] virtual/httpd-php accelerator? ( || ( dev-php/xcache ( >=dev-lang/php-5.5[opcache] dev-php/pecl-apcu ) ) ) uploadprogress? ( dev-php/pecl-uploadprogress ) mysql? ( || ( dev-lang/php[mysql] dev-lang/php[mysqli] ) ) sqlite? ( dev-lang/php[sqlite] ) >=app-admin/webapp-config-1.50.15
 REQUIRED_USE=|| ( mysql postgres sqlite )
-SLOT=7.52
-SRC_URI=https://ftp.drupal.org/files/projects/drupal-7.52.tar.gz
+SLOT=7.53
+SRC_URI=https://ftp.drupal.org/files/projects/drupal-7.53.tar.gz
 _eclasses_=webapp	42c6ef7af496b228f9854b3c81e4b226
 _md5_=1aa7d2a554b8e531a96d73f471885e6e
--- a/metadata/md5-cache/www-apps/drupal-8.2.4
+++ b/metadata/md5-cache/www-apps/drupal-8.2.4
@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=dev-lang/php[gd,hash,pdo,postgres?,simplexml,xml] virtual/httpd-php accelerator? ( || ( dev-php/xcache ( >=dev-lang/php-5.5[opcache] dev-php/pecl-apcu ) ) ) uploadprogress? ( dev-php/pecl-uploadprogress ) mysql? ( || ( dev-lang/php[mysql] dev-lang/php[mysqli] ) ) sqlite? ( dev-lang/php[sqlite] ) >=app-admin/webapp-config-1.50.15
 REQUIRED_USE=|| ( mysql postgres sqlite )
-SLOT=8.2.3
-SRC_URI=https://ftp.drupal.org/files/projects/drupal-8.2.3.tar.gz
+SLOT=8.2.4
+SRC_URI=https://ftp.drupal.org/files/projects/drupal-8.2.4.tar.gz
 _eclasses_=webapp	42c6ef7af496b228f9854b3c81e4b226
 _md5_=d90119129328b8b4e32bdc0ec26091ea
--- a/metadata/md5-cache/x11-misc/shared-mime-info-1.8
+++ b/metadata/md5-cache/x11-misc/shared-mime-info-1.8
@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare
+DEPEND=>=dev-libs/glib-2 dev-libs/libxml2 dev-util/intltool sys-devel/gettext virtual/pkgconfig
+DESCRIPTION=The Shared MIME-info Database specification
+EAPI=5
+HOMEPAGE=https://freedesktop.org/wiki/Software/shared-mime-info
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~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=GPL-2
+RDEPEND=>=dev-libs/glib-2 dev-libs/libxml2
+SLOT=0
+SRC_URI=https://people.freedesktop.org/~hadess/shared-mime-info-1.8.tar.xz
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
+_md5_=6aff746e2dffb7f151421109bea6474b
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@ -1 +1 @@
-Thu, 08 Dec 2016 20:43:15 +0000
+Fri, 09 Dec 2016 05:13:19 +0000
--- a/metadata/projects.xml
+++ b/metadata/projects.xml
@ -1149,22 +1149,17 @@
    <member>
      <email>dabbott@gentoo.org</email>
      <name>David Abbott</name>
-      <role>Board Member: Secretary</role>
+      <role>Board Member, Officer:Secretary, Chairman</role>
    </member>
    <member is-lead="1">
-      <email>neddyseagoon@gentoo.org</email>
-      <name>Roy Bamford</name>
-      <role>Board Member: President</role>
-    </member>
-    <member>
      <email>prometheanfire@gentoo.org</email>
      <name>Matthew Thode</name>
-      <role>Board Member</role>
+      <role>Board Member, Officer:President</role>
    </member>
    <member>
      <email>robbat2@gentoo.org</email>
      <name>Robin Johnson</name>
-      <role>Board member: Infra Liaison, Treasurer</role>
+      <role>Board member, Officer: Infra Liaison, Treasurer</role>
    </member>
    <member>
      <email>swift@gentoo.org</email>
--- a/metadata/timestamp
+++ b/metadata/timestamp
@ -1 +1 @@
-Thu Dec  8 20:39:25 UTC 2016
+Fri Dec  9 05:09:26 UTC 2016
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@ -1 +1 @@
-Thu, 08 Dec 2016 21:00:01 +0000
+Fri, 09 Dec 2016 05:30:01 +0000
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@ -1 +1 @@
-1481229601 Thu 08 Dec 2016 08:40:01 PM UTC
+1481260201 Fri 09 Dec 2016 05:10:01 AM UTC
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@ -1 +1 @@
-Thu, 08 Dec 2016 20:43:15 +0000
+Fri, 09 Dec 2016 05:13:18 +0000
--- a/net-dns/nsd/Manifest
+++ b/net-dns/nsd/Manifest
@ -1,3 +1,3 @@
 DIST nsd-3.2.22.tar.gz 924627 SHA256 47c2b424c719a1535f709f4e82d796bca43cad86731f5f275c9367040a474a03 SHA512 2c0cbc97eaa376dcf496ed4323d9f7afb0dbf1852fa5fc9d8c7ecbcf8aaa1b025d56b5e439d19bc36b50deaf5f753fb08109d7e25dc1f8223fe85b7d017f81c3 WHIRLPOOL 271b47a331f2a63dd51bf642fed7083f27660f618fe0418c6b3a361d7b0a7ebda1a300d12d92c1c03e21cd17560ba4f2f2cdac76f7c6793d4befc71b66646f7d
-DIST nsd-4.1.12.tar.gz 1080273 SHA256 fd1979dff1fba55310fd4f439dc9f3f4701d435c0ec4fb9af533e12c7f27d5de SHA512 f78c0a24669ce8a0cf5640d90f5dfc8756009a840545feddd9c466a5f0b7441d470efb267f7ad38ed45321a6f8b75ad7db9b13bdaefab55b7614ebb3e9bd183b WHIRLPOOL 6304ff6b25a315cf3e340d9cf3cffee141abfdceaeb71ac94c97fe78d14698fe2164042db7785a254feeecd4170c4ad7a8fccdf165cfb5bbefbe1244fdbd4bea
 DIST nsd-4.1.13.tar.gz 1085701 SHA256 c45cd4ba2101a027e133b2be44db9378e27602e05f09a5ef25019e1ae45291af SHA512 f355402273480b2befe914ab2e933c37ec35e5c8e747f85ba03bf8928e42ab809bb6b21cf2b8bf11e8d422a795254e1d916b154156243bc94752a01fb540525e WHIRLPOOL f5d7d3386649b82bf2f7eb6ab2f0c50b2f11e4e545931d99352a63317cda127278e5d9219763dc51a5e3a73daa0ab04e45b037eea738cad20cabf284068e9c7c
+DIST nsd-4.1.14.tar.gz 1086818 SHA256 bdfc61c5f3bf11febd8f4776eef1d4f2d95ed70f12f11d4eeee943c186ffd802 SHA512 25d16a6c3e4515129f0ad4f9ab0bf6ebe12bd817cd6107d66cb99aff6b6984f5153d9b502013492cfdd907d5fad9a284583c8436b559ef4c0cce5a1176a4aff3 WHIRLPOOL 64b14e53a13ff379b665c3d76298f4616b05777694b51aa3a6541be7b2c0d6b283fe6f069dec752241393b3e8795ce048ee935f614db39d221962a2d86a693f2
--- a/net-dns/nsd/nsd-4.1.14.ebuild
+++ b/net-dns/nsd/nsd-4.1.14.ebuild
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@ -503,7 +503,7 @@ app-emulation/libvirt:virt-network - Enable virtual networking (NAT) support for
 app-emulation/libvirt:virtualbox - Support management of VirtualBox virtualisation (one of app-emulation/virtualbox or app-emulation/virtualbox-bin)
 app-emulation/libvirt:wireshark-plugins - Build the net-analyzer/wireshark plugin for the Libvirt RPC protocol
 app-emulation/libvirt:xen - Support management of Xen virtualisation (app-emulation/xen)
-app-emulation/libvirt:zfs - Enable ZFS backend storagesys-fs/zfs
+app-emulation/libvirt:zfs - Enable ZFS backend storage sys-fs/zfs
 app-emulation/lxc:cgmanager - Enable support for cgroup management using app-admin/cgmanager
 app-emulation/lxd:daemon - Build the system daemon, not just the client tool
 app-emulation/open-vm-tools:doc - Generate API documentation
--- a/sys-apps/firejail/Manifest
+++ b/sys-apps/firejail/Manifest
@ -1,4 +1,3 @@
 DIST firejail-0.9.38.2.tar.bz2 158132 SHA256 d76d82d18c45c64f04924a03d7fab0cbf023d86a92a16a13c5f51e09b40ad446 SHA512 d20ff48c39da7941cf61d5d2dc4a126dc7eeb2657d75b8d9bec9e53225fc79b55489b36727d6383c837bbe4e412d4bd5b4bde645b064a539d16e80fe972e3506 WHIRLPOOL 94f96f9696ce4a7cc3bb7084e7d04410b36540a50d2fdf7ae25b3c82114adf6e32169ecf24be501a916b487bf044a87429cf13c9bd2d332d9a761378eac047a5
 DIST firejail-0.9.38.4.tar.bz2 158075 SHA256 47b0707f7d726631e0c9ee6555acb6836b16920fcf02ed7ba6593c86fd7bf5c2 SHA512 b8d2a49e34f3b54b832188f209b4fc6573a951acaf546f1b1c25b681f226ad86b4439a1a3e05e1342746f51fca750261b3d22e7dcf9decd12929e2b790e05890 WHIRLPOOL ce150dcf164f5c3d0656e02830d353fab8d972c364dfead2379f13e0dc9bbc55f09cd28f1741321243183da0c0821c493cd77b7377628201cadbd46dd2fc3c3e
-DIST firejail-0.9.42.tar.xz 204608 SHA256 4f3bceee973b84fdf13a5d5ab0060d140ecc8e42c19c945e7fb93f0fd8499b47 SHA512 bea126c41cbd275ef64bce1fa65419a168a3d39a5eeb2bc78d904e1f7c93357caca0446cdaced2f1e0757d30ebc9dfadce14fe283597abad430f1a2df05581ad WHIRLPOOL 2dacfc0ac8e2707609c53d36fff568b23700d68a464e4f251f1b414d6abdb379403883ac25a3886cfe8c671ac20baf98467190ac36ed0d9b0276005d29edb852
-DIST firejail-0.9.44.tar.xz 212532 SHA256 2cd8ba061a546b593e52748ebbcd8dbdac55973aaeff21250ada43fe3405992c SHA512 6865cf1402f98cf4aceef18239777ca4518a702edd9e119b849385895156661fec560cbcb1738f785725f6c3d55cc478770b8db9d77f2debc386fe4780b6e7f2 WHIRLPOOL 8da1c2d70133618dc2ac4bf45cb10205f7bf168954b9d693b9553eb6b3a504c19addb3a6fd06f4e91eed4a577f0b3ca9bc67697988206f32f1c11afb7924ce77
+DIST firejail-0.9.44.2.tar.xz 213092 SHA256 c5adef1943daa33049c4c39e5a19a0d02b897f1b1581be094ec600490dde8851 SHA512 c7babda0fa2ca35113fcbebf213448e57889d4447a188f2ad2bc06f76fda1024f22b4f3569050330792b57d9f1026ecf11470bbd534a7bdd74320da1bc584f9e WHIRLPOOL 365bd20a946a8210c12d4981ec7057c3bd47af00fcd37f98e65164dd70482bc0461cd445bc24cb7cf04231111575f972e52accc8d08f23b0f0e26141918f2978
--- a/sys-apps/firejail/files/firejail-0.9.42-libstdc++.patch
+++ b/sys-apps/firejail/files/firejail-0.9.42-libstdc++.patch
@ -1,11 +0,0 @@
-diff -Naur firejail-0.9.42/etc/disable-devel.inc firejail-0.9.42.new/etc/disable-devel.inc
--- firejail-0.9.42/etc/disable-devel.inc	2016-09-06 20:48:23.000000000 +0100
-+++ firejail-0.9.42.new/etc/disable-devel.inc	2016-09-19 22:21:14.579410841 +0100
-@@ -2,7 +2,6 @@
- 
- # GCC
- blacklist /usr/include
-blacklist /usr/lib/gcc
- blacklist /usr/bin/gcc*
- blacklist /usr/bin/cpp*
- blacklist /usr/bin/c9*
--- a/sys-apps/firejail/files/firejail-0.9.44-sysmacros.patch
+++ b/sys-apps/firejail/files/firejail-0.9.44-sysmacros.patch
@ -1,27 +0,0 @@
-From c15fc4754a05cc2b2aec4ca75f87bf3d61578843 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Wed, 20 Apr 2016 00:14:21 -0400
-Subject: [PATCH] include sys/sysmacros.h for major/minor/makedev
-
-These funcs have been defined in sys/sysmacros.h forever, and Linux C
-libs are moving away from implicitly including it.  Update the files
-to include it explicitly.
---
- src/firejail/fs_dev.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/firejail/fs_dev.c b/src/firejail/fs_dev.c
-index 97ee9de..2f66980 100644
--- a/src/firejail/fs_dev.c
-+++ b/src/firejail/fs_dev.c
-@@ -28,6 +28,7 @@
- #ifndef _BSD_SOURCE
- #define _BSD_SOURCE 
- #endif
-+#include <sys/sysmacros.h>
- #include <sys/types.h>
- 
- static void create_char_dev(const char *path, mode_t mode, int major, int minor) {
-- 
-2.7.4
-
--- a/sys-apps/firejail/files/firejail-0.9.44.2-sysmacros.patch
+++ b/sys-apps/firejail/files/firejail-0.9.44.2-sysmacros.patch
--- a/sys-apps/firejail/firejail-0.9.42-r1.ebuild
+++ b/sys-apps/firejail/firejail-0.9.42-r1.ebuild
@ -1,47 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit eutils
-
-DESCRIPTION="Security sandbox for any type of processes"
-HOMEPAGE="https://firejail.wordpress.com/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="apparmor +bind +chroot +file-transfer +network
-	network-restricted +seccomp +userns x11"
-
-DEPEND="apparmor? ( sys-libs/libapparmor )"
-RDEPEND="${DEPEND}
-	x11? ( x11-wm/xpra[client,server] )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-sysmacros.patch
-	"${FILESDIR}"/${P}-libstdc++.patch )
-
-src_prepare() {
-	default
-	find -name Makefile.in -exec sed -i -r \
-			-e '/CFLAGS/s: (-O2|-ggdb) : :g' \
-			-e '1iCC=@CC@' {} + || die
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable apparmor)
-		$(use_enable bind)
-		$(use_enable chroot)
-		$(use_enable file-transfer)
-		$(use_enable network)
-		$(use_enable seccomp)
-		$(use_enable userns)
-		$(use_enable x11)
-	)
-	use network-restricted && myeconfargs+=( --enable-network=restricted )
-	econf "${myeconfargs[@]}"
-}
--- a/sys-apps/firejail/firejail-0.9.44.2.ebuild
+++ b/sys-apps/firejail/firejail-0.9.44.2.ebuild
--- a/sys-apps/groff/groff-1.22.2.ebuild
+++ b/sys-apps/groff/groff-1.22.2.ebuild
@ -84,9 +84,12 @@ src_install() {
 	dosym tbl /usr/bin/gtbl

 	if ! use examples ; then
-		# Keep mom-pdf.pdf since it's more of a manual than an example. #454196 #516732
-		rm -f "${ED}"/usr/share/doc/${PF}/pdf/mom-pdf.pdf
-		mv "${ED}"/usr/share/doc/${PF}/{examples/mom,pdf}/mom-pdf.pdf || die
+		# The pdf files might not be generated if ghostscript is unavailable. #602020
+		local pdf="${ED}/usr/share/doc/${PF}/examples/mom/mom-pdf.pdf"
+		if [[ -e ${pdf} ]] ; then
+			# Keep mom-pdf.pdf since it's more of a manual than an example. #454196 #516732
+			mv "${pdf}" "${ED}"/usr/share/doc/${PF}/pdf/ || die
+		fi
 		rm -rf "${ED}"/usr/share/doc/${PF}/examples
 	fi
 }
--- a/sys-apps/groff/groff-1.22.3.ebuild
+++ b/sys-apps/groff/groff-1.22.3.ebuild
@ -75,9 +75,12 @@ src_install() {
 	dosym tbl /usr/bin/gtbl

 	if ! use examples ; then
-		# Keep mom-pdf.pdf since it's more of a manual than an example. #454196 #516732
-		rm -f "${ED}"/usr/share/doc/${PF}/pdf/mom-pdf.pdf
-		mv "${ED}"/usr/share/doc/${PF}/{examples/mom,pdf}/mom-pdf.pdf || die
+		# The pdf files might not be generated if ghostscript is unavailable. #602020
+		local pdf="${ED}/usr/share/doc/${PF}/examples/mom/mom-pdf.pdf"
+		if [[ -e ${pdf} ]] ; then
+			# Keep mom-pdf.pdf since it's more of a manual than an example. #454196 #516732
+			mv "${pdf}" "${ED}"/usr/share/doc/${PF}/pdf/ || die
+		fi
 		rm -rf "${ED}"/usr/share/doc/${PF}/examples
 	fi
 }
--- a/sys-kernel/aufs-sources/Manifest
+++ b/sys-kernel/aufs-sources/Manifest
@ -22,36 +22,12 @@ DIST genpatches-4.4-38.extras.tar.xz 16428 SHA256 b60496f1217495d8ff3800deb49d30
 DIST genpatches-4.4-39.base.tar.xz 899828 SHA256 527ca060a613235c8e991bc1556d1fbcefe61f76121e8911dabc0627ee6c474a SHA512 5ff2f81d6bcf7f1b0d5e768f3c440c00e60403a95ea7fceba56ea4d77f2cf230cec22b5856a53d3105fb0ba1c95eb4854bc69710b1094f0dd411edc1dced2921 WHIRLPOOL cffa9cc9d3f149e42dc06ea2b31e20cbc7e9e5f5652a081da4bfe59e82c876f66ae54916b6d885452037d578051c3888d1bdd940a193d4c5520132ee99e709d3
 DIST genpatches-4.4-39.experimental.tar.xz 87784 SHA256 9331896942c0fc5c87f05405db8205768b7b20abd5780095be6d608f32147e1c SHA512 17298c94b0a76066f520a76f48e88e706e1ea2d0c874d4523ae1332cbc4d4a4a007a3e0b183e54f7051c532a3755bd576d543bc7fab42a2ad57d3f38db9566bf WHIRLPOOL d42d9c42a7f881b91f380a43b693d5d8ae063a3b45cc3111dc9ade59a49e94381b7adccb1c13b9e70bf9b06194685289ef93968f780a98c95951374e1f7f7ad6
 DIST genpatches-4.4-39.extras.tar.xz 16420 SHA256 a1ea4470421a41f0020f226b90af23c0ea611841491332b8fa69ff4d8e78fc1a SHA512 a31a8cbc4f0292b791c9918ec0912625c320b8f77360f2d2daa9a1433abbbc6e55003b1cdd6ad3fa95311c1836ed99307316a29954c2df29f1ab7b1eba02d041 WHIRLPOOL 76aa5dd008ebbd1ea898e3be385225a959980725b8779e1f78d7aee213c3369b035e0fe1917462e49150343823deb59b90d7c869be1599238602276465e2caed
-DIST genpatches-4.8-10.base.tar.xz 195816 SHA256 c682b801ff8d0fa91ea25668223737fbab94e9034ea2d881992dd7b91ab36360 SHA512 b468210994ad688512b80608e25b9969461751827c46d63060534fc9c4d34c552f0bdc325fad1fa8556e4a7cdf4b346328129a997feb562f74a1f8471249cd2c WHIRLPOOL 67cfffd2aebc3253920b3abc42f8874b603f2df4e850c10575cf6210507eb25b911c4808604228c8cc1e2ad9e836d8b7c878facf460c38dd7e318e4c491b28ea
-DIST genpatches-4.8-10.experimental.tar.xz 91996 SHA256 aa8e2fdf527534f7595fd08da6e4f4108ed7c576298793af1a20ed1c57cc87dd SHA512 46eb1d232150e459452108b09326635d9250b1bb55beef05259bf4e64244fd46aa844dc063aa07cae4ce516338c74013b2f7f17aaefaa059b861851d356077d7 WHIRLPOOL 7556bfc112af421dee3e26a44b9fac70226a6cc8df27c8ef172c7bbd37705ffeda8e3b05c3cddb0127b3e47d27a952e71ffd1ac5b23c7e23fef94978182f4b1e
-DIST genpatches-4.8-10.extras.tar.xz 17228 SHA256 2585cd316731f3390d8dcd655f5b20599576de7a0112d443154a699bd8828169 SHA512 d43698b7ff8583bf8962097311ed22efe5a1eb072115376302312f7d2f581b743936585b82ef30920e0f124ec655320ad5df3a2572f9e8b3f82f9ce1def51578 WHIRLPOOL 23ff3f4edd52bca20110e9493c20bd5ebdc6bee580bfd7a63f34cf40842ea0db1b41b4f362c39fb402a5a73a3e7a1113310c3312c87794ecf8a04a8570865f72
-DIST genpatches-4.8-11.base.tar.xz 216840 SHA256 3b16fb85b7bae7c754201a7e0e7151e7303652dec9798b6ae8633265820592bf SHA512 ab2e670abcb26b9c94110760eaabbbfccd93cbd8fc207cb1876414a4d1e7450b56aa713a54d2db7804df9dc98ad7e139bf736ac0ef2e6257c25d496fc4374bab WHIRLPOOL 6b6045085072a406fc1065876ced0bfced1f619ec651dd360319887bf7dc7ccbf7ca51f75e803a3243e25fe87fe1544259cbb2ffdcd594b8ad62f145f3dadf05
-DIST genpatches-4.8-11.experimental.tar.xz 91984 SHA256 04188ee21df440451886a42b43003d34bf3680e1c1c88771ba92fc491f8720e1 SHA512 2cc12f02670beb43655b6cfbc9497241be89266fae9ed5c67c33caa10da519b18631b5bdc20cb612a2a5715ecc947916e358d13ba77ec8e05dfeeb99c081c7ea WHIRLPOOL 2f61b90c540addda8b6da155a6b6381fd1cc7f93a7c60c2b8f5667773597e07dec2e753df4ce878c963d31ab6238290e604f6a232d9736b58e0a90c33b11fdd3
-DIST genpatches-4.8-11.extras.tar.xz 17304 SHA256 eb4f2dfd8e18610c83dc6f78e1f1c93f26799b1e07ee5c6f2f257e4919fa8223 SHA512 ea11b0187446d2148081e8dd49ae012d1355d53991eb901e7082e7469f44ea7d6e7030b849258a41e2109b9a5c32612c0b0cded9568a5fe7d52295d205d0ea4e WHIRLPOOL 94dde7937a757ce0c352882b781040aea1436c7acb66830f4bbaea2cd10acfa639c12a93f96d6f27cdc831ffab12cc7bd7513652ad27f31d01e888857cb3149e
-DIST genpatches-4.8-12.base.tar.xz 235128 SHA256 8c0b7f44bfea8d1f53ab32ce0a630b8a167cc6c989db195c39778f946fd3f28b SHA512 643f1abcf4bc1762d8000e1f3bf6679bcbacecd605a038bbe5ba62b87388d16fb20aa5669981adf405c0d7c0d33006ef775a38fa98f48f040a3d76619e601471 WHIRLPOOL 68ccb8808250c51d6583271f7736452a3b6dc222b409e39f1d3bdd13ab40192ecbf1775db8c99af0410124d448f44ed5b40fd46388c33555150e9750dce1746a
-DIST genpatches-4.8-12.experimental.tar.xz 91996 SHA256 603eef9d7505d22e79c5768372e852ae6cd37af72aff46a7c30be972bde8e033 SHA512 f0981838aeac02ea10695aa952e8d538c295f90032e7618616192bd7be8a19b3eb5503a1f16559f09e77c31a6bf7117d2caad35e812d8c4dbf292a939bacc096 WHIRLPOOL e29a0e4e9e2021286b9892e0c603373b2c3d45c4f84c1787c6dbc92e92aba1acdc2dbdbd513bc6587a54a04541ab231f94aeffd07faca0e7c2cabe5220007ba9
-DIST genpatches-4.8-12.extras.tar.xz 17312 SHA256 f7ee38d1f3e8d02d092c9b52e829c2b61c2dfebd8888bff9029cd8fa937052cb SHA512 51c432705e6700f5b30754966bf02113b9f64b8f4c135d00e5362bf2cfe7bddbc0317bbe35e47dbd288d39df81af5461eb69451dcb2c794beaefcc70906638ce WHIRLPOOL 7e04383c25ae6bfe0f4e75d3e504f58c49662fd444870aedd2f26e54d0df9b06d1033244f02cf90db4449f47274e4a515e1ed45a3ed329d2da9144f446df4837
-DIST genpatches-4.8-13.base.tar.xz 248140 SHA256 4a2d23405042e57eedcd8884e1dc6f8af693a01822b3b4c25657be5768567fd3 SHA512 d0a79b11cb57c428166b94e734edd09de64803decdeb4b3e55b87d3c73e3c42fccf00753e98fd0a0a21b522dcda4ef69d428bca4073849e334159e6a1732bfd5 WHIRLPOOL d44e1a10b1c8e2b303d10a7d5fd2679fb2a6e2cefc0821ef1082111bdf54061789ff36765438079584c8bbf265fbb0f0da65cc4b48b83eb6e9c2af2ab8472d56
-DIST genpatches-4.8-13.experimental.tar.xz 91972 SHA256 eb971ac227b0849b7839df5ea30745284cae242010b5a7fce7af675f6b371bb7 SHA512 3a5aed0e619ceff2b3363fcf08c331924508abbb2eabd6a05f32e1cdb681116ec3f5e27bdbec7b11ac83a45583f671f2d58f54f98161f4b9c6393392dd6f8d9e WHIRLPOOL 5ec4d9982c85632f30fea693ed7a3d65fce408ccd80bc8815b78a76a915152c30ee9b48338f4b15019fad4f54d983f6578f316dd28be9d562a4abebb89b613a3
-DIST genpatches-4.8-13.extras.tar.xz 17316 SHA256 c760ecc18f8ddab5d6bc71edea58e1bcf0c6b1be6f448ccb5f572c2e02234961 SHA512 6f5e51d921c340f2ee6dad1141f5d01f7d1517dda11197510ab2ee2cf64ac0358ad0ddbd5ce8935885086a4580df4de6e908ecf2f73998fa388b59a71bea0c02 WHIRLPOOL 1a8399cfd39b38553cf6e26b3e6112c7dcbc2a9189eff724fa931f5ae634fc321860d9cd344936fda584753407ebab7018d597790ad93775dbfe5799d7e31ecc
-DIST genpatches-4.8-4.base.tar.xz 22700 SHA256 ec60a8dd77a13b82d4f6dc862579f4647ef4b42f3d8385fbad465a2182084c22 SHA512 6450df1fb0cf026246cf69cbed318969daa6c96615ea82d9c9e79362b5f3d4bfef634923c61910276e1c4ff3ad4fb325a7c76b2ba771123c4be125ad65662dec WHIRLPOOL 4ec100607196d1eaa22784c6c224683af638faa92529dae3a476aa75fe18f60a08c766f97f4f754048135a020fc3d35281cace8a58386fcf3a0d75961299a536
-DIST genpatches-4.8-4.experimental.tar.xz 4272 SHA256 9d9cf00237787816175dd877669c184ff7d2de72bc7e428bdb3e7c1fb3e3174c SHA512 d701269683acdef0d5e472323d7e56a44d1e9c2cffd695005688ff3c6cca161254957cc572b583aedaa9bee3db6da085a0053d3a7961bd81cfeed1fed8239b63 WHIRLPOOL 4058bfa922a54f7bacba79c0820ea13dd05c9d07abe8d5be17d937b3533f8b0c279f2eca00cfa660c0ca88f991590ca6432238c69ef08b837f6981bfca138da8
-DIST genpatches-4.8-4.extras.tar.xz 17244 SHA256 69cdebdb2cb1b7c2b9791afd372267089f5a9f83c3e74ae16f1497d49abfe081 SHA512 4238be54a0315eae698b7cd48a3a459ddf43ddf1f07e884910696b97c7dfc3d8a5b5b14ac96fdf69ea8fd37203a32a78fc45e9576e5e9217afaa0a2a6674c8e1 WHIRLPOOL b7107325834f02e486419a8006e0f5c478a46fb33e1df90f2d4b46aac36a221115698777a30cc8414cb5daa419e8bef17d55e5c9536e17562d88ea37eea5a5ad
-DIST genpatches-4.8-5.base.tar.xz 41992 SHA256 a22e80d73abe82adb24423364b3e3f189cf891d54b37550b85eab6b828e874a0 SHA512 003d729b7cf1020678d8075524c8cda0c7c11c084beb942f50212d1d7b59fb29dc6cbf5a7c389111039fa83212b47e73f2c0f56ad49c0590d9b114c305031922 WHIRLPOOL 5fa915883b9b0528de1efb59bed88b9077e5cec4e3465d69c35bdfde4bcc4110435edf7181a9c3c1fe5b72bed0de26b083a18b5a1e34aea637d1a5b0134ce5a2
-DIST genpatches-4.8-5.experimental.tar.xz 4276 SHA256 68203e669ce58d8e1a3fd6207d467b928a77d1dad0be9d7a858c8daead9bcdae SHA512 06477a18755137266723f6aa48bc0dbcbb18c80e4e50938d392855485f16ad4b0cbeb6d20dcf523945c62c3cbe2c75fdfabdb2038ee012bafb5f292425e005c7 WHIRLPOOL df0f4bf637eef5615083e2e2fac26861bac1d4aa0e3bc82962e688709b4ff8aa926f52be18de000971e6fb6367cae2914d5329346811fea8a8ffda1688a2862b
-DIST genpatches-4.8-5.extras.tar.xz 17240 SHA256 fec9122e60b79bf8d69bf5bc023510c2965a99081a849364da82200f74b2b60b SHA512 1add92f5e63a820d74bce33e74f98a5da878e625ba29dab4b25feea0a017ba1cd7e38cfe3e988bfbd79de99821af38d82d996f25be8acae682017f24a46dca09 WHIRLPOOL 5abea1fa83ed2368a9bdb1cadd03e24ff593a1f64afbd9285a7c8f9d1c9ff71a309014ec5fdd9b4f1ee8d4497d10b068e819f510a2a9e2ce51bf53efb47a7221
-DIST genpatches-4.8-6.base.tar.xz 85456 SHA256 fca1a8eb8b0a07562f39f2931eee645d64700fa3782d9e98434b1a74b53af5c8 SHA512 9df43752e3d8dc26fd13f99f4dbfaa038d2f0b43cb9b84d5801e00255ce1e7e01bea7ae79dc392f93eb02e1322c802f26a14535b03520ede8bb45946a44ab96b WHIRLPOOL 01229d3f8ce618cf78a758cd5d9d15a883825d72387e4b440e524a1b2825ea7120b0acdbaa08f011edd0d13014849a9caab51bd8778cd2df0e59bcdc48371753
-DIST genpatches-4.8-6.experimental.tar.xz 91996 SHA256 3c301fcf3c2e62f1d993019460d2614fdfee3f3952ff3de1cc285956d188c04b SHA512 c0ddfe0fab0f3ed84a721755f1b0a935135b63b22a075077332c22f44def28e5b2a1d3b444bd22e988fe2e40711a475e81ad2396f10f6e7369556ce19a941d57 WHIRLPOOL a5b9dc2f9aaf58844fa2547440751bd9e7a7497b096c72a8829541135a7b1776cee6956c594f57d54b54ce8d0613e8718f31529e15c56b22c163c9039acb9a6c
-DIST genpatches-4.8-6.extras.tar.xz 17244 SHA256 ae96b0e06f5e8897f68ec17ab0ac32561d2c52cb2423873384af65dc6de58519 SHA512 b6b0a6b75ffa3d19dc20d45b244a63fb9e9f71187c98ed7d3c346a0ebc5b4863b477727a549e4e52dfba17fe914cae9ec7b84b6f4508858e0ff0b3852fafb4ab WHIRLPOOL 6263175de6016b2c19c00beac8a0f99a3c2991bee8731bf5a7083221699d78d928a8e4cb0871216beffe87fa27b23ff18de87ea28097fb11660c8a8bee3cfea9
-DIST genpatches-4.8-7.base.tar.xz 123604 SHA256 e60431e2dbe2922b5b578d7401d5efc5fc13ae9d302f755c1980a60e47d24d45 SHA512 507f1324fab063f4c0e0efadeee87d9c47f6beb00d8d41410f3d90a67f5ae000c11d2981fd3c4a1407160b42c15634971ac9a58425467ca7fdab5d845da98afa WHIRLPOOL 54c58d70c02f3a346a4208962433702f7a7f75755f8ac123df2bf4e67da34f4f9752b0994c6cd04e2e52155e5b9b79948cf8d6a70265b6f5cefb90acf4ac68db
-DIST genpatches-4.8-7.experimental.tar.xz 91972 SHA256 17de925bba50ab165840774e5fab6485e375181f307e5697bd769748adca021f SHA512 e9e1dce527554ec3f2c081f0561ab6baf5a4c41d3bb9c1f1595c2d1888b774bc98b4ad6b29ed26e09bc3558b2f3b6846db543630eb5222d3d68d295decc20a4a WHIRLPOOL 657831244c411309d2d1b42b8f6ceffef2aa48f3710d018b6987aea25764a0a528cd4e8f57b770814d59093061e1cca7bd187963e75e95d732c7a1bd4e8dda0c
-DIST genpatches-4.8-7.extras.tar.xz 17232 SHA256 2f567d87267974fa1957c3361a1b14ac5574a6a23e750f82e74ca3857afa5aba SHA512 bcb166e60f1a8f71110aeebbe173520ee3c11ec234986dc37d6c2eda4372a49618720989acd752768a6c161aec95d668267e8e14a8ec01ef84ae1d52a278c2d3 WHIRLPOOL 45326e8b5f5c3d9ea7c58414475968f155208b27f9478d564411ae4eeba3e87e83e6db040f04b8689fee323ae219834681541516e47b92ebe6ce92823c539845
-DIST genpatches-4.8-8.base.tar.xz 157508 SHA256 36acdc91d6bbb364eb9c5ec2227766e82f0e203e434c25255965818b933a4986 SHA512 5a43e3a2dd556d7bff251eb22eb98ef7a4a673d6ed0a9f9b3bb4b63e0ebfc5d2ac16abd9d3095116202735d3a5aec7213388a48a0f28e0f721268cb360f5dd23 WHIRLPOOL 79d10ddfaad5341f70b98c5c6c0104a1a1243a6adc77a639d51d1cf911c349caf759b9744146ce3dbeab2d8bed04d59de0456ce977e41dae98a8dfcbc06e2978
-DIST genpatches-4.8-8.experimental.tar.xz 91988 SHA256 6405e2eb15cd885127966db2acc926c9237304314ee63f7d9806cb41f4efbbe2 SHA512 f7a86ac88045b6163860b2d2f2857bb66f096c9cf823b32fe0f198df80fa0316ae02739c75852bf3023ca679f12f4de771aef7e2e93af4bf2ed8b451f73d40d6 WHIRLPOOL 31821f6a6d333df4d5a0c8fda36791fb3147fac5ba73c3235baefd397f6f237077bef0ba97e0c4a22a5efdcb6176c2a88d5f92c483ffda96a19208ea761fee69
-DIST genpatches-4.8-8.extras.tar.xz 17232 SHA256 0ebb5b68c85a9c969b5cf6923ad4f717a7c2feec75a63488050036c1fc00eee9 SHA512 bcdcba2698f386cd626fa89f6534720e9aff578daf72324c4f7d40f27464fe0d9744a8f5a40e3edfa77de2336a5f37ece51588a5a5e91c66409543787d8154d2 WHIRLPOOL 66489a38a7e906721d659159da59aef85f11bf8616e6a8a10d73a3bcedce06981fcd29f44e9a50fceb2ee6656528e539e6993ba04d6c6b41631cdf54608b4120
-DIST genpatches-4.8-9.base.tar.xz 171712 SHA256 17a33696a461e900a59eb2ecc8aeb6461681889b71bd12d89756f183b9aa85ff SHA512 bbdfae61748f45009ba3658ed325b1e977a37c238204a654409f5f67718e98146ce40e5ca0ef5c97571f79b300b7ea98a6e45790407250b4d858bcc3f34752f2 WHIRLPOOL eae93dec27e1eb9b6c834ce5a95e7bbeaefb013451e0d3cd87025321e50ba96e86713590dd908f9c397c7a51d5a57f5c695db8c27a9c73366138ce0384d772a3
-DIST genpatches-4.8-9.experimental.tar.xz 91964 SHA256 c5a4a43bacac7dccb3da756c4422f786815688eeba637fc17d515af99f7f1668 SHA512 b9c1c62599bd9e42a4be60dbbf66d07f1c53135e272b6d7ac18d102fee57ba92f73d16fb5d31e80830389b44736ed50c72fe1d27c8c40e3f5cc90367f49c4ddb WHIRLPOOL c96147a7ed5a7f4b0a48faae8cec3a322057fc8173aeb379339140fea6039fcf397ffd878018ff1f815a793f2f8fddb2e1cf8af630b04819dfe1b3a5edeb537f
-DIST genpatches-4.8-9.extras.tar.xz 17240 SHA256 234f0e14d33db0e6f6030a0ab178cc66262362995ff4283862bc7158653bcb04 SHA512 8ff161bdd3984ec06731ff3da8136ad6a2034e0bf9ab10bf47d6715aaf5cb3495d005c35155c65ff621ce91b8f906019881f3a361b425ba8a6efb9ff45aa16a2 WHIRLPOOL bf4d2f3eadbec945f56d576c7c95169379a44c803cb1c848de1247c506f7acce57f915dd9356844c7412e71c032d02274207a7519ad10ca6adf6d1307cb0c86b
+DIST genpatches-4.4-40.base.tar.xz 900384 SHA256 37e46efeff392dc9e60529bcb5968d41509f7584c2452837c1aeefce8aec433e SHA512 630979a3e8366025327961d8b83d7558f57dc8646de1dbeada48bf746a32c238827a9038861d72a7747ae78aa1eb5739ca2d87245ae2528e17dc57295e9b4dec WHIRLPOOL 2a1082442dde035407d918fff833ec0585d600490d700049951cb6c50eae543369549aeafaf159c69bfc1789b965f3a43cb1920747ba8dafbe45ff36e0e7e856
+DIST genpatches-4.4-40.experimental.tar.xz 87796 SHA256 88cc5074b3365417f97e319fbfe7bf3b4dc0af2cd7ba7041a09c13b1799f51a0 SHA512 f050858eb451258002a56fa2ca5e659724505a32aae5a8f7f0aed80dfbbcc681ac9e08eaf20dc963782e64d77938d255472a97a9a14d9682aca824b4ca6d66ed WHIRLPOOL 0c7e385760c343d4e00249874c32fda40970d3c79bd4120efd01b54a2ddfee429f00a14a64b7e91eab4d861b984b126c5b8ef7ba903e944fdca1ee64a54b412a
+DIST genpatches-4.4-40.extras.tar.xz 16420 SHA256 e8d9995830a65146198ab957a95b3d5397155b56150884ebe8897a7a1dc2b072 SHA512 0212316ca623b87ed9c3154107ea246e452709cd48572882af7be0ff776cf3aa978521ee4c7c82e62d4d3cef5412bae4f90def577b841f61fac529a317aa8106 WHIRLPOOL 6b9188a4007020125e5bce136273b1e9262ae8f863905fc08e7ac3a1b41848de11b54dd6426c3babd8e670997bc1c0aed8073800bb04ef5fa4242e350d2b0572
+DIST genpatches-4.8-14.base.tar.xz 248780 SHA256 abe559e7a15d2bb125811ef28d455baca07092b6af93943803e1079f4d4f6fbc SHA512 4a30f10dcadb47cd02e4f4992ef7f7d221872e03c254751320bd9977bfc59eb27321a02cec6dae1bacebe734adb3d04d022ea019c30f75b943f65f9c0dd49ea3 WHIRLPOOL 77bd42de19550647fbe6c22804a0dd71455f006055dc8c7f5fcc9257e4052b42293a3933dc71400bea198db50656747176777d94c40ef3926100075fbdc6d383
+DIST genpatches-4.8-14.experimental.tar.xz 92004 SHA256 0e574fd254afead4ba164f40fec008f069f78f94100cb04f44b5a313906e8ecb SHA512 fac626c3c4387ab9121de9b10b5fc8753991a326c773d243bc2f7d8c4833d83864458036d3adeed6cf7f7f3d0fb846cdbff707d55d216fe5232e5c842ecdad36 WHIRLPOOL 26c0c1e9a6a840e32d533c7eb4492679f5452ec36b8fbae043b0f7888af71386bb5863c2dc46e299e6f8a54c2cd5d451cd4c71945d6bd185403c11f838ad8d83
+DIST genpatches-4.8-14.extras.tar.xz 17308 SHA256 c64cdd104354fa9d5cac6fcb543c164433cc5abc2f5d85b868bd60464213c83b SHA512 0befc3771ec97707673b94a9183d8969a9f82dd7ec89629ea62dc6d21b023239358ac31cf96f1ef09ae329cde68db45170156d8caaaa29facccbe290521c3601 WHIRLPOOL 61cc5e3d5e69d02716507e10800f41742c8f1de744a8b9e9d2308692890b98292ef31487e0152e1ff24848f81504e5b60a98f89c840bd1a76ca049c487c0bab6
 DIST linux-3.18.tar.xz 80934708 SHA256 becc413cc9e6d7f5cc52a3ce66d65c3725bc1d1cc1001f4ce6c32b69eb188cbd SHA512 2f0b72466e9bc538a675738aa416573d41bbbd7e3e2ffd5b5b127afde609ebc278cec5a3c37e73479607e957c13f1b4ed9782a3795e0dcc2cf8e550228594009 WHIRLPOOL 81634af631b7d30ccd1f4798f96f44d9aa0ba6609b73f2747eb6aebaf7a99487fb2dbd45767605186182533cb222bfd9236e8dd5e11a04fdb67c211e4e0a91d6
 DIST linux-4.4.tar.xz 87295988 SHA256 401d7c8fef594999a460d10c72c5a94e9c2e1022f16795ec51746b0d165418b2 SHA512 13c8459933a8b80608e226a1398e3d1848352ace84bcfb7e6a4a33cb230bbe1ab719d4b58e067283df91ce5311be6d2d595fc8c19e2ae6ecc652499415614b3e WHIRLPOOL 02abc203d867404b9934aaa4c1e5b5dcbb0b0021e91a03f3a7e7fd224eed106821d8b4949f32a590536db150e5a88c16fcde88538777a26d0c17900f0257b1bc
 DIST linux-4.8.tar.xz 91966856 SHA256 3e9150065f193d3d94bcf46a1fe9f033c7ef7122ab71d75a7fb5a2f0c9a7e11a SHA512 a48a065f21e1c7c4de4cf8ca47b8b8d9a70f86b64e7cfa6e01be490f78895745b9c8790734b1d22182cf1f930fb87eaaa84e62ec8cc1f64ac4be9b949e7c0358 WHIRLPOOL 3888c8c07db0c069f827245d4d7306087f78f7d03e8240eb1fcd13622cd5dbe1c17cd8ed7dc11513f77f3efd5dbd84e2b48e82bdb9b9bfd2242fd62ae32812d5
--- a/sys-kernel/aufs-sources/aufs-sources-4.4.36-r1.ebuild
+++ b/sys-kernel/aufs-sources/aufs-sources-4.4.36-r1.ebuild
@ -6,13 +6,13 @@ EAPI=5

 ETYPE="sources"
 K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=12
+K_GENPATCHES_VER=40
 K_DEBLOB_AVAILABLE="0"
 K_KDBUS_AVAILABLE="0"
 UNIPATCH_STRICTORDER=1
 inherit kernel-2 eutils readme.gentoo-r1

-AUFS_VERSION=4.8_p20161010
+AUFS_VERSION=4.4_p20161010
 AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
 # git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
 AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
--- a/sys-kernel/aufs-sources/aufs-sources-4.8.12-r1.ebuild
+++ b/sys-kernel/aufs-sources/aufs-sources-4.8.12-r1.ebuild
@ -6,7 +6,7 @@ EAPI=5

 ETYPE="sources"
 K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=11
+K_GENPATCHES_VER=14
 K_DEBLOB_AVAILABLE="0"
 K_KDBUS_AVAILABLE="0"
 UNIPATCH_STRICTORDER=1
--- a/sys-kernel/aufs-sources/aufs-sources-4.8.12.ebuild
+++ b/sys-kernel/aufs-sources/aufs-sources-4.8.12.ebuild
@ -1,86 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=13
-K_DEBLOB_AVAILABLE="0"
-K_KDBUS_AVAILABLE="0"
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.8_p20161010
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="deblob experimental module vanilla"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
--- a/sys-kernel/aufs-sources/aufs-sources-4.8.3.ebuild
+++ b/sys-kernel/aufs-sources/aufs-sources-4.8.3.ebuild
@ -1,86 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=4
-K_DEBLOB_AVAILABLE="0"
-K_KDBUS_AVAILABLE="0"
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.8_p20161010
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="deblob experimental module vanilla"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
--- a/sys-kernel/aufs-sources/aufs-sources-4.8.4.ebuild
+++ b/sys-kernel/aufs-sources/aufs-sources-4.8.4.ebuild
@ -1,86 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER=5
-K_DEBLOB_AVAILABLE="0"
-K_KDBUS_AVAILABLE="0"
-UNIPATCH_STRICTORDER=1
-inherit kernel-2 eutils readme.gentoo-r1
-
-AUFS_VERSION=4.8_p20161010
-AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
-# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
-AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
-
-KEYWORDS="~amd64 ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
-IUSE="deblob experimental module vanilla"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the linux kernel tree and aufs4 support"
-SRC_URI="
-	${KERNEL_URI}
-	${ARCH_URI}
-	${AUFS_URI}
-	!vanilla? ( ${GENPATCHES_URI} )
-	"
-
-PDEPEND="=sys-fs/aufs-util-4*"
-
-README_GENTOO_SUFFIX="-r1"
-
-src_unpack() {
-	detect_version
-	detect_arch
-	if use vanilla; then
-		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
-		ewarn "You are using USE=vanilla"
-		ewarn "This will drop all support from the gentoo kernel security team"
-	fi
-
-	UNIPATCH_LIST="
-		"${WORKDIR}"/aufs4-kbuild.patch
-		"${WORKDIR}"/aufs4-base.patch
-		"${WORKDIR}"/aufs4-mmap.patch"
-
-	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
-
-	unpack ${AUFS_TARBALL}
-
-	einfo "Using aufs4 version: ${AUFS_VERSION}"
-
-	kernel-2_src_unpack
-}
-
-src_prepare() {
-	if ! use module; then
-		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
-	fi
-	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
-	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
-}
-
-src_install() {
-	kernel-2_src_install
-	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-	has_version sys-fs/aufs-util || \
-		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
-
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
--- a/Show More
+++ b/Show More