diff --git a/app-emulation/rkt/rkt-1.16.0.ebuild b/app-emulation/rkt/rkt-1.16.0.ebuild
index 70e3b76732f2..00f2ec26ac7a 100644
--- a/app-emulation/rkt/rkt-1.16.0.ebuild
+++ b/app-emulation/rkt/rkt-1.16.0.ebuild
@@ -202,8 +202,8 @@ src_compile() {
 	case ${arch} in
 		amd64) arch=x86_64;;
 	esac
-	ARCH=${arch} emake
-	ARCH=${arch} emake bash-completion
+	ARCH=${arch} emake V=3
+	ARCH=${arch} emake V=3 bash-completion
 }
 
 src_install() {
diff --git a/app-emulation/rkt/rkt-1.17.0.ebuild b/app-emulation/rkt/rkt-1.17.0.ebuild
index 8ceb64321051..9e0068cc4cdc 100644
--- a/app-emulation/rkt/rkt-1.17.0.ebuild
+++ b/app-emulation/rkt/rkt-1.17.0.ebuild
@@ -202,8 +202,8 @@ src_compile() {
 	case ${arch} in
 		amd64) arch=x86_64;;
 	esac
-	ARCH=${arch} emake
-	ARCH=${arch} emake bash-completion
+	ARCH=${arch} emake V=3
+	ARCH=${arch} emake V=3 bash-completion
 }
 
 src_install() {
diff --git a/app-emulation/rkt/rkt-1.18.0.ebuild b/app-emulation/rkt/rkt-1.18.0.ebuild
index febbe80e8118..3cf4584f8544 100644
--- a/app-emulation/rkt/rkt-1.18.0.ebuild
+++ b/app-emulation/rkt/rkt-1.18.0.ebuild
@@ -202,8 +202,8 @@ src_compile() {
 	case ${arch} in
 		amd64) arch=x86_64;;
 	esac
-	ARCH=${arch} emake
-	ARCH=${arch} emake bash-completion
+	ARCH=${arch} emake V=3
+	ARCH=${arch} emake V=3 bash-completion
 }
 
 src_install() {
diff --git a/app-emulation/runc/Manifest b/app-emulation/runc/Manifest
index 9c0b7dca214a..988e8c5c3e7f 100644
--- a/app-emulation/runc/Manifest
+++ b/app-emulation/runc/Manifest
@@ -1,5 +1,2 @@
-DIST runc-0.0.2.tar.gz 370712 SHA256 3d0aa68ebb1622853d0bbed432ebd4b6c9ef210881ac74f3a695b4e914d246dc SHA512 e0a44d5dd8a1b8eaeaf7d466cebc7dc8beaa26f49bd0e76d3a955cef9c5c266d2afe6652f28fa905a408b5b93966f52e345112fa7aef373216561ad7069181c5 WHIRLPOOL e7ed1ee3d159a81fb0b2b0f5fac9a9a66116035babc88f6f266a6c8455953ce372e93351baf7c621c42ab8c5907961fd899b1d158e7f7b1335f83fcef7252c71
-DIST runc-0.0.5.tar.gz 441874 SHA256 e80323412883e4afcfcf8e1b2eaefdcb74632628d02fd7f48618caf78e5e4aa0 SHA512 625d67ec02e23c66a3d1a97113a0c58f3f200404866839556bc3cd5b3e34342230b8091613d17ef4a38d05ca51df586cd7366dc6bddeeddd6b69bb9a2ae7efda WHIRLPOOL 862b08621b67fc57286940ad5e20557d90cfef63aae5be0a90fc6f5b764d032b187ba5ad5dcb1fa99fb5ec59d6217941aa19ca9048637bd02b64e52c8cecdce6
 DIST runc-0.1.0.tar.gz 496358 SHA256 681d6d89541ae2e06757f999a242a1f97bbcb1ad6e10f4cdee287ec4a9d2bff9 SHA512 8a9ff02b0161eda0a730194b0fbf7ad76e8f379992e74061ef49302da3492fd0c53f06db9153ded4d934d67bbf6f4291d6154254f1b924ef73c97c44cd14ffcf WHIRLPOOL 81f488a4f1e23e8704a9fa8404965b2f12f74a875ba8e67dc15de93f43b075dc538cd0d89c7a1187cb74ac6320317b5985855945fb8bf8f749d6736df47b844a
-DIST runc-0.1.1.tar.gz 496416 SHA256 f9955daed1e73e842b2f28a258fba51f4e72a6b4b64cc3fc06415481d55ce000 SHA512 074482636fd2342c490c450d7a379cd14cd6c7b1ec6109cf729c4b451cc8cfb0e6b286d0df8e0cc0dba7b24d63d12bd5978013e08301a785db5e4280c595fdaa WHIRLPOOL f605e70d2bea88b5ba10f6375543824167509630cc3ed839575d5e0d3b05bb07edcac8fcee168aa3ae89adaf0ccf5ab816a201b27022ddcf31fd0218bd59c357
 DIST runc-1.0.0_rc2.tar.gz 550449 SHA256 638742c48426b9a3281aeb619e27513d972de228bdbd43b478baea99c186d491 SHA512 83a3d45efbb86d3d583b96062202b9e60121d250af2c0dd37d07fda574b642aa6f05e29cac6644ad3d624647400db694082e280383e41ca9f31dc0a33b87ed76 WHIRLPOOL 990a45739689db80bbeed43b0fd3a4ce4d0563ea833361b9112e750782313f19e638c4bfbd455f5dd1882d64c724dcf0213701322029c2c9f98f624863c744f3
diff --git a/app-emulation/runc/runc-0.0.2.ebuild b/app-emulation/runc/runc-0.0.2.ebuild
deleted file mode 100644
index f5bb49f1adfb..000000000000
--- a/app-emulation/runc/runc-0.0.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-DESCRIPTION="runc container cli tools"
-HOMEPAGE="http://runc.io"
-
-GITHUB_URI="github.com/opencontainers/runc"
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="git://${GITHUB_URI}.git"
-	inherit git-r3
-else
-	SRC_URI="https://${GITHUB_URI}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-inherit multilib
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=dev-lang/go-1.4:="
-RDEPEND=""
-
-src_prepare() {
-	epatch_user
-}
-
-src_compile() {
-	# Taken from app-emulation/docker-1.7.0-r1
-	export CGO_CFLAGS="-I${ROOT}/usr/include"
-	export CGO_LDFLAGS="-L${ROOT}/usr/$(get_libdir)"
-
-	# Setup GOPATH so things build
-	rm -rf .gopath
-	mkdir -p .gopath/src/"$(dirname "${GITHUB_URI}")"
-	ln -sf ../../../.. .gopath/src/"${GITHUB_URI}"
-	export GOPATH="${PWD}/.gopath:${PWD}/vendor"
-
-	make
-}
-
-src_install() {
-	dobin runc
-}
diff --git a/app-emulation/runc/runc-0.0.5.ebuild b/app-emulation/runc/runc-0.0.5.ebuild
deleted file mode 100644
index 5cd38367f22d..000000000000
--- a/app-emulation/runc/runc-0.0.5.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils multilib
-
-DESCRIPTION="runc container cli tools"
-HOMEPAGE="http://runc.io"
-
-GITHUB_URI="github.com/opencontainers/runc"
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="git://${GITHUB_URI}.git"
-	inherit git-r3
-else
-	SRC_URI="https://${GITHUB_URI}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="+seccomp"
-
-DEPEND=">=dev-lang/go-1.4:="
-RDEPEND="seccomp? ( sys-libs/libseccomp )"
-
-src_prepare() {
-	epatch_user
-}
-
-src_compile() {
-	# Taken from app-emulation/docker-1.7.0-r1
-	export CGO_CFLAGS="-I${ROOT}/usr/include"
-	export CGO_LDFLAGS="-L${ROOT}/usr/$(get_libdir)"
-
-	# Setup GOPATH so things build
-	rm -rf .gopath
-	mkdir -p .gopath/src/"$(dirname "${GITHUB_URI}")"
-	ln -sf ../../../.. .gopath/src/"${GITHUB_URI}"
-	export GOPATH="${PWD}/.gopath:${PWD}/vendor"
-
-	# build up optional flags
-	local options=( $(usex seccomp "seccomp") )
-
-	emake BUILDTAGS="${options[@]}"
-}
-
-src_install() {
-	dobin runc
-}
diff --git a/app-emulation/runc/runc-0.1.1.ebuild b/app-emulation/runc/runc-0.1.1.ebuild
deleted file mode 100644
index 38f97f15d881..000000000000
--- a/app-emulation/runc/runc-0.1.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-EGO_PN="github.com/opencontainers/${PN}"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit golang-vcs
-else
-	MY_PV="${PV/_/-}"
-	EGIT_COMMIT="v${MY_PV}"
-	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-	inherit golang-vcs-snapshot
-fi
-
-DESCRIPTION="runc container cli tools"
-HOMEPAGE="http://runc.io"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="apparmor +seccomp"
-
-DEPEND=""
-RDEPEND="
-	apparmor? ( sys-libs/libapparmor )
-	seccomp? ( sys-libs/libseccomp )
-"
-
-S=${WORKDIR}/${P}/src/${EGO_PN}
-
-src_compile() {
-	# Taken from app-emulation/docker-1.7.0-r1
-	export CGO_CFLAGS="-I${ROOT}/usr/include"
-	export CGO_LDFLAGS="-L${ROOT}/usr/$(get_libdir)"
-
-	# Setup GOPATH so things build
-	rm -rf .gopath
-	mkdir -p .gopath/src/"$(dirname "${GITHUB_URI}")"
-	ln -sf ../../../.. .gopath/src/"${GITHUB_URI}"
-	export GOPATH="${PWD}/.gopath:${PWD}/vendor"
-
-	# build up optional flags
-	local options=(
-		$(usex apparmor 'apparmor')
-		$(usex seccomp 'seccomp')
-	)
-
-	emake BUILDTAGS="${options[*]}"
-}
-
-src_install() {
-	dobin runc
-}
diff --git a/dev-python/httplib2/files/python-httplib2-0.9-cve-2013-2037.patch b/dev-python/httplib2/files/python-httplib2-0.9-cve-2013-2037.patch
new file mode 100644
index 000000000000..6a09337b1993
--- /dev/null
+++ b/dev-python/httplib2/files/python-httplib2-0.9-cve-2013-2037.patch
@@ -0,0 +1,21 @@
+diff -Nur httplib2-0.9.orig/python2/httplib2/__init__.py httplib2-0.9/python2/httplib2/__init__.py
+--- httplib2-0.9.orig/python2/httplib2/__init__.py	2015-04-03 13:10:43.401035131 -0600
++++ httplib2-0.9/python2/httplib2/__init__.py	2015-04-03 13:10:08.470685647 -0600
+@@ -1042,7 +1042,7 @@
+                         raise CertificateHostnameMismatch(
+                             'Server presented certificate that does not match '
+                             'host %s: %s' % (hostname, cert), hostname, cert)
+-            except ssl_SSLError, e:
++            except (ssl_SSLError, CertificateHostnameMismatch), e:
+                 if sock:
+                     sock.close()
+                 if self.sock:
+@@ -1052,7 +1052,7 @@
+                 # to get at more detailed error information, in particular
+                 # whether the error is due to certificate validation or
+                 # something else (such as SSL protocol mismatch).
+-                if e.errno == ssl.SSL_ERROR_SSL:
++                if hasattr(e, 'errno') and e.errno == ssl.SSL_ERROR_SSL:
+                     raise SSLHandshakeError(e)
+                 else:
+                     raise
diff --git a/dev-python/httplib2/httplib2-0.9.2-r1.ebuild b/dev-python/httplib2/httplib2-0.9.2-r2.ebuild
similarity index 71%
rename from dev-python/httplib2/httplib2-0.9.2-r1.ebuild
rename to dev-python/httplib2/httplib2-0.9.2-r2.ebuild
index 9fe30a1be1e7..73829485877c 100644
--- a/dev-python/httplib2/httplib2-0.9.2-r1.ebuild
+++ b/dev-python/httplib2/httplib2-0.9.2-r2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5} pypy pypy3 )
+PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy pypy3 )
 
 inherit distutils-r1
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
@@ -22,6 +22,10 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 # tests connect to random remote sites
 RESTRICT="test"
 
+PATCHES=(
+	"${FILESDIR}/python-httplib2-0.9-cve-2013-2037.patch"
+)
+
 python_prepare_all() {
 	chmod o+r */*egg*/* || die
 	distutils-r1_python_prepare_all
diff --git a/dev-vcs/cvs/cvs-1.12.12-r11.ebuild b/dev-vcs/cvs/cvs-1.12.12-r11.ebuild
new file mode 100644
index 000000000000..860cd3f7db43
--- /dev/null
+++ b/dev-vcs/cvs/cvs-1.12.12-r11.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit pam toolchain-funcs
+
+DESCRIPTION="Concurrent Versions System - source code revision control tools"
+HOMEPAGE="http://cvs.nongnu.org/"
+
+SRC_URI="mirror://gnu/non-gnu/cvs/source/feature/${PV}/${P}.tar.bz2
+	doc? ( mirror://gnu/non-gnu/cvs/source/feature/${PV}/cederqvist-${PV}.html.tar.bz2
+		mirror://gnu/non-gnu/cvs/source/feature/${PV}/cederqvist-${PV}.pdf
+		mirror://gnu/non-gnu/cvs/source/feature/${PV}/cederqvist-${PV}.ps )"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64
+	~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+	~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint
+	~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+IUSE="crypt doc kerberos nls pam server"
+RESTRICT="test"
+
+DEPEND=">=sys-libs/zlib-1.1.4
+	kerberos? ( virtual/krb5 )
+	pam? ( virtual/pam )"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	unpack ${P}.tar.bz2
+	use doc && unpack cederqvist-${PV}.html.tar.bz2
+}
+
+PATCHES=(
+	"${FILESDIR}"/${P}-cvsbug-tmpfix.patch
+	"${FILESDIR}"/${P}-openat.patch
+	"${FILESDIR}"/${P}-block-requests.patch
+	"${FILESDIR}"/${P}-cvs-gnulib-vasnprintf.patch
+	"${FILESDIR}"/${P}-install-sh.patch
+	"${FILESDIR}"/${P}-hash-nameclash.patch # for AIX
+	"${FILESDIR}"/${P}-getdelim.patch # 314791
+	"${FILESDIR}"/${PN}-1.12.12-rcs2log-coreutils.patch # 144114
+	"${FILESDIR}"/${P}-mktime-x32.patch # 395641
+	"${FILESDIR}"/${P}-fix-massive-leak.patch
+	"${FILESDIR}"/${P}-mktime-configure.patch #220040 #570208
+	"${FILESDIR}"/${P}-CVE-2012-0804.patch
+	"${FILESDIR}"/${P}-format-security.patch
+	"${FILESDIR}"/${P}-musl.patch
+	)
+DOCS=( BUGS ChangeLog{,.zoo} DEVEL-CVS FAQ HACKING MINOR-BUGS NEWS \
+	PROJECTS README TESTS TODO )
+
+src_prepare() {
+	default
+
+	sed -i "/^AR/s/ar/$(tc-getAR)/" diff/Makefile.in lib/Makefile.in || die
+}
+
+src_configure() {
+	if tc-is-cross-compiler ; then
+		# Sane defaults when cross-compiling (as these tests want to
+		# try and execute code).
+		export cvs_cv_func_printf_ptr="yes"
+	fi
+	econf \
+		--with-external-zlib \
+		--with-tmpdir=${EPREFIX%/}/tmp \
+		$(use_enable crypt encryption) \
+		$(use_with kerberos gssapi) \
+		$(use_enable nls) \
+		$(use_enable pam) \
+		$(use_enable server)
+}
+
+src_install() {
+	# Not installed into emacs site-lisp because it clobbers the normal C
+	# indentations.
+	DOCS+=( cvs-format.el )
+
+	if use doc; then
+		DOCS+=( "${DISTDIR}"/cederqvist-${PV}.{pdf,ps} )
+		HTML_DOCS=( ../cederqvist-${PV}.html/. )
+	fi
+
+	default
+
+	use doc && dosym cvs.html /usr/share/doc/${PF}/html/index.html
+
+	if use server; then
+		newdoc "${FILESDIR}"/cvs-1.12.12-cvs-custom.c cvs-custom.c
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}"/cvspserver.xinetd.d cvspserver
+		newenvd "${FILESDIR}"/01-cvs-env.d 01cvs
+	fi
+
+	newpamd "${FILESDIR}"/cvs.pam-include-1.12.12 cvs
+}
+
+pkg_postinst() {
+	use server || elog "If you want any CVS server functionality, you MUST emerge with USE=server!"
+}
diff --git a/dev-vcs/cvs/files/cvs-1.12.12-CVE-2012-0804.patch b/dev-vcs/cvs/files/cvs-1.12.12-CVE-2012-0804.patch
new file mode 100644
index 000000000000..107c3ea12204
--- /dev/null
+++ b/dev-vcs/cvs/files/cvs-1.12.12-CVE-2012-0804.patch
@@ -0,0 +1,30 @@
+[CVE-2012-0804] Fix proxy response parser
+
+If proxy sends overlong HTTP vesion string, the string will be copied
+to unallocatd space (write_buf) causing heap overflow.
+
+This patch fixes it by ignoring the HTTP version string and checking
+the response line has been parsed correctly.
+
+See <https://bugzilla.redhat.com/show_bug.cgi?id=773699> for more
+details.
+
+Index: src/client.c
+===================================================================
+RCS file: /sources/cvs/ccvs/src/client.c,v
+retrieving revision 1.483
+diff -u -r1.483 client.c
+--- a/src/client.c	18 Nov 2008 22:59:02 -0000	1.483
++++ b/src/client.c	26 Jan 2012 16:32:25 -0000
+@@ -4339,9 +4339,9 @@
+          * code.
+          */
+ 	read_line_via (from_server, to_server, &read_buf);
+-	sscanf (read_buf, "%s %d", write_buf, &codenum);
++	count = sscanf (read_buf, "%*s %d", &codenum);
+ 
+-	if ((codenum / 100) != 2)
++	if (count != 1 || (codenum / 100) != 2)
+ 	    error (1, 0, "proxy server %s:%d does not support http tunnelling",
+ 		   root->proxy_hostname, proxy_port_number);
+ 	free (read_buf);
diff --git a/dev-vcs/cvs/files/cvs-1.12.12-format-security.patch b/dev-vcs/cvs/files/cvs-1.12.12-format-security.patch
new file mode 100644
index 000000000000..d710a9020735
--- /dev/null
+++ b/dev-vcs/cvs/files/cvs-1.12.12-format-security.patch
@@ -0,0 +1,22 @@
+--- a/diff/diff3.c
++++ b/diff/diff3.c
+@@ -1503,7 +1503,7 @@
+ 	      line = 0;
+ 	      do
+ 		{
+-		  printf_output (line_prefix);
++		  printf_output ("%s", line_prefix);
+ 		  cp = D_RELNUM (ptr, realfile, line);
+ 		  length = D_RELLEN (ptr, realfile, line);
+ 		  write_output (cp, length);
+--- a/src/main.c
++++ b/src/main.c
+@@ -1375,7 +1375,7 @@
+ {
+     (void) fprintf (stderr, *cpp++, program_name, cvs_cmd_name);
+     for (; *cpp; cpp++)
+-	(void) fprintf (stderr, *cpp);
++	(void) fprintf (stderr, "%s", *cpp);
+     exit (EXIT_FAILURE);
+ }
+ 
diff --git a/dev-vcs/cvs/files/cvs-1.12.12-getdelim.patch b/dev-vcs/cvs/files/cvs-1.12.12-getdelim.patch
index 04eb03ab600d..837d4408ab1f 100644
--- a/dev-vcs/cvs/files/cvs-1.12.12-getdelim.patch
+++ b/dev-vcs/cvs/files/cvs-1.12.12-getdelim.patch
@@ -8,8 +8,8 @@ http://bugs.gentoo.org/314791
 Already comitted upstream:
 http://cvs.savannah.gnu.org/viewvc/ccvs/src/myndbm.c?root=cvs&r1=1.38&r2=1.39
 
---- src/myndbm.c.orig
-+++ src/myndbm.c
+--- a/src/myndbm.c.orig
++++ b/src/myndbm.c
 @@ -213,7 +213,7 @@
  mydbm_load_file (FILE *fp, List *list, char *filename)
  {
diff --git a/dev-vcs/cvs/files/cvs-1.12.12-hash-nameclash.patch b/dev-vcs/cvs/files/cvs-1.12.12-hash-nameclash.patch
index 0a33eea873ff..95fd61e0a51a 100644
--- a/dev-vcs/cvs/files/cvs-1.12.12-hash-nameclash.patch
+++ b/dev-vcs/cvs/files/cvs-1.12.12-hash-nameclash.patch
@@ -1,8 +1,8 @@
 http://cvs.savannah.gnu.org/viewvc/cvs/ccvs/src/hash.h?r1=1.14.6.2&r2=1.14.6.3&pathrev=cvs1-11-x-branch
 fixed in cvs-1.11.23, cvs-HEAD after cvs-1.12.13a
 
---- src/hash.h.orig	2005-02-01 22:56:48 +0100
-+++ src/hash.h	2010-03-10 19:00:11 +0100
+--- a/src/hash.h.orig	2005-02-01 22:56:48 +0100
++++ b/src/hash.h	2010-03-10 19:00:11 +0100
 @@ -27,26 +27,26 @@
  };
  typedef enum ntype Ntype;
diff --git a/dev-vcs/cvs/files/cvs-1.12.12-mktime-configure.patch b/dev-vcs/cvs/files/cvs-1.12.12-mktime-configure.patch
index 1a9c47b68ba8..03d7f35601e2 100644
--- a/dev-vcs/cvs/files/cvs-1.12.12-mktime-configure.patch
+++ b/dev-vcs/cvs/files/cvs-1.12.12-mktime-configure.patch
@@ -3,8 +3,8 @@ https://bugs.gentoo.org/570208
 
 update mktime check to latest autoconf version which is less buggy
 
---- configure
-+++ configure
+--- a/configure
++++ b/configure
 @@ -5299,26 +6059,25 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
diff --git a/dev-vcs/cvs/files/cvs-1.12.12-musl.patch b/dev-vcs/cvs/files/cvs-1.12.12-musl.patch
new file mode 100644
index 000000000000..e426cf55fcc7
--- /dev/null
+++ b/dev-vcs/cvs/files/cvs-1.12.12-musl.patch
@@ -0,0 +1,13 @@
+http://gcc.gnu.org/ml/gcc/2003-04/msg00518.html
+
+--- a/lib/regex.c
++++ b/lib/regex.c
+@@ -8184,7 +8184,7 @@
+       if (msg_size > errbuf_size)
+         {
+ #if defined HAVE_MEMPCPY || defined _LIBC
+-	  *((char *) __mempcpy (errbuf, msg, errbuf_size - 1)) = '\0';
++	  *((char *) mempcpy (errbuf, msg, errbuf_size - 1)) = '\0';
+ #else
+           memcpy (errbuf, msg, errbuf_size - 1);
+           errbuf[errbuf_size - 1] = 0;
diff --git a/dev-vcs/cvs/files/cvs-1.12.12-rcs2log-coreutils.patch b/dev-vcs/cvs/files/cvs-1.12.12-rcs2log-coreutils.patch
index 0fb4c6c6d73d..7dda3f0f1724 100644
--- a/dev-vcs/cvs/files/cvs-1.12.12-rcs2log-coreutils.patch
+++ b/dev-vcs/cvs/files/cvs-1.12.12-rcs2log-coreutils.patch
@@ -1,8 +1,8 @@
 X-Gentoo-bug: 144114
 
-diff -Nuar cvs-1.12.12.orig//contrib/rcs2log.sh cvs-1.12.12//contrib/rcs2log.sh
---- cvs-1.12.12.orig//contrib/rcs2log.sh	2003-02-25 21:32:51.000000000 +0000
-+++ cvs-1.12.12//contrib/rcs2log.sh	2010-12-06 21:14:33.831532212 +0000
+diff -Nuar cvs-1.12.12.orig/contrib/rcs2log.sh cvs-1.12.12/contrib/rcs2log.sh
+--- cvs-1.12.12.orig/contrib/rcs2log.sh	2003-02-25 21:32:51.000000000 +0000
++++ cvs-1.12.12/contrib/rcs2log.sh	2010-12-06 21:14:33.831532212 +0000
 @@ -620,7 +620,7 @@
  # Sort the log entries, first by date+time (in reverse order),
  # then by author, then by log entry, and finally by file name and revision
diff --git a/media-video/kaffeine/Manifest b/media-video/kaffeine/Manifest
index 6834152a6908..d8612fa5cdcb 100644
--- a/media-video/kaffeine/Manifest
+++ b/media-video/kaffeine/Manifest
@@ -1,2 +1 @@
-DIST kaffeine-2.0.4.tar.xz 1993776 SHA256 b9b22a1e8503a49bcf70feaa5443a30c3c99a9da6e3d5b7fe82c1d98602c0166 SHA512 bb27f967d8106425d8b9f60f157a6bc8372b1fb0d0b28319d447f4ff8b81ed821569f9554940aaf2d35457ae195a7b783b25012ac5839b4213209dcc82ff93e0 WHIRLPOOL 5f7f4e52254054674269a71205153a66faefaae6e8bebce17c12d357d79c7731d7a271827f3fb608134f11b0d0f2695d0d13b999c7d2c086b1f9a386c67d6647
 DIST kaffeine-2.0.5.tar.xz 2284712 SHA256 e1610931e9475e8b86f9c75331f51fbeea22fab0c5fc6a1085325ab2ef055a8c SHA512 2e0562debba616a1b5e3c8c635735e27473cea4ac9b21ab56b8babe5cfffd6f43bce82ecbdcb1d01c08722c08622110fd1b0d00aae779e9007ea82c5068680c2 WHIRLPOOL df3d8bc26077bbd15199a426d77ca0725342c22c0c0c29915479a74f41c37b95579d202cd718e271b2ef7bc0fb6dfc1c921f14395f56040a6727d4830421f840
diff --git a/media-video/kaffeine/kaffeine-2.0.4.ebuild b/media-video/kaffeine/kaffeine-2.0.4.ebuild
deleted file mode 100644
index 06b6af1f8931..000000000000
--- a/media-video/kaffeine/kaffeine-2.0.4.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="Media player with digital TV support by KDE"
-HOMEPAGE="https://kaffeine.kde.org/"
-SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-
-LICENSE="GPL-2 FDL-1.2"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-CDEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep solid)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtsql 'sqlite')
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	$(add_qt_dep qtxml)
-	media-libs/libv4l
-	media-video/vlc[X]
-	x11-libs/libXScrnSaver
-"
-DEPEND="${CDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-RDEPEND="${CDEPEND}
-	!media-video/kaffeine:4
-"
-
-DOCS=( Changelog NOTES README.md )
-
-src_prepare() {
-	kde5_src_prepare
-
-	# unused dependencies incorrectly added during the release process
-	# they do not appear in upstream git
-	sed -i \
-		-e "/find_package(KF5DocTools CONFIG REQUIRED)/d" \
-		-e "/kdoctools_install(po)/d" \
-		CMakeLists.txt || die
-}
-
-src_configure() {
-	# tools working on $HOME directory for a local git checkout
-	local mycmakeargs=(
-		-DBUILD_TOOLS=OFF
-	)
-
-	kde5_src_configure
-}
diff --git a/media-video/kaffeine/kaffeine-2.0.5.ebuild b/media-video/kaffeine/kaffeine-2.0.5.ebuild
index 17a7d85901ca..1fb22a76884e 100644
--- a/media-video/kaffeine/kaffeine-2.0.5.ebuild
+++ b/media-video/kaffeine/kaffeine-2.0.5.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://kaffeine.kde.org/"
 SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.3 )"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 CDEPEND="
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 1702564ee1d4..184ac48141f2 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sat, 19 Nov 2016 18:43:14 +0000
+Sat, 19 Nov 2016 20:43:16 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 1702564ee1d4..184ac48141f2 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sat, 19 Nov 2016 18:43:14 +0000
+Sat, 19 Nov 2016 20:43:16 +0000
diff --git a/metadata/md5-cache/app-emulation/rkt-1.16.0 b/metadata/md5-cache/app-emulation/rkt-1.16.0
index f2329fa1d59a..3e3ddc969286 100644
--- a/metadata/md5-cache/app-emulation/rkt-1.16.0
+++ b/metadata/md5-cache/app-emulation/rkt-1.16.0
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( rkt_stage1_coreos rkt_stage1_fly rkt_stage1_host rkt_stage1_kv
 SLOT=0
 SRC_URI=https://github.com/coreos/rkt/archive/v1.16.0.tar.gz -> rkt-1.16.0.tar.gz rkt_stage1_coreos? ( http://alpha.release.core-os.net/amd64-usr/1151.0.0/coreos_production_pxe_image.cpio.gz -> rkt-pxe-1151.0.0.img ) rkt_stage1_kvm_lkvm? ( https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+archive/d62653e177597251c24494a6dda60acd6d846671.tar.gz -> kvmtool-d62653e177597251c24494a6dda60acd6d846671.tar.gz mirror://kernel/linux/kernel/v4.x/linux-4.3.1.tar.xz http://alpha.release.core-os.net/amd64-usr/1151.0.0/coreos_production_pxe_image.cpio.gz -> rkt-pxe-1151.0.0.img ) rkt_stage1_kvm_qemu? ( http://wiki.qemu-project.org/download/qemu-2.6.1.tar.bz2 mirror://kernel/linux/kernel/v4.x/linux-4.3.1.tar.xz http://alpha.release.core-os.net/amd64-usr/1151.0.0/coreos_production_pxe_image.cpio.gz -> rkt-pxe-1151.0.0.img ) rkt_stage1_src? ( https://github.com/systemd/systemd/archive/v231.tar.gz -> systemd-231.tar.gz )
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87
-_md5_=24be6171a14cfd285f4838b4e6d84d44
+_md5_=0d80e2e4120db5c8422935477bbd127a
diff --git a/metadata/md5-cache/app-emulation/rkt-1.17.0 b/metadata/md5-cache/app-emulation/rkt-1.17.0
index c3368e39b884..562a20462faa 100644
--- a/metadata/md5-cache/app-emulation/rkt-1.17.0
+++ b/metadata/md5-cache/app-emulation/rkt-1.17.0
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( rkt_stage1_coreos rkt_stage1_fly rkt_stage1_host rkt_stage1_kv
 SLOT=0
 SRC_URI=https://github.com/coreos/rkt/archive/v1.17.0.tar.gz -> rkt-1.17.0.tar.gz rkt_stage1_coreos? ( http://alpha.release.core-os.net/amd64-usr/1151.0.0/coreos_production_pxe_image.cpio.gz -> rkt-pxe-1151.0.0.img ) rkt_stage1_kvm_lkvm? ( https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+archive/d62653e177597251c24494a6dda60acd6d846671.tar.gz -> kvmtool-d62653e177597251c24494a6dda60acd6d846671.tar.gz mirror://kernel/linux/kernel/v4.x/linux-4.3.1.tar.xz http://alpha.release.core-os.net/amd64-usr/1151.0.0/coreos_production_pxe_image.cpio.gz -> rkt-pxe-1151.0.0.img ) rkt_stage1_kvm_qemu? ( http://wiki.qemu-project.org/download/qemu-2.6.1.tar.bz2 mirror://kernel/linux/kernel/v4.x/linux-4.3.1.tar.xz http://alpha.release.core-os.net/amd64-usr/1151.0.0/coreos_production_pxe_image.cpio.gz -> rkt-pxe-1151.0.0.img ) rkt_stage1_src? ( https://github.com/systemd/systemd/archive/v231.tar.gz -> systemd-231.tar.gz )
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87
-_md5_=7b8406316e67ddf795f70eb2c910fd89
+_md5_=90930b4b7dbb0106761f692e64033a8a
diff --git a/metadata/md5-cache/app-emulation/rkt-1.18.0 b/metadata/md5-cache/app-emulation/rkt-1.18.0
index 15472ee3127f..658ec94a8c21 100644
--- a/metadata/md5-cache/app-emulation/rkt-1.18.0
+++ b/metadata/md5-cache/app-emulation/rkt-1.18.0
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( rkt_stage1_coreos rkt_stage1_fly rkt_stage1_host rkt_stage1_kv
 SLOT=0
 SRC_URI=https://github.com/coreos/rkt/archive/v1.18.0.tar.gz -> rkt-1.18.0.tar.gz rkt_stage1_coreos? ( http://alpha.release.core-os.net/amd64-usr/1192.0.0/coreos_production_pxe_image.cpio.gz -> rkt-pxe-1192.0.0.img ) rkt_stage1_kvm_lkvm? ( https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+archive/d62653e177597251c24494a6dda60acd6d846671.tar.gz -> kvmtool-d62653e177597251c24494a6dda60acd6d846671.tar.gz mirror://kernel/linux/kernel/v4.x/linux-4.3.1.tar.xz http://alpha.release.core-os.net/amd64-usr/1192.0.0/coreos_production_pxe_image.cpio.gz -> rkt-pxe-1192.0.0.img ) rkt_stage1_kvm_qemu? ( http://wiki.qemu-project.org/download/qemu-2.6.1.tar.bz2 mirror://kernel/linux/kernel/v4.x/linux-4.3.1.tar.xz http://alpha.release.core-os.net/amd64-usr/1192.0.0/coreos_production_pxe_image.cpio.gz -> rkt-pxe-1192.0.0.img ) rkt_stage1_src? ( https://github.com/systemd/systemd/archive/v231.tar.gz -> systemd-231.tar.gz )
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87
-_md5_=d90a573bdc6694ed689c05f1129a0cfe
+_md5_=dbb0072db3ab8ba5be6be400a84bfc84
diff --git a/metadata/md5-cache/app-emulation/runc-0.0.2 b/metadata/md5-cache/app-emulation/runc-0.0.2
deleted file mode 100644
index dd42c1d84e5b..000000000000
--- a/metadata/md5-cache/app-emulation/runc-0.0.2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=>=dev-lang/go-1.4:=
-DESCRIPTION=runc container cli tools
-EAPI=5
-HOMEPAGE=http://runc.io
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-SLOT=0
-SRC_URI=https://github.com/opencontainers/runc/archive/v0.0.2.tar.gz -> runc-0.0.2.tar.gz
-_eclasses_=multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=9221abd9041f3abc00b96606049a42f8
diff --git a/metadata/md5-cache/app-emulation/runc-0.0.5 b/metadata/md5-cache/app-emulation/runc-0.0.5
deleted file mode 100644
index ea4329813868..000000000000
--- a/metadata/md5-cache/app-emulation/runc-0.0.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=>=dev-lang/go-1.4:=
-DESCRIPTION=runc container cli tools
-EAPI=5
-HOMEPAGE=http://runc.io
-IUSE=+seccomp
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=seccomp? ( sys-libs/libseccomp )
-SLOT=0
-SRC_URI=https://github.com/opencontainers/runc/archive/v0.0.5.tar.gz -> runc-0.0.5.tar.gz
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=d4fa2aa53f6a279407ed17ef1aea23c7
diff --git a/metadata/md5-cache/app-emulation/runc-0.1.1 b/metadata/md5-cache/app-emulation/runc-0.1.1
deleted file mode 100644
index f7534b8cfb23..000000000000
--- a/metadata/md5-cache/app-emulation/runc-0.1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=>=dev-lang/go-1.4.2:=
-DESCRIPTION=runc container cli tools
-EAPI=6
-HOMEPAGE=http://runc.io
-IUSE=apparmor +seccomp
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=apparmor? ( sys-libs/libapparmor ) seccomp? ( sys-libs/libseccomp )
-SLOT=0
-SRC_URI=https://github.com/opencontainers/runc/archive/v0.1.1.tar.gz -> runc-0.1.1.tar.gz
-_eclasses_=golang-base	08fe6e0e2b4750daff8887a7f0e1f873	golang-vcs-snapshot	1caa6d8238d2378ad688ae068ff22e5a
-_md5_=fb043c6f701fdd5da0071aebb0fa120e
diff --git a/metadata/md5-cache/dev-python/httplib2-0.9.2-r1 b/metadata/md5-cache/dev-python/httplib2-0.9.2-r2
similarity index 78%
rename from metadata/md5-cache/dev-python/httplib2-0.9.2-r1
rename to metadata/md5-cache/dev-python/httplib2-0.9.2-r2
index 24f2865cb902..ea392982eb44 100644
--- a/metadata/md5-cache/dev-python/httplib2-0.9.2-r1
+++ b/metadata/md5-cache/dev-python/httplib2-0.9.2-r2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3:0= ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 DESCRIPTION=A comprehensive HTTP client library
-EAPI=5
+EAPI=6
 HOMEPAGE=https://pypi.python.org/pypi/httplib2 https://github.com/jcgregorio/httplib2
 IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=MIT
 RDEPEND=python_targets_pypy? ( virtual/pypy:0= ) python_targets_pypy3? ( virtual/pypy3:0= ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/h/httplib2/httplib2-0.9.2.tar.gz
-_eclasses_=distutils-r1	583a05d30524485fda6869c772682ecd	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=d650ed783d1673b8e9ef5ad183e18a06
+_eclasses_=distutils-r1	583a05d30524485fda6869c772682ecd	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=128826a64a2e70e84c6a94b4e80ece7e
diff --git a/metadata/md5-cache/dev-vcs/cvs-1.12.12-r11 b/metadata/md5-cache/dev-vcs/cvs-1.12.12-r11
new file mode 100644
index 000000000000..60c4ed698345
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/cvs-1.12.12-r11
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst prepare unpack
+DEPEND=>=sys-libs/zlib-1.1.4 kerberos? ( virtual/krb5 ) pam? ( virtual/pam )
+DESCRIPTION=Concurrent Versions System - source code revision control tools
+EAPI=6
+HOMEPAGE=http://cvs.nongnu.org/
+IUSE=crypt doc kerberos nls pam server
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2 LGPL-2
+RDEPEND=>=sys-libs/zlib-1.1.4 kerberos? ( virtual/krb5 ) pam? ( virtual/pam )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://gnu/non-gnu/cvs/source/feature/1.12.12/cvs-1.12.12.tar.bz2 doc? ( mirror://gnu/non-gnu/cvs/source/feature/1.12.12/cederqvist-1.12.12.html.tar.bz2 mirror://gnu/non-gnu/cvs/source/feature/1.12.12/cederqvist-1.12.12.pdf mirror://gnu/non-gnu/cvs/source/feature/1.12.12/cederqvist-1.12.12.ps )
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
+_md5_=84a31a13c809af470d311ea425cab328
diff --git a/metadata/md5-cache/media-video/kaffeine-2.0.4 b/metadata/md5-cache/media-video/kaffeine-2.0.4
deleted file mode 100644
index 8d082947cfee..000000000000
--- a/metadata/md5-cache/media-video/kaffeine-2.0.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.26.0:5 >=kde-frameworks/kconfigwidgets-5.26.0:5 >=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/kdbusaddons-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/kio-5.26.0:5 >=kde-frameworks/kwidgetsaddons-5.26.0:5 >=kde-frameworks/kxmlgui-5.26.0:5 >=kde-frameworks/solid-5.26.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtsql-5.6.1:5[sqlite] >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtx11extras-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 media-libs/libv4l media-video/vlc[X] x11-libs/libXScrnSaver sys-devel/gettext virtual/pkgconfig sys-devel/make >=dev-util/cmake-2.8.12 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.26.0:5 >=dev-qt/qtcore-5.6.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Media player with digital TV support by KDE
-EAPI=6
-HOMEPAGE=https://kaffeine.kde.org/
-IUSE=debug
-KEYWORDS=amd64 x86
-LICENSE=GPL-2 FDL-1.2
-RDEPEND=>=kde-frameworks/kconfig-5.26.0:5 >=kde-frameworks/kconfigwidgets-5.26.0:5 >=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/kdbusaddons-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/kio-5.26.0:5 >=kde-frameworks/kwidgetsaddons-5.26.0:5 >=kde-frameworks/kxmlgui-5.26.0:5 >=kde-frameworks/solid-5.26.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtsql-5.6.1:5[sqlite] >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtx11extras-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 media-libs/libv4l media-video/vlc[X] x11-libs/libXScrnSaver !media-video/kaffeine:4 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.6.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/kaffeine/2.0.4/src/kaffeine-2.0.4.tar.xz
-_eclasses_=cmake-utils	f3d38665b0a86e08ba3a5473cdbfafd3	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	b80ab2c131e6011994cf3b553fc21f63	kde5-functions	391cd05771548da2a3942eb1992669b1	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=e6094d3bdf574bc220b065260b47fa78
diff --git a/metadata/md5-cache/media-video/kaffeine-2.0.5 b/metadata/md5-cache/media-video/kaffeine-2.0.5
index 87226ba7ecfd..0bb2428f65bc 100644
--- a/metadata/md5-cache/media-video/kaffeine-2.0.5
+++ b/metadata/md5-cache/media-video/kaffeine-2.0.5
@@ -4,10 +4,10 @@ DESCRIPTION=Media player with digital TV support by KDE
 EAPI=6
 HOMEPAGE=https://kaffeine.kde.org/
 IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+ handbook? ( FDL-1.3 )
 RDEPEND=>=kde-frameworks/kconfig-5.26.0:5 >=kde-frameworks/kconfigwidgets-5.26.0:5 >=kde-frameworks/kcoreaddons-5.26.0:5 >=kde-frameworks/kdbusaddons-5.26.0:5 >=kde-frameworks/ki18n-5.26.0:5 >=kde-frameworks/kio-5.26.0:5 >=kde-frameworks/kwidgetsaddons-5.26.0:5 >=kde-frameworks/kxmlgui-5.26.0:5 >=kde-frameworks/solid-5.26.0:5 >=dev-qt/qtdbus-5.6.1:5 >=dev-qt/qtgui-5.6.1:5 >=dev-qt/qtnetwork-5.6.1:5 >=dev-qt/qtsql-5.6.1:5[sqlite] >=dev-qt/qtwidgets-5.6.1:5 >=dev-qt/qtx11extras-5.6.1:5 >=dev-qt/qtxml-5.6.1:5 media-libs/libv4l media-video/vlc[X] x11-libs/libXScrnSaver !media-video/kaffeine:4 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.6.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kaffeine/2.0.5/src/kaffeine-2.0.5.tar.xz
 _eclasses_=cmake-utils	f3d38665b0a86e08ba3a5473cdbfafd3	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde5	b80ab2c131e6011994cf3b553fc21f63	kde5-functions	391cd05771548da2a3942eb1992669b1	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=32f671aa49d009c519e58486d89c9246
+_md5_=bb94edfb8698c58ff05f492b2898e26d
diff --git a/metadata/md5-cache/sci-libs/indilib-1.3.1 b/metadata/md5-cache/sci-libs/indilib-1.3.1
new file mode 100644
index 000000000000..a14504857396
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/indilib-1.3.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=net-misc/curl sci-libs/cfitsio sci-libs/gsl sci-libs/libnova sys-libs/zlib virtual/jpeg:0 virtual/libusb:0 dev-qt/qtcore:5 dev-qt/qtnetwork:5 sys-kernel/linux-headers sys-devel/make >=dev-util/cmake-2.8.12 virtual/pkgconfig
+DESCRIPTION=INDI Astronomical Control Protocol library
+EAPI=6
+HOMEPAGE=http://www.indilib.org/
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=LGPL-2
+RDEPEND=net-misc/curl sci-libs/cfitsio sci-libs/gsl sci-libs/libnova sys-libs/zlib virtual/jpeg:0 virtual/libusb:0
+SLOT=0/1
+SRC_URI=mirror://sourceforge/indi/indi-1.3.1.zip
+_eclasses_=cmake-utils	f3d38665b0a86e08ba3a5473cdbfafd3	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	udev	73058269b3e70e34e084fa3981282338	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=f641463161a32862e92d53497762f630
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.32 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.33
similarity index 91%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-4.4.32
rename to metadata/md5-cache/sys-kernel/vanilla-sources-4.4.33
index 27e4719bfbeb..0585a7f62a45 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.32
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.33
@@ -8,7 +8,7 @@ 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=4.4.32
-SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.4.32.xz mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz
+SLOT=4.4.33
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.4.33.xz mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	kernel-2	f31f3b95b5d8f120e14f0b7aafbd8b47	multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c8237d05e015cb2231ac8424e6ca7565
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.8.8 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.8.9
similarity index 92%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-4.8.8
rename to metadata/md5-cache/sys-kernel/vanilla-sources-4.8.9
index f05538c9291d..688f334a068f 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.8.8
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.8.9
@@ -8,7 +8,7 @@ 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=4.8.8
-SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.8.8.xz mirror://kernel/linux/kernel/v4.x/linux-4.8.tar.xz
+SLOT=4.8.9
+SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.8.9.xz mirror://kernel/linux/kernel/v4.x/linux-4.8.tar.xz
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	kernel-2	f31f3b95b5d8f120e14f0b7aafbd8b47	multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c8237d05e015cb2231ac8424e6ca7565
diff --git a/metadata/md5-cache/sys-process/fcron-3.2.1 b/metadata/md5-cache/sys-process/fcron-3.2.1-r1
similarity index 100%
rename from metadata/md5-cache/sys-process/fcron-3.2.1
rename to metadata/md5-cache/sys-process/fcron-3.2.1-r1
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 1702564ee1d4..184ac48141f2 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sat, 19 Nov 2016 18:43:14 +0000
+Sat, 19 Nov 2016 20:43:16 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 19a9a9e1850b..423fbef3ca9b 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sat Nov 19 18:39:25 UTC 2016
+Sat Nov 19 20:39:25 UTC 2016
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 34ad1c7ce83c..a1250f99c2c6 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sat, 19 Nov 2016 19:00:01 +0000
+Sat, 19 Nov 2016 21:30:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 0dffbc08e3ff..dd7ca9a5c3ca 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1479580801 Sat 19 Nov 2016 06:40:01 PM UTC
+1479588001 Sat 19 Nov 2016 08:40:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 1702564ee1d4..184ac48141f2 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Sat, 19 Nov 2016 18:43:14 +0000
+Sat, 19 Nov 2016 20:43:16 +0000
diff --git a/sci-libs/indilib/Manifest b/sci-libs/indilib/Manifest
index ce627cc1f74f..82d722e50911 100644
--- a/sci-libs/indilib/Manifest
+++ b/sci-libs/indilib/Manifest
@@ -1 +1,2 @@
+DIST indi-1.3.1.zip 20752009 SHA256 a28b3cd578ac6c85bda91ace287f0d37e6e315d1746d55d1623f9094ebf5747b SHA512 80184287aebf1bc8381ba9f36b83f346411348c610c6c06c7b9aeb4a2c9f3a9713e4f043af66cb777d7fa8fe208d98fa1134c1f0935a706d1797eae38f0ef3f0 WHIRLPOOL 7335c2c4ab9da01fddf1c8844500fe0da35d0e139f9ac67ac8133f5d922f8a6a4ec4bf83859f6aa8e9389e4563820a106f3cb3473c7d4e8a2e5efaa658d4b6f1
 DIST libindi_1.2.0.tar.gz 1425804 SHA256 a1cf17a4f0a0ca30afd4c131b82e181aeb42a68cda176d5b4c6945436ced2321 SHA512 4d7b67e3ff6000132c2971e58942c5f95822d156c6f9587697b6179137cd40997527d62886d0f5fe053980d1a404b61191d1c54194e9a7154bd10b0e3a7c05d6 WHIRLPOOL fe710841e63acc806b17414df231cd178680da8ed8e7c719c32e34cae9d2203362a9cce0cb7e0593d46dda98f9bb8e9b2cc7d28442e491fb11e1786b3145feca
diff --git a/sci-libs/indilib/indilib-1.3.1.ebuild b/sci-libs/indilib/indilib-1.3.1.ebuild
new file mode 100644
index 000000000000..79913700cc2f
--- /dev/null
+++ b/sci-libs/indilib/indilib-1.3.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+MY_PN="lib${PN/lib/}"
+
+inherit cmake-utils udev
+
+DESCRIPTION="INDI Astronomical Control Protocol library"
+HOMEPAGE="http://www.indilib.org/"
+SRC_URI="mirror://sourceforge/${PN/lib/}/${PN/lib/}-${PV}.zip"
+
+LICENSE="LGPL-2"
+SLOT="0/1"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="
+	net-misc/curl
+	sci-libs/cfitsio
+	sci-libs/gsl
+	sci-libs/libnova
+	sys-libs/zlib
+	virtual/jpeg:0
+	virtual/libusb:0
+"
+DEPEND="${RDEPEND}
+	dev-qt/qtcore:5
+	dev-qt/qtnetwork:5
+	sys-kernel/linux-headers
+"
+
+DOCS=( AUTHORS ChangeLog README TODO )
+
+S=${WORKDIR}/${PN/lib/}-${PV}/${MY_PN}
+
+src_configure() {
+	local mycmakeargs=(
+		-INDI_BUILD_UNITTESTS=OFF
+		-DUDEVRULES_INSTALL_DIR="$(get_udevdir)"
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/sys-kernel/vanilla-sources/Manifest b/sys-kernel/vanilla-sources/Manifest
index 63ebbfbadd4c..0d5ea3ea1e30 100644
--- a/sys-kernel/vanilla-sources/Manifest
+++ b/sys-kernel/vanilla-sources/Manifest
@@ -14,5 +14,5 @@ DIST patch-3.18.44.xz 1054032 SHA256 04c8c45d1a8a8085abbfe0b6f7e83fef56a953eda31
 DIST patch-3.2.83.xz 1620216 SHA256 0f1895f98499ca2a3e0888bb7949e7aa5b704e5bf7e992c8afe1b0142d01d3c8 SHA512 a0c5fd87c25a2170de9a28b6903133042fb49fb4b469e4d8e55cf45e6c80e9f0cf211c4148ae8392042a3c06fb16a94977f867ff519d4143a52080138c02e968 WHIRLPOOL 79ef18d2ac80f96baed3697a66832ce8b13a8877b4714f2576d05d40b9554888e612d3fe8156615a393de8befd445a5acdcaf38fd9b6a75482a56a23cec1a95a
 DIST patch-3.4.113.xz 1362096 SHA256 d5492eeaadcf12aaad471011066e447907999035c26368da8e4f82b1871ef03a SHA512 cd212cb2c2d6fb911571472466027c7e502277f7af2426050a5afcd4c7799920e48414190b8a8a039f88d85bbf0d9e164c7d8c45982bf51f7567da9304137688 WHIRLPOOL bc88441d583b9ed2f315b6ed809c168cb00af5a3c1f91fd1e4bd651a5f21cc69fd9343460976b5707916ec992b3e7a2f519953ce1bbc55fbb3290237ec4b44a3
 DIST patch-4.1.35.xz 901088 SHA256 cb9a7bf8998625e5a2c638745e868e0219315439a68b536c33c0e1607b02202f SHA512 da5ac04585da84c850122e376243fe7aa76fbb0fcffa7e9332d8d8e1854f89fbf18228c15cefd3c7a9ca97124c09b35e07a814af4b5ce6e3453a8e2d6dcf8663 WHIRLPOOL 32904115980075aa750afcd674fa27dfde5f25f26bcbb5db68dfc5a85e5b5588a644e9d0a05396f6201e21fd259159364c71685fba4d1242511e4b9133d9f14e
-DIST patch-4.4.32.xz 812316 SHA256 329b6b24e9e02b2e01ab13a9f62f853b37272c4f1c210cdcdda93937e0d0cb18 SHA512 118923fc9bfc123d9b140f345823c20f402fa4f338d6cce2395bec792e018f937b10809ad4f33149da6a0cbde782f26a224b40c5b2dcd22e995f36c2d76d59df WHIRLPOOL e763772e83aaa2319bd46c5eb400ad1375ac96659c67f5ea38a5444479e570ae99c935c49777772769fa2e887985ad2a241fb70f3ff9311cfe3f2fe69edbf679
-DIST patch-4.8.8.xz 167244 SHA256 588b6537cb660c2f7d483aca13f7509a5fc86c60df32c167d40e81d6c7ab4f9c SHA512 4ad7b881c9fafaf446d00e53af22d1940ecf00291ed57d1706ad12725a7bf525abb1d17500d662409eccd77ed0e9c2a11580ce94d6b6344188f35bd9e49c2418 WHIRLPOOL 681543197a4964fe4cafb818ea774779d71c829d0dd4a71adce4004f13071c5be06e4d7457c3d6eb17014b2528bc6951fcf821363650bc6a0feaffb1e9db8213
+DIST patch-4.4.33.xz 819976 SHA256 aaa027196af00a5195e04b4b97203c8da962461eb0feac4f72701049d5441f52 SHA512 01a728ea1c46de4c0a034c7ebc84440fee454365273ee0984d04284be3caf9b7375ac1c02fb1214676b2393c22f6cc2861cb8657dc8c8736c3c85d926d995b86 WHIRLPOOL fa6a816cc78d57e66f2056d47d7bffb1609fa350d4bdf1e5aee4929d27808ff4c5cd0b2649be44bba903ebd55faac9a4850e4fd0c26466851df41115a8966625
+DIST patch-4.8.9.xz 190728 SHA256 9f3c1924080a16ac2b8f054aa9d0490bc0ee4c6159e2fd10e5f6732b2e9604f6 SHA512 c4a5b85f0a7567f0fe0f24d7729aa71a78dae66294caafff2921f2d56a656ca6d5047c1bff027ad603a7899dd97c33ffa1594cad06e3b844ac0fd30c24c26740 WHIRLPOOL 4476a08902378bd5156e4e852d4b87f802be70a2f2a0e0e984d1f18ba545b6b46fb8ef7699be2aaf93ad1eac757c9228a434cbb3f37bd93e89aab9a330eba75a
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.4.32.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.4.33.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-4.4.32.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-4.4.33.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.8.8.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.8.9.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-4.8.8.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-4.8.9.ebuild
diff --git a/sys-process/fcron/fcron-3.2.1.ebuild b/sys-process/fcron/fcron-3.2.1-r1.ebuild
similarity index 100%
rename from sys-process/fcron/fcron-3.2.1.ebuild
rename to sys-process/fcron/fcron-3.2.1-r1.ebuild
diff --git a/sys-process/fcron/files/fcron.init.4 b/sys-process/fcron/files/fcron.init.4
index e2441ee13bca..25fafc16ec25 100644
--- a/sys-process/fcron/files/fcron.init.4
+++ b/sys-process/fcron/files/fcron.init.4
@@ -5,7 +5,7 @@
 
 FCRON_INSTANCE="${SVCNAME##*.}"
 
-if [[ -n "${FCRON_INSTANCE}" && "${SVCNAME}" != "fcron" ]]; then
+if [ -n "${FCRON_INSTANCE}" -a "${SVCNAME}" != "fcron" ]; then
 	FCRON_CONFIGFILE="/etc/fcron/fcron.${FCRON_INSTANCE}.conf"
 else
 	FCRON_CONFIGFILE="/etc/fcron/fcron.conf"
@@ -20,11 +20,11 @@ getconfig() {
 		value="$(service_get_value ${key})"
 	fi
 
-	if [[ -z "${value}" && -r "${FCRON_CONFIGFILE}" ]]; then
+	if [ -z "${value}" -a -r "${FCRON_CONFIGFILE}" ]; then
 		value="$(sed -n -e 's:^'"${key}"'[ \t]*=[ \t]*::p' "${FCRON_CONFIGFILE}")"
 	fi
 
- 	if [[ -z "${value}" ]]; then
+	if [ -z "${value}" ]; then
 		# Value not explicitly set in the configfile or configfile does not exist
 		# or is not readable
 		echo "${value_default}"
@@ -42,7 +42,7 @@ depend() {
 	need hostname
 
 	# provide the cron service if we are the main instance
-	[[ "${SVCNAME}" == "fcron" ]] && provide cron
+	[ "${SVCNAME}" = "fcron" ] && provide cron
 }
 
 command="/usr/libexec/fcron"
@@ -50,6 +50,7 @@ command_args="-c \"${FCRON_CONFIGFILE}\""
 start_stop_daemon_args=${FCRON_SSDARGS:-"--wait 1000"}
 pidfile="$(getconfig pidfile /run/fcron.pid)"
 fcrontabs="$(getconfig fcrontabs /var/spool/fcron)"
+fifofile="$(getconfig fifofile /run/fcron.fifo)"
 required_files="${FCRON_CONFIGFILE}"
 
 extra_started_commands="reload"
@@ -59,9 +60,33 @@ reload() {
 }
 
 start_pre() {
+	if [ "${SVCNAME}" != "fcron" ]; then
+		local _has_invalid_instance_cfg=0
+
+		if [ "${pidfile}" = "/run/fcron.pid" ]; then
+			eerror "You cannot use the same pidfile like the default instance!"
+			eerror "Please adjust your 'pidfile' setting in '${FCRON_CONFIGFILE}'."
+			_has_invalid_instance_cfg=1
+		fi
+
+		if [ "${fcrontabs}" = "/var/spool/fcron" ]; then
+			eerror "You cannot use the same fcrontabs location like the default instance!"
+			eerror "Please adjust your 'fcrontabs' setting in '${FCRON_CONFIGFILE}'."
+			_has_invalid_instance_cfg=1
+		fi
+
+		if [ "${fifofile}" = "/run/fcron.fifo" ]; then
+			eerror "You cannot use the same fifo file like the default instance!"
+			eerror "Please adjust your 'fifofile' setting in '${FCRON_CONFIGFILE}'."
+			_has_invalid_instance_cfg=1
+		fi
+
+		[ ${_has_invalid_instance_cfg} -ne 0 ] && return 1
+	fi
+
 	checkpath --file "${FCRON_CONFIGFILE}" --owner root:fcron --mode 0640
 
-	if [[ ! -d "${fcrontabs}" ]]; then
+	if [ ! -d "${fcrontabs}" ]; then
 		ebegin "Creating missing spooldir '${fcrontabs}'"
 		${command} --newspooldir "${fcrontabs}"
 		eend $?
@@ -70,4 +95,5 @@ start_pre() {
 
 start_post() {
 	service_set_value fcrontabs "${fcrontabs}"
+	service_set_value fifofile "${fifofile}"
 }