diff --git a/app-emulation/lxc/Manifest b/app-emulation/lxc/Manifest
index 7cfcc2775678..3d0547235073 100644
--- a/app-emulation/lxc/Manifest
+++ b/app-emulation/lxc/Manifest
@@ -9,7 +9,8 @@ AUX lxc-2.0.5-omit-sysconfig.patch 259 SHA256 2dc717dfa8afd2823a38aeb4de72d1594b
 AUX lxc-2.0.6-bash-completion.patch 919 SHA256 44c354c90d85371654d77337c8daeca34c0b22a76a424d67b76e38daa960a1fd SHA512 caa90c8bad2a79b4e42b781f00d6f2a7be37fc5c5301592b026c88db2652c90871be940c86a9156f03bc186f76cf2068a2d3084e9abc7a5896ea081885085d41 WHIRLPOOL caf8b079f994db0a3139b6bc77b50f3510ec7fee91ba902d9f4f562a06e40110eea01c02c4427a85daae480dcce1e4cc352e6e00cf4b200cad3dd758fd573133
 AUX lxc-2.0.6-major.patch 1834 SHA256 c0095581ab6f92e6cdbfc8298af08f1fbcbff98cf6d107b925489fd7253e418d SHA512 274e2d138e32645aca2ab954e24db02c4d7c5750a781ebf3d81c69c7eeade06b33a3c8ac36a16548a58f6d7f518977fb2df09e22de96d966de542f470720b398 WHIRLPOOL 386ac9236f5b6ff7ed721f1d0aeace99598a62f42c06423b268f1b75bc96aa446a7dcedf41c3fe131ec21dbdf670b3308d957ae508ca125623656eb06fdd2638
 AUX lxc.initd.3 3280 SHA256 90cd9feec284303010507c9b2e32f1ff8d37bb787f667153ef9a284d09dbba1e SHA512 ab675935ac7d928ad0e4155d8a9085d3b91e804994a1ebd787434f8054beb86c2328fd0a1536f292e6d76e9eff46b20a79357b8fcda58668bd63b90eaf24a547 WHIRLPOOL 822ffcf3fb8552eb8599e4fe1147b2b6007fcda44a3968916048ba8565311895cf4f08b1a0a9a269068d9927b3ab4303efb34b627ef352aceeacc3ad1f15926b
-AUX lxc.initd.5 3289 SHA256 a123a414f2465e95c66f5ecb5e40a37085d7356cc9e3ffdefddf75432a3bac93 SHA512 c1dc92c3265147e6e0bb9b7f4bfbcf1519c7493fb12f4227026c283629088da52b1a3b96a3eb04e1e0f745b2270d38b701e1a1ae7deb7d641777192308c8bff3 WHIRLPOOL 0ed6e1bbd3a1040e763a55e2f5f5bfac57222582a26762f180af731ae179df834881f0645ecf8bc2d0de96e2d12592daba90f1fbe378bded20f51e8104a732bf
+AUX lxc.initd.5 3289 SHA256 d4ec1c35f60578dcd5477bb9a3533dfd7b23ab5dfb2bea49a672a291cce5f340 SHA512 08814f0d902e6f5d29aaca729e7ad25ac69759fe874db639ee8f8872bbc146bb4831c8801de7fded40973f2e1c02ad9fa13dc4fecbea361e4da670670ef6875e WHIRLPOOL a7b542599af7311eab6e7b10e656b501856057345a414cc61bfe7975ae1408313f520ae7e31472088f2648cadb2de907608532348287a40bb0cf0af414f19d14
+AUX lxc.initd.6 3287 SHA256 0ee04f8c777dc56618bec5c6e7bd5abb474ba2b7a7fbe2865bd14dc198e6d402 SHA512 d8939fffd2c0dff27521072e915112f4e3e7ee24d20c1619fba03901ece945f69648dce0ea246f7682ec7079d7f4919d23691b5bb168358a98c22900bf023382 WHIRLPOOL b82c31c39744a15ed9e88b16d728b9229a99567cd86bd8aa3bf95c9b959cf2faa93e59420838da40f34ac59f124cc8303a57037d8460ff414fefb7ac0cfc2a19
 AUX lxc_at.service 232 SHA256 0aaf2f362b3ac6aa2b427d47ac4436d46387624b0d8bc4850c5d5b6a7d228711 SHA512 4c3bab4f2cc9aea8b0753dcaf2fd7ed5f1cd7d97d286d6204b2fc17505b6edaac2f536bbda5c1466856311d0e93d75de91dec51e9b0f665d67afedbf40c19170 WHIRLPOOL f6928b4b85e63c38295cabc651b7bd61d2b0bc69ff1850de7cfa8a4f40e4894d94264c262fec7d345488cace49c4283f932739313b975f6862c1aa0ef51e0652
 AUX lxc_at.service.4 265 SHA256 194ce2917e99a5050dd793bc31c7d4393f61a9244aaa2f59109eaf8bebfe44fd SHA512 d61e7103e90e6ffb3202533e7d7555d8c02b943f06ec6c0d673713c1c0ede58641312c65d6dd6a15907c1171522e6148c2313d7b11acbd85d59fe65758cd52b3 WHIRLPOOL 55892d9cc5ff8cd8ca95ccae65abbb9735904cf1aba6ea33008349bbe4ea2ac01f83307998e90265b7dd2127761c05199be4f7133f21af1490bda40bf18a2873
 DIST lxc-1.0.7.tar.gz 564985 SHA256 a0b1b09592e076e270dcb3ba004616d9ac3147f9de0b78ca39a30f8956b0a8f2 SHA512 e6ff42a7b41177e1be0d2cd47d4c554565c7fc35355f3aa8aeba00d4adc7a0f364ecd060ddb6c97b2fe5968329c4e4c4b3cb022bffd2da145f30880f077264a8 WHIRLPOOL f07e5e9efb8ff394aa9cdd6c3e725b453c8137ec221399cbf910d57dbc9268fc84e7227273567792821415dc14e774942b76a58a1a478de57d5c82e545702000
@@ -18,12 +19,14 @@ DIST lxc-2.0.3.tar.gz 772448 SHA256 635afa330088fea57883018da326fc72f85460b5a6c7
 DIST lxc-2.0.4.tar.gz 775634 SHA256 57d40234aeecf5b60fb29d563e5a09d6a04c89e1267eb22a6704388ac8573e7b SHA512 3f985bba5aaa8a70f0329316ea4f42ab135d58c47611154c62e103718212a4b2c5e4f25fd45c372424db1fbf40afdc8269ae98655fb3bc8e31085a5d948f702b WHIRLPOOL b001c75d67d676e75b203d789cf2c0643ba9a47aa31965441340b66f28e18371415b9d44ce752e35102bc8677688eec6e586d800a33a2a965c8a046c091ebc06
 DIST lxc-2.0.5.tar.gz 778842 SHA256 1f1c491b2ad5e74a85b8eb791ccac8128e6eaf5ddcc1323e9360997c030f7072 SHA512 8e14036597fa3407c87fb92d13b40bbca9a646d27d817e0a9d20fe626625d6cf04a1df65b1a723391d41a311b9f4f3432b3213004892d64355fe0edc7858cb9f WHIRLPOOL fa6ac86d67fe563f92411cbd09a0d66d729a0a15fe48076b42f4b3996e6b786826990bd51382c14606fd1b5240d413bc8d217fac37becd9baccd89de15d30b22
 DIST lxc-2.0.6.tar.gz 788483 SHA256 8723ef5973a47e7b2c439002c28590d74689e871d36f03089965503c0c0d50b2 SHA512 f44c0498876462d78e57d19816eab666e90470badc2bbd38fed9f504e8b21c3e68e4d0f63a8676fa8716be60481befb3db44098228fd71b480972af2b5dcf1e3 WHIRLPOOL 5bb2648637a46e3547edeba2ad46eb131b2ae194f5efe52a688157cfa3f361f51a832554a94bcd47074e65cbf8d1e1119d23548bdf83ca62c131400c40aff34a
+DIST lxc-2.0.7.tar.gz 792557 SHA256 e74ee4a61a8ff426051ce86664f85b028052dd5664cc8e4cf710205c75ded356 SHA512 eb48dc800ce43d2f4d46e0cecc4d0a714b3e22c6a4975776b54d17d1d20d5a1411e6b605215282f1f77286ddf22b61c80b86b83752191fc18023894ef7a1c44d WHIRLPOOL 81da3116450a7c41c7aa4de95e0094a56e6dee29ef2a111bfe87a61d9b7b97846f77984ec4b9b45aaf776a2c8103b5957c129f6d05b9ebf46455450129653502
 EBUILD lxc-1.0.7.ebuild 5939 SHA256 6dc84af5d9149a39e0a08b028cb7058edb21c02070cc4acebda43d1fb7fc220b SHA512 07cd73ba16163b9e37f6a4d9dc71d109d31adebb0ede0fd9677e363a82b894f162a371f9c23698449b18492d6b8342a6a4f170ec9535122521de589ae8e1babc WHIRLPOOL 1d0c66a7abf81a517038b9548889cfe90d553d899284acb87956a404589ab6d0cd0d142dcf93dc14ecdb4c3b915164a132b9c054d731ff698e2610e8d9763d51
 EBUILD lxc-1.0.8.ebuild 5939 SHA256 932ae6caef5cff6abd2a87783f6313661da3915c029e3bf6ed20848cd702f398 SHA512 94f1c0ab4aa7ae12d588b7a889e22e19316357f1d573f02cfbb99c66ac63e137d3fea66f30a4177815027ad6d8fbb9389218cedce4dc0cbba1e80a4e604f7bce WHIRLPOOL 44c393e22ee2b4be2d444d94371d0103ee08653c1b842d7cc40c10178fbd630953edc3de6d6f81c6165c799374451aa60e8eb3fe736a57ce5f609c61708f6726
 EBUILD lxc-2.0.3-r1.ebuild 6253 SHA256 bc0069a4e9ffd5a5599b67e79b0fdcff72596e35f54756d0722353214813dd68 SHA512 640ab432abf880bf9661ef7b33024bc6d83168c79fb95aaa35124f219d0f5cfc5ecc8ec8ac2de28adbebc5cd2d2e7250f5f209b743f1306e8af807f970e6bc0d WHIRLPOOL 6b51f24f96442223f0c2eeeb9738ea412fcde848f352b17e88959efa8aa865dafc26a525bb5e4d69fcf30ad3625653b9e3dd2bcf067304a6d37ec396e2c2a056
 EBUILD lxc-2.0.4.ebuild 6316 SHA256 dd0fa51902b482c5b175351c2b1cbc65b503fe4f50e1b2ea5e42816ee4318124 SHA512 4d2f886867553672930945d15c1febe6327f15d68dc4db9f36227fbf44f3aaf9cd492f9eb0eeab5c99d08b8dbb192e7510559f1006217dbd37e3cea0f73ddfe2 WHIRLPOOL 50205fc872bc5bc15f6baf90b21a84419ab5b4316ff29e5cb74d92874ebec3a670ddf47cdf8629a7d9ba8aca52a45277a9a6484875e10c88a8631708fa888008
 EBUILD lxc-2.0.5.ebuild 6316 SHA256 dd0fa51902b482c5b175351c2b1cbc65b503fe4f50e1b2ea5e42816ee4318124 SHA512 4d2f886867553672930945d15c1febe6327f15d68dc4db9f36227fbf44f3aaf9cd492f9eb0eeab5c99d08b8dbb192e7510559f1006217dbd37e3cea0f73ddfe2 WHIRLPOOL 50205fc872bc5bc15f6baf90b21a84419ab5b4316ff29e5cb74d92874ebec3a670ddf47cdf8629a7d9ba8aca52a45277a9a6484875e10c88a8631708fa888008
 EBUILD lxc-2.0.6-r1.ebuild 6369 SHA256 3faa42234c1a15079f83b2d1db593f59c60a301608be037915f946b91a126e79 SHA512 68d865c3c85bf2214c3a156069dbecf73ed5f7bbf5e70eaa2654f78a616033bc0b33c2b5883990442467ba828ef2e3e1c3220c14c613c765417e5f03ec445f11 WHIRLPOOL 08949feae656c7856465308521577548a416be6958932e651e125b8845a17d796558459e9cd53560ccae20108cf93cb0049479f0760ed155ed8c8239d59fed1e
+EBUILD lxc-2.0.7.ebuild 6330 SHA256 0e77bdadf4156ae5ed5185b7973a7d7a6dc58ea6048e10c1efe1654c4a5913ce SHA512 bf86fef75787e5d3d13a9b02db98b96267801899f525c8292657a8378bc2860cd3e716bc91ff728d1cfbded00d86b4241b318956507818ef20c392b913b2578c WHIRLPOOL 00e0ffce6e5fb9c5bfbcecf0abcc960cc98fe1d192eb1f77cb7b932a24ab431c21963c1f6bc6108e87b9c99fb7191f54940c9f7f514939d7143d9b7c6b7340a4
 MISC ChangeLog 8797 SHA256 5711cccd5a871d9fa0df3728422d0bf02db636520f586ad9a332227a429e7b21 SHA512 08ea3917b8b910af4ccbd4986a4147302138bb23a3eee8a0d130ddfbe9ecd3c4044daba508ab4b53542e46ce33dca88328fc7a4652517a258286a2d286dee8ad WHIRLPOOL 5b85b0e1447cea8d93d8c38196624798b7f760803634c546a6e343bcc4804ff6da4cb2152cd584a37487806b2ddb0d9d790229ae2ff1b8754acd48d3ce645290
 MISC ChangeLog-2015 16297 SHA256 14a9b5072facfe49b0c62131adff2be1185bacb7a44a0511fe447e22ac7aeb32 SHA512 d71746fdc367f4e5833ccde0cf1bcc047db4cb0582a00fac51f5b97c3fc1a160e3add6409185f9197faaa58b94f82f8532e7291344e8cc66a6ff49d48aa719c5 WHIRLPOOL fb28525b3c00a96e7f34beb01b28a486e5071041275f332ab0971ec6ae78159ad3361e3280c9d76b66d0ab6ea2aada06eb1d3530f5fb5ade8f80b073a4ce2416
-MISC metadata.xml 731 SHA256 2c6e2462426e79dc3f998ad18998f92c025189249539c5da8640fc52c1357a5f SHA512 846d23bb109f447ee5d81f005441dc714d229c99798de636a5eb3cdb871eebda00386a7e72cabaa46d43f1f5a9b3225e8a3b4c652261ba46903feb129a377af2 WHIRLPOOL 23147231e24de2fa862f0c0d2c1a782e4af02919dd554dfc08bc379408a720c79305dd6903d02840c370c2fa9f545523d93dabaf874fdaf5d9eb0e6e66f27034
+MISC metadata.xml 811 SHA256 5bd0e8948d73e86844f03feaf3cf8276c0fc101355b29b86db03c2674ce06340 SHA512 fea5f647ca7eb616307378375af86051034e03170f6ce62e2219f78343797072902102515f93cc0f809558fbfbca88eb81e9f8d0fa621ae18381d39a12c31aa2 WHIRLPOOL 732d83aba86a12ed0ba0d3691cef7d56dd83382b7cdfed73935d65c47667323befb5ebb8e9e3f8bbec0f7dc8730125aad28fb7e000deeacd701b5f8a0ccef25d
diff --git a/app-emulation/lxc/files/lxc.initd.5 b/app-emulation/lxc/files/lxc.initd.5
index e5a52360a126..5ca5c9229504 100644
--- a/app-emulation/lxc/files/lxc.initd.5
+++ b/app-emulation/lxc/files/lxc.initd.5
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
diff --git a/app-emulation/lxc/files/lxc.initd.6 b/app-emulation/lxc/files/lxc.initd.6
new file mode 100644
index 000000000000..c3d70eae3b93
--- /dev/null
+++ b/app-emulation/lxc/files/lxc.initd.6
@@ -0,0 +1,119 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+CONTAINER=${SVCNAME#*.}
+
+LXC_PATH=`lxc-config lxc.lxcpath`
+
+lxc_get_configfile() {
+	if [ -f "${LXC_PATH}/${CONTAINER}.conf" ]; then
+		echo "${LXC_PATH}/${CONTAINER}.conf"
+	elif [ -f "${LXC_PATH}/${CONTAINER}/config" ]; then
+		echo "${LXC_PATH}/${CONTAINER}/config"
+	else
+		eerror "Unable to find a suitable configuration file."
+		eerror "If you set up the container in a non-standard"
+		eerror "location, please set the CONFIGFILE variable."
+		return 1
+	fi
+}
+
+[ $CONTAINER != $SVCNAME ] && CONFIGFILE=${CONFIGFILE:-$(lxc_get_configfile)}
+
+lxc_get_var() {
+	awk 'BEGIN { FS="[ \t]*=[ \t]*" } $1 == "'$1'" { print $2; exit }' ${CONFIGFILE}
+}
+
+lxc_get_net_link_type() {
+	awk 'BEGIN { FS="[ \t]*=[ \t]*"; _link=""; _type="" }
+		$1 == "lxc.network.type" {_type=$2;}
+		$1 == "lxc.network.link" {_link=$2;}
+		{if(_link != "" && _type != ""){
+			printf("%s:%s\n", _link, _type );
+			_link=""; _type="";
+		}; }' <${CONFIGFILE}
+}
+
+checkconfig() {
+	if [ ${CONTAINER} = ${SVCNAME} ]; then
+		eerror "You have to create an init script for each container:"
+		eerror " ln -s lxc /etc/init.d/lxc.container"
+		return 1
+	fi
+
+	# no need to output anything, the function takes care of that.
+	[ -z "${CONFIGFILE}" ] && return 1
+
+	utsname=$(lxc_get_var lxc.utsname)
+	if [ ${CONTAINER} != ${utsname} ]; then
+	    eerror "You should use the same name for the service and the"
+	    eerror "container. Right now the container is called ${utsname}"
+	    return 1
+	fi
+}
+
+depend() {
+	# be quiet, since we have to run depend() also for the
+	# non-muxed init script, unfortunately.
+	checkconfig 2>/dev/null || return 0
+
+	config ${CONFIGFILE}
+	need localmount
+	use lxcfs
+
+	local _x _if
+	for _x in $(lxc_get_net_link_type); do
+		_if=${_x%:*}
+		case "${_x##*:}" in
+			# when the network type is set to phys, we can make use of a
+			# network service (for instance to set it up before we disable
+			# the net_admin capability), but we might also not set it up
+			# at all on the host and leave the net_admin capable service
+			# to take care of it.
+			phys)	use net.${_if} ;;
+			*)	need net.${_if} ;;
+		esac
+	done
+}
+
+start() {
+	checkconfig || return 1
+	rm -f /var/log/lxc/${CONTAINER}.log
+
+	rootpath=$(lxc_get_var lxc.rootfs)
+
+	# Check the format of our init and the chroot's init, to see
+	# if we have to use linux32 or linux64; always use setarch
+	# when required, as that makes it easier to deal with
+	# x32-based containers.
+	case $(scanelf -BF '%a#f' ${rootpath}/sbin/init) in
+		EM_X86_64)	setarch=linux64;;
+		EM_386)		setarch=linux32;;
+	esac
+
+	ebegin "Starting ${CONTAINER}"
+	env -i ${setarch} $(which lxc-start) -l WARN -n ${CONTAINER} -f ${CONFIGFILE} -d -o /var/log/lxc/${CONTAINER}.log
+	sleep 1
+
+	# lxc-start -d will _always_ report a correct startup, even if it
+	# failed, so rather than trust that, check that the cgroup exists.
+	[ -d /sys/fs/cgroup/cpuset/lxc/${CONTAINER} ]
+	eend $?
+}
+
+stop() {
+	checkconfig || return 1
+
+
+	if ! [ -d /sys/fs/cgroup/cpuset/lxc/${CONTAINER} ]; then
+	    ewarn "${CONTAINER} doesn't seem to be started."
+	    return 0
+	fi
+
+	# 10s should be enough to shut everything down
+	ebegin "Stopping ${CONTAINER}"
+	lxc-stop -t 10 -n ${CONTAINER}
+	eend $?
+}
diff --git a/app-emulation/lxc/lxc-2.0.7.ebuild b/app-emulation/lxc/lxc-2.0.7.ebuild
new file mode 100644
index 000000000000..26950e7b31b5
--- /dev/null
+++ b/app-emulation/lxc/lxc-2.0.7.ebuild
@@ -0,0 +1,201 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+
+MY_P="${P/_/-}"
+PYTHON_COMPAT=( python{3_4,3_5} )
+DISTUTILS_OPTIONAL=1
+
+inherit autotools bash-completion-r1 distutils-r1 linux-info versionator flag-o-matic systemd
+
+DESCRIPTION="LinuX Containers userspace utilities"
+HOMEPAGE="https://linuxcontainers.org/"
+SRC_URI="https://github.com/lxc/lxc/archive/${MY_P}.tar.gz"
+
+KEYWORDS="~amd64 ~arm ~arm64"
+
+LICENSE="LGPL-3"
+SLOT="0"
+IUSE="cgmanager doc examples lua python seccomp"
+
+RDEPEND="net-libs/gnutls
+	sys-libs/libcap
+	cgmanager? ( app-admin/cgmanager )
+	lua? ( >=dev-lang/lua-5.1:= )
+	python? ( ${PYTHON_DEPS} )
+	seccomp? ( sys-libs/libseccomp )"
+
+DEPEND="${RDEPEND}
+	doc? ( app-text/docbook-sgml-utils )
+	>=sys-kernel/linux-headers-3.2"
+
+RDEPEND="${RDEPEND}
+	sys-process/criu
+	sys-apps/util-linux
+	app-misc/pax-utils
+	virtual/awk"
+
+CONFIG_CHECK="~CGROUPS ~CGROUP_DEVICE
+	~CPUSETS ~CGROUP_CPUACCT
+	~CGROUP_SCHED
+
+	~NAMESPACES
+	~IPC_NS ~USER_NS ~PID_NS
+
+	~NETLINK_DIAG ~PACKET_DIAG
+	~INET_UDP_DIAG ~INET_TCP_DIAG
+	~UNIX_DIAG ~CHECKPOINT_RESTORE
+
+	~CGROUP_FREEZER
+	~UTS_NS ~NET_NS
+	~VETH ~MACVLAN
+
+	~POSIX_MQUEUE
+	~!NETPRIO_CGROUP
+
+	~!GRKERNSEC_CHROOT_MOUNT
+	~!GRKERNSEC_CHROOT_DOUBLE
+	~!GRKERNSEC_CHROOT_PIVOT
+	~!GRKERNSEC_CHROOT_CHMOD
+	~!GRKERNSEC_CHROOT_CAPS
+	~!GRKERNSEC_PROC
+	~!GRKERNSEC_SYSFS_RESTRICT
+"
+
+ERROR_DEVPTS_MULTIPLE_INSTANCES="CONFIG_DEVPTS_MULTIPLE_INSTANCES:  needed for pts inside container"
+
+ERROR_CGROUP_FREEZER="CONFIG_CGROUP_FREEZER:  needed to freeze containers"
+
+ERROR_UTS_NS="CONFIG_UTS_NS:  needed to unshare hostnames and uname info"
+ERROR_NET_NS="CONFIG_NET_NS:  needed for unshared network"
+
+ERROR_VETH="CONFIG_VETH:  needed for internal (host-to-container) networking"
+ERROR_MACVLAN="CONFIG_MACVLAN:  needed for internal (inter-container) networking"
+
+ERROR_NETLINK_DIAG="CONFIG_NETLINK_DIAG:  needed for lxc-checkpoint"
+ERROR_PACKET_DIAG="CONFIG_PACKET_DIAG:  needed for lxc-checkpoint"
+ERROR_INET_UDP_DIAG="CONFIG_INET_UDP_DIAG:  needed for lxc-checkpoint"
+ERROR_INET_TCP_DIAG="CONFIG_INET_TCP_DIAG:  needed for lxc-checkpoint"
+ERROR_UNIX_DIAG="CONFIG_UNIX_DIAG:  needed for lxc-checkpoint"
+ERROR_CHECKPOINT_RESTORE="CONFIG_CHECKPOINT_RESTORE:  needed for lxc-checkpoint"
+
+ERROR_POSIX_MQUEUE="CONFIG_POSIX_MQUEUE:  needed for lxc-execute command"
+
+ERROR_NETPRIO_CGROUP="CONFIG_NETPRIO_CGROUP:  as of kernel 3.3 and lxc 0.8.0_rc1 this causes LXCs to fail booting."
+
+ERROR_GRKERNSEC_CHROOT_MOUNT="CONFIG_GRKERNSEC_CHROOT_MOUNT:  some GRSEC features make LXC unusable see postinst notes"
+ERROR_GRKERNSEC_CHROOT_DOUBLE="CONFIG_GRKERNSEC_CHROOT_DOUBLE:  some GRSEC features make LXC unusable see postinst notes"
+ERROR_GRKERNSEC_CHROOT_PIVOT="CONFIG_GRKERNSEC_CHROOT_PIVOT:  some GRSEC features make LXC unusable see postinst notes"
+ERROR_GRKERNSEC_CHROOT_CHMOD="CONFIG_GRKERNSEC_CHROOT_CHMOD:  some GRSEC features make LXC unusable see postinst notes"
+ERROR_GRKERNSEC_CHROOT_CAPS="CONFIG_GRKERNSEC_CHROOT_CAPS:  some GRSEC features make LXC unusable see postinst notes"
+ERROR_GRKERNSEC_PROC="CONFIG_GRKERNSEC_PROC:  this GRSEC feature is incompatible with unprivileged containers"
+ERROR_GRKERNSEC_SYSFS_RESTRICT="CONFIG_GRKERNSEC_SYSFS_RESTRICT:  this GRSEC feature is incompatible with unprivileged containers"
+
+DOCS=(AUTHORS CONTRIBUTING MAINTAINERS NEWS README doc/FAQ.txt)
+
+S="${WORKDIR}/${PN}-${MY_P}"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+pkg_setup() {
+	kernel_is -lt 4 7 && CONFIG_CHECK="${CONFIG_CHECK} ~DEVPTS_MULTIPLE_INSTANCES"
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	eapply "${FILESDIR}"/${PN}-2.0.6-bash-completion.patch
+	#558854
+	eapply "${FILESDIR}"/${PN}-2.0.5-omit-sysconfig.patch
+	eapply_user
+	eautoreconf
+}
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+
+	if use python; then
+		#541932
+		python_setup "python3*"
+		export PKG_CONFIG_PATH="${T}/${EPYTHON}/pkgconfig:${PKG_CONFIG_PATH}"
+	fi
+
+	# I am not sure about the --with-rootfs-path
+	# /var/lib/lxc is probably more appropriate than
+	# /usr/lib/lxc.
+	econf \
+		--localstatedir=/var \
+		--bindir=/usr/bin \
+		--sbindir=/usr/bin \
+		--with-config-path=/var/lib/lxc	\
+		--with-rootfs-path=/var/lib/lxc/rootfs \
+		--with-distro=gentoo \
+		--with-runtime-path=/run \
+		--disable-apparmor \
+		$(use_enable cgmanager) \
+		$(use_enable doc) \
+		$(use_enable examples) \
+		$(use_enable lua) \
+		$(use_enable python) \
+		$(use_enable seccomp)
+}
+
+python_compile() {
+	distutils-r1_python_compile build_ext -I ../ -L ../${PN}
+}
+
+src_compile() {
+	default
+
+	if use python; then
+		pushd "${S}/src/python-${PN}" > /dev/null
+		distutils-r1_src_compile
+		popd > /dev/null
+	fi
+}
+
+src_install() {
+	default
+
+	mv "${ED}"/usr/share/bash-completion/completions/${PN} "${ED}"/$(get_bashcompdir)/${PN}-start || die
+	# start-ephemeral is no longer a command but removing it here
+	# generates QA warnings (still in upstream completion script)
+	bashcomp_alias ${PN}-start \
+		${PN}-{attach,cgroup,copy,console,create,destroy,device,execute,freeze,info,monitor,snapshot,start-ephemeral,stop,unfreeze,wait}
+
+	if use python; then
+		pushd "${S}/src/python-lxc" > /dev/null
+		# Unset DOCS. This has been handled by the default target
+		unset DOCS
+		distutils-r1_src_install
+		popd > /dev/null
+	fi
+
+	keepdir /etc/lxc /var/lib/lxc/rootfs /var/log/lxc
+
+	find "${D}" -name '*.la' -delete
+
+	# Gentoo-specific additions!
+	newinitd "${FILESDIR}/${PN}.initd.5" ${PN}
+
+	# Remember to compare our systemd unit file with the upstream one
+	# config/init/systemd/lxc.service.in
+	systemd_newunit "${FILESDIR}"/${PN}_at.service.4 "lxc@.service"
+}
+
+pkg_postinst() {
+	elog ""
+	elog "Starting from version ${PN}-1.1.0-r3, the default lxc path has been"
+	elog "moved from /etc/lxc to /var/lib/lxc. If you still want to use /etc/lxc"
+	elog "please add the following to your /etc/lxc/default.conf"
+	elog "lxc.lxcpath = /etc/lxc"
+	elog ""
+	elog "There is an init script provided with the package now; no documentation"
+	elog "is currently available though, so please check out /etc/init.d/lxc ."
+	elog "You _should_ only need to symlink it to /etc/init.d/lxc.configname"
+	elog "to start the container defined into /etc/lxc/configname.conf ."
+	elog "For further information about LXC development see"
+	elog "http://blog.flameeyes.eu/tag/lxc" # remove once proper doc is available
+	elog ""
+}
diff --git a/app-emulation/lxc/metadata.xml b/app-emulation/lxc/metadata.xml
index fd6451fc65be..4257b067cda2 100644
--- a/app-emulation/lxc/metadata.xml
+++ b/app-emulation/lxc/metadata.xml
@@ -10,6 +10,9 @@
   <maintainer type="person">
     <email>stasibear@gentoo.org</email>
   </maintainer>
+  <maintainer type="person">
+    <email>dlan@gentoo.org</email>
+  </maintainer>
   <maintainer type="project">
     <email>virtualization@gentoo.org</email>
     <name>Gentoo Virtualization Project</name>
diff --git a/app-text/paperwork-backend/Manifest b/app-text/paperwork-backend/Manifest
index d048f7391887..b95c2e658577 100644
--- a/app-text/paperwork-backend/Manifest
+++ b/app-text/paperwork-backend/Manifest
@@ -1,6 +1,8 @@
 DIST paperwork-backend-1.0.5.tar.gz 46433 SHA256 a2e481873eec6b676b89aab21d6863264f10e4179cf72a253f52e565a602fcfd SHA512 87debdcef457bc1873d25d7bdb15addf0c78d9f1cc9c324cec51c60bc863a4e891680f85258399f1f0506235e7524bffbf49783a6f23d0f6d0fee68924d697da WHIRLPOOL ebb5d1fc5054fe4306879404805b9ca5e763eadf39fe491775bb767fb7369bc39484449eac0b81ee2e961597a9bf13a4a4eeef426be0afb21211e717ad3382c7
 DIST paperwork-backend-1.0.6.tar.gz 46773 SHA256 6881de10aa7e47039baebbd4742ceb49e048f46f22398a81f690e62a7cdce3ce SHA512 e372d1b702f026746d53f62a85fdf406234e13047e08202e5a793af5669e53f0a87b84ad6ae5e5a56570707bb38a0dcd0503f5578caa2d616502de2757a0d0b9 WHIRLPOOL 37e185769ca984072715a7abe4ca80759a6be3ea110ab56ac01f5e2397c7a95aa0ee22422eb6ef786ca94e7f1ac3b57688a21780843f12923d7f53f155681cb2
+DIST paperwork-backend-1.1.tar.gz 54088 SHA256 d2a78de1c6288779b191e616fec8b6fdfd37934c2ccec90563fadc6d2f2013ba SHA512 57e95b3a29989e0d615ba5295e32fa5b513521b354407565be95be96374b991923c89880fe92138225012e21d0a52149878e2c807673c811771d8fc16e5d4988 WHIRLPOOL 701f2ea789b2f7d45d3e369cab9baa7976f885ee0f7236f8b356fca0fc769f9e52a137cfdf62f8ec56cf62a0d80327d361172e38bd2d2830aa1f09a53cbcd63d
 EBUILD paperwork-backend-1.0.5.ebuild 863 SHA256 6dc4a43a33bc14fc202465cced16cea5fb2cc1e09232f5ebcb8ced6f3bf9bc83 SHA512 cfa157f829435d95392502d3eb65d51a613e6237c38d6ea53de26567e09aa563c8a3d5b9634009d517421d4033c1b5b0b8b078ce5897fd5416ea69018e4549f8 WHIRLPOOL 44b998ee4c700602ed54f0b589d0060a1c79e7c1ee894c6648f4d49c7e979193d522764391acd7abaf6e375bc142ba72a79128e7195706508e0146ab0ade18b2
 EBUILD paperwork-backend-1.0.6-r1.ebuild 942 SHA256 baea78298aaaa68a8906c26fc9f5ed7aa039407766d4218202713f4fb763892a SHA512 e2b7508edc0b638b2aa5ae92187463f1a11c7c2de21a958f9c097d2b3620a1286c60a5394ad0c8a72943367eff5de932cd9b448392c6fc1c08ec06d2f88377a3 WHIRLPOOL 7848fd326c25081ca899498f65a4dbf71b6680e118cb3e2565477cd3cbbd73de84ac6833571f544890dda509f78c1dd2db07d1daeef19c11aa5af25c1618ce13
+EBUILD paperwork-backend-1.1.ebuild 942 SHA256 baea78298aaaa68a8906c26fc9f5ed7aa039407766d4218202713f4fb763892a SHA512 e2b7508edc0b638b2aa5ae92187463f1a11c7c2de21a958f9c097d2b3620a1286c60a5394ad0c8a72943367eff5de932cd9b448392c6fc1c08ec06d2f88377a3 WHIRLPOOL 7848fd326c25081ca899498f65a4dbf71b6680e118cb3e2565477cd3cbbd73de84ac6833571f544890dda509f78c1dd2db07d1daeef19c11aa5af25c1618ce13
 MISC ChangeLog 967 SHA256 80c94264883f889f3144b34e4e4373588120b159ac8841f004384c953adf3982 SHA512 c4735f795f54cf2005eec720416013f0f562edbd73d73fb7123ecd456881504e68ba236411e7717d057baaf32a9d399daf0b349d1435c1a8a7025a35e015a0ad WHIRLPOOL adb9b70d3d44f2f0e3e89bb7f641c906816c1ccdb1c8c8fdad8a44cda19886f4e551a58fed4cb49c7c82f3294aac9a8260892d1c818747ec7862c8fc7a7f8703
 MISC metadata.xml 352 SHA256 65f066c0bdbefc09ea9cc10e3e3725532d2ff91ae835a139bfc9cbdfb79d08cd SHA512 49e85076c718ba6fefea6ea70e45d197fa9add4cc61bcae99800650b075a463202b2fda7206b74646d000d881a5e811560f96adba9e2637aff365e9db1a24bb1 WHIRLPOOL 2fab7e4f514039db9b14ab8835c16a3e50aeaf00bf5bc03bf9699d5e84838329619942f9b53fdb2e20b2b85f5e16f57ee484a5b287cce7ef4ff4f344214ccd2a
diff --git a/app-text/paperwork-backend/paperwork-backend-1.1.ebuild b/app-text/paperwork-backend/paperwork-backend-1.1.ebuild
new file mode 100644
index 000000000000..206632ebbc25
--- /dev/null
+++ b/app-text/paperwork-backend/paperwork-backend-1.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Backend part of Paperwork (Python API, no UI)"
+HOMEPAGE="https://github.com/jflesch/paperwork-backend"
+SRC_URI="https://github.com/jflesch/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="app-text/poppler[introspection]
+	$(python_gen_cond_dep 'dev-python/configparser[${PYTHON_USEDEP}]' python2_7 )
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/pycairo[${PYTHON_USEDEP}]
+	dev-python/pycountry[${PYTHON_USEDEP}]
+	dev-python/pyenchant[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	dev-python/python-levenshtein[${PYTHON_USEDEP}]
+	dev-python/simplebayes[${PYTHON_USEDEP}]
+	dev-python/termcolor[${PYTHON_USEDEP}]
+	dev-python/whoosh[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/app-text/paperwork/Manifest b/app-text/paperwork/Manifest
index 6c135e14a01a..83375bc56677 100644
--- a/app-text/paperwork/Manifest
+++ b/app-text/paperwork/Manifest
@@ -1,9 +1,11 @@
 DIST paperwork-0.3.2.tar.gz 179509 SHA256 55a3aa814cf0b62bc2e40d0b4789068ebec9bfd9fff182d75429aca624d243f1 SHA512 b9dd1010f308d28e300d246d103cdd15253ed8e653721a89ab7de1aa6129b9a52f6ca6afe4714e19fca41369441240900af23faefd7284bbd420a9833bf3449e WHIRLPOOL f20ac1e45b754612b452d3bbb5854857c604108fe4a71b8870de7b317087b99597dc3c9275776c0b1cd68118c78c45f38195ef4635abe514a565a7e1b911895d
 DIST paperwork-1.0.5.tar.gz 328468 SHA256 8a09910f852196983f4beabe97711ae1624d2071755cf6a6fed99d73bedc91ae SHA512 92c7515f10a766064cf1b48a3a482529665c265b09c26c27971e5942020749698168171fa7d242984883d9d4b09c5dd8ae6a29c6626fcb4d96972495164e425e WHIRLPOOL ce18d41ada101cc4b3a7d5d192fe780a78c9d41d044a7c7b1f0eca701ece25653c8b1588bcfd32eb5ae30552e299dd8537850c5363f38d875cde2d29663293a3
 DIST paperwork-1.0.6.tar.gz 329420 SHA256 b0f5d1cea1f4930e748d635f5aab7eed3282b8aea221b8c0624c71e76c7674c1 SHA512 35248ce3428a60f05865cf02ffda1f60c5462bae5bc0544566d64d827f3466ebfbf410f933ad70563e04c687b28255071a3d8c833d2316cbeb228a0e965398af WHIRLPOOL 269a365c303ecb23276613996f1daf571120406cb39edcb00ef5cbf1168bfb6b8c0fb5571d3a1d155de9ba41bb960ed8829d377dbaed3793ad33358ce6bd5267
+DIST paperwork-1.1.tar.gz 330284 SHA256 0f41f85f7d7111b41f1326959a81149e4b93c593045b5594b6f2056dd8137589 SHA512 a96924113dc804ae24d08b14334777e8e586b516b197b463c924d74fac8f45b299b4eb437b72d02d7e0423f41f819bfa13804ba01654ef4eeb1d4e424f3cea5b WHIRLPOOL 053a0cfffbd908b303611e5ba9e7f2e3b87462b947c29de34478b62472586cd3c96651e1c65b83ca295d38eebaf246e8785ba1fc0d119fc303faa56d186ab4b4
 EBUILD paperwork-0.3.2-r1.ebuild 1060 SHA256 1dfb06425af9a30b768c9e8708d58faedc4540c82652233c635f6775661b73bf SHA512 b92448e3e6475cb1c7db493ba911a2eb30f05f32b564b7c5a300e9fa9c25f0ac157caae5482cb5fa5547bd4f808d1e438fe4107bc5a978b85dcec6a0f1bb1bc2 WHIRLPOOL c563dd77ed2654b4886fd4c5d6c01c1901ba3012a374bad74c2dd8e3d3d3e0f863721fcbf718bcb835e58c7aeb359f8570f4726d95790c414e97e61da299ff24
 EBUILD paperwork-1.0.5.ebuild 924 SHA256 c343ccd1b8682e57ea7d9f1b654af113db3f2bc576e26994e25d9bc20e2e3c06 SHA512 0f46e780e8859f76ed76ecdb86830df445f358aa6708012ab08210a63dc9ec3b9054e109666447a8dc48b226e79d0c24b8abe7f354bb389d709b5b95fdcf6ee1 WHIRLPOOL b3ab1eae6630fea3bfa44e5a7b93f0f28fb8ed2fbb4f0b8e3ed0444425b2d8f9f1834663f81d90924006810e8acc8bb5d7bc49dac4f87f9e564ab1f6bdaa55aa
 EBUILD paperwork-1.0.6-r1.ebuild 1003 SHA256 969cd9af31bbf820eec10822a34d4ad617a55d7a8c579183dcfddb30d73e2f4d SHA512 838fbffb57fd9b0b97ad7f7bb2c8fd110dabbbffdf4b4b3c1c79676995ac2a98f5eb5646ae44e1f3e9056e04d721fb362a31556b8b71078051a9ebd1885e06d5 WHIRLPOOL aa7a0949b41abb8c9f67288900cfeb83dd99e0b078ff27ed990dff06b181dc08c05bf833f7b522b6363617024f16828774272aacf6d0e8cd4792b6dd5dc86ba7
+EBUILD paperwork-1.1.ebuild 1003 SHA256 969cd9af31bbf820eec10822a34d4ad617a55d7a8c579183dcfddb30d73e2f4d SHA512 838fbffb57fd9b0b97ad7f7bb2c8fd110dabbbffdf4b4b3c1c79676995ac2a98f5eb5646ae44e1f3e9056e04d721fb362a31556b8b71078051a9ebd1885e06d5 WHIRLPOOL aa7a0949b41abb8c9f67288900cfeb83dd99e0b078ff27ed990dff06b181dc08c05bf833f7b522b6363617024f16828774272aacf6d0e8cd4792b6dd5dc86ba7
 MISC ChangeLog 4353 SHA256 df1ae08ea32bbd7f7b5c52c1c6fbf98db9986a316c9d0ba46b8811ddf8387a1d SHA512 df83031a14f86971e99c70236ac3073a3a5e70ee31351ee7d79062a5103e5a7de35071c32a93849786689ddd555104288913123ed91c2d22707f0464452db48b WHIRLPOOL 22d287e2638eb4f9f095a7f8055b1706bc967819838f01d25e4094015d57c7af87f830054f0e9a8b717232be05a0d3768fc87d5779603e774b6642e8be839ed9
 MISC ChangeLog-2015 1818 SHA256 d80aa5257d448cbd7cea6e86469aa75f0ea1f22a1820b0067f449b6eff6e1682 SHA512 340d17f6b34cd14f49928a0e13b5320cab3837e74fda5a3e993c88aa03b2eef871db624ccb1ef1a912e3649d5aae230c433d8390ce4eaa6fe6f7a9a4f92c2132 WHIRLPOOL a067b717801cd166cb9ba00b79ec4f30b33d4e2a252f03a3343c290501efb1b53629b5991c257bd8fbeca41054ad5c4c4df29d2aea9e2c17db41700e0ce81450
 MISC metadata.xml 721 SHA256 631f06a626a49f98783162ee4d162515ae61cf9976a27934cdec60e8f8109b04 SHA512 f1f8545360dd6ec5a18fb3b32e98e810cfaa5126d4e837b079a65a2be592697e5ce44e38e5e290d3ca6539a0dc3dc5076f4f4bc0690f8d63c1b3f076cd671799 WHIRLPOOL 295bbe8f1c45da1cd125065c8dd0f15201bae3cea57c656d22c5fb8d84f6ba925084266274baba1b742055b691c1dba08ba2ea693c317d1463ff0efcebf4b9bb
diff --git a/app-text/paperwork/paperwork-1.1.ebuild b/app-text/paperwork/paperwork-1.1.ebuild
new file mode 100644
index 000000000000..d3caf5fb5272
--- /dev/null
+++ b/app-text/paperwork/paperwork-1.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="a personal document manager for scanned documents (and PDFs)"
+HOMEPAGE="https://github.com/jflesch/paperwork"
+SRC_URI="https://github.com/jflesch/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="~app-text/paperwork-backend-${PV}[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/configparser[${PYTHON_USEDEP}]' python2_7 )
+	dev-python/libpillowfight[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/pycairo[${PYTHON_USEDEP}]
+	dev-python/pyenchant[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	dev-python/pyinsane:2[${PYTHON_USEDEP}]
+	>=dev-python/pyocr-0.3.0[${PYTHON_USEDEP}]
+	dev-python/simplebayes[${PYTHON_USEDEP}]
+	dev-util/glade[introspection,python]
+	x11-libs/gtk+:3[introspection]"
+DEPEND="${RDEPEND}"
diff --git a/dev-db/postgis/Manifest b/dev-db/postgis/Manifest
index 2c65ec932471..a05e301e56ff 100644
--- a/dev-db/postgis/Manifest
+++ b/dev-db/postgis/Manifest
@@ -8,10 +8,14 @@ DIST postgis-2.1.8.tar.gz 6811272 SHA256 7c2380b895fe7bda34c2e70deab3fcf4c12b13a
 DIST postgis-2.2.0.tar.gz 10164837 SHA256 66f0f8480d535959b8bb9abb5ee5d602d1001413ca770df120baf3de627f9e91 SHA512 e9954d5c4aa381536ae87c32bb37b166a7ede0f9b9fc96cfb300dc2350b9351f40870429f64e755c3371be692a1956f5f8ea21733b64aab490f42d2232ae5d8f WHIRLPOOL 639c6b278dd6e5c3a11ed1d8de179ee72a4e6e9c54ba1e74e585e9233167a3c2cdca0704c47966cf757db22221ebbc8970a68375894a6179970ab6c0e6c637a2
 DIST postgis-2.2.1.tar.gz 10069889 SHA256 0fe500b0250203aac656bfa8f42f8458b63f33258404844e066e0e535988fa09 SHA512 e580fc6556e1d8e2ba36d62795650852d303ce4c935c8e538d14f0bf0f00c3c27dcb034c42dfafa0c8995eb0f28f71119c8ada4ceecaa8ca9897d0653552bb2f WHIRLPOOL a91f5e44de49b1b41d90188a4f7842c23d41b8c589416014273f4a1e655e0f3013176f7341bac0ea7004c3f7af86634981f3c0695d3e848e45798eeb5f7bfdeb
 DIST postgis-2.2.2.tar.gz 10071528 SHA256 40232391f8f66a6dc740ebb26088e568c8ccb663666998616c71c3bdaeed4163 SHA512 c5ad97abe52b7ec67e52a06e05e694099eaf2daacb7dc73c85dce71a61c269c755ec401f1077a1760cfb930ccd42fb1d34ebfb79990f52f5bc3aafa9db2e9ce4 WHIRLPOOL 265630298436c79023a4a1263ca0f4208ba7ece62d5a992fac9914ee6489926d94d23ea6d0f4c0557caa47a1032f4ef0b5d71b22f95ed0e11c5f265aafa3c48a
+DIST postgis-2.2.5.tar.gz 10223574 SHA256 1fcd458c1e095236d38e52160be5be0c62163f135d4fe7e2554edee0937ce705 SHA512 13069d6e6c0429acff5d6475d6b75783c3e81bc61fb528c5eba28ff125c31513b8a4df1a0870c4c835560d310bba4abf5ac8b9aa4722731f0988d617eca78ea8 WHIRLPOOL 7b39674f0b85477ad759fcb4237d4572304eead8fec5676e2cd90221a5a564ab607890f44b7ab12602cc48e2345f4f017627ba5c379ae4ec484fcff607d751af
+DIST postgis-2.3.2.tar.gz 11336387 SHA256 e92e34c18f078a3d1a2503cd870efdc4fa9e134f0bcedbbbdb8b46b0e6af09e4 SHA512 d4503959c12e7e269817764e5fae4e567b1765ffe9c857a2382d072a0f159939ddb4f6a57c5ca34b822c585926d0f219f0d788b37e8b06a822ce7c0bcc4e88c6 WHIRLPOOL ff207196df6ab0fd858f93f2ac2b0f8863aab5ad12b0444817f99e7de2a618d6157929302b7199dc8c56d3b6b4b25e6c5bb964a129785e366fd03ae4616051f2
 EBUILD postgis-2.1.8.ebuild 7460 SHA256 186ebce727ff46b489cb809aeac98aa929992c55db0e6be78800f75c9ab55d97 SHA512 b78e91c4fbb8e98d6be57afb5e916ca70b1a7805e9662a7ecbdbc24ce34e5bd5b2abadf754458e11677cdc0b3990bde119f049ea73da4cedcc7f06cf25cef024 WHIRLPOOL 2991326449dcbeb5f293ff059a0c0d7c8eccc52d9cba2d38677ccaa8128c21d0e5a26515f1fc7cee5f99a07afd87c95f47d2b33bb7ab60e23035480a601b7a91
 EBUILD postgis-2.2.0.ebuild 3165 SHA256 79bd064826e477f5878185fd834d51a39816354d8fc3d20ac9f988a42673c961 SHA512 f7562306e560a3784becb94e17520f9b13dfa30ae941f0702270ac1504c9d6efd25653a00ebc4168728ee7a638fe7a8c3d75befdf14497ee87640ca219773714 WHIRLPOOL 657d9be1aa389d5c880d30d3d259d0533d61ffe6d7a6b8f34d3f5c5bf411caa165a669d4f5e3142e61717987f46b1b2dbd9cb4c0f89f26f446591204013cebf3
 EBUILD postgis-2.2.1.ebuild 3165 SHA256 79bd064826e477f5878185fd834d51a39816354d8fc3d20ac9f988a42673c961 SHA512 f7562306e560a3784becb94e17520f9b13dfa30ae941f0702270ac1504c9d6efd25653a00ebc4168728ee7a638fe7a8c3d75befdf14497ee87640ca219773714 WHIRLPOOL 657d9be1aa389d5c880d30d3d259d0533d61ffe6d7a6b8f34d3f5c5bf411caa165a669d4f5e3142e61717987f46b1b2dbd9cb4c0f89f26f446591204013cebf3
 EBUILD postgis-2.2.2.ebuild 3176 SHA256 1b341caabf70f2c51c78bf1f8a10eb4f60d7925a0a38b8e994befceee17da8a8 SHA512 cd190333cb8648a4fcd70f72d7407645a562f120f6f0bc27a88c55f32f15b3ebeaf50da529bc53b26cf5eeee88ab058a58ef734a30b2e6e3ffa4631cad173e9a WHIRLPOOL 3d62c3a1ed91bd89fe8a2619c14f8dc51094e0e697a649f4b809fa1b529876bb5b584fb9282c2f78daf427556648fcc7142f1a69fd29dfdaa371f00a502f8b51
+EBUILD postgis-2.2.5.ebuild 3176 SHA256 acdfb031703604be4c7220f864e2b459c5920be0d30346186016eefda1304d54 SHA512 615ec00f782ca4a0e7d50181c4eeed4bd022beda1f6259ab74edb37d36f0809202e70a6d73566388a3541da91b6426a8e9cecd4adbc16195b0ff50cf3717facd WHIRLPOOL 1c924fb61614dcb0a7b8c80b77b2dd8a57ae8af0d7a4bac4b6e15586c8154c40eb7b90f7ae3b559477bc93aaf72d6c05caa412602151aafac921e954f1379b00
+EBUILD postgis-2.3.2.ebuild 3176 SHA256 acdfb031703604be4c7220f864e2b459c5920be0d30346186016eefda1304d54 SHA512 615ec00f782ca4a0e7d50181c4eeed4bd022beda1f6259ab74edb37d36f0809202e70a6d73566388a3541da91b6426a8e9cecd4adbc16195b0ff50cf3717facd WHIRLPOOL 1c924fb61614dcb0a7b8c80b77b2dd8a57ae8af0d7a4bac4b6e15586c8154c40eb7b90f7ae3b559477bc93aaf72d6c05caa412602151aafac921e954f1379b00
 EBUILD postgis-9999.ebuild 7485 SHA256 2fe879e176a88ca8c69ddb79c4444eedf7353b2532a07842919a8618133d4b9a SHA512 ee8dde6bf220974bac718a526961957cd0aecceea43dce4c763e3ccc197c1fd98994208fc7f59088062e27568dbcf2e2e56296adaa9b33080c0fc2f7dbf212e4 WHIRLPOOL 9bbe3896a141e67ff47a5ae94e42251eea26e325708d2fd6d81f7bfaf29a9618bb6fb460bc6ba2c9e6aed12dd36c22f9f40640d18359ddecd881bdc33f5aab52
 MISC ChangeLog 6529 SHA256 27002d9667de8a361e347cc66c2fc804054e53b1834548a3229526d472d5c36c SHA512 e5011139d4d58675b1513bb128e07c589bfa65a8d6ac9e2d43366f50d8a8cd38f6b08d39b1b6adeff3af0579c22403a5b1643f4f290be3c8a8a08fbf33c00570 WHIRLPOOL 93ed801a763374b3a6afe680e8711fedd7a9e0a149ffb7dc8352664b1f1cc7284886415f879aa1ac2f5b12aec3591e032e1814559c0414fb5f13654c96cddbd6
 MISC ChangeLog-2015 15421 SHA256 0f3e682af97970b63f483d38082d202cad0ce391e805f545590a37fc9fc2c3b3 SHA512 71d3a8f9f00ecdb484fead44508a1f15674b546d60533addf7f91c94d028800b098f52b1172ec028b6c85470154a4b364f10c9e1c8e0e6d0d8139d1aac8b9c6a WHIRLPOOL 651c4e132f36162267fe3473136aecfb8f6266a22d2715989697ff8319c933b058fb3a9fdbcefc6abc9451e5b3da72d94c05c51e31dc90bf6a09dd9e166330d6
diff --git a/dev-db/postgis/postgis-2.2.5.ebuild b/dev-db/postgis/postgis-2.2.5.ebuild
new file mode 100644
index 000000000000..dbd23affd4a3
--- /dev/null
+++ b/dev-db/postgis/postgis-2.2.5.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+POSTGRES_COMPAT=( 9.{1,2,3,4,5} )
+
+inherit autotools eutils versionator
+
+MY_PV=$(replace_version_separator 3 '')
+MY_P="${PN}-${MY_PV}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Geographic Objects for PostgreSQL"
+HOMEPAGE="http://postgis.net"
+SRC_URI="http://download.osgeo.org/postgis/source/${MY_P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc gtk static-libs test"
+
+RDEPEND="
+		|| (
+			dev-db/postgresql:9.5[server]
+			dev-db/postgresql:9.4[server]
+			dev-db/postgresql:9.3[server]
+			dev-db/postgresql:9.2[server]
+			dev-db/postgresql:9.1[server]
+		)
+		dev-libs/json-c
+		dev-libs/libxml2:2
+		>=sci-libs/geos-3.5.0
+		>=sci-libs/proj-4.6.0
+		>=sci-libs/gdal-1.10.0:=
+		gtk? ( x11-libs/gtk+:2 )
+"
+
+DEPEND="${RDEPEND}
+		doc? (
+				app-text/docbook-xsl-stylesheets
+				app-text/docbook-xml-dtd:4.5
+				dev-libs/libxslt
+				|| (
+					media-gfx/imagemagick[png]
+					media-gfx/graphicsmagick[imagemagick,png]
+				)
+		)
+		virtual/pkgconfig
+		test? ( dev-util/cunit )
+"
+
+PGIS="$(get_version_component_range 1-2)"
+
+REQUIRED_USE="test? ( doc )"
+
+# Needs a running psql instance, doesn't work out of the box
+RESTRICT="test"
+
+MAKEOPTS+=' -j1'
+
+# These modules are built using the same *FLAGS that were used to build
+# dev-db/postgresql. The right thing to do is to ignore the current
+# *FLAGS settings.
+QA_FLAGS_IGNORED="usr/lib(64)?/(rt)?postgis-${PGIS}\.so"
+
+postgres_check_slot() {
+	if ! declare -p POSTGRES_COMPAT &>/dev/null; then
+		die 'POSTGRES_COMPAT not declared.'
+	fi
+
+# Don't die because we can't run postgresql-config during pretend.
+[[ "$EBUILD_PHASE" = "pretend" \
+	&& -z "$(which postgresql-config 2> /dev/null)" ]] && return 0
+
+	local res=$(echo ${POSTGRES_COMPAT[@]} \
+		| grep -c $(postgresql-config show 2> /dev/null) 2> /dev/null)
+
+	if [[ "$res" -eq "0" ]] ; then
+			eerror "PostgreSQL slot must be set to one of: "
+			eerror "    ${POSTGRES_COMPAT[@]}"
+			return 1
+	fi
+
+	return 0
+}
+
+pkg_pretend() {
+	postgres_check_slot || die
+}
+
+pkg_setup() {
+	postgres_check_slot || die
+	export PGSLOT="$(postgresql-config show)"
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-2.2.0-arflags.patch"
+
+	eapply_user
+
+	local AT_M4DIR="macros"
+	eautoreconf
+}
+
+src_configure() {
+	local myargs=""
+	use gtk && myargs+=" --with-gui"
+	econf \
+		--with-pgconfig="/usr/lib/postgresql-${PGSLOT}/bin/pg_config" \
+		${myargs}
+}
+
+src_compile() {
+	emake
+	emake -C topology
+
+	if use doc ; then
+		emake comments
+		emake cheatsheets
+		emake -C doc html
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	use doc && emake DESTDIR="${D}" comments-install
+	emake -C topology DESTDIR="${D}" install
+	dobin ./utils/postgis_restore.pl
+
+	dodoc CREDITS TODO loader/README.* doc/*txt
+
+	use doc && dohtml -r doc/html/*
+
+	docinto topology
+	dodoc topology/{TODO,README}
+
+	use static-libs || find "${ED}" -name '*.a' -delete
+}
+
+pkg_postinst() {
+	postgresql-config update
+
+	elog "To finish installing PostGIS, follow the directions detailed at:"
+	elog "http://postgis.net/docs/manual-${PGIS}/postgis_installation.html#create_new_db_extensions"
+}
diff --git a/dev-db/postgis/postgis-2.3.2.ebuild b/dev-db/postgis/postgis-2.3.2.ebuild
new file mode 100644
index 000000000000..dbd23affd4a3
--- /dev/null
+++ b/dev-db/postgis/postgis-2.3.2.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+POSTGRES_COMPAT=( 9.{1,2,3,4,5} )
+
+inherit autotools eutils versionator
+
+MY_PV=$(replace_version_separator 3 '')
+MY_P="${PN}-${MY_PV}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Geographic Objects for PostgreSQL"
+HOMEPAGE="http://postgis.net"
+SRC_URI="http://download.osgeo.org/postgis/source/${MY_P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc gtk static-libs test"
+
+RDEPEND="
+		|| (
+			dev-db/postgresql:9.5[server]
+			dev-db/postgresql:9.4[server]
+			dev-db/postgresql:9.3[server]
+			dev-db/postgresql:9.2[server]
+			dev-db/postgresql:9.1[server]
+		)
+		dev-libs/json-c
+		dev-libs/libxml2:2
+		>=sci-libs/geos-3.5.0
+		>=sci-libs/proj-4.6.0
+		>=sci-libs/gdal-1.10.0:=
+		gtk? ( x11-libs/gtk+:2 )
+"
+
+DEPEND="${RDEPEND}
+		doc? (
+				app-text/docbook-xsl-stylesheets
+				app-text/docbook-xml-dtd:4.5
+				dev-libs/libxslt
+				|| (
+					media-gfx/imagemagick[png]
+					media-gfx/graphicsmagick[imagemagick,png]
+				)
+		)
+		virtual/pkgconfig
+		test? ( dev-util/cunit )
+"
+
+PGIS="$(get_version_component_range 1-2)"
+
+REQUIRED_USE="test? ( doc )"
+
+# Needs a running psql instance, doesn't work out of the box
+RESTRICT="test"
+
+MAKEOPTS+=' -j1'
+
+# These modules are built using the same *FLAGS that were used to build
+# dev-db/postgresql. The right thing to do is to ignore the current
+# *FLAGS settings.
+QA_FLAGS_IGNORED="usr/lib(64)?/(rt)?postgis-${PGIS}\.so"
+
+postgres_check_slot() {
+	if ! declare -p POSTGRES_COMPAT &>/dev/null; then
+		die 'POSTGRES_COMPAT not declared.'
+	fi
+
+# Don't die because we can't run postgresql-config during pretend.
+[[ "$EBUILD_PHASE" = "pretend" \
+	&& -z "$(which postgresql-config 2> /dev/null)" ]] && return 0
+
+	local res=$(echo ${POSTGRES_COMPAT[@]} \
+		| grep -c $(postgresql-config show 2> /dev/null) 2> /dev/null)
+
+	if [[ "$res" -eq "0" ]] ; then
+			eerror "PostgreSQL slot must be set to one of: "
+			eerror "    ${POSTGRES_COMPAT[@]}"
+			return 1
+	fi
+
+	return 0
+}
+
+pkg_pretend() {
+	postgres_check_slot || die
+}
+
+pkg_setup() {
+	postgres_check_slot || die
+	export PGSLOT="$(postgresql-config show)"
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-2.2.0-arflags.patch"
+
+	eapply_user
+
+	local AT_M4DIR="macros"
+	eautoreconf
+}
+
+src_configure() {
+	local myargs=""
+	use gtk && myargs+=" --with-gui"
+	econf \
+		--with-pgconfig="/usr/lib/postgresql-${PGSLOT}/bin/pg_config" \
+		${myargs}
+}
+
+src_compile() {
+	emake
+	emake -C topology
+
+	if use doc ; then
+		emake comments
+		emake cheatsheets
+		emake -C doc html
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	use doc && emake DESTDIR="${D}" comments-install
+	emake -C topology DESTDIR="${D}" install
+	dobin ./utils/postgis_restore.pl
+
+	dodoc CREDITS TODO loader/README.* doc/*txt
+
+	use doc && dohtml -r doc/html/*
+
+	docinto topology
+	dodoc topology/{TODO,README}
+
+	use static-libs || find "${ED}" -name '*.a' -delete
+}
+
+pkg_postinst() {
+	postgresql-config update
+
+	elog "To finish installing PostGIS, follow the directions detailed at:"
+	elog "http://postgis.net/docs/manual-${PGIS}/postgis_installation.html#create_new_db_extensions"
+}
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index 841d76d41684..e4527d5371bc 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -1,4 +1,3 @@
-DIST ruby-2.0.0-p648.tar.xz 8303584 SHA256 22fe97739110ba9171b13fc4dcd1a92e767f16769de3593ee41ef1283d218402 SHA512 95df515d37f04193eaceaded4a4f568f83041683349cd44767803f77361a66533226d83eac6586ac894ae61d79bd36ce047f951aed43f9a8356dbb3244280774 WHIRLPOOL ef78b838d061b1707219453a70c8b4a503d46e9f95797007555943a837de21f22c0c93039c75172d7df4fe9b5eca38472ee7177f98785cb5993c7e80140a1d27
 DIST ruby-2.1.10.tar.xz 9362868 SHA256 5be9f8d5d29d252cd7f969ab7550e31bbb001feb4a83532301c0dd3b5006e148 SHA512 72406ac133af7f057d4633d2a300e49e133881f6b36ff4cdf6c72b4ff4325de332fc5a45c96ea407140a8bf09cdc307e13107c539196902e5b67b7d24cd72dc9 WHIRLPOOL c069461eca483db74ffd72efb3279eea3949975e504d1b38ef76d4226f6e85cc3d337a358453fb4910f3b1306fc903ce38f156c7af65d207d2a4732571ef9ac1
 DIST ruby-2.1.9.tar.xz 9395648 SHA256 39f203f7498aed2456fb500147fada5adcbf102d89d4f6aca773ebcadd8ea82a SHA512 1f331a8910fd7a9ab9c41bf56aef12041dd413ad49c696f6df2c9a7ec3a3d5cdf383f2a3d30949ea37b8ecb39f50355e526412b36ed4e07b60733d9db4d2bd14 WHIRLPOOL bb2fa158d837f9c278cab93ecb1a8f6a00ddff12c40d1fa5ffb6b55741dc71268fef40fc9f30508dc89b27a05fe9f3b4fbf739ba69ab4e62f669f82a15d26dfa
 DIST ruby-2.2.5.tar.xz 10457620 SHA256 f86feaa0a578e8da0924ced3ec68b25b50d69fc9a72cc8d919bc3c73f85f87d7 SHA512 6da4bdb0a43d56c7a8e4dddbcacf237e998ebb54706c8f835b53713dbdf924e40d5f89f63017515e1d66904ca01f28058cf296567104e06540c57f036dcdd0fe WHIRLPOOL 16d7a03c359bf31aeecc67afd72d8290f8f7e2a26b15c069ad623716866b76cea467f550946a27916087343ab3225149681e1555ea9c21459a94f7a038758270
@@ -7,7 +6,6 @@ DIST ruby-2.3.1.tar.xz 11407048 SHA256 6725b5534d5a3a21ec4f14d6d7b9921a0d00d08ac
 DIST ruby-2.3.2.tar.xz 11420276 SHA256 5c78f311045ce48160092160444dec2744941a5e37d7865032978bd5bf392f0c SHA512 f2e602281cbcfad81b8197b9555bf637a1ef34f51dbc7548e5e0c5996ab1b7db5bd9eeb902128d37eed90f39b559c569aa75f2b29fe5f65085be65a63206fd72 WHIRLPOOL a8206b08b27c45e237069804d03d2250f561c588dfbb65aeb4e3f394b8d843d08abddc65fbf56b4f943dcc25cc2a60b3967cc1a50af4fdce4b8eb5eb1ebe5b95
 DIST ruby-2.3.3.tar.xz 11444164 SHA256 1a4fa8c2885734ba37b97ffdb4a19b8fba0e8982606db02d936e65bac07419dc SHA512 73dd6ed896ff52d953b153b2cab359c87953ea77521878f1ee16c1e217cc46bcb253100debe61ba631e6ffa0bc773e592d603a374508ed5189a311136ccd8d20 WHIRLPOOL aa368a2d0f067ac9d0c6fed62c0e1bdfac0d49c473cd49be9b2774ed3097b76286d091a0887528227f36307b8c1217a2493c5c48fb462db52a3e23cb251a7f79
 DIST ruby-2.4.0.tar.xz 9906880 SHA256 3a87fef45cba48b9322236be60c455c13fd4220184ce7287600361319bb63690 SHA512 975a5388592adc038461e0acebb6c0efee242891b2ea8621476401458efe2bc0fdd317d3bf99beb745b0b3808410efdff33862da29c95c027f457943721e3ab6 WHIRLPOOL 5e0594aa853f9a8a64837d6c34d7110f32471bda719df3ae724643cbe9722b5003cf014ac10130b5a1d59c3f4cc65967c4c00edeea47801e389241be7fe0b53f
-DIST ruby-patches-2.0.0_p648.tar.bz2 3341 SHA256 7d82403fed6216baed59ac1fbba888e2b9a4a9cb742ffd01531753bae07ab6b8 SHA512 40d07275a391df3e0a7a0c2705913c8120a548e223032dc39993f8f873c8d0639646cf728dc95f1400352a13766623ac6d69a1b1ff03183df6fabf32946dd7a6 WHIRLPOOL ed7ea6b1c1fd3570ea85b885f7455d8273cff2a9db2540c9e89faca867bd5eed2b4de52c7d21a96bb33ae0beedce113c68bb6c8cee4688650ff5169bd9c265fd
 DIST ruby-patches-2.1.10.tar.bz2 1931 SHA256 7e02c1b6a6352693bfd5828c9d1a7633a52baa57d8770df182ed0d8b450a3341 SHA512 85928207db4f76e58925e50d39d73db2d521674385ce3232828377e7d7bb4252aafb9f93d6045d4c159bf094b472af61ef9307203db313bf28918fe35e0f3a21 WHIRLPOOL 17a698b0a09be15f444ea34b33e9aa1d029fbd572c565072a92480bf7b6b21f1b6b88b0da3183a486bae30e7e65f3172cd72b7336be1dc5974b62bd8e2b9ef7a
 DIST ruby-patches-2.1.9.tar.bz2 1931 SHA256 7e02c1b6a6352693bfd5828c9d1a7633a52baa57d8770df182ed0d8b450a3341 SHA512 85928207db4f76e58925e50d39d73db2d521674385ce3232828377e7d7bb4252aafb9f93d6045d4c159bf094b472af61ef9307203db313bf28918fe35e0f3a21 WHIRLPOOL 17a698b0a09be15f444ea34b33e9aa1d029fbd572c565072a92480bf7b6b21f1b6b88b0da3183a486bae30e7e65f3172cd72b7336be1dc5974b62bd8e2b9ef7a
 DIST ruby-patches-2.2.5.tar.bz2 2272 SHA256 f54373704ce8df732490e8d1e7e35188503faacc5278fe0ab0d8c07bdc762fed SHA512 ed8bff8f730ccb114e62784d29541f276b2821d9eb121a9772dc4aabc139b688f2b14f5f27710098a8cd751c62d31b46170b427ad54dc4f6490c003450ae1583 WHIRLPOOL 8598c9284252c1e7cc9f9019c5f468ce5ab8b4ae013e71c631cd00cc8bfde068b041f1bc6851bb2962982a1e46cbde0ddc51c186ea41638a7881c587c658e603
@@ -17,7 +15,6 @@ DIST ruby-patches-2.3.2.tar.bz2 2223 SHA256 f0a803173564368e5cf31162e1dba901c466
 DIST ruby-patches-2.3.3-r1.tar.bz2 2223 SHA256 f0a803173564368e5cf31162e1dba901c46640f9e861255f6cbe14256d18f3eb SHA512 bb47000e516017c1fedf7c5313b0628fa734030e69bd0fed1c06a38dd115b8c50837e3dd917f272e24abf5609c4c12793ae4570bfd7d6210290785bf2f8287bd WHIRLPOOL 0b0d4dcf7df4ff3ff11610bfe7a7b29ed621b45b412cb7618a6572f98a568ac67419bd852b193cfc3aa0968382cf9400a578511e9e8fb8b2125bc876e733bd64
 DIST ruby-patches-2.3.3.tar.bz2 2223 SHA256 f0a803173564368e5cf31162e1dba901c46640f9e861255f6cbe14256d18f3eb SHA512 bb47000e516017c1fedf7c5313b0628fa734030e69bd0fed1c06a38dd115b8c50837e3dd917f272e24abf5609c4c12793ae4570bfd7d6210290785bf2f8287bd WHIRLPOOL 0b0d4dcf7df4ff3ff11610bfe7a7b29ed621b45b412cb7618a6572f98a568ac67419bd852b193cfc3aa0968382cf9400a578511e9e8fb8b2125bc876e733bd64
 DIST ruby-patches-2.4.0.tar.bz2 2047 SHA256 9560b8e8dc4a5517814df07aa635c9269f5e7cff5a15827a25a9f0811194e450 SHA512 b35db875a7e4a226e75eb6f7bc68b4bc97cc699bdc5f6930015e55cdc324b67b9883a2aa574c9c9a8b5dc5345c4df8a5ca8ace5b794b3e4de6517f3eefd25745 WHIRLPOOL fc5d226f46fe4ee1c86f6fff51ec9184b8c0ec08a1793eab365437d4ce2fd573cfc8857386cd10932f7dde05254bc975eff5b7986aea429730c606147fae2a5c
-EBUILD ruby-2.0.0_p648.ebuild 6428 SHA256 2a781de03553b429532a7088c00e45a94955bc9e80c6b7ae8bbeef255597c560 SHA512 6b4009d9d0a234399de0fff62573bfc02ba6db4264a8b7ea38acd8c8a745ac810089f716227723064045fb02c9b393b7d5855d12e7c772e5d6275aa448f40190 WHIRLPOOL 37ce28ce1fa2e4ba1b2d525a2228fabd96caa0aad41f42f7548899ff8e44906217f7ea7359cb1024d99839049d6eee3d5fa5675ab8e52b7b843077a2596bf7f7
 EBUILD ruby-2.1.10.ebuild 6449 SHA256 fbeddad3552a151e317c659ff58a1f4de8c566d82c464da78177e379409ca879 SHA512 2ce0ac6adce63cded69fcecad3b5da7a9e6221ce76af53b3fcc0cb68a9571395c5263e31e5c1a4d60f0a84736751b638acc36d356765d2078f6f98e6cbe8b08c WHIRLPOOL e92a39352a464081e00ff44b6d0f6b1efbd19379d0d459d6333922a15e01ac82bc36f97b5cd070b0a4725ecc529f4b19dfa716a74ca4ab841fdb01b9a096ed87
 EBUILD ruby-2.1.9.ebuild 6505 SHA256 e37ca467407ccf69b32d104ce4dbab795c5838e41fee181923b9d9bc920c3d61 SHA512 e9711aececadb6c6d6a9957bc3e6ca2a826a875e6c551b43feec121948511f93f78ce48b4bd732e38087752b89c9d88f59b192a644d39270235ea45c4bf2ec4a WHIRLPOOL 05f579c5d2c60ad6236aeb4a01fb59ff568b05658913c3435235733ce526d7298b70aa3cfea27ac7abf64721b5d1f09df5698debd21c99230863e4f60537f6e6
 EBUILD ruby-2.2.5.ebuild 6925 SHA256 a3c0d208a0ecc9762c327fe9aa87bbe06679d32b9e42a0bc018bd91ff5ebcc89 SHA512 081b1817cb1a1aa8ba700baa3fbd5c4fc6d4fcdd30f425314f6480798840711e122757f4c0ba69eb1f050573baf449af3a6f585c7920d7b7b375912c824058a7 WHIRLPOOL 1d33978882bec35ef44998de95e32a3970b84f84ada3792ac791e005072116db145194fae387be50f4cee05567e35f9691e9670cfa0d9c1d3a893b30a5526ba2
diff --git a/dev-lang/ruby/ruby-2.0.0_p648.ebuild b/dev-lang/ruby/ruby-2.0.0_p648.ebuild
deleted file mode 100644
index 1bd67a9dc6b1..000000000000
--- a/dev-lang/ruby/ruby-2.0.0_p648.ebuild
+++ /dev/null
@@ -1,230 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-#PATCHSET=1
-
-inherit autotools eutils flag-o-matic multilib versionator
-
-RUBYPL=$(get_version_component_range 4)
-
-MY_P="${PN}-$(get_version_component_range 1-3)-${RUBYPL:-0}"
-S=${WORKDIR}/${MY_P}
-
-SLOT=$(get_version_component_range 1-2)
-MY_SUFFIX=$(delete_version_separator 1 ${SLOT})
-RUBYVERSION=2.0.0
-
-if [[ -n ${PATCHSET} ]]; then
-	if [[ ${PVR} == ${PV} ]]; then
-		PATCHSET="${PV}-r0.${PATCHSET}"
-	else
-		PATCHSET="${PVR}.${PATCHSET}"
-	fi
-else
-	PATCHSET="${PVR}"
-fi
-
-DESCRIPTION="An object-oriented scripting language"
-HOMEPAGE="http://www.ruby-lang.org/"
-SRC_URI="mirror://ruby/2.0/${MY_P}.tar.xz
-		 https://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2"
-
-LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="berkdb debug doc examples gdbm ipv6 +rdoc rubytests socks5 ssl xemacs ncurses +readline cpu_flags_x86_sse2"
-
-RDEPEND="
-	berkdb? ( sys-libs/db:= )
-	gdbm? ( sys-libs/gdbm )
-	ssl? ( dev-libs/openssl:0= )
-	socks5? ( >=net-proxy/dante-1.1.13 )
-	ncurses? ( sys-libs/ncurses:0= )
-	readline?  ( sys-libs/readline:0= )
-	dev-libs/libyaml
-	virtual/libffi
-	sys-libs/zlib
-	>=app-eselect/eselect-ruby-20100402
-	!<dev-ruby/rdoc-3.9.4
-	!<dev-ruby/rubygems-1.8.10-r1"
-
-DEPEND="${RDEPEND}"
-PDEPEND="
-	virtual/rubygems[ruby_targets_ruby20]
-	>=dev-ruby/json-1.7.7[ruby_targets_ruby20]
-	>=dev-ruby/rake-0.9.6[ruby_targets_ruby20]
-	rdoc? ( >=dev-ruby/rdoc-4.0.0[ruby_targets_ruby20] )
-	xemacs? ( app-xemacs/ruby-modes )"
-
-src_prepare() {
-	if use cpu_flags_x86_sse2 ; then
-		excluded_patches="012_no_forced_sse2.patch"
-	fi
-
-	EPATCH_EXCLUDE="${excluded_patches}" EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \
-		epatch "${WORKDIR}/patches"
-
-	# We can no longer unbundle all of rake because rubygems now depends
-	# on this. We leave the actual rake code around to bootstrap
-	# rubygems, but remove the bits that would cause a file collision.
-	einfo "Unbundling gems..."
-	cd "$S"
-	rm -rf \
-		{bin,lib}/rake lib/rake.rb man/rake.1 \
-		bin/gem || die "removal failed"
-
-	# Fix a hardcoded lib path in configure script
-	sed -i -e "s:\(RUBY_LIB_PREFIX=\"\${prefix}/\)lib:\1$(get_libdir):" \
-		configure.in || die "sed failed"
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=
-
-	# The Tk module can no longer be built because the module code is no
-	# longer compatible with newer stable versions.
-	# https://bugs.gentoo.org/show_bug.cgi?id=500894
-	local modules="tk"
-
-	# -fomit-frame-pointer makes ruby segfault, see bug #150413.
-	filter-flags -fomit-frame-pointer
-	# In many places aliasing rules are broken; play it safe
-	# as it's risky with newer compilers to leave it as it is.
-	append-flags -fno-strict-aliasing
-	# SuperH needs this
-	use sh && append-flags -mieee
-
-	# Socks support via dante
-	if use socks5 ; then
-		# Socks support can't be disabled as long as SOCKS_SERVER is
-		# set and socks library is present, so need to unset
-		# SOCKS_SERVER in that case.
-		unset SOCKS_SERVER
-	fi
-
-	# Increase GC_MALLOC_LIMIT if set (default is 8000000)
-	if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then
-		append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
-	fi
-
-	# ipv6 hack, bug 168939. Needs --enable-ipv6.
-	use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET"
-
-	# Determine which modules *not* to build depending in the USE flags.
-	if ! use readline ; then
-		modules="${modules},readline"
-	fi
-	if ! use berkdb ; then
-		modules="${modules},dbm"
-	fi
-	if ! use gdbm ; then
-		modules="${modules},gdbm"
-	fi
-	if ! use ssl ; then
-		modules="${modules},openssl"
-	fi
-	if ! use ncurses ; then
-		modules="${modules},curses"
-	fi
-
-	INSTALL="${EPREFIX}/usr/bin/install -c" econf \
-		--program-suffix=${MY_SUFFIX} \
-		--with-soname=ruby${MY_SUFFIX} \
-		--docdir=${EPREFIX}/usr/share/doc/${P} \
-		--enable-shared \
-		--enable-pthread \
-		--disable-rpath \
-		--with-out-ext="${modules}" \
-		$(use_enable socks5 socks) \
-		$(use_enable doc install-doc) \
-		--enable-ipv6 \
-		$(use_enable debug) \
-		${myconf} \
-		--enable-option-checking=no \
-		|| die "econf failed"
-}
-
-src_compile() {
-	emake V=1 EXTLDFLAGS="${LDFLAGS}" || die "emake failed"
-}
-
-src_test() {
-	emake -j1 V=1 test || die "make test failed"
-
-	elog "Ruby's make test has been run. Ruby also ships with a make check"
-	elog "that cannot be run until after ruby has been installed."
-	elog
-	if use rubytests; then
-		elog "You have enabled rubytests, so they will be installed to"
-		elog "/usr/share/${PN}-${SLOT}/test. To run them you must be a user other"
-		elog "than root, and you must place them into a writeable directory."
-		elog "Then call: "
-		elog
-		elog "ruby${MY_SUFFIX} -C /location/of/tests runner.rb"
-	else
-		elog "Enable the rubytests USE flag to install the make check tests"
-	fi
-}
-
-src_install() {
-	# Remove the remaining bundled gems. We do this late in the process
-	# since they are used during the build to e.g. create the
-	# documentation.
-	rm -rf ext/json || die
-
-	# Ruby is involved in the install process, we don't want interference here.
-	unset RUBYOPT
-
-	local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby)
-
-	LD_LIBRARY_PATH="${D}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
-	RUBYLIB="${S}:${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
-	for d in $(find "${S}/ext" -type d) ; do
-		RUBYLIB="${RUBYLIB}:$d"
-	done
-	export LD_LIBRARY_PATH RUBYLIB
-
-	emake V=1 DESTDIR="${D}" install || die "make install failed"
-
-	# Remove installed rubygems copy
-	rm -rf "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed"
-	rm -rf "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed"
-	rm -rf "${D}/usr/bin/"{ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed"
-
-	if use doc; then
-		make DESTDIR="${D}" install-doc || die "make install-doc failed"
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r sample
-	fi
-
-	dodoc ChangeLog NEWS doc/NEWS* README* || die
-
-	if use rubytests; then
-		pushd test
-		insinto /usr/share/${PN}-${SLOT}/test
-		doins -r .
-		popd
-	fi
-}
-
-pkg_postinst() {
-	if [[ ! -n $(readlink "${ROOT}"usr/bin/ruby) ]] ; then
-		eselect ruby set ruby${MY_SUFFIX}
-	fi
-
-	elog
-	elog "To switch between available Ruby profiles, execute as root:"
-	elog "\teselect ruby set ruby(19|20|...)"
-	elog
-}
-
-pkg_postrm() {
-	eselect ruby cleanup
-}
diff --git a/dev-libs/qrosscore/Manifest b/dev-libs/qrosscore/Manifest
index af895b3c4034..32a3b92ddf61 100644
--- a/dev-libs/qrosscore/Manifest
+++ b/dev-libs/qrosscore/Manifest
@@ -1,5 +1,7 @@
 DIST qrosscore-0.3.1.tar.gz 3963408 SHA256 0573ece8c78fc836544a87adbb3a61afb1b8821cc11b289935d4b650c2d6bc85 SHA512 0dba2257a18ad36ec5348dc9a298d264f5d3ca1cd08e1bfce50259da85ccf3ebec9bad5e578b99e870948888789e76ce33cc8aaf7538c7da6a732a5c76630be6 WHIRLPOOL ef1c9a6fa7fad7a49c9237ed47bc2e7694d1c89639e62bfcd21c5d253ab40147c8694546db778ed6a16ca06e08a551b5a7a5aacbcc192659291846d87df313d0
+DIST qrosscore-0.3.2.tar.gz 3963954 SHA256 64aa12a25c8739ceb214cd11c51aa825c075576b9178e479ae37778ac1736a56 SHA512 2f86aa156af3a00eed38160258b2c178891e134f455e5c3f93a681193ea1d526d1adb6f428b948b8f52768415daed2c4dd7fb34040ff3046eea20bed81ea4d16 WHIRLPOOL fc454858c8206dfc97ead1a6b6af719ed3fb99198f2a2f3292076474a324c1636eb29849c82b75bd337de0645a07c9b2cf6071085e77ab9b675a110973eef030
 EBUILD qrosscore-0.3.1.ebuild 554 SHA256 f7cd1aa23fb679418079be0d5af27d07401a49426b500bcd806c024b5e26e02f SHA512 8efbde2d4ecfb75b6b67ea79886a90bc2fa19a5c5e3dab4592712f33c648159114641442c56cf13b3c4fb91415fccf004ee5a8373d71faca4033b6fb5317d8ef WHIRLPOOL 9c0b0dba1be004612a4745391c8b4caa838d123cab155b9e0114330dddaa015e320f334d13fee94f983bb367f06428742a9077475760dee5885f416964ebde7c
+EBUILD qrosscore-0.3.2.ebuild 590 SHA256 d98ebc1684a5f5c3b185d7be1e78b67f1809434a96e7eb5565ac94e04f2ba637 SHA512 62be7ea83f6945cac54c66ab8213046cf6de514b489248db8a1aa3db2dbad9cfb12459eaaa3fb94f169e530e16523f6913742eef5fabe9fb1230e145916a69bc WHIRLPOOL 611522d770a73ae1b1bddea447fd8befbbcdb55c4c107670c9899865086f390cf69678ccb9bc146479684d65e7b7823e97eb6f5aa92b3b1b58b8588fc9155eea
 EBUILD qrosscore-9999.ebuild 519 SHA256 f19d91b771ad247b54a0559352eef35625624812040f5d71b3719b92a1d4e7c1 SHA512 f66179bc397625aa58f50fef2532284c4f2da4a184a8f24f14aa18b6e992b558bb34a97205fd74ea03f2c9dc664b423057a7b279bec3a60d981d172b795ba0e8 WHIRLPOOL be110a5c21f8b45ffa2a9b6645a85619e6ee2260a8b96bc52b40f8dd630442b9e0dd2cbde15134f347cbb111f4f88cde5a904262752def2fad5dcbef83b283cb
 MISC ChangeLog 2657 SHA256 5434ecee44529436e93cd432413b33d695bc3b397430aef5d5a6e8b99d59a54a SHA512 54411e864a1219ac29c631a6d77bca0178a7b1e751814bbe2b3a6aacd6c47efeee1afe09e9fd46cb77921b92765a4651b4f5c792e8dad83a3feb44fa7a39036f WHIRLPOOL 98a19abe8dc6c22c0dc358e3e52c035a71f5046f0a7fdfffced852a833b3593f68bb0f57035ddd2d2db2bfb102a3c674ed4994383cefc47f8049e7a06c1d8a88
 MISC ChangeLog-2015 2295 SHA256 879e5fcabbc9d6bb60d5a5bfa2ce6f4b0b1abc920de0c901461a4bdd6ac8a9ca SHA512 e306b488d4fbd6f8741d9924bc25b279d19111a41375035eb886673dea3d6d5ff0e4f4860edf4588707c3503591e4c9d2cdfcb989956fab073150f7c5e5051b6 WHIRLPOOL 9cc7431a10200551f2fc7b27af85d28a043fd284cfe39b50255ac7d023e3006f641772f951e7849e99fe109944b431b9f779c6086c1daa9917d17df582ababa7
diff --git a/dev-libs/qrosscore/qrosscore-0.3.2.ebuild b/dev-libs/qrosscore/qrosscore-0.3.2.ebuild
new file mode 100644
index 000000000000..2686d0c69df1
--- /dev/null
+++ b/dev-libs/qrosscore/qrosscore-0.3.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="KDE-free version of Kross (core libraries and Qt Script backend)"
+HOMEPAGE="https://github.com/0xd34df00d/Qross"
+SRC_URI="https://github.com/0xd34df00d/Qross/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtwidgets:5
+	dev-qt/designer:5
+	dev-qt/qtscript:5
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/Qross-${PV}/src/qross"
+
+mycmakeargs=( -DUSE_QT5=ON )
diff --git a/dev-libs/qrosspython/Manifest b/dev-libs/qrosspython/Manifest
index 512529f91688..458f542f0518 100644
--- a/dev-libs/qrosspython/Manifest
+++ b/dev-libs/qrosspython/Manifest
@@ -1,5 +1,7 @@
 DIST qrosscore-0.3.1.tar.gz 3963408 SHA256 0573ece8c78fc836544a87adbb3a61afb1b8821cc11b289935d4b650c2d6bc85 SHA512 0dba2257a18ad36ec5348dc9a298d264f5d3ca1cd08e1bfce50259da85ccf3ebec9bad5e578b99e870948888789e76ce33cc8aaf7538c7da6a732a5c76630be6 WHIRLPOOL ef1c9a6fa7fad7a49c9237ed47bc2e7694d1c89639e62bfcd21c5d253ab40147c8694546db778ed6a16ca06e08a551b5a7a5aacbcc192659291846d87df313d0
+DIST qrosscore-0.3.2.tar.gz 3963954 SHA256 64aa12a25c8739ceb214cd11c51aa825c075576b9178e479ae37778ac1736a56 SHA512 2f86aa156af3a00eed38160258b2c178891e134f455e5c3f93a681193ea1d526d1adb6f428b948b8f52768415daed2c4dd7fb34040ff3046eea20bed81ea4d16 WHIRLPOOL fc454858c8206dfc97ead1a6b6af719ed3fb99198f2a2f3292076474a324c1636eb29849c82b75bd337de0645a07c9b2cf6071085e77ab9b675a110973eef030
 EBUILD qrosspython-0.3.1.ebuild 704 SHA256 2c556b1e4ec64499617cfcfd0d51d5b139290834d54a8d43be1015e12a881177 SHA512 e7be7cefebca5624e9eabd247c6597ca11e78258f1dbba80a2dc76e5bdf06917fa4156e2eaa38b1bd989943f7d80ce407d2bb79f54a9628318ef002a611127ce WHIRLPOOL 0170dc6bef7073de07c11eccf6d2e26ed7f24515befc029c57bfd24e8a7e8ac7bb7a1d9c4a2217ba3d50d3666c6dd39ae903aaf0b31f6e551bc8d5991807f045
+EBUILD qrosspython-0.3.2.ebuild 734 SHA256 4e847dedaae4510f4e6160bf10d8f0e6fd84f05a3c173d806885c6c481298f88 SHA512 283743be9ca1225728f31ef63c6153f659a07bfb6323d5c59650b89b85077d54eee07597b51b00ee2556ace44a53d1f8d07faa48d16e07ca5dba3274171a2f55 WHIRLPOOL 3a26e8bc4a18418d0279bc10775967ddfeef985c031efc69ea2787245d527a2630aab8b4bb3feb0255c38c24124b5089771154d286e5db4fdae9cda656ce2b4b
 EBUILD qrosspython-9999.ebuild 634 SHA256 0728e46d76386d3364acfac2e65c855a0e1d985ccb7ff0bafaba155ceb659477 SHA512 b51186315320f2b3dc61a72e5c10bd798cc1aea9e15c177169189175be46573b8a099d58b8ce80589f103e5b4bc2e5886af254e143edd9544753a584bf2945b8 WHIRLPOOL aafca4ae6a234b3d004196b79ffc28c3db5b15707f4289ff577f0fc831dc1e5c6829e270da07bc88d11d4312f5e8703ed0176573108b208384b05473b9a69a28
 MISC ChangeLog 2671 SHA256 4009e7f32a977d7712918d2271434a636c972ff65671a744f2a69d3c3ba01c46 SHA512 3de81dd7b8310d5d82f4af7a4b8474eb2299087c2e99563a4c347462577520fce6216c97ed2e052b536623a04b93c27a3cae7a4219bd2c69d8d8c2c7ae977554 WHIRLPOOL 690eb821136c6b51c43d75d6268b1fab83e6d83a849651c548531ab629ce34a7cc97270633189e974f5d5b6e0efa7de7837cfc3fbf204e05ac91760af1079c82
 MISC ChangeLog-2015 1274 SHA256 e816481b5c2d0268e8a82a5c843b4311c709a8a30e757994685e724104528939 SHA512 dd37de6ec802586dc27a3d46a19db715787d41a88907d07ec822e810a9f889dba59c61ad0cbbe6a9c5451a3ff007427407654aeac85f1ce613532db25b918c5c WHIRLPOOL 144f021339209e7c60d72fc6c6ab7abb7e2d0b6dbe6344c9ee8b2dc2c0ae31cc1bdaf620360077ce1ff833acfed4f5a907146afa811901556d8fb3f112873fb3
diff --git a/dev-libs/qrosspython/qrosspython-0.3.2.ebuild b/dev-libs/qrosspython/qrosspython-0.3.2.ebuild
new file mode 100644
index 000000000000..01fd727a07d4
--- /dev/null
+++ b/dev-libs/qrosspython/qrosspython-0.3.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1 cmake-utils
+
+DESCRIPTION="Python scripting backend for Qross"
+HOMEPAGE="https://github.com/0xd34df00d/Qross"
+SRC_URI="https://github.com/0xd34df00d/Qross/archive/${PV}.tar.gz -> qrosscore-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+RDEPEND="
+	~dev-libs/qrosscore-${PV}
+	dev-python/sip
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	${PYTHON_DEPS}
+"
+DEPEND="${RDEPEND}
+	dev-qt/qttest:5
+"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+S="${WORKDIR}/Qross-${PV}"
+CMAKE_USE_DIR="${S}/src/bindings/python/qrosspython"
+
+mycmakeargs=( -DUSE_QT5=ON )
diff --git a/dev-python/certifi/Manifest b/dev-python/certifi/Manifest
index a707141e118d..f70e7b15d0e3 100644
--- a/dev-python/certifi/Manifest
+++ b/dev-python/certifi/Manifest
@@ -1,6 +1,6 @@
 DIST certifi-2016.9.26.tar.gz 374637 SHA256 8275aef1bbeaf05c53715bfc5d8569bd1e04ca1e8e69608cc52bcaac2604eb19 SHA512 e89c07dab0d926754012c89e12fff9ee59f771a5edd24130c8adb7ab32076971f4ea6d266ed9f3ed2010c1aba403505f5b5e97af3b5efcf3d039ddc7a7b2af39 WHIRLPOOL 52412b9cf57544ac19e89a493bf65dc212a06f053778b7c5de3d6254a7189fed9f051af99e0176efec6d7c318760f9a9fca51d1ddcf56024c973a6ffbe803496
 DIST certifi-2017.1.23.tar.gz 380397 SHA256 81877fb7ac126e9215dfb15bfef7115fdc30e798e0013065158eed0707fd99ce SHA512 8e7a03236458567545739bdef1526f81f4cef61d6cc708048f2411a0387a9b1b38d21a83739cc5207bd590d67c876e99ef1e22916065a371dae30b4a94cc1e49 WHIRLPOOL df50f3c715802cdff496a482d97d3431b79db629de3708eeac910c423c0b59c5222f73937f349dad114a7fc311f4c31fde39d1a4c0632d7f2486dd463815ff26
-EBUILD certifi-2016.9.26.ebuild 733 SHA256 1aac471f04470b53e46014f35fa87adf35c7e2e7d9028f728756a6b5960588d0 SHA512 b32e2e37164f9d103bf2337ef453368519cf0c02dabbbbe00e233f1d6129e5a90b1424b44a77cd77c7d6d8333e28f0d587d9c680fb51b2fdf52be52e6474d0a2 WHIRLPOOL ca74a094287989305e0c92f6dd31c343f864156eb438c66f6de795bf7c1f77b62987602358148aa5aadc3aa11ae4be9469c35bdab4bf70fa5ed9f5d02dbee91f
+EBUILD certifi-2016.9.26.ebuild 729 SHA256 143eb1c933f7afdee5b62241ccd549731c184884edde06bb8e7e5fc484240c9f SHA512 25eb7641880f1157853eba11656da482de7dc6679ef29f81216d285a8648ab2f661e9230ebbb5b050c056cfd3451b835a3dc0193c8207baddb4f11b223f07368 WHIRLPOOL b71c70c8bdd4a668a5ade0785dbbc75c6fe621e1a462caec31bbdf8731bcec4476ae132e4ab81944f5e0e586e9db008387b1c064d8465dd53ec03c5dd7bde14e
 EBUILD certifi-2017.1.23.ebuild 742 SHA256 65b97c2b098569edb40ef4c2c9d054a062290bc0ecf5d788605c19f1fc5d1e6d SHA512 a8050faf4d888769785733f736ebc3f2e3f760f8b2b292e8d51b70565a1dfbdedc3be9c3dc5c5f141105f514b69382e2e9c892f3bd2e363c5bd1dc093f959afe WHIRLPOOL 764630e0ebf3b339d19b03bf2d142c49096026093b45062a29f1ae11df660b795d85fe6453cfed3593bbb14148cf76d7df31697930d6d50bc21c4eaf2025ad5c
 MISC ChangeLog 8110 SHA256 3dd557deaecbb5a90035cc4de72f417965549679e52ef69b8e61d6e65b8473c8 SHA512 474e5fa1135a22de1e251807d49b3d9c8422375bbef9024159958581bd19c18c0b7ba170fb7342dce205fe8d52dfd42f225ba309ddfac869be9867420be81c8f WHIRLPOOL e14382ff91ecd97d88d74bb250d63d1d47247b9c4dad1f464d57457859f9461d3c16bcfc0b0ba7acf938e4123a5544db80cc3a0c74ab811200547668697d8e39
 MISC ChangeLog-2015 1269 SHA256 7f03c766028c0a93b71ea9473b1da396493355a0c331925225b1921f1f48f811 SHA512 c37a4995e51cd9016e3ac7d51580161268f6d9c1a9dd427f4645e84a8ab1a6663da1970ae43bbc5af80be74624e060a72fa35be8b0c5c6660563a6132236c74b WHIRLPOOL d6103146e2677da460d722e33f5ed663da6f5b368a3ca3d366107336eb043bab7e840963f50b30356aa9ec65b6bb4a2c2093cfa7e8a3e9d26e75f238349b53a5
diff --git a/dev-python/certifi/certifi-2016.9.26.ebuild b/dev-python/certifi/certifi-2016.9.26.ebuild
index 5101f5eca3f4..d446836df22a 100644
--- a/dev-python/certifi/certifi-2016.9.26.ebuild
+++ b/dev-python/certifi/certifi-2016.9.26.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-python/pyxattr/Manifest b/dev-python/pyxattr/Manifest
index 241d6aec84ff..8ba70b82f29a 100644
--- a/dev-python/pyxattr/Manifest
+++ b/dev-python/pyxattr/Manifest
@@ -1,6 +1,6 @@
 DIST pyxattr-0.5.5.tar.gz 26718 SHA256 132297c35261dd74b2ae2bd558e725b04834bbdf60997495e0110e255f5f2a3f SHA512 77b732a7e524a7c31a0511df2c96c18b214f93c6ac47276ecdf12ed95133ee506fa882b2532a7159aa2f4e02a7128e33bb8883ea632a5394297d98fb28898327 WHIRLPOOL 42db6c0d603f5bfca951a39194e5b95d4285a68b4c5e3f77ffe806fb5f05e46ce2f12dadc2d598c40178b68b83ee947b50474c7c026dc8e40378fc9c552a5180
 DIST pyxattr-0.6.0.tar.gz 31057 SHA256 09d00ee4235841a5d7d6275837c5cfc37a8b68efdd663f588505fff5a8c46ea8 SHA512 c56bf57729b5f8c8e3e19e29fd903b7365c6644abe3dcebf57ffc2f97a1e92d0e22cdc0a967c5abee3a74ba61a2a379e31a1734f45449095bdb7895b8357a9bb WHIRLPOOL aa312257d527a890c0aea65317d11ad0b6065b28aea18cc84f181cd1476de8cd31bf14af9c60bb0804a37283985830655c4d5ae9c16faec099572fb067c306f7
-EBUILD pyxattr-0.5.5.ebuild 1446 SHA256 a712d16bdf0718e587012e11532c98b2631830b29090b946d9e6362a6d422cfe SHA512 9106fbc8b4f4bf2f6ee00226bb2dfac4755f5ab51abca94c59b6950c68494b1f27a127ed17617c0d72afdb2b65aff2ed1881bce31fd17fb54d09fb1f1f04000b WHIRLPOOL 92916b43043006c9a2dd2a7d3891a98a1599534af699dc48c6ad63396f65ff39a2a780312c86cd9b8b82b440ff00a530e3d628f58e300d82617001af8840d549
+EBUILD pyxattr-0.5.5.ebuild 1443 SHA256 e78d9d798cdbf6cf7f90b87efeb80767dd90a5a14f59af0acffedcff64b5a783 SHA512 324d1aa29edbf3303bb0d87522ebfaa69a8a0c74a4f3a911cd2b31c9b29422a6a03c640a06296cd012833a659f2e80d7395cc41fd08e5cde619edc63c3eef95e WHIRLPOOL 6611a2a14b301a7d1afd4dbdbfb073107cdc078348e8a95401d3cd40ec65f04adac5dfd2eb733e37f804e41c96f63cda10ce23ebe37474cf887ede3be016661c
 EBUILD pyxattr-0.6.0.ebuild 1456 SHA256 df33844b3c2128b0402d9ad2c7f497c773af367a22a4a505442cbce4a23bf04e SHA512 70ac51e6cf3748793a239e1f4d5cd0c8cec57fcffc16bc56a1acc3d138e610cc08edb32eed3297c2b193cf7d1030cbb02f46c41f97242d1e97feb4fb0bf17e11 WHIRLPOOL 22b62458c5a0cc9c52895cd463680e4a051abec89bd417d7e2b1af671a9a8f5d8940fbcca4f519b809a2a8cfe397af0b3314bc83f82b2fa970aa57b412d23019
 EBUILD pyxattr-9999.ebuild 926 SHA256 fda1fd73b6d96b38b585b8b39227b3bd90dc076b2b5b680e57ad18e9465359a3 SHA512 8209468ad20904613a2e5e8448456dc2f14ff62191120b5574b820663487657cdcd379df368838a934ab02293c20fe7208c7998caf76efe9647c29c89511091c WHIRLPOOL 7ca02f19e672170ee44a7d6cb7d5eb3313af1da063d9eb1912092dd4976513cec214e3c18304557182e19d5f871f6b2f24cd47606d593836e5bb23f44ac35954
 MISC ChangeLog 5911 SHA256 768099c0ac1b818c5d129d03e946578785d361e453a8d3436722aa362f99cc09 SHA512 35b0505c406c44c4a449e6d73f8ceb1b342d3da3bd455ad067437b84c67d046c830c5c3d7fff6055ab9b66cb547e5936de5ef07740102a4a2dfad830b2b478ab WHIRLPOOL 65a3cc8295025797d8b94d38e5b362668eac6b00724ee1f366a6f0ede95ae669fb8b7f92005e137a5c0ea9319646eb0faeaf660a74f483f633c3f479529059f3
diff --git a/dev-python/pyxattr/pyxattr-0.5.5.ebuild b/dev-python/pyxattr/pyxattr-0.5.5.ebuild
index 164bb9cad44e..4ee9cb19876d 100644
--- a/dev-python/pyxattr/pyxattr-0.5.5.ebuild
+++ b/dev-python/pyxattr/pyxattr-0.5.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="doc test"
 
 RDEPEND="sys-apps/attr"
diff --git a/dev-ruby/gh/Manifest b/dev-ruby/gh/Manifest
index 30b88e380b29..0ec32d4b3d1f 100644
--- a/dev-ruby/gh/Manifest
+++ b/dev-ruby/gh/Manifest
@@ -1,6 +1,4 @@
-DIST gh-0.14.0.tar.gz 64205 SHA256 ddc973a2835ca2eaddaf3663413c7f3f1da6188104630cddfbab4a2b8f4d0b68 SHA512 8fd4c7bac702c57d98ee509d35dbbc81291f45977bb0e2c3b1f06e2cc3d8635d0656adafa5569ef6b3f9d6acbc563f8db7c69b43cf177dd379335d673f5ef781 WHIRLPOOL 164621c8121e0d5a9d31c39cd37f69f73bd34d71409e143ecca99df7085e1ff82e530714a2ba5e0c12f22adbc16e49c7067572e8664632a9f19638fce16ed7d8
 DIST gh-0.15.0.tar.gz 64056 SHA256 4739528f33e21cfa884a38d8e30766d8744bf9d8122b327a347e7cbee7014293 SHA512 d191477b368536770f021c7897d0c6e57c5ff4945ce4e936d9c6d13174508e1fd2d63dd44f18b106bca9c78e4e5c23bcaba19633588029239300b3a93e326599 WHIRLPOOL 270e63f22949aa0d7fe62df9c5e0f623b37cfe8bd7b6ac8d48602b072b7220ecd862675802068a435ed859913ac66d954a4f7cf5201e5ccb1e994d59fc159476
-EBUILD gh-0.14.0-r1.ebuild 679 SHA256 edbe7fb2d2a4d3f8227c068ff4fa0d05ac87fa2bf127afb77051bf72434ef3fc SHA512 2d3b1492ffb344f4078e6b486cc5125e4d757120b2390e55a1254199dd1cb2574053e837fe8676046f9ad9bbe6e1d4013553a26d8c527ed1d80cafe191b850b8 WHIRLPOOL 2bbc54ee37acc5dea6b07049382e8c99d4485773ac099cd7e243c5957843753bba6bbbc7db4771be675bb92dd72d142628b09b00643cf8f052bf049f01c37b51
-EBUILD gh-0.15.0.ebuild 728 SHA256 1854c4f8c395cf1ac9298a953d3de8ccdd3e83dbd6cbc41bf6eb6092d1e81853 SHA512 e4e75191bf1aa18c06cbe824e8617355de287797850ea834c81623d5d5efcd5f3c49021b2bc42d8182b898b0bdf5f09e6dd87a677b93c2cd5ffaada6d08e4ed4 WHIRLPOOL 49bc702d15c682bd43bf802822a13403269aa0e107153e3d850fb743067c51fda76bd318130f3fdf135c187db9882108788e64dfd21cc2e68e92d2ee60c8be9f
+EBUILD gh-0.15.0-r1.ebuild 723 SHA256 7f4f3ebcf2a7555d7375afb0a403a377f8e08387565461d024d470f93c6fdf73 SHA512 d052e9d9a675581c632a113632022512368b95e9ffb75a86d09956e3645b19b5a5be68931f386eedd641669d2211925e83a1ebb3d24a787b61b342aed38bcdfe WHIRLPOOL 7dda864c6c149a04acf616cecaf66b9c89ec922223ccff4cd69d064cd2e00e809789f6de87139599b7f47044ec12130970e07eb48c783dc3584003220035818f
 MISC ChangeLog 713 SHA256 e81476c160e0460402b71f2df7b9e9e83750493639ccadebbc0a324b24d38a75 SHA512 a7c258bcf4a92397c617462362ecf3709fcf1cd6d8fd6b028c15823a9d9036791fba3445d808df33a2505e0a0053a3875496c22ec8f0c830da0e58847fd977df WHIRLPOOL 02330caddc9411a72269bd9ad6ed5058dc7a241758dd0e6e6ceea586e4736cdcd7da91a4b98427124d3a8d88477784ce5c36b7d56bb3eb8ae7b6d096d9401abb
 MISC metadata.xml 334 SHA256 e671f500a040e2031515581988f0c5a4796bdc95eaf6d72ad3e0ff28865e2477 SHA512 d65f5adfb644204e693f51a9a0c5551905fb211aec82a0210e793b5041941df4b4dcce3d1eef0afc579c7d303418655b0191b1ac26d46770af6d47376b2747c2 WHIRLPOOL 8677370e4c2c3ea57cbe3ed9e7fd453f638a33e538529c8637061a3c8c2ec850a9645eebca36a1c16784b85f2474181cad66b033b080603a87a832dad00a3adc
diff --git a/dev-ruby/gh/gh-0.14.0-r1.ebuild b/dev-ruby/gh/gh-0.14.0-r1.ebuild
deleted file mode 100644
index d572aef480da..000000000000
--- a/dev-ruby/gh/gh-0.14.0-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby20 ruby21"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit ruby-fakegem
-
-DESCRIPTION="multi-layer client for the github api v3"
-HOMEPAGE="https://github.com/travis-ci/gh"
-SRC_URI="https://github.com/travis-ci/gh/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_bdepend "
-	dev-ruby/webmock
-"
-
-ruby_add_rdepend "
-	dev-ruby/addressable
-	dev-ruby/backports
-	>dev-ruby/faraday-0.8
-	>dev-ruby/multi_json-1.0
-	>=dev-ruby/net-http-persistent-2.7
-	dev-ruby/net-http-pipeline
-"
diff --git a/dev-ruby/gh/gh-0.15.0.ebuild b/dev-ruby/gh/gh-0.15.0-r1.ebuild
similarity index 84%
rename from dev-ruby/gh/gh-0.15.0.ebuild
rename to dev-ruby/gh/gh-0.15.0-r1.ebuild
index 303250e17f15..750f2ad8c60f 100644
--- a/dev-ruby/gh/gh-0.15.0.ebuild
+++ b/dev-ruby/gh/gh-0.15.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+USE_RUBY="ruby21 ruby22 ruby23"
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
@@ -27,6 +27,6 @@ ruby_add_rdepend "
 	dev-ruby/backports
 	>dev-ruby/faraday-0.8
 	>dev-ruby/multi_json-1.0
-	>=dev-ruby/net-http-persistent-2.9
+	>=dev-ruby/net-http-persistent-2.9:0
 	dev-ruby/net-http-pipeline
 "
diff --git a/dev-ruby/mechanize/Manifest b/dev-ruby/mechanize/Manifest
index 4b2a76776d4d..10419f350f4a 100644
--- a/dev-ruby/mechanize/Manifest
+++ b/dev-ruby/mechanize/Manifest
@@ -1,9 +1,7 @@
 DIST mechanize-2.7.3.gem 133120 SHA256 3de7f3c2799be07b2788c8226e73cf9120a04ae79602c5bab2de6287e4575302 SHA512 5a06f1e7a1c97f985f3011358061c631bcc69e3092082959f738670c9491f734bc6dbbca321018fa484ee493f2f251b8af0cf17602fe381d491ff3e18663f2eb WHIRLPOOL 661869f23fd4f0a60a9a58ba35fd02cd51a65af79c66f8ab04d18498feb20f200d2959351ff44bcb4385f0c947e3b47e1b3e046735021d60d502256df8c63f98
-DIST mechanize-2.7.4.gem 137216 SHA256 1799d05733a1176a32179a210345a555b9a2bba4d1e2977f17fdcdf114aa6dd2 SHA512 d5d0dd824f3c2cee9111a55bff7323ed280cdb8f585169e71f35adcc2b9805b019867f916b425b9bfd655eaf2453ce405e6a303369dce7aff9e0bf4bd297f8c5 WHIRLPOOL 005dbe4be81b5cacd471c69867fa52919cff78b36259270269985553328ae4258fc829656cf093067c6a690beb4b88571f482351654ca41b1d4221f1ebb0bc75
 DIST mechanize-2.7.5.gem 137216 SHA256 de042b0b2b75a53b078c8e71ba6cc24e1d2a8b4e42ec3c81f1efd5294c0f06b9 SHA512 0dfd000d8f58be3fc08e2d6e625128135d6fc2d22e899152f46f66c545c6ede0d1e7b798f4b7de2f96ccdcf7c47001a3946866d0d6a19f9faa946ade6a4bcf92 WHIRLPOOL cccd374862087454cbcc0e7093d7d183d12c76e899fe2e0b72d2ddd8fbc732aa05e7bddd999c27c86b660587d18a8d08a6c51d6c426c13d204204d62df2e32cd
 EBUILD mechanize-2.7.3-r1.ebuild 970 SHA256 dfad08de3729c9083ea5211d0b93c2a9cb68aabf5cca8753e721644528a57b7e SHA512 10e219e3a664552f89fe05bb3c6b252d6cdbbe200fff086d725aadbb8b0c15392b03aaaca66c6f9cecafdbd8d82fe898b03198ad2939890e045443f9531da942 WHIRLPOOL 01cc9e5bfe468451909c77f3fc5340033dbc905d345c43851b21ad3d36507ee1eb5548776453455dc7393204895f2afff89bd5f080b31d0d57be06d1a6e8028d
-EBUILD mechanize-2.7.4.ebuild 968 SHA256 1753a7eef63abd2924fed6444a861a394a18e67ebb1b305f478a67baad532748 SHA512 ace3c519b9bd24b3d91c5a4113380ec52c0c45bcee5b460f1a7515ddd4991a42ec695f1bdec4a1ac1f4ebf473cd34178d0c68d11d2fd6e841e5a0c3695dc75a6 WHIRLPOOL 24317cf53ef6cb3f28d06ca12ec1b604b6c08b88705b8a1fe22dbc64247e96753cd3c99a6bd2702d95c32ebce2ab4c6abc3d08acf16e1fcf5a844532a46874a6
-EBUILD mechanize-2.7.5-r1.ebuild 961 SHA256 bd57bcf3cd9ef01a9f5b569b1c6aca12649e2198524bffdf651fcaa7bb88ff3c SHA512 036eb4bfd7554b26a1f5124046c21c9db7bad56517b3dd12149c63437594126eb163232fb5b3404bf1601c3b6fb729aae754be2e80ecd39655e8b5cde5e715a4 WHIRLPOOL 54fb76eb53421ce2fe766c2c619b2ba5511c16f42c6c7c611e283d4f937b164a7124d2d8b9572b44f0887465173c5c6396d215f405df10d00b8ee6ad606af23b
+EBUILD mechanize-2.7.5-r2.ebuild 963 SHA256 211f60c00111a784d77c691d4bf82a3063f226875d9ff35b9c1e0b02f73953b3 SHA512 f831fe521dc6e3fdedce6bccfabadb42324df9a2c207887c8cd726e97ef28ca76945bc7093e6d5447c3f22458652c3fce372bb142fd98cd31aa23640e54a32c0 WHIRLPOOL 69726eb07a9e3a524a724cd0d0780a7c86201ad7fa8c11bd55794f028c2ae0edd4e9d49551b74e5238d8a5a4c606babe05e11a0097dc3ea42a1d641c45243930
 EBUILD mechanize-2.7.5.ebuild 971 SHA256 a52eb6588ed11b0438ed19745da3a07082db226746ba9692a380918aac547743 SHA512 6f16cb52659f3a868fff6ad038c151945d5ab6d67f245d52023d375dcbc51fa24d9bffff11c35d9c1724ce1491c8316bc1242961fffdf3cab59cb6b1964b6870 WHIRLPOOL 6c60704c62c5236b3f2b312dd5bc6214c03e9978436dffabd696cae7bace96bc5237034fd032f0b38d127be894d594fd7cecd0706560b57074ebc06871cc6193
 MISC ChangeLog 3645 SHA256 5a140f1b0f37952f5f977ecc691dc877d550246d6c0b652a7a9a923e1fe0b806 SHA512 bdd78c4b8147222702a62f8a87a2cc885404738aec6b657d2ec66fd4f557ff87a2405fef11927ad01dcc95436ba24eb1fd67f6aa22d9d30ce932af2ea20573cd WHIRLPOOL 92764ec9bfcb39e8982a162924750e16238348c9f71b6a86ee348e5a78af5d88d70b45d700f9626f3864b41ec89c69b39c9e74fb1dc5cf4ad838f7cd1b618db6
 MISC ChangeLog-2015 7226 SHA256 0f319ef441ce01bf1b079bf95d0ba7a6799071fb14c3daba41c96a1f98793983 SHA512 0f1abd39c043b17350c3ad163933058204fcabcae0d892c8afeebaf1d0b8612d942838d2056c21e3ab5223da2e90f612ec12ee5e42cb51cf7d54773adc6077c6 WHIRLPOOL f1a6ab5ef7d2d87aec0350ce30147155306dcd472e602b424bdf440fec57ae66efb20e0bbea88ca9fa98ed16f58c7430238cbba6f857b7cd84794fabb427671a
diff --git a/dev-ruby/mechanize/mechanize-2.7.4.ebuild b/dev-ruby/mechanize/mechanize-2.7.4.ebuild
deleted file mode 100644
index dd53d8ef6f28..000000000000
--- a/dev-ruby/mechanize/mechanize-2.7.4.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.rdoc EXAMPLES.rdoc GUIDE.rdoc README.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Ruby library used for automating interaction with websites"
-HOMEPAGE="https://github.com/sparklemotion/mechanize"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend ">=dev-ruby/hoe-3.7
-	test? ( dev-ruby/minitest:5 )"
-ruby_add_rdepend ">=dev-ruby/nokogiri-1.6
-	>=dev-ruby/net-http-digest_auth-1.1.1
-	>=dev-ruby/net-http-persistent-2.5.2
-	>=dev-ruby/ntlm-http-0.1.1
-	>=dev-ruby/webrobots-0.0.9
-	>=dev-ruby/http-cookie-1.0.2
-	>=dev-ruby/mime-types-2.0:2
-	>=dev-ruby/domain_name-0.5.1"
-
-all_ruby_install() {
-	all_fakegem_install
-
-	docinto examples
-	dodoc examples/* || die
-}
diff --git a/dev-ruby/mechanize/mechanize-2.7.5-r1.ebuild b/dev-ruby/mechanize/mechanize-2.7.5-r2.ebuild
similarity index 91%
rename from dev-ruby/mechanize/mechanize-2.7.5-r1.ebuild
rename to dev-ruby/mechanize/mechanize-2.7.5-r2.ebuild
index d185ac78d135..85b1087fadc5 100644
--- a/dev-ruby/mechanize/mechanize-2.7.5-r1.ebuild
+++ b/dev-ruby/mechanize/mechanize-2.7.5-r2.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$
 
@@ -24,7 +24,7 @@ ruby_add_bdepend ">=dev-ruby/hoe-3.7
 	test? ( dev-ruby/minitest:5 )"
 ruby_add_rdepend ">=dev-ruby/nokogiri-1.6
 	>=dev-ruby/net-http-digest_auth-1.1.1
-	>=dev-ruby/net-http-persistent-2.5.2
+	>=dev-ruby/net-http-persistent-2.5.2:0
 	>=dev-ruby/ntlm-http-0.1.1
 	>=dev-ruby/webrobots-0.0.9
 	>=dev-ruby/http-cookie-1.0.2
diff --git a/dev-ruby/net-ssh/Manifest b/dev-ruby/net-ssh/Manifest
index b716a460e1a8..a0485086e677 100644
--- a/dev-ruby/net-ssh/Manifest
+++ b/dev-ruby/net-ssh/Manifest
@@ -1,10 +1,6 @@
 DIST net-ssh-git-2.10.0.tgz 172885 SHA256 ef063f3f967ec614df49acd74ede7694124f7ffc28c20c7434ac3841c181429a SHA512 f66db6465667baf0c253868cc15aab3261675a8c15ca4b244c3cd587ae5e8b7a273959b97d5fc498ff1b19e1f06f51ea571573d243366a59ef56faf41c2ae347 WHIRLPOOL 1460082033e0cef7dc6ddb2a645943039c0619573701c25fd6e0f784b596b8010142eef295e7df84a30f4239c8da743c500571ed557081b72d5a0212ffb8e9d0
-DIST net-ssh-git-3.0.2.tgz 175130 SHA256 3d9ffc60b621f3aac4a6687e625759358b6b404122cf0bf0492f23b16c72467b SHA512 a55bab7d79b660f5cf16ad498732edeb8d555777cf70973b7d89f46f111374f2e0d6143202fd9e50cc0112aad79dd7fcfeafe0e5a470c9917650700e03ca756c WHIRLPOOL d1d78a59697fe3c4afc5c35a6492ff5cea55a891b47d1cc7daca628b1c8a92dfa6af6ae5262b1de7e62607bb8fcaa99c6b32386642457d8786467e8c784ab6b6
-DIST net-ssh-git-3.1.1.tgz 177292 SHA256 3b853688da6d7aa62abed2ce2ded83bcfced55b296c0eb8839ca33178d517c1d SHA512 e7cd5a5728568fd97f2830f3046bfe03665e368f42cac9d30b91bdfe5d4dbd51778b0706b03e1e387c5922575f5c270a8839440d9dc414ee6ba8186c81486e8f WHIRLPOOL 2f2e26b622652c0febc6a6de036d8c5db04fc6391a5bce440b15d186f2a6f13bc55a4e17ac098fe3844c16717bb5b2e6c9018e6e08720a26cfdd642ec2a8c75d
 DIST net-ssh-git-3.2.0.tgz 178267 SHA256 656c44973dc640556d283392db123a89d63455a299e78cb67fed274fee4d0de2 SHA512 2c161e096515e2c9f6fe8ca11725b7b6a92ed1234b591714bfcce5b258a38bf3631fc552b1ef029dd27ba123cc82fee8f2431d61035f1ff99102ecdf26992d5c WHIRLPOOL 999c9b2db40f6c50a7a6cf44efceabce2b93c32ac9be274fd459f2350126f9a5b4b1ed1d1385c7693fcb8c71eef77895b27f60059df607e5a3223084ffb5f803
 EBUILD net-ssh-2.10.0.ebuild 865 SHA256 cfbae5cfff1732a14ee393aa624198bb762e22a346925f32f5539d6c8ba8de7c SHA512 6cf2de96717b19d5fbe3b833fff411e061f563dfd02e0aca6bfa0bfca2a76e26cf22a2b1135498b42d974a3007438491d8272c39c1c6efe4690754f5b6960865 WHIRLPOOL b8dbe4255142ac8aaf7128a742fcaf35670e48b528f60f4248d3d7e7a09f0923f4898644933ab1bbaadd05daa45315ce4230594c96872c433295d98f9aceaa4b
-EBUILD net-ssh-3.0.2.ebuild 855 SHA256 178b040246243c4de6e01fbf0378584fdf828d002255ee9fd9c99fa7001c9f69 SHA512 7dcd74c801e9ad8741ca124ad42daddeb707a97e20d359f492c63f1e8e1d1485659b5a2118d3f246d8fdedf426554cec86e0c594b451fe9094119d3035030c3b WHIRLPOOL fdde05493a7bb43c58ad04b892774f20d2118fd12d18a31a4b235fc479689af607c08a72baa2f0e9b41c97d267dd0f57cd779427347347c563016d8c24d746d8
-EBUILD net-ssh-3.1.1.ebuild 862 SHA256 868e4594feff4e2f618192e3c90505c9faea393c98f6743e14a04c74eb635e4d SHA512 fc4312b4f85f6098f90113f42c045e0d892dbaabc542948b708a919f9c2f539518748047f369ac2af11a4f89c33b619e4a4d2a0d05f5756a54418880ce2823bd WHIRLPOOL b1cb8f424a65f2efb4ff3d9ab3dfba2aa48e1248a7219344161914731934e9e51bb0aa8f6265adae119b382e05a3030519d9916192151649a766e9b8ac83d408
 EBUILD net-ssh-3.2.0.ebuild 862 SHA256 868e4594feff4e2f618192e3c90505c9faea393c98f6743e14a04c74eb635e4d SHA512 fc4312b4f85f6098f90113f42c045e0d892dbaabc542948b708a919f9c2f539518748047f369ac2af11a4f89c33b619e4a4d2a0d05f5756a54418880ce2823bd WHIRLPOOL b1cb8f424a65f2efb4ff3d9ab3dfba2aa48e1248a7219344161914731934e9e51bb0aa8f6265adae119b382e05a3030519d9916192151649a766e9b8ac83d408
 MISC ChangeLog 5566 SHA256 411cf51229ec8053794cb7dd2fbb7baa3a0ce651908d6c1ac246643f6147e2a9 SHA512 07fad61eab3d9f2ec4fb3270779321c6a2fe4a9a4e972a8b9d827fe771dc725c9df0187cdf978b7eb36f72b2aa8c48d5831a3dbcc5bd5ffc75b987f9d66f5339 WHIRLPOOL 62d0db3069732f9415308568b615528f83371f5a2eed5ed12e0988069c58d921f7e87004ca5345b0ac70c4095f8259bb4f388106f660481117aa88c6de6ddd45
 MISC ChangeLog-2015 17104 SHA256 7b60807b5789e7f5766d79a7193bf5aa639fd50c4ce8ecb591347e4bb2a15162 SHA512 77edb3ca834dd67ebd363ba1dc8331858fb67014785d7c35d2a400fec2331dbf022cf9ad29a3fa1bd694c3d8d0a4afa6e61819394168f800f9c876848050723b WHIRLPOOL 62552540a3babbfb830a8db8ddf7bf18eeab4535d5e21cb21b642f36a4468d450abc349a4c1d546d476c50347d4eb8cfcf4c09096ed8c123774edc21bd4125bf
diff --git a/dev-ruby/net-ssh/net-ssh-3.0.2.ebuild b/dev-ruby/net-ssh/net-ssh-3.0.2.ebuild
deleted file mode 100644
index e88466df4c80..000000000000
--- a/dev-ruby/net-ssh/net-ssh-3.0.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGES.txt README.rdoc THANKS.txt"
-RUBY_FAKEGEM_EXTRAINSTALL="support"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Non-interactive SSH processing in pure Ruby"
-HOMEPAGE="https://github.com/net-ssh/net-ssh"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> net-ssh-git-${PV}.tgz"
-
-LICENSE="GPL-2"
-SLOT="3"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="test"
-
-ruby_add_rdepend "virtual/ruby-ssl"
-ruby_add_bdepend "test? ( dev-ruby/test-unit:2 >=dev-ruby/mocha-0.13 )"
-
-each_ruby_test() {
-	${RUBY} -Ilib:test test/test_all.rb || die "Tests failed."
-}
diff --git a/dev-ruby/net-ssh/net-ssh-3.1.1.ebuild b/dev-ruby/net-ssh/net-ssh-3.1.1.ebuild
deleted file mode 100644
index 89977477eb77..000000000000
--- a/dev-ruby/net-ssh/net-ssh-3.1.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGES.txt README.rdoc THANKS.txt"
-RUBY_FAKEGEM_EXTRAINSTALL="support"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Non-interactive SSH processing in pure Ruby"
-HOMEPAGE="https://github.com/net-ssh/net-ssh"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> net-ssh-git-${PV}.tgz"
-
-LICENSE="GPL-2"
-SLOT="3"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="test"
-
-ruby_add_rdepend "virtual/ruby-ssl"
-ruby_add_bdepend "test? ( dev-ruby/test-unit:2 >=dev-ruby/mocha-0.13 )"
-
-each_ruby_test() {
-	${RUBY} -Ilib:test test/test_all.rb || die "Tests failed."
-}
diff --git a/dev-ruby/rbnacl/Manifest b/dev-ruby/rbnacl/Manifest
new file mode 100644
index 000000000000..49156bea41e9
--- /dev/null
+++ b/dev-ruby/rbnacl/Manifest
@@ -0,0 +1,3 @@
+DIST rbnacl-4.0.1.gem 219648 SHA256 8161c789cf6567084b648b480e4c6081546ecea265061376f715887977ba4072 SHA512 987a3cdbaa83ee433bf8acce8c6b89202a7ae6c485a0f8bbb58b77c6c6f096fd60ec571c88cd96cabc861bc0e4fecf0611177732136a88a98a03dbb547cf6b67 WHIRLPOOL 6c53418e2b492a38b1dea30501375f893fadb64d590321cb0d1c9b0e2494adfcb3e04ddcdf7480bacd9ae26ea9af951f4ce100024bc514b4630cbf07a4486c5c
+EBUILD rbnacl-4.0.1.ebuild 687 SHA256 82ec88b8ed31c52ab591a16036caeaf9e412d1ffa6364c581810438fa3473fe6 SHA512 54cf023c5f3d37e7fdc29df3c6c682113d9ad589c8e24cf171f01f35d53ce4dc418a428a221e85c5ad034fdb871657480166ed6a9b4ae3b30388a8559527dce1 WHIRLPOOL c4081c26bc12990c242fe1835cf5e7c5dad94054bba8ef4df2532450824662b2188a31a8a785720f9112fbafef808853d7855c3daa82688ad26e7e54a3f90e11
+MISC metadata.xml 345 SHA256 3ea77cf2f32ca3e39454d905b750f22f5048c9b694a2f474637eb56e282efb9b SHA512 e18502485ad21a5e5cb71be6f2980657a40b08618b50147f50daba44e1f87f009f796e1df046bef94c05bb9305e1bf9dd1a81df33c7fdacc8c2974dd18cd309e WHIRLPOOL bc3383187b1bd11e59b5ff26a21cc54ce11f8160974c93dace0ccf4123db19524aefbc36d208b0595aa7b005cd04902f7e106b4d406f07c8961794a22e66b06b
diff --git a/dev-ruby/rbnacl/metadata.xml b/dev-ruby/rbnacl/metadata.xml
new file mode 100644
index 000000000000..22da0070927f
--- /dev/null
+++ b/dev-ruby/rbnacl/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">cryptosphere/rbnacl</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/rbnacl/rbnacl-4.0.1.ebuild b/dev-ruby/rbnacl/rbnacl-4.0.1.ebuild
new file mode 100644
index 000000000000..444d5008c7a7
--- /dev/null
+++ b/dev-ruby/rbnacl/rbnacl-4.0.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby22 ruby23"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Provides a high-level toolkit for building cryptographic systems and protocols"
+HOMEPAGE="https://github.com/cryptosphere/rbnacl"
+
+LICENSE="MIT"
+SLOT="4"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND+=" dev-libs/libsodium"
+DEPEND+=" test? ( dev-libs/libsodium )"
+
+all_ruby_prepare() {
+	sed -i -e '/coveralls/I s:^:#:' \
+		-e '/bundler/ s:^:#:' \
+		-e 's:rbnacl/libsodium:rbnacl:' spec/spec_helper.rb
+}
diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest
index 327d29e1fe04..e2f6a5c04fcc 100644
--- a/mail-mta/exim/Manifest
+++ b/mail-mta/exim/Manifest
@@ -17,12 +17,12 @@ AUX exim.service 229 SHA256 6e5372338d93b75d96bf571d892b167ac812378bcf978dcd3f33
 AUX exim.socket 139 SHA256 3e3d8b6be2741d2587a496196c08b3f2ffa05b5803b2bf9fb49359cef3a98d26 SHA512 db621116907ceb573e6f34581f47c91f751bff593054d7ddc32397b34c7f2405bec184bdb0589d2ac457fa3a61bcba072761e3a6293a99c9c764d2d9fd6069ae WHIRLPOOL 6ddceaa1bf31d995afa2dc49ab4d8e1068321ab12b158e075f6ea3f2cc4dff35c2052da2a85fe998813354755e574670086880ef7e42e2a02877d4f766706d3c
 AUX exim_at.service 140 SHA256 faad96dadbb2750faa5652d830f10d5a14be487a42e8db1cec797164acf14b73 SHA512 11c8133ee15b3e5193c9b1c59aed66c81b6e045dd23310bede9fcde6c88905db5ef08afdb798b53b75a7465915ea1247e980edf95db07a7f9b7bb58ce95fbb5a WHIRLPOOL 78f0c825526ae890458c4e71df2bd724d77d508081c6d6c2e3493732f11576ffeed755968dd2f3bcfb1cc6e0b0d61ea9fc175cd71340d908646f1a9ccbc7406e
 DIST exim-4.88.tar.bz2 1824610 SHA256 119d5fd7e31fc224e84dfa458fe182f200856bae7adf852a8287c242161f8a2d SHA512 ea094bf703628c201de119fc5f09539475e52158e935f8f2a9e4138c4a1bfe885017145c3cc5e22aa9087b195091955c69385ebf1ea0baec64ed5c1b8e3b1caf WHIRLPOOL d2d8c404217fcc5bbc7bc18500456f2709a099b0a31d4930343b836c35c62e3914fa1c686ea7d9ba5eea95f0caab13c3b76c1508eda74cb75dabb0d61472428e
-DIST exim-4.89_RC1.tar.bz2 1443535 SHA256 4e64927665c83aa9d18b1edc3cc73b1113c886925f71bd72eb3d598eb72ad573 SHA512 715e996eea555192ca847447e4e900df576e5fbaf523af5d55de20c5b762a9292aecbc4944e0764605f956fef8cf58301a59cb06560909d412fcc65bb49e0d0d WHIRLPOOL b83978375e7869d270a1ea4fa4bc81fa87274abb73de5c43e30c377ba71274629510594de477246901ecacef2533312fd0e90b8809c9c0f411b32b1c944cf9be
+DIST exim-4.89_RC2.tar.bz2 1840130 SHA256 1c73a672986d7f77ea1257e166b0c44553dc17c64f4f7386cd5b5cdeb572dd01 SHA512 f417e6f8d6e0fa13d226fd6351ebb0a7a2fef9f184258faac832835f2996f7aaea2562d1c7e6a20ff9fac2f96bc5bbdfcb031eed05c5223f352ca08bca3ba70f WHIRLPOOL a403e4296fa557b6c0ca89c45cc493f4e884d52e4755f5e94219819dd1beb0b3181c038ce4804560299e4080e19bd18a27d7bc33960cdfe0cbe51c18bc61d4b4
 DIST exim-pdf-4.88.tar.bz2 1922494 SHA256 33736fafb45c5922fcbc0def7626f46cb74927987b78943aa26949ef30789574 SHA512 8c4f580fa319c0285bcb49056ecd72b056cbbfa287a15a4d856965b4218469c85607ec7321ae0f2ba3be868f05a70a7fb8a77d5836a574417e6bffc64720bee5 WHIRLPOOL 7e3e65c58cc9a313d3440de6b79ed4f113ea265e39201aa2d36c091037c2b20718bd49f04e99f2aa029a20d238cd21178762e2ba6b470596309e83fb3ffc542b
-DIST exim-pdf-4.89_RC1.tar.bz2 1923715 SHA256 83e3ed3bd2ccf460c629ed2967148be03d0bdef408d9908be90a78cb86b572c9 SHA512 e858e10a140b6c389f2c51c580ea5e31897297ef5822f9191d2f3315fb8805b77b525a29aff4bccaca6c92be06d958f9b9a239afa7623193e0340c08af730102 WHIRLPOOL b904c0bc4f54de58d03e1bfde854be55f5b68c83d7b3aea56f1b4f29cd857e63e54348b46c3d47659ca75ce83671f2726d83d5b67cfe7c5cc90ccede8c7238ec
+DIST exim-pdf-4.89_RC2.tar.bz2 1925600 SHA256 b1e5c91e4244971d8dea1af8163bc9b630f398abdc469de993505e35e695ee53 SHA512 8f547bb4ce46c72a0b6dffa6a7a351576a073d4c9db3902a0493f0095bd1150989a5c25a56e3a5346585cef8dc956c38f2999a6399200c899dce6305c71b1289 WHIRLPOOL b6a76582409ca75af0156fc158de02f68bd7450af7926deed3df813382f5136ef919eb58fb8276db41edf6b017d8301a3a6ae6a9210ca1a63d67dfb68636820c
 DIST system_filter.exim.gz 3075 SHA256 3a3471b486a09e0a0153f7b520e1eaf26d21b97d73ea8348bdc593c00eb1e437 SHA512 cb358d3ce2499a0bb5920d962a06f2af8486e55ec90c8c928bd8e3aefb279aa57f5f960d5adfcef68bd94110b405eaa144e9629cfe6014a529c79c544600bbf3 WHIRLPOOL ce68d9c18b24eca3ef97ea810964cc1ada5f85b795a7c432ad39b5788188a16419101c92fb52b418738d760e1d658f7a41485e5561079a667d84d276c71be5a4
 EBUILD exim-4.88.ebuild 12240 SHA256 85ddd2d1fae732a2cf73d513a3ceb01f4001dd1d45f601f2161fbf0f509679c6 SHA512 d3d5a6191910b3a7ee9d0530755611f257633ea81131d39f25250035aa576d88768f4283647a7e82a7561c7bdbf88431bdf753cbe92c0555ab146ddd0044a3b3 WHIRLPOOL cde091482b1d7c48ba0027ce000208e7900d812428695968e8999cc14dd12412cf3f0a9a13f62814995a370153b4d8536c8754338f83782da5110ef54887d5da
-EBUILD exim-4.89_rc1.ebuild 12248 SHA256 7b446dfcaf9476184003c831ff867e1f4635d761f00879882ee84b904cbcb4b8 SHA512 0189d267204e5eb7425916d17b7638e36b183460e941ac785ab8749782a19916240c6f38991f91bacc3c7a9f364ed1010a409e8f8f0f7c1be57a740b7913cb62 WHIRLPOOL 8f35ff7f48c71ef0f6091f450293adb1fcf96f38587d089e936d55f0dcd316d77a001f240351644196de5e0fda47cb81110aa25a7fe4b744b4add00722b1a85e
+EBUILD exim-4.89_rc2.ebuild 12248 SHA256 7b446dfcaf9476184003c831ff867e1f4635d761f00879882ee84b904cbcb4b8 SHA512 0189d267204e5eb7425916d17b7638e36b183460e941ac785ab8749782a19916240c6f38991f91bacc3c7a9f364ed1010a409e8f8f0f7c1be57a740b7913cb62 WHIRLPOOL 8f35ff7f48c71ef0f6091f450293adb1fcf96f38587d089e936d55f0dcd316d77a001f240351644196de5e0fda47cb81110aa25a7fe4b744b4add00722b1a85e
 MISC ChangeLog 13030 SHA256 5686d9f0d2be8158ab3c640f0e0d2c15442db59f0dfbffaebb260f1f96e219d8 SHA512 6e0a8aecdee434eb1c7fa9420de9a1ba07ee7b629232c2ba9a03e33adfb75b049656a85fa42e972bec6e1c466f07d0f92ff77599a01ba3893348406898f84093 WHIRLPOOL 79642a92025c6cd8686ec1c0855ad44783a833875e2133a7457c19bb3a4baeb7f117ac5dffba270ef92309caaf3231551906c9817c48fd38e9d3fa744741c504
 MISC ChangeLog-2015 59473 SHA256 0867a4dc55a8e07aa1405df7cf42cb81b69ac23448033497fc1e320a3f495e8e SHA512 9617c4567c0186089802445a8457fc3ccd087285a7075a30e5072a6d53aba47a5820d391f149e9b3dfd9e576848888172a05d1a7073136dd4720fee5a43da289 WHIRLPOOL 14e758c28088f809a6052016e09f3c6e556716ce254d59bdadf1ffed8824d9cd88f435940743193332f3d9a2da6bf4be98d24be04f0602e017ff59c05c85ee28
 MISC metadata.xml 2482 SHA256 ec45d3ec75d244d4e842d76157f927deb78c933d01fabbefd1dc3f3a1666494d SHA512 dcda0d8164098a41d7defa30b84b36bfdc6fc1fecce2dc680aa22341f67be9dad281bdee0b6f9028459b4a62d4f3a83a16bd1cdca99238b114532c7b06f5c25f WHIRLPOOL 5bdfc907c3fe72cfa3846a183737de42315ebee92e168835347a419366049daab2b9ad236bc24889828d96dac8cd6d44711ccbe8de895ec9da909f5ec1c4d72c
diff --git a/mail-mta/exim/exim-4.89_rc1.ebuild b/mail-mta/exim/exim-4.89_rc2.ebuild
similarity index 100%
rename from mail-mta/exim/exim-4.89_rc1.ebuild
rename to mail-mta/exim/exim-4.89_rc2.ebuild
diff --git a/media-libs/opencollada/Manifest b/media-libs/opencollada/Manifest
index a1225f9a46d8..0741d94ca447 100644
--- a/media-libs/opencollada/Manifest
+++ b/media-libs/opencollada/Manifest
@@ -8,7 +8,7 @@ DIST opencollada-1.6.31.tar.gz 11832790 SHA256 ef338d03646da3039cf67382b19f39fe5
 DIST opencollada-1.6.36.tar.gz 12275972 SHA256 774b41611ab3ebb3a6008d32bcfd326d4ac1545d5316ba383b4ae90f16335701 SHA512 bcee958d229a6d28043afd6dbe2e8536668ce57b510d2759ef68420aa9ac5b8f82ab5956fbcef7ecc6177ad5f0f20c9a7364a886236e583c85215de86f7066f8 WHIRLPOOL 2184e01d903f662afa94369445336d510bcc9a5f9e1a54677476d41cf920052f9fab5190e8f2c2ddc775ee0062e7cbb5f0a1c1b120d2476217ff78ccd9c38b8b
 EBUILD opencollada-1.6.25.ebuild 1698 SHA256 351e3ac997ff831d305bbfd81c3d391df70869853da2d7cfa6a7f38d8bd774fa SHA512 15a86fa9d99c1c0905f54c830152af549e3f787817e9ec0f44034ba4645fef242afafa5d5b1a0d8ee23c5309c6d9e3c18d043f4d1d81aebdccc36d262f5afc84 WHIRLPOOL a97f5b24622e2494a810194d0797c03fb03611604f9bb9b39e138dd8b7000c6492013f8c760aa49cddc15de6b1c28160380e0dbb873ed224134a4d6ec208db89
 EBUILD opencollada-1.6.31.ebuild 1701 SHA256 0d3a74dc392b5b559818aca27012ee3ed52fb536651d1b64b46adc82f6865aab SHA512 a8aa66d72df30c242ebbabf78b11a482e72dd36da40a74f43f8a0e5e880036a95c7568a9b7a3caf4795062442f7e2c7cd2f40b8ea92323c7e71d4a5fb5c29db3 WHIRLPOOL 7596b2e61253be2bc0c87320a53d494a5b581e9f8f136f12ced01ccf435cd2a5d56a25fd1c15b4c7ff861e489fe5ff1d2d30c4b1bc2ef9953262451b4ee5b185
-EBUILD opencollada-1.6.36.ebuild 1540 SHA256 6c9780e0a8c623bc0b7b19a2d7354bae21280e7d93860986a37da59a3ac16800 SHA512 a9cce5c75ee60277a299b92a1db766b07ef4a4192302a69f9b644affc45cd61774c21ebf4c371dd1aaca14475bb17940b75d70dea2ca8ae2f33028abad0e6a9c WHIRLPOOL 99268ba6c2e23a5130cdcf6f3394581129aa52b3e1b21580ebac83c352a435de04bfe8d149a8a6fca54540b985818029d8791d45be5cf8a5607a9fba8df9382a
+EBUILD opencollada-1.6.36.ebuild 1455 SHA256 97f69c3bc43f0bba6a8aeba2bbd6712704d83b5d51edbc15bee2377ac7692455 SHA512 c60b737b57dfc028de5ce0917733c8751d7527ff6d8ce3501330ddd8ce33f540bedcabc1bd07146fd36fe92117c7e3c109588ed8e7a50fc8c870c1e109a580fc WHIRLPOOL a8b517cf00197ac79edefb74bbd529394d321a8213bb56df0b63346bc767f4a9f4afbe03d7b7cddb7dc2af6a579bcc33ddecded5ba455296c95b5bea3b4f8f73
 MISC ChangeLog 6664 SHA256 fcf2665568528b9870e0d87f0dbdb9eff34ce22a33a8d0babe362fb14043633c SHA512 b370d1f7ae9e5d10d9a3640cd9b17dcf9811f69bbd92b6b3becca0efbdc90a38da3d550e47781978bd40ccac0a0a0b9f69b854e952fde0e150e32e9bd3a743b0 WHIRLPOOL 8255006d88dc3a0c01ddeb07d6d860e78282484aef3d2159eac6ad76ea2c5020e396aaab9c5ca1c8e07ee811912b3ef86dce06bcf84df5fc1e906148a8247070
 MISC ChangeLog-2015 2481 SHA256 728239c63aa9e1d8458b26203dc589abc2ea6815e1a8b880fb02d0b90da3d2b9 SHA512 dc8338913930a3bb45071feb37bf54fe525e2cebc652119598cc2269ad826f51052f3b36c8d38c1ecb53f078410393a90539a5587660796778682b7ed7cfed21 WHIRLPOOL 5c5aa6a7e2d75276d90de9f38d38dba45f824d4f2e1095bd778f9acc3b9a17e3cb7e7bb7ae332541eec0513b5ff1a419aabb907d5f207dbbf79c2e7430132476
 MISC metadata.xml 619 SHA256 fd6776ce5b0bb865dab13840509a381aa74a9315a7c2db82d2e7f662ded64fb2 SHA512 34b215a39874db328d26e9c03740672f701d6c9398a7cac50de7f42b9f6cc854ee4b04358d4afeab3966839f401189ad329b4376c977b80c94973838e08c0f63 WHIRLPOOL 06dbe92d55543363f363f160add16cbd898e57ee7e8370e0f9b0bde44bb99a50be92dff4e92a78bedc4aa454cfacb7ee1f099db76409e213a6f6f8453ae93edb
diff --git a/media-libs/opencollada/opencollada-1.6.36.ebuild b/media-libs/opencollada/opencollada-1.6.36.ebuild
index 34c4aa67ab8e..319304da732e 100644
--- a/media-libs/opencollada/opencollada-1.6.36.ebuild
+++ b/media-libs/opencollada/opencollada-1.6.36.ebuild
@@ -15,7 +15,7 @@ SLOT="0"
 
 KEYWORDS="~amd64 ~ppc64 ~x86"
 
-IUSE="expat static-libs"
+IUSE="static-libs"
 
 # This is still needed to have so version numbers
 MY_SOVERSION="$(get_version_component_range 1-2)"
@@ -24,8 +24,7 @@ RDEPEND="dev-libs/libpcre
 	dev-libs/zziplib
 	media-libs/lib3ds
 	sys-libs/zlib
-	expat? ( dev-libs/expat )
-	!expat? ( dev-libs/libxml2 )"
+	dev-libs/libxml2"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
@@ -50,8 +49,7 @@ src_configure() {
 	local mycmakeargs=(
 		-DUSE_SHARED=ON
 		-DUSE_STATIC=$(usex static-libs)
-		-DUSE_EXPAT=$(usex expat)
-		-DUSE_LIBXML=$(usex !expat)
+		-DUSE_LIBXML=ON
 		-Dsoversion=${MY_SOVERSION}
 	)
 
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index e303e8d0c987..5e8bf7185057 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Fri, 03 Feb 2017 04:43:21 +0000
+Fri, 03 Feb 2017 12:43:28 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index e303e8d0c987..5e8bf7185057 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Fri, 03 Feb 2017 04:43:21 +0000
+Fri, 03 Feb 2017 12:43:28 +0000
diff --git a/metadata/md5-cache/app-emulation/lxc-2.0.7 b/metadata/md5-cache/app-emulation/lxc-2.0.7
new file mode 100644
index 000000000000..540de1cc4b90
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/lxc-2.0.7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=net-libs/gnutls sys-libs/libcap cgmanager? ( app-admin/cgmanager ) lua? ( >=dev-lang/lua-5.1:= ) python? ( 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_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) seccomp? ( sys-libs/libseccomp ) doc? ( app-text/docbook-sgml-utils ) >=sys-kernel/linux-headers-3.2 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DESCRIPTION=LinuX Containers userspace utilities
+EAPI=6
+HOMEPAGE=https://linuxcontainers.org/
+IUSE=cgmanager doc examples lua python seccomp python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64 ~arm ~arm64
+LICENSE=LGPL-3
+RDEPEND=net-libs/gnutls sys-libs/libcap cgmanager? ( app-admin/cgmanager ) lua? ( >=dev-lang/lua-5.1:= ) python? ( 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_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) seccomp? ( sys-libs/libseccomp ) sys-process/criu sys-apps/util-linux app-misc/pax-utils virtual/awk
+REQUIRED_USE=python? ( || ( python_targets_python3_4 python_targets_python3_5 ) )
+SLOT=0
+SRC_URI=https://github.com/lxc/lxc/archive/lxc-2.0.7.tar.gz
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	distutils-r1	f1707af2d2ad4cf700a9e690de6ed855	eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	linux-info	af49d8ab3be91bb1d38b7201dc9e5123	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	7bb10a841be2368af0c00f27dd67560b	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d275302cd06aedef2ba08f81f3104206	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=234a5f1370588d3eb9beff51ab53c818
diff --git a/metadata/md5-cache/app-text/paperwork-1.1 b/metadata/md5-cache/app-text/paperwork-1.1
new file mode 100644
index 000000000000..4a139461f401
--- /dev/null
+++ b/metadata/md5-cache/app-text/paperwork-1.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=~app-text/paperwork-backend-1.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( dev-python/configparser[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/libpillowfight[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pycairo[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pyenchant[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pyinsane:2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pyocr-0.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/simplebayes[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-util/glade[introspection,python] x11-libs/gtk+:3[introspection] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DESCRIPTION=a personal document manager for scanned documents (and PDFs)
+EAPI=6
+HOMEPAGE=https://github.com/jflesch/paperwork
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=~app-text/paperwork-backend-1.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( dev-python/configparser[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/libpillowfight[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pycairo[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pyenchant[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pyinsane:2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pyocr-0.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/simplebayes[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-util/glade[introspection,python] x11-libs/gtk+:3[introspection] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=https://github.com/jflesch/paperwork/archive/1.1.tar.gz -> paperwork-1.1.tar.gz
+_eclasses_=distutils-r1	f1707af2d2ad4cf700a9e690de6ed855	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	7bb10a841be2368af0c00f27dd67560b	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d275302cd06aedef2ba08f81f3104206	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=5b7550c9bc7dd6f1cad77f747c3f2004
diff --git a/metadata/md5-cache/app-text/paperwork-backend-1.1 b/metadata/md5-cache/app-text/paperwork-backend-1.1
new file mode 100644
index 000000000000..771176c4c2c6
--- /dev/null
+++ b/metadata/md5-cache/app-text/paperwork-backend-1.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=app-text/poppler[introspection] python_targets_python2_7? ( dev-python/configparser[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pycairo[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pycountry[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pyenchant[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/python-levenshtein[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/simplebayes[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/termcolor[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/whoosh[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DESCRIPTION=Backend part of Paperwork (Python API, no UI)
+EAPI=6
+HOMEPAGE=https://github.com/jflesch/paperwork-backend
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=app-text/poppler[introspection] python_targets_python2_7? ( dev-python/configparser[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pycairo[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pycountry[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pyenchant[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/python-levenshtein[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/simplebayes[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/termcolor[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/whoosh[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=https://github.com/jflesch/paperwork-backend/archive/1.1.tar.gz -> paperwork-backend-1.1.tar.gz
+_eclasses_=distutils-r1	f1707af2d2ad4cf700a9e690de6ed855	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	7bb10a841be2368af0c00f27dd67560b	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d275302cd06aedef2ba08f81f3104206	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=691bc29e2dbbd134c1fc68c0065ee990
diff --git a/metadata/md5-cache/dev-db/postgis-2.2.5 b/metadata/md5-cache/dev-db/postgis-2.2.5
new file mode 100644
index 000000000000..f69b37fe96c8
--- /dev/null
+++ b/metadata/md5-cache/dev-db/postgis-2.2.5
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare pretend setup
+DEPEND=|| ( dev-db/postgresql:9.5[server] dev-db/postgresql:9.4[server] dev-db/postgresql:9.3[server] dev-db/postgresql:9.2[server] dev-db/postgresql:9.1[server] ) dev-libs/json-c dev-libs/libxml2:2 >=sci-libs/geos-3.5.0 >=sci-libs/proj-4.6.0 >=sci-libs/gdal-1.10.0:= gtk? ( x11-libs/gtk+:2 ) doc? ( app-text/docbook-xsl-stylesheets app-text/docbook-xml-dtd:4.5 dev-libs/libxslt || ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[imagemagick,png] ) ) virtual/pkgconfig test? ( dev-util/cunit ) !<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=Geographic Objects for PostgreSQL
+EAPI=6
+HOMEPAGE=http://postgis.net
+IUSE=doc gtk static-libs test
+KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=|| ( dev-db/postgresql:9.5[server] dev-db/postgresql:9.4[server] dev-db/postgresql:9.3[server] dev-db/postgresql:9.2[server] dev-db/postgresql:9.1[server] ) dev-libs/json-c dev-libs/libxml2:2 >=sci-libs/geos-3.5.0 >=sci-libs/proj-4.6.0 >=sci-libs/gdal-1.10.0:= gtk? ( x11-libs/gtk+:2 )
+REQUIRED_USE=test? ( doc )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://download.osgeo.org/postgis/source/postgis-2.2.5.tar.gz
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	ea170b525f6a38a006be05c9d9429f13	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=02f06b83e49d523dabef889104341f02
diff --git a/metadata/md5-cache/dev-db/postgis-2.3.2 b/metadata/md5-cache/dev-db/postgis-2.3.2
new file mode 100644
index 000000000000..1d5cdb7992f3
--- /dev/null
+++ b/metadata/md5-cache/dev-db/postgis-2.3.2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare pretend setup
+DEPEND=|| ( dev-db/postgresql:9.5[server] dev-db/postgresql:9.4[server] dev-db/postgresql:9.3[server] dev-db/postgresql:9.2[server] dev-db/postgresql:9.1[server] ) dev-libs/json-c dev-libs/libxml2:2 >=sci-libs/geos-3.5.0 >=sci-libs/proj-4.6.0 >=sci-libs/gdal-1.10.0:= gtk? ( x11-libs/gtk+:2 ) doc? ( app-text/docbook-xsl-stylesheets app-text/docbook-xml-dtd:4.5 dev-libs/libxslt || ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[imagemagick,png] ) ) virtual/pkgconfig test? ( dev-util/cunit ) !<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=Geographic Objects for PostgreSQL
+EAPI=6
+HOMEPAGE=http://postgis.net
+IUSE=doc gtk static-libs test
+KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=|| ( dev-db/postgresql:9.5[server] dev-db/postgresql:9.4[server] dev-db/postgresql:9.3[server] dev-db/postgresql:9.2[server] dev-db/postgresql:9.1[server] ) dev-libs/json-c dev-libs/libxml2:2 >=sci-libs/geos-3.5.0 >=sci-libs/proj-4.6.0 >=sci-libs/gdal-1.10.0:= gtk? ( x11-libs/gtk+:2 )
+REQUIRED_USE=test? ( doc )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://download.osgeo.org/postgis/source/postgis-2.3.2.tar.gz
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	ea170b525f6a38a006be05c9d9429f13	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=02f06b83e49d523dabef889104341f02
diff --git a/metadata/md5-cache/dev-lang/ruby-2.0.0_p648 b/metadata/md5-cache/dev-lang/ruby-2.0.0_p648
deleted file mode 100644
index 2f5c344487cf..000000000000
--- a/metadata/md5-cache/dev-lang/ruby-2.0.0_p648
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm ) ssl? ( dev-libs/openssl:0= ) socks5? ( >=net-proxy/dante-1.1.13 ) ncurses? ( sys-libs/ncurses:0= ) readline? ( sys-libs/readline:0= ) dev-libs/libyaml virtual/libffi sys-libs/zlib >=app-eselect/eselect-ruby-20100402 !<dev-ruby/rdoc-3.9.4 !<dev-ruby/rubygems-1.8.10-r1 !<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=An object-oriented scripting language
-EAPI=5
-HOMEPAGE=http://www.ruby-lang.org/
-IUSE=berkdb debug doc examples gdbm ipv6 +rdoc rubytests socks5 ssl xemacs ncurses +readline cpu_flags_x86_sse2
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=|| ( Ruby-BSD BSD-2 )
-PDEPEND=virtual/rubygems[ruby_targets_ruby20] >=dev-ruby/json-1.7.7[ruby_targets_ruby20] >=dev-ruby/rake-0.9.6[ruby_targets_ruby20] rdoc? ( >=dev-ruby/rdoc-4.0.0[ruby_targets_ruby20] ) xemacs? ( app-xemacs/ruby-modes )
-RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm ) ssl? ( dev-libs/openssl:0= ) socks5? ( >=net-proxy/dante-1.1.13 ) ncurses? ( sys-libs/ncurses:0= ) readline? ( sys-libs/readline:0= ) dev-libs/libyaml virtual/libffi sys-libs/zlib >=app-eselect/eselect-ruby-20100402 !<dev-ruby/rdoc-3.9.4 !<dev-ruby/rubygems-1.8.10-r1
-SLOT=2.0
-SRC_URI=mirror://ruby/2.0/ruby-2.0.0-p648.tar.xz https://dev.gentoo.org/~flameeyes/ruby-team/ruby-patches-2.0.0_p648.tar.bz2
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=3246fb137b839a4c8283d9bb8a444049
diff --git a/metadata/md5-cache/dev-libs/qrosscore-0.3.2 b/metadata/md5-cache/dev-libs/qrosscore-0.3.2
new file mode 100644
index 000000000000..1069f0d34ebc
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/qrosscore-0.3.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-qt/qtcore:5 dev-qt/qtwidgets:5 dev-qt/designer:5 dev-qt/qtscript:5 sys-devel/make >=dev-util/cmake-3.5.2
+DESCRIPTION=KDE-free version of Kross (core libraries and Qt Script backend)
+EAPI=6
+HOMEPAGE=https://github.com/0xd34df00d/Qross
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtwidgets:5 dev-qt/designer:5 dev-qt/qtscript:5
+SLOT=0
+SRC_URI=https://github.com/0xd34df00d/Qross/archive/0.3.2.tar.gz -> qrosscore-0.3.2.tar.gz
+_eclasses_=cmake-utils	f0c2647fb321257c91c6a967f362d053	eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	7bb10a841be2368af0c00f27dd67560b	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=598f6ac57c3c7dd2731c761b0af0ec51
diff --git a/metadata/md5-cache/dev-libs/qrosspython-0.3.2 b/metadata/md5-cache/dev-libs/qrosspython-0.3.2
new file mode 100644
index 000000000000..056d92a7ab11
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/qrosspython-0.3.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=~dev-libs/qrosscore-0.3.2 dev-python/sip dev-qt/qtcore:5 dev-qt/qtgui:5 >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-qt/qttest:5 sys-devel/make >=dev-util/cmake-3.5.2
+DESCRIPTION=Python scripting backend for Qross
+EAPI=6
+HOMEPAGE=https://github.com/0xd34df00d/Qross
+IUSE=debug python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=~dev-libs/qrosscore-0.3.2 dev-python/sip dev-qt/qtcore:5 dev-qt/qtgui:5 >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)]
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=https://github.com/0xd34df00d/Qross/archive/0.3.2.tar.gz -> qrosscore-0.3.2.tar.gz
+_eclasses_=cmake-utils	f0c2647fb321257c91c6a967f362d053	eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	7bb10a841be2368af0c00f27dd67560b	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d275302cd06aedef2ba08f81f3104206	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=abb61e94004aaa79561b9a1e1617f54f
diff --git a/metadata/md5-cache/dev-python/certifi-2016.9.26 b/metadata/md5-cache/dev-python/certifi-2016.9.26
index 0b68099046d9..5ba316309a3d 100644
--- a/metadata/md5-cache/dev-python/certifi-2016.9.26
+++ b/metadata/md5-cache/dev-python/certifi-2016.9.26
@@ -4,11 +4,11 @@ DESCRIPTION=Python package for providing Mozilla's CA Bundle
 EAPI=6
 HOMEPAGE=http://certifi.io/ https://pypi.python.org/pypi/certifi
 IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1
 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 )
 SLOT=0
 SRC_URI=mirror://pypi/c/certifi/certifi-2016.9.26.tar.gz
 _eclasses_=distutils-r1	f1707af2d2ad4cf700a9e690de6ed855	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	7bb10a841be2368af0c00f27dd67560b	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d275302cd06aedef2ba08f81f3104206	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=446d41532782f1e58c9d1ed26d51b042
+_md5_=80b5bf7888c346916eb9068867bd5a7b
diff --git a/metadata/md5-cache/dev-python/pyxattr-0.5.5 b/metadata/md5-cache/dev-python/pyxattr-0.5.5
index 9448503ec0e0..09bfcff2e44f 100644
--- a/metadata/md5-cache/dev-python/pyxattr-0.5.5
+++ b/metadata/md5-cache/dev-python/pyxattr-0.5.5
@@ -4,11 +4,11 @@ DESCRIPTION=Python interface to xattr
 EAPI=5
 HOMEPAGE=http://pyxattr.k1024.org/
 IUSE=doc test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=LGPL-2.1
 RDEPEND=sys-apps/attr python_targets_pypy? ( virtual/pypy: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_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyxattr/pyxattr-0.5.5.tar.gz http://pyxattr.k1024.org/downloads/pyxattr-0.5.5.tar.gz
 _eclasses_=distutils-r1	f1707af2d2ad4cf700a9e690de6ed855	eutils	ea170b525f6a38a006be05c9d9429f13	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	7bb10a841be2368af0c00f27dd67560b	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d275302cd06aedef2ba08f81f3104206	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=f4e29e2474e609ddf1f614517d2bd84d
+_md5_=1aef586c7574c4dcd74614889f1df750
diff --git a/metadata/md5-cache/dev-ruby/gh-0.14.0-r1 b/metadata/md5-cache/dev-ruby/gh-0.14.0-r1
deleted file mode 100644
index 54f007753392..000000000000
--- a/metadata/md5-cache/dev-ruby/gh-0.14.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby20? ( dev-ruby/webmock[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/webmock[ruby_targets_ruby21] ) test? ( ruby_targets_ruby20? ( dev-ruby/addressable[ruby_targets_ruby20] dev-ruby/backports[ruby_targets_ruby20] >dev-ruby/faraday-0.8[ruby_targets_ruby20] >dev-ruby/multi_json-1.0[ruby_targets_ruby20] >=dev-ruby/net-http-persistent-2.7[ruby_targets_ruby20] dev-ruby/net-http-pipeline[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/addressable[ruby_targets_ruby21] dev-ruby/backports[ruby_targets_ruby21] >dev-ruby/faraday-0.8[ruby_targets_ruby21] >dev-ruby/multi_json-1.0[ruby_targets_ruby21] >=dev-ruby/net-http-persistent-2.7[ruby_targets_ruby21] dev-ruby/net-http-pipeline[ruby_targets_ruby21] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby21] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
-DESCRIPTION=multi-layer client for the github api v3
-EAPI=5
-HOMEPAGE=https://github.com/travis-ci/gh
-IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 doc test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby20? ( dev-ruby/addressable[ruby_targets_ruby20] dev-ruby/backports[ruby_targets_ruby20] >dev-ruby/faraday-0.8[ruby_targets_ruby20] >dev-ruby/multi_json-1.0[ruby_targets_ruby20] >=dev-ruby/net-http-persistent-2.7[ruby_targets_ruby20] dev-ruby/net-http-pipeline[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/addressable[ruby_targets_ruby21] dev-ruby/backports[ruby_targets_ruby21] >dev-ruby/faraday-0.8[ruby_targets_ruby21] >dev-ruby/multi_json-1.0[ruby_targets_ruby21] >=dev-ruby/net-http-persistent-2.7[ruby_targets_ruby21] dev-ruby/net-http-pipeline[ruby_targets_ruby21] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
-REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
-SLOT=0
-SRC_URI=https://github.com/travis-ci/gh/archive/v0.14.0.tar.gz -> gh-0.14.0.tar.gz
-_eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-fakegem	2b249022d4895a29827658b7d630c461	ruby-ng	934780d41ab18a9ff091703f511371be	ruby-utils	382c3a262907e1219a21618dfd1a01a0	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=b3d529e830d449c5b825b14ed0fe66b3
diff --git a/metadata/md5-cache/dev-ruby/gh-0.15.0 b/metadata/md5-cache/dev-ruby/gh-0.15.0
deleted file mode 100644
index 08c78075ce17..000000000000
--- a/metadata/md5-cache/dev-ruby/gh-0.15.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby20? ( dev-ruby/webmock[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/webmock[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/webmock[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/webmock[ruby_targets_ruby23] ) test? ( ruby_targets_ruby20? ( >=dev-ruby/addressable-2.4.0[ruby_targets_ruby20] =dev-ruby/addressable-2.4*[ruby_targets_ruby20] dev-ruby/backports[ruby_targets_ruby20] >dev-ruby/faraday-0.8[ruby_targets_ruby20] >dev-ruby/multi_json-1.0[ruby_targets_ruby20] >=dev-ruby/net-http-persistent-2.9[ruby_targets_ruby20] dev-ruby/net-http-pipeline[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/addressable-2.4.0[ruby_targets_ruby21] =dev-ruby/addressable-2.4*[ruby_targets_ruby21] dev-ruby/backports[ruby_targets_ruby21] >dev-ruby/faraday-0.8[ruby_targets_ruby21] >dev-ruby/multi_json-1.0[ruby_targets_ruby21] >=dev-ruby/net-http-persistent-2.9[ruby_targets_ruby21] dev-ruby/net-http-pipeline[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/addressable-2.4.0[ruby_targets_ruby22] =dev-ruby/addressable-2.4*[ruby_targets_ruby22] dev-ruby/backports[ruby_targets_ruby22] >dev-ruby/faraday-0.8[ruby_targets_ruby22] >dev-ruby/multi_json-1.0[ruby_targets_ruby22] >=dev-ruby/net-http-persistent-2.9[ruby_targets_ruby22] dev-ruby/net-http-pipeline[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/addressable-2.4.0[ruby_targets_ruby23] =dev-ruby/addressable-2.4*[ruby_targets_ruby23] dev-ruby/backports[ruby_targets_ruby23] >dev-ruby/faraday-0.8[ruby_targets_ruby23] >dev-ruby/multi_json-1.0[ruby_targets_ruby23] >=dev-ruby/net-http-persistent-2.9[ruby_targets_ruby23] dev-ruby/net-http-pipeline[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
-DESCRIPTION=multi-layer client for the github api v3
-EAPI=5
-HOMEPAGE=https://github.com/travis-ci/gh
-IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/addressable-2.4.0[ruby_targets_ruby20] =dev-ruby/addressable-2.4*[ruby_targets_ruby20] dev-ruby/backports[ruby_targets_ruby20] >dev-ruby/faraday-0.8[ruby_targets_ruby20] >dev-ruby/multi_json-1.0[ruby_targets_ruby20] >=dev-ruby/net-http-persistent-2.9[ruby_targets_ruby20] dev-ruby/net-http-pipeline[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/addressable-2.4.0[ruby_targets_ruby21] =dev-ruby/addressable-2.4*[ruby_targets_ruby21] dev-ruby/backports[ruby_targets_ruby21] >dev-ruby/faraday-0.8[ruby_targets_ruby21] >dev-ruby/multi_json-1.0[ruby_targets_ruby21] >=dev-ruby/net-http-persistent-2.9[ruby_targets_ruby21] dev-ruby/net-http-pipeline[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/addressable-2.4.0[ruby_targets_ruby22] =dev-ruby/addressable-2.4*[ruby_targets_ruby22] dev-ruby/backports[ruby_targets_ruby22] >dev-ruby/faraday-0.8[ruby_targets_ruby22] >dev-ruby/multi_json-1.0[ruby_targets_ruby22] >=dev-ruby/net-http-persistent-2.9[ruby_targets_ruby22] dev-ruby/net-http-pipeline[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/addressable-2.4.0[ruby_targets_ruby23] =dev-ruby/addressable-2.4*[ruby_targets_ruby23] dev-ruby/backports[ruby_targets_ruby23] >dev-ruby/faraday-0.8[ruby_targets_ruby23] >dev-ruby/multi_json-1.0[ruby_targets_ruby23] >=dev-ruby/net-http-persistent-2.9[ruby_targets_ruby23] dev-ruby/net-http-pipeline[ruby_targets_ruby23] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
-SLOT=0
-SRC_URI=https://github.com/travis-ci/gh/archive/v0.15.0.tar.gz -> gh-0.15.0.tar.gz
-_eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-fakegem	2b249022d4895a29827658b7d630c461	ruby-ng	934780d41ab18a9ff091703f511371be	ruby-utils	382c3a262907e1219a21618dfd1a01a0	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=c532e39888d15936d48ecd5b1787c3a7
diff --git a/metadata/md5-cache/dev-ruby/gh-0.15.0-r1 b/metadata/md5-cache/dev-ruby/gh-0.15.0-r1
new file mode 100644
index 000000000000..e448f5c2a865
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/gh-0.15.0-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby21? ( dev-ruby/webmock[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/webmock[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/webmock[ruby_targets_ruby23] ) test? ( ruby_targets_ruby21? ( >=dev-ruby/addressable-2.4.0[ruby_targets_ruby21] =dev-ruby/addressable-2.4*[ruby_targets_ruby21] dev-ruby/backports[ruby_targets_ruby21] >dev-ruby/faraday-0.8[ruby_targets_ruby21] >dev-ruby/multi_json-1.0[ruby_targets_ruby21] >=dev-ruby/net-http-persistent-2.9:0[ruby_targets_ruby21] dev-ruby/net-http-pipeline[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/addressable-2.4.0[ruby_targets_ruby22] =dev-ruby/addressable-2.4*[ruby_targets_ruby22] dev-ruby/backports[ruby_targets_ruby22] >dev-ruby/faraday-0.8[ruby_targets_ruby22] >dev-ruby/multi_json-1.0[ruby_targets_ruby22] >=dev-ruby/net-http-persistent-2.9:0[ruby_targets_ruby22] dev-ruby/net-http-pipeline[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/addressable-2.4.0[ruby_targets_ruby23] =dev-ruby/addressable-2.4*[ruby_targets_ruby23] dev-ruby/backports[ruby_targets_ruby23] >dev-ruby/faraday-0.8[ruby_targets_ruby23] >dev-ruby/multi_json-1.0[ruby_targets_ruby23] >=dev-ruby/net-http-persistent-2.9:0[ruby_targets_ruby23] dev-ruby/net-http-pipeline[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DESCRIPTION=multi-layer client for the github api v3
+EAPI=5
+HOMEPAGE=https://github.com/travis-ci/gh
+IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/addressable-2.4.0[ruby_targets_ruby21] =dev-ruby/addressable-2.4*[ruby_targets_ruby21] dev-ruby/backports[ruby_targets_ruby21] >dev-ruby/faraday-0.8[ruby_targets_ruby21] >dev-ruby/multi_json-1.0[ruby_targets_ruby21] >=dev-ruby/net-http-persistent-2.9:0[ruby_targets_ruby21] dev-ruby/net-http-pipeline[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/addressable-2.4.0[ruby_targets_ruby22] =dev-ruby/addressable-2.4*[ruby_targets_ruby22] dev-ruby/backports[ruby_targets_ruby22] >dev-ruby/faraday-0.8[ruby_targets_ruby22] >dev-ruby/multi_json-1.0[ruby_targets_ruby22] >=dev-ruby/net-http-persistent-2.9:0[ruby_targets_ruby22] dev-ruby/net-http-pipeline[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/addressable-2.4.0[ruby_targets_ruby23] =dev-ruby/addressable-2.4*[ruby_targets_ruby23] dev-ruby/backports[ruby_targets_ruby23] >dev-ruby/faraday-0.8[ruby_targets_ruby23] >dev-ruby/multi_json-1.0[ruby_targets_ruby23] >=dev-ruby/net-http-persistent-2.9:0[ruby_targets_ruby23] dev-ruby/net-http-pipeline[ruby_targets_ruby23] ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
+REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
+SLOT=0
+SRC_URI=https://github.com/travis-ci/gh/archive/v0.15.0.tar.gz -> gh-0.15.0.tar.gz
+_eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-fakegem	2b249022d4895a29827658b7d630c461	ruby-ng	934780d41ab18a9ff091703f511371be	ruby-utils	382c3a262907e1219a21618dfd1a01a0	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=63d91a7fe9881b6b40ee1db9cbcebfc2
diff --git a/metadata/md5-cache/dev-ruby/mechanize-2.7.4 b/metadata/md5-cache/dev-ruby/mechanize-2.7.4
deleted file mode 100644
index 7b98d3b12026..000000000000
--- a/metadata/md5-cache/dev-ruby/mechanize-2.7.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby20? ( >=dev-ruby/hoe-3.7[ruby_targets_ruby20] test? ( dev-ruby/minitest:5[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( >=dev-ruby/hoe-3.7[ruby_targets_ruby21] test? ( dev-ruby/minitest:5[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( >=dev-ruby/hoe-3.7[ruby_targets_ruby22] test? ( dev-ruby/minitest:5[ruby_targets_ruby22] ) ) test? ( ruby_targets_ruby20? ( >=dev-ruby/nokogiri-1.6[ruby_targets_ruby20] >=dev-ruby/net-http-digest_auth-1.1.1[ruby_targets_ruby20] >=dev-ruby/net-http-persistent-2.5.2[ruby_targets_ruby20] >=dev-ruby/ntlm-http-0.1.1[ruby_targets_ruby20] >=dev-ruby/webrobots-0.0.9[ruby_targets_ruby20] >=dev-ruby/http-cookie-1.0.2[ruby_targets_ruby20] >=dev-ruby/mime-types-2.0:2[ruby_targets_ruby20] >=dev-ruby/domain_name-0.5.1[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/nokogiri-1.6[ruby_targets_ruby21] >=dev-ruby/net-http-digest_auth-1.1.1[ruby_targets_ruby21] >=dev-ruby/net-http-persistent-2.5.2[ruby_targets_ruby21] >=dev-ruby/ntlm-http-0.1.1[ruby_targets_ruby21] >=dev-ruby/webrobots-0.0.9[ruby_targets_ruby21] >=dev-ruby/http-cookie-1.0.2[ruby_targets_ruby21] >=dev-ruby/mime-types-2.0:2[ruby_targets_ruby21] >=dev-ruby/domain_name-0.5.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/nokogiri-1.6[ruby_targets_ruby22] >=dev-ruby/net-http-digest_auth-1.1.1[ruby_targets_ruby22] >=dev-ruby/net-http-persistent-2.5.2[ruby_targets_ruby22] >=dev-ruby/ntlm-http-0.1.1[ruby_targets_ruby22] >=dev-ruby/webrobots-0.0.9[ruby_targets_ruby22] >=dev-ruby/http-cookie-1.0.2[ruby_targets_ruby22] >=dev-ruby/mime-types-2.0:2[ruby_targets_ruby22] >=dev-ruby/domain_name-0.5.1[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
-DESCRIPTION=A Ruby library used for automating interaction with websites
-EAPI=5
-HOMEPAGE=https://github.com/sparklemotion/mechanize
-IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/nokogiri-1.6[ruby_targets_ruby20] >=dev-ruby/net-http-digest_auth-1.1.1[ruby_targets_ruby20] >=dev-ruby/net-http-persistent-2.5.2[ruby_targets_ruby20] >=dev-ruby/ntlm-http-0.1.1[ruby_targets_ruby20] >=dev-ruby/webrobots-0.0.9[ruby_targets_ruby20] >=dev-ruby/http-cookie-1.0.2[ruby_targets_ruby20] >=dev-ruby/mime-types-2.0:2[ruby_targets_ruby20] >=dev-ruby/domain_name-0.5.1[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/nokogiri-1.6[ruby_targets_ruby21] >=dev-ruby/net-http-digest_auth-1.1.1[ruby_targets_ruby21] >=dev-ruby/net-http-persistent-2.5.2[ruby_targets_ruby21] >=dev-ruby/ntlm-http-0.1.1[ruby_targets_ruby21] >=dev-ruby/webrobots-0.0.9[ruby_targets_ruby21] >=dev-ruby/http-cookie-1.0.2[ruby_targets_ruby21] >=dev-ruby/mime-types-2.0:2[ruby_targets_ruby21] >=dev-ruby/domain_name-0.5.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/nokogiri-1.6[ruby_targets_ruby22] >=dev-ruby/net-http-digest_auth-1.1.1[ruby_targets_ruby22] >=dev-ruby/net-http-persistent-2.5.2[ruby_targets_ruby22] >=dev-ruby/ntlm-http-0.1.1[ruby_targets_ruby22] >=dev-ruby/webrobots-0.0.9[ruby_targets_ruby22] >=dev-ruby/http-cookie-1.0.2[ruby_targets_ruby22] >=dev-ruby/mime-types-2.0:2[ruby_targets_ruby22] >=dev-ruby/domain_name-0.5.1[ruby_targets_ruby22] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
-SLOT=0
-SRC_URI=mirror://rubygems/mechanize-2.7.4.gem
-_eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-fakegem	2b249022d4895a29827658b7d630c461	ruby-ng	934780d41ab18a9ff091703f511371be	ruby-utils	382c3a262907e1219a21618dfd1a01a0	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=b72720eb4a39d88b84f15755a61fbcfa
diff --git a/metadata/md5-cache/dev-ruby/mechanize-2.7.5-r1 b/metadata/md5-cache/dev-ruby/mechanize-2.7.5-r1
deleted file mode 100644
index f2b0967078a7..000000000000
--- a/metadata/md5-cache/dev-ruby/mechanize-2.7.5-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby21? ( >=dev-ruby/hoe-3.7[ruby_targets_ruby21] test? ( dev-ruby/minitest:5[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( >=dev-ruby/hoe-3.7[ruby_targets_ruby22] test? ( dev-ruby/minitest:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( >=dev-ruby/hoe-3.7[ruby_targets_ruby23] test? ( dev-ruby/minitest:5[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby21? ( >=dev-ruby/nokogiri-1.6[ruby_targets_ruby21] >=dev-ruby/net-http-digest_auth-1.1.1[ruby_targets_ruby21] >=dev-ruby/net-http-persistent-2.5.2[ruby_targets_ruby21] >=dev-ruby/ntlm-http-0.1.1[ruby_targets_ruby21] >=dev-ruby/webrobots-0.0.9[ruby_targets_ruby21] >=dev-ruby/http-cookie-1.0.2[ruby_targets_ruby21] >=dev-ruby/mime-types-1.17.2:*[ruby_targets_ruby21] >=dev-ruby/domain_name-0.5.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/nokogiri-1.6[ruby_targets_ruby22] >=dev-ruby/net-http-digest_auth-1.1.1[ruby_targets_ruby22] >=dev-ruby/net-http-persistent-2.5.2[ruby_targets_ruby22] >=dev-ruby/ntlm-http-0.1.1[ruby_targets_ruby22] >=dev-ruby/webrobots-0.0.9[ruby_targets_ruby22] >=dev-ruby/http-cookie-1.0.2[ruby_targets_ruby22] >=dev-ruby/mime-types-1.17.2:*[ruby_targets_ruby22] >=dev-ruby/domain_name-0.5.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/nokogiri-1.6[ruby_targets_ruby23] >=dev-ruby/net-http-digest_auth-1.1.1[ruby_targets_ruby23] >=dev-ruby/net-http-persistent-2.5.2[ruby_targets_ruby23] >=dev-ruby/ntlm-http-0.1.1[ruby_targets_ruby23] >=dev-ruby/webrobots-0.0.9[ruby_targets_ruby23] >=dev-ruby/http-cookie-1.0.2[ruby_targets_ruby23] >=dev-ruby/mime-types-1.17.2:*[ruby_targets_ruby23] >=dev-ruby/domain_name-0.5.1[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
-DESCRIPTION=A Ruby library used for automating interaction with websites
-EAPI=5
-HOMEPAGE=https://github.com/sparklemotion/mechanize
-IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
-KEYWORDS=~amd64 ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/nokogiri-1.6[ruby_targets_ruby21] >=dev-ruby/net-http-digest_auth-1.1.1[ruby_targets_ruby21] >=dev-ruby/net-http-persistent-2.5.2[ruby_targets_ruby21] >=dev-ruby/ntlm-http-0.1.1[ruby_targets_ruby21] >=dev-ruby/webrobots-0.0.9[ruby_targets_ruby21] >=dev-ruby/http-cookie-1.0.2[ruby_targets_ruby21] >=dev-ruby/mime-types-1.17.2:*[ruby_targets_ruby21] >=dev-ruby/domain_name-0.5.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/nokogiri-1.6[ruby_targets_ruby22] >=dev-ruby/net-http-digest_auth-1.1.1[ruby_targets_ruby22] >=dev-ruby/net-http-persistent-2.5.2[ruby_targets_ruby22] >=dev-ruby/ntlm-http-0.1.1[ruby_targets_ruby22] >=dev-ruby/webrobots-0.0.9[ruby_targets_ruby22] >=dev-ruby/http-cookie-1.0.2[ruby_targets_ruby22] >=dev-ruby/mime-types-1.17.2:*[ruby_targets_ruby22] >=dev-ruby/domain_name-0.5.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/nokogiri-1.6[ruby_targets_ruby23] >=dev-ruby/net-http-digest_auth-1.1.1[ruby_targets_ruby23] >=dev-ruby/net-http-persistent-2.5.2[ruby_targets_ruby23] >=dev-ruby/ntlm-http-0.1.1[ruby_targets_ruby23] >=dev-ruby/webrobots-0.0.9[ruby_targets_ruby23] >=dev-ruby/http-cookie-1.0.2[ruby_targets_ruby23] >=dev-ruby/mime-types-1.17.2:*[ruby_targets_ruby23] >=dev-ruby/domain_name-0.5.1[ruby_targets_ruby23] ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
-SLOT=0
-SRC_URI=mirror://rubygems/mechanize-2.7.5.gem
-_eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-fakegem	2b249022d4895a29827658b7d630c461	ruby-ng	934780d41ab18a9ff091703f511371be	ruby-utils	382c3a262907e1219a21618dfd1a01a0	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=f9c3157f6fbf50aeb3c35aa8327940c8
diff --git a/metadata/md5-cache/dev-ruby/mechanize-2.7.5-r2 b/metadata/md5-cache/dev-ruby/mechanize-2.7.5-r2
new file mode 100644
index 000000000000..2a676b6c4e29
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/mechanize-2.7.5-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby21? ( >=dev-ruby/hoe-3.7[ruby_targets_ruby21] test? ( dev-ruby/minitest:5[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( >=dev-ruby/hoe-3.7[ruby_targets_ruby22] test? ( dev-ruby/minitest:5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( >=dev-ruby/hoe-3.7[ruby_targets_ruby23] test? ( dev-ruby/minitest:5[ruby_targets_ruby23] ) ) test? ( ruby_targets_ruby21? ( >=dev-ruby/nokogiri-1.6[ruby_targets_ruby21] >=dev-ruby/net-http-digest_auth-1.1.1[ruby_targets_ruby21] >=dev-ruby/net-http-persistent-2.5.2:0[ruby_targets_ruby21] >=dev-ruby/ntlm-http-0.1.1[ruby_targets_ruby21] >=dev-ruby/webrobots-0.0.9[ruby_targets_ruby21] >=dev-ruby/http-cookie-1.0.2[ruby_targets_ruby21] >=dev-ruby/mime-types-1.17.2:*[ruby_targets_ruby21] >=dev-ruby/domain_name-0.5.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/nokogiri-1.6[ruby_targets_ruby22] >=dev-ruby/net-http-digest_auth-1.1.1[ruby_targets_ruby22] >=dev-ruby/net-http-persistent-2.5.2:0[ruby_targets_ruby22] >=dev-ruby/ntlm-http-0.1.1[ruby_targets_ruby22] >=dev-ruby/webrobots-0.0.9[ruby_targets_ruby22] >=dev-ruby/http-cookie-1.0.2[ruby_targets_ruby22] >=dev-ruby/mime-types-1.17.2:*[ruby_targets_ruby22] >=dev-ruby/domain_name-0.5.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/nokogiri-1.6[ruby_targets_ruby23] >=dev-ruby/net-http-digest_auth-1.1.1[ruby_targets_ruby23] >=dev-ruby/net-http-persistent-2.5.2:0[ruby_targets_ruby23] >=dev-ruby/ntlm-http-0.1.1[ruby_targets_ruby23] >=dev-ruby/webrobots-0.0.9[ruby_targets_ruby23] >=dev-ruby/http-cookie-1.0.2[ruby_targets_ruby23] >=dev-ruby/mime-types-1.17.2:*[ruby_targets_ruby23] >=dev-ruby/domain_name-0.5.1[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DESCRIPTION=A Ruby library used for automating interaction with websites
+EAPI=5
+HOMEPAGE=https://github.com/sparklemotion/mechanize
+IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+KEYWORDS=~amd64 ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/nokogiri-1.6[ruby_targets_ruby21] >=dev-ruby/net-http-digest_auth-1.1.1[ruby_targets_ruby21] >=dev-ruby/net-http-persistent-2.5.2:0[ruby_targets_ruby21] >=dev-ruby/ntlm-http-0.1.1[ruby_targets_ruby21] >=dev-ruby/webrobots-0.0.9[ruby_targets_ruby21] >=dev-ruby/http-cookie-1.0.2[ruby_targets_ruby21] >=dev-ruby/mime-types-1.17.2:*[ruby_targets_ruby21] >=dev-ruby/domain_name-0.5.1[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/nokogiri-1.6[ruby_targets_ruby22] >=dev-ruby/net-http-digest_auth-1.1.1[ruby_targets_ruby22] >=dev-ruby/net-http-persistent-2.5.2:0[ruby_targets_ruby22] >=dev-ruby/ntlm-http-0.1.1[ruby_targets_ruby22] >=dev-ruby/webrobots-0.0.9[ruby_targets_ruby22] >=dev-ruby/http-cookie-1.0.2[ruby_targets_ruby22] >=dev-ruby/mime-types-1.17.2:*[ruby_targets_ruby22] >=dev-ruby/domain_name-0.5.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/nokogiri-1.6[ruby_targets_ruby23] >=dev-ruby/net-http-digest_auth-1.1.1[ruby_targets_ruby23] >=dev-ruby/net-http-persistent-2.5.2:0[ruby_targets_ruby23] >=dev-ruby/ntlm-http-0.1.1[ruby_targets_ruby23] >=dev-ruby/webrobots-0.0.9[ruby_targets_ruby23] >=dev-ruby/http-cookie-1.0.2[ruby_targets_ruby23] >=dev-ruby/mime-types-1.17.2:*[ruby_targets_ruby23] >=dev-ruby/domain_name-0.5.1[ruby_targets_ruby23] ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
+REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
+SLOT=0
+SRC_URI=mirror://rubygems/mechanize-2.7.5.gem
+_eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-fakegem	2b249022d4895a29827658b7d630c461	ruby-ng	934780d41ab18a9ff091703f511371be	ruby-utils	382c3a262907e1219a21618dfd1a01a0	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=43a4432b2571a23999e4ec8ba4929c82
diff --git a/metadata/md5-cache/dev-ruby/net-ssh-3.0.2 b/metadata/md5-cache/dev-ruby/net-ssh-3.0.2
deleted file mode 100644
index d9e47d233f64..000000000000
--- a/metadata/md5-cache/dev-ruby/net-ssh-3.0.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby20? ( virtual/ruby-ssl[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/ruby-ssl[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/ruby-ssl[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby20] >=dev-ruby/mocha-0.13[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby21] >=dev-ruby/mocha-0.13[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby22] >=dev-ruby/mocha-0.13[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
-DESCRIPTION=Non-interactive SSH processing in pure Ruby
-EAPI=5
-HOMEPAGE=https://github.com/net-ssh/net-ssh
-IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby20? ( virtual/ruby-ssl[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/ruby-ssl[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
-SLOT=3
-SRC_URI=https://github.com/net-ssh/net-ssh/archive/v3.0.2.tar.gz -> net-ssh-git-3.0.2.tgz
-_eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-fakegem	2b249022d4895a29827658b7d630c461	ruby-ng	934780d41ab18a9ff091703f511371be	ruby-utils	382c3a262907e1219a21618dfd1a01a0	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=e05bfde50ed102c91126041d01795384
diff --git a/metadata/md5-cache/dev-ruby/net-ssh-3.1.1 b/metadata/md5-cache/dev-ruby/net-ssh-3.1.1
deleted file mode 100644
index ec31ee4ea213..000000000000
--- a/metadata/md5-cache/dev-ruby/net-ssh-3.1.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby20? ( virtual/ruby-ssl[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/ruby-ssl[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/ruby-ssl[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby20] >=dev-ruby/mocha-0.13[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby21] >=dev-ruby/mocha-0.13[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby22] >=dev-ruby/mocha-0.13[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/test-unit:2[ruby_targets_ruby23] >=dev-ruby/mocha-0.13[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
-DESCRIPTION=Non-interactive SSH processing in pure Ruby
-EAPI=5
-HOMEPAGE=https://github.com/net-ssh/net-ssh
-IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby20? ( virtual/ruby-ssl[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/ruby-ssl[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/ruby-ssl[ruby_targets_ruby23] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
-SLOT=3
-SRC_URI=https://github.com/net-ssh/net-ssh/archive/v3.1.1.tar.gz -> net-ssh-git-3.1.1.tgz
-_eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-fakegem	2b249022d4895a29827658b7d630c461	ruby-ng	934780d41ab18a9ff091703f511371be	ruby-utils	382c3a262907e1219a21618dfd1a01a0	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=a682696c795a1a654a91156feae19e3c
diff --git a/metadata/md5-cache/dev-ruby/rbnacl-4.0.1 b/metadata/md5-cache/dev-ruby/rbnacl-4.0.1
new file mode 100644
index 000000000000..fe8facc3b564
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rbnacl-4.0.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( dev-libs/libsodium ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DESCRIPTION=Provides a high-level toolkit for building cryptographic systems and protocols
+EAPI=5
+HOMEPAGE=https://github.com/cryptosphere/rbnacl
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=dev-libs/libsodium ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
+SLOT=4
+SRC_URI=mirror://rubygems/rbnacl-4.0.1.gem
+_eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	java-utils-2	a50950a73b5d5db46f42638e2996a087	multilib	165fc17c38d1b11dac2008280dab6e80	ruby-fakegem	2b249022d4895a29827658b7d630c461	ruby-ng	934780d41ab18a9ff091703f511371be	ruby-utils	382c3a262907e1219a21618dfd1a01a0	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=4c84db5a5d4010703b441bbcb140ccf5
diff --git a/metadata/md5-cache/mail-mta/exim-4.89_rc1 b/metadata/md5-cache/mail-mta/exim-4.89_rc2
similarity index 96%
rename from metadata/md5-cache/mail-mta/exim-4.89_rc1
rename to metadata/md5-cache/mail-mta/exim-4.89_rc2
index e74324df6a21..86be42b63463 100644
--- a/metadata/md5-cache/mail-mta/exim-4.89_rc1
+++ b/metadata/md5-cache/mail-mta/exim-4.89_rc2
@@ -9,6 +9,6 @@ LICENSE=GPL-2
 RDEPEND=>=sys-apps/sed-4.0.5 >=sys-libs/db-3.2:= dev-libs/libpcre perl? ( dev-lang/perl:= ) pam? ( virtual/pam ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) gnutls? ( net-libs/gnutls[pkcs11?] dev-libs/libtasn1 ) ldap? ( >=net-nds/openldap-2.0.7 ) nis? ( elibc_glibc? ( || ( <sys-libs/glibc-2.23 >=sys-libs/glibc-2.23[rpc] ) ) ) mysql? ( virtual/libmysqlclient ) postgres? ( dev-db/postgresql:= ) sasl? ( >=dev-libs/cyrus-sasl-2.1.26-r2 ) redis? ( dev-libs/hiredis ) spf? ( >=mail-filter/libspf2-1.2.5-r1 ) dmarc? ( mail-filter/opendmarc ) srs? ( mail-filter/libsrs_alt ) X? ( x11-proto/xproto x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXaw ) sqlite? ( dev-db/sqlite ) radius? ( net-dialup/freeradius-client ) virtual/libiconv !mail-mta/courier !mail-mta/esmtp !mail-mta/mini-qmail !<mail-mta/msmtp-1.4.19-r1 !>=mail-mta/msmtp-1.4.19-r1[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta] !net-mail/mailwrapper >=net-mail/mailbase-0.00-r5 virtual/logger dcc? ( mail-filter/dcc ) selinux? ( sec-policy/selinux-exim )
 REQUIRED_USE=dane? ( !gnutls ) dmarc? ( spf dkim ) pkcs11? ( gnutls ) spf? ( exiscan-acl ) srs? ( exiscan-acl )
 SLOT=0
-SRC_URI=ftp://ftp.exim.org/pub/exim/exim4/test/exim-4.89_RC1.tar.bz2 mirror://gentoo/system_filter.exim.gz doc? ( ftp://ftp.exim.org/pub/exim/exim4/test/exim-pdf-4.89_RC1.tar.bz2 )
+SRC_URI=ftp://ftp.exim.org/pub/exim/exim4/test/exim-4.89_RC2.tar.bz2 mirror://gentoo/system_filter.exim.gz doc? ( ftp://ftp.exim.org/pub/exim/exim4/test/exim-pdf-4.89_RC2.tar.bz2 )
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	systemd	5b6ca8b2fc1307ca593223f327342c96	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
 _md5_=442efa931d0684f699de374b1bc35888
diff --git a/metadata/md5-cache/media-libs/opencollada-1.6.36 b/metadata/md5-cache/media-libs/opencollada-1.6.36
index af73977456f0..08bb3cefa813 100644
--- a/metadata/md5-cache/media-libs/opencollada-1.6.36
+++ b/metadata/md5-cache/media-libs/opencollada-1.6.36
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/libpcre dev-libs/zziplib media-libs/lib3ds sys-libs/zlib expat? ( dev-libs/expat ) !expat? ( dev-libs/libxml2 ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.5.2
+DEPEND=dev-libs/libpcre dev-libs/zziplib media-libs/lib3ds sys-libs/zlib dev-libs/libxml2 virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.5.2
 DESCRIPTION=Stream based read/write library for COLLADA files
 EAPI=6
 HOMEPAGE=http://www.opencollada.org/
-IUSE=expat static-libs
+IUSE=static-libs
 KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=MIT
-RDEPEND=dev-libs/libpcre dev-libs/zziplib media-libs/lib3ds sys-libs/zlib expat? ( dev-libs/expat ) !expat? ( dev-libs/libxml2 )
+RDEPEND=dev-libs/libpcre dev-libs/zziplib media-libs/lib3ds sys-libs/zlib dev-libs/libxml2
 SLOT=0
 SRC_URI=https://github.com/KhronosGroup/OpenCOLLADA/archive/v1.6.36.tar.gz -> opencollada-1.6.36.tar.gz
 _eclasses_=cmake-utils	f0c2647fb321257c91c6a967f362d053	eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	7bb10a841be2368af0c00f27dd67560b	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=95e40797e877e6b82d2cbba5fdab9ae0
+_md5_=fb7e9bee66eb7d42880a7f9cc1fc9fe3
diff --git a/metadata/md5-cache/net-libs/nodejs-6.9.1 b/metadata/md5-cache/net-libs/nodejs-6.9.1
deleted file mode 100644
index 0b109f0f6173..000000000000
--- a/metadata/md5-cache/net-libs/nodejs-6.9.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=icu? ( >=dev-libs/icu-56:= ) npm? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) >=net-libs/http-parser-2.6.2:= >=dev-libs/libuv-1.9.0:= >=dev-libs/openssl-1.0.2g:0=[-bindist] sys-libs/zlib >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] test? ( net-misc/curl )
-DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
-EAPI=6
-HOMEPAGE=https://nodejs.org/
-IUSE=cpu_flags_x86_sse2 debug doc icu +npm +snapshot +ssl test python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x64-macos
-LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
-RDEPEND=icu? ( >=dev-libs/icu-56:= ) npm? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) >=net-libs/http-parser-2.6.2:= >=dev-libs/libuv-1.9.0:= >=dev-libs/openssl-1.0.2g:0=[-bindist] sys-libs/zlib
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=https://nodejs.org/dist/v6.9.1/node-v6.9.1.tar.xz
-_eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	pax-utils	4c2654a34ebe732e85fda354f6ee642f	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d275302cd06aedef2ba08f81f3104206	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=7b2c824dbb1f2961e58063e93f10f968
diff --git a/metadata/md5-cache/net-libs/nodejs-6.9.2 b/metadata/md5-cache/net-libs/nodejs-6.9.5
similarity index 95%
rename from metadata/md5-cache/net-libs/nodejs-6.9.2
rename to metadata/md5-cache/net-libs/nodejs-6.9.5
index 69469129ed90..259156af76d3 100644
--- a/metadata/md5-cache/net-libs/nodejs-6.9.2
+++ b/metadata/md5-cache/net-libs/nodejs-6.9.5
@@ -9,6 +9,6 @@ LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
 RDEPEND=icu? ( >=dev-libs/icu-56:= ) npm? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) >=net-libs/http-parser-2.6.2:= >=dev-libs/libuv-1.9.0:= >=dev-libs/openssl-1.0.2g:0=[-bindist] sys-libs/zlib
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
-SRC_URI=https://nodejs.org/dist/v6.9.2/node-v6.9.2.tar.xz
+SRC_URI=https://nodejs.org/dist/v6.9.5/node-v6.9.5.tar.xz
 _eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	pax-utils	4c2654a34ebe732e85fda354f6ee642f	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d275302cd06aedef2ba08f81f3104206	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=7b2c824dbb1f2961e58063e93f10f968
+_md5_=e47d35d226ef4ef4f74b7e2ed9bf337b
diff --git a/metadata/md5-cache/net-libs/nodejs-6.9.0 b/metadata/md5-cache/net-libs/nodejs-7.5.0
similarity index 86%
rename from metadata/md5-cache/net-libs/nodejs-6.9.0
rename to metadata/md5-cache/net-libs/nodejs-7.5.0
index 9a46d56f34c0..a743a139501c 100644
--- a/metadata/md5-cache/net-libs/nodejs-6.9.0
+++ b/metadata/md5-cache/net-libs/nodejs-7.5.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=icu? ( >=dev-libs/icu-56:= ) npm? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) >=net-libs/http-parser-2.6.2:= >=dev-libs/libuv-1.9.0:= >=dev-libs/openssl-1.0.2g:0=[-bindist] sys-libs/zlib >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] test? ( net-misc/curl )
+DEPEND=icu? ( >=dev-libs/icu-56:= ) npm? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) >=net-libs/http-parser-2.6.2:= >=dev-libs/libuv-1.9.0:= >=dev-libs/openssl-1.0.2g:0=[-bindist] sys-libs/zlib >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] systemtap? ( dev-util/systemtap ) test? ( net-misc/curl )
 DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
 EAPI=6
 HOMEPAGE=https://nodejs.org/
-IUSE=cpu_flags_x86_sse2 debug doc icu +npm +snapshot +ssl test python_targets_python2_7
+IUSE=cpu_flags_x86_sse2 debug doc icu +npm +snapshot +ssl systemtap test python_targets_python2_7
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x64-macos
 LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
 RDEPEND=icu? ( >=dev-libs/icu-56:= ) npm? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) >=net-libs/http-parser-2.6.2:= >=dev-libs/libuv-1.9.0:= >=dev-libs/openssl-1.0.2g:0=[-bindist] sys-libs/zlib
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
-SRC_URI=https://nodejs.org/dist/v6.9.0/node-v6.9.0.tar.xz
+SRC_URI=https://nodejs.org/dist/v7.5.0/node-v7.5.0.tar.xz
 _eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	pax-utils	4c2654a34ebe732e85fda354f6ee642f	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d275302cd06aedef2ba08f81f3104206	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=7b2c824dbb1f2961e58063e93f10f968
+_md5_=1c0c0a2e6d49a448f9baca79ab49a4e2
diff --git a/metadata/md5-cache/sys-apps/coreutils-8.25 b/metadata/md5-cache/sys-apps/coreutils-8.25
index 73462b8cf9d7..46cc96ccc1dc 100644
--- a/metadata/md5-cache/sys-apps/coreutils-8.25
+++ b/metadata/md5-cache/sys-apps/coreutils-8.25
@@ -1,6 +1,6 @@
 DEFINED_PHASES=configure install postinst prepare test
 DEPEND=!static? ( acl? ( sys-apps/acl ) caps? ( sys-libs/libcap ) gmp? ( dev-libs/gmp ) xattr? ( !userland_BSD? ( sys-apps/attr ) ) ) selinux? ( sys-libs/libselinux ) nls? ( virtual/libintl ) static? ( acl? ( sys-apps/acl[static-libs] ) caps? ( sys-libs/libcap ) gmp? ( dev-libs/gmp[static-libs] ) xattr? ( !userland_BSD? ( sys-apps/attr[static-libs] ) ) ) app-arch/xz-utils
-DESCRIPTION=Standard GNU file utilities (chmod, cp, dd, dir, ls...), text utilities (sort, tr, head, wc..), and shell utilities (whoami, who,...)
+DESCRIPTION=Standard GNU utilities (chmod, cp, dd, ls, sort, tr, head, wc, who,...)
 EAPI=4
 HOMEPAGE=https://www.gnu.org/software/coreutils/
 IUSE=acl caps gmp hostname kill multicall nls selinux static userland_BSD vanilla xattr
@@ -10,4 +10,4 @@ RDEPEND=!static? ( acl? ( sys-apps/acl ) caps? ( sys-libs/libcap ) gmp? ( dev-li
 SLOT=0
 SRC_URI=mirror://gnu/coreutils/coreutils-8.25.tar.xz mirror://gentoo/coreutils-8.25-patches-1.1.tar.xz https://dev.gentoo.org/~vapier/dist/coreutils-8.25-patches-1.1.tar.xz mirror://gentoo/coreutils-8.25-man.tar.xz https://dev.gentoo.org/~vapier/dist/coreutils-8.25-man.tar.xz
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=fe2f4f2bf001e2003be5eb499b60d072
+_md5_=3c8f4adaa4915cad6cae3b3e5dbccf97
diff --git a/metadata/md5-cache/sys-apps/coreutils-8.26 b/metadata/md5-cache/sys-apps/coreutils-8.26
index 6e81c07423ba..22ad454c22fb 100644
--- a/metadata/md5-cache/sys-apps/coreutils-8.26
+++ b/metadata/md5-cache/sys-apps/coreutils-8.26
@@ -1,6 +1,6 @@
 DEFINED_PHASES=configure install postinst prepare test
 DEPEND=!static? ( acl? ( sys-apps/acl ) caps? ( sys-libs/libcap ) gmp? ( dev-libs/gmp:= ) xattr? ( !userland_BSD? ( sys-apps/attr ) ) ) selinux? ( sys-libs/libselinux ) nls? ( virtual/libintl ) static? ( acl? ( sys-apps/acl[static-libs] ) caps? ( sys-libs/libcap ) gmp? ( dev-libs/gmp:=[static-libs] ) xattr? ( !userland_BSD? ( sys-apps/attr[static-libs] ) ) ) app-arch/xz-utils
-DESCRIPTION=Standard GNU file utilities (chmod, cp, dd, dir, ls...), text utilities (sort, tr, head, wc..), and shell utilities (whoami, who,...)
+DESCRIPTION=Standard GNU utilities (chmod, cp, dd, ls, sort, tr, head, wc, who,...)
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/coreutils/
 IUSE=acl caps gmp hostname kill multicall nls selinux static userland_BSD vanilla xattr
@@ -10,4 +10,4 @@ RDEPEND=!static? ( acl? ( sys-apps/acl ) caps? ( sys-libs/libcap ) gmp? ( dev-li
 SLOT=0
 SRC_URI=mirror://gnu/coreutils/coreutils-8.26.tar.xz mirror://gentoo/coreutils-8.26-patches-1.1.tar.xz https://dev.gentoo.org/~polynomial-c/dist/coreutils-8.26-patches-1.1.tar.xz mirror://gentoo/coreutils-8.26-man.tar.xz https://dev.gentoo.org/~polynomial-c/dist/coreutils-8.26-man.tar.xz
 _eclasses_=eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
-_md5_=68270fc936fdec42ac2b5ea3bbce3700
+_md5_=b294aa0ed3f0a11fc8e93ff0023eb339
diff --git a/metadata/md5-cache/sys-block/hdrecover-0.4 b/metadata/md5-cache/sys-block/hdrecover-0.4
deleted file mode 100644
index 470552e28a2f..000000000000
--- a/metadata/md5-cache/sys-block/hdrecover-0.4
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=configure
-DESCRIPTION=Attempts to recover a hard disk that has bad blocks on it
-EAPI=5
-HOMEPAGE=http://hdrecover.sourceforge.net/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-SLOT=0
-SRC_URI=mirror://sourceforge/hdrecover/hdrecover-0.4.tar.gz
-_md5_=17473ff79fbb8223b292914434b219af
diff --git a/metadata/md5-cache/www-client/chromium-57.0.2987.8 b/metadata/md5-cache/www-client/chromium-57.0.2987.21
similarity index 98%
rename from metadata/md5-cache/www-client/chromium-57.0.2987.8
rename to metadata/md5-cache/www-client/chromium-57.0.2987.21
index 9d992fb56682..c9c7dc53a77e 100644
--- a/metadata/md5-cache/www-client/chromium-57.0.2987.8
+++ b/metadata/md5-cache/www-client/chromium-57.0.2987.21
@@ -9,6 +9,6 @@ LICENSE=BSD
 RDEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) >=dev-libs/elfutils-0.149 dev-libs/expat:= dev-libs/glib:2 dev-libs/icu:= >=dev-libs/jsoncpp-0.5.0-r1:= dev-libs/libxml2:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.14.3:= >=dev-libs/re2-0.2016.05.01:= gconf? ( >=gnome-base/gconf-2.24.0:= ) gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-1.3.1:=[icu(+)] media-libs/libexif:= media-libs/libjpeg-turbo:= media-libs/libpng:= system-libvpx? ( media-libs/libvpx:=[svc] ) media-libs/speex:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-3:= ) sys-apps/dbus:= sys-apps/pciutils:= >=sys-libs/libcap-2.22:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/libdrm x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXinerama:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !=www-client/chromium-9999 !<www-plugins/chrome-binary-plugins-37 x11-misc/xdg-utils virtual/opengl virtual/ttf-fonts !gtk3? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) selinux? ( sec-policy/selinux-chromium ) tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 ) widevine? ( www-plugins/chrome-binary-plugins[widevine(-)] )
 RESTRICT=!system-ffmpeg? ( proprietary-codecs? ( bindist ) )
 SLOT=0
-SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-57.0.2987.8.tar.xz
+SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-57.0.2987.21.tar.xz
 _eclasses_=check-reqs	aee25bdf4e2f459af86d17f7c41dcdf6	chromium-2	c30f482b868782938c772c21d9ede135	eutils	ea170b525f6a38a006be05c9d9429f13	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	linux-info	af49d8ab3be91bb1d38b7201dc9e5123	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	7bb10a841be2368af0c00f27dd67560b	pax-utils	4c2654a34ebe732e85fda354f6ee642f	portability	bb1a0ed8ea152b957d17339f01d4d7f5	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	d275302cd06aedef2ba08f81f3104206	readme.gentoo-r1	03878c06495db70bc36bd717383c09f7	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=a7201adc4a6e4888723d25ea22505834
+_md5_=e040451b25b41c2ca77fd6755b14b67a
diff --git a/metadata/md5-cache/x11-wm/stumpwm-0.9.9 b/metadata/md5-cache/x11-wm/stumpwm-0.9.9
deleted file mode 100644
index c86e48b59159..000000000000
--- a/metadata/md5-cache/x11-wm/stumpwm-0.9.9
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare
-DEPEND=dev-lisp/cl-ppcre sbcl? ( >=dev-lisp/sbcl-1.0.32 ) sbcl? ( >=dev-lisp/clx-0.7.4 ) !sbcl? ( !clisp? ( !ecl? ( >=dev-lisp/sbcl-1.0.32 ) ) ) !sbcl? ( !clisp? ( ecl? ( >=dev-lisp/ecls-10.4.1 ) ) ) !sbcl? ( clisp? ( >=dev-lisp/clisp-2.44[X,new-clx] ) ) emacs? ( virtual/emacs app-emacs/slime ) sys-apps/texinfo doc? ( virtual/texi2dvi ) contrib? ( dev-vcs/git ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Stumpwm is a Window Manager written entirely in Common Lisp.
-EAPI=5
-HOMEPAGE=https://stumpwm.github.io/
-IUSE=contrib doc emacs clisp ecl +sbcl
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-PDEPEND=virtual/commonlisp
-RDEPEND=dev-lisp/cl-ppcre sbcl? ( >=dev-lisp/sbcl-1.0.32 ) sbcl? ( >=dev-lisp/clx-0.7.4 ) !sbcl? ( !clisp? ( !ecl? ( >=dev-lisp/sbcl-1.0.32 ) ) ) !sbcl? ( !clisp? ( ecl? ( >=dev-lisp/ecls-10.4.1 ) ) ) !sbcl? ( clisp? ( >=dev-lisp/clisp-2.44[X,new-clx] ) ) emacs? ( virtual/emacs app-emacs/slime )
-RESTRICT=strip mirror
-SLOT=0
-SRC_URI=https://github.com/stumpwm/stumpwm/archive/0.9.9.tar.gz -> stumpwm-0.9.9.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	common-lisp-3	732b3b6e2021a252e13158c86e4ea4d0	elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	ea170b525f6a38a006be05c9d9429f13	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=e01410d7e492ed1fd71d5190fdb00865
diff --git a/metadata/md5-cache/x11-wm/stumpwm-1.0.0 b/metadata/md5-cache/x11-wm/stumpwm-1.0.0
index ad8e4852cae2..6ec10255647e 100644
--- a/metadata/md5-cache/x11-wm/stumpwm-1.0.0
+++ b/metadata/md5-cache/x11-wm/stumpwm-1.0.0
@@ -6,10 +6,10 @@ HOMEPAGE=https://stumpwm.github.io/
 IUSE=contrib doc emacs clisp ecl +sbcl
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-PDEPEND=virtual/commonlisp
+PDEPEND=contrib? ( x11-wm/stumpwm-contrib ) virtual/commonlisp
 RDEPEND=dev-lisp/cl-ppcre sbcl? ( >=dev-lisp/sbcl-1.0.32 ) sbcl? ( >=dev-lisp/clx-0.7.4 ) !sbcl? ( !clisp? ( !ecl? ( >=dev-lisp/sbcl-1.0.32 ) ) ) !sbcl? ( !clisp? ( ecl? ( >=dev-lisp/ecls-10.4.1 ) ) ) !sbcl? ( clisp? ( >=dev-lisp/clisp-2.44[X,new-clx] ) ) emacs? ( virtual/emacs app-emacs/slime )
 RESTRICT=strip mirror
 SLOT=0
 SRC_URI=https://github.com/stumpwm/stumpwm/archive/1.0.0.tar.gz -> stumpwm-1.0.0.tar.gz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	common-lisp-3	732b3b6e2021a252e13158c86e4ea4d0	elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	ea170b525f6a38a006be05c9d9429f13	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=1295feb43ed480b2eb3a8a7ecf91cb80
+_md5_=120977e63ed98ba1cbe6a0a0acc07cfb
diff --git a/metadata/md5-cache/x11-wm/stumpwm-contrib-20170202 b/metadata/md5-cache/x11-wm/stumpwm-contrib-20170202
new file mode 100644
index 000000000000..e05aa95cae13
--- /dev/null
+++ b/metadata/md5-cache/x11-wm/stumpwm-contrib-20170202
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install
+DESCRIPTION=Extension Modules for StumpWM
+EAPI=6
+HOMEPAGE=https://github.com/stumpwm/stumpwm-contrib/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 GPL-3 BSD-2
+PDEPEND=virtual/commonlisp
+RDEPEND=>=x11-wm/stumpwm-0.9.9
+RESTRICT=mirror
+SLOT=0
+SRC_URI=mirror://gentoo/stumpwm-contrib-20170202.tar.gz
+_eclasses_=common-lisp-3	732b3b6e2021a252e13158c86e4ea4d0	eutils	ea170b525f6a38a006be05c9d9429f13	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
+_md5_=58a11494e001ae52d656b79029985869
diff --git a/metadata/md5-cache/x11-wm/stumpwm-contrib-99999999 b/metadata/md5-cache/x11-wm/stumpwm-contrib-99999999
new file mode 100644
index 000000000000..ff2d40b22fc9
--- /dev/null
+++ b/metadata/md5-cache/x11-wm/stumpwm-contrib-99999999
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install unpack
+DEPEND=>=dev-vcs/git-1.8.2.1
+DESCRIPTION=Extension Modules for StumpWM
+EAPI=6
+HOMEPAGE=https://github.com/stumpwm/stumpwm-contrib/
+LICENSE=GPL-2 GPL-3 BSD-2
+PDEPEND=virtual/commonlisp
+RDEPEND=>=x11-wm/stumpwm-0.9.9
+RESTRICT=mirror
+SLOT=0
+_eclasses_=common-lisp-3	732b3b6e2021a252e13158c86e4ea4d0	eutils	ea170b525f6a38a006be05c9d9429f13	git-r3	6efc2d7de07a77bf72c7207b48d0e123	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	1b1da0c45c555989dc5d832b54880783
+_md5_=9dd5fd18c2a7d0d73c0ef7a21c1de69a
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index e303e8d0c987..5e8bf7185057 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Fri, 03 Feb 2017 04:43:21 +0000
+Fri, 03 Feb 2017 12:43:28 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 9dd5ccdf0188..95c3d0535f6a 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Fri Feb  3 04:39:27 UTC 2017
+Fri Feb  3 12:39:35 UTC 2017
diff --git a/metadata/timestamp.calculate b/metadata/timestamp.calculate
index 90eeac85e0ab..fb797838a2e4 100644
--- a/metadata/timestamp.calculate
+++ b/metadata/timestamp.calculate
@@ -2192,6 +2192,7 @@
 1611062004 ./app-emulation/runv/runv-0.7.0.ebuild
 1611012358 ./app-emulation/lxc/lxc-2.0.3-r1.ebuild
 1701211452 ./app-emulation/lxc/lxc-2.0.6-r1.ebuild
+1702031151 ./app-emulation/lxc/lxc-2.0.7.ebuild
 1611012358 ./app-emulation/lxc/lxc-2.0.4.ebuild
 1701181302 ./app-emulation/lxc/lxc-1.0.8.ebuild
 1611012358 ./app-emulation/lxc/lxc-1.0.7.ebuild
@@ -6579,7 +6580,7 @@
 1701292214 ./media-libs/fontconfig/fontconfig-2.11.1-r2.ebuild
 1701292214 ./media-libs/fontconfig/fontconfig-2.12.0.ebuild
 1701292214 ./media-libs/fontconfig/fontconfig-2.12.1.ebuild
-1701151414 ./media-libs/opencollada/opencollada-1.6.36.ebuild
+1702031100 ./media-libs/opencollada/opencollada-1.6.36.ebuild
 1609060028 ./media-libs/opencollada/opencollada-1.6.31.ebuild
 1701201404 ./media-libs/opencollada/opencollada-1.6.25.ebuild
 1701011543 ./media-libs/x265/x265-1.8-r3.ebuild
@@ -7900,6 +7901,8 @@
 1701211556 ./x11-wm/dwm/dwm-9999.ebuild
 1701211551 ./x11-wm/dwm/dwm-6.1.ebuild
 1701211551 ./x11-wm/dwm/dwm-6.1-r1.ebuild
+1702031146 ./x11-wm/stumpwm-contrib/stumpwm-contrib-20170202.ebuild
+1702031146 ./x11-wm/stumpwm-contrib/stumpwm-contrib-99999999.ebuild
 1701311442 ./x11-wm/cwm/cwm-5.6.ebuild
 1508241336 ./x11-wm/cwm/cwm-5.5.ebuild
 1508241336 ./x11-wm/cwm/cwm-5.1.ebuild
@@ -7981,8 +7984,7 @@
 1606112239 ./x11-wm/muffin/muffin-2.8.5.ebuild
 1508090338 ./x11-wm/plwm/plwm-2.7_rc1-r1.ebuild
 1606161354 ./x11-wm/stumpwm/stumpwm-9999.ebuild
-1701221920 ./x11-wm/stumpwm/stumpwm-1.0.0.ebuild
-1610091508 ./x11-wm/stumpwm/stumpwm-0.9.9.ebuild
+1702031155 ./x11-wm/stumpwm/stumpwm-1.0.0.ebuild
 1508241349 ./x11-wm/subtle/subtle-9999.ebuild
 1508241349 ./x11-wm/subtle/subtle-0.11.3244.ebuild
 1701050949 ./x11-wm/amiwm/amiwm-0.21_p2.ebuild
@@ -11961,12 +11963,11 @@
 1701281738 ./net-libs/nodejs/nodejs-7.4.0.ebuild
 1701281738 ./net-libs/nodejs/nodejs-6.9.4.ebuild
 1610261313 ./net-libs/nodejs/nodejs-4.6.1.ebuild
-1610192039 ./net-libs/nodejs/nodejs-6.9.0.ebuild
 1609291839 ./net-libs/nodejs/nodejs-4.6.0.ebuild
-1610250928 ./net-libs/nodejs/nodejs-6.9.1.ebuild
 1610272051 ./net-libs/nodejs/nodejs-7.0.0.ebuild
+1702031403 ./net-libs/nodejs/nodejs-7.5.0.ebuild
 1612160351 ./net-libs/nodejs/nodejs-0.12.10.ebuild
-1612282101 ./net-libs/nodejs/nodejs-6.9.2.ebuild
+1702031403 ./net-libs/nodejs/nodejs-6.9.5.ebuild
 1508241349 ./net-libs/cppzmq/cppzmq-0_pre150606.ebuild
 1508241349 ./net-libs/cppzmq/cppzmq-0_pre130717-r1.ebuild
 1511151842 ./net-libs/dleyna-connector-dbus/dleyna-connector-dbus-0.2.0.ebuild
@@ -13143,7 +13144,7 @@
 1611200245 ./mail-mta/msmtp/msmtp-1.6.6.ebuild
 1508241349 ./mail-mta/qmail-ldap/qmail-ldap-1.03-r8.ebuild
 1701291343 ./mail-mta/exim/exim-4.88.ebuild
-1701311044 ./mail-mta/exim/exim-4.89_rc1.ebuild
+1702031049 ./mail-mta/exim/exim-4.89_rc2.ebuild
 1508241349 ./mail-mta/netqmail/netqmail-1.06.ebuild
 1510110405 ./mail-mta/netqmail/netqmail-1.06-r3.ebuild
 1508241349 ./mail-mta/netqmail/netqmail-1.06-r2.ebuild
@@ -13388,6 +13389,7 @@
 1606252313 ./app-text/sdcv/sdcv-0.5.0_beta2.ebuild
 1701021739 ./app-text/paperwork/paperwork-1.0.6-r1.ebuild
 1611101624 ./app-text/paperwork/paperwork-0.3.2-r1.ebuild
+1702031225 ./app-text/paperwork/paperwork-1.1.ebuild
 1611281548 ./app-text/paperwork/paperwork-1.0.5.ebuild
 1610302304 ./app-text/pspdftool/pspdftool-0.03.ebuild
 1610302304 ./app-text/pspdftool/pspdftool-9999.ebuild
@@ -13431,6 +13433,7 @@
 1701040211 ./app-text/flpsed/flpsed-0.7.0.ebuild
 1701021739 ./app-text/paperwork-backend/paperwork-backend-1.0.6-r1.ebuild
 1611281548 ./app-text/paperwork-backend/paperwork-backend-1.0.5.ebuild
+1702031225 ./app-text/paperwork-backend/paperwork-backend-1.1.ebuild
 1508090338 ./app-text/mpage/mpage-2.5.6-r1.ebuild
 1610162035 ./app-text/calibre/calibre-2.70.0.ebuild
 1611270058 ./app-text/calibre/calibre-2.73.0.ebuild
@@ -17848,7 +17851,6 @@
 1612281347 ./sys-block/thin-provisioning-tools/thin-provisioning-tools-0.6.3.ebuild
 1605090626 ./sys-block/thin-provisioning-tools/thin-provisioning-tools-0.4.1.ebuild
 1508090338 ./sys-block/sas2ircu/sas2ircu-19.ebuild
-1508090338 ./sys-block/hdrecover/hdrecover-0.4.ebuild
 1608081105 ./sys-block/hdrecover/hdrecover-0.5.ebuild
 1508090338 ./sys-block/fwdl/fwdl-1.2.3.ebuild
 1604292035 ./sys-block/spindown/spindown-0.4.0-r5.ebuild
@@ -21936,6 +21938,7 @@
 1612231311 ./dev-libs/libmirage/libmirage-3.0.4.ebuild
 1612231311 ./dev-libs/libmirage/libmirage-3.0.3.ebuild
 1508090338 ./dev-libs/mapm/mapm-4.9.5.ebuild
+1702031057 ./dev-libs/qrosspython/qrosspython-0.3.2.ebuild
 1508241336 ./dev-libs/qrosspython/qrosspython-9999.ebuild
 1508241336 ./dev-libs/qrosspython/qrosspython-0.3.1.ebuild
 1609031507 ./dev-libs/jsoncpp/jsoncpp-1.7.5.ebuild
@@ -22122,6 +22125,7 @@
 1701282331 ./dev-libs/libxls/libxls-1.4.0-r1.ebuild
 1701031337 ./dev-libs/libuv/libuv-1.8.0.ebuild
 1701311743 ./dev-libs/libuv/libuv-1.10.2.ebuild
+1702031057 ./dev-libs/qrosscore/qrosscore-0.3.2.ebuild
 1508241336 ./dev-libs/qrosscore/qrosscore-0.3.1.ebuild
 1508241336 ./dev-libs/qrosscore/qrosscore-9999.ebuild
 1701240416 ./dev-libs/libnsfb/libnsfb-0.1.5.ebuild
@@ -26329,9 +26333,9 @@
 1701192159 ./www-client/opera-beta/opera-beta-43.0.2442.52.ebuild
 1701131706 ./www-client/seamonkey/seamonkey-2.46-r1.ebuild
 1612221234 ./www-client/w3m/w3m-0.5.3-r9.ebuild
+1702031246 ./www-client/chromium/chromium-57.0.2987.21.ebuild
 1701300917 ./www-client/chromium/chromium-56.0.2924.76-r1.ebuild
 1701300917 ./www-client/chromium/chromium-57.0.2987.13.ebuild
-1701300127 ./www-client/chromium/chromium-57.0.2987.8.ebuild
 1701292206 ./www-client/chromium/chromium-55.0.2883.75.ebuild
 1508090338 ./www-client/dillo/dillo-3.0.4.ebuild
 1508090338 ./www-client/dillo/dillo-3.0.4.1.ebuild
@@ -27503,8 +27507,8 @@
 1701120233 ./sys-apps/s6-linux-init/s6-linux-init-0.2.0.0.ebuild
 1607270959 ./sys-apps/watchdog/watchdog-5.14.ebuild
 1607270959 ./sys-apps/watchdog/watchdog-5.15.ebuild
-1612010012 ./sys-apps/coreutils/coreutils-8.26.ebuild
-1701201404 ./sys-apps/coreutils/coreutils-8.25.ebuild
+1702031311 ./sys-apps/coreutils/coreutils-8.26.ebuild
+1702031311 ./sys-apps/coreutils/coreutils-8.25.ebuild
 1607262152 ./sys-apps/entropy/entropy-302.ebuild
 1508090338 ./sys-apps/cciss_vol_status/cciss_vol_status-1.09-r1.ebuild
 1508090338 ./sys-apps/cciss_vol_status/cciss_vol_status-1.09.ebuild
@@ -29654,8 +29658,10 @@
 1611201715 ./dev-db/postgis/postgis-2.1.8.ebuild
 1606171754 ./dev-db/postgis/postgis-2.2.0.ebuild
 1610182033 ./dev-db/postgis/postgis-2.2.2.ebuild
+1702031503 ./dev-db/postgis/postgis-2.2.5.ebuild
 1610182041 ./dev-db/postgis/postgis-9999.ebuild
 1606171754 ./dev-db/postgis/postgis-2.2.1.ebuild
+1702031503 ./dev-db/postgis/postgis-2.3.2.ebuild
 1701270020 ./dev-db/innotop/innotop-1.11.4.ebuild
 1611240304 ./dev-db/innotop/innotop-1.11.1.ebuild
 1607270959 ./dev-db/vbisam/vbisam-2.0.ebuild
@@ -29857,7 +29863,6 @@
 1612262216 ./dev-lang/ruby/ruby-2.4.0.ebuild
 1612281114 ./dev-lang/ruby/ruby-2.3.3-r1.ebuild
 1610020958 ./dev-lang/ruby/ruby-2.2.5.ebuild
-1610020958 ./dev-lang/ruby/ruby-2.0.0_p648.ebuild
 1609191609 ./dev-lang/ruby/ruby-2.3.1.ebuild
 1701291855 ./dev-lang/nasm/nasm-2.12.01.ebuild
 1701291855 ./dev-lang/nasm/nasm-2.11.08.ebuild
@@ -33400,8 +33405,7 @@
 1612170002 ./dev-ruby/typed-array/typed-array-0.1.2-r1.ebuild
 1609110952 ./dev-ruby/shotgun/shotgun-0.9.2.ebuild
 1604150243 ./dev-ruby/shotgun/shotgun-0.9.1.ebuild
-1611250925 ./dev-ruby/gh/gh-0.15.0.ebuild
-1611171001 ./dev-ruby/gh/gh-0.14.0-r1.ebuild
+1702030943 ./dev-ruby/gh/gh-0.15.0-r1.ebuild
 1701200939 ./dev-ruby/asciimath/asciimath-1.0.4.ebuild
 1608031336 ./dev-ruby/asciimath/asciimath-1.0.2.ebuild
 1605130818 ./dev-ruby/podcast/podcast-0.0.4-r2.ebuild
@@ -33549,10 +33553,9 @@
 1602110351 ./dev-ruby/listen/listen-3.0.6.ebuild
 1607120733 ./dev-ruby/listen/listen-1.3.1-r3.ebuild
 1601101028 ./dev-ruby/listen/listen-3.0.5.ebuild
-1601011055 ./dev-ruby/mechanize/mechanize-2.7.4.ebuild
-1612241655 ./dev-ruby/mechanize/mechanize-2.7.5-r1.ebuild
 1611251749 ./dev-ruby/mechanize/mechanize-2.7.3-r1.ebuild
 1608230750 ./dev-ruby/mechanize/mechanize-2.7.5.ebuild
+1702030946 ./dev-ruby/mechanize/mechanize-2.7.5-r2.ebuild
 1604100853 ./dev-ruby/ntlm-http/ntlm-http-0.1.1-r2.ebuild
 1610080848 ./dev-ruby/sdoc/sdoc-0.4.2.ebuild
 1603310909 ./dev-ruby/sdoc/sdoc-0.4.1.ebuild
@@ -33598,6 +33601,7 @@
 1604150849 ./dev-ruby/rainbow/rainbow-1.1.4-r1.ebuild
 1604150842 ./dev-ruby/rainbow/rainbow-2.0.0-r1.ebuild
 1604150849 ./dev-ruby/rainbow/rainbow-2.1.0.ebuild
+1702031029 ./dev-ruby/rbnacl/rbnacl-4.0.1.ebuild
 1611031739 ./dev-ruby/rspec-collection_matchers/rspec-collection_matchers-1.1.2.ebuild
 1612230906 ./dev-ruby/rspec-collection_matchers/rspec-collection_matchers-1.1.3.ebuild
 1610300001 ./dev-ruby/creole/creole-0.5.0.ebuild
@@ -33771,8 +33775,6 @@
 1607222204 ./dev-ruby/uuidtools/uuidtools-2.1.4-r1.ebuild
 1608020828 ./dev-ruby/uuidtools/uuidtools-2.1.5-r1.ebuild
 1612221234 ./dev-ruby/net-ssh/net-ssh-2.10.0.ebuild
-1601010306 ./dev-ruby/net-ssh/net-ssh-3.0.2.ebuild
-1603280851 ./dev-ruby/net-ssh/net-ssh-3.1.1.ebuild
 1606260832 ./dev-ruby/net-ssh/net-ssh-3.2.0.ebuild
 1604070826 ./dev-ruby/textpow/textpow-1.4.0.ebuild
 1701291148 ./dev-ruby/launchy/launchy-2.4.3-r1.ebuild
@@ -35472,7 +35474,7 @@
 1510221409 ./dev-python/larch/larch-1.20130808.ebuild
 1510221409 ./dev-python/larch/larch-1.20131130.ebuild
 1701302156 ./dev-python/pyxattr/pyxattr-0.6.0.ebuild
-1611012358 ./dev-python/pyxattr/pyxattr-0.5.5.ebuild
+1702030733 ./dev-python/pyxattr/pyxattr-0.5.5.ebuild
 1611012358 ./dev-python/pyxattr/pyxattr-9999.ebuild
 1610052203 ./dev-python/ip-associations-python-novaclient-ext/ip-associations-python-novaclient-ext-0.2.ebuild
 1611012358 ./dev-python/cytoolz/cytoolz-0.7.3.ebuild
@@ -37550,7 +37552,7 @@
 1702022142 ./dev-python/pyzmq/pyzmq-15.0.0.ebuild
 1702022142 ./dev-python/pyzmq/pyzmq-14.6.0.ebuild
 1701302155 ./dev-python/certifi/certifi-2017.1.23.ebuild
-1701292015 ./dev-python/certifi/certifi-2016.9.26.ebuild
+1702030733 ./dev-python/certifi/certifi-2016.9.26.ebuild
 1611012358 ./dev-python/et_xmlfile/et_xmlfile-1.0.1.ebuild
 1611012358 ./dev-python/et_xmlfile/et_xmlfile-1.0.0.ebuild
 1609190238 ./dev-python/aiodns/aiodns-1.1.1.ebuild
@@ -40836,6 +40838,7 @@
 1701210539 metadata/md5-cache/app-emulation/spectemu-0.99.3
 1701210539 metadata/md5-cache/app-emulation/vmware-workstation-11.1.3.3206955-r4
 1701260208 metadata/md5-cache/app-emulation/playonlinux-4.2.4
+1702031209 metadata/md5-cache/app-emulation/lxc-2.0.7
 1701210539 metadata/md5-cache/app-emulation/vmware-modules-304.2
 1610221339 metadata/md5-cache/app-emulation/dlx-1.0.0-r1
 1603210606 metadata/md5-cache/app-emulation/crossover-office-pro-bin-5.0.1
@@ -45404,7 +45407,7 @@
 1701282312 metadata/md5-cache/media-libs/kodi-platform-17.1.0.1
 1701292238 metadata/md5-cache/media-libs/libuninameslist-20091231
 1701210555 metadata/md5-cache/media-libs/wxsvg-1.5.9
-1701282312 metadata/md5-cache/media-libs/opencollada-1.6.36
+1702031108 metadata/md5-cache/media-libs/opencollada-1.6.36
 1701210555 metadata/md5-cache/media-libs/libmatemixer-1.14.0
 1607271009 metadata/md5-cache/media-libs/libicns-0.7.1
 1701210555 metadata/md5-cache/media-libs/sge-030809
@@ -46696,6 +46699,7 @@
 1701210603 metadata/md5-cache/x11-wm/marco-1.14.2
 1701260215 metadata/md5-cache/x11-wm/qtile-9999
 1701301108 metadata/md5-cache/x11-wm/evilwm-1.0.1
+1702031209 metadata/md5-cache/x11-wm/stumpwm-contrib-20170202
 1701260215 metadata/md5-cache/x11-wm/qtile-0.10.5
 1701282313 metadata/md5-cache/x11-wm/awesome-3.5.7
 1701210603 metadata/md5-cache/x11-wm/treewm-0.4.5
@@ -46718,7 +46722,6 @@
 1702020039 metadata/md5-cache/x11-wm/xpra-1.0.1
 1702011009 metadata/md5-cache/x11-wm/twm-1.0.9
 1701210603 metadata/md5-cache/x11-wm/wmii-3.9.2-r4
-1701210603 metadata/md5-cache/x11-wm/stumpwm-0.9.9
 1701210603 metadata/md5-cache/x11-wm/cwm-9999
 1701210603 metadata/md5-cache/x11-wm/xmonad-0.11.1
 1701210603 metadata/md5-cache/x11-wm/xmonad-contrib-0.12
@@ -46782,11 +46785,12 @@
 1701210603 metadata/md5-cache/x11-wm/compiz-0.8.8-r3
 1701210603 metadata/md5-cache/x11-wm/echinus-0.4.9
 1701260215 metadata/md5-cache/x11-wm/icewm-1.3.11
-1701221939 metadata/md5-cache/x11-wm/stumpwm-1.0.0
+1702031209 metadata/md5-cache/x11-wm/stumpwm-1.0.0
 1701210603 metadata/md5-cache/x11-wm/bspwm-0.8.8-r1
 1701282313 metadata/md5-cache/x11-wm/awesome-3.5.8
 1701210603 metadata/md5-cache/x11-wm/musca-0.9.24_p20100226-r4
 1701301108 metadata/md5-cache/x11-wm/windowmaker-0.95.5-r2
+1702031209 metadata/md5-cache/x11-wm/stumpwm-contrib-99999999
 1701210603 metadata/md5-cache/x11-wm/subtle-0.11.3244
 1701282313 metadata/md5-cache/x11-wm/awesome-3.5.6-r2
 1701251639 metadata/md5-cache/x11-wm/wmfs-99999999
@@ -50426,7 +50430,6 @@
 1701210557 metadata/md5-cache/net-libs/http-parser-2.6.1
 1701292308 metadata/md5-cache/net-libs/webkit-gtk-2.14.2
 1701210557 metadata/md5-cache/net-libs/libflowmanager-2.0.4
-1701260213 metadata/md5-cache/net-libs/nodejs-6.9.1
 1608310809 metadata/md5-cache/net-libs/libflowmanager-2.0.5
 1701210557 metadata/md5-cache/net-libs/libgrss-0.7.0
 1701252009 metadata/md5-cache/net-libs/nghttp2-1.19.0
@@ -50554,7 +50557,6 @@
 1701210557 metadata/md5-cache/net-libs/gsoap-2.8.39
 1701210557 metadata/md5-cache/net-libs/pjproject-2.5.1
 1701210557 metadata/md5-cache/net-libs/ortp-0.23.0-r1
-1701260213 metadata/md5-cache/net-libs/nodejs-6.9.0
 1608041209 metadata/md5-cache/net-libs/libmicrohttpd-0.9.49
 1701282312 metadata/md5-cache/net-libs/mbedtls-2.4.0
 1610221357 metadata/md5-cache/net-libs/libosmo-abis-9999
@@ -50584,6 +50586,7 @@
 1701210557 metadata/md5-cache/net-libs/libnatpmp-20110808-r1
 1701240039 metadata/md5-cache/net-libs/shairplay-0_pre20170118
 1701210557 metadata/md5-cache/net-libs/ccrtp-2.0.9
+1702031439 metadata/md5-cache/net-libs/nodejs-6.9.5
 1701210557 metadata/md5-cache/net-libs/aqbanking-5.6.10
 1701210557 metadata/md5-cache/net-libs/libntlm-1.4
 1701210557 metadata/md5-cache/net-libs/libnatpmp-20140401-r1
@@ -50671,6 +50674,7 @@
 1701210557 metadata/md5-cache/net-libs/zeromq-4.1.1
 1701210557 metadata/md5-cache/net-libs/axtls-2.1.1
 1701210557 metadata/md5-cache/net-libs/rest-0.8.0
+1702031439 metadata/md5-cache/net-libs/nodejs-7.5.0
 1701251639 metadata/md5-cache/net-libs/libisds-9999
 1701282312 metadata/md5-cache/net-libs/onion-0.8
 1701292308 metadata/md5-cache/net-libs/liblockfile-1.13
@@ -50758,7 +50762,6 @@
 1701260213 metadata/md5-cache/net-libs/nodejs-4.6.0
 1701260213 metadata/md5-cache/net-libs/ldns-1.6.17-r1
 1701210557 metadata/md5-cache/net-libs/osptoolkit-4.1.5
-1701260213 metadata/md5-cache/net-libs/nodejs-6.9.2
 1701210557 metadata/md5-cache/net-libs/libnetfilter_acct-1.0.2
 1701282312 metadata/md5-cache/net-libs/ignition-msgs-0.7.0
 1701210557 metadata/md5-cache/net-libs/libnatpmp-20150609
@@ -51934,7 +51937,6 @@
 1701301208 metadata/md5-cache/mail-mta/postfix-3.2_pre20170129
 1701210554 metadata/md5-cache/mail-mta/qpsmtpd-0.84-r2
 1610221354 metadata/md5-cache/mail-mta/msmtp-1.6.2
-1701311108 metadata/md5-cache/mail-mta/exim-4.89_rc1
 1701210554 metadata/md5-cache/mail-mta/postfix-3.0.2
 1701210554 metadata/md5-cache/mail-mta/mini-qmail-1.05-r1
 1610221354 metadata/md5-cache/mail-mta/msmtp-1.6.1
@@ -51958,6 +51960,7 @@
 1610221354 metadata/md5-cache/mail-mta/msmtp-1.6.3
 1701210554 metadata/md5-cache/mail-mta/sendmail-8.14.9
 1701210554 metadata/md5-cache/mail-mta/nullmailer-1.13-r5
+1702031108 metadata/md5-cache/mail-mta/exim-4.89_rc2
 1701210554 metadata/md5-cache/mail-mta/nullmailer-2.0-r1
 1701210554 metadata/md5-cache/mail-mta/mini-qmail-1.06
 1701210554 metadata/md5-cache/mail-mta/netqmail-1.06
@@ -52420,6 +52423,7 @@
 1701210540 metadata/md5-cache/app-text/libxmlpatch-0.3.3
 1701282308 metadata/md5-cache/app-text/cb2bib-1.5.0
 1701291838 metadata/md5-cache/app-text/dvipsk-5.996_p20160523
+1702031239 metadata/md5-cache/app-text/paperwork-1.1
 1701210540 metadata/md5-cache/app-text/linuxdoc-tools-0.9.72
 1701291838 metadata/md5-cache/app-text/poppler-0.45.0
 1701291838 metadata/md5-cache/app-text/docbook-sgml-dtd-4.3-r2
@@ -52564,6 +52568,7 @@
 1701291838 metadata/md5-cache/app-text/ttf2pk2-1.5_p20120701
 1701282308 metadata/md5-cache/app-text/zpspell-0.4.3-r1
 1701210540 metadata/md5-cache/app-text/hnb-1.9.18-r1
+1702031239 metadata/md5-cache/app-text/paperwork-backend-1.1
 1701210539 metadata/md5-cache/app-text/cedilla-0.6
 1701291838 metadata/md5-cache/app-text/texlive-core-2014-r4
 1701210540 metadata/md5-cache/app-text/unpaper-6.1-r1
@@ -56625,7 +56630,6 @@
 1701210551 metadata/md5-cache/games-fps/duke3d-data-1.0-r3
 1701210600 metadata/md5-cache/sys-block/buffer-1.19-r2
 1701210600 metadata/md5-cache/sys-block/smp_utils-0.98
-1508100528 metadata/md5-cache/sys-block/hdrecover-0.4
 1604292107 metadata/md5-cache/sys-block/spindown-0.4.0-r5
 1601171009 metadata/md5-cache/sys-block/lsiutil-1.62-r2
 1508241439 metadata/md5-cache/sys-block/tw_cli-10.2
@@ -60688,6 +60692,7 @@
 1702011008 metadata/md5-cache/dev-libs/libpthread-stubs-0.3-r1
 1701231938 metadata/md5-cache/dev-libs/klibc-2.0.4-r2
 1508100513 metadata/md5-cache/dev-libs/libverto-0.2.5
+1702031108 metadata/md5-cache/dev-libs/qrosscore-0.3.2
 1701210542 metadata/md5-cache/dev-libs/leveldb-1.14.0
 1701291938 metadata/md5-cache/dev-libs/libksba-1.3.5
 1701210543 metadata/md5-cache/dev-libs/tvmet-1.7.2-r2
@@ -60753,6 +60758,7 @@
 1701210543 metadata/md5-cache/dev-libs/mathjax-2.7.0
 1701210543 metadata/md5-cache/dev-libs/pslib-0.4.1-r2
 1701260209 metadata/md5-cache/dev-libs/sord-0.12.2
+1702031108 metadata/md5-cache/dev-libs/qrosspython-0.3.2
 1701291938 metadata/md5-cache/dev-libs/gmp-6.1.2
 1701251908 metadata/md5-cache/dev-libs/libinput-1.4.2
 1701210543 metadata/md5-cache/dev-libs/librep-0.92.6
@@ -65075,7 +65081,6 @@
 1701260214 metadata/md5-cache/www-client/ripe-atlas-cousteau-1.2
 1701210602 metadata/md5-cache/www-client/phantomjs-2.0.0
 1701310409 metadata/md5-cache/www-client/netsurf-3.6
-1701300139 metadata/md5-cache/www-client/chromium-57.0.2987.8
 1701300038 metadata/md5-cache/www-client/links-2.14
 1701300038 metadata/md5-cache/www-client/pybugz-9999
 1701300038 metadata/md5-cache/www-client/lynx-2.8.9_pre11
@@ -65137,6 +65142,7 @@
 1701300038 metadata/md5-cache/www-client/pybugz-0.13
 1701210602 metadata/md5-cache/www-client/epiphany-3.20.3
 1701300038 metadata/md5-cache/www-client/lynx-2.8.9_pre6
+1702031308 metadata/md5-cache/www-client/chromium-57.0.2987.21
 1701210602 metadata/md5-cache/www-client/qtweb-3.8.5_p108
 1701300038 metadata/md5-cache/www-client/links-2.13
 1701300038 metadata/md5-cache/www-client/pybugz-0.12.1
@@ -66322,7 +66328,7 @@
 1701210600 metadata/md5-cache/sys-apps/cpuid-20151017
 1701210600 metadata/md5-cache/sys-apps/intel-performance-counter-monitor-2.8
 1605181009 metadata/md5-cache/sys-apps/hprofile-3.1.1
-1701210600 metadata/md5-cache/sys-apps/coreutils-8.26
+1702031338 metadata/md5-cache/sys-apps/coreutils-8.26
 1701210600 metadata/md5-cache/sys-apps/mouseemu-0.12
 1701210600 metadata/md5-cache/sys-apps/openrc-0.18.4
 1701210600 metadata/md5-cache/sys-apps/irqbalance-1.0.7-r1
@@ -66357,7 +66363,7 @@
 1701210600 metadata/md5-cache/sys-apps/pcmciautils-018_p8-r1
 1701210600 metadata/md5-cache/sys-apps/darwin-miscutils-8
 1701210600 metadata/md5-cache/sys-apps/hwloc-1.10.1-r1
-1701210600 metadata/md5-cache/sys-apps/coreutils-8.25
+1702031338 metadata/md5-cache/sys-apps/coreutils-8.25
 1610221400 metadata/md5-cache/sys-apps/lcdsplash-0.3
 1701210600 metadata/md5-cache/sys-apps/busybox-1.26.0
 1508241709 metadata/md5-cache/sys-apps/ethtool-2.6.39
@@ -68372,6 +68378,7 @@
 1701210540 metadata/md5-cache/dev-db/lib_mysqludf_stem-0.9.1
 1701300338 metadata/md5-cache/dev-db/redis-3.2.6
 1701291908 metadata/md5-cache/dev-db/mariadb-5.5.54
+1702031539 metadata/md5-cache/dev-db/postgis-2.3.2
 1701260209 metadata/md5-cache/dev-db/postgresql-9.6.1-r1
 1701260209 metadata/md5-cache/dev-db/postgresql-9.4.10
 1701210540 metadata/md5-cache/dev-db/psqlodbc-09.01.0200
@@ -68517,6 +68524,7 @@
 1701210540 metadata/md5-cache/dev-db/postgis-9999
 1701260209 metadata/md5-cache/dev-db/mycli-1.7.1
 1701210540 metadata/md5-cache/dev-db/couchdb-1.6.1-r2
+1702031539 metadata/md5-cache/dev-db/postgis-2.2.5
 1701210540 metadata/md5-cache/dev-db/slony1-2.2.5
 1701210540 metadata/md5-cache/dev-db/aerospike-server-community-3.9.0.3
 1610221340 metadata/md5-cache/dev-db/gqlplus-1.16
@@ -68918,7 +68926,6 @@
 1511090807 metadata/md5-cache/dev-lang/gwydion-dylan-bin-2.4.0-r1
 1701210542 metadata/md5-cache/dev-lang/polyml-5.4.1
 1701210542 metadata/md5-cache/dev-lang/ekopath-6.0.779_p20160428-r1
-1701210542 metadata/md5-cache/dev-lang/ruby-2.0.0_p648
 1701210542 metadata/md5-cache/dev-lang/gnat-gcc-4.4.7
 1701291938 metadata/md5-cache/dev-lang/perl-5.22.3_rc4
 1508100513 metadata/md5-cache/dev-lang/opendylan-bin-2014.1
@@ -71545,7 +71552,6 @@
 1701210549 metadata/md5-cache/dev-ruby/rspec-3.3.0
 1701210550 metadata/md5-cache/dev-ruby/typhoeus-0.6.9
 1701210550 metadata/md5-cache/dev-ruby/timers-4.0.1
-1701210549 metadata/md5-cache/dev-ruby/net-ssh-3.1.1
 1701210549 metadata/md5-cache/dev-ruby/rspec-mocks-2.14.6-r1
 1701210549 metadata/md5-cache/dev-ruby/racc-1.4.13
 1701210548 metadata/md5-cache/dev-ruby/GeoRuby-2.2.1-r2
@@ -71606,6 +71612,7 @@
 1701210549 metadata/md5-cache/dev-ruby/pg_array_parser-0.0.9-r2
 1701210549 metadata/md5-cache/dev-ruby/rspec-collection_matchers-1.1.3
 1701210549 metadata/md5-cache/dev-ruby/rack-protection-1.5.3-r1
+1702031108 metadata/md5-cache/dev-ruby/gh-0.15.0-r1
 1701210549 metadata/md5-cache/dev-ruby/ruby-feedparser-0.9.3
 1701210549 metadata/md5-cache/dev-ruby/sanitize-4.2.0
 1701210549 metadata/md5-cache/dev-ruby/ragol-1.0.1-r2
@@ -71635,7 +71642,6 @@
 1701210549 metadata/md5-cache/dev-ruby/cmdparse-2.0.6-r1
 1701210549 metadata/md5-cache/dev-ruby/instance_storage-1.0.0
 1701210549 metadata/md5-cache/dev-ruby/delayer-deferred-1.0.3
-1701210549 metadata/md5-cache/dev-ruby/mechanize-2.7.4
 1701210548 metadata/md5-cache/dev-ruby/amq-protocol-2.0.1
 1701210549 metadata/md5-cache/dev-ruby/colorator-0.1-r1
 1701210549 metadata/md5-cache/dev-ruby/liquid-c-3.0.0
@@ -71990,7 +71996,6 @@
 1701210549 metadata/md5-cache/dev-ruby/nokogumbo-1.4.9
 1701210548 metadata/md5-cache/dev-ruby/capybara-1.1.4
 1701210550 metadata/md5-cache/dev-ruby/vcard-0.2.14
-1701210549 metadata/md5-cache/dev-ruby/gh-0.14.0-r1
 1701210549 metadata/md5-cache/dev-ruby/contracts-0.14.0
 1701210550 metadata/md5-cache/dev-ruby/sprockets-3.7.0
 1701210549 metadata/md5-cache/dev-ruby/sass-3.4.22
@@ -72155,7 +72160,6 @@
 1701210549 metadata/md5-cache/dev-ruby/escape_utils-1.2.0
 1701210548 metadata/md5-cache/dev-ruby/bson-4.2.0
 1701210549 metadata/md5-cache/dev-ruby/ruby-gettext-3.2.2
-1701210549 metadata/md5-cache/dev-ruby/net-ssh-3.0.2
 1702020109 metadata/md5-cache/dev-ruby/facter-3.6.0
 1701210548 metadata/md5-cache/dev-ruby/bundler-audit-0.4.0
 1701210550 metadata/md5-cache/dev-ruby/sshkit-1.11.4
@@ -72243,7 +72247,6 @@
 1701281008 metadata/md5-cache/dev-ruby/msgpack-1.0.3
 1701220539 metadata/md5-cache/dev-ruby/afm-0.2.2
 1701210549 metadata/md5-cache/dev-ruby/rb-gsl-1.16.0.6
-1701210549 metadata/md5-cache/dev-ruby/mechanize-2.7.5-r1
 1701210549 metadata/md5-cache/dev-ruby/crack-0.4.2-r1
 1701210548 metadata/md5-cache/dev-ruby/bson-3.2.6
 1701210549 metadata/md5-cache/dev-ruby/faraday_middleware-multi_json-0.0.6
@@ -72423,6 +72426,7 @@
 1701210549 metadata/md5-cache/dev-ruby/net-sftp-2.1.2-r2
 1701210549 metadata/md5-cache/dev-ruby/haml-4.0.7-r1
 1701210548 metadata/md5-cache/dev-ruby/activerecord-5.0.1
+1702031108 metadata/md5-cache/dev-ruby/mechanize-2.7.5-r2
 1701210548 metadata/md5-cache/dev-ruby/activesupport-4.2.7.1
 1701210548 metadata/md5-cache/dev-ruby/bones-3.8.4
 1701210549 metadata/md5-cache/dev-ruby/rest-client-2.0.0
@@ -72444,7 +72448,6 @@
 1701210550 metadata/md5-cache/dev-ruby/shoulda-matchers-2.8.0-r1
 1701210550 metadata/md5-cache/dev-ruby/spreadsheet-0.6.9
 1701210550 metadata/md5-cache/dev-ruby/websocket-driver-0.6.4
-1701210549 metadata/md5-cache/dev-ruby/gh-0.15.0
 1701210549 metadata/md5-cache/dev-ruby/rubypants-0.5.0
 1701032038 metadata/md5-cache/dev-ruby/puppetdb-termini-4.3.0
 1701210549 metadata/md5-cache/dev-ruby/ruby-mp3info-0.8.10
@@ -72658,6 +72661,7 @@
 1701210549 metadata/md5-cache/dev-ruby/memcache-client-1.8.5-r2
 1701210550 metadata/md5-cache/dev-ruby/vlad-2.7.0
 1701210549 metadata/md5-cache/dev-ruby/rake-remote_task-2.4.1
+1702031108 metadata/md5-cache/dev-ruby/rbnacl-4.0.1
 1701210549 metadata/md5-cache/dev-ruby/ox-2.4.8
 1701210549 metadata/md5-cache/dev-ruby/redis-3.2.2
 1701210549 metadata/md5-cache/dev-ruby/ritex-1.0.1
@@ -74849,7 +74853,7 @@
 1701260209 metadata/md5-cache/dev-python/django-classy-tags-0.7.2
 1701260209 metadata/md5-cache/dev-python/django-extensions-1.5.9
 1701260210 metadata/md5-cache/dev-python/montage-wrapper-0.9.8
-1701292038 metadata/md5-cache/dev-python/certifi-2016.9.26
+1702030809 metadata/md5-cache/dev-python/certifi-2016.9.26
 1701292038 metadata/md5-cache/dev-python/pysvn-1.8.0
 1701260210 metadata/md5-cache/dev-python/pyosd-0.2.14-r1
 1701260210 metadata/md5-cache/dev-python/python-troveclient-1.3.0
@@ -76112,7 +76116,7 @@
 1701260210 metadata/md5-cache/dev-python/python-efl-1.17.0
 1701260209 metadata/md5-cache/dev-python/flask-sqlalchemy-1.0
 1701260210 metadata/md5-cache/dev-python/pyflann-1.8.4
-1701260211 metadata/md5-cache/dev-python/pyxattr-0.5.5
+1702030809 metadata/md5-cache/dev-python/pyxattr-0.5.5
 1701260210 metadata/md5-cache/dev-python/pyasn1-modules-0.0.7
 1701260209 metadata/md5-cache/dev-python/flask-uploads-0.2.0
 1701260209 metadata/md5-cache/dev-python/eventlet-0.18.4
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index dd77ab6e67b9..f0c602881651 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Fri, 03 Feb 2017 05:00:01 +0000
+Fri, 03 Feb 2017 13:00:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index ff9e9be8e378..e1147cab8d03 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1486096801 Fri 03 Feb 2017 04:40:01 AM UTC
+1486125601 Fri 03 Feb 2017 12:40:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index e303e8d0c987..5e8bf7185057 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Fri, 03 Feb 2017 04:43:21 +0000
+Fri, 03 Feb 2017 12:43:28 +0000
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index 080bfe0a4767..a4a09f0a4f93 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -3,26 +3,24 @@ DIST node-v0.12.10.tar.gz 19572955 SHA256 edbd3710512ec7518a3de4cabf9bfee6d12f27
 DIST node-v0.12.17.tar.gz 19938029 SHA256 ddea5e253812f167608fbdda6ff29ffc30dc6f669cf2f6e4249938d28b9cd44d SHA512 86c22b17f57018083b07096beeca10e6dfa7569b3d1a25a3b12dd82796db3c9536e6136e0dd0ff62b4de116413f3722b36ce396faa46d8640f80ab09ccfcbca7 WHIRLPOOL 5fba1f95de0a7dbda7e7649bc0f8553cd8595eb87cd27062efbdc59a54673e7e1e6f80191abede683a686043a81d82b76e141aa765b98e3dc39e015aca98e41f
 DIST node-v4.6.0.tar.xz 13295184 SHA256 42910dbd34e49bfc40580e06753947c30d31101455a38e9f0343a23d67c0c694 SHA512 d3e79f7e361af888955f311818c0d0401a29fd99a86fa125924b3f7891f209f84f4f662dba071c9bdbb3d11a3b3097274d95bdc4a51143a2e816400ff71b041f WHIRLPOOL 011d1de801b87be413b7838e0b0ea216909bbe4a2d88a5045536d65d3b85cca64f9e94923859a65d8b6ed1fcbbf34a9463c7a8fc036ba1f0b902f8b4a07b83ac
 DIST node-v4.6.1.tar.xz 13295568 SHA256 fe2a85df8758001878abb5bbaf17a6b6cdc12b3e465b1d3bace83b37fdf0345a SHA512 4eb2acbe13ee2373922420e3238be63d2108dacba640438bddbdea12ec2de9c655f33db611e4c0654b66bf4fdb844a7b6554a823aac73171b17599096856abdb WHIRLPOOL a6d21cce7ab8c430528682f78a6e6492f753c87949b7b1bdc15dc02911559cd89deb45329c2ba32da57b776dd4feaabec8a3e7a59a78094cfb079261b6475c76
-DIST node-v6.9.0.tar.xz 15615224 SHA256 656342ed8a84c95a36af902f309aeeca7103b16d61c02925bd37bd47d2194915 SHA512 c8dc6899e8ec9d97d37b72a0ff6483069c494b05020ff6cf101c2b8b2774ed2673138fc260dc90b7317123d77daf89d0ba3321deda47457fa892456054f93337 WHIRLPOOL e65031667b619e0449924272359db01fd846dc68238e45a2bc4890d6f539b32dc173bab282c858412f2d34b73cdf68371a5677d081f9b56fb19791a9354ad740
-DIST node-v6.9.1.tar.xz 15617228 SHA256 0bdd8d1305777cc8cd206129ea494d6c6ce56001868dd80147aff531d6df0729 SHA512 3f1c724dfc9f76f101064be6ef222482f3b7e53d8d6c026b3d166dfbdd104f05055cf04a3205679793fa12f946548fc06e3272527655b28002d0bf0e7eccdf1b WHIRLPOOL dd1607b4c193f7ef05f7d0571f31c72133464e2ebd023278cf055d7156daa6e194e5170948f32cae8027f1ef5c6eaef6a89bf7271ed386d45c787b30e57880fb
-DIST node-v6.9.2.tar.xz 15628240 SHA256 f41b320b37ce23a34dbc597040e71535ea4f6baa2342bc526bb45f5f9aa9c9fb SHA512 d433661af57e9367296dc3ca8a4cd9662344ec868655f94aaf20685a589eabfb762ce5e84556da08460d6862d67eebb12505623a58daf299f2983a54d5a84d5f WHIRLPOOL 76ebb495d8bb4837e8f8efaa47ff0f1dcddba5a4d6b8165bf2e12de40736b0d8e7f42e92d2cb04e14c2aad9841d79fcbb3de87968b73dd26681f388be08e214f
 DIST node-v6.9.4.tar.xz 15519264 SHA256 c51d7c61db40455d57428abcadc7eb0f0a08a8878cb1d8ea3c1e211c54532c35 SHA512 86d3e2889031c2b50c021bd3fd63194c2c22c44291d51dff1b5e1652b01853c09d2880c2f58fdad062e3e2a3f637a3f0d78dac66b835b676790cf272e64f8dce WHIRLPOOL d1bcf488ed1aae7959303b988c9467fc5d0930166c7bfe0e441392763e19f788496971c07560a9f62586bbb2be7ce741ece8346140d665d29593b9b8f649b002
+DIST node-v6.9.5.tar.xz 15521472 SHA256 d7fed1a354b29503f3e176d7fdb90b1a9de248e0ce9b3eb56cc26bb1f3d5b6b3 SHA512 d13cebccf0d0b422c735a5e3981fa430f6537c2bdb4569c9fe256c07d1e833524b60645746fe5a7957c7e49ca4df434aa4ed72ee392b14d1cf9693c49e27b063 WHIRLPOOL 2c08015b06d0b1bc34fb1869f7c2b327b42aff61ff205ec2e8db646a60633bfdaa4ea11da0dbf5832640db0d0bb03e298e1c6f0a38b444139c0042984a1606b1
 DIST node-v7.0.0.tar.xz 16296516 SHA256 e16c3c76c2d6756bbfd711189cbdaf5676049b443e6817007bb537f243ca899a SHA512 775b3a786ca6975b1913f048ea9a969e674d6d8ca58094557fe21e7c821e10f8d4bd8d484ca3617b553587449020ecf1d3d8c8d912c46725bab7f7561c2fbdda WHIRLPOOL e9068c49181151ebcf1dd75f5ecb8ee87b89abc7695cb9158bbfa701de9344bc5c2b59b5363d5be4a65bb4df1c37b8f6285b6c584f43ad3f933628a7e175ff1f
 DIST node-v7.2.0.tar.xz 16407484 SHA256 486d4db7ef659521ad2fafefca877638da07bef61e2aee090207ff52149294fb SHA512 482067965ac97f296a66317b6b10950087f9f61cf1bd3ee5275da6ca804aa2669cd1f82dc619ece576996403b27b295380b53c308ce5defe91c7b75a6bd3e91e WHIRLPOOL 37cebc3350b97390640a38c8701667cf66411fe2abdc41e77b089f2415f88434426e7da5a8192543ed63fa6dcd5ea768dfc2b33fbcf16431b36e4decbd4b793c
 DIST node-v7.3.0.tar.xz 16434356 SHA256 dde8f6c800ac8049016d86b91ba5aeb6ddb35cb747cd74756dc05cf9fbe16b81 SHA512 97961c68d097d71ff5030e04526935921af498acba7e9081cd8699c624d4df9b9ce9992c29fe224387a26a53727dcc2181b63841e75e69808295b259bd6da1f1 WHIRLPOOL 7ec8be0b169e3361896296cfe08b9fda8a0e467c479f6305ec255fc26ad1b346bd05b7397f0a18910d5d4999016db3d406914db4b9e19e5f85dfa5a52ac7f245
 DIST node-v7.4.0.tar.xz 16611356 SHA256 9f15b916f8677ec1615c46bdd6d2208ed1b24fad26384f9ac249f5b09d31c32b SHA512 50167c85cae41720412b8de627f7f6a9b351e80823aafe23d96bc8d37c96a25ad635abc46af481d1817cec89bf0bec0e059964434d585f59ad22f99af820c67d WHIRLPOOL a56dc105ef768f044f68181b186d7e907dbdc3238006f28cb677d62ced69f7430a02a2a2b9d026895dafd3f185aa50dec221a6ca76de37b84f8792ea8ae97a58
+DIST node-v7.5.0.tar.xz 16539384 SHA256 f99ee74647fe223eb03f2dd1dc6acdc14d9a881621376c848236c8d2ac8afd03 SHA512 ae903445d27b487200eaf95ef12ac56d84ae76efa0195a533bede33d9248489b3fd71db064969b3ea8505a5a013cce67787350d7633a6e57ea05d5fd33582ac8 WHIRLPOOL 03f1f7c1e54d620650705ba9fe6f4f556dcdbb8269f2db4192d793feee7c85bd07d7be3ad331b8442b438930387a1036d2d772262837c3b659aa19309d041c62
 EBUILD nodejs-0.12.10.ebuild 3432 SHA256 c882d7847724aefe86efc0a6a8e510376a7f083d8c32f43b9d491c62901967d7 SHA512 698208aff58a8799f3c0f6613273f477ca0d8bbf23b6288d7e2b6d6583bfd93bd0faa857fc9f6a6ac6b3859c0548065a2b9654b0ffe978598d0ca2bdbad16433 WHIRLPOOL 2d1f924f550bf196923748c3186b64df931b30bb0930b8216eeddcb399001bdb09f26f6a833374348005ebe1761989d84c7ce1e24a44a6e2bdc459cfbe75c39a
 EBUILD nodejs-0.12.17.ebuild 3432 SHA256 c882d7847724aefe86efc0a6a8e510376a7f083d8c32f43b9d491c62901967d7 SHA512 698208aff58a8799f3c0f6613273f477ca0d8bbf23b6288d7e2b6d6583bfd93bd0faa857fc9f6a6ac6b3859c0548065a2b9654b0ffe978598d0ca2bdbad16433 WHIRLPOOL 2d1f924f550bf196923748c3186b64df931b30bb0930b8216eeddcb399001bdb09f26f6a833374348005ebe1761989d84c7ce1e24a44a6e2bdc459cfbe75c39a
 EBUILD nodejs-4.6.0.ebuild 4444 SHA256 63d4c7735dc914bb96a60ef97fd38d78e824c16bc0314aee8aab8026288bd47f SHA512 297f751cf02f562b18fe96a90ae417c3fc41ba1284fda46cac24c83d1305fe500ce0cdc26f172759dc729e10c5dec0dc046f2a8d7ebad4ea04543626a6ca6b6c WHIRLPOOL 703cc8a3e9fcb8568cba7726dc43fafc76402f2686020dac03b54ec9723b24b5a7de9172415534016801cb2cdb0bd1e5c31be921bbecb16f000e1a3fc50d342d
 EBUILD nodejs-4.6.1.ebuild 4442 SHA256 07bdb373530ac40fc0ebeb1c688ee05d3d22a42e6c0ab891bc0f406fe72693fa SHA512 a9a651f3256e92273e2be83361937528d17e1c17d875d79e083bb3afbee64b938553f1dd85a2a96174bf268fe75efdb95699929387f37c562cf31463cfb9fed6 WHIRLPOOL 4660f7a6fa0e963e8e49b1c927bfad4db14ce603ee5992328d4af7baae2a4af6ed6c2c4d4bb81bd7259c21db72848a6554e3cdec6bb859d415dc5be198b7488f
-EBUILD nodejs-6.9.0.ebuild 6080 SHA256 03351fef91e1c1f273a4b083acea842a2a35d7dbfd500bf2e2f37dd0e613cf81 SHA512 a5d5a9e2439d231bf78c68d4a85bd5d8a1d9164f661b191a684701fa60807f4acf913f8b4dd9c7162c46e582ee774d39208ea4118f6d591198155b849b7fde5b WHIRLPOOL d0186dfb7f4c78037447e1a43f24eddc7ddd9dd09d7f4b65b82de9edc2d2f5000760c348e6549f9661aa58e7b789812751c8ff63e782e3c1082fa8ef226674d9
-EBUILD nodejs-6.9.1.ebuild 6080 SHA256 03351fef91e1c1f273a4b083acea842a2a35d7dbfd500bf2e2f37dd0e613cf81 SHA512 a5d5a9e2439d231bf78c68d4a85bd5d8a1d9164f661b191a684701fa60807f4acf913f8b4dd9c7162c46e582ee774d39208ea4118f6d591198155b849b7fde5b WHIRLPOOL d0186dfb7f4c78037447e1a43f24eddc7ddd9dd09d7f4b65b82de9edc2d2f5000760c348e6549f9661aa58e7b789812751c8ff63e782e3c1082fa8ef226674d9
-EBUILD nodejs-6.9.2.ebuild 6080 SHA256 03351fef91e1c1f273a4b083acea842a2a35d7dbfd500bf2e2f37dd0e613cf81 SHA512 a5d5a9e2439d231bf78c68d4a85bd5d8a1d9164f661b191a684701fa60807f4acf913f8b4dd9c7162c46e582ee774d39208ea4118f6d591198155b849b7fde5b WHIRLPOOL d0186dfb7f4c78037447e1a43f24eddc7ddd9dd09d7f4b65b82de9edc2d2f5000760c348e6549f9661aa58e7b789812751c8ff63e782e3c1082fa8ef226674d9
 EBUILD nodejs-6.9.4.ebuild 6080 SHA256 4cc359525f346ea70fd40d4cc1706bd87df25de32f4c8d00bced18ea8c66d447 SHA512 e5d4fdf7c6574684f6fa1da5ca5c110dc9bc2c15690078942f91ceb3e6f8945bf3a6331ed7168382395b5504ad18a15d7e43823df71ebbc0292e8a5dbaeed8c4 WHIRLPOOL 484a8be1afc201059837f754caa32dc96de6cf6a37ef3be81029da11d5ca5ccd666ccd30d9c4e5711ae5f2894d5d494ad0690b59a803a739c29f003551d9808f
+EBUILD nodejs-6.9.5.ebuild 6080 SHA256 4cc359525f346ea70fd40d4cc1706bd87df25de32f4c8d00bced18ea8c66d447 SHA512 e5d4fdf7c6574684f6fa1da5ca5c110dc9bc2c15690078942f91ceb3e6f8945bf3a6331ed7168382395b5504ad18a15d7e43823df71ebbc0292e8a5dbaeed8c4 WHIRLPOOL 484a8be1afc201059837f754caa32dc96de6cf6a37ef3be81029da11d5ca5ccd666ccd30d9c4e5711ae5f2894d5d494ad0690b59a803a739c29f003551d9808f
 EBUILD nodejs-7.0.0.ebuild 6080 SHA256 03351fef91e1c1f273a4b083acea842a2a35d7dbfd500bf2e2f37dd0e613cf81 SHA512 a5d5a9e2439d231bf78c68d4a85bd5d8a1d9164f661b191a684701fa60807f4acf913f8b4dd9c7162c46e582ee774d39208ea4118f6d591198155b849b7fde5b WHIRLPOOL d0186dfb7f4c78037447e1a43f24eddc7ddd9dd09d7f4b65b82de9edc2d2f5000760c348e6549f9661aa58e7b789812751c8ff63e782e3c1082fa8ef226674d9
 EBUILD nodejs-7.2.0.ebuild 6137 SHA256 add90f1306c3bfba63ce553d1c1d4ad4393572669cfd1b64127c43f6e00eb239 SHA512 241693007171d5d0aea61f2efa93bf73d50ca33273a29ae9f5e29aadb1a30d2697c912a07fb7587413df5242be263458742e85a651560c492fec144107b7c0a8 WHIRLPOOL 137ce303cced8f53ddf4661120b80d60bee71ac67150cb8e094def070a1c7fe444b7271b8c23edc97b8ccdd98bbccfd33c5552c438164e671d9247b1e1f51411
 EBUILD nodejs-7.3.0.ebuild 6137 SHA256 add90f1306c3bfba63ce553d1c1d4ad4393572669cfd1b64127c43f6e00eb239 SHA512 241693007171d5d0aea61f2efa93bf73d50ca33273a29ae9f5e29aadb1a30d2697c912a07fb7587413df5242be263458742e85a651560c492fec144107b7c0a8 WHIRLPOOL 137ce303cced8f53ddf4661120b80d60bee71ac67150cb8e094def070a1c7fe444b7271b8c23edc97b8ccdd98bbccfd33c5552c438164e671d9247b1e1f51411
 EBUILD nodejs-7.4.0.ebuild 6137 SHA256 c4e07b66da98093c89885c662e75fad1b324020cab09e5266246fb150e89ba07 SHA512 918113dbc0ac9189e23407efeacd8b7066c68c7acd14098d8a40af80c0b29133eb40af500aaec383255ab88fc841afd5ed20d9a6bf77b55831461a0c341be956 WHIRLPOOL 880d4897cbb9701039010eb7a3d81b71aeab044cb2b085326dae7113c11df73d4de9fee6ede6e12bdde9842527437dfe886bc983809c73385196d61147ba5897
+EBUILD nodejs-7.5.0.ebuild 6137 SHA256 c4e07b66da98093c89885c662e75fad1b324020cab09e5266246fb150e89ba07 SHA512 918113dbc0ac9189e23407efeacd8b7066c68c7acd14098d8a40af80c0b29133eb40af500aaec383255ab88fc841afd5ed20d9a6bf77b55831461a0c341be956 WHIRLPOOL 880d4897cbb9701039010eb7a3d81b71aeab044cb2b085326dae7113c11df73d4de9fee6ede6e12bdde9842527437dfe886bc983809c73385196d61147ba5897
 MISC ChangeLog 16331 SHA256 16702a204cff5e2c71e5b982f323aa3aeaa29a6f3b2da7d23745b81a7f9e01bc SHA512 a98fae5176a945e301bb763d80c44c641295dabdd8cd6d8226106db206b5e3d90654f3b9d98f5adb2291218c97c1707daec05f68f5d1036edba0129c5d86169d WHIRLPOOL 7a409b0f4f81d549f26f777325c4149a645e275fd83b5128252dd27596654e6800454692664e3cf5d41030794215e8e39cbc05ff3cd6db7bd681a12a96eeffec
 MISC ChangeLog-2015 23934 SHA256 354bd9c41192f651dd4426b236bc63a6bb41ea76831855a0ec00550a369a1b97 SHA512 28421b67fa37d71d97f976bd938cdaded4c994c08fa68d469b1d193a4cb380da633acb352cdcbda0f4cdfaf6cf671c82132c3e64bb48721df9d78843bcf49d74 WHIRLPOOL 65cad5043c8d83e0d342c1e593a7c0eb2d2400968507ef48e2de0384baab13861c99ed7e44cdf41eb6027826b174695be598d77077587a01ce96adbb43a5b633
 MISC metadata.xml 749 SHA256 7bd1463235daf323e99518809d179f158263c5b702cb3b06433e33527a78f0ba SHA512 6b1115136449fad2edd373b2b853874b54da2dfab5a30a36f54bd8c0ac61636139f3c59bbd4618460c725bf9981c71731c33ccb07900c38c58bf4b9511254ee3 WHIRLPOOL 3bb964d5b3a51c2895fdf5c0d6cfcde5391f8cabf4f559e78c0988558f14c6c026d9523a89e14a8d8ff605d33a39982884d85397b6871aec4d5a862b2b3e2777
diff --git a/net-libs/nodejs/nodejs-6.9.0.ebuild b/net-libs/nodejs/nodejs-6.9.0.ebuild
deleted file mode 100644
index 4e7689015852..000000000000
--- a/net-libs/nodejs/nodejs-6.9.0.ebuild
+++ /dev/null
@@ -1,193 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-
-inherit bash-completion-r1 eutils flag-o-matic pax-utils python-single-r1 toolchain-funcs
-
-DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
-HOMEPAGE="https://nodejs.org/"
-SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
-
-LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x64-macos"
-IUSE="cpu_flags_x86_sse2 debug doc icu +npm +snapshot +ssl test"
-
-RDEPEND="icu? ( >=dev-libs/icu-56:= )
-	npm? ( ${PYTHON_DEPS} )
-	>=net-libs/http-parser-2.6.2:=
-	>=dev-libs/libuv-1.9.0:=
-	>=dev-libs/openssl-1.0.2g:0=[-bindist]
-	sys-libs/zlib"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	test? ( net-misc/curl )"
-
-S="${WORKDIR}/node-v${PV}"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-PATCHES=(
-	"${FILESDIR}"/gentoo-global-npm-config.patch
-)
-
-pkg_pretend() {
-	(use x86 && ! use cpu_flags_x86_sse2) && \
-		die "Your CPU doesn't support the required SSE2 instruction."
-
-	( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \
-		die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
-}
-
-src_prepare() {
-	tc-export CC CXX PKG_CONFIG
-	export V=1
-	export BUILDTYPE=Release
-
-	# fix compilation on Darwin
-	# https://code.google.com/p/gyp/issues/detail?id=260
-	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
-
-	# make sure we use python2.* while using gyp
-	sed -i -e "s/python/${EPYTHON}/" deps/npm/node_modules/node-gyp/gyp/gyp || die
-	sed -i -e "s/|| 'python'/|| '${EPYTHON}'/" deps/npm/node_modules/node-gyp/lib/configure.js || die
-
-	# less verbose install output (stating the same as portage, basically)
-	sed -i -e "/print/d" tools/install.py || die
-
-	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
-	local LIBDIR=$(get_libdir)
-	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
-	sed -i -e "s/'lib'/'${LIBDIR}'/" lib/module.js || die
-	sed -i -e "s|\"lib\"|\"${LIBDIR}\"|" deps/npm/lib/npm.js || die
-
-	# Avoid writing a depfile, not useful
-	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
-
-	# Avoid a test that I've only been able to reproduce from emerge. It doesnt
-	# seem sandbox related either (invoking it from a sandbox works fine).
-	# The issue is that no stdin handle is openened when asked for one.
-	# It doesn't really belong upstream , so it'll just be removed until someone
-	# with more gentoo-knowledge than me (jbergstroem) figures it out.
-	rm test/parallel/test-stdout-close-unref.js || die
-
-	# debug builds. change install path, remove optimisations and override buildtype
-	if use debug; then
-		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
-		BUILDTYPE=Debug
-	fi
-
-	default
-}
-
-src_configure() {
-	local myarch=""
-	local myconf=( --shared-openssl --shared-libuv --shared-http-parser --shared-zlib )
-	use npm || myconf+=( --without-npm )
-	use icu && myconf+=( --with-intl=system-icu )
-	use snapshot && myconf+=( --with-snapshot )
-	use ssl || myconf+=( --without-ssl )
-	use debug && myconf+=( --debug )
-
-	case ${ABI} in
-		amd64) myarch="x64";;
-		arm) myarch="arm";;
-		arm64) myarch="arm64";;
-		ppc64) myarch="ppc64";;
-		x32) myarch="x32";;
-		x86) myarch="ia32";;
-		*) myarch="${ABI}";;
-	esac
-
-	GYP_DEFINES="linux_use_gold_flags=0
-		linux_use_bundled_binutils=0
-		linux_use_bundled_gold=0" \
-	"${PYTHON}" configure \
-		--prefix="${EPREFIX}"/usr \
-		--dest-cpu=${myarch} \
-		--without-dtrace \
-		"${myconf[@]}" || die
-}
-
-src_compile() {
-	emake -C out mksnapshot
-	pax-mark m "out/${BUILDTYPE}/mksnapshot"
-	emake -C out
-}
-
-src_install() {
-	local LIBDIR="${ED}/usr/$(get_libdir)"
-	emake install DESTDIR="${D}"
-	pax-mark -m "${ED}"usr/bin/node
-
-	# set up a symlink structure that node-gyp expects..
-	dodir /usr/include/node/deps/{v8,uv}
-	dosym . /usr/include/node/src
-	for var in deps/{uv,v8}/include; do
-		dosym ../.. /usr/include/node/${var}
-	done
-
-	if use doc; then
-		# Patch docs to make them offline readable
-		for i in `grep -rl 'fonts.googleapis.com' "${S}"/out/doc/api/*`; do
-			sed -i '/fonts.googleapis.com/ d' $i;
-		done
-		# Install docs!
-		dohtml -r "${S}"/doc/*
-	fi
-
-	if use npm; then
-		dodir /etc/npm
-
-		# Install bash completion for `npm`
-		# We need to temporarily replace default config path since
-		# npm otherwise tries to write outside of the sandbox
-		local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
-		sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die
-		local tmp_npm_completion_file="$(emktemp)"
-		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
-		newbashcomp "${tmp_npm_completion_file}" npm
-		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
-
-		# Move man pages
-		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
-
-		# Clean up
-		rm "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} || die
-		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} || die
-
-		local find_exp="-or -name"
-		local find_name=()
-		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
-			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
-			"*.md" "*.markdown" "*.bat" "*.cmd"; do
-			find_name+=( ${find_exp} "${match}" )
-		done
-
-		# Remove various development and/or inappropriate files and
-		# useless docs of dependend packages.
-		find "${LIBDIR}"/node_modules \
-			\( -type d -name examples \) -or \( -type f \( \
-				-iname "LICEN?E*" \
-				"${find_name[@]}" \
-			\) \) -exec rm -rf "{}" \;
-	fi
-}
-
-src_test() {
-	out/${BUILDTYPE}/cctest || die
-	"${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
-}
-
-pkg_postinst() {
-	einfo "The global npm config lives in /etc/npm. This deviates slightly"
-	einfo "from upstream which otherwise would have it live in /usr/etc/."
-	einfo ""
-	einfo "Protip: When using node-gyp to install native modules, you can"
-	einfo "avoid having to download extras by doing the following:"
-	einfo "$ node-gyp --nodedir /usr/include/node <command>"
-}
diff --git a/net-libs/nodejs/nodejs-6.9.1.ebuild b/net-libs/nodejs/nodejs-6.9.5.ebuild
similarity index 99%
rename from net-libs/nodejs/nodejs-6.9.1.ebuild
rename to net-libs/nodejs/nodejs-6.9.5.ebuild
index 4e7689015852..cf82de1941ac 100644
--- a/net-libs/nodejs/nodejs-6.9.1.ebuild
+++ b/net-libs/nodejs/nodejs-6.9.5.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$
 
diff --git a/net-libs/nodejs/nodejs-6.9.2.ebuild b/net-libs/nodejs/nodejs-7.5.0.ebuild
similarity index 97%
rename from net-libs/nodejs/nodejs-6.9.2.ebuild
rename to net-libs/nodejs/nodejs-7.5.0.ebuild
index 4e7689015852..b46f87b1e03b 100644
--- a/net-libs/nodejs/nodejs-6.9.2.ebuild
+++ b/net-libs/nodejs/nodejs-7.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -16,7 +16,7 @@ SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
 LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x64-macos"
-IUSE="cpu_flags_x86_sse2 debug doc icu +npm +snapshot +ssl test"
+IUSE="cpu_flags_x86_sse2 debug doc icu +npm +snapshot +ssl systemtap test"
 
 RDEPEND="icu? ( >=dev-libs/icu-56:= )
 	npm? ( ${PYTHON_DEPS} )
@@ -26,6 +26,7 @@ RDEPEND="icu? ( >=dev-libs/icu-56:= )
 	sys-libs/zlib"
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
+	systemtap? ( dev-util/systemtap )
 	test? ( net-misc/curl )"
 
 S="${WORKDIR}/node-v${PV}"
@@ -109,7 +110,7 @@ src_configure() {
 	"${PYTHON}" configure \
 		--prefix="${EPREFIX}"/usr \
 		--dest-cpu=${myarch} \
-		--without-dtrace \
+		$(use_with systemtap dtrace) \
 		"${myconf[@]}" || die
 }
 
diff --git a/profiles/package.mask b/profiles/package.mask
index c8c2fe28e550..c317c62fd0e0 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -30,6 +30,11 @@
 
 #--- END OF EXAMPLES ---
 
+# Pawel Hajdan, Jr. <phajdan.jr@gentoo.org> (03 Feb 2017)
+# Dev channel releases are only for people who are developers or want more
+# experimental features and accept a more unstable release.
+>=www-client/chromium-58
+
 # Michael Palimaka <kensington@gentoo.org> (02 Feb 2017)
 # Upstream missing. Ancient. Unmaintained. No revdeps.
 # Masked for removal in 30 days.
@@ -62,7 +67,7 @@ dev-python/mwlib-rl
 
 # Fabian Groffen <grobian@gentoo.org> (31 Jan 2017)
 # Mask upcoming Exim release candidates
-=mail-mta/exim-4.89_rc1
+=mail-mta/exim-4.89_rc2
 
 # David Seifert <soap@gentoo.org> (30 Jan 2017)
 # No maintainer activity since git migration, dated eclass
@@ -462,19 +467,10 @@ dev-ruby/activesupport:4.1
 # depends on a newer version.
 net-misc/termtter
 
-# Mike Gilbert <floppym@gentoo.org> (10 Dec 2016)
-# Dev channel releases are only for people who are developers or want more
-# experimental features and accept a more unstable release.
->=www-client/chromium-57
-
 # Markos Chandras <hwoarang@gentoo.org> (10 Dec 2016)
 # Reverse dependencies need testing, wrt bug #580760
 >=net-libs/rb_libtorrent-1.1.1
 
-# Hans de Graaff <graaff@gentoo.org> (07 Dec 2016)
-# Mask ruby 2.0 for removal, bug 576034
-dev-lang/ruby:2.0
-
 # Kent Fredric (19 Nov 2016)
 # virtual/perl-MathBigInt-1.999.726+ Mask Block
 # Will likely not be unmasked until future Perls
diff --git a/sci-mathematics/msieve/Manifest b/sci-mathematics/msieve/Manifest
index 03025a9d12b7..4b4a7ccd89e7 100644
--- a/sci-mathematics/msieve/Manifest
+++ b/sci-mathematics/msieve/Manifest
@@ -2,8 +2,6 @@ AUX fix-version.patch 499 SHA256 1c748921c35d34af3267020704a26feb14d3043ce58a9ff
 AUX fix-version2.patch 560 SHA256 a3806f9159a0a760ac49872883631bae85fb137a357ee1d3ec9022ca76c10eb1 SHA512 c745b63461a76a20d32c3d022c120ed1ee201a05ed372f01381d71f4cc9601d92089acfc07bfe6930180740c4f4711b88b129d126065558d2cf6d7dd81bf78d8 WHIRLPOOL 26b2205eaf577233fc0b3f0faa7e943cfaefdc2badecdc06a016bf69c533322b600ffbaf6efe2ac02d133028f3b9adfbffdc309cde5370e23b3806d5ac094327
 AUX msieve-1.51-reduce-printf.patch 1598 SHA256 effe23eee2cc845fdf23237790f5cc2dc8f6c5a9141f25d9a52a9be54d00ef5e SHA512 abd539239b1c289265b523f748dc0838df89d532a21c27040b6bbd0a8c7ef10641fc24a06378d48c45fe2d0156f09de06d10412d1d0ec71583c02123fa6158c6 WHIRLPOOL 1e4b175880e3cc5fae4456733b8ae9d29d545d6f477430923ae550437c902015f8d903546d8a97dbe9263ce2b7be6b1180ec6d04816340a1e09e4c036da136bb
 AUX reduce-printf.patch 2105 SHA256 b576d46577c411b1ad814ab48e4fce595927b225e93e311789e6f2135a68a01e SHA512 c0ee9ddbbb41a25a48ec4b6cc80cf6a8afee35a723aee74eb7d7bfa01b545eff1713eaf2077ace7d2a9aca97f00aa42bc36e6d23d7d229f339de1f152316af98 WHIRLPOOL 75a55e0ff6da1e99c96bb2395ce75fbfac1aad1c3bfaf4bb924c957bc821141afd4a805e79bbd4fb47ebeae101c488a2291ca900198fb25cc8f94badfc1eb139
-AUX reduce-printf2.patch 1234 SHA256 12a0866c7833f7589a3061a496d19bc82eec3cf066552c0f10173689302e9da2 SHA512 3c0722df684284cdf4ec5740dfc4e1469e3a998c672b9a7059710899add07eeff1e6324c5893609eedab2c33bb337447649a5483aaeac33175274451e8ea4eab WHIRLPOOL 578c0f191633aeb164fad242d446db3dc45ab1c8837c8ae535bddcd38bb0505a66913d963f20f08f7ac72b325e3daac0a8cd87b1e8ad2b868edad8c298cb5f9a
-AUX reduce-printf3.patch 1145 SHA256 144d5ee944cefc7169ce8a7735f9ea1e43a94fc383f0ccd0bd3906edd3a98b75 SHA512 5a7f8ac795b7a04b6d6df8f9985e98a0c34d4bcefd8405b289987e45cd93dd967aaf4b54b212a37e4992e38135bcba849f62eb27af50746325b37c26bcc03cc1 WHIRLPOOL c73cc23d3676391927e2a70b058021c7e6b37483c75b313a4649c675fbf11f864f5a1617eaed09e909b124deb0510e06f2a8c1b1c75d6dd2ae43332a2bba133e
 DIST msieve151.tar.gz 623885 SHA256 26bc1d0d89325986aacfbafb687451f3de5da1bd388e087ec3ac24813e9dc948 SHA512 79c03b5d669de7f05e27fc59fa999f416f513e41cba822376b862c31439fc66cf8749034c1f8f967f745955a5271a484b23e950ffede23d3fa2737ae26dbb0d4 WHIRLPOOL 237f3f1e872b05890e008f8261e0ba5c7621ef7bfa3e78305c17076496ad87d281497e4cf9ee79d2b275a65e86f7c84fa3897697ef823c2e1ffe9725d3b08b9b
 EBUILD msieve-1.51.ebuild 1524 SHA256 9ba2b2926aa5cc56531b3b296adb01d7b168e48b38be745a122ef1dbaba31b60 SHA512 0679d9c245c9d71e2dcda45d96fa3730b8e85b8f64c9850b6d23040bbd97cbd49f9acdf902d4c7fe246470f133ff7975dd7d2986b5a308459a200d48e4955ce8 WHIRLPOOL 079c813014f76180fe5079e6f4446c934ad51acbafb4c7d1d48697a750436b9980e4fae51b1b9e524b7f19536e532c135b96431bef83a9da2d668288fa36f210
 EBUILD msieve-9999.ebuild 1397 SHA256 6e611e78ac87dec7b8160306f7fdecbdd151f9e1e3e75527498cf32cead8d919 SHA512 45c7463fd97bd07ee2c10978a4e1abbae0ab12de67d9a5bfd4ca457a73731e116f11f59d34d4ae69b03ebfef9346ebf934afe67979779d6911b315081b2e87ab WHIRLPOOL 0cd04907b06604e10cac48fe6d4298cac011679f69cb1967fc78ac2cb603a51eb8c305fc34337f60a962f8b58788302db2c9921a013740acbf15705affa61044
diff --git a/sci-mathematics/msieve/files/reduce-printf2.patch b/sci-mathematics/msieve/files/reduce-printf2.patch
deleted file mode 100644
index fdaa344a3a07..000000000000
--- a/sci-mathematics/msieve/files/reduce-printf2.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- gnfs/poly/stage2/root_sieve_deg45_x.c	2011-08-23 20:59:59.000000000 +0800
-+++ gnfs/poly/stage2/root_sieve_deg45_x.c.new	2012-11-30 17:09:22.553116526 +0800
- 		return;
- 	}
- 
-@@ -585,7 +585,7 @@
- 		if (obj->flags & MSIEVE_FLAG_STOP_SIEVING)
- 			break;
- 	}
--	printf("\n");
-+	printf(",");
- }
- 
- /*-------------------------------------------------------------------------*/
-@@ -604,7 +604,7 @@
- 	xline_heap_t xline_heap;
- 	uint32 cutoff_score;
- 
--	printf("L %u\n", (uint32)lattice_size);
-+	/* printf("L %u\n", (uint32)lattice_size); */
- 
- 	mpz_set_ui(xy->y_base, (unsigned long)0);
- 	xy->y_blocks = 0;
-@@ -621,7 +621,7 @@
- 		x->x_blocks = line_max - line_min;
- 		x->curr_score = 0;
- 		root_sieve_line(rs);
--		printf("\n");
-+		printf("_");
- 		return;
- 	}
- 
-@@ -664,5 +664,5 @@
- 			break;
- 	}
- 
--	printf("\n");
-+	printf("*");
- }
---- gnfs/poly/stage2/root_sieve_deg5_xy.c	2011-07-15 09:49:00.000000000 +0800
-+++ gnfs/poly/stage2/root_sieve_deg5_xy.c.new	2012-11-30 17:09:51.462454813 +0800
-@@ -290,8 +290,8 @@
- 	}
- 	xy->y_blocks = y_blocks;
- 
--	printf("\n%.0lf %u %u\n", (double)lattice_size, 
--			y_blocks, num_lattices);
-+	/* printf("\n%.0lf %u %u\n", (double)lattice_size, 
-+			y_blocks, num_lattices); */
- 
- 	sieve_x_run_deg5(rs);
- }
diff --git a/sci-mathematics/msieve/files/reduce-printf3.patch b/sci-mathematics/msieve/files/reduce-printf3.patch
deleted file mode 100644
index dedadde51d42..000000000000
--- a/sci-mathematics/msieve/files/reduce-printf3.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- gnfs/poly/poly_skew.c	2011-12-23 03:48:49.000000000 +0800
-+++ gnfs/poly/poly_skew.c.new	2012-11-30 17:14:29.802747785 +0800
-@@ -221,7 +221,7 @@
- static void stage1_callback(mpz_t high_coeff, mpz_t p, mpz_t m, 
- 				double coeff_bound, void *extra) {
- 	
--	gmp_printf("%Zd %Zd %Zd\n", high_coeff, p, m);
-+	/* gmp_printf("%Zd %Zd %Zd\n", high_coeff, p, m); */
- 	poly_stage2_run((poly_stage2_t *)extra, high_coeff, p, m, 
- 			coeff_bound, NULL);
- }
-@@ -231,7 +231,7 @@
- 				double coeff_bound, void *extra) {
- 	
- 	FILE *mfile = (FILE *)extra;
--	gmp_printf("%Zd %Zd %Zd\n", high_coeff, p, m);
-+	/* gmp_printf("%Zd %Zd %Zd\n", high_coeff, p, m); */
- 	gmp_fprintf(mfile, "%Zd %Zd %Zd\n",
- 			high_coeff, p, m);
- 	fflush(mfile);
---- gnfs/poly/stage2/root_sieve_line.c	2011-11-25 00:25:28.000000000 +0800
-+++ gnfs/poly/stage2/root_sieve_line.c.new	2012-11-30 17:18:19.887475567 +0800
-@@ -402,7 +402,7 @@
- 	uint32 num_primes = rs->num_primes;
- 	uint16 *block = rs->sieve_block;
- 
--	printf("%u ", num_blocks); fflush(stdout);
-+	/* printf("%u ", num_blocks); fflush(stdout); */
- 
- 	if (mpz_cmp_ui(x->mp_lattice_size, 1) == 0)
- 		prepare_sieve_line(rs);
diff --git a/sci-mathematics/rstudio/Manifest b/sci-mathematics/rstudio/Manifest
index 7656d4f94d29..a0cc5f5bc82b 100644
--- a/sci-mathematics/rstudio/Manifest
+++ b/sci-mathematics/rstudio/Manifest
@@ -1,7 +1,4 @@
 AUX rsession.conf 1145 SHA256 23dea938def95eaf559666faba1701f686000d1af510a579d13e415d99b8226e SHA512 90395faac5aa80ce52ae56da3565512b8a880a14ab2acf9a24c7a56c9d03f1e3d5f63ebaca66efa68f5c5c9c831235846df22ca37f20ba071437a2a963b808cf WHIRLPOOL c57d10c1fdccb49004825f4f99e8fb966e4270167be36116a5b73c289bb4af89fb36a99275d1b35d0f2f4b6f3dfc2fa45a9e66892ea9d59a8223afa888990db6
-AUX rstudio-0.97.318-linker_flags.patch 806 SHA256 9fa104ef1fc659aeda8108d2a6418679685ae8d0a19e3f5f97a634ad1d1d05d8 SHA512 2049077768ef72faf502387b5eeef80948d0ec748bc52df7bff6e507dd92a8c52b3a7f7f82eda526ea1289f16720ae51fd40c059bd2d04f5eacd51911b995f06 WHIRLPOOL df36ec2fd3c3e9bced79b6f29ecfbeebde8df6a7873f5de8d46ac0ca7f26c7851426c8b869de12ad302d7c152fa2212af25ed4b52e123f324d92cc7085e6e772
-AUX rstudio-0.97.318-paths.patch 5418 SHA256 6973516ee72f19df412e6b7739fa0d18f337328ca74d009564b5f3e93d3f5470 SHA512 bfe3a0c2903e804773e4325f655de18097ce30534fd6d8cf6ff5a54f976de170b4e37d86eae2d812411131fa96e1eef7f3a3fbd951c35082fab478fd72a4d0fc WHIRLPOOL 50ae21a068b63b644a033fc25dff8599c95bf869b64f1bfd0a200484f61d15f7deba3ac565efd02b09e9fc92e10fb4f429ab28eabb2c3b95dfb3cac8c5b97fb8
-AUX rstudio-0.97.318-prefs.patch 1008 SHA256 ae5bcb603cdd112adb9f5929b9cf15b33db36a9f9efc76bd24fb67855e99150f SHA512 2edd5dee1d59ed2abc64c2f68f354bd0c2d23de649790e956112131988de68d649a09ce9cd893d2715f656e90cabfee8a67f9ef98464b5fc2a6eb17d29e4a50e WHIRLPOOL 83f7f85f2c40a21697db1a5af9f28de80a802005e910a78905b4b45d66accfec03e67fb1c35cc7091eedf9f7d98bcd89e427e200b999edf1b206e1115fe2aac7
 AUX rstudio-0.97.336-boost-1.53.patch 3048 SHA256 86290a2a4ac39cae8de988739c702f726451d2d4f76d515954edac2db6d5e20e SHA512 eca9b5d112fb84f83533c74b099694c5c5b1eaac3d6b0978a4b2236328b51d41893b1e3e94f3afbbb49cf841401d05cfba6941ff9a1a7f8a2cd35a57cda6176c WHIRLPOOL 280be4773ebeb1deedbc4a32cb07c85f8321bee0676a55bada93c3d5c350e2a4690665723b02ad4132e99b7463f23562f922790004f18fa0064332e1e07883de
 AUX rstudio-0.97.336-linker_flags.patch 806 SHA256 9fa104ef1fc659aeda8108d2a6418679685ae8d0a19e3f5f97a634ad1d1d05d8 SHA512 2049077768ef72faf502387b5eeef80948d0ec748bc52df7bff6e507dd92a8c52b3a7f7f82eda526ea1289f16720ae51fd40c059bd2d04f5eacd51911b995f06 WHIRLPOOL df36ec2fd3c3e9bced79b6f29ecfbeebde8df6a7873f5de8d46ac0ca7f26c7851426c8b869de12ad302d7c152fa2212af25ed4b52e123f324d92cc7085e6e772
 AUX rstudio-0.97.336-paths.patch 5543 SHA256 376b0ba06c3744902b14ce644d481b1a61cd030981faaaadacbf20fa8dea7857 SHA512 42063474152f0c044f9afea3e93812ddae98de012a7f2d3d1b5f23b95353538b97c584bd6e61c8eb5d314b63b4af6161d7088037a8210687c31fd64d53788a4d WHIRLPOOL a028f30c1b5ce8e3773cee2099c683bb2fbe1f0b16ddf45a5bffba499c8460f078ffe25c9b64a8b774464ea72ea71b8cb11f1623789e82c21b897825c650e3ea
diff --git a/sci-mathematics/rstudio/files/rstudio-0.97.318-linker_flags.patch b/sci-mathematics/rstudio/files/rstudio-0.97.318-linker_flags.patch
deleted file mode 100644
index a336fccbc981..000000000000
--- a/sci-mathematics/rstudio/files/rstudio-0.97.318-linker_flags.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Some gcc hardening options were added, however since we add
-"-Wl,--as-needed" we end up with "-Wl,--as-needed;-Wl,-z,relro" which
-leads to linker errors about unknown options, if we make it so the
-as-needed option is the last option on the line, everything is fine.
-
-diff --git a/src/cpp/CMakeLists.txt b/src/cpp/CMakeLists.txt
-index 0589ca0..fe5bd5f 100644
---- a/src/cpp/CMakeLists.txt
-+++ b/src/cpp/CMakeLists.txt
-@@ -57,7 +57,7 @@ if(UNIX)
-       add_definitions(-D_FORTIFY_SOURCE=2)
-       add_definitions(-fstack-protector --param ssp-buffer-size=4)
-       add_definitions(-pie -fPIE)
--      set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,relro,-z,now")
-+      set(CMAKE_EXE_LINKER_FLAGS "-Wl,-z,relro,-z,now ${CMAKE_EXE_LINKER_FLAGS}")
-    endif()
- 
- # Win32 specific global directives
diff --git a/sci-mathematics/rstudio/files/rstudio-0.97.318-paths.patch b/sci-mathematics/rstudio/files/rstudio-0.97.318-paths.patch
deleted file mode 100644
index 26f11f5bfac5..000000000000
--- a/sci-mathematics/rstudio/files/rstudio-0.97.318-paths.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-change the install path, as by default everything is dumped right under
-the prefix. After fixing install paths, now fix the source so the
-program can find the moved resources.
-	
-diff --git a/CMakeGlobals.txt b/CMakeGlobals.txt
-index da74970..1537bff 100644
---- a/CMakeGlobals.txt
-+++ b/CMakeGlobals.txt
-@@ -103,7 +103,7 @@ else()
-    else()
-      set(RSTUDIO_INSTALL_BIN bin)
-    endif()
--   set(RSTUDIO_INSTALL_SUPPORTING .)
-+   set(RSTUDIO_INSTALL_SUPPORTING ${DISTRO_SHARE})
- endif()
- 
- # if the install prefix is /usr/local then tweak as appropriate
-diff --git a/src/cpp/server/CMakeLists.txt b/src/cpp/server/CMakeLists.txt
-index af4db1c..96b767e 100644
---- a/src/cpp/server/CMakeLists.txt
-+++ b/src/cpp/server/CMakeLists.txt
-@@ -142,7 +142,7 @@ if (UNIX AND NOT APPLE)
-    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_INITD_DEBIAN_SCRIPT}.in
-                   ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_DEBIAN_SCRIPT})
-    install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_DEBIAN_SCRIPT}
--           DESTINATION ${RSERVER_INITD_DEBIAN_DIR})
-+           DESTINATION ${DISTRO_SHARE}/${RSERVER_INITD_DEBIAN_DIR})
- 
-    # install configured redhat init.d script
-    set(RSERVER_INITD_REDHAT_DIR "extras/init.d/redhat")
-@@ -150,7 +150,7 @@ if (UNIX AND NOT APPLE)
-    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_INITD_REDHAT_SCRIPT}.in
-                   ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_REDHAT_SCRIPT})
-    install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_REDHAT_SCRIPT}
--           DESTINATION ${RSERVER_INITD_REDHAT_DIR})
-+           DESTINATION ${DISTRO_SHARE}/${RSERVER_INITD_REDHAT_DIR})
- 
-    # install configured suse init.d script
-    set(RSERVER_INITD_SUSE_DIR "extras/init.d/suse")
-@@ -158,13 +158,13 @@ if (UNIX AND NOT APPLE)
-    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_INITD_SUSE_SCRIPT}.in
-                   ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_SUSE_SCRIPT})
-    install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_SUSE_SCRIPT}
--           DESTINATION ${RSERVER_INITD_SUSE_DIR})
-+           DESTINATION ${DISTRO_SHARE}/${RSERVER_INITD_SUSE_DIR})
- 
-    # install pam profile
-    set(RSERVER_PAM_DIR "extras/pam")
-    set(RSERVER_PAM_PROFILE "${RSERVER_PAM_DIR}/rstudio")
-    install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_PAM_PROFILE}
--           DESTINATION ${RSERVER_PAM_DIR})
-+           DESTINATION ${DISTRO_SHARE}/${RSERVER_PAM_DIR})
- 
-    # install configured apparmor profile
-    set(RSERVER_APPARMOR_DIR "extras/apparmor")
-@@ -172,9 +172,9 @@ if (UNIX AND NOT APPLE)
-    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_APPARMOR_PROFILE}.in
-                   ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_APPARMOR_PROFILE})
-    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_APPARMOR_PROFILE}
--           DESTINATION ${RSERVER_APPARMOR_DIR})
-+           DESTINATION ${DISTRO_SHARE}/${RSERVER_APPARMOR_DIR})
-    install(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_APPARMOR_DIR}/apparmor-profile-load
--           DESTINATION ${RSERVER_APPARMOR_DIR})
-+           DESTINATION ${DISTRO_SHARE}/${RSERVER_APPARMOR_DIR})
- 
-    # install configured upstart profile
-    set(RSERVER_UPSTART_DIR "extras/upstart")
-@@ -182,6 +182,6 @@ if (UNIX AND NOT APPLE)
-    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_UPSTART_PROFILE}.in
-                   ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_UPSTART_PROFILE})
-    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_UPSTART_PROFILE}
--           DESTINATION ${RSERVER_UPSTART_DIR})
-+           DESTINATION ${DISTRO_SHARE}/${RSERVER_UPSTART_DIR})
- 
- endif()
-diff --git a/src/cpp/server/ServerOptions.cpp b/src/cpp/server/ServerOptions.cpp
-index 77a63f1..f0d25f0 100644
---- a/src/cpp/server/ServerOptions.cpp
-+++ b/src/cpp/server/ServerOptions.cpp
-@@ -201,7 +201,7 @@ ProgramStatus Options::read(int argc, char * const argv[])
- 
-    // convert relative paths by completing from the system installation
-    // path (this allows us to be relocatable)
--   resolvePath(installPath, &wwwLocalPath_);
-+   resolvePath(installPath.childPath(DISTRO_SHARE), &wwwLocalPath_);
-    resolvePath(installPath, &authPamHelperPath_);
-    resolvePath(installPath, &rsessionPath_);
-    resolvePath(installPath, &rldpathPath_);
-diff --git a/src/cpp/session/SessionOptions.cpp b/src/cpp/session/SessionOptions.cpp
-index 0df1081..777cc6a 100644
---- a/src/cpp/session/SessionOptions.cpp
-+++ b/src/cpp/session/SessionOptions.cpp
-@@ -314,12 +314,12 @@ core::ProgramStatus Options::read(int argc, char * const argv[])
-    }
- 
-    // convert relative paths by completing from the app resource path
--   resolvePath(resourcePath, &rResourcesPath_);
-+   resolvePath(resourcePath.childPath(DISTRO_SHARE), &rResourcesPath_);
-    resolvePath(resourcePath, &agreementFilePath_);
--   resolvePath(resourcePath, &wwwLocalPath_);
--   resolvePath(resourcePath, &coreRSourcePath_);
--   resolvePath(resourcePath, &modulesRSourcePath_);
--   resolvePath(resourcePath, &sessionPackagesPath_);
-+   resolvePath(resourcePath.childPath(DISTRO_SHARE), &wwwLocalPath_);
-+   resolvePath(resourcePath.childPath(DISTRO_SHARE), &coreRSourcePath_);
-+   resolvePath(resourcePath.childPath(DISTRO_SHARE), &modulesRSourcePath_);
-+   resolvePath(resourcePath.childPath(DISTRO_SHARE), &sessionPackagesPath_);
-    resolvePostbackPath(resourcePath, &rpostbackPath_);
- #ifdef _WIN32
-    resolvePath(resourcePath, &consoleIoPath_);
diff --git a/sci-mathematics/rstudio/files/rstudio-0.97.318-prefs.patch b/sci-mathematics/rstudio/files/rstudio-0.97.318-prefs.patch
deleted file mode 100644
index 3175d47235ab..000000000000
--- a/sci-mathematics/rstudio/files/rstudio-0.97.318-prefs.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-And now we fix src/gwt/build.xml since java's user preference class is
-braindead and insists on writing where it is not allowed.
-much thanks to http://www.allaboutbalance.com/articles/disableprefs/
-
-diff --git a/src/gwt/build.xml b/src/gwt/build.xml
-index e7d2418..ae3a331 100644
---- a/src/gwt/build.xml
-+++ b/src/gwt/build.xml
-@@ -25,6 +25,7 @@
-    <property name="gwt.extra.args" value=""/>
-    <property name="gwt.main.module" value="org.rstudio.studio.RStudio"/>
-    <property name="ace.bin" value="src/org/rstudio/studio/client/workbench/views/source/editors/text/ace"/>
-+   <property environment="env"/>
- 
-    <path id="project.class.path">
-       <pathelement location="bin"/>
-@@ -109,6 +110,7 @@
-          </classpath>
-          <!-- add jvmarg -Xss16M or similar if you see a StackOverflowError -->
-          <jvmarg value="-Xmx1024M"/>
-+         <jvmarg value="-Djava.util.prefs.userRoot=${env.T}"/>
-          <arg value="-war"/>
-          <arg value="www"/>
-          <arg value="-localWorkers"/>
diff --git a/sci-mathematics/spin/Manifest b/sci-mathematics/spin/Manifest
index 370c7884a842..d5e9e7505a90 100644
--- a/sci-mathematics/spin/Manifest
+++ b/sci-mathematics/spin/Manifest
@@ -1,4 +1,3 @@
-AUX spin-6.0.1-makefile.patch 799 SHA256 20060fa1644f2633d99fb5a66cffdfc23f8c86f33bd63bf72aa9af3fe8912726 SHA512 c1350353a5935e757ee0aa7a38ba172f37c21a6c58ab15607cb369bf53578ac2ce32e697271ca451ce197fa6992c4319068c4e3202be98febae9ec77d9c2043f WHIRLPOOL 2aee880249f2d69440e04609951b9e0e7ee7d4928b53774ddae93ae57a3e4d98d0be19f367d38fa91736767cbabf58aeeacd6811557655c1d95ab7f1882fe6a6
 AUX spin-6.2.1-makefile.patch 756 SHA256 befb05f5c54b6099399a0e125f79caa95be38f985deaaddb0e4012d4e47d5db5 SHA512 6547515ca8bfe7eba22eb8d6eb671e19f41abe83cdcf09c0b7ca3d6f3edb79f585d872c469ce7aeab502403f6264b0750c254589a73c3464dfb91cb4174a72f7 WHIRLPOOL 3bdd9a4fdcf0347f9e2abdeb9a4893ef75c0c1c25fa7c2318bc5f36bf93f34363f0f7cf7a0108f295f63358a306eccca4e3ee3858adc24f06e7a7dfa540904fd
 AUX spin-6.2.5-makefile.patch 582 SHA256 77513dbb60e806122b64ccbe178881569cc229a8c88755552f6992476e203fef SHA512 86ca1ea14d43e167540851c2faa3e6bda7f4cc10d6c48179a24045fa9f3da858a13dbc2ea1c06742a38728cd632489cc349f39285c9db5f9bf3963d038bbc015 WHIRLPOOL 295362e94618ea645365d891be55da8ea013150003f26e940b915ed076584eff87432945bc69c7a48dc0f38967347706cccd7d1e89f1212379702b173f5e7d6b
 AUX spin-6.4.5-makefile.patch 620 SHA256 41d5dc3eb7249141c04407c22f2fd602508b5eae712eb4493c642c1f6ad44cc9 SHA512 47b72f5cda3275f62a291870e3683fb3f29f3eeab2d251336777d9a2c814b6be436bcbe59a8d98c0f4f32d7b0a9a2961f34c436d6f265d8a2474258fd9c0d6ee WHIRLPOOL 466386b579f5eb5d09fba494f6d7bc0d6d94ba59c58793c5465524d30938b92bb3ffb6f433eb379a5c819000d37d4a49aec78606c28c008ba4add318b5ea3b54
diff --git a/sci-mathematics/spin/files/spin-6.0.1-makefile.patch b/sci-mathematics/spin/files/spin-6.0.1-makefile.patch
deleted file mode 100644
index d1840875fc03..000000000000
--- a/sci-mathematics/spin/files/spin-6.0.1-makefile.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- makefile.orig	2011-01-01 16:51:18.000000000 +0100
-+++ makefile	2011-01-01 16:52:00.000000000 +0100
-@@ -13,9 +13,6 @@
- 
- # see also ./make_pc for a simpler script, not requiring make
- 
--CC=gcc
--CFLAGS=-O2 -ansi -DNXT -D_POSIX_SOURCE -Wno-format-security	# on some systems add: -I/usr/include
--
- # CC=cc -m32 	# for 32bit compilation on a 64bit system (not recommended)
- # for a more picky compilation use gcc-4 and:
- # CFLAGS=-std=c99 -Wstrict-prototypes -pedantic -fno-strength-reduce -fno-builtin -W -Wshadow -Wpointer-arith -Wcast-qual -Winline -Wall -g -DNXT -DPC
-@@ -43,7 +40,7 @@
- 	tl_mem.o tl_rewrt.o tl_cache.o
- 
- spin:	$(SPIN_OS) $(TL_OS)
--	$(CC) $(CFLAGS) -o spin $(SPIN_OS) $(TL_OS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o spin $(SPIN_OS) $(TL_OS)
- 
- spin.o:	spin.y
- 	$(YACC) $(YFLAGS) spin.y
diff --git a/sys-apps/coreutils/Manifest b/sys-apps/coreutils/Manifest
index 0448e55d2f32..b79011cd55c2 100644
--- a/sys-apps/coreutils/Manifest
+++ b/sys-apps/coreutils/Manifest
@@ -4,8 +4,8 @@ DIST coreutils-8.25.tar.xz 5725008 SHA256 31e67c057a5b32a582f26408c789e11c2e8d67
 DIST coreutils-8.26-man.tar.xz 43608 SHA256 9324ec412ffca3b0431e6299720c33ac98e749e430f72a7c6e65f3635c86aa29 SHA512 33fe9f370b0d2a59217b5a40a47f5f673669b9975baf2793f45a05117fe4c04ab9f05be68cf419a761b20e21c13d9a15b35322cecc81b7b9a1c8c534960432cf WHIRLPOOL d7426e2f0c41cf937a4b6362aa71427bdc5e555a0a6aa6dba27a6533cb5fecaa1827ddc63b866e70daca8f250fd5724c688b4d5d843f0b29051e8a5570421dbb
 DIST coreutils-8.26-patches-1.1.tar.xz 7184 SHA256 67fad0b8e53fe9e3daf489cf73882465c15bdc50722a8e09470ff7fbdca9f71a SHA512 ed8b9af1f76484549b63eb3ad4818a6649117ff1efbda2231f8741d149f0ee67438d09b6b2ea7b461aef36c346f17e3ee9a7328766a4c01d1b2b7d3e157f4455 WHIRLPOOL bf656f5b201b7a3b341b0d3b60c19136cd9a6676aee86e9ad8da45906ae64c8644305a070694aab0c70bc6c853a02d27a0209b2433b681e4b00f024da614d9e8
 DIST coreutils-8.26.tar.xz 5810244 SHA256 155e94d748f8e2bc327c66e0cbebdb8d6ab265d2f37c3c928f7bf6c3beba9a8e SHA512 1ca7b32a1564855e672f64cb815f858619dd4308af1c9763959d06fab1ecd51385c4c61d987ceec7ff6baaaac699f2db10be4be7e40b2c6a6d4ffc3911180b03 WHIRLPOOL 9b1026ea5a2fa3dc3c49c4088ddec2de499d06bf7820e1df0d29dd1add7309982a961bd754edeb65f4a54370ab53fde29211c9a93ee5c2f5abce89d7a67be888
-EBUILD coreutils-8.25.ebuild 5903 SHA256 8a4aa98f23de0def09cd0fb1f88f39441af71d8ab4993ccdc39b80f3c995303d SHA512 3a15457cbb1c826e39a37e5b1d3c5b6dadc52dbfe297379a9649f2aafadb821503e80410bad0bb3366b3ba724862e421ee1f9f6a19bada209126f3f5ec7cd3c1 WHIRLPOOL c51dc7be65802b0df53832321713a5ccce7f12d2bb4df5a091fbb595595d54869475386d040ba04ced9c7dc6c0e7a4daeb19ec1209f32d4048e7fad8b6fbbd90
-EBUILD coreutils-8.26.ebuild 5935 SHA256 12e097fcb100800f6a989f2c28d009a47ad928bd25a8cfcd8dc183396dba15fc SHA512 a9c74381695db087d97b3a86c98612ef53a5a706c27fab94f95848e35e38d6ea4ce582c43e39ca98f4c3d6c9a05c32cb86dc78b86be1e5c0ccb5bb1b786544af WHIRLPOOL fca00932876150117457bf62a658d0e8e4d3a8b3caccd6febf56020ea7016cf9c18ed5a6061526ec4c1ddb5dfac1c07f8f319d8b62fa7dabb19bc43cb3608c0f
+EBUILD coreutils-8.25.ebuild 5841 SHA256 ae5418fa0233649863f06918a1d25f07e04f833f01074d9b650f45d1cf348087 SHA512 5fe66fa9e780bd7094e5eae81a28da24eb51549b011f944cd348aab6c5bef12816479d39e14d390c3cabeebfa3c5e2444e0d7acf67e23849ec7e4a266249c6bb WHIRLPOOL 32ce6842c2c2ba5865cd237dd0871ebc707a0d3cf98f2af1d7d6967d33fee477fa2b787d0b5abb24b282c77b690c8fe902ab337feb628f367d0a7c58cd6cdb8d
+EBUILD coreutils-8.26.ebuild 5873 SHA256 801735463664c9ca1f6eba9dc7b7d1c6123c296ce29c413b5a01b7d3431d40b8 SHA512 b4ca1ba83916ee7770d9d26c9a3d1bf6b57ddc839ae37dab59ef678887bf7f92377d3044943e1dd0260d5737ecee84fb27d0e2a6ea826d5becdda1fd2b6f55e8 WHIRLPOOL 021d5ce89a3e54a4253df00a19e9d2a42d87afefef4e14bfe8f875c114707a6946ea0b4a7fed340a246eb0cf0918c585a8f5e29840125dd52b03afff8e19ae04
 MISC ChangeLog 7611 SHA256 95cfa59136c273c96f0197f728a444d3337cf408e6d974d07553188148c77d14 SHA512 a1a429745e1d5b7efb21b321abd21e1b064bde4f271bbd600f6be3dd32dced5e04cea1fe8a2bc9abf12fdadde55ccefea1257730d5d944f5dc1b97d98d25e4ff WHIRLPOOL 93253eca9c20b770912675ad30f312e803fc1bf8cd17f59e0fd02446298d4f327e8f9c90ab4c90636fd9b4bc0dcbaf3ba477b3ba86f6820ff4040a676e057529
 MISC ChangeLog-2015 57093 SHA256 368347193225a6204bd2454ecbdf549ca614cb8fc5e183ac14c2f767288323e9 SHA512 ef4eff9a3d748641bf1b745599e951308801e1d00d67c5504d17e4d740f5cd7f0c75cd5ee34c8345e8017ee8b6397b84a41df84b4f342ff899a04fd35a0c8f28 WHIRLPOOL 43464de8d0d85fa5b35797c95049591d0a225e4e6f0ab596d8c637da0538f0605c15c35749195fea181b9d5e6a75ea7573a96dbe9da70f28e131a47c913d43b5
-MISC metadata.xml 562 SHA256 80a6788324cad291fc488dd7e1a6cc2578acae197b7ad2d42860109d45d8e12d SHA512 1372dac2fe4990f6cf47a56a56f3fab9c2eb96eb687bdabc0b5b79fc5dbad69e6c434deb5a0904e18ee8032b777fdea0f997c855e3fca86923ab0f04c969b206 WHIRLPOOL ea7e54219becc762b04fe41de75eb511449821b889606f13c617be68b6c1cc64a3e765b90cdd66820b4549709a022e1d9405bbc4c51033996cb2d04a72c7c53f
+MISC metadata.xml 738 SHA256 1b3907f92a4f6f20b1267d1c4a2b4d126e2a27b9820f6a3b2cb671b438edeeb6 SHA512 c074b29033dae300fa02fb35edf0b595bf00bd5616bac8af5b88525980dc8542dc336145b19942d0f849189b7abe0201f2a40d86d0ed02ddad602eb131b3a87a WHIRLPOOL 206dd26110118d307e0f1654b9e20e26805c90f968c1c00ffc71878503bd6112510ee334a44a031d05884fe8f3576a07efcab630f4823f5527c5d32adc918938
diff --git a/sys-apps/coreutils/coreutils-8.25.ebuild b/sys-apps/coreutils/coreutils-8.25.ebuild
index fd2169f21109..6402475ba5c9 100644
--- a/sys-apps/coreutils/coreutils-8.25.ebuild
+++ b/sys-apps/coreutils/coreutils-8.25.ebuild
@@ -13,7 +13,7 @@ EAPI="4"
 inherit eutils flag-o-matic toolchain-funcs
 
 PATCH_VER="1.1"
-DESCRIPTION="Standard GNU file utilities (chmod, cp, dd, dir, ls...), text utilities (sort, tr, head, wc..), and shell utilities (whoami, who,...)"
+DESCRIPTION="Standard GNU utilities (chmod, cp, dd, ls, sort, tr, head, wc, who,...)"
 HOMEPAGE="https://www.gnu.org/software/coreutils/"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
 	mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz
diff --git a/sys-apps/coreutils/coreutils-8.26.ebuild b/sys-apps/coreutils/coreutils-8.26.ebuild
index b19472ac4cd2..f98570634d19 100644
--- a/sys-apps/coreutils/coreutils-8.26.ebuild
+++ b/sys-apps/coreutils/coreutils-8.26.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$
 
@@ -13,7 +13,7 @@ EAPI=5
 inherit eutils flag-o-matic toolchain-funcs
 
 PATCH_VER="1.1"
-DESCRIPTION="Standard GNU file utilities (chmod, cp, dd, dir, ls...), text utilities (sort, tr, head, wc..), and shell utilities (whoami, who,...)"
+DESCRIPTION="Standard GNU utilities (chmod, cp, dd, ls, sort, tr, head, wc, who,...)"
 HOMEPAGE="https://www.gnu.org/software/coreutils/"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
 	mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz
diff --git a/sys-apps/coreutils/metadata.xml b/sys-apps/coreutils/metadata.xml
index f9a79626e12c..b75c0df6a5f9 100644
--- a/sys-apps/coreutils/metadata.xml
+++ b/sys-apps/coreutils/metadata.xml
@@ -5,6 +5,8 @@
 	<email>base-system@gentoo.org</email>
 	<name>Gentoo Base System</name>
 </maintainer>
+<longdescription>Standard GNU file utilities (chmod, cp, dd, dir, ls, ...), text utilities (sort, tr, head, wc, ...), and shell utilities (whoami, who, ...)
+</longdescription>
 <use>
 	<flag name="hostname">Build the hostname program</flag>
 	<flag name="kill">Build the kill program</flag>
diff --git a/sys-block/hdrecover/Manifest b/sys-block/hdrecover/Manifest
index 1ff6fa481ecf..229949b4d352 100644
--- a/sys-block/hdrecover/Manifest
+++ b/sys-block/hdrecover/Manifest
@@ -1,6 +1,4 @@
-DIST hdrecover-0.4.tar.gz 85409 SHA256 609a0755dbda744e3dc89bffd1c673fd5c370448aa43e426d90ff35faa74a20d SHA512 280fb7b92172b3f92d358744d093e17462e2b118d2bcd7707cb9e1ceaf89010d565f60d490d8fc247887b6189fc76adbefd8d4aedce452e402d09fdde38a130e WHIRLPOOL 842384aad30072d9ea6ff5ff3991a19664a1d2c349c04310d2083e2b0837066f7d255b475da79521b98735a9fe7c5cd6a5ff750993e2a68872ec64bd458e940e
 DIST hdrecover-0.5.tar.gz 86486 SHA256 5daa11caaa8c597778a4a7a76b022372ddb315a90c527405972a2380668ad3f8 SHA512 515bc59e1e936b7c22bbd99da9e25020968e0801fe490abaa09a5e5d72cf26427e829e8412e5bf44fafb2875ac81142db15d1f55d5462708f41882633c09df5e WHIRLPOOL 466173e3affd4a0486d7ac90beebb61131f6844d4c9c70fe9acf4a70265b385211470430b0b809e379123c71128a63458d0a546c6155a5c06fcf5bdb045ab338
-EBUILD hdrecover-0.4.ebuild 479 SHA256 c5802cfbf17aa4ef5d74d821690c962a17d83aa9a0cd3b1e5e856ab549841c50 SHA512 019c1170d1bee167331929023d0f9a96bdc946ef682ab83fa264546009641e2ee586585127ebaf8cd69764ccf7f25172d7c12daddaff6d63af8090ca9e93f08d WHIRLPOOL b2f8351cf09ba81eb992a5df0616ce4daea75d9482ea911b34b40812a729f8fc05d062ec6c2ff1e9a207114a00643afcf45a1a03ce3066bdc51285fa076d6a14
 EBUILD hdrecover-0.5.ebuild 477 SHA256 c249b71f604f63db5be0108bc17a4b68d5c5efe877ee2cb3d14c8c84b200acda SHA512 ab08f148cdf585054561c48550f5670f69c1ed710b2d86dbefa9accf1a1697469420b8127d2a208519957e393a8fb7b37227270900c88e1df3ba0bbc5c60feb6 WHIRLPOOL 3fba310ed2e77858689351725ee8f3f08f043548407e7cbeb5f1ea3806650da658981cc0550c50242536bd6ac1960699bfc5a45a686d3a11ca658ec3772d1018
 MISC ChangeLog 2541 SHA256 0bebcfc9afb5dd4bddb6461ae84308b3b38bfb5ac8331f170fcc55c39d4d5b68 SHA512 ce943ca0938f9562ab1206b1780099b1cfa20aacee64b8dcf30419119922976287cd372c01484f13cafeb2d2ff4d29bd03a3ec496f0d62fc59712341d14aecf0 WHIRLPOOL 3b86f4d8a23168a29cdedf6e3291ebf5fc2f87ede095f0e63cc557c0308762321b3e46832c88abf3fd0bcca08c1344b7120dd55074ed4605c30ac500ff7d92b7
 MISC ChangeLog-2015 443 SHA256 5a7429754c7566c4361406378d2a33c20479f38d075406d37094f61b968a1e50 SHA512 ba2b77d7820874c8b14cde254e5c1dd9320130e61ac9c28683f026f70b3dcd8a0f166ad521b4c471d1b1852b703e5f5ad156ef030bedbc3c92706e08691abcc9 WHIRLPOOL 0a153bce76a9f58dae6c3bc39a2fee70d65724eeb14838cb184f42a5375602445732f2efc03046380b087a7d8efc45c062853d2a8f96b8c317a3c6596fbc71ee
diff --git a/sys-block/hdrecover/hdrecover-0.4.ebuild b/sys-block/hdrecover/hdrecover-0.4.ebuild
deleted file mode 100644
index 9170a7ec231a..000000000000
--- a/sys-block/hdrecover/hdrecover-0.4.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="Attempts to recover a hard disk that has bad blocks on it"
-HOMEPAGE="http://hdrecover.sourceforge.net/"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-src_configure() {
-	# we don't want the command to be visible to non-root users.
-	econf --bindir=/usr/sbin
-}
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 1082c00cd9b7..3756dae3c388 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -16,11 +16,11 @@ AUX toolchain/BUILD.gn 400 SHA256 d51e70d29f69110726c1ae93a4cfc8685a2feea24ce195
 DIST chromium-55.0.2883.75.tar.xz 511256096 SHA256 5bcf7180935bebc7648f7e2577f612da681f7846127f79dac22630ded9984e55 SHA512 9830b02e05ebaf120b02b11114c67196ba5c7f2d5aa917b9e5f8516b1f0cce1abd8e752c379e8ac1f16c7b7e451341486d9356d47a1b77b72ab5117390ce16b9 WHIRLPOOL ab752b9e9a6c7a536424ac1384d9f0ad0f23dd40bbf6784e4185554602628e8e1f45acbb264fff33f7f00c8ee14f293bfaf23259d2db4f785c9c9c49e72b28eb
 DIST chromium-56.0.2924.76.tar.xz 513487700 SHA256 cfb08e226b9c16ad887eb96d715a9cc4ab097d1a79e2e68c8749a7a4164b3c38 SHA512 ddcb2f0c76bdad3b87dc9219367764cb9adb900d7581dc5a371184ebfe2581f6ecbfc9aae02115e87291a5b90587fc145dada2b0940ae60fc19d25f5c505022d WHIRLPOOL db244681d9b1e325179328a64fb46ffb7a2492b48bafc327500ef491a676d3783cdf4ba400283c0c7a505958d376f784c35d28f4418557d6ba4cdd6bcf2cd5e9
 DIST chromium-57.0.2987.13.tar.xz 521667288 SHA256 61b7501202b79e07fe435d1402c89195c3ac34e12e494d1f5cdfc91a09d3ccb8 SHA512 8f5d59f02b7b5c079ca891f99aa8ebbdfdb9ecf63482bd5ff8e027e31c6ea62021bd35b827058e9c6187a6c6c1d91fc8fec2e7664ae5530660cb0f2563e26162 WHIRLPOOL cf16c4e09e61586b03358f240b1b6aa86fc0e46381dd1e07e0f0d220625e3ec957dcafb03b88a2a78ed9fa6ca13902bbb9bbe66a93dec0a1cf3572f925fc1198
-DIST chromium-57.0.2987.8.tar.xz 521629532 SHA256 3fbdb631a03cf310ca7fab6783c0a2dabd02940330fdcb1a0bc3436bcca4ac36 SHA512 5c8a66873f79b4d986bb5fbcf1a66d02bd87c68e2fc061cd60a758cd207e8a16ce16b0ec01fcf62904c68f9b67b3c564e77e3208d962c977e3af84df9816f525 WHIRLPOOL c3d0ca9f31905292948f3594b7a84a12617407253054e3fb986d14b51277e1a8b7e1d834cfcea048c0b409f09595ef5f8ebd7dd06c20ef1be5d45b300cad3e7a
+DIST chromium-57.0.2987.21.tar.xz 522738052 SHA256 632189c16d56fc23e6c3ef8174fd59ee3bae9b1c6a6740bf9a41dfb83cd39c57 SHA512 c968a7ef00e136e67f827370c7489195ec173e56cc37cba105f7558bd56ec918f5beb8f74b54f3c5224067f513e69a5c6cf497d1d5bb7f9dec1fde9fff88710b WHIRLPOOL b99b2f4d731a9c0772424ac50603905d7db76f8705533cb3fa4e13403083316020ea29b47aa8e817364cc6e4cc071768cac950b34bd29206fc6d744ec0e77337
 EBUILD chromium-55.0.2883.75.ebuild 22697 SHA256 0c5b655795f4bfcdf2f0e608332e32e80067a40de166913c4e0ad5feb82925d4 SHA512 a5d501e26b8f87cdc340dd61671f2a4d0d5fa3ef670f49312038d925ba35a092c361b76942cdf0a51a56be6824255f0c6d2596d74fb8c7a2fbc7772832a0df2d WHIRLPOOL dda600d125cb5d6e62e3af47d2ad3f8acadcab3d91de50e99a5e6b281462d0529b8cf7b4ef8897d57714eb4093f93190fac3217ce208354de73d9bbc3250136e
 EBUILD chromium-56.0.2924.76-r1.ebuild 19683 SHA256 ee63c5451126974d6c0a53878fb6e340458d85f53d300d6633e6f6ced4addf2b SHA512 f5af1c0ccf05204c93e873ba403b2322b48d6a89fb890b7057e82cd3caed61cd880655a4cf27977e465f06e8550ac657e9aa4ea6c358a99c98d06b80ac62a99c WHIRLPOOL d3ca8acf7b627d88f486aef3ea42b555db4ee1711c31e584d43136af81daee6e519707f21fe1498673d4c9c3cf54f8a11a6652c518a484633e896042873cae00
 EBUILD chromium-57.0.2987.13.ebuild 19319 SHA256 9bc66c78dc48ead3d3031553a15cc14a7ef67f9dc8ac75a1d3ec75aef6b7fcc1 SHA512 1fa1307d55b1cce26169cbbe6798709b3d1551668448ee9b61e2f25e5e23b2e0361dbd4d81dbf7f2d07145d4875920da1ea8b93cf671573c84486949cf5fdf33 WHIRLPOOL 616f3bf84556f5515e47868b0b357712d2fe998df95038deed0df027aa391ec695eb51e13f8fd5caaaca460b5abb244773d9ee349d322fe2d637da347059ff7a
-EBUILD chromium-57.0.2987.8.ebuild 19274 SHA256 ab0d39194e332dfb73dc279b6e9a5468abfa9f58aeb8634fdc8dad2211d0f94e SHA512 dbc434c1347bf017551e766988bba86b83012bccd33e13c81a1899f3a6f0604b45997b460d3a2a2f564b2d5c70657dcdca95afb581367c226740c7e3639cd94d WHIRLPOOL 5d43fce1ef39af32bf2d85e57c8eb492ede8bf8ad978613e3a1f132151f79220587bb0caffec041f71a7162f73d273c17b8e56bb0d83bad790edecf2ac39af59
+EBUILD chromium-57.0.2987.21.ebuild 19319 SHA256 9bc66c78dc48ead3d3031553a15cc14a7ef67f9dc8ac75a1d3ec75aef6b7fcc1 SHA512 1fa1307d55b1cce26169cbbe6798709b3d1551668448ee9b61e2f25e5e23b2e0361dbd4d81dbf7f2d07145d4875920da1ea8b93cf671573c84486949cf5fdf33 WHIRLPOOL 616f3bf84556f5515e47868b0b357712d2fe998df95038deed0df027aa391ec695eb51e13f8fd5caaaca460b5abb244773d9ee349d322fe2d637da347059ff7a
 MISC ChangeLog 61379 SHA256 6089c72a9ad011b043f45bf3057c79f999d2aad5f4ecf0f9f45f9ced5156a18c SHA512 05868a71dfe2cbabb32b664968939704ada3c56bdd70aee289dbc60c5708e07df8496090687bf9b4659810872f629d53530990820e0da57b792a31add93d1f19 WHIRLPOOL fb91699e99261a3128ac7d931cfa5ec34a8884682935cc0740a129119f0b8d18a2aa83652ee06e0e6900371007cffbaea46f4e5d450ff2817d12e96cc819cca9
 MISC ChangeLog-2011 114031 SHA256 e2c2c75785c5eaf78b6efe01e357279cbb7be0c89d00b4053f475e963916fa54 SHA512 8e14759348333bdbd7c338080472789d7bbb1ece1ca5817bac6306bdcb33dda1e23bf3055cbb3b7bcee9362b6900bba1ace7ba73f353570a74d3ed761c9198cc WHIRLPOOL 810b6423c53f892a4b0964380b8190dec2a8783d560a9cb0baec93a77d879186201055382ca05975ae242e16728529ae85445db003fdd425355292d17817157b
 MISC ChangeLog-2014 123105 SHA256 f67108708d3d21b4acfca327aca42ceb4cc31201772dff496babfacb50acc4eb SHA512 bf6464e7e6ccdee81a4c26949176ebfb705f99e85a0120eea77f52b862fa3b8142abb006462f31e5a9053777836d4d9fdb69926d2b01b49463553740aecdbc43 WHIRLPOOL 114181b4c8e700a56bdf76b4de2e94998436b1b27df9182348ab88afd352085938686359369ffa4af929936e9ad88305efc97e22afd3b4c50b0dcf9669286fea
diff --git a/www-client/chromium/chromium-57.0.2987.8.ebuild b/www-client/chromium/chromium-57.0.2987.21.ebuild
similarity index 99%
rename from www-client/chromium/chromium-57.0.2987.8.ebuild
rename to www-client/chromium/chromium-57.0.2987.21.ebuild
index 8613930c6866..f9ea58616254 100644
--- a/www-client/chromium/chromium-57.0.2987.8.ebuild
+++ b/www-client/chromium/chromium-57.0.2987.21.ebuild
@@ -155,12 +155,6 @@ For other desktop environments, try one of the following:
 - x11-themes/tango-icon-theme
 "
 
-PATCHES=(
-	"${FILESDIR}/${PN}-system-ffmpeg-r4.patch"
-	"${FILESDIR}/${PN}-widevine-r1.patch"
-	"${FILESDIR}/${PN}-FORTIFY_SOURCE.patch"
-)
-
 pre_build_checks() {
 	if [[ ${MERGE_TYPE} != binary ]]; then
 		local -x CPP="$(tc-getCXX) -E"
@@ -202,6 +196,13 @@ pkg_setup() {
 }
 
 src_prepare() {
+	local PATCHES=(
+		"${FILESDIR}/${PN}-widevine-r1.patch"
+		"${FILESDIR}/${PN}-FORTIFY_SOURCE.patch"
+	)
+
+	use system-ffmpeg && PATCHES+=( "${FILESDIR}/${PN}-system-ffmpeg-r4.patch" )
+
 	default
 
 	local keeplibs=(
diff --git a/x11-wm/stumpwm-contrib/Manifest b/x11-wm/stumpwm-contrib/Manifest
new file mode 100644
index 000000000000..831355a825c6
--- /dev/null
+++ b/x11-wm/stumpwm-contrib/Manifest
@@ -0,0 +1,4 @@
+DIST stumpwm-contrib-20170202.tar.gz 63938 SHA256 2630a65c22f845cac3558d09a8a35c7286a6ec0bd9fe1cec0b9d751652414507 SHA512 035682e6225b1930d2db22ac2541118826e306b682b12cc589362f835a35e287321eb7e5899cacc7076dbded36afa6baaebd7d0e9d727bdc5c1ecde5ad256e59 WHIRLPOOL 29cf0ad802642065b376c5fd85d7b776520c915500856ae6cc5df0bc106f768b654642d4194ef703046871523ebf4e3fece4e92686d17b902ae789c9d103197a
+EBUILD stumpwm-contrib-20170202.ebuild 638 SHA256 9af241aad69e1e55e178c4f2f2e50bf70dba0f4796337625ef84fa5fe744bfd1 SHA512 b028a6d0939da6b625854a88bd6184b92d02df03edc10596d4fb137f846bcccf5a45bfdef491980943f7030607dc92dd84b220219cdb30feb32251027dfc6456 WHIRLPOOL 5241e9b05160c37fde77378370a387ef595a17b5dff65151cc9c6fa1da003e8df17e28fde633d7570588f357ce0eb2b52e401607136f442a0289f10a1ac63ae7
+EBUILD stumpwm-contrib-99999999.ebuild 639 SHA256 ec20c621097e86cb7222ba1706061617a8052420354d6f1f98d1a140bee5ecdb SHA512 f01bab3a46efcb858b90100f54a4d82bde5d8b73740eb30a8da8fc3d165bb015752346aa546ca532370ab8eaead7e9d503ee7265a9cca7543275483309725aa4 WHIRLPOOL 4a150fc52c18698415e9a64526f11041e91df88e88594f0a423ad0c1e3ce135b8dbcfed86f4b33744a4d863c39c77e308ae603b9e1549f0a61d7e271781faf1f
+MISC metadata.xml 250 SHA256 d793d1882c2ac79b342dc662abd7625a60b1803a237d798e5723ef7671578ff9 SHA512 edfbc7db743ecc341349b3ebd5c1367e100dd1999194001f6de526be5fbf340daf8ebb9a70b4b4b069178219c37a8c4e161afc2650997070dd3be113d091d077 WHIRLPOOL 4859bd6e9a4cee4de508a2e82b4a42535f5405a5db87b63c8bd00af7fc7001b1416738a2078788740abb2f086b1368d95579168019e9c977c837e48d0675fbec
diff --git a/x11-wm/stumpwm-contrib/metadata.xml b/x11-wm/stumpwm-contrib/metadata.xml
new file mode 100644
index 000000000000..cd8c274bc1eb
--- /dev/null
+++ b/x11-wm/stumpwm-contrib/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>nimiux@gentoo.org</email>
+		<name>Chema Alonso Josa</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/x11-wm/stumpwm-contrib/stumpwm-contrib-20170202.ebuild b/x11-wm/stumpwm-contrib/stumpwm-contrib-20170202.ebuild
new file mode 100644
index 000000000000..a06bbe9f093f
--- /dev/null
+++ b/x11-wm/stumpwm-contrib/stumpwm-contrib-20170202.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit common-lisp-3
+
+if [[ ${PV} == 9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="git://github.com/stumpwm/${PN}"
+else
+	SRC_URI="mirror://gentoo/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Extension Modules for StumpWM"
+HOMEPAGE="https://github.com/stumpwm/stumpwm-contrib/"
+
+LICENSE="GPL-2 GPL-3 BSD-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND=">=x11-wm/stumpwm-0.9.9"
+
+CONTRIBCATEGORIES="media modeline minor-mode util"
+
+src_install() {
+	common-lisp-install-sources -t all ${CONTRIBCATEGORIES}
+	dodoc README.org
+}
diff --git a/x11-wm/stumpwm-contrib/stumpwm-contrib-99999999.ebuild b/x11-wm/stumpwm-contrib/stumpwm-contrib-99999999.ebuild
new file mode 100644
index 000000000000..4d27f2cc3696
--- /dev/null
+++ b/x11-wm/stumpwm-contrib/stumpwm-contrib-99999999.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit common-lisp-3
+
+if [[ ${PV} == 9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="git://github.com/stumpwm/${PN}"
+else
+	SRC_URI="mirror://gentoo/${PN}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Extension Modules for StumpWM"
+HOMEPAGE="https://github.com/stumpwm/stumpwm-contrib/"
+
+LICENSE="GPL-2 GPL-3 BSD-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND=">=x11-wm/stumpwm-0.9.9"
+
+CONTRIBCATEGORIES="media modeline minor-mode util"
+
+src_install() {
+	common-lisp-install-sources -t all ${CONTRIBCATEGORIES}
+	dodoc README.org
+}
diff --git a/x11-wm/stumpwm/Manifest b/x11-wm/stumpwm/Manifest
index b4ef81a5d9df..2ab74e477788 100644
--- a/x11-wm/stumpwm/Manifest
+++ b/x11-wm/stumpwm/Manifest
@@ -1,9 +1,7 @@
 AUX 70stumpwm-gentoo.el 84 SHA256 45683a3c00460e54243ac2489cc78ff394f2d5818ec7b2fe72ca5ffc33b2e1a2 SHA512 2e67f51dd6840f850aa1c0e3f2e8c2453203603f174f3ce97feacd2658cf6168bf557eb6ee83499b8c60fb107fdd527caccdda7ab5692646a33f96ad1350bcd1 WHIRLPOOL 8b494c5df00f07f753580bbcb009920de4eabb7d561719b8b3fd4c9cf2d41f9e31c863a241113b361c24e332fe774c38c3bdb65d0d0b8b6f25bd9fe7046e2698
 AUX README.Gentoo 1894 SHA256 a708ee3f7fba6862ae2685daa4707c5a58f500c07862da0dafb92c17bf78b82c SHA512 c187fcc12bbb4c10718e708a4b17a9adc89f1268270f231e8b5feeea881149482d8b70ac0f5eb78b7e0b93700d6cd5133bf7d844f97736bee793405de9a25a09 WHIRLPOOL a4adb14ed13157619a1efcd7a2974c19dac6270f373994311eba2bf2e5b83f38ede7dafa9289d09b2953948670687cdfdd97a7fbd25be67ee88edff14301b49d
-DIST stumpwm-0.9.9.tar.gz 189516 SHA256 7dfcb31f3c248a454b892ae98a186f43681f6e8e62b7c77d7858b34f645c0abb SHA512 b114f0dc9091e6704acd4f6d16183b15d956b0f27abec800bca8cfdf966636e7e96c036678fe9c2ca9266d794eabb48c4d66dd62c52c1d26e42ab54abb7ff05b WHIRLPOOL 599bed139c5b058c61b89f01750179f9d9dd5db5fa65737e06f65990c96547042331845aa7d8ce137b0a9357c6e063b6663f7c8c66dab3e74553abedd56b6736
 DIST stumpwm-1.0.0.tar.gz 200794 SHA256 31fcb6fb34af20bf4857bb4621ab4b2c9bd6bec92bfd9ddaf88a18f850ba5dd5 SHA512 eb5bf48a5d185d982e8a9ec7639958f14fd912e0f4c89da205f0bcb0c10a61c3953bce5029c2a301fdcd29fe05c505601d4db30fc50b34b7082ce69bd25b43ac WHIRLPOOL 7049299b1c5db42f7379f3f741de8d87e3322deac6787494fb09c553130e0c2c79de93fdcb33beabb80f44f5b29a03f25bc61bfdcb3755043b4937627a3658fc
-EBUILD stumpwm-0.9.9.ebuild 2802 SHA256 07838657f768edd6e51bcae209d057ada10c7758a5cdfec45f7c2512b379ce44 SHA512 7e9d19dcd029b8156a3a4802bff1a1d41e01080091d8b9dcbd4e02fcd167c728ad07bce5f3077e6d8466a9d7df75d419e4dd61daad8b4c3ca861892efd365b54 WHIRLPOOL 6b41c18f54a18419f68b099c086f9c3efc1257704c0cab705839a7e8f6debf1e84a26d7f8ac798e077d9555fe6d6ae9f96bfd616d5bc4ea9d42f1f2b27744def
-EBUILD stumpwm-1.0.0.ebuild 2783 SHA256 ac00ac159d179ed192a74fd9db2b2838ae0b130244423ea1098f854252813dce SHA512 954a60f39da203d59f1e0b15a2d4b9689deb08a5c92646eee4884fd155ecbdc22197edab5e7e1eb570db964c93490f2479518c26340e4ac93c32f00d6d332fdc WHIRLPOOL 5a213b59ca562dc7509c2c0e349beb2e6c337bc6174eb0cb926efb4e71c213b15f3245bcfc95c4f1061b3ff56230a5fefe20d17748d88f69234d946b92808df0
+EBUILD stumpwm-1.0.0.ebuild 2280 SHA256 c967da1f59e45d2797725c6f63dfeff200768d834c97574696ba9f5115760337 SHA512 04e1ccec1aed16f92e61c44373d01528f0f22c37ffa95ed619149dc3c956b6fa4b9179a984b06776101f891c72ad9e21ac053e62a242ee3fd9f7abbb793dd6a3 WHIRLPOOL 9761e0da5783a89e5b4d0e9618496b5ce309b941fb01f393622c93de62cd906d46ccea0ee8566755c935f7b08a36e36c1a6d31a37e83f9357cf61c0f2e64cf1c
 EBUILD stumpwm-9999.ebuild 1149 SHA256 6efd8517a86fb35791f4cc29ea625febf63eed67eeec7e5308bee9c872d4221d SHA512 d5d8a497190093126f53359f83de7e54fdc499cb30892f79495e18a8380daaf94bff360f65c9f584ad3c0429afd19386f2751479ba5d20d15effce20e5bcc451 WHIRLPOOL bd5addbfbe783e92c5c58f1e42c99d3e7803648b5e5649e799a1b9b28ee799354fecff5e6bcd28f159155a934c95c9733f7c2921535894b3c2f45ba810601efa
 MISC ChangeLog 4202 SHA256 4cb6f95ee88f1a3f9a972f4eec281e05dd7e2aa0ad124bebf36f370ca34bc38b SHA512 f9371fd5906d25ae8d036831248d3db72c56b157fb6b54727ec28bd37a2964a45f87734aab1cd38f91fe72620206b1bba38535c7cad7b005d8e4980c296eb9a0 WHIRLPOOL 10c6ab0711f3d6e51839c3061a45da1ade001545b76996da6f5dcee162f108ed53ad57355e7efae233089db777f826a532e830545fd08c308be1a55fbe1a7f7d
 MISC ChangeLog-2015 1987 SHA256 f5eae5e51be2f68ac25698c140f367ef9975023120cca8e7c2a3b003ebf77d1b SHA512 4b1a93c67e72eeabb75a459eec64758e1326a7a2b0f1d3ce124536e11d91f624dbc23bfa0b4cea56e32f15c01d540da6822a76134dce3fbdf8fad32d394de0eb WHIRLPOOL fb5cd0394ae822d7117a1d95a4c37ebb0b50a1895a910399771edac8886f56d94c6550c34ead08ddc4e3cf4263e2ca80bb8bd06896e92b6bdced8ca62918a167
diff --git a/x11-wm/stumpwm/stumpwm-0.9.9.ebuild b/x11-wm/stumpwm/stumpwm-0.9.9.ebuild
deleted file mode 100644
index e050a5fa8236..000000000000
--- a/x11-wm/stumpwm/stumpwm-0.9.9.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit autotools common-lisp-3 eutils elisp-common xdg-utils
-
-DESCRIPTION="Stumpwm is a Window Manager written entirely in Common Lisp."
-HOMEPAGE="https://stumpwm.github.io/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="contrib doc emacs clisp ecl +sbcl"
-
-RESTRICT="strip mirror"
-
-RDEPEND="dev-lisp/cl-ppcre
-		sbcl?  ( >=dev-lisp/sbcl-1.0.32 )
-		sbcl? ( >=dev-lisp/clx-0.7.4 )
-		!sbcl? ( !clisp? ( !ecl? ( >=dev-lisp/sbcl-1.0.32 ) ) )
-		!sbcl? ( !clisp? (  ecl? ( >=dev-lisp/ecls-10.4.1 ) ) )
-		!sbcl? (  clisp? ( >=dev-lisp/clisp-2.44[X,new-clx] ) )
-		emacs? ( virtual/emacs app-emacs/slime )"
-
-DEPEND="${RDEPEND}
-		sys-apps/texinfo
-		doc? ( virtual/texi2dvi )
-		contrib? ( dev-vcs/git )"
-
-SITEFILE=70${PN}-gentoo.el
-CLPKGDIR="${CLSOURCEROOT}/${CLPACKAGE}"
-CONTRIBDIR="${CLPKGDIR}/contrib"
-
-get_lisp() {
-	local lisp
-
-	for lisp in "$@" ; do
-		use ${lisp} && echo ${lisp} && return
-	done
-}
-
-do_doc() {
-	local pdffile="${PN}.pdf"
-
-	texi2pdf -o "${pdffile}" "${PN}.texi" && dodoc "${pdffile}" || die
-	cp "${FILESDIR}/README.Gentoo" . && sed -i "s:@VERSION@:${PV}:" README.Gentoo || die
-	dodoc AUTHORS NEWS README.md README.Gentoo
-	doinfo "${PN}.info"
-	docinto examples ; dodoc sample-stumpwmrc.lisp
-}
-
-do_contrib() {
-	emake install-modules
-	rm -r "${D}${CONTRIBDIR}"/.git* || die
-}
-
-src_prepare() {
-	# Upstream didn't change the version before packaging
-	sed -i -e 's/:version "0.9.8"/:version "0.9.9"/' "${PN}.asd" || die
-	# Bug 534592. Does not build with asdf:oos, using require to load the package
-	sed -i "load-${PN}.lisp.in" -e "s/asdf:oos 'asdf:load-op/require/" || die
-	if use contrib ; then
-		# Fix contrib directory
-		sed -i -e "s|@CONTRIB_DIR@|@MODULE_DIR@|" make-image.lisp.in || die
-		sed -i -e "s|\~\/.${CLPACKAGE}\.d/modules|${D}${CONTRIBDIR}|" Makefile.in || die
-		sed -i -e "s|\${HOME}/\.${CLPACKAGE}\.d/modules|${CONTRIBDIR}|" configure.ac || die
-	fi
-	eautoreconf
-}
-
-src_configure() {
-	local moduleconfig
-
-	xdg_environment_reset
-	use contrib && moduleconfig="--with-module-dir=${CONTRIBDIR}/contrib"
-	econf --with-lisp=$(get_lisp sbcl clisp ecl) "${moduleconfig}"
-}
-
-src_compile() {
-	emake -j1
-}
-
-src_install() {
-	common-lisp-export-impl-args $(get_lisp sbcl clisp ecl)
-	dobin stumpwm
-	make_session_desktop StumpWM /usr/bin/stumpwm
-
-	common-lisp-install-sources *.lisp
-	common-lisp-install-asdf ${PN}.asd
-	# Fix ASDF dir
-	sed -i -e "/(:directory/c\   (:directory \"${CLPKGDIR}\")" \
-		"${D}${CLPKGDIR}/load-stumpwm.lisp" || die
-	use doc && do_doc
-	use contrib && do_contrib
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/x11-wm/stumpwm/stumpwm-1.0.0.ebuild b/x11-wm/stumpwm/stumpwm-1.0.0.ebuild
index b3c7548eee00..5ffbe143408d 100644
--- a/x11-wm/stumpwm/stumpwm-1.0.0.ebuild
+++ b/x11-wm/stumpwm/stumpwm-1.0.0.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=6
 
-inherit common-lisp-3 eutils elisp-common autotools xdg-utils
+inherit common-lisp-3 autotools elisp-common xdg-utils
 
 DESCRIPTION="Stumpwm is a Window Manager written entirely in Common Lisp."
 HOMEPAGE="https://stumpwm.github.io/"
@@ -28,9 +28,10 @@ DEPEND="${RDEPEND}
 		sys-apps/texinfo
 		doc? ( virtual/texi2dvi )"
 
+PDEPEND="contrib? ( x11-wm/stumpwm-contrib )"
+
 SITEFILE=70${PN}-gentoo.el
 CLPKGDIR="${CLSOURCEROOT}/${CLPACKAGE}"
-CONTRIBDIR="${CLPKGDIR}/contrib"
 
 get_lisp() {
 	local lisp
@@ -50,32 +51,18 @@ do_doc() {
 	docinto examples ; dodoc sample-stumpwmrc.lisp
 }
 
-do_contrib() {
-	emake install-modules
-	rm -r "${D}${CONTRIBDIR}"/.git* || die
-}
-
 src_prepare() {
 	default
 	# Upstream didn't change the version before packaging
 	sed -i -e 's/:version "0.9.8"/:version "0.9.9"/' "${PN}.asd" || die
 	# Bug 534592. Does not build with asdf:oos, using require to load the package
 	sed -i "load-${PN}.lisp.in" -e "s/asdf:oos 'asdf:load-op/require/" || die
-	if use contrib ; then
-		# Fix contrib directory
-		sed -i -e "s|@CONTRIB_DIR@|@MODULE_DIR@|" make-image.lisp.in || die
-		sed -i -e "s|\~\/.${CLPACKAGE}\.d/modules|${D}${CONTRIBDIR}|" Makefile.in || die
-		sed -i -e "s|\${HOME}/\.${CLPACKAGE}\.d/modules|${CONTRIBDIR}|" configure.ac || die
-	fi
 	eautoreconf
 }
 
 src_configure() {
-	local moduleconfig
-
 	xdg_environment_reset
-	use contrib && moduleconfig="--with-module-dir=${CONTRIBDIR}/contrib"
-	econf --with-lisp=$(get_lisp sbcl clisp ecl) "${moduleconfig}"
+	econf --with-lisp=$(get_lisp sbcl clisp ecl)
 }
 
 src_compile() {
@@ -93,7 +80,6 @@ src_install() {
 	sed -i -e "/(:directory/c\   (:directory \"${CLPKGDIR}\")" \
 		"${D}${CLPKGDIR}/load-stumpwm.lisp" || die
 	use doc && do_doc
-	use contrib && do_contrib
 }
 
 pkg_postinst() {