Sync with portage [Thu Jan 12 08:42:18 MSK 2017].

7 years ago · c5fb715c59
parent d4522f489f
commit c5fb715c59
72 changed files with 1106 additions and 122 deletions
--- a/app-i18n/libpinyin/libpinyin-1.3.0-r1.ebuild
+++ b/app-i18n/libpinyin/libpinyin-1.3.0-r1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -17,7 +17,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
 IUSE=""

-RDEPEND="sys-libs/db:4.8
+RDEPEND="sys-libs/db:*
 	dev-libs/glib:2"
 DEPEND="${RDEPEND}
 	virtual/libintl
--- a/dev-lang/execline/Manifest
+++ b/dev-lang/execline/Manifest
@ -1,3 +1,4 @@
 DIST execline-2.1.1.0.tar.gz 75967 SHA256 9e1a9b95772b64bd623c1ddea6200909cca0eb659893ac47857848928eaff7dc SHA512 250fe449b39a198193f1431b249b342f3c6c499fea12779a55d0e27aec2095285bbf9dc2a48d84eebdf9f540ecf5e67ef39393243ca0fadfc764d2cc95ac0b6b WHIRLPOOL ce92f6d7786e5f1efcfb5298b1fa8a561957c6b9f542ace49b815e69f98da4f88adcd339f7210d61d7ae1298573cd9bc31c22c6f7b3c8ac30f44986c88241f32
 DIST execline-2.1.4.5.tar.gz 80203 SHA256 ab4451d4992a5d7fb2ae34cffe4d0806e4902bf9aa27ee3b75617aa35379356f SHA512 15a76c73afe98142b9f466edb442cad06ee69f0f0e15ad6a325c37f3878b4c5863b5cece67bd169e84b465a0f7f4f38f87fa88b2aa96fe40a20ebc3575a1ceb9 WHIRLPOOL 1df5b72f02c95d3fd24ff7c46b3cd7aff89186bfe6bb27df815f5bb06a12886e57b3fe67ff18d2d387dccb107eb8acf0b09124eafe47a9857e636d240e1051e8
 DIST execline-2.1.5.0.tar.gz 80932 SHA256 8a3605a6db73183baa376bf2130e8b7eb75a5b5347c7f9144e520fe86bcb1142 SHA512 43ebff73e279dcffda686a372bded80e12be4b66b6c2fde69f17810aa0b52214d23da8581002adfcb5a40437e335594b8e44c698d0295d8c172fbc2c0a93aeed WHIRLPOOL 8b0d3b28d28e7c18515600dd866c0ade5f99ba97ded37102e58f2d613d2e60f1d9de1d1327f0c5331bd8f346e9b808dafbfbd8e7003a01983904f6576ae90575
+DIST execline-2.2.0.0.tar.gz 82860 SHA256 93bd744f2e3ad204cb89f147efdc6ca4e622f9c6bfc9895e0b2cb8b0480029de SHA512 0174bd46c231684f78b7ea2f6f85776b9edf780d1ae928fcaf0eda3ade46fa60666c17af4480fd37179461b622a069221386f229c777fd214b5abe70e7f58a19 WHIRLPOOL 6e39ceca7a867e5fc6d7fee16e78df2a5602b15924c411766089719afd81b198c7e816b54634dd2f322048c0230f9009392f01264eacba96924fe1af8888625f
--- a/dev-lang/execline/execline-2.2.0.0.ebuild
+++ b/dev-lang/execline/execline-2.2.0.0.ebuild
@ -0,0 +1,53 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit versionator
+
+DESCRIPTION="a non-interactive scripting language"
+HOMEPAGE="http://www.skarnet.org/software/execline/"
+SRC_URI="http://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~x86"
+IUSE="static static-libs"
+
+DEPEND=">=sys-devel/make-3.81
+	static? (
+		>=dev-libs/skalibs-2.4.0.0[static-libs]
+	)
+	!static? (
+		>=dev-libs/skalibs-2.4.0.0
+	)
+"
+RDEPEND="
+	!static? (
+		>=dev-libs/skalibs-2.4.0.0:=
+	)
+"
+
+HTML_DOCS="doc/*"
+
+src_prepare() {
+	default
+
+	# Remove QA warning about LDFLAGS addition
+	sed -i "s/tryldflag LDFLAGS_AUTO -Wl,--hash-style=both/:/" "${S}/configure" || die
+}
+
+src_configure() {
+	econf \
+		--bindir=/bin \
+		--dynlibdir=/$(get_libdir) \
+		--libdir=/usr/$(get_libdir)/${PN} \
+		--with-dynlib=/$(get_libdir) \
+		--with-lib=/usr/$(get_libdir)/skalibs \
+		--with-sysdeps=/usr/$(get_libdir)/skalibs \
+		$(use_enable !static shared) \
+		$(use_enable static allstatic) \
+		$(use_enable static static-libc) \
+		$(use_enable static-libs static)
+}
--- a/dev-libs/klibc/klibc-2.0.4-r2.ebuild
+++ b/dev-libs/klibc/klibc-2.0.4-r2.ebuild
@ -108,7 +108,7 @@ PATCHES=(
 )

 src_prepare() {
-	[[ ${PKV} ]] && EPATCH_OPTS="-d ${KS} -p1" eapply "${DISTDIR}"/patch-${PKV}.${K_TARBALL_SUFFIX}
+	[[ ${PKV} ]] && eapply "${DISTDIR}"/patch-${PKV}.${K_TARBALL_SUFFIX}

 	# Symlink /usr/src/linux to ${S}/linux
 	ln -snf "${KS}" linux
@ -262,7 +262,8 @@ src_install() {
 	# Actually I have no idea, why the includes have those weird-ass permissions
 	# on a particular system, might be due to inherited permissions from parent
 	# directory
-	find "${D}"/usr/${libdir}/klibc/include | xargs chmod o+rX
+	# NOTE: This totally violates sandbox <asturm@gentoo.org>
+	# find "${D}"/usr/${libdir}/klibc/include | xargs chmod o+rX
 	find "${D}"/usr/${libdir}/klibc/include -type f \
 		\( -name '.install' -o -name '..install.cmd' \) -delete || die

--- a/dev-libs/skalibs/Manifest
+++ b/dev-libs/skalibs/Manifest
@ -1,3 +1,4 @@
 DIST skalibs-2.3.10.0.tar.gz 213288 SHA256 e4d5147941055b2a367794666f773a4b216c3ae83c015a5fcf2cd0498470ea44 SHA512 9120554a91ef292a8094c4c036b0e93c8db0576d72597c720eca3562d7239da673ace12b9f73747d957a993a780f112b9b7d03030451c1d0b33eaf90b402832a WHIRLPOOL 9eb29c052d25c3850761956647d0a5403eff0a8e264c049885d0315a53f000aee428a688c5fb9cd831a6923cd734b6a1ca8ea8217b36991d95bce031979ae678
 DIST skalibs-2.3.2.0.tar.gz 205976 SHA256 a36302b63fe97fa8d616cac0bb7aebbff60e1419dfb4d4f1af66b3c058dbd6ba SHA512 f5a4b85fc43f49eccf5a2ac2ce5b142afc28fe4af781e59d1ad21a7eb5896075720230391234fcf7879cb29ba2d1624926d8cca77c3925327aa7a9a5fefff91a WHIRLPOOL 453d5a0c9d1c2d84e1c8d5ac6bdb27e85d402de8007b8fcc6ba00c6e7c2400fb30c188da0a71343271edf47480916c7f3a5c7bb6e07703d5adc196bccc783350
 DIST skalibs-2.3.9.0.tar.gz 211781 SHA256 6229fb4fb415699bbff3b446ff44aa5b7fb9c512b83bd68ae4005603afab60cb SHA512 30b08fec01944fd7e816eb275dfe6eafdf21e14af95e70ae4991b9da716ab191b22c1576084ed7c40fd9e958804519075befaaf4314ccb370ced3c5e94793212 WHIRLPOOL 626ae08b19bb26916b5f75a979f60455404d91ae77c7c70fd35ae5b697e970f6cd72c68f42ddf6b288018b5639003ab6f2d2860d5617d8b6a0feca02f261277e
+DIST skalibs-2.4.0.2.tar.gz 215964 SHA256 0708172bc2ec9825f8a4f312d35f8dcd94da5f291425a598c33c873b3de77df8 SHA512 1a60ff7bf2364cfe56dc5847321dad4eaa3942be90555a405c4c6c6fff287e197621796624cd52030f4373665ef53d4f7cd5832e8492ecf1d75c82544a4c8f2e WHIRLPOOL 921f30c49c14b26ddef4e4a92f22f097379619e1ad42a4486081efe2436ca07ac7343144663efce738b35fc2cf0580a7651b81ca308edca5a7d262ec8a1b3559
--- a/dev-libs/skalibs/skalibs-2.4.0.2.ebuild
+++ b/dev-libs/skalibs/skalibs-2.4.0.2.ebuild
@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit versionator
+
+DESCRIPTION="skarnet.org general-purpose libraries"
+HOMEPAGE="http://www.skarnet.org/software/skalibs/"
+SRC_URI="http://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc ipv6 static-libs"
+
+DEPEND=">=sys-devel/make-3.81"
+RDEPEND=""
+
+HTML_DOCS="doc/*"
+
+src_prepare() {
+	default
+
+	# Remove QA warning about LDFLAGS addition
+	sed -i "s/tryldflag LDFLAGS_AUTO -Wl,--hash-style=both/:/" "${S}/configure" || die
+}
+
+src_configure() {
+	econf \
+		--datadir=/etc \
+		--dynlibdir=/$(get_libdir) \
+		--libdir=/usr/$(get_libdir)/${PN} \
+		--sysdepdir=/usr/$(get_libdir)/${PN} \
+		--enable-clock \
+		--enable-shared \
+		$(use_enable static-libs static) \
+		$(use_enable ipv6)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	use doc && einstalldocs
+}
--- a/dev-lisp/asdf/Manifest
+++ b/dev-lisp/asdf/Manifest
@ -4,7 +4,5 @@ DIST asdf-3.1.5.tar.gz 400359 SHA256 3005aa50470feefc3f786e4e300f275bef3d3662ed1
 DIST asdf-3.1.6.tar.gz 396066 SHA256 1c15f8db038ace781fa5e6f0cf045b06f6315c715c55d8bcc185238182bb6514 SHA512 3203bef1ce4c2d28306ca1ee214d3d5fd04b3d2caa61f606d0334f100358bfbd9b03d69c95e83734175639a91e76aeac509e949768fc694817631078671a9bc1 WHIRLPOOL 52a4a62f17d54c638a3f3ed4c42804c64e34a86c8df5bf0e118ff478c38c1558adb8751a987b97093ec5adc0f7a6c951f9c563ef7549fc7591fdffd9a7aa1212
 DIST asdf-3.1.7.tgz 402257 SHA256 06b7b081a887183d31d1fc710d4f63a2e30ff6f70ee9792f130017abd62037be SHA512 ebe2ddf702f6200bf98408fb262e9929565c9d29bcd874dd2657a6f84e123b0153a78e457fb425d48a05c427f7c090ab5fd0e6201223eb4b296b3b4cd5b57c26 WHIRLPOOL 6fff0e34909bc3094c6ea5acddd5c35b08a1ae173f3343f3fd4e11f4ba4320d377f014bca4f74218de794d2dd4d461641ba96ba55172427e8fa4c846aa2e20fb
 DIST asdf-3.2.0.tar.gz 438536 SHA256 2a5d406394c8b124e02857ccb0a640363afea8d71c194cfc7ece2ae00a84445b SHA512 2c273aa7b1049c1a8f4da5d195ac7c2cceba238228508847b5afbed8a258ad49e6b346e79b07d0347be0326d3558ed881838fe8461a6d45cc3f2d58380789fcb WHIRLPOOL 346d1acc18e8c48f3e49b5abb2cf0042005bea86be9895e0622963156133d4c5dfa2616e98b8bc15304acce8ce21c06c2bed015fc700c0f1b098126d9d14add0
-DIST cl-asdf_1.86-1.diff.gz 4888 SHA256 ac7c526a4471353cff3fc2ae750693cf5a9a35c6dca1e52d04e9fd17d76082c8 SHA512 9aa905a14e814a9c7e8077d09aca238d735511ae67f0197fffc84100f5500950081bc00f5be7c6838e3a58d9e4c2f5b6fce9e41d84c7e39fb4fb2e04a1482abf WHIRLPOOL 86a88af4124e9e822c899f23400d054fd915365a825017fdf1ad0b6a26e121cbfe80639f65b018dbc7012173a40c88a31b287c96919184e050feb809ba86bd12
-DIST cl-asdf_1.86.orig.tar.gz 53686 SHA256 cfee04493fe4b8a70a42e3ed79d927c3551878c8685ba7c8cf557341453421ce SHA512 a62ff032b41d60b3afbd1f1ef85ea52d669a6fdd87371b19364dec98e99a01e134242bd0b0d6e8731c8d89feab78b809b740a533a46ff21a3969ef0f7dd1e65c WHIRLPOOL c1943361d8e396d9ec602428b91622a023f7743553c4a8d8316ac6b472e11ef1bc3ad3e65644e2d492932c8eb7d02bf596f465e48b6e6714ee4af957459754d2
 DIST cl-asdf_1.89-1.diff.gz 395 SHA256 1ad2de4d9bb494f58e69f327d02cd86100967371c93727393b99b3b6fd20d567 SHA512 0d5ac51e69914b58497815971f1736712bd65988944fff5966f854c2dd22d1969d9237c996bfd44a6195d2765db9af07c3055c9bf126ba25059eccdbf8da20b4 WHIRLPOOL 20bc02a86d3645bedf1952ef70193f3b52250dcab5720e21940f0721e2c8be330f8452d4f77c82cc7bb105afb935c3b255e435b5d99ac40965c49621082c0f4b
 DIST cl-asdf_1.89.orig.tar.gz 60134 SHA256 617853e512a0e6bdfa269811c3b9866af3878d40c7e4e8bab4ebf5374bd5a0ec SHA512 eb20877bb6acb6cab5874229290605aaef19d2501d8011473b66d0c9609d0b4d12f2951c39e4a3d2d07a3f0a7862c7e6beb6073514bb8b36189049bb96ba0e9a WHIRLPOOL 23636e9db0d351f88cec352a2c85489f41c5dc1085af75d2a3f4b460c462ff1115a0fb0408dcb21e2dc66d2ac773053c3586067aeaeca19615a2b22fcc3b384b
--- a/dev-lisp/asdf/asdf-1.86-r1.ebuild
+++ b/dev-lisp/asdf/asdf-1.86-r1.ebuild
@ -1,42 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-DEB_PV="1"
-MY_PN="cl-${PN}"
-MY_P="${MY_PN}-${PV}"
-
-inherit eutils
-
-DESCRIPTION="ASDF is Another System Definition Facility for Common Lisp"
-HOMEPAGE="http://packages.debian.org/unstable/devel/cl-asdf"
-SRC_URI="mirror://gentoo/${MY_PN}_${PV}.orig.tar.gz
-	mirror://gentoo/${MY_PN}_${PV}-${DEB_PV}.diff.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~mips ppc ppc64 s390 sparc x86"
-IUSE="examples"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-EPATCH_SOURCE="${WORKDIR}"
-S="${WORKDIR}"/${MY_P}
-
-src_prepare() {
-	epatch ${MY_PN}_${PV}-${DEB_PV}.diff || die
-}
-
-src_install() {
-	insinto /usr/share/common-lisp/source/asdf
-	doins asdf.lisp wild-modules.lisp asdf-install.lisp
-
-	dodoc README
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins test/*
-	fi
-}
--- a/dev-util/fuzz/fuzz-0.6-r1.ebuild
+++ b/dev-util/fuzz/fuzz-0.6-r1.ebuild
@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit toolchain-funcs
+
+DESCRIPTION="Stress-tests programs by giving them random input"
+HOMEPAGE="http://fuzz.sourceforge.net/"
+DEB_P="${PN}_${PV}"
+DEB_PR="7.3"
+SRC_URI="
+	mirror://sourceforge/${PN}/${P}.tar.gz
+	mirror://debian/pool/main/${PN:0:1}/${PN}/${DEB_P}-${DEB_PR}.diff.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="sys-libs/readline:0="
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${DISTDIR}"/${DEB_P}-${DEB_PR}.diff.gz )
+
+src_prepare() {
+	default
+	tc-export CC
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc NEWS README ChangeLog AUTHORS
+}
--- a/dev-util/fuzz/fuzz-0.6.ebuild
+++ b/dev-util/fuzz/fuzz-0.6.ebuild
@ -1,32 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Stress-tests programs by giving them random input"
-HOMEPAGE="http://fuzz.sourceforge.net/"
-DEB_P="${PN}_${PV}"
-DEB_PR="7.3"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-		mirror://debian/pool/main/${PN:0:1}/${PN}/${DEB_P}-${DEB_PR}.diff.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-DEPEND=">=sys-libs/readline-4.3"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd "${S}"
-	epatch "${DISTDIR}"/${DEB_P}-${DEB_PR}.diff.gz
-	tc-export CC
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc NEWS README ChangeLog AUTHORS
-}
--- a/gnome-extra/gnome-builder/Manifest
+++ b/gnome-extra/gnome-builder/Manifest
@ -1 +1,2 @@
 DIST gnome-builder-3.18.1.tar.xz 1510460 SHA256 501c95220dcf8ca44a5748e863492377fe2c3aee78a95973d6819b1836e5407c SHA512 8e53b0d7a0afe440708bf33357408424cca5302e4516f85af18d04bce787012db681c93b6f48e9d41d8cb1a7c050d5e68770bf2e1ed8814ed43fa91e1d60c0f1 WHIRLPOOL d805338a3b49fe56794ddd9dca1ff047a4a9c87de24d06fed377637dba4e2ce8cf953cc8770e8745666dde1abfaabee9c68827631605a24e76e06148bed03f5b
+DIST gnome-builder-3.22.4.tar.xz 2480900 SHA256 d569446a83ab88872c265f238f8f42b5928a6b3eebb22fd1db3dbc0dd9128795 SHA512 69ee0d22f7e60f1bc236f2648662ece38f2a3c827d6877f8cbee82eadd499c19de8e4f6f94d7ad8832a93d26cddb5d34106ec6a9e878a7abea3350929d50711d WHIRLPOOL 9dd3f91d6f66a30e9ff6b415683f9a024d38f4af53029bb9fb4e5b3bf73f06c303516b4958585d7743ffb62cbb468da76b2a9c996ee460539762fada4c11a4da
--- a/gnome-extra/gnome-builder/gnome-builder-3.22.4.ebuild
+++ b/gnome-extra/gnome-builder/gnome-builder-3.22.4.ebuild
@ -0,0 +1,133 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python{3_3,3_4,3_5} )
+VALA_MIN_API_VERSION="0.30"
+VALA_USE_DEPEND="vapigen"
+DISABLE_AUTOFORMATTING=1
+FORCE_PRINT_ELOG=1
+
+inherit gnome2 python-single-r1 vala virtualx readme.gentoo-r1
+
+DESCRIPTION="Builder attempts to be an IDE for writing software for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Builder"
+
+# FIXME: Review licenses at some point
+LICENSE="GPL-3+ GPL-2+ LGPL-3+ LGPL-2+ MIT CC-BY-SA-3.0 CC0-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="clang +git sysprof vala webkit"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# When bumping, pay attention to all the included plugins/*/configure.ac files and the requirements within.
+# Most have no extra requirements and default to enabled; we need to handle the ones with extra requirements, which tend to default to auto(magic).
+# Look at the last (fourth) argument given to AC_ARG_ENABLE to decide. We don't support any disabling of those that are default-enabled and have no extra deps beyond C/python/introspection.
+# FIXME: >=dev-util/devhelp-3.20.0 dependency is automagic for devhelp integration plugin
+# FIXME: vte could be optional via $(use_enable vte terminal-plugin) - but most/all people want this and have vte?
+# FIXME: flatpak-plugin needs flatpak.pc >=0.6.9, libgit2[threads] >=libgit2-glib-0.24.0[ssh] libsoup-2.4.pc
+# FIXME: --with-sanitizer configure option
+# FIXME: Enable rdtscp based high performance counter usage on suitable architectures for EGG_COUNTER?
+# Editorconfig needs pcre.h, with vte migrating away, might want it optional?
+# Python is always enabled - the core python plugin support checks are automagic and not worth crippling it by not supporting python plugins
+# Relatedly introspection is always required to not have broken python using plugins or have to enable/disable them based on it. This is a full IDE, not a place to be really minimal.
+# An introspection USE flag of a dep is required if any introspection based language plugin wants to use it. Last full check at 3.22.4
+RDEPEND="
+	>=x11-libs/gtk+-3.22.1:3[introspection]
+	>=dev-libs/glib-2.50.0:2[dbus]
+	>=x11-libs/gtksourceview-3.22.0:3.0[introspection]
+	>=dev-libs/gobject-introspection-1.48.0:=
+	>=dev-python/pygobject-3.22.0:3
+	>=dev-libs/libxml2-2.9
+	>=x11-libs/pango-1.38.0
+	>=dev-libs/libpeas-1.18.0
+	>=dev-libs/json-glib-1.2.0
+	webkit? ( >=net-libs/webkit-gtk-2.12.0:4=[introspection] )
+	clang? ( sys-devel/clang )
+	git? (
+		dev-libs/libgit2[ssh,threads]
+		>=dev-libs/libgit2-glib-0.24.0[ssh] )
+	>=x11-libs/vte-0.46:2.91
+	sysprof? ( >=dev-util/sysprof-3.22.2[gtk] )
+	dev-libs/libpcre:3
+	${PYTHON_DEPS}
+	vala? ( $(vala_depend) )
+"
+# desktop-file-utils for desktop-file-validate check in configure for 3.22.4
+# mm-common due to not fully clean --disable-idemm behaviour, recheck on bump
+DEPEND="${RDEPEND}
+	dev-cpp/mm-common
+	dev-libs/appstream-glib
+	dev-util/desktop-file-utils
+	>=dev-util/gtk-doc-am-1.11
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	!<sys-apps/sandbox-2.10-r3
+"
+
+# Tests fail if all plugins aren't enabled (webkit, clang, devhelp, perhaps more)
+RESTRICT="test"
+
+DOC_CONTENTS='gnome-builder can use various other dependencies on runtime to provide
+extra capabilities beyond these expressed via USE flags. Some of these
+that are currently available with packages include:
+
+* dev-util/ctags with exuberant-ctags selected via "eselect ctags" for
+  C, C++, Python, JavaScript, CSS, HTML and Ruby autocompletion, semantic
+  highlighting and symbol resolving support.
+* dev-python/jedi and dev-python/lxml for more accurate Python
+  autocompletion support.
+* dev-util/meson for integration with the Meson build system.
+* dev-util/cargo for integration with the Rust Cargo build system.
+'
+# FIXME: Package gnome-code-assistance and mention here, or maybe USE flag and default enable because it's rather important
+# jhbuild support
+# rust language server via rls
+# autotools stuff for autotools plugin
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	export PYTHON3_CONFIG="$(python_get_PYTHON_CONFIG)"
+	# idemm is C++ wrapper for libide. Once that's needed by something, we might want to
+	# consider a split package instead of USE flag. Deps are in libidemm/configure.ac
+	gnome2_src_configure \
+		--disable-idemm \
+		--enable-editorconfig \
+		--enable-introspection \
+		$(use_enable vala vala-pack-plugin) \
+		$(use_enable webkit) \
+		$(use_enable webkit html-preview-plugin) \
+		$(use_enable clang clang-plugin) \
+		$(use_enable git git-plugin) \
+		$(use_enable git contributing-plugin) \
+		$(use_enable sysprof sysprof-plugin) \
+		--disable-flatpak-plugin \
+		--enable-terminal-plugin \
+		--disable-static
+}
+
+src_install() {
+	gnome2_src_install
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	readme.gentoo_print_elog
+}
+
+src_test() {
+	# FIXME: this should be handled at eclass level
+	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data/gsettings" || die
+
+	GSETTINGS_SCHEMA_DIR="${S}/data/gsettings" virtx emake check
+}
--- a/gnome-extra/gnome-builder/metadata.xml
+++ b/gnome-extra/gnome-builder/metadata.xml
@ -1,8 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>gnome@gentoo.org</email>
-		<name>Gentoo GNOME Desktop</name>
-	</maintainer>
+<maintainer type="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+<use>
+	<flag name="clang">Provide integration with <pkg>sys-devel/clang</pkg> for best possible C/C++ autocompletion, semantic highlighting, symbol resolving, and diagnostics support</flag>
+	<flag name="git">Provide support for the Git version control system via <pkg>dev-libs/libgit2-glib</pkg>
+		(such as setup of Git for New Project, direct cloning for Open Project and changed lines indicators in the editor gutter)</flag>
+	<flag name="sysprof">Provide an integrated profiler via <pkg>dev-util/sysprof</pkg></flag>
+	<flag name="vala">Provide an autoindenter, autocompletion, diagnostics, and symbol resolver for Vala</flag>
+	<flag name="webkit">Enable <pkg>net-libs/webkit-gtk</pkg> using plugins support and the HTML/Markdown previewer plugin</flag>
+</use>
 </pkgmetadata>
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@ -1 +1 @@
-Wed, 11 Jan 2017 20:13:14 +0000
+Thu, 12 Jan 2017 05:13:18 +0000
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@ -1 +1 @@
-Wed, 11 Jan 2017 20:13:14 +0000
+Thu, 12 Jan 2017 05:13:19 +0000
--- a/metadata/md5-cache/app-i18n/libpinyin-1.3.0-r1
+++ b/metadata/md5-cache/app-i18n/libpinyin-1.3.0-r1
@ -1,12 +1,12 @@
 DEFINED_PHASES=install prepare
-DEPEND=sys-libs/db:4.8 dev-libs/glib:2 virtual/libintl virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=sys-libs/db:* dev-libs/glib:2 virtual/libintl virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Library for Chinese pinyin input methods
 EAPI=5
 HOMEPAGE=https://github.com/libpinyin/libpinyin
 KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
-RDEPEND=sys-libs/db:4.8 dev-libs/glib:2
+RDEPEND=sys-libs/db:* dev-libs/glib:2
 SLOT=0
 SRC_URI=https://github.com/libpinyin/libpinyin/archive/1.3.0.tar.gz -> libpinyin-1.3.0.tar.gz mirror://sourceforge/libpinyin/models/model11.text.tar.gz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	017377e73405d964cd0137088cddb9c3	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=2a94e27a412e30aa4dba2da8e572fdb4
+_md5_=9d4506fa35050f28b7700624f3ab4973
--- a/metadata/md5-cache/dev-lang/execline-2.2.0.0
+++ b/metadata/md5-cache/dev-lang/execline-2.2.0.0
@ -0,0 +1,13 @@
+DEFINED_PHASES=configure prepare
+DEPEND=>=sys-devel/make-3.81 static? ( >=dev-libs/skalibs-2.4.0.0[static-libs] ) !static? ( >=dev-libs/skalibs-2.4.0.0 )
+DESCRIPTION=a non-interactive scripting language
+EAPI=6
+HOMEPAGE=http://www.skarnet.org/software/execline/
+IUSE=static static-libs
+KEYWORDS=~amd64 ~x86
+LICENSE=ISC
+RDEPEND=!static? ( >=dev-libs/skalibs-2.4.0.0:= )
+SLOT=0/2.2
+SRC_URI=http://www.skarnet.org/software/execline/execline-2.2.0.0.tar.gz
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=6b5bc1c66d19f1dbaf84e994e112f741
--- a/metadata/md5-cache/dev-libs/klibc-2.0.4-r2
+++ b/metadata/md5-cache/dev-libs/klibc-2.0.4-r2
@ -11,4 +11,4 @@ RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://kernel/linux/libs/klibc/2.0/klibc-2.0.4.tar.xz mirror://debian/pool/main/k/klibc/klibc_2.0.4-9.debian.tar.xz mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz mirror://kernel/linux/kernel/v4.x/testing/linux-4.4.tar.xz
 _eclasses_=eutils	017377e73405d964cd0137088cddb9c3	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=534aed3ea73e357752deb272c56f9973
+_md5_=f9f8b083e5463834f65d372350d0f075
--- a/metadata/md5-cache/dev-libs/skalibs-2.4.0.2
+++ b/metadata/md5-cache/dev-libs/skalibs-2.4.0.2
@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=>=sys-devel/make-3.81
+DESCRIPTION=skarnet.org general-purpose libraries
+EAPI=6
+HOMEPAGE=http://www.skarnet.org/software/skalibs/
+IUSE=doc ipv6 static-libs
+KEYWORDS=~amd64 ~x86
+LICENSE=ISC
+SLOT=0/2.4
+SRC_URI=http://www.skarnet.org/software/skalibs/skalibs-2.4.0.2.tar.gz
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=ae03bf2d928f0170605f71c54853a28d
--- a/metadata/md5-cache/dev-lisp/asdf-1.86-r1
+++ b/metadata/md5-cache/dev-lisp/asdf-1.86-r1
@ -1,11 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=ASDF is Another System Definition Facility for Common Lisp
-EAPI=3
-HOMEPAGE=http://packages.debian.org/unstable/devel/cl-asdf
-IUSE=examples
-KEYWORDS=amd64 ~mips ppc ppc64 s390 sparc x86
-LICENSE=MIT
-SLOT=0
-SRC_URI=mirror://gentoo/cl-asdf_1.86.orig.tar.gz mirror://gentoo/cl-asdf_1.86-1.diff.gz
-_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=48fabf3681b3b5392d93d2cbdf3562ad
--- a/metadata/md5-cache/dev-util/fuzz-0.6
+++ b/metadata/md5-cache/dev-util/fuzz-0.6
@ -1,12 +0,0 @@
-DEFINED_PHASES=install unpack
-DEPEND=>=sys-libs/readline-4.3
-DESCRIPTION=Stress-tests programs by giving them random input
-EAPI=0
-HOMEPAGE=http://fuzz.sourceforge.net/
-KEYWORDS=~x86 ~amd64
-LICENSE=GPL-2
-RDEPEND=>=sys-libs/readline-4.3
-SLOT=0
-SRC_URI=mirror://sourceforge/fuzz/fuzz-0.6.tar.gz mirror://debian/pool/main/f/fuzz/fuzz_0.6-7.3.diff.gz
-_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=8876ca3377144dcb099fc782577de792
--- a/metadata/md5-cache/dev-util/fuzz-0.6-r1
+++ b/metadata/md5-cache/dev-util/fuzz-0.6-r1
@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=sys-libs/readline:0=
+DESCRIPTION=Stress-tests programs by giving them random input
+EAPI=5
+HOMEPAGE=http://fuzz.sourceforge.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sys-libs/readline:0=
+SLOT=0
+SRC_URI=mirror://sourceforge/fuzz/fuzz-0.6.tar.gz mirror://debian/pool/main/f/fuzz/fuzz_0.6-7.3.diff.gz
+_eclasses_=multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
+_md5_=8b0d296fbca2992e3bbbb2bfe6be81bf
--- a/metadata/md5-cache/gnome-extra/gnome-builder-3.22.4
+++ b/metadata/md5-cache/gnome-extra/gnome-builder-3.22.4
@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=>=x11-libs/gtk+-3.22.1:3[introspection] >=dev-libs/glib-2.50.0:2[dbus] >=x11-libs/gtksourceview-3.22.0:3.0[introspection] >=dev-libs/gobject-introspection-1.48.0:= >=dev-python/pygobject-3.22.0:3 >=dev-libs/libxml2-2.9 >=x11-libs/pango-1.38.0 >=dev-libs/libpeas-1.18.0 >=dev-libs/json-glib-1.2.0 webkit? ( >=net-libs/webkit-gtk-2.12.0:4=[introspection] ) clang? ( sys-devel/clang ) git? ( dev-libs/libgit2[ssh,threads] >=dev-libs/libgit2-glib-0.24.0[ssh] ) >=x11-libs/vte-0.46:2.91 sysprof? ( >=dev-util/sysprof-3.22.2[gtk] ) dev-libs/libpcre:3 python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] vala? ( || ( dev-lang/vala:0.34[vapigen(+)] dev-lang/vala:0.32[vapigen(+)] dev-lang/vala:0.30[vapigen(+)] ) ) dev-cpp/mm-common dev-libs/appstream-glib dev-util/desktop-file-utils >=dev-util/gtk-doc-am-1.11 >=sys-devel/gettext-0.19.8 virtual/pkgconfig !<sys-apps/sandbox-2.10-r3 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Builder attempts to be an IDE for writing software for GNOME
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/Builder
+IUSE=clang +git sysprof vala webkit python_targets_python3_4 python_targets_python3_5 python_single_target_python3_4 python_single_target_python3_5 test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+ GPL-2+ LGPL-3+ LGPL-2+ MIT CC-BY-SA-3.0 CC0-1.0
+RDEPEND=>=x11-libs/gtk+-3.22.1:3[introspection] >=dev-libs/glib-2.50.0:2[dbus] >=x11-libs/gtksourceview-3.22.0:3.0[introspection] >=dev-libs/gobject-introspection-1.48.0:= >=dev-python/pygobject-3.22.0:3 >=dev-libs/libxml2-2.9 >=x11-libs/pango-1.38.0 >=dev-libs/libpeas-1.18.0 >=dev-libs/json-glib-1.2.0 webkit? ( >=net-libs/webkit-gtk-2.12.0:4=[introspection] ) clang? ( sys-devel/clang ) git? ( dev-libs/libgit2[ssh,threads] >=dev-libs/libgit2-glib-0.24.0[ssh] ) >=x11-libs/vte-0.46:2.91 sysprof? ( >=dev-util/sysprof-3.22.2[gtk] ) dev-libs/libpcre:3 python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] vala? ( || ( dev-lang/vala:0.34[vapigen(+)] dev-lang/vala:0.32[vapigen(+)] dev-lang/vala:0.30[vapigen(+)] ) )
+REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-builder/3.22/gnome-builder-3.22.4.tar.xz
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	gnome.org	ad34f378a3d57a6f2f2b8b4aaca4543e	gnome2	21c81ea94c12e45a63f7f14fba666e3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	readme.gentoo-r1	03878c06495db70bc36bd717383c09f7	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	vala	ca3f1c504058f5de407febddfae73167	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg	a5c4c5ce4f5ce9a2e777f5d9a40a8723	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=42f6df9146e3ea84687cd3764c9227e2
--- a/metadata/md5-cache/net-dns/s6-dns-2.1.0.0
+++ b/metadata/md5-cache/net-dns/s6-dns-2.1.0.0
@ -0,0 +1,13 @@
+DEFINED_PHASES=configure prepare
+DEPEND=>=sys-devel/make-3.81 static? ( >=dev-libs/skalibs-2.4.0.0[static-libs] ) !static? ( >=dev-libs/skalibs-2.4.0.0 )
+DESCRIPTION=suite of DNS client programs and libraries for Unix systems
+EAPI=6
+HOMEPAGE=http://www.skarnet.org/software/s6-dns/
+IUSE=static static-libs
+KEYWORDS=~amd64 ~x86
+LICENSE=ISC
+RDEPEND=!static? ( >=dev-libs/skalibs-2.4.0.0:= )
+SLOT=0/2.1
+SRC_URI=http://www.skarnet.org/software/s6-dns/s6-dns-2.1.0.0.tar.gz
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=e40ad4df4475dbf3ec46138f77b3da6f
--- a/metadata/md5-cache/net-misc/s6-networking-2.2.1.0
+++ b/metadata/md5-cache/net-misc/s6-networking-2.2.1.0
@ -0,0 +1,13 @@
+DEFINED_PHASES=configure prepare
+DEPEND=>=sys-devel/make-3.81 static? ( >=dev-lang/execline-2.2.0.0[static-libs] >=dev-libs/skalibs-2.4.0.2[static-libs] >=net-dns/s6-dns-2.1.0.0[static-libs] >=sys-apps/s6-2.4.0.0[static-libs] ssl? ( >=dev-libs/libressl-2.4.4[static-libs] ) ) !static? ( >=dev-lang/execline-2.2.0.0[static=] >=dev-libs/skalibs-2.4.0.2 >=net-dns/s6-dns-2.1.0.0[static=] >=sys-apps/s6-2.4.0.0[static=] ssl? ( >=dev-libs/libressl-2.4.4 ) )
+DESCRIPTION=suite of small networking utilities for Unix systems
+EAPI=6
+HOMEPAGE=http://www.skarnet.org/software/s6-networking/
+IUSE=ssl static static-libs
+KEYWORDS=~amd64 ~x86
+LICENSE=ISC
+RDEPEND=>=dev-lang/execline-2.2.0.0:=[!static?] >=sys-apps/s6-2.4.0.0:=[!static?] !static? ( >=dev-libs/skalibs-2.4.0.2:= >=net-dns/s6-dns-2.1.0.0:= ssl? ( >=dev-libs/libressl-2.4.4:= ) )
+SLOT=0/2.2
+SRC_URI=http://www.skarnet.org/software/s6-networking/s6-networking-2.2.1.0.tar.gz
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=7a3d36cea5f67fe265087b2b59830a29
--- a/metadata/md5-cache/sys-apps/firejail-lts-0.9.38.8
+++ b/metadata/md5-cache/sys-apps/firejail-lts-0.9.38.8
@ -0,0 +1,13 @@
+DEFINED_PHASES=configure prepare
+DEPEND=!sys-apps/firejail
+DESCRIPTION=Security sandbox for any type of processes; LTS branch
+EAPI=5
+HOMEPAGE=https://firejail.wordpress.com/
+IUSE=+seccomp
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=!sys-apps/firejail
+SLOT=0
+SRC_URI=mirror://sourceforge/firejail/firejail-0.9.38.8.tar.bz2
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
+_md5_=61d48dced73c26d43cbf20802fb6a0cf
--- a/metadata/md5-cache/sys-apps/s6-2.4.0.0
+++ b/metadata/md5-cache/sys-apps/s6-2.4.0.0
@ -0,0 +1,13 @@
+DEFINED_PHASES=configure prepare
+DEPEND=>=sys-devel/make-3.81 static? ( >=dev-lang/execline-2.2.0.0[static-libs] >=dev-libs/skalibs-2.4.0.0[static-libs] ) !static? ( >=dev-lang/execline-2.2.0.0[static=] >=dev-libs/skalibs-2.4.0.0 )
+DESCRIPTION=skarnet.org's small and secure supervision software suite
+EAPI=6
+HOMEPAGE=http://www.skarnet.org/software/s6/
+IUSE=static static-libs
+KEYWORDS=~amd64 ~x86
+LICENSE=ISC
+RDEPEND=>=dev-lang/execline-2.2.0.0:=[!static?] !static? ( >=dev-libs/skalibs-2.4.0.0:= )
+SLOT=0/2.4
+SRC_URI=http://www.skarnet.org/software/s6/s6-2.4.0.0.tar.gz
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=3ddde028b1022f68bbdec4805f4ddb00
--- a/metadata/md5-cache/sys-apps/s6-linux-init-0.2.0.0
+++ b/metadata/md5-cache/sys-apps/s6-linux-init-0.2.0.0
@ -0,0 +1,12 @@
+DEFINED_PHASES=configure postinst prepare
+DEPEND=>=sys-devel/make-3.81 static? ( >=dev-libs/skalibs-2.4.0.0[static-libs] ) !static? ( >=dev-libs/skalibs-2.4.0.0 )
+DESCRIPTION=Generates an init binary for s6-based init systems
+EAPI=6
+HOMEPAGE=http://www.skarnet.org/software/s6-linux-init/
+IUSE=static
+KEYWORDS=~amd64 ~x86
+LICENSE=ISC
+RDEPEND=!<sys-apps/s6-linux-utils-2.2.0.0 !static? ( >=dev-libs/skalibs-2.4.0.0:= )
+SLOT=0
+SRC_URI=http://www.skarnet.org/software/s6-linux-init/s6-linux-init-0.2.0.0.tar.gz
+_md5_=7b33b746e444a2526e7977dbf1c3dab8
--- a/metadata/md5-cache/sys-apps/s6-linux-utils-2.2.0.0
+++ b/metadata/md5-cache/sys-apps/s6-linux-utils-2.2.0.0
@ -0,0 +1,12 @@
+DEFINED_PHASES=configure prepare
+DEPEND=>=sys-devel/make-3.81 static? ( >=dev-libs/skalibs-2.4.0.0[static-libs] ) !static? ( >=dev-libs/skalibs-2.4.0.0 )
+DESCRIPTION=set of tiny linux utilities
+EAPI=6
+HOMEPAGE=http://www.skarnet.org/software/s6-linux-utils/
+IUSE=static
+KEYWORDS=~amd64 ~x86
+LICENSE=ISC
+RDEPEND=!static? ( >=dev-libs/skalibs-2.4.0.0:= )
+SLOT=0
+SRC_URI=http://www.skarnet.org/software/s6-linux-utils/s6-linux-utils-2.2.0.0.tar.gz
+_md5_=38c3c72802a90766bc34c6de3cdd2d7c
--- a/metadata/md5-cache/sys-apps/s6-portable-utils-2.1.0.0
+++ b/metadata/md5-cache/sys-apps/s6-portable-utils-2.1.0.0
@ -0,0 +1,12 @@
+DEFINED_PHASES=configure prepare
+DEPEND=>=sys-devel/make-3.81 static? ( >=dev-libs/skalibs-2.4.0.0[static-libs] ) !static? ( >=dev-libs/skalibs-2.4.0.0 )
+DESCRIPTION=set of tiny portable unix utilities
+EAPI=6
+HOMEPAGE=http://www.skarnet.org/software/s6-portable-utils/
+IUSE=static
+KEYWORDS=~amd64 ~x86
+LICENSE=ISC
+RDEPEND=!static? ( >=dev-libs/skalibs-2.4.0.0:= )
+SLOT=0
+SRC_URI=http://www.skarnet.org/software/s6-portable-utils/s6-portable-utils-2.1.0.0.tar.gz
+_md5_=b865e86505834f2ddef728dbebf56fb4
--- a/metadata/md5-cache/sys-apps/s6-rc-0.1.0.0
+++ b/metadata/md5-cache/sys-apps/s6-rc-0.1.0.0
@ -0,0 +1,13 @@
+DEFINED_PHASES=configure prepare
+DEPEND=>=sys-devel/make-3.81 static? ( >=dev-lang/execline-2.2.0.0[static-libs] >=dev-libs/skalibs-2.4.0.0[static-libs] >=sys-apps/s6-2.4.0.0[static-libs] ) !static? ( >=dev-lang/execline-2.2.0.0[static=] >=dev-libs/skalibs-2.4.0.0 >=sys-apps/s6-2.4.0.0[static=] )
+DESCRIPTION=service manager for the s6 supervision suite
+EAPI=6
+HOMEPAGE=http://www.skarnet.org/software/s6-rc/
+IUSE=static static-libs
+KEYWORDS=~amd64 ~x86
+LICENSE=ISC
+RDEPEND=>=dev-lang/execline-2.2.0.0:=[!static?] >=sys-apps/s6-2.4.0.0:=[!static?] !static? ( >=dev-libs/skalibs-2.4.0.0:= )
+SLOT=0/0.1
+SRC_URI=http://www.skarnet.org/software/s6-rc/s6-rc-0.1.0.0.tar.gz
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=e6cce6124c0cc1d33c780366204fbed8
--- a/metadata/md5-cache/sys-kernel/hardened-sources-4.8.17
+++ b/metadata/md5-cache/sys-kernel/hardened-sources-4.8.17
@ -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 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
+DESCRIPTION=Hardened kernel sources (kernel series 4.8)
+EAPI=5
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/
+IUSE=deblob symlink build deblob
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2 !deblob? ( freedist )
+RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=4.8.17
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.8.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.8-gnu/deblob-4.8 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.8-gnu/deblob-check -> deblob-check-4.8 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-4.8.17-1.extras.tar.bz2 mirror://gentoo/genpatches-4.8-18.base.tar.xz
+_eclasses_=eutils	017377e73405d964cd0137088cddb9c3	kernel-2	d6e1dc6b6c76281d9b644966393069ef	multilib	165fc17c38d1b11dac2008280dab6e80	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=105646f76e466860bf53eb6c579836e2
--- a/metadata/md5-cache/www-apps/wordpress-4.7.1
+++ b/metadata/md5-cache/www-apps/wordpress-4.7.1
@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst prerm setup
+DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
+DESCRIPTION=Wordpress PHP and MySQL based content management system (CMS)
+EAPI=6
+HOMEPAGE=https://wordpress.org/
+IUSE=+akismet examples +themes vhosts vhosts
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=virtual/httpd-php || ( dev-lang/php[mysql] dev-lang/php[mysqli] ) >=app-admin/webapp-config-1.50.15
+SLOT=4.7.1
+SRC_URI=https://wordpress.org/wordpress-4.7.1.tar.gz
+_eclasses_=webapp	42c6ef7af496b228f9854b3c81e4b226
+_md5_=a492869b7c2aaa5f54bd488775976770
--- a/metadata/md5-cache/www-client/google-chrome-beta-56.0.2924.59
+++ b/metadata/md5-cache/www-client/google-chrome-beta-56.0.2924.59
@ -9,6 +9,6 @@ LICENSE=google-chrome
 RDEPEND=app-arch/bzip2 app-misc/ca-certificates dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype:2 net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-libs/pango x11-misc/xdg-utils
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_56.0.2924.51-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_56.0.2924.59-1_amd64.deb
 _eclasses_=chromium-2	c30f482b868782938c772c21d9ede135	eutils	017377e73405d964cd0137088cddb9c3	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	linux-info	af49d8ab3be91bb1d38b7201dc9e5123	multilib	165fc17c38d1b11dac2008280dab6e80	pax-utils	4c2654a34ebe732e85fda354f6ee642f	readme.gentoo-r1	03878c06495db70bc36bd717383c09f7	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	unpacker	45d07319df5f40ee6af58418b0f930be	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
 _md5_=2ef7d66582145c8c6873a02fc8d431af
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-56.0.2924.59_beta
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-56.0.2924.59_beta
@ -8,6 +8,6 @@ LICENSE=google-chrome
 RDEPEND=!www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:stable !www-plugins/chrome-binary-plugins:unstable
 RESTRICT=bindist mirror strip
 SLOT=beta
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_56.0.2924.51-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_56.0.2924.59-1_amd64.deb
 _eclasses_=multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	unpacker	45d07319df5f40ee6af58418b0f930be
 _md5_=4df2a0fb20b715181b807a5714ff09d6
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@ -1 +1 @@
-Wed, 11 Jan 2017 20:13:14 +0000
+Thu, 12 Jan 2017 05:13:19 +0000
--- a/metadata/timestamp
+++ b/metadata/timestamp
@ -1 +1 @@
-Wed Jan 11 20:09:24 UTC 2017
+Thu Jan 12 05:09:33 UTC 2017
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@ -1 +1 @@
-Wed, 11 Jan 2017 20:30:01 +0000
+Thu, 12 Jan 2017 05:30:01 +0000
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@ -1 +1 @@
-1484165401 Wed 11 Jan 2017 08:10:01 PM UTC
+1484197801 Thu 12 Jan 2017 05:10:01 AM UTC
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@ -1 +1 @@
-Wed, 11 Jan 2017 20:13:14 +0000
+Thu, 12 Jan 2017 05:13:18 +0000
--- a/net-dns/s6-dns/Manifest
+++ b/net-dns/s6-dns/Manifest
@ -0,0 +1 @@
+DIST s6-dns-2.1.0.0.tar.gz 77415 SHA256 8455f3b1edad8f01a1340cb1242c141755729bfd5d71059739eced5c006539ad SHA512 c75722b3ddd9d1646116654983558efde22d0d5d3ff1c296a8d5e2ba44abe0d5a86fc86804cf90bea2ee8c3e82028e182d28cdbf5155d46c6b3d8f4d1c3387fc WHIRLPOOL 7c1eb845d6101c53fd65579bd46ad83c0085ee734d2623b616a34db0721bbca913820f21c6979bdc1c87582d8a92c547f7f9a5b640c4f31badbc3bd0098f75fd
--- a/net-dns/s6-dns/metadata.xml
+++ b/net-dns/s6-dns/metadata.xml
@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>samuel@sholland.org</email>
+		<name>Samuel Holland</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+	<longdescription lang="en">
+		s6-dns is a suite of DNS client programs and libraries for Unix systems,
+		as an alternative to the BIND, djbdns or other DNS clients.
+	</longdescription>
+</pkgmetadata>
--- a/net-dns/s6-dns/s6-dns-2.1.0.0.ebuild
+++ b/net-dns/s6-dns/s6-dns-2.1.0.0.ebuild
@ -0,0 +1,53 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit versionator
+
+DESCRIPTION="suite of DNS client programs and libraries for Unix systems"
+HOMEPAGE="http://www.skarnet.org/software/s6-dns/"
+SRC_URI="http://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~x86"
+IUSE="static static-libs"
+
+DEPEND=">=sys-devel/make-3.81
+	static? (
+		>=dev-libs/skalibs-2.4.0.0[static-libs]
+	)
+	!static? (
+		>=dev-libs/skalibs-2.4.0.0
+	)
+"
+RDEPEND="
+	!static? (
+		>=dev-libs/skalibs-2.4.0.0:=
+	)
+"
+
+HTML_DOCS="doc/*"
+
+src_prepare() {
+	default
+
+	# Remove QA warning about LDFLAGS addition
+	sed -i "s/tryldflag LDFLAGS_AUTO -Wl,--hash-style=both/:/" "${S}/configure" || die
+}
+
+src_configure() {
+	econf \
+		--bindir=/bin \
+		--dynlibdir=/$(get_libdir) \
+		--libdir=/usr/$(get_libdir)/${PN} \
+		--with-dynlib=/$(get_libdir) \
+		--with-lib=/usr/$(get_libdir)/skalibs \
+		--with-sysdeps=/usr/$(get_libdir)/skalibs \
+		$(use_enable !static shared) \
+		$(use_enable static allstatic) \
+		$(use_enable static static-libc) \
+		$(use_enable static-libs static)
+}
--- a/net-misc/s6-networking/Manifest
+++ b/net-misc/s6-networking/Manifest
@ -0,0 +1 @@
+DIST s6-networking-2.2.1.0.tar.gz 85242 SHA256 5d8150d7413b335693c6e63092381dd0866b1b6f95662a2cbae5ec17ca449ab0 SHA512 33085e2a855079ab046b6f851b4dc15801012dc1a353a1254508c6c9da9e45da4f7e2b62e16ab1d0a41d42b424bebe7b362860f68f3be0f9eba37b7a15817633 WHIRLPOOL e76817f4803dfff8e85efbc3f70c050ca88fd5046863abc2832d3e8d7765840e5e91e443f7ce96b66bde0d6697e4764b1b820d04eaf981e958eabc5b30107442
--- a/net-misc/s6-networking/metadata.xml
+++ b/net-misc/s6-networking/metadata.xml
@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>samuel@sholland.org</email>
+		<name>Samuel Holland</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+	<longdescription lang="en">
+		s6-networking is a suite of small networking utilities for Unix systems.
+		It includes command-line client and server management, TCP access
+		control, privilege escalation across UNIX domain sockets, IDENT protocol
+		management and clock synchronization. Optionally, it also includes
+		command-line TLS/SSL tools for secure communications.
+	</longdescription>
+</pkgmetadata>
--- a/net-misc/s6-networking/s6-networking-2.2.1.0.ebuild
+++ b/net-misc/s6-networking/s6-networking-2.2.1.0.ebuild
@ -0,0 +1,68 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit versionator
+
+DESCRIPTION="suite of small networking utilities for Unix systems"
+HOMEPAGE="http://www.skarnet.org/software/s6-networking/"
+SRC_URI="http://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~x86"
+IUSE="ssl static static-libs"
+
+DEPEND=">=sys-devel/make-3.81
+	static? (
+		>=dev-lang/execline-2.2.0.0[static-libs]
+		>=dev-libs/skalibs-2.4.0.2[static-libs]
+		>=net-dns/s6-dns-2.1.0.0[static-libs]
+		>=sys-apps/s6-2.4.0.0[static-libs]
+		ssl? ( >=dev-libs/libressl-2.4.4[static-libs] )
+	)
+	!static? (
+		>=dev-lang/execline-2.2.0.0[static=]
+		>=dev-libs/skalibs-2.4.0.2
+		>=net-dns/s6-dns-2.1.0.0[static=]
+		>=sys-apps/s6-2.4.0.0[static=]
+		ssl? ( >=dev-libs/libressl-2.4.4 )
+	)
+"
+RDEPEND="
+	>=dev-lang/execline-2.2.0.0:=[!static?]
+	>=sys-apps/s6-2.4.0.0:=[!static?]
+	!static? (
+		>=dev-libs/skalibs-2.4.0.2:=
+		>=net-dns/s6-dns-2.1.0.0:=
+		ssl? ( >=dev-libs/libressl-2.4.4:= )
+	)
+"
+
+HTML_DOCS="doc/*"
+
+src_prepare() {
+	default
+
+	# Remove QA warning about LDFLAGS addition
+	sed -i "s/tryldflag LDFLAGS_AUTO -Wl,--hash-style=both/:/" "${S}/configure" || die
+}
+
+src_configure() {
+	econf \
+		--bindir=/bin \
+		--dynlibdir=/$(get_libdir) \
+		--libdir=/usr/$(get_libdir)/${PN} \
+		--with-dynlib=/$(get_libdir) \
+		--with-lib=/usr/$(get_libdir)/s6 \
+		--with-lib=/usr/$(get_libdir)/s6-dns \
+		--with-lib=/usr/$(get_libdir)/skalibs \
+		--with-sysdeps=/usr/$(get_libdir)/skalibs \
+		$(use_enable ssl ssl libressl) \
+		$(use_enable !static shared) \
+		$(use_enable static allstatic) \
+		$(use_enable static static-libc) \
+		$(use_enable static-libs static)
+}
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@ -3188,6 +3188,11 @@ gnome-extra/evolution-data-server:gnome-online-accounts - Enable using net-libs/
 gnome-extra/evolution-data-server:google - Enable Google Contacts support. This will also enable the internal Google authentication support. Please note this last one relies on a deprecated (and vulnerable) net-libs/webkit-gtk slot. If you want to avoid this dependency, you can disable this support and rely on gnome-online-accounts instead
 gnome-extra/evolution-data-server:weather - Enable optional weather calendar support
 gnome-extra/gnome-boxes:usbredir - Use sys-apps/usbredir to redirect USB devices to another machine over TCP
+gnome-extra/gnome-builder:clang - Provide integration with sys-devel/clang for best possible C/C++ autocompletion, semantic highlighting, symbol resolving, and diagnostics support
+gnome-extra/gnome-builder:git - Provide support for the Git version control system via dev-libs/libgit2-glib (such as setup of Git for New Project, direct cloning for Open Project and changed lines indicators in the editor gutter)
+gnome-extra/gnome-builder:sysprof - Provide an integrated profiler via dev-util/sysprof
+gnome-extra/gnome-builder:vala - Provide an autoindenter, autocompletion, diagnostics, and symbol resolver for Vala
+gnome-extra/gnome-builder:webkit - Enable net-libs/webkit-gtk using plugins support and the HTML/Markdown previewer plugin
 gnome-extra/gnome-color-manager:packagekit - Enable support for the distro-neutral package manager GUI app-admin/packagekit
 gnome-extra/gnome-commander:chm - Enable metadata support for Microsoft Compiled HTML Help files
 gnome-extra/gnome-commander:gsf - Add metadata support for OLE, OLE2 and ODF
--- a/sys-apps/firejail-lts/Manifest
+++ b/sys-apps/firejail-lts/Manifest
@ -1 +1,2 @@
 DIST firejail-0.9.38.6.tar.bz2 158685 SHA256 76a25da5d2c3e2b50d0f3ff750614a43742f7115b0c65b92ba5c71a226006b70 SHA512 ba65ba77faa5f278a632f01cabc7ce963cd9a6c665a531ab4b5abfb076e670b52b1326c097a7e180aa717085aace4ecc4b9922c28066752f1afc77e123dfad26 WHIRLPOOL fcafc4155bdf2fc914eebc45bad7ce0c1ebc042705f57334f820453b3095aec444f7b49dbd84284e308d0f63185163be3f6089025df8815eca4983a007a853c0
+DIST firejail-0.9.38.8.tar.bz2 158812 SHA256 36990c817d89b70ca9fa50860133c7728157003479e3b1801515ff259adf9357 SHA512 6f62bd0a9e87251af0e8c6d009714d18e7fb2819e4136fb49dcd7cc7ebc2b7b196395a0fe45a93101b0d42c66240c0da82481fd9d911fa33b0d7ca4933227dfd WHIRLPOOL 9ef9d61e5ec36c517b55dbbe921e28b96a2839f79a4aec775cf4f88320a3f6f8d2270363c0949e84e17af40642491910abc13f0e997dedd9dfad19a891312484
--- a/sys-apps/firejail-lts/files/firejail-lts-0.9.38.8-sysmacros.patch
+++ b/sys-apps/firejail-lts/files/firejail-lts-0.9.38.8-sysmacros.patch
@ -0,0 +1,27 @@
+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-lts/firejail-lts-0.9.38.8.ebuild
+++ b/sys-apps/firejail-lts/firejail-lts-0.9.38.8.ebuild
@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+MY_PN=firejail
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Security sandbox for any type of processes; LTS branch"
+HOMEPAGE="https://firejail.wordpress.com/"
+SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+seccomp"
+
+DEPEND="!sys-apps/firejail"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-sysmacros.patch
+	find -name Makefile.in -exec sed -i -r \
+			-e '/CFLAGS/s: (-O2|-ggdb) : :g' \
+			-e '1iCC=@CC@' {} + || die
+}
+
+src_configure() {
+	econf $(use_enable seccomp)
+}
--- a/sys-apps/s6-linux-init/Manifest
+++ b/sys-apps/s6-linux-init/Manifest
@ -1,2 +1,3 @@
 DIST s6-linux-init-0.0.1.4.tar.gz 21493 SHA256 80eeb8e3bf3095d69b86aaf8e6f5c28aab53a0eb6473e301a673870b56566b6a SHA512 84fabc9720f2aa2c68723c7b34023a8971f9e55c367b69c200c9c99d2c04bd23b598563facaca4deb4a11f732be3016361e38a40258a7d0ce68cb0f3c10a0235 WHIRLPOOL 55f6c6cac544b6c9ffa5b5f16639a20a47b1ba2ae61cdfe5c1446c254a11801cfab4f211c2b55c7381a37ff76509a06b25d2ec8710ec32f1682ee186efc8b805
 DIST s6-linux-init-0.1.0.0.tar.gz 22242 SHA256 4db16d235dc052f6376f4e88e5e4c0dd1cb84237e7eadb9eb4b440eececcaffc SHA512 8898ac09212d33d4160d0a1ccad4f6f24ed8010a16815daec4a68827f7af1948568807ae2063bb1f0fe901b87f605eb3cd199d0a3e9a217255b77ed4fc9eef08 WHIRLPOOL 4eed683de5c0846698c1d603e7be72299a425f1f91e3f944da98ed5fb0d9d988db1fb1931ec86ec41f837dab0b51bd61f828b2763c21ac520037021831e47543
+DIST s6-linux-init-0.2.0.0.tar.gz 24482 SHA256 131484e61eff0e671e112f0436b13e8e7d08752f810d8bec4924a68383eee2b9 SHA512 16c8c97b65ad533b70ed9dd189827778797dc8d0a70af0880655b5f89a1524cd9d3675cb681b99f4704d43c810a4211c9926bfeb743247d7c29559ec2f77606e WHIRLPOOL 45aad2584c8036f8fe9d9c72a7da3fb29e91f36a38d6b63297dbd1c201601971b6b11304290d16df09190f0706825c3e0cbd8c7f48657be17ece3ef27dffbd95
--- a/sys-apps/s6-linux-init/metadata.xml
+++ b/sys-apps/s6-linux-init/metadata.xml
@ -6,6 +6,10 @@
 		<name>Luis Ressel</name>
 		<description>Proxied maintainer; set to assignee in all bugs</description>
 	</maintainer>
+	<maintainer type="person">
+		<email>samuel@sholland.org</email>
+		<name>Samuel Holland</name>
+	</maintainer>
 	<maintainer type="person">
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
--- a/sys-apps/s6-linux-init/s6-linux-init-0.2.0.0.ebuild
+++ b/sys-apps/s6-linux-init/s6-linux-init-0.2.0.0.ebuild
@ -0,0 +1,57 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DESCRIPTION="Generates an init binary for s6-based init systems"
+HOMEPAGE="http://www.skarnet.org/software/s6-linux-init/"
+SRC_URI="http://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static"
+
+DEPEND=">=sys-devel/make-3.81
+	static? (
+		>=dev-libs/skalibs-2.4.0.0[static-libs]
+	)
+	!static? (
+		>=dev-libs/skalibs-2.4.0.0
+	)
+"
+RDEPEND="
+	!<sys-apps/s6-linux-utils-2.2.0.0
+	!static? (
+		>=dev-libs/skalibs-2.4.0.0:=
+	)
+"
+
+DOCS="INSTALL examples"
+HTML_DOCS="doc/*"
+
+src_prepare() {
+	default
+
+	# Remove QA warning about LDFLAGS addition
+	sed -i "s/tryldflag LDFLAGS_AUTO -Wl,--hash-style=both/:/" "${S}/configure" || die
+}
+
+src_configure() {
+	econf \
+		--bindir=/bin \
+		--dynlibdir=/$(get_libdir) \
+		--libdir=/usr/$(get_libdir)/${PN} \
+		--with-dynlib=/$(get_libdir) \
+		--with-lib=/usr/$(get_libdir)/skalibs \
+		--with-sysdeps=/usr/$(get_libdir)/skalibs \
+		$(use_enable static allstatic) \
+		$(use_enable static static-libc)
+}
+
+pkg_postinst()
+{
+	einfo "The generated init script requires additional packages."
+	einfo "Read ${ROOT}usr/share/doc/${PF}/INSTALL for details."
+}
--- a/sys-apps/s6-linux-utils/Manifest
+++ b/sys-apps/s6-linux-utils/Manifest
@ -1,2 +1,3 @@
 DIST s6-linux-utils-2.0.2.3.tar.gz 40050 SHA256 f959ffb9bb79865018becc6664d29faef22cb747a43db252879e11886b1b8cc3 SHA512 10d919c67036dbd57ed8d0e2ba46e1957c621414cae2326c2c696a27b46496d928aa768465236585ed8be279a2866cc9a519f9feb51b9757f999e9b8b80faf2d WHIRLPOOL 7c5515d65fc2f5db1a0b14abedfd2ea462e621a6a16200da162487b0a57d1adce6f5ecc034524b1e8f066e531413f5a9c528187dee38b1980d3826a3a970d6c8
 DIST s6-linux-utils-2.1.0.0.tar.gz 40996 SHA256 3523ba84ba524198711b2de3edaaf620381a4e95d78ec6d13dcb7aba42397ead SHA512 a2bd997334b69c7d864ea14dd27af7b62c8a7b6ccf8f9431ed87f46590546e540a06577f04d2cf3e52299cd9819a31e926326862d751b8528bc98ec2f4e93913 WHIRLPOOL 3718fc4260b3ea1fe04d8b05021ce1a8ad2b1099e780da646df53d7174cabbe536c2e366f2b725a049258bcc057cdf9e226bd81a0fe575ad184f3df866112847
+DIST s6-linux-utils-2.2.0.0.tar.gz 40863 SHA256 587745abfbf2cc631bb54dd2b3fd29f39b723e3c50e28165138a85c98fda35f9 SHA512 5d0fcd29f7a03146b5296d7164326f76af95a8632df4204021d9ae30b1f03590e7f25d410f07639cf741a455f9624f9410b2e7836ae6838916da50be1527ae7f WHIRLPOOL 49f3ff3882100cc0176915bcc17f824b7b49c0e2bef8037c0643b1bf6e88df2221d5cdd8144110e03631433d80a0d35283b3fa8d338c3ecf2681c756c193280a
--- a/sys-apps/s6-linux-utils/metadata.xml
+++ b/sys-apps/s6-linux-utils/metadata.xml
@ -6,6 +6,10 @@
 		<name>Luis Ressel</name>
 		<description>Proxied maintainer; set to assignee in all bugs</description>
 	</maintainer>
+	<maintainer type="person">
+		<email>samuel@sholland.org</email>
+		<name>Samuel Holland</name>
+	</maintainer>
 	<maintainer type="person">
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
--- a/sys-apps/s6-linux-utils/s6-linux-utils-2.2.0.0.ebuild
+++ b/sys-apps/s6-linux-utils/s6-linux-utils-2.2.0.0.ebuild
@ -0,0 +1,49 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DESCRIPTION="set of tiny linux utilities"
+HOMEPAGE="http://www.skarnet.org/software/s6-linux-utils/"
+SRC_URI="http://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static"
+
+DEPEND=">=sys-devel/make-3.81
+	static? (
+		>=dev-libs/skalibs-2.4.0.0[static-libs]
+	)
+	!static? (
+		>=dev-libs/skalibs-2.4.0.0
+	)
+"
+RDEPEND="
+	!static? (
+		>=dev-libs/skalibs-2.4.0.0:=
+	)
+"
+
+HTML_DOCS="doc/*"
+
+src_prepare() {
+	default
+
+	# Remove QA warning about LDFLAGS addition
+	sed -i "s/tryldflag LDFLAGS_AUTO -Wl,--hash-style=both/:/" "${S}/configure" || die
+}
+
+src_configure() {
+	econf \
+		--bindir=/bin \
+		--dynlibdir=/$(get_libdir) \
+		--libdir=/usr/$(get_libdir)/${PN} \
+		--with-dynlib=/$(get_libdir) \
+		--with-lib=/usr/$(get_libdir)/skalibs \
+		--with-sysdeps=/usr/$(get_libdir)/skalibs \
+		$(use_enable static allstatic) \
+		$(use_enable static static-libc)
+}
--- a/sys-apps/s6-portable-utils/Manifest
+++ b/sys-apps/s6-portable-utils/Manifest
@ -1,2 +1,3 @@
 DIST s6-portable-utils-2.0.5.3.tar.gz 46300 SHA256 27be01b3d66df617ea7dbc21b55d253d5b9142463099f6944f90ef33587a2e09 SHA512 19e71457dc0ca8c1d161da36fb32902f2b8c60759745651806c9eebd19f3ec4d3d87d2d45fb226711eb16f6ae407671c363fc2a7df7d5746ecf3a4197012a122 WHIRLPOOL 1760eadf1eded5981aeb5b43df3a3c012a0b300ffed4ffdb22b51907e07962f65270763dff24937acbe7414d70f273497d8b91672360606827a002e968d2fa58
 DIST s6-portable-utils-2.0.6.0.tar.gz 46972 SHA256 233b7d13766a23661cc7ed5c052f29b9c558c1d516a538a281a17da22a909d4b SHA512 822c723f112550550591afb83908bf4d62f40e88fd46eacc6d56feb4c952bcfc4bad91c988f7379323cf7997c4fb823bb837e0c433ca6947762a63a1b8681557 WHIRLPOOL efa966bb5423bb4d0e7cd56c41d899430a7b6204e99646f376b8e9acba9ec8cc7b597fb420397a8808c2f3c4bec65826701e61f1d6e452fef2004e051a4d0d35
+DIST s6-portable-utils-2.1.0.0.tar.gz 47170 SHA256 cde145b7b9d1f1685f271c45c8aed635e74221689bb8ec21a11b3e5a252d1c4e SHA512 0b18304c63180c3233a5f29e1fc24b20c9c99c8949b042244d4a5b69cf2f15049ccbeddb2c3ffc5e88ee636bcfe836568670cc1626d5517381771ee3baff10c5 WHIRLPOOL aeca14c78f8cc5e95c56a14658b6bd41f93bd7bb301b219d2b9a49034f8f565de9e5c33736b029e1d9e5c78abbca75276538b56e442cc247b5971ec5699087a7
--- a/sys-apps/s6-portable-utils/metadata.xml
+++ b/sys-apps/s6-portable-utils/metadata.xml
@ -6,6 +6,10 @@
 		<name>Luis Ressel</name>
 		<description>Proxied maintainer; set to assignee in all bugs</description>
 	</maintainer>
+	<maintainer type="person">
+		<email>samuel@sholland.org</email>
+		<name>Samuel Holland</name>
+	</maintainer>
 	<maintainer type="person">
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
--- a/sys-apps/s6-portable-utils/s6-portable-utils-2.1.0.0.ebuild
+++ b/sys-apps/s6-portable-utils/s6-portable-utils-2.1.0.0.ebuild
@ -0,0 +1,49 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DESCRIPTION="set of tiny portable unix utilities"
+HOMEPAGE="http://www.skarnet.org/software/s6-portable-utils/"
+SRC_URI="http://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static"
+
+DEPEND=">=sys-devel/make-3.81
+	static? (
+		>=dev-libs/skalibs-2.4.0.0[static-libs]
+	)
+	!static? (
+		>=dev-libs/skalibs-2.4.0.0
+	)
+"
+RDEPEND="
+	!static? (
+		>=dev-libs/skalibs-2.4.0.0:=
+	)
+"
+
+HTML_DOCS="doc/*"
+
+src_prepare() {
+	default
+
+	# Remove QA warning about LDFLAGS addition
+	sed -i "s/tryldflag LDFLAGS_AUTO -Wl,--hash-style=both/:/" "${S}/configure" || die
+}
+
+src_configure() {
+	econf \
+		--bindir=/bin \
+		--dynlibdir=/$(get_libdir) \
+		--libdir=/usr/$(get_libdir)/${PN} \
+		--with-dynlib=/$(get_libdir) \
+		--with-lib=/usr/$(get_libdir)/skalibs \
+		--with-sysdeps=/usr/$(get_libdir)/skalibs \
+		$(use_enable static allstatic) \
+		$(use_enable static static-libc)
+}
--- a/sys-apps/s6-rc/Manifest
+++ b/sys-apps/s6-rc/Manifest
@ -1,2 +1,3 @@
 DIST s6-rc-0.0.2.1.tar.gz 85549 SHA256 93f30557e2e2e5c507b5becef2bd26f377be6b6c542fb4627c3122e1c2d83ef9 SHA512 9a83e272ba521e5ede17ded6b6143797d70205c6631fd08bdb9cbefc66e8ab6011de68e94876ec3c7af439ffbff21778207507db74f0ae91117e88fe36a7f65c WHIRLPOOL f10e515db0106816fb3c79c46dea0f171ac89653f326b9287aeccb1a9cc369fb6e6fec40c43eb3c3863763081608ec7cccf780cb8bcaaee7303e6c5d106c082d
 DIST s6-rc-0.0.3.0.tar.gz 86992 SHA256 5eb94e77961a075e6305e89e3a5c7e6c95fb7037682d4ea45277c1ab1625892e SHA512 66fe8cf1937671d3b6c06e7aca40e5b94502ca12a659b50e8120a178295084272091a378e8bbf9f69c560fbc69ca10ffdf08763cbd714ed2411d0d558437e325 WHIRLPOOL 54c1bddc6254eadf428806920f9cdf567cbb77d4496d7b8afd2b9c9daee5159719160a63f2ef257eb6bc86726161356864df070a80ed8acb3d3f7e0c8c748518
+DIST s6-rc-0.1.0.0.tar.gz 88520 SHA256 d04a8a765740ed55e38a33da3639197f51f83b3e498bdef5bc1d1d322b1acff3 SHA512 d58f52e4bc132eab6fddd1be3b406d0314cc4fdd61e476310a16348c117b032dafd3ef8701219dd7476247d5b9a6685621e94212705aa88934cb1eaee7b1e6fe WHIRLPOOL afac5177ca5220551575036e27b0881fe78712de93ef48e88158abf2c49a7494c47bebe58f48aec8b412a7e2075d29284f57514fe81d2b42b35cd441ff08e13e
--- a/sys-apps/s6-rc/metadata.xml
+++ b/sys-apps/s6-rc/metadata.xml
@ -6,6 +6,10 @@
 		<name>Luis Ressel</name>
 		<description>Proxied maintainer; set to assignee in all bugs</description>
 	</maintainer>
+	<maintainer type="person">
+		<email>samuel@sholland.org</email>
+		<name>Samuel Holland</name>
+	</maintainer>
 	<maintainer type="person">
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
--- a/sys-apps/s6-rc/s6-rc-0.1.0.0.ebuild
+++ b/sys-apps/s6-rc/s6-rc-0.1.0.0.ebuild
@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit versionator
+
+DESCRIPTION="service manager for the s6 supervision suite"
+HOMEPAGE="http://www.skarnet.org/software/s6-rc/"
+SRC_URI="http://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~x86"
+IUSE="static static-libs"
+
+DEPEND=">=sys-devel/make-3.81
+	static? (
+		>=dev-lang/execline-2.2.0.0[static-libs]
+		>=dev-libs/skalibs-2.4.0.0[static-libs]
+		>=sys-apps/s6-2.4.0.0[static-libs]
+	)
+	!static? (
+		>=dev-lang/execline-2.2.0.0[static=]
+		>=dev-libs/skalibs-2.4.0.0
+		>=sys-apps/s6-2.4.0.0[static=]
+	)
+"
+RDEPEND="
+	>=dev-lang/execline-2.2.0.0:=[!static?]
+	>=sys-apps/s6-2.4.0.0:=[!static?]
+	!static? (
+		>=dev-libs/skalibs-2.4.0.0:=
+	)
+"
+
+DOCS="examples"
+HTML_DOCS="doc/*"
+
+src_prepare() {
+	default
+
+	# Remove QA warning about LDFLAGS addition
+	sed -i "s/tryldflag LDFLAGS_AUTO -Wl,--hash-style=both/:/" "${S}/configure" || die
+}
+
+src_configure() {
+	econf \
+		--bindir=/bin \
+		--dynlibdir=/$(get_libdir) \
+		--libdir=/usr/$(get_libdir)/${PN} \
+		--with-dynlib=/$(get_libdir) \
+		--with-lib=/usr/$(get_libdir)/execline \
+		--with-lib=/usr/$(get_libdir)/s6 \
+		--with-lib=/usr/$(get_libdir)/skalibs \
+		--with-sysdeps=/usr/$(get_libdir)/skalibs \
+		$(use_enable !static shared) \
+		$(use_enable static allstatic) \
+		$(use_enable static static-libc) \
+		$(use_enable static-libs static)
+}
--- a/sys-apps/s6/Manifest
+++ b/sys-apps/s6/Manifest
@ -1,3 +1,4 @@
 DIST s6-2.1.3.0.tar.gz 181237 SHA256 73057df188f1ac8db186b96298c0cb6081199aa73d3f2f8d5fabdbbe21c3ea04 SHA512 f5b962fb9f36a910fd8b56b1158cc28d1dab808f22f6beb309b8c23dab1863409aaecd2e3806b51ec34aef1c70f117d3b8af4c7167e0e854f6925fe278cdcaca WHIRLPOOL 03283a6c2a8a9419bf7e27a9e6c46fe2fe9ad0cbb384f4da0efaec56f5066ab36d20b00aae7a81408ca7b94a1325625feb83173e99e9ff9e85f28be69e6ba2c7
 DIST s6-2.2.4.3.tar.gz 192153 SHA256 f584ec56d5f2a3a2d81698d5f744b9b64d8fb6c22b56649faa71f3b62da7db3f SHA512 af2f06d31eeba3efeaa93e1df6afc50051eb4b13b034d24750314e0d7e9277953595cd04134eecbe239c0ea633e2242712d193a23389a3c1206a81bf7438b5bb WHIRLPOOL 5d00db61a036fa5e692892bc72391ad5d74144c57e505da73b708d8a152dc7a620e9bc7f04ef52e51220eb4ac3da15b7e31e35e0998c3c954a0d431593476c0b
 DIST s6-2.3.0.0.tar.gz 192887 SHA256 49c9a0476d93c6279c776ca5ae9c49b3fd39c356eda674828aebf78f8488e8e6 SHA512 40b9ae41b29a32a47a88211a3eb2a0771b5108fc57a2a7a0524e5c6b99bf31c465e99bd910b11c7de784f22b712c79bb32306e963bf8b1aa5270e5463577758c WHIRLPOOL 7052ece89b0bc4174b9583b3dba721322ee89974f9540a243fd9e4f4a5c43710360c31e5fd7596630f539e7204f7cb7bc92569e6a5d11a68cb520379078b5f37
+DIST s6-2.4.0.0.tar.gz 193534 SHA256 5e788d5935dbcce76ac9a99cfcf6ee46a2ffb84220c84225df7589e9a3585560 SHA512 bd294fd6ec6bd5b696c52f8ef43de278a82d2b5ec4bcea3f32ab45f15b22b33633210f38709c1e736bab8ac4c560af6a307b2617709adfc8d5f9c0bce329dff2 WHIRLPOOL 6c6fe574cfdd8d6d97279dac48d4a284941f1e2cce981fecac3fa5083fc3ddc9e960fa38676edf94881e48f7e85ce7875415c12a7f867ca847d2e639716e62d7
--- a/sys-apps/s6/s6-2.4.0.0.ebuild
+++ b/sys-apps/s6/s6-2.4.0.0.ebuild
@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit versionator
+
+DESCRIPTION="skarnet.org's small and secure supervision software suite"
+HOMEPAGE="http://www.skarnet.org/software/s6/"
+SRC_URI="http://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~x86"
+IUSE="static static-libs"
+
+DEPEND=">=sys-devel/make-3.81
+	static? (
+		>=dev-lang/execline-2.2.0.0[static-libs]
+		>=dev-libs/skalibs-2.4.0.0[static-libs]
+	)
+	!static? (
+		>=dev-lang/execline-2.2.0.0[static=]
+		>=dev-libs/skalibs-2.4.0.0
+	)
+"
+RDEPEND="
+	>=dev-lang/execline-2.2.0.0:=[!static?]
+	!static? (
+		>=dev-libs/skalibs-2.4.0.0:=
+	)
+"
+
+DOCS="AUTHORS examples README*"
+HTML_DOCS="doc/*"
+
+src_prepare() {
+	default
+
+	# Remove QA warning about LDFLAGS addition
+	sed -i "s/tryldflag LDFLAGS_AUTO -Wl,--hash-style=both/:/" "${S}/configure" || die
+}
+
+src_configure() {
+	econf \
+		--bindir=/bin \
+		--dynlibdir=/$(get_libdir) \
+		--libdir=/usr/$(get_libdir)/${PN} \
+		--with-dynlib=/$(get_libdir) \
+		--with-lib=/usr/$(get_libdir)/execline \
+		--with-lib=/usr/$(get_libdir)/skalibs \
+		--with-sysdeps=/usr/$(get_libdir)/skalibs \
+		$(use_enable !static shared) \
+		$(use_enable static allstatic) \
+		$(use_enable static static-libc) \
+		$(use_enable static-libs static)
+}
--- a/sys-kernel/hardened-sources/Manifest
+++ b/sys-kernel/hardened-sources/Manifest
@ -17,6 +17,7 @@ DIST hardened-patches-4.7.6-1.extras.tar.bz2 1913657 SHA256 f32b7891fa0a821a6027
 DIST hardened-patches-4.8.15-2.extras.tar.bz2 1907395 SHA256 cee405ecf691f489df870eb63e6946e33c8b2e8e352b1769282d0db2406e2787 SHA512 0e0cfa6b42ae216ab3897fc2ab4d13b57871265be4f26c9716c29c280b0e647096de2d4bb161cf75340d67f31001a258bb42373f80a0d697b5462ed63c3842e7 WHIRLPOOL 06a0865cc0c245a25fb4bb9f3b06f6e12a98b64cd896009fa99b234634da78125af206fb5756adf9bc8deca68d617624b8eb14cab7d6b5450514475ac6f7eb6a
 DIST hardened-patches-4.8.15-3.extras.tar.bz2 1908708 SHA256 71532165a859327f280d861ef57cdf234837b8a243abedeaa146ba94f9e1200b SHA512 8fea93927ddb61c1d718464eeb211b47082d74c1811b4977ef310a47c87616ca66fb136b030aec733a80ceffffdf79020dc64918529d76f2315effc11e060edf WHIRLPOOL 606c25ff3ab2646e0f837cdb9ba0a8646f97ae8594d85b9b5a33db96ece160a77bd8eb4f0ff6b231881c9c14af26d26750e608d598fdc288128aa191166bfc7b
 DIST hardened-patches-4.8.16-1.extras.tar.bz2 1907562 SHA256 75f8f5f9cbc2f68e6d52c8954ecf01beca2418136ef8b4c17a5515cf00c643ad SHA512 42c0510b4a277ffa080764e81d2f66169036d90162b1ab392ac9bac5df96192806df139c27466f5e9995757bbb8a4c413c4aeefd4078b0c854126ab77b97f3e7 WHIRLPOOL 4ea9a735e299ca9176c45104d4ae371b31105c5a58c839750b31cb23fe3b2b2402b4f1c01a99a1f52b70a35ec76f5e6c0a01c79fb0e22514c2c7d1701d0124eb
+DIST hardened-patches-4.8.17-1.extras.tar.bz2 1931109 SHA256 9cdd18e283d46dbce0f5ca332ed348b5cd18642f7c3734b73bb67af0f395e17e SHA512 0f886142a8595fb7af3441222880d8c42af0252540906941acbfe5b76da683c068ce662d5f02ac8365456f9ae1d330594bfc21457b263edb47e0a603276b472d WHIRLPOOL f7191e164929c860cc64929f563e35f19b21fe85129eacce3009b453a69a7101c3556271b12cd32b81be6ffab185f5cb466ab8297420a2635e6eeb16c8dfba49
 DIST linux-4.4.tar.xz 87295988 SHA256 401d7c8fef594999a460d10c72c5a94e9c2e1022f16795ec51746b0d165418b2 SHA512 13c8459933a8b80608e226a1398e3d1848352ace84bcfb7e6a4a33cb230bbe1ab719d4b58e067283df91ce5311be6d2d595fc8c19e2ae6ecc652499415614b3e WHIRLPOOL 02abc203d867404b9934aaa4c1e5b5dcbb0b0021e91a03f3a7e7fd224eed106821d8b4949f32a590536db150e5a88c16fcde88538777a26d0c17900f0257b1bc
 DIST linux-4.7.tar.xz 90412100 SHA256 5190c3d1209aeda04168145bf50569dc0984f80467159b1dc50ad731e3285f10 SHA512 e8c02583e17e4fc4214fef694825fcb78c898266f1624deb1cdf56ab5c5fdfa669c5221122a7cf0d502ed6f921ff3797634acd9d294d29e98e3faa8a21920185 WHIRLPOOL e968c89ce714c8d918db6074dabac4b0200c57ff111260313cf5798eeefb8b5b10c1509b64e2ee611a78e81075c588a473b67f9802609b2fef9ebb87ae514d98
 DIST linux-4.8.tar.xz 91966856 SHA256 3e9150065f193d3d94bcf46a1fe9f033c7ef7122ab71d75a7fb5a2f0c9a7e11a SHA512 a48a065f21e1c7c4de4cf8ca47b8b8d9a70f86b64e7cfa6e01be490f78895745b9c8790734b1d22182cf1f930fb87eaaa84e62ec8cc1f64ac4be9b949e7c0358 WHIRLPOOL 3888c8c07db0c069f827245d4d7306087f78f7d03e8240eb1fcd13622cd5dbe1c17cd8ed7dc11513f77f3efd5dbd84e2b48e82bdb9b9bfd2242fd62ae32812d5
--- a/sys-kernel/hardened-sources/hardened-sources-4.8.17.ebuild
+++ b/sys-kernel/hardened-sources/hardened-sources-4.8.17.ebuild
@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base"
+K_GENPATCHES_VER="18"
+K_DEBLOB_AVAILABLE="1"
+
+inherit kernel-2
+detect_version
+
+HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-1"
+HGPV_URI="http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-${HGPV}.extras.tar.bz2"
+SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2"
+UNIPATCH_EXCLUDE="
+	1500_XATTR_USER_PREFIX.patch
+	2900_dev-root-proc-mount-fix.patch"
+
+DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
+HOMEPAGE="http://www.gentoo.org/proj/en/hardened/"
+IUSE="deblob"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND=">=sys-devel/gcc-4.5"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+
+	local GRADM_COMPAT="sys-apps/gradm-3.1*"
+
+	ewarn
+	ewarn "Users of grsecurity's RBAC system must ensure they are using"
+	ewarn "${GRADM_COMPAT}, which is compatible with ${PF}."
+	ewarn "It is strongly recommended that the following command is issued"
+	ewarn "prior to booting a ${PF} kernel for the first time:"
+	ewarn
+	ewarn "emerge -na =${GRADM_COMPAT}"
+	ewarn
+}
--- a/www-apps/wordpress/Manifest
+++ b/www-apps/wordpress/Manifest
@ -1,4 +1,5 @@
 DIST wordpress-4.4.2.tar.gz 7099520 SHA256 c8a74c0f7cfc0d19989d235759e70cebd90f42aa0513bd9bc344230b0f79e08b SHA512 dfced463ece13f266c15e1b45d8e7882e58ce9cd3b7146c81a4671bc51c58998ae318bd6e45b1f7bc657e2d49d7d39f971d814998e074375129c8dff7cfcac63 WHIRLPOOL c74b1b6d303bbdb3c66c432838e12528f06c124475c3258ccbc6472143e4a9cf56bda4293d7556564eb878d0f701f0853f46f3be7a37b9a2eb035bc08815e6d4
 DIST wordpress-4.5.3.tar.gz 7773389 SHA256 fd94288cd6fc657b2d8061737fcb121fc6acbe18acfcff80661e49fd2d3ee17c SHA512 e6add76d61cc8f43947c6626d48ff8dcda38738138b576c0b7974c2d01a601fd9a99d6fb7cfc50a0ea50ac3165624fda46656f8bed0fd2540006b9fa069d64ae WHIRLPOOL e00939f2759ee7ce4280b0ca2a205dbc43b71ebf90afd0b047004c47580a497284e3047f53fecb7f20fbcda680b8828f17e119154ba7fe21fe103b45512c1c2a
 DIST wordpress-4.6.1.tar.gz 7961036 SHA256 873f562cdea14d6305b9ad2f41f18a557d99cd8694b4a0056a33970e127abfee SHA512 303c8fe8ec877baf7380677dc22505062613dfc33c03f8858f7c6b9ce7a5825ba00a13395730fa554da9d2b3ccab8c3441e40fbc29fee45f7da44f46aa400981 WHIRLPOOL 7c00560e064c475bf35aa8bd39c24bca59e11111e83176b2b4780e6c45374c28aca47ee3e5fd70f9bab6d5aac113599eb84bd5d9c180b6adaf6d19c15e2226c0
+DIST wordpress-4.7.1.tar.gz 7998661 SHA256 171252eed21e31becb5d52fa3d3ef7ba2b41f0fedd1a412afc5ad937da5317f6 SHA512 ccb2d36e0192ceeb02e4391a3bd6fb100558c3013c1e10a91465c9b7d83e294a51c35ee60637f01838131e2a3c99266320fe0e90d51979c566a53fffed19dc4c WHIRLPOOL d3ddde15f0a114f7566c345ddab76b8166ea52b3cdafe0815e962e171c801207f549a5e224da08b0077c637a85d841cb4abef386b1c7a2cdf23263a2a91ffb35
 DIST wordpress-4.7.tar.gz 7993186 SHA256 7eae27ff70716dae2d2ba58280f2832fd70a208c9cdaf29ab36ac789c14d6977 SHA512 5bbdce5215dc5debc57e00376a94c9035f63d64d20aeb947e973a4dbe1803d262aa85ce27118ddbb3fadaf956ec90974bc76654149102a88c4b1e867740db4ca WHIRLPOOL f536e908e30050fd0ec86ee98c4ba333ea1539de901083e28a36a723c91b64ffcf53d1375d3005bbfc52736668c2bd7178d7a7797760ad4807271564573d9248
--- a/www-apps/wordpress/wordpress-4.7.1.ebuild
+++ b/www-apps/wordpress/wordpress-4.7.1.ebuild
@ -0,0 +1,56 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit webapp
+
+DESCRIPTION="Wordpress PHP and MySQL based content management system (CMS)"
+HOMEPAGE="https://wordpress.org/"
+SRC_URI="https://wordpress.org/${P/_rc/-RC}.tar.gz"
+
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="virtual/httpd-php
+	|| ( dev-lang/php[mysql] dev-lang/php[mysqli] )"
+
+S=${WORKDIR}/${PN}
+
+need_httpd_cgi
+
+IUSE="+akismet examples +themes vhosts"
+
+src_install() {
+	webapp_src_preinst
+
+	dodoc readme.html
+	rm readme.html license.txt || die
+
+	if ! use akismet ; then
+		rm -R wp-content/plugins/akismet/ || die
+	fi
+	if ! use examples ; then
+		rm wp-content/plugins/hello.php || die
+	fi
+	if ! use themes ; then
+		rm -R wp-content/themes/*/ || die
+	fi
+
+	[[ -f wp-config.php ]] || cp wp-config-sample.php wp-config.php
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	webapp_serverowned "${MY_HTDOCSDIR}"/index.php
+	webapp_serverowned "${MY_HTDOCSDIR}"/wp-admin/menu.php
+	webapp_serverowned "${MY_HTDOCSDIR}"
+
+	webapp_configfile  "${MY_HTDOCSDIR}"/wp-config.php
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+	webapp_postupgrade_txt en "${FILESDIR}"/postupgrade-en.txt
+
+	webapp_src_install
+}
--- a/www-client/google-chrome-beta/Manifest
+++ b/www-client/google-chrome-beta/Manifest
@ -1 +1 @@
-DIST google-chrome-beta_56.0.2924.51-1_amd64.deb 48743688 SHA256 4cefc0a74ff44e74f5f38e16a875aa4732fbe9315043e32e8f7f94855f455852 SHA512 6f74281f7d0bc3f3d1deb40c505ffef4c44235e8789ffa2d1f0077f90e85525d54d3116819ff85ea6db38470eb407f6c2596e850d5c9553c708cc6f170bcb5b2 WHIRLPOOL ae63d6d208a76e1f7241df43da367bf01a2a45189ac4ec7aeba0580c8295e9bfcc70381231c1767395f7f7900f57c9f2dccbc6daf4996bb719b1b2855e51e6ef
+DIST google-chrome-beta_56.0.2924.59-1_amd64.deb 48760940 SHA256 307a27c5a25eff77419bda342d59dc73631cee151e7d36f9b39929ad01c85244 SHA512 27d5bc7efe10b5f2793e9adfd8080ee5830196e2e210d8b227f1d5cd94fe35e3bd49791dec005a20b2ce66fad6256f3014581d677b85cfe0d0d11b1f3855a5b9 WHIRLPOOL 058eb21a7b3fe57997dbc68bd159897b85b8484edc54b947c77a996dca8759989c7aa54e56620c1e3c25822661e9f2360c73086bc4800c28b9f6d484041e70b8
--- a/www-client/google-chrome-beta/google-chrome-beta-56.0.2924.59.ebuild
+++ b/www-client/google-chrome-beta/google-chrome-beta-56.0.2924.59.ebuild
--- a/www-plugins/chrome-binary-plugins/Manifest
+++ b/www-plugins/chrome-binary-plugins/Manifest
@ -1,3 +1,3 @@
-DIST google-chrome-beta_56.0.2924.51-1_amd64.deb 48743688 SHA256 4cefc0a74ff44e74f5f38e16a875aa4732fbe9315043e32e8f7f94855f455852 SHA512 6f74281f7d0bc3f3d1deb40c505ffef4c44235e8789ffa2d1f0077f90e85525d54d3116819ff85ea6db38470eb407f6c2596e850d5c9553c708cc6f170bcb5b2 WHIRLPOOL ae63d6d208a76e1f7241df43da367bf01a2a45189ac4ec7aeba0580c8295e9bfcc70381231c1767395f7f7900f57c9f2dccbc6daf4996bb719b1b2855e51e6ef
+DIST google-chrome-beta_56.0.2924.59-1_amd64.deb 48760940 SHA256 307a27c5a25eff77419bda342d59dc73631cee151e7d36f9b39929ad01c85244 SHA512 27d5bc7efe10b5f2793e9adfd8080ee5830196e2e210d8b227f1d5cd94fe35e3bd49791dec005a20b2ce66fad6256f3014581d677b85cfe0d0d11b1f3855a5b9 WHIRLPOOL 058eb21a7b3fe57997dbc68bd159897b85b8484edc54b947c77a996dca8759989c7aa54e56620c1e3c25822661e9f2360c73086bc4800c28b9f6d484041e70b8
 DIST google-chrome-stable_55.0.2883.87-1_amd64.deb 46241756 SHA256 15e44458e0ff667fa0f97f6970df200daf41a671477f8a08cd18b5dbb64b77b3 SHA512 767a4651892dd86512e57235888281b8a0df14f843ffe9ac6144a5324896a8310fff99292b7ae72e737c91ca12178c61a8579106d17025bd288cf0cc43ca5d9c WHIRLPOOL fb68559e9189fbfa3bc564741be418fa22f1cf19ddd4d8448b03f29e35b5f4ea46a2d7241227b1150392e158fedf3980024e966bd37cc5e1201440019806c378
 DIST google-chrome-unstable_57.0.2970.0-1_amd64.deb 49540416 SHA256 18fbc4e20d4f71ffa0617b157bd18a0c10b4e925b47d36e11e1df443c864295f SHA512 81756d916ed905fa8cb6f289c4337322cf6534aebf2a6fe262cdfcfb7f5f8c343e3db5ba52c15ffa12876f057c553dddb6d4431a2f5f05e929ef34b7326fa527 WHIRLPOOL 78d5e818711696832dd868531ba751fb7004b44027ab77e0007e2db715a4c7f652928b1f0cd4359485898d66e7a8313c16afd08d68ec05211a41dadcc4c669c3
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-56.0.2924.59_beta.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-56.0.2924.59_beta.ebuild
				`@ -0,0 +1 @@`
				`DIST s6-dns-2.1.0.0.tar.gz 77415 SHA256 8455f3b1edad8f01a1340cb1242c141755729bfd5d71059739eced5c006539ad SHA512 c75722b3ddd9d1646116654983558efde22d0d5d3ff1c296a8d5e2ba44abe0d5a86fc86804cf90bea2ee8c3e82028e182d28cdbf5155d46c6b3d8f4d1c3387fc WHIRLPOOL 7c1eb845d6101c53fd65579bd46ad83c0085ee734d2623b616a34db0721bbca913820f21c6979bdc1c87582d8a92c547f7f9a5b640c4f31badbc3bd0098f75fd`
				`@ -0,0 +1 @@`
				`DIST s6-networking-2.2.1.0.tar.gz 85242 SHA256 5d8150d7413b335693c6e63092381dd0866b1b6f95662a2cbae5ec17ca449ab0 SHA512 33085e2a855079ab046b6f851b4dc15801012dc1a353a1254508c6c9da9e45da4f7e2b62e16ab1d0a41d42b424bebe7b362860f68f3be0f9eba37b7a15817633 WHIRLPOOL e76817f4803dfff8e85efbc3f70c050ca88fd5046863abc2832d3e8d7765840e5e91e443f7ce96b66bde0d6697e4764b1b820d04eaf981e958eabc5b30107442`