import portage-20161007.tar.xz
diff --git a/app-admin/collectd/ChangeLog b/app-admin/collectd/ChangeLog
index a34978a..4f0ad4f 100644
--- a/app-admin/collectd/ChangeLog
+++ b/app-admin/collectd/ChangeLog
@@ -396,3 +396,10 @@
 
   Package-Manager: portage-2.3.1
 
+*collectd-5.6.1 (07 Oct 2016)
+
+  07 Oct 2016; Thomas Deutschmann <whissi@gentoo.org> +collectd-5.6.1.ebuild:
+  Bump to v5.6.1
+
+  Package-Manager: portage-2.3.1
+
diff --git a/app-admin/collectd/Manifest b/app-admin/collectd/Manifest
index b7c063f..b724096 100644
--- a/app-admin/collectd/Manifest
+++ b/app-admin/collectd/Manifest
@@ -12,8 +12,10 @@
 AUX collectd.logrotate 115 SHA256 eb359631805b6bfb9f2a9ae5ed21be8f8b3b6f1ffeed8d506231043c9a77262c SHA512 87ec01784d415f00834c2b20614f11f7e08b70f88d7c87509a8b8fd7e1af8758565b9ed6a6840af7bf1006cb941a61a6ff4f3176f6ded722728f24483b08bc8e WHIRLPOOL ba884cecfc7fc41e1fc8661d5e92c4519718ebddc4d919dd94d2183f377076efdad19f460ace810e1505cd2005bd64addf34306841993af9d754df633709a003
 DIST collectd-5.5.2.tar.bz2 1800476 SHA256 017f3a4062187e594d8ab6af685655fb82a8a942dc574668e68242bdb8ba820f SHA512 9d311db4f3677b95e3a47c03af01bdf1127957f6fccb6c601455632d0ea3b39e3f4cd9a6f8f510083e208714bbb0da2e04aaa574a90b0ad6fe984506675475b3 WHIRLPOOL 98ed4fb29eec0ae660d3e1651380a3f17f7bf7f22e687633c4a44974bc84e49cf8de11fd6fea349bfe24809ac3c29a407459a1203b72bcf741e1587c6c0b1773
 DIST collectd-5.6.0.tar.bz2 1818470 SHA256 f0ffbbd91fac3682bd324a74b9b4c9eabe781394b303b5cfd457c4cfbe748623 SHA512 5eecd7fe1619850b29e7853e0ab8f9eb7688d0fdf5687cf04930c75a94181c53d7dc0601a1dfa02417bdeb63cccf09b87acd7129e7f155b8d11147ec46982ed8 WHIRLPOOL 690e50f16318e9df39eac62010f8b0a57059356deeedd72505cc4a980876261a198edac095317f97b03913167dcfc49bf9f3b46986bbc3653628856e3a005111
+DIST collectd-5.6.1.tar.bz2 1903962 SHA256 c30ff644f91407b4dc2d99787b99cc45ec00e538bd1cc269429d3c5e8a4aee2c SHA512 da25f1a9cbaf47533f5a4d2f5f78b966317d4f21865c5a714954ad9d7d02b4798a3e0471ce52199dc80e01dc2808376cb10a7e19c402aafc984bf595f09951a6 WHIRLPOOL 68ed2b27bbd48f5af5e29743dcd2871ab4c2904d5593bbb6f3e68129f318389e32e13b256d489ea7842b90c406974511c8f324383253c7b438e7b6a9d36d299d
 EBUILD collectd-5.5.2.ebuild 17461 SHA256 888f79a52cb618cd7418226bb0bda3e7c36d97e07a46d15c9cdc83c161b5c5fc SHA512 260b409fc647afd636494e14c438dae18a2fe72eed72f5b6715bc074a69d75ca602fb6ad12dd9162edcf45953646cd6cffba6b221c4afc8636ff52c4b5487e4a WHIRLPOOL b3dc809685a178e36ebb0979d11e9644fb8e53b2163ba028d2579e9d1f1bc29c06f3bd596b8427637e9bd8988206e61897454fc5251f89763445b3ec7165d6ad
 EBUILD collectd-5.6.0.ebuild 17424 SHA256 6d54d7b5d88a8d0f049677c1cf081da15ca6568cc136a44bbce03843f8f6f316 SHA512 eb238cee5b4f2b40f16bd66843f525be0c8d27607610acd0a2b8e554af6a3385e606a697ec4ead53005c2dae1b24467041baa441fd4bd0906936618d863828da WHIRLPOOL 34bc7bd14a1e61a156e7bc147bac597ca16a495b727474e64c44d1c69a2c8387beb5489805a2178ab3b2eca5b4f96ed47eb789bcecc64ae9f175e2ffdd761016
-MISC ChangeLog 13210 SHA256 aa578179ca302245e88afe82821033f27549c3ce6e2a7bebcc9433cf3a175077 SHA512 5fa0b14a5248b72240a6bf7c713e8496410023d6934a8d79ad243bf6a1d5f93f82cf347a748128837eee4094e7141103e70d845e5c6e3f2ddf6b318cf55101a4 WHIRLPOOL 29ff8f987db141a75135bbf6a5b6df0c5ccfa12baab9ab7ce7fc80ad76fad526b9d4e11e9cd5b21a0962769d54eaa46d1da52c2926f58264223445ebd314a62f
+EBUILD collectd-5.6.1.ebuild 17394 SHA256 9b106ddb219a57e74bb6ec2774d8aafe7a0f7e6f98e9468c1f57e2f2b6c952ac SHA512 ae27037855b7a1743f3bd807be4517692966a378abd20219f9f1ba21e6ba1e2fcf84cea216f3ce3a52ececce81d70512de0427a90ff015a09b5b9ccf50a64afd WHIRLPOOL 8ffe68b5f4390ce52aef5b37e269b1469cfe6cd2e66623913d1238eee15d9fb410e12480621a0098165386463112efd9cb07dacf6768df98251ac4a9a1da15d5
+MISC ChangeLog 13371 SHA256 e3912f52ef5c8327f3ef983d6027f30bfea0848c2315474dfc2ce7aaab8c2592 SHA512 884186cf330591baa5162cda6cdd843055ccb98c6e13029378dc5c22c2b955f6a359d3089fc196eff021349cbe14b862a42c014fbaccb830fd05744834d68259 WHIRLPOOL 91642812c72bdf5a567875cab30307bbdd5b976a520cafc223bcea24b5c71d41856b825541e98364345582226a8d69c729d9cbac3807294407feea4937260729
 MISC ChangeLog-2015 14362 SHA256 1859e1b9ca3e7493396d72b51c984fdd2be019a1247e7005a41fe1a05f578894 SHA512 2434c3cfe30fbbcdc9a9e0e6d0f2c881d13e58d1bab2f47738ca0654a3a56b5d488ff1f542c1fd011e5349df810dcdc98c80559e91f39b4457ba626e633205dd WHIRLPOOL ce50c9de205ef7b86cd799d1d9f2bc4d0623fbfee511dd7e4a3a1f4d289eb567ff0026866c7b38428b285b88eabde060d77403db71f9455c865ae01c4c3623b9
 MISC metadata.xml 1736 SHA256 cddf7516d0f243602a01924480c83535125ed578c48509a759f91a255215447d SHA512 88d88b60f565a315ebdf6f77dc89de7b2354ecc600688bf49812fce047d4b2e5af2f7d21b1134311c21c4a3230ba7517eae221cfb9af87b91ba4c5958be242ab WHIRLPOOL 07b12e50d7653bcf19372a56a2f774dc3dd859c4cd40e6f47a197e1dbfd95f37f38e053c9d485287d24f412b385bb58ec6e7dcfa5db9400b299a19ee181d5377
diff --git a/app-admin/collectd/collectd-5.6.1.ebuild b/app-admin/collectd/collectd-5.6.1.ebuild
new file mode 100644
index 0000000..29cb16f
--- /dev/null
+++ b/app-admin/collectd/collectd-5.6.1.ebuild
@@ -0,0 +1,491 @@
+# Copyright 1999-2016 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} )
+JAVA_PKG_OPT_USE="collectd_plugins_java"
+
+inherit autotools fcaps flag-o-matic java-pkg-opt-2 linux-info multilib perl-functions python-single-r1 systemd user
+
+DESCRIPTION="Collects system statistics and provides mechanisms to store the values"
+
+HOMEPAGE="https://collectd.org/"
+SRC_URI="${HOMEPAGE}/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="contrib debug java kernel_Darwin kernel_FreeBSD kernel_linux perl selinux static-libs udev xfs"
+
+# The plugin lists have to follow here since they extend IUSE
+
+# Plugins that don't build (e.g. dependencies not in Gentoo)
+# apple_sensors: Requires libIOKit
+# aquaero:       Requires aerotools-ng/libaquaero5
+# barometer:     Requires libi2c (i2c_smbus_read_i2c_block_data)
+# grpc:          Requires libgrpc
+# lpar:          Requires libperfstat (AIX only)
+# mic:           Requires Intel Many Integrated Core Architecture API
+#                (part of Intel's  Xeon Phi software)
+# netapp:        Requires libnetapp (http://communities.netapp.com/docs/DOC-1110)
+# pf:            Requires BSD packet filter
+# pinba:         Requires MySQL Pinba engine (http://pinba.org/)
+# tape:          Requires libkstat (Solaris only)
+# write_mongodb: https://github.com/collectd/collectd/issues/492
+# write_riemann: Requires riemann-c-client
+# xmms:          Requires libxmms (v1)
+# zone:          Solaris only...
+COLLECTD_IMPOSSIBLE_PLUGINS="apple_sensors aquaero barometer grpc lpar mic
+	netapp pf pinba tape write_kafka write_mongodb write_riemann xmms
+	zone"
+
+# Plugins that have been (compile) tested and can be enabled via COLLECTD_PLUGINS
+COLLECTD_TESTED_PLUGINS="aggregation amqp apache apcups ascent battery bind
+	ceph cgroups chrony conntrack contextswitch cpu cpufreq cpusleep
+	csv curl curl_json curl_xml dbi df disk dns drbd email entropy
+	ethstat exec fhcount filecount fscache gmond gps hddtemp interface
+	ipc ipmi iptables ipvs irq java lua load logfile log_logstash lvm
+	madwifi match_empty_counter match_hashed match_regex match_timediff
+	match_value mbmon md memcachec memcached memory modbus mqtt
+	multimeter mysql netlink network network nfs nginx notify_desktop
+	notify_email notify_nagios ntpd numa nut olsrd onewire openldap
+	openvpn oracle perl ping postgresql powerdns processes protocols
+	python python redis routeros rrdcached rrdtool sensors serial
+	sigrok smart snmp statsd swap syslog table tail tail_csv
+	target_notification target_replace target_scale target_set tcpconns
+	teamspeak2 ted thermal threshold tokyotyrant turbostat unixsock
+	uptime users uuid varnish virt vmem vserver wireless write_graphite
+	write_http write_kafka write_log write_redis write_sensu write_tsdb
+	xencpu zfs_arc zookeeper"
+
+COLLECTD_DISABLED_PLUGINS="${COLLECTD_IMPOSSIBLE_PLUGINS}"
+
+COLLECTD_ALL_PLUGINS=${COLLECTD_TESTED_PLUGINS}
+
+for plugin in ${COLLECTD_ALL_PLUGINS}; do
+	IUSE="${IUSE} collectd_plugins_${plugin}"
+done
+unset plugin
+
+# Now come the dependencies.
+
+COMMON_DEPEND="
+	dev-libs/libgcrypt:=
+	dev-libs/libltdl:0=
+	perl?					( dev-lang/perl:=[ithreads] )
+	udev?					( virtual/udev )
+	xfs?					( sys-fs/xfsprogs )
+	collectd_plugins_amqp?			( net-libs/rabbitmq-c )
+	collectd_plugins_apache?		( net-misc/curl:0= )
+	collectd_plugins_ascent?		( net-misc/curl:0= dev-libs/libxml2:2= )
+	collectd_plugins_bind?			( net-misc/curl:0= dev-libs/libxml2:2= )
+	collectd_plugins_ceph?			( dev-libs/yajl:= )
+	collectd_plugins_curl?			( net-misc/curl:0= )
+	collectd_plugins_curl_json?		( net-misc/curl:0= dev-libs/yajl:= )
+	collectd_plugins_curl_xml?		( net-misc/curl:0= dev-libs/libxml2:2= )
+	collectd_plugins_dbi?			( dev-db/libdbi )
+	collectd_plugins_dns?			( net-libs/libpcap )
+	collectd_plugins_gmond?			( sys-cluster/ganglia )
+	collectd_plugins_gps?			( sci-geosciences/gpsd )
+	collectd_plugins_ipmi?			( >=sys-libs/openipmi-2.0.16-r1 )
+	collectd_plugins_iptables?		( >=net-firewall/iptables-1.4.13:0= )
+	collectd_plugins_log_logstash?		( dev-libs/yajl:= )
+	collectd_plugins_lua?			( dev-lang/lua:0= )
+	collectd_plugins_lvm?			( sys-fs/lvm2 )
+	collectd_plugins_memcachec?		( dev-libs/libmemcached )
+	collectd_plugins_modbus?		( dev-libs/libmodbus )
+	collectd_plugins_mqtt?			( app-misc/mosquitto )
+	collectd_plugins_mysql?			( >=virtual/mysql-5.0 )
+	collectd_plugins_netlink?		( net-libs/libmnl )
+	collectd_plugins_nginx?			( net-misc/curl:0= )
+	collectd_plugins_notify_desktop?	( x11-libs/libnotify )
+	collectd_plugins_notify_email?		( net-libs/libesmtp )
+	collectd_plugins_nut?			( >=sys-power/nut-2.7.2-r2 )
+	collectd_plugins_openldap?		( net-nds/openldap )
+	collectd_plugins_onewire?		( >=sys-fs/owfs-3.1:= )
+	collectd_plugins_oracle?		( dev-db/oracle-instantclient-basic )
+	collectd_plugins_perl?			( dev-lang/perl:=[ithreads] )
+	collectd_plugins_ping?			( net-libs/liboping )
+	collectd_plugins_postgresql?		( dev-db/postgresql:= )
+	collectd_plugins_python?		( ${PYTHON_DEPS} )
+	collectd_plugins_redis?			( dev-libs/hiredis:= )
+	collectd_plugins_routeros?		( net-libs/librouteros )
+	collectd_plugins_rrdcached?		( net-analyzer/rrdtool:= )
+	collectd_plugins_rrdtool?		( net-analyzer/rrdtool:= )
+	collectd_plugins_sensors?		( sys-apps/lm_sensors )
+	collectd_plugins_sigrok?		( <sci-libs/libsigrok-0.4 dev-libs/glib:2 )
+	collectd_plugins_smart?			( dev-libs/libatasmart )
+	collectd_plugins_snmp?			( net-analyzer/net-snmp )
+	collectd_plugins_tokyotyrant?		( net-misc/tokyotyrant )
+	collectd_plugins_varnish?		( www-servers/varnish )
+	collectd_plugins_virt?			( app-emulation/libvirt:= dev-libs/libxml2:2= )
+	collectd_plugins_write_http?		( net-misc/curl:0= dev-libs/yajl:= )
+	collectd_plugins_write_kafka?		( >=dev-libs/librdkafka-0.9.0.99:= dev-libs/yajl:= )
+	collectd_plugins_write_redis?		( dev-libs/hiredis:= )
+	collectd_plugins_xencpu?		( app-emulation/xen-tools )
+
+	kernel_FreeBSD? (
+		collectd_plugins_disk?		( sys-libs/libstatgrab:= )
+		collectd_plugins_interface?	( sys-libs/libstatgrab:= )
+		collectd_plugins_load?		( sys-libs/libstatgrab:= )
+		collectd_plugins_memory?	( sys-libs/libstatgrab:= )
+		collectd_plugins_swap?		( sys-libs/libstatgrab:= )
+		collectd_plugins_users?		( sys-libs/libstatgrab:= )
+	)"
+
+# Enforcing <=sys-kernel/linux-headers-4.4 due to #577846
+DEPEND="${COMMON_DEPEND}
+	collectd_plugins_iptables?		( <=sys-kernel/linux-headers-4.4 )
+	collectd_plugins_java?			( >=virtual/jdk-1.6 )
+	virtual/pkgconfig"
+
+RDEPEND="${COMMON_DEPEND}
+	collectd_plugins_java?			( >=virtual/jre-1.6 )
+	collectd_plugins_syslog?		( virtual/logger )
+	selinux?				( sec-policy/selinux-collectd )"
+
+REQUIRED_USE="
+	collectd_plugins_python?		( ${PYTHON_REQUIRED_USE} )
+	collectd_plugins_smart?			( udev )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.6.0-gentoo.patch
+)
+
+# @FUNCTION: collectd_plugin_kernel_linux
+# @DESCRIPTION:
+# USAGE: <plugin name> <kernel_options> <severity>
+# kernel_options is a list of kernel configurations options; the check tests whether at least
+#   one of them is enabled. If no, depending on the third argument an elog, ewarn, or eerror message
+#   is emitted.
+collectd_plugin_kernel_linux() {
+	local multi_opt opt
+	if has ${1} ${COLLECTD_ALL_PLUGINS}; then
+		if use collectd_plugins_${1}; then
+			for opt in ${2}; do
+				if linux_chkconfig_present ${opt}; then
+					return 0;
+				fi
+			done
+			multi_opt=${2//\ /\ or\ }
+			case ${3} in
+				(info)
+					elog "The ${1} plugin can use kernel features that are disabled now; enable ${multi_opt} in your kernel"
+				;;
+				(warn)
+					ewarn "The ${1} plugin uses kernel features that are disabled now; enable ${multi_opt} in your kernel"
+				;;
+				(error)
+					eerror "The ${1} plugin needs kernel features that are disabled now; enable ${multi_opt} in your kernel"
+				;;
+				(*)
+					die "function collectd_plugin_kernel_linux called with invalid third argument"
+				;;
+			esac
+		fi
+	fi
+}
+
+collectd_linux_kernel_checks() {
+	if ! linux_chkconfig_present PROC_FS; then
+		ewarn "/proc file system support is disabled, many plugins will not be able to read any statistics from your system unless you enable PROC_FS in your kernel"
+	fi
+
+	if ! linux_chkconfig_present SYSFS; then
+		ewarn "/sys file system support is disabled, many plugins will not be able to read any statistics from your system unless you enable SYSFS in your kernel"
+	fi
+
+	# battery.c: /proc/pmu/battery_%i
+	# battery.c: /proc/acpi/battery
+	collectd_plugin_kernel_linux battery ACPI_BATTERY warn
+
+	# cgroups.c: /sys/fs/cgroup/
+	collectd_plugin_kernel_linux cgroups CGROUPS warn
+
+	# cpufreq.c: /sys/devices/system/cpu/cpu%d/cpufreq/
+	collectd_plugin_kernel_linux cpufreq SYSFS warn
+	collectd_plugin_kernel_linux cpufreq CPU_FREQ_STAT warn
+
+	# drbd.c: /proc/drbd
+	collectd_plugin_kernel_linux drbd BLK_DEV_DRBD warn
+
+	# conntrack.c: /proc/sys/net/netfilter/*
+	collectd_plugin_kernel_linux conntrack NETFILTER warn
+
+	# fscache.c: /proc/fs/fscache/stats
+	collectd_plugin_kernel_linux fscache FSCACHE warn
+
+	# nfs.c: /proc/net/rpc/nfs
+	# nfs.c: /proc/net/rpc/nfsd
+	collectd_plugin_kernel_linux nfs NFS_COMMON warn
+
+	# serial.c: /proc/tty/driver/serial
+	# serial.c: /proc/tty/driver/ttyS
+	collectd_plugin_kernel_linux serial SERIAL_CORE warn
+
+	# swap.c: /proc/meminfo
+	collectd_plugin_kernel_linux swap SWAP warn
+
+	# thermal.c: /proc/acpi/thermal_zone
+	# thermal.c: /sys/class/thermal
+	collectd_plugin_kernel_linux thermal ACPI_THERMAL warn
+
+	# turbostat.c: /dev/cpu/%d/msr
+	collectd_plugin_kernel_linux turbostat X86_MSR warn
+
+	# vmem.c: /proc/vmstat
+	collectd_plugin_kernel_linux vmem VM_EVENT_COUNTERS warn
+
+	# vserver.c: /proc/virtual
+	collectd_plugin_kernel_linux vserver VSERVER warn
+
+	# uuid.c: /sys/hypervisor/uuid
+	collectd_plugin_kernel_linux uuid SYSFS info
+
+	# wireless.c: /proc/net/wireless
+	collectd_plugin_kernel_linux wireless "WIRELESS MAC80211 IEEE80211" warn
+
+	# zfs_arc.c: /proc/spl/kstat/zfs/arcstats
+	collectd_plugin_kernel_linux zfs_arc "SPL ZFS" warn
+}
+
+pkg_setup() {
+	if use kernel_linux; then
+		linux-info_pkg_setup
+
+		if linux_config_exists; then
+			einfo "Checking your linux kernel configuration:"
+			collectd_linux_kernel_checks
+		else
+			elog "Cannot find a linux kernel configuration. Continuing anyway."
+		fi
+	fi
+
+	if use collectd_plugins_java; then
+		java-pkg-opt-2_pkg_setup
+	fi
+
+	use collectd_plugins_python && python-single-r1_pkg_setup
+
+	enewgroup collectd
+	enewuser collectd -1 -1 /var/lib/collectd collectd
+}
+
+src_prepare() {
+	default
+
+	# There's some strange prefix handling in the default config file, resulting in
+	# paths like "/usr/var/..."
+	sed -i -e "s:@prefix@/var:/var:g" src/collectd.conf.in || die
+
+	# fix installdirs for perl, bug 444360
+	sed -i -e 's/INSTALL_BASE=$(DESTDIR)$(prefix) //' bindings/Makefile.am || die
+
+	if use collectd_plugins_java; then
+		# Set javac -source and -target flags according to (R)DEPEND.
+		sed -i -e "s/\$(JAVAC)/\0 $(java-pkg_javac-args)/g" bindings/java/Makefile.am || die
+	fi
+
+	ebegin "Removing bundled libltdl"
+	rm -rf libltdl || die
+	eend 0
+
+	eautoreconf
+}
+
+src_configure() {
+	# Now come the lists of os-dependent plugins. Any plugin that is not listed anywhere here
+	# should work independent of the operating system.
+
+	local linux_plugins="barometer battery cpu cpufreq disk drbd entropy
+		ethstat interface iptables ipvs irq ipc load memory md netlink nfs
+		numa processes serial swap tcpconns thermal turbostat users vmem
+		wireless zfc_arc"
+
+	local need_libstatgrab=0
+	local libstatgrab_plugins="cpu disk interface load memory swap users"
+	local bsd_plugins="cpu tcpconns ${libstatgrab_plugins} zfc_arc"
+
+	local darwin_plugins="apple_sensors battery cpu disk interface memory processes tcpconns"
+
+	local osdependent_plugins="${linux_plugins} ${bsd_plugins} ${darwin_plugins}"
+	local myos_plugins=""
+	if use kernel_linux; then
+		einfo "Enabling Linux plugins."
+		myos_plugins=${linux_plugins}
+	elif use kernel_FreeBSD; then
+		einfo "Enabling FreeBSD plugins."
+		myos_plugins=${bsd_plugins}
+	elif use kernel_Darwin; then
+		einfo "Enabling Darwin plugins."
+		myos_plugins=${darwin_plugins}
+	fi
+
+	local myconf="--disable-werror"
+
+	# Do we debug?
+	myconf+=" $(use_enable debug)"
+
+	# udev support?
+	# Required for smart plugin via REQUIRED_USE; Optional for disk plugin
+	if use udev; then
+		myconf+=" --with-libudev"
+	else
+		myconf+=" --without-libudev"
+	fi
+
+	local plugin
+
+	# Disable what needs to be disabled.
+	for plugin in ${COLLECTD_DISABLED_PLUGINS}; do
+		myconf+=" --disable-${plugin}"
+	done
+
+	# Set enable/disable for each single plugin.
+	for plugin in ${COLLECTD_ALL_PLUGINS}; do
+		if has ${plugin} ${osdependent_plugins}; then
+			# plugin is os-dependent ...
+			if has ${plugin} ${myos_plugins}; then
+				# ... and available in this os
+				myconf+=" $(use_enable collectd_plugins_${plugin} ${plugin})"
+				# ... must we link against libstatgrab? Bug #541518
+				if use kernel_FreeBSD && has ${plugin} ${libstatgrab_plugins}; then
+					einfo "We must link against libstatgrab due to plugin \"${plugin}\" ..."
+					need_libstatgrab=1
+				fi
+			else
+				# ... and NOT available in this os
+				if use collectd_plugins_${plugin}; then
+					ewarn "You try to enable the ${plugin} plugin, but it is not available for this"
+					ewarn "kernel. Disabling it automatically."
+				fi
+				myconf+=" --disable-${plugin}"
+			fi
+		elif [[ "${plugin}" = "collectd_plugins_perl" ]]; then
+			if use collectd_plugins_perl && ! use perl; then
+				ewarn "Perl plugin disabled as perl bindings disabled by -perl use flag"
+				myconf+= --disable-perl
+			else
+				myconf+=" $(use_enable collectd_plugins_${plugin} ${plugin})"
+			fi
+		else
+			myconf+=" $(use_enable collectd_plugins_${plugin} ${plugin})"
+		fi
+	done
+
+	if [ "${need_libstatgrab}" -eq 1 ]; then
+		myconf+=" --with-libstatgrab"
+	else
+		myconf+=" --without-libstatgrab"
+	fi
+
+	# JAVA_HOME is set by eclasses.
+	if use collectd_plugins_java; then
+		myconf+=" --with-java"
+	fi
+
+	# Need libiptc ONLY for iptables. If we try to use it otherwise bug 340109 happens.
+	# lots of libs are only needed for plugins, if they are disabled, also disable the lib
+	use collectd_plugins_iptables || myconf+=" --with-libiptc=no"
+	use collectd_plugins_openldap || myconf+=" --with-libldap=no"
+	use collectd_plugins_redis    || use collectd_plugins_write_redis || myconf+=" --with-libhiredis=no"
+	use collectd_plugins_smart    || myconf+=" --with-libatasmart=no"
+	use collectd_plugins_gps      || myconf+=" --with-libgps=no"
+
+	if use perl; then
+		myconf+=" --with-perl-bindings=INSTALLDIRS=vendor"
+	else
+		myconf+=" --without-perl-bindings"
+	fi
+
+	# No need for v5upgrade
+	myconf+=" --disable-target_v5upgrade"
+
+	# Python
+	if use collectd_plugins_python; then
+		myconf+=" --with-libpython=yes"
+		export PYTHON_CONFIG=$(python_get_PYTHON_CONFIG)
+	else
+		myconf+=" --with-libpython=no"
+	fi
+
+	# XFS support
+	myconf+=" $(use_enable xfs)"
+
+	# Finally, run econf.
+	KERNEL_DIR="${KERNEL_DIR}" econf --config-cache \
+		$(use_enable static-libs static) \
+		--localstatedir=/var ${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D%/}" install
+
+	perl_delete_localpod
+
+	find "${ED}"usr/ -name "*.la" -delete || die
+
+	if use collectd_plugins_java; then
+		java-pkg_regjar "${ED}"usr/share/${PN}/java/*.jar
+	fi
+
+	fowners root:collectd /etc/collectd.conf
+	fperms u=rw,g=r,o= /etc/collectd.conf
+
+	dodoc AUTHORS ChangeLog NEWS README TODO
+
+	if use contrib ; then
+		insinto /usr/share/doc/${PF}
+		doins -r contrib
+	fi
+
+	keepdir /var/lib/${PN}
+	fowners collectd:collectd /var/lib/${PN}
+
+	newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
+	systemd_newunit "contrib/systemd.${PN}.service" ${PN}.service
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+	sed -i -e 's:^.*PIDFile     "/var/run/collectd.pid":PIDFile     "/run/collectd/collectd.pid":' "${ED}"etc/collectd.conf || die
+	sed -i -e 's:^#	SocketFile "/var/run/collectd-unixsock":#	SocketFile "/run/collectd/collectd.socket":' "${ED}"etc/collectd.conf || die
+	sed -i -e 's:^.*LoadPlugin perl$:# The new, correct way to load the perl plugin -- \n# <LoadPlugin perl>\n#   Globals true\n# </LoadPlugin>:' "${ED}"etc/collectd.conf || die
+	sed -i -e 's:^.*LoadPlugin python$:# The new, correct way to load the python plugin -- \n# <LoadPlugin python>\n#   Globals true\n# </LoadPlugin>:' "${ED}"etc/collectd.conf || die
+}
+
+pkg_postinst() {
+	local caps=()
+	use collectd_plugins_ping      && caps+=('cap_net_raw')
+	use collectd_plugins_iptables  && caps+=('cap_net_admin')
+	use collectd_plugins_filecount && caps+=('cap_dac_read_search')
+
+	if [ ${#caps[@]} -gt 0 ]; then
+		local caps_str=$(IFS=","; echo "${caps[*]}")
+		fcaps ${caps_str} usr/sbin/collectd
+		elog "Capabilities for ${EROOT}usr/sbin/collectd set to:"
+		elog "  ${caps_str}+ep"
+		elog
+	fi
+
+	elog "Note: Collectd is only the collector."
+	elog "      You need to install 'data' sources (applications) locally or"
+	elog "      remotely on your own."
+
+	elog
+	elog "Collectd is configured to run as unprivileged user by default."
+	elog "You may want to revisit the configuration."
+	elog
+
+	if use collectd_plugins_email; then
+		ewarn "The email plug-in is deprecated. To submit statistics please use the unixsock plugin."
+	fi
+
+	if use contrib; then
+		elog "The scripts in /usr/share/doc/${PF}/collection3 for generating graphs need dev-perl/HTML-Parser,"
+		elog "dev-perl/config-general, dev-perl/regexp-common, and net-analyzer/rrdtool[perl] to be installed."
+	fi
+}
diff --git a/app-editors/mg/ChangeLog b/app-editors/mg/ChangeLog
index 71b8bbc..5c86b2e 100644
--- a/app-editors/mg/ChangeLog
+++ b/app-editors/mg/ChangeLog
@@ -153,3 +153,15 @@
   Package-Manager: portage-2.3.1
   RepoMan-Options: --include-arches="arm"
 
+*mg-20161005 (07 Oct 2016)
+
+  07 Oct 2016; Ulrich Müller <ulm@gentoo.org> +mg-20161005.ebuild:
+  Version bump.
+
+  Package-Manager: portage-2.3.1
+
+  07 Oct 2016; Ulrich Müller <ulm@gentoo.org> -mg-20160905.ebuild:
+  Remove old.
+
+  Package-Manager: portage-2.3.1
+
diff --git a/app-editors/mg/Manifest b/app-editors/mg/Manifest
index cdb1e1c..bbc2391 100644
--- a/app-editors/mg/Manifest
+++ b/app-editors/mg/Manifest
@@ -1,11 +1,11 @@
 DIST mg-20150323.tar.gz 142105 SHA256 d71b24d47d3e1426f162e446d92dfa457df96dd47c1289419cba9fd14c2c3afb SHA512 747a04c203509cdbe84d9cea6c5be93585cdd5cb855b556ea5dee273a2923a4a68bee3f952cf92d584fcdd682049cb4442c21888304ba036851127174457351f WHIRLPOOL bdba74b62034a6613434fc3efea7b56fa1599b6059ab97dbd760b013be7dc50ab13dfcee3f5fb1f41f4c26c3f0146583680134d3809ec7977a14a28cb345c6db
 DIST mg-20160421.tar.gz 145187 SHA256 b5dd8fbecb8a0ff0f32588c448f22f25fafcbfb297857e76d2883598a3e63a9a SHA512 7a4fb9d8958952a1b430bda88cafa251aab74691073d103941bfc2cce495ad3831b2c722db044791d61ae2aee9a5a9acaedde0090964129822c94745d89469ed WHIRLPOOL 9a040a69c9d57232c411da3859e80c84f2f250f2fd78cd2799cfb82243fdd9d01d374edb23de44d6eb94b9ab86009458b3c7c4cf34b738c45d4622e6c67dc99b
-DIST mg-20160905.tar.gz 144991 SHA256 72c14476f98e341a01520f09ab8dfdd52663498d9dc14d0831c31697a08b8349 SHA512 7ee51739ef15c70e28e81b8da70d9d85534c6f5d7ddf3c8530dad8b9be73c6b519c002b219cdc782e8080fbe4cc5c09a33e6eb88b1e7b4e6771b2f5d5cff9213 WHIRLPOOL b7f17f91f366e63ae3da002af245eb66ee682748df9d7bdb53fb14cd474b44593d0e0e4f73ed26f727ec71dd39e4f3385e6bac9670b094e38fb4486f79398c09
 DIST mg-20160912.tar.gz 145176 SHA256 0b050456b78d767d13839486e01705de6acf407f27052c204505e166eb698176 SHA512 6a4c8fd28c71eec27191f664fe8dcc13a2d9b05bb43677579ddb84fec016cbb91bacea1998c3c15bfc87a455a8fc31abc3c633ce7d334e433ce0768ab8e9b737 WHIRLPOOL f20a62e81b33c606f34ef6e9d30dd7a6b9223728734b4c518370b6af330f454954748903fe3962f5c2b7cda5f6e5deb567be91588895c61a2b362a43c6b5b8d9
+DIST mg-20161005.tar.gz 140797 SHA256 b7fcb5136a6783ca24c8463ab0852fc1f26bdb2bb1c24759b2c51ccfc46c5e61 SHA512 3ec2e10d0cd427f9543818690fdd469b64e6eb5d061a221eb7b18566dfb1965ee68cea7c83e4e4ae9b2d6027a0803aacfc815390571ac550bc0b7004b46972ae WHIRLPOOL 4cfb72313b8181acc40b1cd06269f2162198302d2e088a7b04263af4b127071adbe9725aed2ecdf6cd3854a9e9c9df9173a75bf7a83cf2492a644448df9d297d
 EBUILD mg-20150323.ebuild 1203 SHA256 579e7c9e92a9f979e010ce93d3ca2fd205e58dba16d0eea29fdfd5292eb9b1ae SHA512 3a5c9a717cc4230da1f740d8a6892200ecdce1d735223e3dc0dbb60c9aa18f50699eed371e308dddd580e7145a92d0ea6e0b1c1cdffa5a06b77c38153ec8078b WHIRLPOOL 41fa6386e0bfd9707618fd9072e0b234252cc79bc2a61c51a0f3bc0db73a66efd370f697a83bfa8a69b338fd5484b5ed5cb124d41aae2bbea69e673e9b81e652
 EBUILD mg-20160421.ebuild 1199 SHA256 691ec5d930095dbb408787e68cce6f3f4846498f19d67735a5c260decbd7b0cb SHA512 7b0770ee930ed1200d920b30cea25465ab39aa7744afb8b5c22c0aec5a946fe75740d40a23de7678deeb607b44f89ac4236e2651f86c14612499890953261ecd WHIRLPOOL 0cbae7f208f470f515102e4a74897ad77996a1e500dc21d71caed7b9b1fd712aadd34ffc4f6fcb64962608c8756ff7e9428d823056f66ca6d66f3afeb6842405
-EBUILD mg-20160905.ebuild 1182 SHA256 a98ab7d2bfd6eab8b103630293d532c21cdd773059c3dba58a91a6209587d230 SHA512 f57c7de46329c925edd61582d781c541d05a380973435638a3386bc9a1a0ad6d0c455913baaa52616864a1bd7b395d24c87c5f356fd1a4a89de06f6c055d44df WHIRLPOOL e621906fca78ce2db66ece357428240c1f5ea01d08c7db868522bda2c00ac59a26108979a01d43e96cb7c3f49fdc35859a6f476519d4b982fbece59021555c30
 EBUILD mg-20160912.ebuild 1182 SHA256 a98ab7d2bfd6eab8b103630293d532c21cdd773059c3dba58a91a6209587d230 SHA512 f57c7de46329c925edd61582d781c541d05a380973435638a3386bc9a1a0ad6d0c455913baaa52616864a1bd7b395d24c87c5f356fd1a4a89de06f6c055d44df WHIRLPOOL e621906fca78ce2db66ece357428240c1f5ea01d08c7db868522bda2c00ac59a26108979a01d43e96cb7c3f49fdc35859a6f476519d4b982fbece59021555c30
-MISC ChangeLog 4695 SHA256 6406b4083ca52753b038b5d7d9914f72821412a784d7d7aeab21eba2186a9791 SHA512 ade930b8adf3ac8954aeeb5a1bba6906897527294a9fc7de185820ab7ec6fa386af632e74645936c5a4fe1a34d6c37a6c3f56b17398cf6891333f1b8864ae860 WHIRLPOOL 361588ae466a5287780636589bc9163f909842c0074086dd4d2a7e1090ccd80690dbcac2ebea953142d3f0bba7ee49ae58f55bf5d73d40c6794a9e56bd762f8f
+EBUILD mg-20161005.ebuild 1059 SHA256 31e2947185254734a273c824ca252099c968fa338a816ae9632e0c26f47086ea SHA512 cceb4f126be2c3c75597691fe1980d87a535b657787e10076d50eaa187051b75e40b06e0c69c203b2d9c7df2a5aa7a01a4b91ad78135af6d8a22197e2221c6e0 WHIRLPOOL 1238e9fe4aefbbd578c228e540b4868e6e9b95109f42738d76b7a09abb1781c5332c350df01ec0cd068b7976f95378c474645c80e2d8afe3318c8b633206c264
+MISC ChangeLog 4959 SHA256 dd395b83974db28bb5c748fff18cb58d9f075e63642636ca16abc92c97079c0b SHA512 d75660122cc3008857971268df1e75220ad2b122a39cb0428bfa9e2564d3cb3bc3daa1625331e9854a44500a51528a6ea98e417c4a4a3d0612b4a2fc7b3854d9 WHIRLPOOL efbc0da7342662546e752b85c110e56cc6dd6c5c46489406f1ce7680bb8ad4a8f8cc4489f18d6f4c26c8f76c1c71b5b02dc344b829671a4593a67e74142abe81
 MISC ChangeLog-2015 13105 SHA256 cace27ac64a502179a77766381bf98b078859762af50daa67b9d131d2d75d4f7 SHA512 057a9507201db1602e4fd0df06332ea74582c318102efafcc8a2750aa6f17157ce82288cb0e03b5cb62c04f812dd55e0e5158598d7dce98c37e04d891385662e WHIRLPOOL dbb8b7881a97248ed45ac6ab4fcbf09df44bd5dd91ba630dd2b883ea82ec62614c2ce979cd5de329e8a76b7b1d6a52661b2f4a0583b11830984f41b5730f0b79
 MISC metadata.xml 384 SHA256 3ad78578cf5ca1e761ef628698f06d12a55ebf532e40985aa62ad7f7176d44b3 SHA512 70e2db47bef37d81a3842797ea0e12081e697b6e06bd25fbecfb64acf58b80e60a0c31508bf1c93879734af0921a47654fd489f08301b2517757741e0c6d25cf WHIRLPOOL add3c462182b70d77d8fff5a47fc2f428e8ec6a3ed9f23053d5a63fb01c7e0533db07f08671de6f56a3bf9fa3306a927fa39637ece186453440610060e80b86d
diff --git a/app-editors/mg/mg-20160905.ebuild b/app-editors/mg/mg-20161005.ebuild
similarity index 89%
rename from app-editors/mg/mg-20160905.ebuild
rename to app-editors/mg/mg-20161005.ebuild
index b221969..ff162ce 100644
--- a/app-editors/mg/mg-20160905.ebuild
+++ b/app-editors/mg/mg-20161005.ebuild
@@ -21,10 +21,6 @@
 	virtual/pkgconfig"
 
 src_prepare() {
-	# remove OpenBSD specific easter egg
-	sed -i -e 's/theo\.o//' GNUmakefile || die
-	sed -i -e '/theo_init/d' main.c || die
-
 	# fix path to tutorial in man page
 	sed -i -e "s:doc/mg/:doc/${PF}/:" mg.1 || die
 
diff --git a/app-emulation/cloud-init/ChangeLog b/app-emulation/cloud-init/ChangeLog
index 2aece1b..870546e 100644
--- a/app-emulation/cloud-init/ChangeLog
+++ b/app-emulation/cloud-init/ChangeLog
@@ -174,3 +174,18 @@
 
   Package-Manager: portage-2.3.0
 
+*cloud-init-0.7.8-r1 (07 Oct 2016)
+
+  07 Oct 2016; Matthew Thode <prometheanfire@gentoo.org>
+  -cloud-init-0.7.8.ebuild, +cloud-init-0.7.8-r1.ebuild,
+  files/cloud-init-0.7.8-gentooinit.patch:
+  fixing runlevel stuff
+
+  Package-Manager: portage-2.3.0
+
+  07 Oct 2016; Matthew Thode <prometheanfire@gentoo.org>
+  cloud-init-0.7.8-r1.ebuild:
+  stable amd64 x86
+
+  Package-Manager: portage-2.3.0
+
diff --git a/app-emulation/cloud-init/Manifest b/app-emulation/cloud-init/Manifest
index 7261320..5e4dfe8 100644
--- a/app-emulation/cloud-init/Manifest
+++ b/app-emulation/cloud-init/Manifest
@@ -1,7 +1,7 @@
 AUX cloud-init-0.7.6-gentoo.patch 2569 SHA256 11e177a66511a27c8bed12237365e16d1b8d3a3376f687ec964e86b5e9bedc90 SHA512 5de2fe7632162bd5b527bda21a6f8c96122bdb2a9cb4ae40e8d73e48a303b56ae479a06985b8c1807829f53dd859e59d053b3613d6e2e446e5506b310d5e2eb5 WHIRLPOOL a2be7408066ceb091aaedeae7458ac41ae83b259f1d6c84d59aaf966b62b49be3b2ae649fef9d800a601f213dc3e0e16db12a8dc33a824c0d84434dcfe9f0c9e
 AUX cloud-init-0.7.6_p1212-gentoo.patch 1521 SHA256 d51e5ad00b28bf697cb040c16499f641d0d28ba1405da5fba61d1c3dc6bb2991 SHA512 e364bc88b8a41dc109d0e44ac7045d2de9312bbc27afa0668cfc31f6cdc60456ca39b08e23669eb36da8dc71e72e8360a113179f1524ab0646665749e7a9cd5e WHIRLPOOL ef522c89840573a9caf659a3f103bca593fc51a501aa361710f2087e759ad2fe018fbb6786e5519a870d2a7aef121015b3c43324db5b2cd06f7b06ea5a72671f
 AUX cloud-init-0.7.7-gentooinit.patch 2066 SHA256 6bb15613c1b9fdf95dfad3b51afd566c7d9bfe2a05d47f588f867e660012940f SHA512 2846c04f65d37f8dd981c5feb445ebb3ba1c437ac4e7fae12557a49cc12bc369e0e46acf3977a8fc2890f3675480a47f504b6a69b79e61307f6c82f17bf00c47 WHIRLPOOL 1a49203a037fa18b202242df59bbc1ab3ba9b66c173afc55c8d454bba9a901bcb1c777d1c99eb5564c37233c55eb1b12e0379d75964b552532af87bf1b9dfbde
-AUX cloud-init-0.7.8-gentooinit.patch 468 SHA256 4f115cdd8693b5a8d4c024d78ede36e5890748a3a9271d397882fb39407c7207 SHA512 07538a07a494c752b49ca357b448b4ae012ae855751886c4368e95d7a152a65afcc7c243eae428b670ae5f5802fbaeedeebf5a07d3a470bdc74d33c1f5f8ca02 WHIRLPOOL 725bc5babdec0a45c536a39b5f3edd67ded7f1ed03d973a006948d024439f93226bd8fad51b5065d9e0e5f58476575902df84b150bc31795206bfeffff74f0b7
+AUX cloud-init-0.7.8-gentooinit.patch 1111 SHA256 41b79f2f6143fa0b17e0955cc81e97cf15232a45394ea9f8d230f16a7b5c6106 SHA512 2a7e81b327853c8052c7eeb039d8166414d302e3558fa1a5147c2614f6f14d85419a70d10e8e526c3611b72273b5cae8027bb250f1a0f743924b89fd350aa130 WHIRLPOOL 9e82d06a55832a02f5393a4c4c62adf02fa9d6445dda48a3514d6e17fb70033a1b21fa73f28ad942e73d3410c1bbffdc52d0070ec1dadb5dc9d124d90c89d22b
 AUX cloud.cfg 1815 SHA256 e2eecea357864a080ff8c757f4282b9ae6373acef4e6ed604b071f9c622cd7bd SHA512 ff9a978befebdc177000ce50252a89d2b9adf4e2ab92c7c87300c54cebe5ff160fd6619dd56f0432a6ec8a819a4f948aa3e99c06e37dc6650ed41fdce16daeb3 WHIRLPOOL 97a2dcfd07860920cad70e28641853272e3ff927ed7cdc6075a26065bbb2a017d94f2b39795ecdfa5c1ec70587fc6a7b88fd281b2f702cc3ddbf7d1475a1bba0
 AUX hosts.gentoo.tmpl 920 SHA256 a7d1a6e160bb05928bbb9f2b8cfcbc1fa60c3a33cd034b06f3f92ffe1126df37 SHA512 39e6bcdf40bd842a1d2e4ccd1c993b432016f7b3c4d5455b71896a16ee87a5d698e214919172f0a7e2f647156f5efe0964fed999dd193e4f16c944efdcc0f9c5 WHIRLPOOL 89ad898aa4479b9bc3dc3efc9a10d7be81c302e490e8548f3752af9d50cd688ef0f3202d2efeadf2e034fcf5ef39ef3a5e78f9ebfa308f79684dd0342686e94d
 DIST cloud-init-0.7.6.tar.gz 515670 SHA256 9e8fd22eb7f6e40ae6a5f66173ddc3cc18f65ee406c460a728092b37db2f3ed7 SHA512 aa2397328afda8e77ed6d642e7642f41a4b4b5bcd3d0e87056aa8c88b56624ec65c57cfc66b0d13ccc235f1840baf1d577316974902a0439cf2f2eb0f8eef36d WHIRLPOOL 639a556e51b4b4b180951f9e481f9a0dcd45067d1d5760ce7e871ceea8bbb4e195258d96273d3ef88c7e2f2520318e9172c3ad0cb23d6ad0ae1835e17087e3a5
@@ -12,8 +12,8 @@
 EBUILD cloud-init-0.7.6-r2.ebuild 1923 SHA256 dfbad5510b2ed6c3b439910cf67625dcd5fbbb6a5a7a562e98d34aeecd4c9464 SHA512 e41aab4a8cf25e934d9e86d54d03879d925d50f246f905f00bd89d9e943997f27ffa94292bcd05941d811a51006f8f9200a3ec01c5f2288f628f3f46d3bc6deb WHIRLPOOL 6b390b2d7ec8b037abaa28e8a14bb8437421218b48dfdf7d7d35406d1900c04a4c8abcf7eafcf4cd3729ee48f07f7680a26582331e0533e2c51c260ddaeda048
 EBUILD cloud-init-0.7.6_p1212.ebuild 1958 SHA256 7ee21d127fd8dd10ba546147ec58ee9917632ce86502946dd48e92e392f023f1 SHA512 b394e4de59ee5f65a97910851a71ccd19f595b4cca302b2b6b14aa358a046bacb0f6e3cc64b4efd2be302ea5dc8461f3f5c1bf11a08156341d8e8b7df98c782d WHIRLPOOL 58eb51808d173b27f796fe67f81d161d324c40e815a9e5fb7ec37a85d6f95bdd447f422ce9cd0b4c6f7e46d334a4be4b3a47714a905cde8d319ef17b8bfd8ff9
 EBUILD cloud-init-0.7.7.ebuild 2405 SHA256 90b6a5ef913fc0e4b9e6a325005fc5b47df42df800f2133357356bc3d02800b1 SHA512 8f32b96be14e35af4a0db8dd4a839291859fca1dc75d4b4f9ebf276179f8fe379c9a4a18bdd67098aadba97e7badf1815ae4704cb415313d9267746fddeaed23 WHIRLPOOL 106d7b15c7b39f49a294d71ebce0c32f129c52cd7d80cd271e45f85c537f27b30e5b7d889bff2b3c7f2a056042444ee1b5d6a2b3e1d0b97f4ded36c09004deb6
-EBUILD cloud-init-0.7.8.ebuild 2180 SHA256 590a6a95301bf486e0a9f6db82d2156f379faa9019547e43d03d42e0927bef02 SHA512 b36fffc3576ebb98f9a0a4d3006c8a71d60a7dbfea615c1c1194273a1b95aa042bd5454e52dd68958798e29ac0ecdb85576b64a6a182735ee261beea8378cfa4 WHIRLPOOL c7888825ab5127ff5b310c2668f7dc3c68560757b69f66953d70ebf1a5c2abf840d064c8ff37728d73e911b04983107a515b4482f1d28db658f594ec4ec99623
+EBUILD cloud-init-0.7.8-r1.ebuild 2475 SHA256 f8a4dbf81c1217dda0363b820a8a6b3cb3f628be036050162d88c34b12f7b6ad SHA512 40021cd586d6aa2d8600c6bc1090f73b63d217e17d3faa24afa9ae03db065de708f6f1ef4de7f999e008b5394b7c6d13242f8ded2c3884bc9c5e85d493b78061 WHIRLPOOL bbd3389bba37231d7d4138aefee3e10441e46a634f977254f50036a4a67024ff9b1b08e3279de4b67055d7d4722af32bb39d6f11712b77781d13a44d519382a1
 EBUILD cloud-init-9999.ebuild 2226 SHA256 2095569f04b58438552a097ba15ad422118a977a035985b130d77ad84a136906 SHA512 b4202d565e651412f85f750e620b0467b7a28a71f6663bdfe81750647e867c4185a029c4aecfa2edf73ff5ba9dd89d524b341ca24d400f5cf0a61523922b0302 WHIRLPOOL 441a6ba5580952abd895fb0f7ff61b2885ccd33b24c785647f5ea9ae394854f5769fbca821d34d92ea8067037f026c55421b548281fedd28992b52a7e1be0bc0
-MISC ChangeLog 5928 SHA256 f1e6ee5d5ba95c750e94f9aecc789ebe279a90feeae6c5c497dcf04342678a84 SHA512 04a932fb01e58eccdae6640d8aed7e251031ded160ae33e1fca860c5ae5e367ddf743c5df043a8067dfd63812f3de29875d612443e644c6b5f1a44e33e1976fa WHIRLPOOL 57e496ff428cdced765c74cdfb2d3ffbfb34717ec45449b2da2f686929b2b949b9efc891a1a669d924dc34633d7eb0b905bb80cd5e912677e9d31a14f279b890
+MISC ChangeLog 6321 SHA256 6827aba1d60badd5cca5d44c55033291eb99c1d98d3f6d2bd238a942ef06ac9e SHA512 cf30e71550bcf4d4c73d7c80691a973e8dbaaa726c5341389af3cd79d3f4e0f890d818bc2b6b9e2d2c31153669026c038e198f68382b7dab65495b55aca93f0d WHIRLPOOL 0fa6fd9fe30b196bbc3878616e7e85a377f96eb8f51a2eff5f7e7d7bd07a68654940f82a3c465d894bc6e6484cf86efcf18478234950f16cd507ced1c6ad4648
 MISC ChangeLog-2015 3361 SHA256 be1943a0d510b5b544b7e31cb630149f23093559da96b30c3933c073021b0bb7 SHA512 c2eea40c0d70371003e10986f5d674026dc325862d17793c60af3588ec81f6f54ba2d0402467e35f3c78c67d71203198029a2a1918fd028b36505277cb02c9ad WHIRLPOOL 711132a9e69fcb065186b293d3ceaef3febe8e0456466dff0d84ed497ed209ea1d144b6f20fa5b4982a5bb5eb9998c34b8ffb6f49ba23304cc35949b0015cb49
 MISC metadata.xml 662 SHA256 67e6f93e82f5ebd25c0c913568c1928e25135a7dc3badf967e4f54d6d0ad37d6 SHA512 c2a5eaa8c03116d4c91aaf8faaa5e5d0db354459241fed422cf54e4aab65fd987ee0649358bdd497ee831a468768cb76bd86f559308a34dadb6be1e55ac99f3a WHIRLPOOL ea923e925d0e8a4d10118ac284ceaec86de1ccbc87d1dfc1766dd3f7745ad1492ba9ce2fb0b028bdc80f23aec1a1cd2f2dfff851fd578c7b1bb00a74156c9db7
diff --git a/app-emulation/cloud-init/cloud-init-0.7.8.ebuild b/app-emulation/cloud-init/cloud-init-0.7.8-r1.ebuild
similarity index 87%
rename from app-emulation/cloud-init/cloud-init-0.7.8.ebuild
rename to app-emulation/cloud-init/cloud-init-0.7.8-r1.ebuild
index 2a4ecb7..b537380 100644
--- a/app-emulation/cloud-init/cloud-init-0.7.8.ebuild
+++ b/app-emulation/cloud-init/cloud-init-0.7.8-r1.ebuild
@@ -84,3 +84,10 @@
 	systemd_dounit "${S}"/systemd/cloud-init-local.service
 	systemd_dounit "${S}"/systemd/cloud-init.service
 }
+
+pkg_postinst() {
+	elog "cloud-init-local needs to be run in the boot runlevel because it"
+	elog "modifies services in the default runlevel.  When a runlevel is started"
+	elog "it is cached, so modifications that happen to the current runlevel"
+	elog "while you are in it are not acted upon."
+}
diff --git a/app-emulation/cloud-init/files/cloud-init-0.7.8-gentooinit.patch b/app-emulation/cloud-init/files/cloud-init-0.7.8-gentooinit.patch
index b80a60a..ff0e014 100644
--- a/app-emulation/cloud-init/files/cloud-init-0.7.8-gentooinit.patch
+++ b/app-emulation/cloud-init/files/cloud-init-0.7.8-gentooinit.patch
@@ -11,3 +11,28 @@
      scripts=['tools/cloud-init-per'],
      license='GPLv3',
      data_files=data_files,
+diff --git a/sysvinit/gentoo/cloud-init b/sysvinit/gentoo/cloud-init
+index 5afc0f2..531a715 100644
+--- a/sysvinit/gentoo/cloud-init
++++ b/sysvinit/gentoo/cloud-init
+@@ -2,6 +2,7 @@
+ # add depends for network, dns, fs etc
+ depend() {
+   after cloud-init-local
++  after net
+   before cloud-config
+   provide cloud-init
+ }
+diff --git a/sysvinit/gentoo/cloud-init-local b/sysvinit/gentoo/cloud-init-local
+index 9bd0b56..0f8cf65 100644
+--- a/sysvinit/gentoo/cloud-init-local
++++ b/sysvinit/gentoo/cloud-init-local
+@@ -2,7 +2,7 @@
+ 
+ depend() {
+   after localmount
+-  after netmount
++  before net
+   before cloud-init
+   provide cloud-init-local
+ }
diff --git a/app-shells/bash/ChangeLog b/app-shells/bash/ChangeLog
index f7ac1e3..f3d3d12 100644
--- a/app-shells/bash/ChangeLog
+++ b/app-shells/bash/ChangeLog
@@ -509,3 +509,39 @@
   RepoMan-Options: --include-arches="ia64"
   Signed-off-by: Agostino Sarubbo <ago@gentoo.org>
 
+*bash-4.3_p48 (07 Oct 2016)
+
+  07 Oct 2016; Lars Wendler <polynomial-c@gentoo.org> +bash-4.3_p48.ebuild:
+  Bump to version 4.3_p48
+
+  Package-Manager: portage-2.3.1
+  Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+
+  07 Oct 2016; Lars Wendler <polynomial-c@gentoo.org> -bash-4.3_p42-r1.ebuild,
+  -bash-4.3_p42-r2.ebuild, -bash-4.3_p46.ebuild:
+  Removed old.
+
+  Package-Manager: portage-2.3.1
+  Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+
+  07 Oct 2016; Lars Wendler <polynomial-c@gentoo.org> -bash-4.4_rc2.ebuild,
+  -files/bash-4.4-assign-crash.patch:
+  Removed rc version.
+
+  Package-Manager: portage-2.3.1
+  Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+
+  07 Oct 2016; Agostino Sarubbo <ago@gentoo.org> bash-4.3_p48.ebuild:
+  amd64 stable wrt bug #595268
+
+  Package-Manager: portage-2.2.28
+  RepoMan-Options: --include-arches="amd64"
+  Signed-off-by: Agostino Sarubbo <ago@gentoo.org>
+
+  07 Oct 2016; Agostino Sarubbo <ago@gentoo.org> bash-4.3_p48.ebuild:
+  x86 stable wrt bug #595268
+
+  Package-Manager: portage-2.2.28
+  RepoMan-Options: --include-arches="x86"
+  Signed-off-by: Agostino Sarubbo <ago@gentoo.org>
+
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index fb6a875..d7073ef 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -56,7 +56,6 @@
 AUX bash-4.3-mapfile-improper-array-name-validation.patch 407 SHA256 0302e96630afc5106ea446defd6890fb0b4c96bb27b375e8fbfd96b09eb10335 SHA512 214935a751c3275593654c36b471cbb47ca4f5bb6f2a19e0a7ff73b646e5318a861538bf923ebb5f84abafa6d0d6eeece7b2f36ef77ab8c582223e098b4eb356 WHIRLPOOL 3bf136afd45fe614e3429079b6f41102dda55390d4a3d190f4584aa189f8e623439c13f9efe623644d3990e0f5d2d1b90a8b61eee322f22050b3d5e63d8f5eda
 AUX bash-4.3-prompt-string-comsub.patch 3395 SHA256 33eeb827efffcac9362359b49c6552aeba56b53760c332ab038cd6c1fdd678d5 SHA512 1da0ca9fa9c9c9331c848342194f2c0b0ad590daa162d78d994f6ab79991c926c832ee71fad9550acf7099067b6b40e60169227ebca56cf450b95627b842929b WHIRLPOOL 3681415ea4c57b8a13fe25ce637b61a14ccaf2c1a8d5081b47baa29d2ae0f36a2d1b9dc58ff7ec5ba5b7c59dac38bace989e76f8dfa2d35d209df7e8916002ac
 AUX bash-4.3-protos.patch 174 SHA256 729aded4f907f4bad466785eed850b2b25a145e9ed75f0fc690190d5fccd387a SHA512 4af0540467bbcf7cf041de6fe6ed080b149a2ff309e5dbe5e7b76bb30459aaeead813be678384feb01a7b64d3a649372f8a8aaf686f69ac7958baa87b25340b0 WHIRLPOOL b1a5def9952b1f8ec4b9c3ff9df09672b2ad55a67a99890bc0796c87e23c1ec86c0eed50125d790120b6eea595f5aeabf981383323aac43b2f790587ec70685a
-AUX bash-4.4-assign-crash.patch 1163 SHA256 b440ae2ca03a040b766a01fc688eaa1b26b6a7a6044abd02a61f14dc68520dc4 SHA512 0ad1df868fe90e1524455c0c767bcb051826d4ed56d13c6a14c6a4a9b7232fcda5f225747f45e8023c4bf6b1caeed2b96900440fc3e2b7fd554c0c97b93aed2d WHIRLPOOL 9d8f7dfbd978d7359c4425a1a5f2e68175a14307300c51155f9f8dcc681995c581ef4a5704ce5db26d8d2316436e363830fa7a1338b0b13eb7e7317741a65bbb
 AUX bash-4.x-deferred-heredocs.patch 1255 SHA256 845ffcd7035eef5dc029747f211a737e0260b53b16086a37fb3c8ab3609a7d36 SHA512 9016203189d0b601f0441daec19f902de7387b599a2196c475d76c596dcf9a9c22765a58e7fc5a3117522ec2722475bd166bea271ff3048f31674e8bed2901a0 WHIRLPOOL f3a2ef5245c446b7e90917e987d80efba5e6437dbe86fc27bbd7768bc5f1e5f6e7663b350ca8a81a3f21a29af6e1594c14061be0d818fce6a4a63aed7efcb6fe
 AUX bash_logout 205 SHA256 15aaded954389c05d7de5d36c4887db61975ad52c87ad78baf1062ec8997289d SHA512 7234250c03fc920996a381f9daef9e2d8ab1e1a29acdebed6669d8e0fe1c872a7fa343adf7d9ddc81225b0cd9eb223ba7ad1ff42448aff057fc6d6baa8f04a7d WHIRLPOOL 16242c8796af44f550f2935b37c770c022754c63db75b57fbe49d1a313b8651235619ead571cd70ae37f890c694d1c6b2e4871ec51345743eff8649782d0523b
 AUX bashrc 3619 SHA256 056b82ffa8c5d96f8ffa983068f3969c436156c41d4e9c9174fcaec705effeae SHA512 6ee0ece1bdaeb4d3d56f610f418cf3e42990fc7725aae3dfd175cab5cb41bc40000a6c216f5f3f621b8636bb0e005c04823740d34ce93ce4d9e954a80b07d3f1 WHIRLPOOL b31e89fd09496eb277cfa83ee05993e910c8b78f77feeb0b1d9ce77beaa450452627b04ad1993cdc390683deb9e07fc8485ffb058c84bd70c09a45dd15953128
@@ -71,7 +70,6 @@
 DIST bash-4.1.tar.gz 6598300 SHA256 3f627124a83c6d34db503a923e20710d370573a29dd5d11d6f116d1aee7be1da SHA512 2f2a053d98be9a31cd089e1293e3369ad05406f6543d1d1662d8b5807fdcfebc1dda79db9bf2c596a6351ea463fb9bd9c8943c1d45da9b82f2fd3bab0b8a581a WHIRLPOOL 0259149d6f0d8f8a19e4b5a88e127c55efae0df4459063295aa6a9de69450b5f4b4b579894e4410ddfc0119eeb0356865b7cc4dbc7e4a75ad98acce0dfe2d46f
 DIST bash-4.2.tar.gz 7009201 SHA256 a27a1179ec9c0830c65c6aa5d7dab60f7ce1a2a608618570f96bfa72e95ab3d8 SHA512 fdd3c230f4f7a687d36db1b8f7baab5e553cf55756e2d49a88ffaa4260c8cb949897dec9f48655e96608ef0093ac101b60c132060f06c711c0ab81aa3f148b5c WHIRLPOOL fd5f321a8a89381904b1dd1f5acb5100186ce48cccc9b248cf68b35a1c1932177df1fc2b0215131999ee6018decf3264c45e54d407bf4b74ff8e4cc8215c630a
 DIST bash-4.3.tar.gz 7955839 SHA256 afc687a28e0e24dc21b988fa159ff9dbcf6b7caa92ade8645cc6d5605cd024d4 SHA512 a852b8e46ee55568dce9d23a30a9dbd1c770c2d2a4bc91e1c3177d723b31b32c5d69d19704a93f165891b409b9dd2cc65723372044e2bd0ee49ed59a11512651 WHIRLPOOL d82eb296b1bdee517b20e40d2231697dc41e2040d34e2da24c4fa40755c723d732929805ebef6f6923cd8ffecfb0db7063ec1dc3ab4e695a93916f2d872e236f
-DIST bash-4.4-rc2.tar.gz 8937485 SHA256 199ec0166d50a765eec74dc258b006b06cf6b59901d7ff40510c82aae37ad994 SHA512 e47cf16c98d2a22373d61ed4e8bae9951c10e04d9aefbcf3b2b8189db6f71314025ad73b6a93a1135a9714011f0e3517911c8e68a39e4a92bda4811441062b2f WHIRLPOOL ead4840dc6313be760f51be7fe611673c9a0e5ddcd76c3817fd173bfe41e213a4d73f4a41f2556023974a7880738f98c30f8f7bb4fd520f10d62a838aef6b650
 DIST bash-4.4.tar.gz 9377313 SHA256 d86b3392c1202e8ff5a423b302e6284db7f8f435ea9f39b5b1b20fd3ac36dfcb SHA512 73de3b425faaac55e45456b0f6f6d8077b5dfa7bb76e0d1894a19361b4a2b6bd4fbbe182117ddbfe9b07b4d898fba03537c261badc9533dd3c0da891764c7f29 WHIRLPOOL cb88bb6f565d66346f5eb358a179e52637a2ede2fda3358899730795f1ac6f9540d116202f2d0d1ebb9d983ad7054c5fbf9be8b06a1ca0b4fe1eb62bb30a15ce
 DIST bash205b-001 1132 SHA256 bf7a055e0916b7899e7429e36e35d009db445b942b34520a601ea5a8fa634fdd SHA512 5ce4357468821b05e747201f3aa57225ad8f540c9e2c87051720490e039c30b478b9b662a68f14a0800fefe40184e4495e2645665200f9d75e9a115b2ac08071 WHIRLPOOL 90ba36843bbf2e0b7279d3bd197ddaa04e03e113be32051e5a77280cda6d43dcbf339780c57322fc0835a54c82e0095f0d3f2a13f13fec8c0b8da38e7e9b253a
 DIST bash205b-002 755 SHA256 affdd1808a6262fbfe291ebffa2133b05e4bb46067a90e3329d5741e10f0587b SHA512 46947b0229478d5c2cfeff68b8ebc00e4ef0c8b94e336ca12f72b4490ba3622c0240c01c17c1641c3b07adc2c64ec94d6d780365e8990768ec8888f3a9526883 WHIRLPOOL 7333910e98e517306077937881d4c5569ddd85552203b3ec833f0fda13822e388ce85f007d60e4ab4b1ef15abb66fa40dc4356ca01367463d179a6a23bcff8e7
@@ -348,6 +346,8 @@
 DIST bash43-044 1658 SHA256 9338820630bf67373b44d8ea68409f65162ea7a47b9b29ace06a0aed12567f99 SHA512 2937ef80c99e93094e4aaa6a93d077efc3e433a4712c17e30590a0abeb5488293365cb8aa19e37d25b7d5c38d3ad26cdea12b904e5ffb2cdb16f18ab12f422fd WHIRLPOOL 488f567b900e49a9de9b92e9a8e29a92a087d390e9f24c3986bf1d89524878c88c7a3c2cae959844427fb20e6858a7b8eae112aac640f3d97ba1f79888f9f25d
 DIST bash43-045 1312 SHA256 ba6ec3978e9eaa1eb3fabdaf3cc6fdf8c4606ac1c599faaeb4e2d69864150023 SHA512 7b79dacff44e5358da736334d2277a2879ca1389e22e9dac50e139f30dab623bc89a56930d89e74efc468a00d051f6747ccaffcd1a30d7c737d49780b9830e3d WHIRLPOOL f361e523879ff1898574ac5eca480661bd787dc278fff204e7f27da89e85439b4e9d36a5f556046b760f3beb115302e745b5196bfa081b402d3f76fb44463558
 DIST bash43-046 1494 SHA256 b3b456a6b690cd293353f17e22d92a202b3c8bce587ae5f2667c20c9ab6f688f SHA512 c036b659fa681f8129110356bec33fad00fb8e469f3b4bcefd0b7ddf5e20030977716adf5c65f58f3ff68cd7af0bdd42392ee077100bc7f45ee123749d082f7d WHIRLPOOL d58384a2ca77f9a80a69a117221da51a701539cf5497d8e0fc634cd1cc0cb0024e02675bea810a0f42b873b557d479ba1b7aee6e6f73bd1422df2dbb29396477
+DIST bash43-047 4437 SHA256 c69248de7e78ba6b92f118fe1ef47bc86479d5040fe0b1f908ace1c9e3c67c4a SHA512 9332d680ac226491cf8e5986a3261eb76b53ef4b0b2a43405564b088afc0e8658077812c9177bdab7900e05394e69f3047d82ddb59553fc01ef721acfa9d5553 WHIRLPOOL 719fa31d0fb09a75d5abbb63ee5a485802c5eadd06720d6074c2282d117aa6e234f5f75cabd340643710bd14e99260047183386bd1df278c9715aed7b98232d7
+DIST bash43-048 1612 SHA256 5b8215451c5d096ca1e115307ffe6613553551a70369525a0778f216c3a4dfa2 SHA512 7c3963bfbc730b4592668460e86c166e727e9897c1a9235a6860a01bc90d365ef0707f0fac7ed62780dcc84e80dbe8484ec59e9e948def22f44ae03e8a169780 WHIRLPOOL e1a435c3b9fbc0deca80dd89bfd3adcbff1d5a3af50884d2aef54635b8ba1063903e2d99a5a23bd1c64c19c5e9c19de6b479ac777cecdb812555dc5683b8cf71
 EBUILD bash-2.05b_p13.ebuild 4632 SHA256 4ca7ca4d432e2cf9ef15fc6f29599a2c74e312470754d11e173d928b47ae3297 SHA512 155aa055b210b6af3debbd1473760d33bce26be0b0f0bba156fdd0740374213bed7768c5b681eba1d70913385bd71859d358ac0da1d07c0c7c6dfc6a99dcc63c WHIRLPOOL 23a4c316f23d409bd99b841ca42a3dd6d7310e18f92c362ea13c9d63cb53c26876b2bddd651f0ef2af158156914cfd3b6efa5651bcfa4000236f3b2b57ceb5b5
 EBUILD bash-3.0_p22.ebuild 4765 SHA256 1e7b3e90cee3a2da0046f20b23f625c38284448f5eea252d01e92b08fdc6c4c1 SHA512 3fbaaf25cec9555200c712065a8f306c09d721f5240cdaae2b442cb412d6d8aec39255c931007316520757eca4d58983b1182956d04407d0ccb780959e7598af WHIRLPOOL aac3166bb7bfc7220f7546f4a1f231e3b622d487c4b8ae1c98b0fd59e8881d282b5f3037b31ff9f5e19f18af515cf7d16678ba488f1e379eb8d0dc224b312357
 EBUILD bash-3.1_p23.ebuild 4446 SHA256 82142de41f1323bfbdc12f70ba0226066585f49d34909a17baf9ce57c2ee2335 SHA512 c889b66620f1d1de4443d0040347218d035bb70fcc4a88405cd33faefbd130088aaae1a6c0623262f43a2a0275fead4d3c47e9fc624ed3d329d7e9b8a2e1c6a8 WHIRLPOOL d1f4ee34466f65a20f2f6d20112b23bd26c66a69e1e2ac455d55b25f57c14b62cd770af6ab090b1879af0860c524ed742d5bfe769330fa773945cf941f4001f7
@@ -356,12 +356,9 @@
 EBUILD bash-4.1_p17.ebuild 4161 SHA256 230a2c913130e23c900fd2bc6c993fe840f0b2b615703717949e0b2fca7a8e55 SHA512 7c1b2c490cded423b32434a596de7bb1f55c329d0d70e5030ade68e645c6fd94dfd95dd37908403e2ccf2a821ab0246e3e9c31d1682dbc4b313318b914c8e72d WHIRLPOOL e710903ff055bde7c85e7a663ce5f09a4c78f78cc158ecf9f6f0cdc91068268d82e0c9f356ad98b9d0b4fee17d987df75012c2843513a276b31a4075bf68ab2e
 EBUILD bash-4.2_p53.ebuild 4363 SHA256 5f40d4bde8f80fb93f3cc91296b70c85e46c6731544efbe9c9cc5cd764551887 SHA512 6ab16a90d2ebcc1b6e6b1f500143ffcf402732e7cf322ab58d3832c27d6691c932152b48c4c3ddfdbe56544c5707e4477e1bf13efe84e89bc07e6c36adc83cb6 WHIRLPOOL 80af09fe47b9380bed03952f9cf03d3d8c55bc8820873d2132fccf9b9e1463383012591beea37c2f724ac91ee3474f3ffd2cbc7e7da34316c2a50c0a15600352
 EBUILD bash-4.3_p39_pre0.ebuild 3588 SHA256 138193a32dddeafb1554acaea79a5310fcb3f574f6e2465576d61c7d74082faa SHA512 b6a908d862ee1930c9cdd7a224cb6b157c4320529c5578fdb0e874e30547f737478318e418ee5b4ea7c226ff5fdbb21f9870fd307650aa620589232992c2a1c1 WHIRLPOOL 48dd19ebcc8c57e354ced98a23ec6afbd7be34df3bfae2f582e1e6cf924b65a76813b8bfa00f165c210e1fe1ae1264ef2f43ad7e82911dee3b93c1a9edfebbc8
-EBUILD bash-4.3_p42-r1.ebuild 7139 SHA256 e3febac20279ef23bd8ea8cfdbb2fbde205bd5f4a88cc20399c127e752eae816 SHA512 372a20b5f49a8933bd765699bd136aebba50e4e0ab00037a0cd674a2da54087845c6b125a5b03704b02938ff716303039bb8892a3a7dccacfdb9d0aa33fb8679 WHIRLPOOL 07aa549760c3ef05983cc0dfa36d14625abaf817ca139b2ded2d50979727acc25e7e37e2f128bcec236ccfae600c60c0f3850688f43bdaba637a29d7e1a904ac
-EBUILD bash-4.3_p42-r2.ebuild 7272 SHA256 ac62a605dc59955343ed1c4a7fa0dee71c6dd56eebe1f7eb16b67c2c7b8737da SHA512 d7394a26e7912efb4312c17d6b0f0fd56fd35f82df04c7abf89dd246a5c1cd450066e1ff0bc0b23b3de03f6c959f2a111b411b97d301cb1872ecf31ac7d85a4a WHIRLPOOL 3dd2d18ab65721e704f5f7d431e377a0cf39707d02e65f0775f1b8f77b75874e3fc853fe1de79c14906f3af7060b73209e337ddf621bbf6f3ecfd7096b90d24d
 EBUILD bash-4.3_p46-r1.ebuild 7302 SHA256 03e5e1fd4f9d4299ddd4695ed098173ad383f44718ca63be50fa7b5e297f1c63 SHA512 99c50dc7f5da161420485e57770cafed2160bf32cfdc8467919ae617b9f63c59ca5e397d8cbb514622eeadcd278a27b39e2ebe9889fb46d16e9ab2d903699abb WHIRLPOOL 6e1ea55865b303497109f80392fad59f9e5374666f3d319ceba60751d4e3ac8a6ba96272cd0ce376d3597a815ad80561df96d364d80c6c2c59f6587cdfcbf840
-EBUILD bash-4.3_p46.ebuild 7206 SHA256 fb5b9c2a677ae83f90b2aad430884d29ad5e674212f36962ede4bdf847750b62 SHA512 a2014f9e29e53252e8e83e6501d476bd3ba5067488e27821bf24787583577b393908ee6b84afe0b142b5d0ed2aaf89497fe7523f5304f36d974df3cec1422b39 WHIRLPOOL 667df5a1cda45a8cdac3d8fe8746d90ef69e5d98bd43773121a5d2448355ae206775c117aaa57270bb07b867755a45b18a36777867596ee5511226b7ab7a5edc
+EBUILD bash-4.3_p48.ebuild 7226 SHA256 f2524eb991fdbba2ee72ca09ad3460c258e9123c4bcb60b1f5352d85c7995127 SHA512 2442cc5271f12ca8fd1eb0d7453effa383a1d34f3e1dc1424145ccb077325b25d500ed2e1e578f37f05cd502900ace0bb850e03e5435d70efdd63802bab6b49a WHIRLPOOL d00b81e134fb2a0c77cf827d61272f0ba2550fd57c0b0f73df9c1abfb2846e5be99b1391b55e7036ae62015ba77df0797fdb32533776fbe28ea1a0b6d71c473e
 EBUILD bash-4.4.ebuild 7046 SHA256 5d9d50dfcdb04e390da529e03ff5d75fc743468f73f0d6c0c099216290981274 SHA512 b7bee4f8f74d5917d7fcb0c63d19086a1acb2d5bc25becb2352d2277a7413e0b5acf8550eaf1e6e7f0b3dcc9142c7b9db6dcd296629f692d993c395d96eff53c WHIRLPOOL e17b34e7d130e3fdf5b2ebf3ba775d651943b244c5c691ff57cdcda5ade3adb88b9a70db05074c1d65a8829cffb6dc9d60ebbcd66d7bba64da16874876c54c82
-EBUILD bash-4.4_rc2.ebuild 7047 SHA256 4cf42eca6dca354b34c744fe45d737acf3d570c180e86412780439c2f718d206 SHA512 d98546e1a98fab2b8f5a2d9c8df5b1c4a87bb2b9a0fac23e6fc41b725a16f9181173b0be18f6d328c20abe00be575b50c879b14b8e53725fdbfd9622d37889a8 WHIRLPOOL 5518d74db5e005cf47823c56863a2bcc7a82181134bd509a73cb5627bdcd17670f5e82f8a9d894ddeacb423e0da4254be3e623447331424bea570dc8a0dbf14a
-MISC ChangeLog 19600 SHA256 641c6376b0906174c6241a1a991af657d4c46571f892acfdbd91ced99828e9dc SHA512 728208438ac02c6b93a751dd3da9ff6f97e558a801f25221dc5bc7fbc9af11fcb59b7bdba2f44bf8d67a950dfb4a9c261e2aa22d5c2f3d2b2329141fa305d585 WHIRLPOOL 59ccc41a2c4aa152cffcec1ec3ba3123557fccfc5692db6260a87953ab80da4c3dd3e3d9bcee0d814f6196a8500801d5c354df0bf18e08a92b90db9a768789b1
+MISC ChangeLog 20743 SHA256 226ed2103b7df63626ff90434a399d6b5025a56f06f0a32665470874364afded SHA512 cfa22a970b6e9908e5b06a3a44f4568be1b8b0849689745d3de8d0e56568e668d2126674ef35272964aae208e0eed3cc17bed2ce6acb5cfd5ab01be1630ca231 WHIRLPOOL 27ca29143c1a090772946e1e7a8a35306a4abca81ba2edc99c67c694416ae83697470511fa999c10ddb2518d57c6a7da45ff8d8c164d6e9ddf0060fff8839489
 MISC ChangeLog-2015 75298 SHA256 51ab8cfa0add2586982824d436caf2442369f4f1229b99b9323b90a1f1a8c7fc SHA512 ce206ffc7817b15cfafc589de1799a50d6ad91d0ac9913b1164273ab63c971217bc04bfcb90c5208dc42e6ffca21fe97b65d8f19b861641d20b2403b05d1e957 WHIRLPOOL 1fab776c7e3c790021335e31e3d9ba0a3c2e2606aeba16d7b556586f8a5fa74137f4a17850367d42fa3909d83391fdc97e00c5ae6180c7d9c5be15417b18d29a
 MISC metadata.xml 734 SHA256 7850abd55e656b9360deafb278c98598922eb3b6f884d024d199110afdcf6ff0 SHA512 a9301e8d2347e0cf90a97325d9a705076150c00609d28338e5d7d72c135468e4f0531b2a4077b69679ae6ccf89eee691e0e5f0748caab60689f5f017afb544f1 WHIRLPOOL ce0e36bc0ae83b73aee7abee391d1b0a384f0277dfb7f7282043624a523699685d866ef3291a02e9ad1bde3abf196b47e1351f646e0149f942a40ed4dc940a37
diff --git a/app-shells/bash/bash-4.3_p42-r1.ebuild b/app-shells/bash/bash-4.3_p42-r1.ebuild
deleted file mode 100644
index 6c14466..0000000
--- a/app-shells/bash/bash-4.3_p42-r1.ebuild
+++ /dev/null
@@ -1,249 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit eutils flag-o-matic toolchain-funcs multilib
-
-# Official patchlevel
-# See ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/
-PLEVEL=${PV##*_p}
-MY_PV=${PV/_p*}
-MY_PV=${MY_PV/_/-}
-MY_P=${PN}-${MY_PV}
-[[ ${PV} != *_p* ]] && PLEVEL=0
-patches() {
-	local opt=$1 plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}}
-	[[ ${plevel} -eq 0 ]] && return 1
-	eval set -- {1..${plevel}}
-	set -- $(printf "${pn}${pv/\.}-%03d " "$@")
-	if [[ ${opt} == -s ]] ; then
-		echo "${@/#/${DISTDIR}/}"
-	else
-		local u
-		for u in ftp://ftp.cwru.edu/pub/bash mirror://gnu/${pn} ; do
-			printf "${u}/${pn}-${pv}-patches/%s " "$@"
-		done
-	fi
-}
-
-# The version of readline this bash normally ships with.
-READLINE_VER="6.3"
-
-DESCRIPTION="The standard GNU Bourne again shell"
-HOMEPAGE="http://tiswww.case.edu/php/chet/bash/bashtop.html"
-SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
-[[ ${PV} == *_rc* ]] && SRC_URI+=" ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline vanilla"
-
-DEPEND=">=sys-libs/ncurses-5.2-r2
-	readline? ( >=sys-libs/readline-${READLINE_VER} )
-	nls? ( virtual/libintl )"
-RDEPEND="${DEPEND}
-	!<sys-apps/portage-2.1.6.7_p1
-	!<sys-apps/paludis-0.26.0_alpha5"
-# we only need yacc when the .y files get patched (bash42-005)
-DEPEND+=" virtual/yacc"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	if is-flag -malign-double ; then #7332
-		eerror "Detected bad CFLAGS '-malign-double'.  Do not use this"
-		eerror "as it breaks LFS (struct stat64) on x86."
-		die "remove -malign-double from your CFLAGS mr ricer"
-	fi
-	if use bashlogger ; then
-		ewarn "The logging patch should ONLY be used in restricted (i.e. honeypot) envs."
-		ewarn "This will log ALL output you enter into the shell, you have been warned."
-	fi
-}
-
-src_unpack() {
-	unpack ${MY_P}.tar.gz
-}
-
-src_prepare() {
-	# Include official patches
-	[[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s)
-
-	# Clean out local libs so we know we use system ones w/releases.
-	if [[ ${PV} != *_rc* ]] ; then
-		rm -rf lib/{readline,termcap}/*
-		touch lib/{readline,termcap}/Makefile.in # for config.status
-		sed -ri -e 's:\$[(](RL|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in || die
-	fi
-
-	# Avoid regenerating docs after patches #407985
-	sed -i -r '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in || die
-	touch -r . doc/*
-
-	epatch "${FILESDIR}"/${PN}-4.3-compat-lvl.patch
-	epatch "${FILESDIR}"/${PN}-4.3-append-process-segfault.patch
-	epatch "${FILESDIR}"/${PN}-4.3-mapfile-improper-array-name-validation.patch
-	epatch "${FILESDIR}"/${PN}-4.3-arrayfunc.patch
-
-	epatch_user
-}
-
-src_configure() {
-	local myconf=()
-
-	# For descriptions of these, see config-top.h
-	# bashrc/#26952 bash_logout/#90488 ssh/#24762 mktemp/#574426
-	append-cppflags \
-		-DDEFAULT_PATH_VALUE=\'\"/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin\"\' \
-		-DSTANDARD_UTILS_PATH=\'\"/bin:/usr/bin:/sbin:/usr/sbin\"\' \
-		-DSYS_BASHRC=\'\"/etc/bash/bashrc\"\' \
-		-DSYS_BASH_LOGOUT=\'\"/etc/bash/bash_logout\"\' \
-		-DNON_INTERACTIVE_LOGIN_SHELLS \
-		-DSSH_SOURCE_BASHRC \
-		-DUSE_MKTEMP -DUSE_MKSTEMP \
-		$(use bashlogger && echo -DSYSLOG_HISTORY)
-
-	# Don't even think about building this statically without
-	# reading Bug 7714 first.  If you still build it statically,
-	# don't come crying to us with bugs ;).
-	#use static && export LDFLAGS="${LDFLAGS} -static"
-	use nls || myconf+=( --disable-nls )
-
-	# Historically, we always used the builtin readline, but since
-	# our handling of SONAME upgrades has gotten much more stable
-	# in the PM (and the readline ebuild itself preserves the old
-	# libs during upgrades), linking against the system copy should
-	# be safe.
-	# Exact cached version here doesn't really matter as long as it
-	# is at least what's in the DEPEND up above.
-	export ac_cv_rl_version=${READLINE_VER}
-
-	# Force linking with system curses ... the bundled termcap lib
-	# sucks bad compared to ncurses.  For the most part, ncurses
-	# is here because readline needs it.  But bash itself calls
-	# ncurses in one or two small places :(.
-
-	if [[ ${PV} != *_rc* ]] ; then
-		# Use system readline only with released versions.
-		myconf+=( --with-installed-readline=. )
-	fi
-
-	if use plugins; then
-		append-ldflags -Wl,-rpath,/usr/$(get_libdir)/bash
-	else
-		# Disable the plugins logic by hand since bash doesn't
-		# provide a way of doing it.
-		export ac_cv_func_dl{close,open,sym}=no \
-			ac_cv_lib_dl_dlopen=no ac_cv_header_dlfcn_h=no
-		sed -i \
-			-e '/LOCAL_LDFLAGS=/s:-rdynamic::' \
-			configure || die
-	fi
-	tc-export AR #444070
-	econf \
-		--docdir='$(datarootdir)'/doc/${PF} \
-		--htmldir='$(docdir)/html' \
-		--with-curses \
-		$(use_with afs) \
-		$(use_enable net net-redirections) \
-		--disable-profiling \
-		$(use_enable mem-scramble) \
-		$(use_with mem-scramble bash-malloc) \
-		$(use_enable readline) \
-		$(use_enable readline history) \
-		$(use_enable readline bang-history) \
-		"${myconf[@]}"
-}
-
-src_compile() {
-	emake
-
-	if use plugins ; then
-		emake -C examples/loadables all others
-	fi
-}
-
-src_install() {
-	local d f
-
-	default
-
-	dodir /bin
-	mv "${ED}"/usr/bin/bash "${ED}"/bin/ || die
-	dosym bash /bin/rbash
-
-	insinto /etc/bash
-	doins "${FILESDIR}"/bash_logout
-	doins "${FILESDIR}"/bashrc
-	keepdir /etc/bash/bashrc.d
-	insinto /etc/skel
-	for f in bash{_logout,_profile,rc} ; do
-		newins "${FILESDIR}"/dot-${f} .${f}
-	done
-
-	local sed_args=(
-		-e "s:#${USERLAND}#@::"
-		-e '/#@/d'
-	)
-	if ! use readline ; then
-		sed_args+=( #432338
-			-e '/^shopt -s histappend/s:^:#:'
-			-e 's:use_color=true:use_color=false:'
-		)
-	fi
-	sed -i \
-		"${sed_args[@]}" \
-		"${ED}"/etc/skel/.bashrc \
-		"${ED}"/etc/bash/bashrc || die
-
-	if use plugins ; then
-		exeinto /usr/$(get_libdir)/bash
-		doexe $(echo examples/loadables/*.o | sed 's:\.o::g')
-		insinto /usr/include/bash-plugins
-		doins *.h builtins/*.h include/*.h lib/{glob/glob.h,tilde/tilde.h}
-	fi
-
-	if use examples ; then
-		for d in examples/{functions,misc,scripts,startup-files} ; do
-			exeinto /usr/share/doc/${PF}/${d}
-			insinto /usr/share/doc/${PF}/${d}
-			for f in ${d}/* ; do
-				if [[ ${f##*/} != PERMISSION ]] && [[ ${f##*/} != *README ]] ; then
-					doexe ${f}
-				else
-					doins ${f}
-				fi
-			done
-		done
-	fi
-
-	doman doc/*.1
-	newdoc CWRU/changelog ChangeLog
-	dosym bash.info /usr/share/info/bashref.info
-}
-
-pkg_preinst() {
-	if [[ -e ${EROOT}/etc/bashrc ]] && [[ ! -d ${EROOT}/etc/bash ]] ; then
-		mkdir -p "${EROOT}"/etc/bash
-		mv -f "${EROOT}"/etc/bashrc "${EROOT}"/etc/bash/
-	fi
-
-	if [[ -L ${EROOT}/bin/sh ]] ; then
-		# rewrite the symlink to ensure that its mtime changes. having /bin/sh
-		# missing even temporarily causes a fatal error with paludis.
-		local target=$(readlink "${EROOT}"/bin/sh)
-		local tmp=$(emktemp "${EROOT}"/bin)
-		ln -sf "${target}" "${tmp}"
-		mv -f "${tmp}" "${EROOT}"/bin/sh
-	fi
-}
-
-pkg_postinst() {
-	# If /bin/sh does not exist, provide it
-	if [[ ! -e ${EROOT}/bin/sh ]] ; then
-		ln -sf bash "${EROOT}"/bin/sh
-	fi
-}
diff --git a/app-shells/bash/bash-4.3_p42-r2.ebuild b/app-shells/bash/bash-4.3_p42-r2.ebuild
deleted file mode 100644
index 19fc224..0000000
--- a/app-shells/bash/bash-4.3_p42-r2.ebuild
+++ /dev/null
@@ -1,249 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit eutils flag-o-matic toolchain-funcs multilib
-
-# Official patchlevel
-# See ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/
-PLEVEL=${PV##*_p}
-MY_PV=${PV/_p*}
-MY_PV=${MY_PV/_/-}
-MY_P=${PN}-${MY_PV}
-[[ ${PV} != *_p* ]] && PLEVEL=0
-patches() {
-	local opt=$1 plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}}
-	[[ ${plevel} -eq 0 ]] && return 1
-	eval set -- {1..${plevel}}
-	set -- $(printf "${pn}${pv/\.}-%03d " "$@")
-	if [[ ${opt} == -s ]] ; then
-		echo "${@/#/${DISTDIR}/}"
-	else
-		local u
-		for u in ftp://ftp.cwru.edu/pub/bash mirror://gnu/${pn} ; do
-			printf "${u}/${pn}-${pv}-patches/%s " "$@"
-		done
-	fi
-}
-
-# The version of readline this bash normally ships with.
-READLINE_VER="6.3"
-
-DESCRIPTION="The standard GNU Bourne again shell"
-HOMEPAGE="http://tiswww.case.edu/php/chet/bash/bashtop.html"
-SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
-[[ ${PV} == *_rc* ]] && SRC_URI+=" ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline vanilla"
-
-DEPEND=">=sys-libs/ncurses-5.2-r2
-	readline? ( >=sys-libs/readline-${READLINE_VER} )
-	nls? ( virtual/libintl )"
-RDEPEND="${DEPEND}
-	!<sys-apps/portage-2.1.6.7_p1
-	!<sys-apps/paludis-0.26.0_alpha5"
-# we only need yacc when the .y files get patched (bash42-005)
-DEPEND+=" virtual/yacc"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	if is-flag -malign-double ; then #7332
-		eerror "Detected bad CFLAGS '-malign-double'.  Do not use this"
-		eerror "as it breaks LFS (struct stat64) on x86."
-		die "remove -malign-double from your CFLAGS mr ricer"
-	fi
-	if use bashlogger ; then
-		ewarn "The logging patch should ONLY be used in restricted (i.e. honeypot) envs."
-		ewarn "This will log ALL output you enter into the shell, you have been warned."
-	fi
-}
-
-src_unpack() {
-	unpack ${MY_P}.tar.gz
-}
-
-src_prepare() {
-	# Include official patches
-	[[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s)
-
-	# Clean out local libs so we know we use system ones w/releases.
-	if [[ ${PV} != *_rc* ]] ; then
-		rm -rf lib/{readline,termcap}/*
-		touch lib/{readline,termcap}/Makefile.in # for config.status
-		sed -ri -e 's:\$[(](RL|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in || die
-	fi
-
-	# Avoid regenerating docs after patches #407985
-	sed -i -r '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in || die
-	touch -r . doc/*
-
-	epatch "${FILESDIR}"/${PN}-4.3-compat-lvl.patch
-	epatch "${FILESDIR}"/${PN}-4.3-append-process-segfault.patch
-	epatch "${FILESDIR}"/${PN}-4.3-mapfile-improper-array-name-validation.patch
-	epatch "${FILESDIR}"/${PN}-4.3-arrayfunc.patch
-
-	epatch_user
-}
-
-src_configure() {
-	local myconf=()
-
-	# For descriptions of these, see config-top.h
-	# bashrc/#26952 bash_logout/#90488 ssh/#24762 mktemp/#574426
-	append-cppflags \
-		-DDEFAULT_PATH_VALUE=\'\"${EPREFIX}/usr/local/sbin:${EPREFIX}/usr/local/bin:${EPREFIX}/usr/sbin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/bin\"\' \
-		-DSTANDARD_UTILS_PATH=\'\"${EPREFIX}/bin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/usr/sbin\"\' \
-		-DSYS_BASHRC=\'\"${EPREFIX}/etc/bash/bashrc\"\' \
-		-DSYS_BASH_LOGOUT=\'\"${EPREFIX}/etc/bash/bash_logout\"\' \
-		-DNON_INTERACTIVE_LOGIN_SHELLS \
-		-DSSH_SOURCE_BASHRC \
-		-DUSE_MKTEMP -DUSE_MKSTEMP \
-		$(use bashlogger && echo -DSYSLOG_HISTORY)
-
-	# Don't even think about building this statically without
-	# reading Bug 7714 first.  If you still build it statically,
-	# don't come crying to us with bugs ;).
-	#use static && export LDFLAGS="${LDFLAGS} -static"
-	use nls || myconf+=( --disable-nls )
-
-	# Historically, we always used the builtin readline, but since
-	# our handling of SONAME upgrades has gotten much more stable
-	# in the PM (and the readline ebuild itself preserves the old
-	# libs during upgrades), linking against the system copy should
-	# be safe.
-	# Exact cached version here doesn't really matter as long as it
-	# is at least what's in the DEPEND up above.
-	export ac_cv_rl_version=${READLINE_VER}
-
-	# Force linking with system curses ... the bundled termcap lib
-	# sucks bad compared to ncurses.  For the most part, ncurses
-	# is here because readline needs it.  But bash itself calls
-	# ncurses in one or two small places :(.
-
-	if [[ ${PV} != *_rc* ]] ; then
-		# Use system readline only with released versions.
-		myconf+=( --with-installed-readline=. )
-	fi
-
-	if use plugins; then
-		append-ldflags -Wl,-rpath,/usr/$(get_libdir)/bash
-	else
-		# Disable the plugins logic by hand since bash doesn't
-		# provide a way of doing it.
-		export ac_cv_func_dl{close,open,sym}=no \
-			ac_cv_lib_dl_dlopen=no ac_cv_header_dlfcn_h=no
-		sed -i \
-			-e '/LOCAL_LDFLAGS=/s:-rdynamic::' \
-			configure || die
-	fi
-	tc-export AR #444070
-	econf \
-		--docdir='$(datarootdir)'/doc/${PF} \
-		--htmldir='$(docdir)/html' \
-		--with-curses \
-		$(use_with afs) \
-		$(use_enable net net-redirections) \
-		--disable-profiling \
-		$(use_enable mem-scramble) \
-		$(use_with mem-scramble bash-malloc) \
-		$(use_enable readline) \
-		$(use_enable readline history) \
-		$(use_enable readline bang-history) \
-		"${myconf[@]}"
-}
-
-src_compile() {
-	emake
-
-	if use plugins ; then
-		emake -C examples/loadables all others
-	fi
-}
-
-src_install() {
-	local d f
-
-	default
-
-	dodir /bin
-	mv "${ED}"/usr/bin/bash "${ED}"/bin/ || die
-	dosym bash /bin/rbash
-
-	insinto /etc/bash
-	doins "${FILESDIR}"/bash_logout
-	doins "${FILESDIR}"/bashrc
-	keepdir /etc/bash/bashrc.d
-	insinto /etc/skel
-	for f in bash{_logout,_profile,rc} ; do
-		newins "${FILESDIR}"/dot-${f} .${f}
-	done
-
-	local sed_args=(
-		-e "s:#${USERLAND}#@::"
-		-e '/#@/d'
-	)
-	if ! use readline ; then
-		sed_args+=( #432338
-			-e '/^shopt -s histappend/s:^:#:'
-			-e 's:use_color=true:use_color=false:'
-		)
-	fi
-	sed -i \
-		"${sed_args[@]}" \
-		"${ED}"/etc/skel/.bashrc \
-		"${ED}"/etc/bash/bashrc || die
-
-	if use plugins ; then
-		exeinto /usr/$(get_libdir)/bash
-		doexe $(echo examples/loadables/*.o | sed 's:\.o::g')
-		insinto /usr/include/bash-plugins
-		doins *.h builtins/*.h include/*.h lib/{glob/glob.h,tilde/tilde.h}
-	fi
-
-	if use examples ; then
-		for d in examples/{functions,misc,scripts,startup-files} ; do
-			exeinto /usr/share/doc/${PF}/${d}
-			insinto /usr/share/doc/${PF}/${d}
-			for f in ${d}/* ; do
-				if [[ ${f##*/} != PERMISSION ]] && [[ ${f##*/} != *README ]] ; then
-					doexe ${f}
-				else
-					doins ${f}
-				fi
-			done
-		done
-	fi
-
-	doman doc/*.1
-	newdoc CWRU/changelog ChangeLog
-	dosym bash.info /usr/share/info/bashref.info
-}
-
-pkg_preinst() {
-	if [[ -e ${EROOT}/etc/bashrc ]] && [[ ! -d ${EROOT}/etc/bash ]] ; then
-		mkdir -p "${EROOT}"/etc/bash
-		mv -f "${EROOT}"/etc/bashrc "${EROOT}"/etc/bash/
-	fi
-
-	if [[ -L ${EROOT}/bin/sh ]] ; then
-		# rewrite the symlink to ensure that its mtime changes. having /bin/sh
-		# missing even temporarily causes a fatal error with paludis.
-		local target=$(readlink "${EROOT}"/bin/sh)
-		local tmp=$(emktemp "${EROOT}"/bin)
-		ln -sf "${target}" "${tmp}"
-		mv -f "${tmp}" "${EROOT}"/bin/sh
-	fi
-}
-
-pkg_postinst() {
-	# If /bin/sh does not exist, provide it
-	if [[ ! -e ${EROOT}/bin/sh ]] ; then
-		ln -sf bash "${EROOT}"/bin/sh
-	fi
-}
diff --git a/app-shells/bash/bash-4.3_p46.ebuild b/app-shells/bash/bash-4.3_p48.ebuild
similarity index 94%
rename from app-shells/bash/bash-4.3_p46.ebuild
rename to app-shells/bash/bash-4.3_p48.ebuild
index dd22287..a0b4fae 100644
--- a/app-shells/bash/bash-4.3_p46.ebuild
+++ b/app-shells/bash/bash-4.3_p48.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="4"
+EAPI="5"
 
 inherit eutils flag-o-matic toolchain-funcs multilib
 
@@ -38,11 +38,11 @@
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline vanilla"
 
-DEPEND=">=sys-libs/ncurses-5.2-r2
-	readline? ( >=sys-libs/readline-${READLINE_VER} )
+DEPEND=">=sys-libs/ncurses-5.2-r2:0=
+	readline? ( >=sys-libs/readline-${READLINE_VER}:0= )
 	nls? ( virtual/libintl )"
 RDEPEND="${DEPEND}
 	!<sys-apps/portage-2.1.6.7_p1
@@ -50,6 +50,12 @@
 # we only need yacc when the .y files get patched (bash42-005)
 DEPEND+=" virtual/yacc"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.3-mapfile-improper-array-name-validation.patch
+	"${FILESDIR}"/${PN}-4.3-arrayfunc.patch
+	"${FILESDIR}"/${PN}-4.3-protos.patch
+)
+
 S=${WORKDIR}/${MY_P}
 
 pkg_setup() {
@@ -83,9 +89,7 @@
 	sed -i -r '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in || die
 	touch -r . doc/*
 
-	epatch "${FILESDIR}"/${PN}-4.3-mapfile-improper-array-name-validation.patch
-	epatch "${FILESDIR}"/${PN}-4.3-arrayfunc.patch
-	epatch "${FILESDIR}"/${PN}-4.3-protos.patch
+	epatch "${PATCHES[@]}"
 
 	epatch_user
 }
diff --git a/app-shells/bash/bash-4.4_rc2.ebuild b/app-shells/bash/bash-4.4_rc2.ebuild
deleted file mode 100644
index 30a5023..0000000
--- a/app-shells/bash/bash-4.4_rc2.ebuild
+++ /dev/null
@@ -1,245 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils flag-o-matic toolchain-funcs multilib
-
-# Official patchlevel
-# See ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/
-PLEVEL=${PV##*_p}
-MY_PV=${PV/_p*}
-MY_PV=${MY_PV/_/-}
-MY_P=${PN}-${MY_PV}
-[[ ${PV} != *_p* ]] && PLEVEL=0
-patches() {
-	local opt=$1 plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}}
-	[[ ${plevel} -eq 0 ]] && return 1
-	eval set -- {1..${plevel}}
-	set -- $(printf "${pn}${pv/\.}-%03d " "$@")
-	if [[ ${opt} == -s ]] ; then
-		echo "${@/#/${DISTDIR}/}"
-	else
-		local u
-		for u in ftp://ftp.cwru.edu/pub/bash mirror://gnu/${pn} ; do
-			printf "${u}/${pn}-${pv}-patches/%s " "$@"
-		done
-	fi
-}
-
-# The version of readline this bash normally ships with.
-READLINE_VER="7.0_rc2"
-
-DESCRIPTION="The standard GNU Bourne again shell"
-HOMEPAGE="http://tiswww.case.edu/php/chet/bash/bashtop.html"
-case ${PV} in
-*_alpha*|*_beta*|*_rc*) SRC_URI+=" ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz" ;;
-*) SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)" ;;
-esac
-
-LICENSE="GPL-3"
-SLOT="0"
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline vanilla"
-
-DEPEND=">=sys-libs/ncurses-5.2-r2:0=
-	readline? ( >=sys-libs/readline-${READLINE_VER}:0= )
-	nls? ( virtual/libintl )"
-RDEPEND="${DEPEND}
-	!<sys-apps/portage-2.1.6.7_p1
-	!<sys-apps/paludis-0.26.0_alpha5"
-# we only need yacc when the .y files get patched (bash42-005)
-DEPEND+=" virtual/yacc"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	if is-flag -malign-double ; then #7332
-		eerror "Detected bad CFLAGS '-malign-double'.  Do not use this"
-		eerror "as it breaks LFS (struct stat64) on x86."
-		die "remove -malign-double from your CFLAGS mr ricer"
-	fi
-	if use bashlogger ; then
-		ewarn "The logging patch should ONLY be used in restricted (i.e. honeypot) envs."
-		ewarn "This will log ALL output you enter into the shell, you have been warned."
-	fi
-}
-
-src_unpack() {
-	unpack ${MY_P}.tar.gz
-}
-
-src_prepare() {
-	# Include official patches
-	[[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s)
-
-	# Clean out local libs so we know we use system ones w/releases.
-	if [[ ${PV} != *_rc* ]] ; then
-		rm -rf lib/{readline,termcap}/*
-		touch lib/{readline,termcap}/Makefile.in # for config.status
-		sed -ri -e 's:\$[(](RL|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in || die
-	fi
-
-	# Avoid regenerating docs after patches #407985
-	sed -i -r '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in || die
-	touch -r . doc/*
-
-	epatch_user
-}
-
-src_configure() {
-	local myconf=()
-
-	# For descriptions of these, see config-top.h
-	# bashrc/#26952 bash_logout/#90488 ssh/#24762 mktemp/#574426
-	append-cppflags \
-		-DDEFAULT_PATH_VALUE=\'\"${EPREFIX}/usr/local/sbin:${EPREFIX}/usr/local/bin:${EPREFIX}/usr/sbin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/bin\"\' \
-		-DSTANDARD_UTILS_PATH=\'\"${EPREFIX}/bin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/usr/sbin\"\' \
-		-DSYS_BASHRC=\'\"${EPREFIX}/etc/bash/bashrc\"\' \
-		-DSYS_BASH_LOGOUT=\'\"${EPREFIX}/etc/bash/bash_logout\"\' \
-		-DNON_INTERACTIVE_LOGIN_SHELLS \
-		-DSSH_SOURCE_BASHRC \
-		$(use bashlogger && echo -DSYSLOG_HISTORY)
-
-	# Don't even think about building this statically without
-	# reading Bug 7714 first.  If you still build it statically,
-	# don't come crying to us with bugs ;).
-	#use static && export LDFLAGS="${LDFLAGS} -static"
-	use nls || myconf+=( --disable-nls )
-
-	# Historically, we always used the builtin readline, but since
-	# our handling of SONAME upgrades has gotten much more stable
-	# in the PM (and the readline ebuild itself preserves the old
-	# libs during upgrades), linking against the system copy should
-	# be safe.
-	# Exact cached version here doesn't really matter as long as it
-	# is at least what's in the DEPEND up above.
-	export ac_cv_rl_version=${READLINE_VER%%_*}
-
-	# Force linking with system curses ... the bundled termcap lib
-	# sucks bad compared to ncurses.  For the most part, ncurses
-	# is here because readline needs it.  But bash itself calls
-	# ncurses in one or two small places :(.
-
-	if [[ ${PV} != *_rc* ]] ; then
-		# Use system readline only with released versions.
-		myconf+=( --with-installed-readline=. )
-	fi
-
-	if use plugins; then
-		append-ldflags -Wl,-rpath,/usr/$(get_libdir)/bash
-	else
-		# Disable the plugins logic by hand since bash doesn't
-		# provide a way of doing it.
-		export ac_cv_func_dl{close,open,sym}=no \
-			ac_cv_lib_dl_dlopen=no ac_cv_header_dlfcn_h=no
-		sed -i \
-			-e '/LOCAL_LDFLAGS=/s:-rdynamic::' \
-			configure || die
-	fi
-	tc-export AR #444070
-	econf \
-		--docdir='$(datarootdir)'/doc/${PF} \
-		--htmldir='$(docdir)/html' \
-		--with-curses \
-		$(use_with afs) \
-		$(use_enable net net-redirections) \
-		--disable-profiling \
-		$(use_enable mem-scramble) \
-		$(use_with mem-scramble bash-malloc) \
-		$(use_enable readline) \
-		$(use_enable readline history) \
-		$(use_enable readline bang-history) \
-		"${myconf[@]}"
-}
-
-src_compile() {
-	emake
-
-	if use plugins ; then
-		emake -C examples/loadables all others
-	fi
-}
-
-src_install() {
-	local d f
-
-	default
-
-	dodir /bin
-	mv "${ED}"/usr/bin/bash "${ED}"/bin/ || die
-	dosym bash /bin/rbash
-
-	insinto /etc/bash
-	doins "${FILESDIR}"/bash_logout
-	doins "${FILESDIR}"/bashrc
-	keepdir /etc/bash/bashrc.d
-	insinto /etc/skel
-	for f in bash{_logout,_profile,rc} ; do
-		newins "${FILESDIR}"/dot-${f} .${f}
-	done
-
-	local sed_args=(
-		-e "s:#${USERLAND}#@::"
-		-e '/#@/d'
-	)
-	if ! use readline ; then
-		sed_args+=( #432338
-			-e '/^shopt -s histappend/s:^:#:'
-			-e 's:use_color=true:use_color=false:'
-		)
-	fi
-	sed -i \
-		"${sed_args[@]}" \
-		"${ED}"/etc/skel/.bashrc \
-		"${ED}"/etc/bash/bashrc || die
-
-	if use plugins ; then
-		exeinto /usr/$(get_libdir)/bash
-		doexe $(echo examples/loadables/*.o | sed 's:\.o::g')
-		insinto /usr/include/bash-plugins
-		doins *.h builtins/*.h include/*.h lib/{glob/glob.h,tilde/tilde.h}
-	fi
-
-	if use examples ; then
-		for d in examples/{functions,misc,scripts,startup-files} ; do
-			exeinto /usr/share/doc/${PF}/${d}
-			insinto /usr/share/doc/${PF}/${d}
-			for f in ${d}/* ; do
-				if [[ ${f##*/} != PERMISSION ]] && [[ ${f##*/} != *README ]] ; then
-					doexe ${f}
-				else
-					doins ${f}
-				fi
-			done
-		done
-	fi
-
-	doman doc/*.1
-	newdoc CWRU/changelog ChangeLog
-	dosym bash.info /usr/share/info/bashref.info
-}
-
-pkg_preinst() {
-	if [[ -e ${EROOT}/etc/bashrc ]] && [[ ! -d ${EROOT}/etc/bash ]] ; then
-		mkdir -p "${EROOT}"/etc/bash
-		mv -f "${EROOT}"/etc/bashrc "${EROOT}"/etc/bash/
-	fi
-
-	if [[ -L ${EROOT}/bin/sh ]] ; then
-		# rewrite the symlink to ensure that its mtime changes. having /bin/sh
-		# missing even temporarily causes a fatal error with paludis.
-		local target=$(readlink "${EROOT}"/bin/sh)
-		local tmp=$(emktemp "${EROOT}"/bin)
-		ln -sf "${target}" "${tmp}"
-		mv -f "${tmp}" "${EROOT}"/bin/sh
-	fi
-}
-
-pkg_postinst() {
-	# If /bin/sh does not exist, provide it
-	if [[ ! -e ${EROOT}/bin/sh ]] ; then
-		ln -sf bash "${EROOT}"/bin/sh
-	fi
-}
diff --git a/app-shells/bash/files/bash-4.4-assign-crash.patch b/app-shells/bash/files/bash-4.4-assign-crash.patch
deleted file mode 100644
index 17089e9..0000000
--- a/app-shells/bash/files/bash-4.4-assign-crash.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-http://lists.gnu.org/archive/html/bug-bash/2016-07/msg00066.html
-
-From: Andreas Schwab <schwab@suse.de>
-To: bug-bash@gnu.org
-Subject: a=$* -> crash
-Date: Wed, 27 Jul 2016 13:59:22 +0200
-Message-ID: <mvmbn1j2sx1.fsf@hawking.suse.de>
-
-(gdb) r
-Starting program: /bin/bash -c a=\$\*
-
-Program received signal SIGSEGV, Segmentation fault.
-quote_string (string=string@entry=0x0) at subst.c:3940
-3940      if (*string == 0)
-
-diff --git a/subst.c b/subst.c
-index 37d96f9..16ae3f0 100644
---- a/subst.c
-+++ b/subst.c
-@@ -8575,7 +8575,7 @@ param_expand (string, sindex, quoted, expanded_something,
- 	      /* If we're not quoted but we still don't want word splitting, make
- 		 we quote the IFS characters to protect them from splitting (e.g.,
- 		 when $@ is in the string as well). */
--	      else if (quoted == 0 && ifs_is_set && (pflags & PF_ASSIGNRHS))
-+	      else if (temp != 0 && quoted == 0 && ifs_is_set && (pflags & PF_ASSIGNRHS))
- 		{
- 		  temp1 = quote_string (temp);
- 		  free (temp);
-
-Andreas.
-
--- 
-Andreas Schwab, SUSE Labs, schwab@suse.de
-GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE  1748 E4D4 88E3 0EEA B9D7
-"And now for something completely different."
-
diff --git a/dev-db/postgresql/ChangeLog b/dev-db/postgresql/ChangeLog
index 173703b..fed3a96 100644
--- a/dev-db/postgresql/ChangeLog
+++ b/dev-db/postgresql/ChangeLog
@@ -929,3 +929,19 @@
 
   Package-Manager: portage-2.3.0
 
+  07 Oct 2016; Aaron W. Swenson <titanofold@gentoo.org>
+  -postgresql-9.0.23-r1.ebuild, -postgresql-9.1.19-r1.ebuild,
+  -postgresql-9.1.20.ebuild, -postgresql-9.1.22.ebuild,
+  -postgresql-9.2.14-r1.ebuild, -postgresql-9.2.15.ebuild,
+  -postgresql-9.2.17.ebuild, -postgresql-9.3.10-r1.ebuild,
+  -postgresql-9.3.10-r2.ebuild, -postgresql-9.3.11.ebuild,
+  -postgresql-9.3.13.ebuild, -postgresql-9.4.5-r1.ebuild,
+  -postgresql-9.4.5-r2.ebuild, -postgresql-9.4.6.ebuild,
+  -postgresql-9.4.8.ebuild, -postgresql-9.5.1.ebuild,
+  -postgresql-9.5.3.ebuild:
+  Clean Up
+
+  Clean out old and insecure.
+
+  Package-Manager: portage-2.2.28
+
diff --git a/dev-db/postgresql/Manifest b/dev-db/postgresql/Manifest
index de67306..c81dd42 100644
--- a/dev-db/postgresql/Manifest
+++ b/dev-db/postgresql/Manifest
@@ -14,61 +14,29 @@
 AUX postgresql.init-9.3 4194 SHA256 ae547732e2e1fd1adac40bd30fd79b83a5ba3bb1de4a553b8d0f09500cb2d082 SHA512 1aa490d336d29dd8837f993413caf4e9df659d7fa22667c2681c875ccb47191b48405dd3a5443f76bf5b872084d60387cf86ba3244a4530d4f34d30389d0a6a2 WHIRLPOOL afdae9a70426ef0261a939456c809d14b5ab7e137417574f0d66af0f2ca9e427ffb20e12dd386b37d15b5a03266f5be49115a52fa541a4ac2b4568049352f6d0
 AUX postgresql.init-pre_9.2 4157 SHA256 6c0d2e1b3146230724e52aa977ac73a17a52a68b15a890bfa13b5fa9ca84cd9d SHA512 b6ac488322c54403021f28bda088bbcb412ae0fded83ff7df5b9a07cd2daad5d781b796b46afa2c536a9f510e505c9fd9d034e1acfc2907f78791d3316718af9 WHIRLPOOL 6ac00ea2a6b033879a0d0cb38e260c16d2aaafe49f3991d3a4e651fed372784c00954a531e3ecfa4ddcf1ea58d3bad7acf2793148a168fa6d18f5f8f1ad71851
 AUX postgresql.service 1768 SHA256 a5882f4f4b8d391a1226c5dc514df83342107c94880e32eaf174d152f280de88 SHA512 92c60a21ac87a298742d0aa0f4180218cebfa5644762c32a27b1314d92a581eb4f6cbcf41b20f29509c6eec9f6f236a57d2c944aa1eca35d7f8d29e2865b47d7 WHIRLPOOL 5f58b28a903311b4b59452d44c1cec3dab792bbb59b73eb5ae3926f64f45a5926bbdc7a17f460ea66256c940aefa560c89ffa49999fedfff69f223a63bf33a03
-DIST postgresql-9.0.23.tar.bz2 15045569 SHA256 3dbcbe19c814139a3f4be8bc6b49db804753cbc49979f345083e835c52b4d7de SHA512 db8fe64a5a5a1caae97e792ee5b8bcc375c6d6e10ef9c35f1003f174745568854dc5a7a58dbaf46794dcd35dee5a13f6eb1ba356f9618134b601b7759c753c9f WHIRLPOOL 5177facff628271a0d57d1f2925cfc04796020492c4102f0b0c6fa34149da9ddd9ccb0a38629e320521fe82163bdd4aa56f74af3a887ff4389cd9f62e921c53a
-DIST postgresql-9.1.19.tar.bz2 15843978 SHA256 cbd5057451147dd63a1e764176a4e17a7795773be1e4266ea9faa951064c0ec6 SHA512 23dd4108556edcc667f599c5663356a1106bc239a1c5337d153c13a1e1871d52316825b84802bbc1d79612dfa4c9c77f4c4b96d59d23d7338988bdf370e956d4 WHIRLPOOL 6845fd8071032e987ab65a642ca04adbc8b464332bac8c346f01e011411947aa4341ea596fd910342124fcbae4cc25410c25ab695894b0b68d20441df5424722
-DIST postgresql-9.1.20.tar.bz2 15844360 SHA256 6d1e6c4334c265a85f0f96407b7a9aafff0f26cb62db2d8d03a32ba0c2872937 SHA512 ebec6aae593058276dda2404812d89f3df637ceac24d96de1a774da03cf58ea9ce44819e18549040b6f6d811f2c8203462e13788df7158d45a0fe9dfb72d0fd9 WHIRLPOOL de990c029949c8ef372d3440c4cbb870739bf5b83c438ba2b012004cabcb077bab1258b2115ceb239eafefe73f282ea729384085e3f682240cb40ed662f350e5
 DIST postgresql-9.1.21.tar.bz2 15850128 SHA256 d66ee9076f3149a4cab4be3c6f47e13bc047138d17dfcb531ad01f78cfdeb393 SHA512 75a96ce2c080b2e657b6f591e18c4778635a9f8c74870bbe7c99cb82bf1dfaad124942214ab6e3079b565c41b7fc77af1a4a49672e7ddba075374402c8832a5b WHIRLPOOL 4de012763b985d1fa675e151d68988f4dd4de4ae8860d67fab3818666b3e135849465a0a41bc1f073eb4d679415fb18871f8156c99376c7860c51258e607771e
-DIST postgresql-9.1.22.tar.bz2 15860904 SHA256 f619664b0dde4e1a75fdc00c35afb4517002984a462d70967ffcdedfeee5e16e SHA512 a2ed0a1f0d0920f6151d128a206c557b14832ab296dbf51c665309434a851b83eefd12a5a36c870ee0281371350b6b86ac6e81188c164c72407847cf9e70d691 WHIRLPOOL d95f142e149fec8311502bff6cfabf33aadc1ccc400d9b0d77e4b5000beec88b60ff6de59fbc625b4696626e9b626dc887dd8c96a3c02a66019dc6d0e214994c
 DIST postgresql-9.1.23.tar.bz2 15856178 SHA256 7f7471e8b3b369726f1c1df0e6a163dde63b6546c4bba985c1f36a574c75f6d5 SHA512 192f48ed8db510663c85c217afee8eff732d467fe10f600c9be834371ccb6a788acd380c582d80f0096a0b7d7ee0daa378d1fb8177281bf4e6e2fcc39fffdc67 WHIRLPOOL 55a60cdc6a0c1e570d2a1f7fce9c160637101cf77c7dda3d1a2ccd31350d16678f07949c8bd7519f54bc6008e18074d0d57f1201c870b044e765c8057a358441
-DIST postgresql-9.2.14.tar.bz2 16451398 SHA256 54c20b3f320a48c38487f2711e98b2fa3f9ce4305905a294ad0449e8b4fb292e SHA512 268015d9e397ee62eebbbc9abf1ee25d0d4aa6bf5943b404009b3aab31f485b8523353c679beed34cc00304b9d4c7aca9de0ba841d9841dbf885d05d1a5692a1 WHIRLPOOL 4f6d5d6989a67d14082ddb215411b55d0dc0be29772e6a593b4df133489ff4a7e6c265d0830adba64d4c6be47e17a949cbc21d6570dceb9362399649af2be88e
-DIST postgresql-9.2.15.tar.bz2 16480973 SHA256 7ced4807589899e83c64dd0803cf1f9782b6a20077ab545c66e868ef26543e60 SHA512 4a0e52beaffc9f0b004c761a5ca107a019d6265877d36cd7be46912807da6fa6824ce469c8d59fb24092440646d3f0872b8aa62941b4b3ba657edc2f5678b2b1 WHIRLPOOL 58607fcd1adc474f6a78741527b4192e30ac8e87d83a80fa71b6660ac1665a9ab5ee062ae19c919b288df607854ab55866e00e0228ffc6bd1b71dd59c18d83bd
 DIST postgresql-9.2.16.tar.bz2 16490199 SHA256 d2164cb8706bf828161871c195299841c5be1fbd9bc85d7866704e54f0741b11 SHA512 0f0b317473b4b42ae4261993c704a7c6cd28c7e6bd83e77a81850695655baa473d7d52e97441ee5500d646d405c84145a54f42b9bae89a0ddfebb0418d608820 WHIRLPOOL 8dfdca52555889d20e857ecc01ee75a14fd18bb7fa1ac50f5d54415a423d62223d0d389d43b143ae927446946aaff06b68cbf8214e26e2f432c39a50c0296b08
-DIST postgresql-9.2.17.tar.bz2 16497200 SHA256 c660cc0ee42c221ebedc2c75ad0d4b30ec8da488a954df9987a3fc83bcb7363f SHA512 a771c98c0de4e6c5790b9ee698ee8d259533d372b82ff3c9900c00cf79706ef29af6204de4292ff8ca4a3f3a13fec1991c4441c352c309bbf9cdd397579677b4 WHIRLPOOL c522b5bb4baa06624d67dac5c50e7d33bdd03a78a34e9c96df850285ab3b491f3502a94abb7604abf0716672c207340f05c23d4b110f8f51c8bd278c848dd389
 DIST postgresql-9.2.18.tar.bz2 16448429 SHA256 d7aa37d586ae4d46d07a4fac417ff966e45a9dd99bac8b3cd149be8df9ea35f4 SHA512 c311f621ac38e2dfaf5fd57a4500430333dcbb2d7f1719bc7d99fef54e06a22f93aea595391c3607d44c89c372d0e89daf18f8f295b33e3b21e5285fbbb87d5b WHIRLPOOL 08664a3378eca1a509066a6a841c1489d7cf8cbda60cd836ad67b0cb2bf112b58191d0a1170f97aec09ef5a0984916263c754bc108de2cec6945417e97ce0e66
-DIST postgresql-9.3.10.tar.bz2 16995860 SHA256 e5444f0f76aff98a251400b7c28bc361d65e3d72d8d6cb9bb5d8361a69541531 SHA512 6b048fd1d0b38f72bab6ea70e40f10e7b805b94fc4c6fd865e0ec5e86da3c54043f20059dbf716d29eb4ca787dc50da561b1c7b48ab9f3096ebc651300855672 WHIRLPOOL b8ea15a04d18535662832d444b556aedffaa8c954b52dcd42d548f53f93b8a9dbfbe9298f63c26d44c8b757e8c10d76711c303cd83c84d9c86bf23c2837e74ce
-DIST postgresql-9.3.11.tar.bz2 17047707 SHA256 3d222a90c941d3a6c02c7c749fc9eb54ff20a1166570459d09c5476743496a21 SHA512 8da91e11e0a6502c185931b6e47ba8e583d3360009f26ad703552be9a216b2c37a688894d4ea867c529c4135b6c36da26e9d7ef52a411b0c68ad50a53ff3cdb3 WHIRLPOOL cc1251553ec902dc1998c2bad11460206064c0d55140601b96293d98774f9622d38fa49f758e2f69ed6cb27ee14dd0a20f6ec41f655a4793b255168dfd430815
 DIST postgresql-9.3.12.tar.bz2 17052755 SHA256 f3339ea23f86d07f3730adc878b2e5d433087ff44aad65a5ec9c22c32b112e67 SHA512 d88cb167ca78bd8588e3ff9b3f13b77f661e3ddec7e5b726cc0a46512db2584b15ce5f691fe7e4ab84855f102cb88014245921a38f5da41ad19e762a88968883 WHIRLPOOL 8738e18f8534f70ddbfa7c0c0ae1ab585330cb9df2d2da3a3e5f5c15a2e5070aebd38124b7295214e0105c482a79011d00c8cbe2a9061edc90bfd5ed07000dcb
-DIST postgresql-9.3.13.tar.bz2 17061824 SHA256 5544e1d29bfdb9a815d3533400ae242b8763c399285e5d4020ffdb49c362a72b SHA512 04658f95d723563c08249faf674f2119358059808c42045e05adaa28264b9ae054d4e81ae2bb6639995e007caa65d21d935ff988d5b0473dc517107ddd8c6ca3 WHIRLPOOL 4d3e05220fea08111d75f613d3af93b8a6dd320861c99ecf993ab515447077d4991e36d02fb5a3f2963f7d1d2f0ac48cb000b5922156ad7af10482f929ca8694
 DIST postgresql-9.3.14.tar.bz2 17042199 SHA256 5c4322f1c42ba1ff4b28383069c56663b46160bb08e85d41fa2ab9a5009d039d SHA512 97bd92ffdd661f7428c47a8bc87fde88a2b150e7d08bd577a7159ac65aec319d358495b883b95dff2069d24a8d15d1e7c10c3fae81fc76186bfef0127f257ac4 WHIRLPOOL d603e2016cba37fd0ea68b00c1493d23588aeeb334cceeb7fce521ed66618ffa70b4eb281e8a37650e30151cd4f1353879c63fe4076caa144d085ac96e8b5a79
-DIST postgresql-9.4.5.tar.bz2 17660960 SHA256 b87c50c66b6ea42a9712b5f6284794fabad0616e6ae420cf0f10523be6d94a39 SHA512 01ad4b5a097efa70f74a9e96b764c32953a9df57d6bf81b893a1e552475f6aba0381580dcd1f27b2c443ce89fecc429eeeb0219af60a0b2f84798f76eb1757f5 WHIRLPOOL 8ea0e9a40cefa53568071f2137bac996898f9bd486cfb5cfcf8bb49590816833f37878f10caabffb9d3127e047f00c916b8830594a485ebe16fb9fe6fc834c95
-DIST postgresql-9.4.6.tar.bz2 17734946 SHA256 cbce1f4d01a6142c5d8bebe125623c5198ec04f363da7dd3d3b3a4100b4140a6 SHA512 03e2c68ec7fb40b4886885136692e96ed5d7e50ead8ebd094ede402eeb8ed94a791357e8eff2776a2e4a537ced3d900e032779a33c1fbd920588d89f8b6705ee WHIRLPOOL d25073985dc9974064175bf8b90f7a18368882c8d62fdb403183121452624bfb50c10c181bdc4b6a076d515dc29e081cf913793653f04ced98a48640dab9b3ff
 DIST postgresql-9.4.7.tar.bz2 17746987 SHA256 cc795e6c35b30e697e5891e3056376af685f848a4e67fab1702e74a2385f81e0 SHA512 e61d74a4a9caeb7d4a3fb9509b37aaeb5bd563d61d20739edd777ec990c92011286a7485f275178f9f8c1ebb8c84a98290e2b5351b11e0f9a1baa781f323e374 WHIRLPOOL 2ae25affc35e12fd250161585bc5cf318930d9864c9fccbf44c9bd697933aa75860467256b811501947c0fad8c6cdc0622889e9991904a4db9fda2d19efa2b37
-DIST postgresql-9.4.8.tar.bz2 17740626 SHA256 4a10640e180e0d9adb587bc25a82dcce6bf507b033637e7fb9d4eeffa33a6b4c SHA512 d1cc8a02ed7eb0af365479cee43b3cd33fade69e07eb82343cd562efda5a460e405836e1fb2492a8cb22a71d14038216868cb48694400b3c31a56c4aee0bcac4 WHIRLPOOL f799c60ed6b753b0db197796718c4508669bf7cc64c34d97fe023c38e09c5e38801da5bac91c3392d690e0e8829beff6b4d3b3fa610119ce0a24a1e8fe9486f7
 DIST postgresql-9.4.9.tar.bz2 17763281 SHA256 c120a62e90214c20d9160da3ca3fbaec97d5f1656f1dd033f60e7297b7a1e1c9 SHA512 980b1a8828d07151e67793367ea0ee08e4231cd76d9b20b4f4bca08a7976ee82a3aea51ce801a4107680c8203f8ebdb4cf5a0a6aaf93d580c9f337658d50819b WHIRLPOOL f5c9922bd12008a87a6ed0b8efaf8280d1a3ce8ef47fc853efd4d4d1a754e878f9cb27a4049cfb6d7c50968083e1286670a9b79588e29e127bd3f96b927f4999
-DIST postgresql-9.5.1.tar.bz2 18441638 SHA256 6b309d8506a39773a752ff074f47656e5424576ea090b04a24fe1725958c5bd2 SHA512 fcb2b3bde51c4152b3a72764de1f9b4e607cb591571ed5bc1187b2c6938c33e21bdd512694a969a03c046e4889a129bb0e75fa676d55a1a1e77142da1e984192 WHIRLPOOL 2fdbae2c58ce4255b514055ada220b25269a01719c202e1d1ae86d408fd56b523f1a4e16ef5abd675b0fbf0675c1eabca7d0f5f2e8fdb9cdc3a3d98e7b755aeb
 DIST postgresql-9.5.2.tar.bz2 18446616 SHA256 f8d132e464506b551ef498719f18cfe9d777709c7a1589dc360afc0b20e47c41 SHA512 ba31dddee8a960a4b1a97394eae5ea7efaa5e74e21c755882efcef90404676c6052dff55f40b585932e4f752cbcda5ceac0e29d601ea6651cfbab7a49190381a WHIRLPOOL 0b9abe3a5b3933485e5d0b2c08daa20d421e5920ae5b4640b36971463915d7e7b2767575564d80bb5dfa3a353c646c9c4ca8e483dfd64df39370774e76fa1cee
-DIST postgresql-9.5.3.tar.bz2 18455394 SHA256 7385c01dc58acba8d7ac4e6ad42782bd7c0b59272862a3a3d5fe378d4503a0b4 SHA512 7275dbde0c1b795f3a491d45464c69a97fbfd0e66a7fe62ba00e97747908df0df19bf65e104e10e049e31a8cf484c9d9f29eb75ff6a3875cb087559e25744c29 WHIRLPOOL 60536e8e244ecdd1e307a8daa1bcd5728bd070b5c08063bf48fbcb93673c012497e257fe3c4f15019b0674e82724e48105d2799926572910370efb17dbbd6e21
 DIST postgresql-9.5.4.tar.bz2 18496299 SHA256 cf5e571164ad66028ecd7dd8819e3765470d45bcd440d258b686be7e69c76ed0 SHA512 e5220bc967443d54b9dcff7ba5aefccedbe1c219f953eb0d67254c709d52b0e647d1dc473446640804165b596fc5b75fa4ff8d63696123b87d8096c3a7795c34 WHIRLPOOL d429d853062b2d2f8e999db1733b3206020f2d521401e0510376213ecaa2049b6d87987b9ee999ab81faacf6ce65ddfdcf43b0922fc23e91961594956c556e0d
 DIST postgresql-9.6.0.tar.bz2 19157472 SHA256 3b5fe9634b80a4511aac1832a087586a7caa8c3413619562bdda009a015863ce SHA512 46ec903eed13bf5fb5510d56e4814405ba4510c9e5f43c533189b6ed07c7955dba326107ae0dbeebb5abdd00b7007971ca5d7213274bd653d8d4295f93e6cbf8 WHIRLPOOL aa5d30d41aca14eee3a00d5f3805b28187278a538c0f00b9cb70fad9e2c401dedc797512b9851a04c67f21e7b8cfbcf6d2f85c1486795803840b7111cccb2b19
-EBUILD postgresql-9.0.23-r1.ebuild 11216 SHA256 1a82a1b4418d31d9f5a5b9f970a0a0fbe8aeeb7865f53a69d207c0dc8f04ce92 SHA512 65ab533d688bb5b4076d2419ef29e0922a5dc5f444b35f9a2105c4c89855d814d9db171c92aa9062ea67284b8cdb74a4364c359facd07e2d2806bad7b5b819ff WHIRLPOOL 581e6cffbeb6c0444635f8675a49860d9ec4080183c63221b58f820189b403e6a5ac129723bdd8b44b957ff5285a31bedbb8a89535b111396b361e25768e2acb
-EBUILD postgresql-9.1.19-r1.ebuild 11404 SHA256 af9bb38a889d72cf785aedbcb1c42f8fc83c5990ad6105bb81ce2aebad7c1d09 SHA512 59ef20cafdc64f01766b8e0f8d86bc970645c66ceedfde03d675704429cd096c6092015f822a9bec0176c1686436f7cda075c40916bf79da37074c5216995e99 WHIRLPOOL 755f0d5200e64d34a3a5773c03f237d21331195d1a8b7052e5003ee43fbc5f50a3a61236fb1196b555bbdb666ae0b532715908a484a8506ddcbf3b6508537cd9
-EBUILD postgresql-9.1.20.ebuild 11404 SHA256 af9bb38a889d72cf785aedbcb1c42f8fc83c5990ad6105bb81ce2aebad7c1d09 SHA512 59ef20cafdc64f01766b8e0f8d86bc970645c66ceedfde03d675704429cd096c6092015f822a9bec0176c1686436f7cda075c40916bf79da37074c5216995e99 WHIRLPOOL 755f0d5200e64d34a3a5773c03f237d21331195d1a8b7052e5003ee43fbc5f50a3a61236fb1196b555bbdb666ae0b532715908a484a8506ddcbf3b6508537cd9
 EBUILD postgresql-9.1.21.ebuild 11404 SHA256 af9bb38a889d72cf785aedbcb1c42f8fc83c5990ad6105bb81ce2aebad7c1d09 SHA512 59ef20cafdc64f01766b8e0f8d86bc970645c66ceedfde03d675704429cd096c6092015f822a9bec0176c1686436f7cda075c40916bf79da37074c5216995e99 WHIRLPOOL 755f0d5200e64d34a3a5773c03f237d21331195d1a8b7052e5003ee43fbc5f50a3a61236fb1196b555bbdb666ae0b532715908a484a8506ddcbf3b6508537cd9
-EBUILD postgresql-9.1.22.ebuild 11413 SHA256 f67a588331648fec15d4d03248a6b3710c154dcd6f6d4a10129c99a010fdaad6 SHA512 578c819060177bd9c5afa196fd50ddcfd855c354ff37a15132ea77ba87b18034e77631518390e51d55148671b3545a95beb3a91b794de829c82003a8d7f0a0b5 WHIRLPOOL bca6fa9a12903d2d5ec3dd0642b3ec032934d10cd6f6135c8d5c8794cb40e271138ad52b3e7b6fc88892afbc88c458568b061e6422573099370a1322596a2320
 EBUILD postgresql-9.1.23.ebuild 11408 SHA256 5bfb055c56c37dd88c82407fd640ecf48c95267c4279757eaee043c1a7ea3fde SHA512 4d03561033cb51e5a033c6be57cc5c90fb51b0f1846d7212de8832bd62ec8f12dcbfe04525834910866da2a7be778ed7b6d4f29f6c3cdf83e1ae0e6722d5fb24 WHIRLPOOL b43e9454dc27d3b5c26d6c7d5c01923199e7d4a04542b39a03ad9ebdc0abe2cd5cd7cf332c95731260962402e759d8cecf6efc9feb3bf77b43a0038f821abd48
-EBUILD postgresql-9.2.14-r1.ebuild 11692 SHA256 373d1dc7aad84a77d6467be9232ba4b17ed7d30291f47144251fa98a59e19cfb SHA512 c4700de2632869b3092affdd5c4740d8c52c4f02b1e45d6e82e7d5ce3874155e4145af8be18c5430fbbe860e3d493176a9c9d0d318150e5ed3eef0b6cbf3a3f8 WHIRLPOOL dc1f26e30c41e4ca40d0968205805aee79fd9ff935b94314123c3e4ed145dfd62f4b1afd0b356d8030405afdc3ae205fd5315f5739fdd1331ea4e11c35b893bb
-EBUILD postgresql-9.2.15.ebuild 11692 SHA256 373d1dc7aad84a77d6467be9232ba4b17ed7d30291f47144251fa98a59e19cfb SHA512 c4700de2632869b3092affdd5c4740d8c52c4f02b1e45d6e82e7d5ce3874155e4145af8be18c5430fbbe860e3d493176a9c9d0d318150e5ed3eef0b6cbf3a3f8 WHIRLPOOL dc1f26e30c41e4ca40d0968205805aee79fd9ff935b94314123c3e4ed145dfd62f4b1afd0b356d8030405afdc3ae205fd5315f5739fdd1331ea4e11c35b893bb
 EBUILD postgresql-9.2.16.ebuild 11692 SHA256 373d1dc7aad84a77d6467be9232ba4b17ed7d30291f47144251fa98a59e19cfb SHA512 c4700de2632869b3092affdd5c4740d8c52c4f02b1e45d6e82e7d5ce3874155e4145af8be18c5430fbbe860e3d493176a9c9d0d318150e5ed3eef0b6cbf3a3f8 WHIRLPOOL dc1f26e30c41e4ca40d0968205805aee79fd9ff935b94314123c3e4ed145dfd62f4b1afd0b356d8030405afdc3ae205fd5315f5739fdd1331ea4e11c35b893bb
-EBUILD postgresql-9.2.17.ebuild 11701 SHA256 14c2a2062f9e946ca53dc5ddab10bf5325bda181e3880bb7ef9a77c4006a9abb SHA512 e0ae4c66928b6b9fd9aa4d084c60ae2511e03bc7d4991bcde9ad15efc0fe4124712f977b3b2b2c54f8b6ac5ae953d8a505fd84c5fc26ede29add31fc0e64a7bf WHIRLPOOL 17d4a09dda7aa8320b5e83a88ca368cbd281357cac9c49ec115570b60b57cf018cef1b0b9d8a99f51d023814c3d1024733bc089270ab8a9332944340aa8d9d52
 EBUILD postgresql-9.2.18.ebuild 11697 SHA256 51f5618148ecce1c2e5f1d900fa724510c4653e5c421df1dcbafba53acd5bc90 SHA512 960ae6a799b0dfbac822c4c017e2cba33a5aff7278a811cfd8968937307250429a19d9aeeaa4647ec9104fa2e831c286d186fa4f87d717696f5386037c2a64ec WHIRLPOOL 83457b3662799ff1be620f45638c9a5fe2d0556105341d3b04c7db7b199279f4974a7ca82fac04aa60fba1bae451dee41b7bda3b3f1ebd606c0711e3639e9df6
-EBUILD postgresql-9.3.10-r1.ebuild 11696 SHA256 b5bfa9e3adad1cdc0a1eedd4ce316b8e27f8559ef997db976785ed1289d00c09 SHA512 b8334729d1975d985431862a741f1bdf1f85d0320d4311a5f4307b18d7b7bc0dd6b448e2f79877f56ff43f5123070a61ceab147fdbfdb67dbbb4f90f783a770d WHIRLPOOL e1715b2bf3bd17c4eaf71d08cf97e0dc33a0c4b898cc7a15ccd75ddd2bc0cac450800e67c6dcd9257e9a7e511427c4df31973677265eace19829046eaac0a41f
-EBUILD postgresql-9.3.10-r2.ebuild 11952 SHA256 3fa88cd97fb729381aad8f6361b0adff4c1959854f712fe441d236dddc0d2309 SHA512 66ee75061b4b7e125f05c2e1e27aeff16c6876a1de7c1c70a5fc0f2310b1dce7aa657d389fef0440db8536ef8c56067088bab60e9a5d21f497bbe92bebaaeb3a WHIRLPOOL e9c3960aa690b4b0f6e19b0a555a8d7fe04e902093ef424edad62e411e6c9dee59d970a8db5d52c873750297f9fc0047298c247282632e8692443240b09754df
-EBUILD postgresql-9.3.11.ebuild 11947 SHA256 d9ecbf49b06a27b3dc4bce512bccb4075ac29d6e37050e0d933db40a4ef60d47 SHA512 f4f556dbb64788d42d032c73475b82b021a21e8b3b70501c1afab4436dbb3b03fc58e1ce343fd19a4c5286d6761004339868190144712c180a0864c3b33e7d45 WHIRLPOOL 3c4a21ea8a2b636707115ad6a05d660318164a808f38b7226264c6487be7df41574c4a52d9029a2473176d65ef7d4b4778e810a93008f162580b8565210c14be
 EBUILD postgresql-9.3.12.ebuild 11947 SHA256 d9ecbf49b06a27b3dc4bce512bccb4075ac29d6e37050e0d933db40a4ef60d47 SHA512 f4f556dbb64788d42d032c73475b82b021a21e8b3b70501c1afab4436dbb3b03fc58e1ce343fd19a4c5286d6761004339868190144712c180a0864c3b33e7d45 WHIRLPOOL 3c4a21ea8a2b636707115ad6a05d660318164a808f38b7226264c6487be7df41574c4a52d9029a2473176d65ef7d4b4778e810a93008f162580b8565210c14be
-EBUILD postgresql-9.3.13.ebuild 11956 SHA256 21638ae5d012fa91ec7cb86b302925c1c83d6d104dc0569e55dc2d647f74977f SHA512 0aa8d3b92775f11688be1ea83e1a272157c966dab65f950412e2536a5ab8a6d699ef661c7314fbf08cad2e2696dea8f4c88f05cd3ffabd7d0a81e1a12380a4d7 WHIRLPOOL 505acf2705c61b4f172e4da57140052058cd91d4878bc1256e79699e70db0646d007c47aead2243e73ccd5dce5398e3a4f52e82c6b353703f8a0613056e3fe62
 EBUILD postgresql-9.3.14.ebuild 11951 SHA256 8a3c4f756f8970e928b67f3b156d42d6c0d9a878cb21f448d0515ad0be9635a8 SHA512 0c6a2a8c557f3d2130d1b7f58e01c0e8120ad889015a840f112e86a97ccf7a91ad61076db4f2d00e913400044aabc1926d2ef2f14e6a444b00d2b684df77e2b5 WHIRLPOOL 66730213d40bea9d86bb841d462f01b792e2d5f0d02955d319e12efcb6306308485e94099cb57c9572c709912f9c58a38451eb6842fa668c2e1efdc4659aca5c
-EBUILD postgresql-9.4.5-r1.ebuild 12507 SHA256 455150240c31a5ee3a522f3872b1a4c937491521ce592117123bbf95e81e1343 SHA512 ebc15b3b7aa128a0ea3c671ab8ab1806c6e89ab567b5cd39a194eec775f272fa6698c1423ce18fd54dbd552706080c5db75d31c7f362575c01e778fbf33b59da WHIRLPOOL 23f2c8287a72ce1b6e2390f3fa1413c1b96f1977fafed3e066feaf1eee834e8b0a17b409efa46ee5cb6273e9a96c14c3589bbefae51ee9a3be07f4bdd41fff16
-EBUILD postgresql-9.4.5-r2.ebuild 12763 SHA256 5a27da2a1c3f06db03f5e6a41092cbdd23c99a7a29a4262ebe3b1fa586a247d6 SHA512 39e26febe735a25188e3839b8264d14a86b64902ad589de616443be7fa312aedacafaa569e563e7ad09581d207d2909320169d961591b4acebcb71c5231d6a42 WHIRLPOOL d08ab8e0bffb97d130bd7a4b26a331de7f0f1f52a940f91509c9afae464c76f1c0e7120f6fb30390f0abab9d1918c1171f1db922cb1579806cb4c3724cc3b642
-EBUILD postgresql-9.4.6.ebuild 12758 SHA256 87097d88c3b3e5816ef46fbaf14078f68ca3fe1b643414afd39c774cc8038ebb SHA512 951674d8c104b1187977f9627f3f388b6a16832f2cfcf8233df6cb3fa1130781958d31628c7d097255011f51c51b79132a96e2d9da58e9a9027077f0001d7d81 WHIRLPOOL 0029d50e92a078988626ce810aa945432aab00232d0e8146eb0529f83ba327997d8cdeec1bc00fb112e98c0673eaf547ad7f182b7bac64df0a5ba7575e66546b
 EBUILD postgresql-9.4.7.ebuild 12758 SHA256 87097d88c3b3e5816ef46fbaf14078f68ca3fe1b643414afd39c774cc8038ebb SHA512 951674d8c104b1187977f9627f3f388b6a16832f2cfcf8233df6cb3fa1130781958d31628c7d097255011f51c51b79132a96e2d9da58e9a9027077f0001d7d81 WHIRLPOOL 0029d50e92a078988626ce810aa945432aab00232d0e8146eb0529f83ba327997d8cdeec1bc00fb112e98c0673eaf547ad7f182b7bac64df0a5ba7575e66546b
-EBUILD postgresql-9.4.8.ebuild 12767 SHA256 99ef5e41d05c9a7d1543143a3d7e748f15c626357d24b2032fd912c34a0c6fca SHA512 3a1f79a6e64eb9a901adae57bb1bc71991a3184c8436d1e94a0a1f051fe68728dfbdf612dff024ca0a26b1205e764910a015a113fc1b9b7dfada1b0e9fd8aecb WHIRLPOOL e3dbf67bf91b44508e6333ce0feb732161d3c47c731e20b38ef40c6f0d3df00e6950dbb1c3cfb6b59792eeaa16b6b78d1b4af3592d7e86855450dba588ae3b7e
 EBUILD postgresql-9.4.9.ebuild 12762 SHA256 d0f495311ea65cc5cd795cad57347d0d94c3bb4c9c4fd7e1325d74a57cec09b5 SHA512 6c6d4d3d083d19314513ff1de4545363c619fa55e5f0291dea413ad5d1e400ef1d4eb73d6c8360cc73ab35cfcd96bce89f178f92b2cd0c9552b612d5fd44df89 WHIRLPOOL 776811f9cdf5e4e9aa1fdd1ec94bb0ed8edda174c275eeb7e2e4071ce9ac81c032afeb68408bab750bde3a092aecede2582f0886d4e208dd812232a34d7406d5
-EBUILD postgresql-9.5.1.ebuild 12766 SHA256 4f93d298d22316f6b9b9e8f420c2c0b60c042441bf84e8ba272e82f1e7566c62 SHA512 f3828f6faae8c637a2e84b539e95ca527f132cccf2e9e5407e01303f71c3219895bea62c1f6fa043f92000f51d770aaa5614b724b00e88915b6574e55e452e00 WHIRLPOOL 2319afa71e6d2f1244e77444c933c9ac8c29379a1a4ad2bebc912475aa41fd3a0395063c4dc5393c356e4fcec53f3a2cec7f89e341ed393fb34c63232ceb816f
 EBUILD postgresql-9.5.2.ebuild 12770 SHA256 b95b68472104693b411a0d7526a59886e0f700068bb431f2689c9be572f9ff80 SHA512 36b325c1b21c474f31ca300127e9f73751dc794a7830d4e1c044ecaf6926d4eeed3093e8884c9240e02fa17f166fcf98fbe47fed03d0394d20351c8cbcc26b66 WHIRLPOOL a614d8f850968c66f3e2b965b3a852e94229f31b14c80fedb185e37889d0df1d494c2fd55187e3ccb80f11f2ec84012dd9cf150401034ed1e941584dc867248f
-EBUILD postgresql-9.5.3.ebuild 13000 SHA256 c49b76df9663227f730e0284556df5ee66aeafc07a11bd8db5fc202e5a765f71 SHA512 a8022762eae86535dd323cc60f835d919bf8b7b1bccb15f44423d31d15edfa76484aba978c2b7042d36a8c27317b492e95a6baf97b59cfb255f90b3fece8fbec WHIRLPOOL fbd96f4734ee076bdd722c0e5efc99a67adf1ad0631f6b9bc8349135b043e98f04d743b7433be8f4be83ced6925755242452150f778456f15c3ac44968dec3dd
 EBUILD postgresql-9.5.4.ebuild 12996 SHA256 a9f3d56ac7777abede3ce79e87ab344a89ec2f013d7348e2d94d53947cdf7b3d SHA512 7773300f91e9958176527e882738b7be02214089152199452873d359c30db232684ca6e371d0080923881ed3e2f16f7c3405533536a80de03fee811b6a79319c WHIRLPOOL 3e12652e39f9e475045f569becd437b2305f4ea6b8ee7f4865841c4807e479911c5a7340310762429ca55d1ba5a57f2e1f153c3c2089c5e405a4e56f0aa84ad8
 EBUILD postgresql-9.6.0.ebuild 12830 SHA256 645f343aae9727d3f3f423e9a37272a09ea8779a6ec9168a33ca29a38b27801d SHA512 c789a5375da80cc25a5119a3e90d930d4fb8742642cf1ec6a25833f8984bc6faedd3e2a729ec8dad155e5adb6466801e194f74dcbbd8fb565cabe4006db19336 WHIRLPOOL a450bf327248118d09eea9b653dca4734f985f095c90bdb4e36af003414ad3e6a0fcaff2be84d823cc2bafa76bcfa99e2d4d2bd973f37056afd64981609ff7a5
 EBUILD postgresql-9999.ebuild 11248 SHA256 41c06028cc4e2a4cded1e8508ac5fc6d762e54c79a7f3ce3d72722abe3c21ab0 SHA512 9293bc955bef8dc57523b4eafcde2a0d49521344b04ec1f8b624471ed92a710fc17735b9a17af92150bc07e53b5bf02ba2ce2c1699662630ca94f92a947b8649 WHIRLPOOL fb3a154cfcc9d88ff4345804855164382904236cdcf87c23e509e7fd42e7fc5c4be5e24f61cdee8a147088de4765ed07df7748173d421ad2b77a893cf32d8ba5
-MISC ChangeLog 30802 SHA256 679d6548141e57917be058351d7a4880eef13646b3f64b01aedd608c2b866689 SHA512 ff9d90238246bc567b4ecf2385022db2b85a9e9a4c8881f5f128af1ba21c415fe9ee6098e51d06f868aa66767b7f7347fc44e9150b93b4e3825fef00042a47dc WHIRLPOOL a316c8f778c150003a8831f0f820e3c4887a682d895ac5891418b714e5fd44bff08f717325802181be034f4654d6ab3a456e9a2916a395c28e0836b1361328e1
+MISC ChangeLog 31428 SHA256 45861164662262ae8e255cf7993264534dd29bcc7966793bd96fb267488b8d3f SHA512 973990d1ad0594568239f9ade8eb92989e11a7cd41ee1b8618bd3b4c17f71471fec075889d377be4e8490b01e64f1ae725a224fdd223476164b5bc623f723120 WHIRLPOOL d5fa27ea1fec96baae5d0f556f4b27a651992cb0ecc3e0d1d0a8519eadcd01ef5b895719f40573769192ebd0e86ce2ee057dc1f81468032279f6c9884a912e65
 MISC ChangeLog-2015 18629 SHA256 4f6c87a86705d9d4597dcbd319d207c8b45f4dba38455f1466bdcdaffb65ba1d SHA512 2604c3af8d03fff5f293c30b5c6bbfc801c0b99fa5d20021b365795e2af50cc65c73972fb643e594720e28ccf5e873503550eeedef262375da63b29442e80c96 WHIRLPOOL 760146d15f3f656816be71d4d4b27823975ecc37c13f03766c38a0b8a3c2cabf15bec3da2c01d843859e277937815e85532a17327650dc221c4d22d01fece293
 MISC metadata.xml 751 SHA256 97274deca46bb3ef708b8fe348946d9119220d8ba34bf90c0044675a00eeb5f2 SHA512 726f30ec991194427b2dbcdf650778dbe0f169cb305d569918404d403deef397aef7ec3f1a5269c15f7ec7fc5506dc534203323379f1d0acc475eeb8d75d0cf1 WHIRLPOOL 8372aaaaa2044be729eaa5d2e620dff368f16bacd450a48b048338a51f1500fc85fe5865d68f3e06b783732e823566b6dc7b7bc4f6149893cda8e452daefc331
diff --git a/dev-db/postgresql/postgresql-9.0.23-r1.ebuild b/dev-db/postgresql/postgresql-9.0.23-r1.ebuild
deleted file mode 100644
index 508707d..0000000
--- a/dev-db/postgresql/postgresql-9.0.23-r1.ebuild
+++ /dev/null
@@ -1,380 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-# Testing within Portage's environment is broken, and the patch no
-# longer applies cleanly.
-RESTRICT="test"
-
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
-		systemd user versionator
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
-
-SLOT="$(get_version_component_range 1-2)"
-
-SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
-
-LICENSE="POSTGRESQL GPL-2"
-DESCRIPTION="PostgreSQL RDBMS"
-HOMEPAGE="http://www.postgresql.org/"
-
-LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr
-		 zh_CN zh_TW"
-IUSE="doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python
-	  +readline selinux +server ssl static-libs tcl threads uuid xml zlib"
-
-for lingua in ${LINGUAS}; do
-	IUSE+=" linguas_${lingua}"
-done
-
-wanted_languages() {
-	local enable_langs
-
-	for lingua in ${LINGUAS} ; do
-		use linguas_${lingua} && enable_langs+="${lingua} "
-	done
-
-	echo -n ${enable_langs}
-}
-
-CDEPEND="
->=app-eselect/eselect-postgresql-1.2.0
-sys-apps/less
-virtual/libintl
-kerberos? ( virtual/krb5 )
-ldap? ( net-nds/openldap )
-pam? ( virtual/pam )
-perl? ( >=dev-lang/perl-5.8:= )
-python? ( ${PYTHON_DEPS} )
-readline? ( sys-libs/readline:0= )
-ssl? (
-	!libressl? ( >=dev-libs/openssl-0.9.6-r1:0= )
-	libressl? ( dev-libs/libressl:= )
-)
-tcl? ( >=dev-lang/tcl-8:0= )
-uuid? ( dev-libs/ossp-uuid )
-xml? ( dev-libs/libxml2 dev-libs/libxslt )
-zlib? ( sys-libs/zlib )
-"
-
-DEPEND="${CDEPEND}
-!!<sys-apps/sandbox-2.0
-sys-devel/bison
-sys-devel/flex
-nls? ( sys-devel/gettext )
-xml? ( virtual/pkgconfig )
-"
-
-RDEPEND="${CDEPEND}
-!dev-db/postgresql-docs:${SLOT}
-!dev-db/postgresql-base:${SLOT}
-!dev-db/postgresql-server:${SLOT}
-selinux? ( sec-policy/selinux-postgresql )
-"
-
-pkg_setup() {
-	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
-
-	enewgroup postgres 70
-	enewuser postgres 70 /bin/sh /var/lib/postgresql postgres
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Work around PPC{,64} compilation bug where bool is already defined
-	sed '/#ifndef __cplusplus/a #undef bool' -i src/include/c.h || die
-
-	# Set proper run directory
-	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
-		-i src/include/pg_config_manual.h || die
-
-	epatch "${FILESDIR}/pg_ctl-exit-status.patch"
-
-	use server || epatch "${FILESDIR}/${PN}-${SLOT}-no-server.patch"
-
-	if use pam ; then
-		sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
-			-i src/backend/libpq/auth.c || \
-			die 'PGSQL_PAM_SERVICE rename failed.'
-	fi
-
-	epatch_user
-}
-
-src_configure() {
-	case ${CHOST} in
-		*-darwin*|*-solaris*)
-			use nls && append-libs intl
-			;;
-	esac
-
-	export LDFLAGS_SL="${LDFLAGS}"
-	export LDFLAGS_EX="${LDFLAGS}"
-
-	local PO="${EPREFIX%/}"
-
-	econf \
-		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
-		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
-		--docdir="${PO}/usr/share/doc/${PF}" \
-		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
-		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
-		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
-		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
-		$(use_enable !pg_legacytimestamp integer-datetimes) \
-		$(use_enable threads thread-safety) \
-		$(use_with kerberos gssapi) \
-		$(use_with kerberos krb5) \
-		$(use_with ldap) \
-		$(use_with pam) \
-		$(use_with perl) \
-		$(use_with python) \
-		$(use_with readline) \
-		$(use_with ssl openssl) \
-		$(use_with tcl) \
-		$(use_with uuid ossp-uuid) \
-		$(use_with xml libxml) \
-		$(use_with xml libxslt) \
-		$(use_with zlib) \
-		"$(use_enable nls nls "$(wanted_languages)")"
-}
-
-src_compile() {
-	emake
-	emake -C contrib
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	emake DESTDIR="${D}" install -C contrib
-
-	dodoc README HISTORY doc/{TODO,bug.template}
-
-	# man pages are already built, but if we have the target make them,
-	# they'll be generated from source before being installed so we
-	# manually install man pages.
-	# We use ${SLOT} instead of doman for postgresql.eselect
-	insinto /usr/share/postgresql-${SLOT}/man/
-	doins -r doc/src/sgml/man{1,3,7}
-	if ! use server; then
-		# Remove man pages for non-existent binaries
-		for m in {initdb,pg_{controldata,ctl,resetxlog},post{gres,master}}; do
-			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
-		done
-	fi
-	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
-
-	insinto /etc/postgresql-${SLOT}
-	newins src/bin/psql/psqlrc.sample psqlrc
-
-	dodir /etc/eselect/postgresql/slots/${SLOT}
-	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
-		"${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
-
-	use static-libs || find "${ED}" -name '*.a' -delete
-
-	if use doc ; then
-		docinto html
-		dodoc doc/src/sgml/html/*
-
-		docinto sgml
-		dodoc doc/src/sgml/*.{sgml,dsl}
-	fi
-
-	if use server; then
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.confd" | newconfd - ${PN}-${SLOT}
-
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.init-pre_9.2" | newinitd - ${PN}-${SLOT}
-
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.service" | \
-			systemd_newunit - ${PN}-${SLOT}.service
-
-		newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
-
-		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
-
-		if use prefix ; then
-			keepdir /run/postgresql
-			fperms 0775 /run/postgresql
-		fi
-	fi
-}
-
-pkg_postinst() {
-	postgresql-config update
-
-	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
-
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog
-		elog "It looks like this is your first time installing PostgreSQL. Run the"
-		elog "following command in all active shells to pick up changes to the default"
-		elog "environment:"
-		elog "    source /etc/profile"
-	fi
-
-	if use server ; then
-		elog
-		elog "Gentoo specific documentation:"
-		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
-		elog
-		elog "Official documentation:"
-		elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
-		elog
-		elog "The default location of the Unix-domain socket is:"
-		elog "    ${EROOT%/}/run/postgresql/"
-		elog
-		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
-		elog "so that it contains your preferred locale in:"
-		elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-		elog
-		elog "Then, execute the following command to setup the initial database"
-		elog "environment:"
-		elog "    emerge --config =${CATEGORY}/${PF}"
-	fi
-}
-
-pkg_prerm() {
-	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
-		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
-		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
-
-		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
-		sleep 10
-		eend 0
-	fi
-}
-
-pkg_postrm() {
-	postgresql-config update
-}
-
-pkg_config() {
-	use server || die "USE flag 'server' not enabled. Nothing to configure."
-
-	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
-		&& source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
-	[[ -z "${DATA_DIR}" ]] \
-		&& DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
-
-	# environment.bz2 may not contain the same locale as the current system
-	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
-		unset LANG
-		unset LC_CTYPE
-		unset LC_NUMERIC
-		unset LC_TIME
-		unset LC_COLLATE
-		unset LC_MONETARY
-		unset LC_MESSAGES
-		unset LC_ALL
-		source "${EROOT%/}/etc/env.d/02locale"
-		[ -n "${LANG}" ] && export LANG
-		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
-		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
-		[ -n "${LC_TIME}" ] && export LC_TIME
-		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
-		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
-		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
-		[ -n "${LC_ALL}" ] && export LC_ALL
-	fi
-
-	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	einfo
-	einfo "Information on options that can be passed to initdb are found at:"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
-	einfo
-	einfo "PG_INITDB_OPTS is currently set to:"
-	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
-		einfo "    (none)"
-	else
-		einfo "    ${PG_INITDB_OPTS}"
-	fi
-	einfo
-	einfo "Configuration files will be installed to:"
-	einfo "    ${PGDATA}"
-	einfo
-	einfo "The database cluster will be created in:"
-	einfo "    ${DATA_DIR}"
-	einfo
-	while [ "$correct" != "true" ] ; do
-		einfo "Are you ready to continue? (y/n)"
-		read answer
-		if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
-			correct="true"
-		elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
-			die "Aborting initialization."
-		else
-			echo "Answer not recognized"
-		fi
-	done
-
-	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
-		eerror "The given directory, '${DATA_DIR}', is not empty."
-		eerror "Modify DATA_DIR to point to an empty directory."
-		die "${DATA_DIR} is not empty."
-	fi
-
-	einfo "Creating the data directory ..."
-	if [[ ${EUID} == 0 ]] ; then
-		mkdir -p "${DATA_DIR}"
-		chown -Rf postgres:postgres "${DATA_DIR}"
-		chmod 0700 "${DATA_DIR}"
-	fi
-
-	einfo "Initializing the database ..."
-
-	if [[ ${EUID} == 0 ]] ; then
-		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
-	else
-		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
-	fi
-
-	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
-		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
-		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
-	fi
-
-	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
-		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
-		# On the off-chance that you might need to work with UTF-8 encoded
-		# characters in PL/Perl
-		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
-	EOF
-
-	einfo "The autovacuum function, which was in contrib, has been moved to the main"
-	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
-	einfo "by default. You can disable it in the cluster's:"
-	einfo "    ${PGDATA%/}/postgresql.conf"
-	einfo
-	einfo "The PostgreSQL server, by default, will log events to:"
-	einfo "    ${DATA_DIR%/}/postmaster.log"
-	einfo
-	if use prefix ; then
-		einfo "The location of the configuration files have moved to:"
-		einfo "    ${PGDATA}"
-		einfo "To start the server:"
-		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
-		einfo "To stop:"
-		einfo "    pg_ctl stop -D ${DATA_DIR}"
-		einfo
-		einfo "Or move the configuration files back:"
-		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
-	else
-		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	fi
-}
diff --git a/dev-db/postgresql/postgresql-9.1.19-r1.ebuild b/dev-db/postgresql/postgresql-9.1.19-r1.ebuild
deleted file mode 100644
index aeb559b..0000000
--- a/dev-db/postgresql/postgresql-9.1.19-r1.ebuild
+++ /dev/null
@@ -1,384 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-# Testing within Portage's environment is broken, and the patch no
-# longer applies cleanly.
-RESTRICT="test"
-
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
-		systemd user versionator
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
-
-SLOT="$(get_version_component_range 1-2)"
-
-SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
-
-LICENSE="POSTGRESQL GPL-2"
-DESCRIPTION="PostgreSQL RDBMS"
-HOMEPAGE="http://www.postgresql.org/"
-
-LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr
-		 zh_CN zh_TW"
-IUSE="doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python
-	  +readline selinux +server ssl static-libs tcl threads uuid xml zlib"
-
-for lingua in ${LINGUAS}; do
-	IUSE+=" linguas_${lingua}"
-done
-
-wanted_languages() {
-	local enable_langs
-
-	for lingua in ${LINGUAS} ; do
-		use linguas_${lingua} && enable_langs+="${lingua} "
-	done
-
-	echo -n ${enable_langs}
-}
-
-CDEPEND="
->=app-eselect/eselect-postgresql-1.2.0
-sys-apps/less
-virtual/libintl
-kerberos? ( virtual/krb5 )
-ldap? ( net-nds/openldap )
-pam? ( virtual/pam )
-perl? ( >=dev-lang/perl-5.8:= )
-python? ( ${PYTHON_DEPS} )
-readline? ( sys-libs/readline:0= )
-ssl? (
-	!libressl? ( >=dev-libs/openssl-0.9.6-r1:0= )
-	libressl? ( dev-libs/libressl:= )
-)
-tcl? ( >=dev-lang/tcl-8:0= )
-uuid? ( dev-libs/ossp-uuid )
-xml? ( dev-libs/libxml2 dev-libs/libxslt )
-zlib? ( sys-libs/zlib )
-"
-
-DEPEND="${CDEPEND}
-!!<sys-apps/sandbox-2.0
-sys-devel/bison
-sys-devel/flex
-nls? ( sys-devel/gettext )
-xml? ( virtual/pkgconfig )
-"
-
-RDEPEND="${CDEPEND}
-!dev-db/postgresql-docs:${SLOT}
-!dev-db/postgresql-base:${SLOT}
-!dev-db/postgresql-server:${SLOT}
-selinux? ( sec-policy/selinux-postgresql )
-"
-
-pkg_setup() {
-	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
-
-	enewgroup postgres 70
-	enewuser postgres 70 /bin/sh /var/lib/postgresql postgres
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Work around PPC{,64} compilation bug where bool is already defined
-	sed '/#ifndef __cplusplus/a #undef bool' -i src/include/c.h || die
-
-	# Set proper run directory
-	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
-		-i src/include/pg_config_manual.h || die
-
-	epatch "${FILESDIR}/pg_ctl-exit-status.patch"
-
-	use server || epatch "${FILESDIR}/${PN}-${SLOT}-no-server.patch"
-
-	# Fix bug 486556 where the server would crash at start up because of
-	# an infinite loop caused by a self-referencing symlink.
-	epatch "${FILESDIR}/postgresql-9.1-tz-dir-overflow.patch"
-
-	if use pam ; then
-		sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
-			-i src/backend/libpq/auth.c || \
-			die 'PGSQL_PAM_SERVICE rename failed.'
-	fi
-
-	epatch_user
-}
-
-src_configure() {
-	case ${CHOST} in
-		*-darwin*|*-solaris*)
-			use nls && append-libs intl
-			;;
-	esac
-
-	export LDFLAGS_SL="${LDFLAGS}"
-	export LDFLAGS_EX="${LDFLAGS}"
-
-	local PO="${EPREFIX%/}"
-
-	econf \
-		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
-		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
-		--docdir="${PO}/usr/share/doc/${PF}" \
-		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
-		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
-		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
-		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
-		$(use_enable !pg_legacytimestamp integer-datetimes) \
-		$(use_enable threads thread-safety) \
-		$(use_with kerberos gssapi) \
-		$(use_with kerberos krb5) \
-		$(use_with ldap) \
-		$(use_with pam) \
-		$(use_with perl) \
-		$(use_with python) \
-		$(use_with readline) \
-		$(use_with ssl openssl) \
-		$(use_with tcl) \
-		$(use_with uuid ossp-uuid) \
-		$(use_with xml libxml) \
-		$(use_with xml libxslt) \
-		$(use_with zlib) \
-		"$(use_enable nls nls "$(wanted_languages)")"
-}
-
-src_compile() {
-	emake
-	emake -C contrib
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	emake DESTDIR="${D}" install -C contrib
-
-	dodoc README HISTORY doc/{TODO,bug.template}
-
-	# man pages are already built, but if we have the target make them,
-	# they'll be generated from source before being installed so we
-	# manually install man pages.
-	# We use ${SLOT} instead of doman for postgresql.eselect
-	insinto /usr/share/postgresql-${SLOT}/man/
-	doins -r doc/src/sgml/man{1,3,7}
-	if ! use server; then
-		# Remove man pages for non-existent binaries
-		for m in {initdb,pg_{controldata,ctl,resetxlog},post{gres,master}}; do
-			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
-		done
-	fi
-	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
-
-	insinto /etc/postgresql-${SLOT}
-	newins src/bin/psql/psqlrc.sample psqlrc
-
-	dodir /etc/eselect/postgresql/slots/${SLOT}
-	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
-		"${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
-
-	use static-libs || find "${ED}" -name '*.a' -delete
-
-	if use doc ; then
-		docinto html
-		dodoc doc/src/sgml/html/*
-
-		docinto sgml
-		dodoc doc/src/sgml/*.{sgml,dsl}
-	fi
-
-	if use server; then
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.confd" | newconfd - ${PN}-${SLOT}
-
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.init-pre_9.2" | newinitd - ${PN}-${SLOT}
-
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.service" | \
-			systemd_newunit - ${PN}-${SLOT}.service
-
-		newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
-
-		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
-
-		if use prefix ; then
-			keepdir /run/postgresql
-			fperms 0775 /run/postgresql
-		fi
-	fi
-}
-
-pkg_postinst() {
-	postgresql-config update
-
-	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
-
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog
-		elog "It looks like this is your first time installing PostgreSQL. Run the"
-		elog "following command in all active shells to pick up changes to the default"
-		elog "environment:"
-		elog "    source /etc/profile"
-	fi
-
-	if use server ; then
-		elog
-		elog "Gentoo specific documentation:"
-		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
-		elog
-		elog "Official documentation:"
-		elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
-		elog
-		elog "The default location of the Unix-domain socket is:"
-		elog "    ${EROOT%/}/run/postgresql/"
-		elog
-		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
-		elog "so that it contains your preferred locale in:"
-		elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-		elog
-		elog "Then, execute the following command to setup the initial database"
-		elog "environment:"
-		elog "    emerge --config =${CATEGORY}/${PF}"
-	fi
-}
-
-pkg_prerm() {
-	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
-		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
-		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
-
-		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
-		sleep 10
-		eend 0
-	fi
-}
-
-pkg_postrm() {
-	postgresql-config update
-}
-
-pkg_config() {
-	use server || die "USE flag 'server' not enabled. Nothing to configure."
-
-	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
-		&& source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
-	[[ -z "${DATA_DIR}" ]] \
-		&& DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
-
-	# environment.bz2 may not contain the same locale as the current system
-	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
-		unset LANG
-		unset LC_CTYPE
-		unset LC_NUMERIC
-		unset LC_TIME
-		unset LC_COLLATE
-		unset LC_MONETARY
-		unset LC_MESSAGES
-		unset LC_ALL
-		source "${EROOT%/}/etc/env.d/02locale"
-		[ -n "${LANG}" ] && export LANG
-		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
-		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
-		[ -n "${LC_TIME}" ] && export LC_TIME
-		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
-		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
-		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
-		[ -n "${LC_ALL}" ] && export LC_ALL
-	fi
-
-	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	einfo
-	einfo "Information on options that can be passed to initdb are found at:"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
-	einfo
-	einfo "PG_INITDB_OPTS is currently set to:"
-	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
-		einfo "    (none)"
-	else
-		einfo "    ${PG_INITDB_OPTS}"
-	fi
-	einfo
-	einfo "Configuration files will be installed to:"
-	einfo "    ${PGDATA}"
-	einfo
-	einfo "The database cluster will be created in:"
-	einfo "    ${DATA_DIR}"
-	einfo
-	while [ "$correct" != "true" ] ; do
-		einfo "Are you ready to continue? (y/n)"
-		read answer
-		if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
-			correct="true"
-		elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
-			die "Aborting initialization."
-		else
-			echo "Answer not recognized"
-		fi
-	done
-
-	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
-		eerror "The given directory, '${DATA_DIR}', is not empty."
-		eerror "Modify DATA_DIR to point to an empty directory."
-		die "${DATA_DIR} is not empty."
-	fi
-
-	einfo "Creating the data directory ..."
-	if [[ ${EUID} == 0 ]] ; then
-		mkdir -p "${DATA_DIR}"
-		chown -Rf postgres:postgres "${DATA_DIR}"
-		chmod 0700 "${DATA_DIR}"
-	fi
-
-	einfo "Initializing the database ..."
-
-	if [[ ${EUID} == 0 ]] ; then
-		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
-	else
-		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
-	fi
-
-	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
-		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
-		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
-	fi
-
-	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
-		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
-		# On the off-chance that you might need to work with UTF-8 encoded
-		# characters in PL/Perl
-		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
-	EOF
-
-	einfo "The autovacuum function, which was in contrib, has been moved to the main"
-	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
-	einfo "by default. You can disable it in the cluster's:"
-	einfo "    ${PGDATA%/}/postgresql.conf"
-	einfo
-	einfo "The PostgreSQL server, by default, will log events to:"
-	einfo "    ${DATA_DIR%/}/postmaster.log"
-	einfo
-	if use prefix ; then
-		einfo "The location of the configuration files have moved to:"
-		einfo "    ${PGDATA}"
-		einfo "To start the server:"
-		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
-		einfo "To stop:"
-		einfo "    pg_ctl stop -D ${DATA_DIR}"
-		einfo
-		einfo "Or move the configuration files back:"
-		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
-	else
-		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	fi
-}
diff --git a/dev-db/postgresql/postgresql-9.1.20.ebuild b/dev-db/postgresql/postgresql-9.1.20.ebuild
deleted file mode 100644
index aeb559b..0000000
--- a/dev-db/postgresql/postgresql-9.1.20.ebuild
+++ /dev/null
@@ -1,384 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-# Testing within Portage's environment is broken, and the patch no
-# longer applies cleanly.
-RESTRICT="test"
-
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
-		systemd user versionator
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
-
-SLOT="$(get_version_component_range 1-2)"
-
-SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
-
-LICENSE="POSTGRESQL GPL-2"
-DESCRIPTION="PostgreSQL RDBMS"
-HOMEPAGE="http://www.postgresql.org/"
-
-LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr
-		 zh_CN zh_TW"
-IUSE="doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python
-	  +readline selinux +server ssl static-libs tcl threads uuid xml zlib"
-
-for lingua in ${LINGUAS}; do
-	IUSE+=" linguas_${lingua}"
-done
-
-wanted_languages() {
-	local enable_langs
-
-	for lingua in ${LINGUAS} ; do
-		use linguas_${lingua} && enable_langs+="${lingua} "
-	done
-
-	echo -n ${enable_langs}
-}
-
-CDEPEND="
->=app-eselect/eselect-postgresql-1.2.0
-sys-apps/less
-virtual/libintl
-kerberos? ( virtual/krb5 )
-ldap? ( net-nds/openldap )
-pam? ( virtual/pam )
-perl? ( >=dev-lang/perl-5.8:= )
-python? ( ${PYTHON_DEPS} )
-readline? ( sys-libs/readline:0= )
-ssl? (
-	!libressl? ( >=dev-libs/openssl-0.9.6-r1:0= )
-	libressl? ( dev-libs/libressl:= )
-)
-tcl? ( >=dev-lang/tcl-8:0= )
-uuid? ( dev-libs/ossp-uuid )
-xml? ( dev-libs/libxml2 dev-libs/libxslt )
-zlib? ( sys-libs/zlib )
-"
-
-DEPEND="${CDEPEND}
-!!<sys-apps/sandbox-2.0
-sys-devel/bison
-sys-devel/flex
-nls? ( sys-devel/gettext )
-xml? ( virtual/pkgconfig )
-"
-
-RDEPEND="${CDEPEND}
-!dev-db/postgresql-docs:${SLOT}
-!dev-db/postgresql-base:${SLOT}
-!dev-db/postgresql-server:${SLOT}
-selinux? ( sec-policy/selinux-postgresql )
-"
-
-pkg_setup() {
-	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
-
-	enewgroup postgres 70
-	enewuser postgres 70 /bin/sh /var/lib/postgresql postgres
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Work around PPC{,64} compilation bug where bool is already defined
-	sed '/#ifndef __cplusplus/a #undef bool' -i src/include/c.h || die
-
-	# Set proper run directory
-	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
-		-i src/include/pg_config_manual.h || die
-
-	epatch "${FILESDIR}/pg_ctl-exit-status.patch"
-
-	use server || epatch "${FILESDIR}/${PN}-${SLOT}-no-server.patch"
-
-	# Fix bug 486556 where the server would crash at start up because of
-	# an infinite loop caused by a self-referencing symlink.
-	epatch "${FILESDIR}/postgresql-9.1-tz-dir-overflow.patch"
-
-	if use pam ; then
-		sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
-			-i src/backend/libpq/auth.c || \
-			die 'PGSQL_PAM_SERVICE rename failed.'
-	fi
-
-	epatch_user
-}
-
-src_configure() {
-	case ${CHOST} in
-		*-darwin*|*-solaris*)
-			use nls && append-libs intl
-			;;
-	esac
-
-	export LDFLAGS_SL="${LDFLAGS}"
-	export LDFLAGS_EX="${LDFLAGS}"
-
-	local PO="${EPREFIX%/}"
-
-	econf \
-		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
-		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
-		--docdir="${PO}/usr/share/doc/${PF}" \
-		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
-		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
-		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
-		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
-		$(use_enable !pg_legacytimestamp integer-datetimes) \
-		$(use_enable threads thread-safety) \
-		$(use_with kerberos gssapi) \
-		$(use_with kerberos krb5) \
-		$(use_with ldap) \
-		$(use_with pam) \
-		$(use_with perl) \
-		$(use_with python) \
-		$(use_with readline) \
-		$(use_with ssl openssl) \
-		$(use_with tcl) \
-		$(use_with uuid ossp-uuid) \
-		$(use_with xml libxml) \
-		$(use_with xml libxslt) \
-		$(use_with zlib) \
-		"$(use_enable nls nls "$(wanted_languages)")"
-}
-
-src_compile() {
-	emake
-	emake -C contrib
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	emake DESTDIR="${D}" install -C contrib
-
-	dodoc README HISTORY doc/{TODO,bug.template}
-
-	# man pages are already built, but if we have the target make them,
-	# they'll be generated from source before being installed so we
-	# manually install man pages.
-	# We use ${SLOT} instead of doman for postgresql.eselect
-	insinto /usr/share/postgresql-${SLOT}/man/
-	doins -r doc/src/sgml/man{1,3,7}
-	if ! use server; then
-		# Remove man pages for non-existent binaries
-		for m in {initdb,pg_{controldata,ctl,resetxlog},post{gres,master}}; do
-			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
-		done
-	fi
-	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
-
-	insinto /etc/postgresql-${SLOT}
-	newins src/bin/psql/psqlrc.sample psqlrc
-
-	dodir /etc/eselect/postgresql/slots/${SLOT}
-	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
-		"${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
-
-	use static-libs || find "${ED}" -name '*.a' -delete
-
-	if use doc ; then
-		docinto html
-		dodoc doc/src/sgml/html/*
-
-		docinto sgml
-		dodoc doc/src/sgml/*.{sgml,dsl}
-	fi
-
-	if use server; then
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.confd" | newconfd - ${PN}-${SLOT}
-
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.init-pre_9.2" | newinitd - ${PN}-${SLOT}
-
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.service" | \
-			systemd_newunit - ${PN}-${SLOT}.service
-
-		newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
-
-		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
-
-		if use prefix ; then
-			keepdir /run/postgresql
-			fperms 0775 /run/postgresql
-		fi
-	fi
-}
-
-pkg_postinst() {
-	postgresql-config update
-
-	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
-
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog
-		elog "It looks like this is your first time installing PostgreSQL. Run the"
-		elog "following command in all active shells to pick up changes to the default"
-		elog "environment:"
-		elog "    source /etc/profile"
-	fi
-
-	if use server ; then
-		elog
-		elog "Gentoo specific documentation:"
-		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
-		elog
-		elog "Official documentation:"
-		elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
-		elog
-		elog "The default location of the Unix-domain socket is:"
-		elog "    ${EROOT%/}/run/postgresql/"
-		elog
-		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
-		elog "so that it contains your preferred locale in:"
-		elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-		elog
-		elog "Then, execute the following command to setup the initial database"
-		elog "environment:"
-		elog "    emerge --config =${CATEGORY}/${PF}"
-	fi
-}
-
-pkg_prerm() {
-	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
-		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
-		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
-
-		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
-		sleep 10
-		eend 0
-	fi
-}
-
-pkg_postrm() {
-	postgresql-config update
-}
-
-pkg_config() {
-	use server || die "USE flag 'server' not enabled. Nothing to configure."
-
-	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
-		&& source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
-	[[ -z "${DATA_DIR}" ]] \
-		&& DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
-
-	# environment.bz2 may not contain the same locale as the current system
-	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
-		unset LANG
-		unset LC_CTYPE
-		unset LC_NUMERIC
-		unset LC_TIME
-		unset LC_COLLATE
-		unset LC_MONETARY
-		unset LC_MESSAGES
-		unset LC_ALL
-		source "${EROOT%/}/etc/env.d/02locale"
-		[ -n "${LANG}" ] && export LANG
-		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
-		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
-		[ -n "${LC_TIME}" ] && export LC_TIME
-		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
-		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
-		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
-		[ -n "${LC_ALL}" ] && export LC_ALL
-	fi
-
-	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	einfo
-	einfo "Information on options that can be passed to initdb are found at:"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
-	einfo
-	einfo "PG_INITDB_OPTS is currently set to:"
-	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
-		einfo "    (none)"
-	else
-		einfo "    ${PG_INITDB_OPTS}"
-	fi
-	einfo
-	einfo "Configuration files will be installed to:"
-	einfo "    ${PGDATA}"
-	einfo
-	einfo "The database cluster will be created in:"
-	einfo "    ${DATA_DIR}"
-	einfo
-	while [ "$correct" != "true" ] ; do
-		einfo "Are you ready to continue? (y/n)"
-		read answer
-		if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
-			correct="true"
-		elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
-			die "Aborting initialization."
-		else
-			echo "Answer not recognized"
-		fi
-	done
-
-	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
-		eerror "The given directory, '${DATA_DIR}', is not empty."
-		eerror "Modify DATA_DIR to point to an empty directory."
-		die "${DATA_DIR} is not empty."
-	fi
-
-	einfo "Creating the data directory ..."
-	if [[ ${EUID} == 0 ]] ; then
-		mkdir -p "${DATA_DIR}"
-		chown -Rf postgres:postgres "${DATA_DIR}"
-		chmod 0700 "${DATA_DIR}"
-	fi
-
-	einfo "Initializing the database ..."
-
-	if [[ ${EUID} == 0 ]] ; then
-		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
-	else
-		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
-	fi
-
-	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
-		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
-		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
-	fi
-
-	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
-		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
-		# On the off-chance that you might need to work with UTF-8 encoded
-		# characters in PL/Perl
-		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
-	EOF
-
-	einfo "The autovacuum function, which was in contrib, has been moved to the main"
-	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
-	einfo "by default. You can disable it in the cluster's:"
-	einfo "    ${PGDATA%/}/postgresql.conf"
-	einfo
-	einfo "The PostgreSQL server, by default, will log events to:"
-	einfo "    ${DATA_DIR%/}/postmaster.log"
-	einfo
-	if use prefix ; then
-		einfo "The location of the configuration files have moved to:"
-		einfo "    ${PGDATA}"
-		einfo "To start the server:"
-		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
-		einfo "To stop:"
-		einfo "    pg_ctl stop -D ${DATA_DIR}"
-		einfo
-		einfo "Or move the configuration files back:"
-		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
-	else
-		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	fi
-}
diff --git a/dev-db/postgresql/postgresql-9.1.22.ebuild b/dev-db/postgresql/postgresql-9.1.22.ebuild
deleted file mode 100644
index 6e1262f..0000000
--- a/dev-db/postgresql/postgresql-9.1.22.ebuild
+++ /dev/null
@@ -1,384 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-# Testing within Portage's environment is broken, and the patch no
-# longer applies cleanly.
-RESTRICT="test"
-
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
-		systemd user versionator
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
-
-SLOT="$(get_version_component_range 1-2)"
-
-SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
-
-LICENSE="POSTGRESQL GPL-2"
-DESCRIPTION="PostgreSQL RDBMS"
-HOMEPAGE="http://www.postgresql.org/"
-
-LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr
-		 zh_CN zh_TW"
-IUSE="doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python
-	  +readline selinux +server ssl static-libs tcl threads uuid xml zlib"
-
-for lingua in ${LINGUAS}; do
-	IUSE+=" linguas_${lingua}"
-done
-
-wanted_languages() {
-	local enable_langs
-
-	for lingua in ${LINGUAS} ; do
-		use linguas_${lingua} && enable_langs+="${lingua} "
-	done
-
-	echo -n ${enable_langs}
-}
-
-CDEPEND="
->=app-eselect/eselect-postgresql-1.2.0
-sys-apps/less
-virtual/libintl
-kerberos? ( virtual/krb5 )
-ldap? ( net-nds/openldap )
-pam? ( virtual/pam )
-perl? ( >=dev-lang/perl-5.8:= )
-python? ( ${PYTHON_DEPS} )
-readline? ( sys-libs/readline:0= )
-ssl? (
-	!libressl? ( >=dev-libs/openssl-0.9.6-r1:0= )
-	libressl? ( dev-libs/libressl:= )
-)
-tcl? ( >=dev-lang/tcl-8:0= )
-uuid? ( dev-libs/ossp-uuid )
-xml? ( dev-libs/libxml2 dev-libs/libxslt )
-zlib? ( sys-libs/zlib )
-"
-
-DEPEND="${CDEPEND}
-!!<sys-apps/sandbox-2.0
-sys-devel/bison
-sys-devel/flex
-nls? ( sys-devel/gettext )
-xml? ( virtual/pkgconfig )
-"
-
-RDEPEND="${CDEPEND}
-!dev-db/postgresql-docs:${SLOT}
-!dev-db/postgresql-base:${SLOT}
-!dev-db/postgresql-server:${SLOT}
-selinux? ( sec-policy/selinux-postgresql )
-"
-
-pkg_setup() {
-	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
-
-	enewgroup postgres 70
-	enewuser postgres 70 /bin/sh /var/lib/postgresql postgres
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Work around PPC{,64} compilation bug where bool is already defined
-	sed '/#ifndef __cplusplus/a #undef bool' -i src/include/c.h || die
-
-	# Set proper run directory
-	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
-		-i src/include/pg_config_manual.h || die
-
-	epatch "${FILESDIR}/pg_ctl-exit-status.patch"
-
-	use server || epatch "${FILESDIR}/${PN}-${SLOT}-no-server.patch"
-
-	# Fix bug 486556 where the server would crash at start up because of
-	# an infinite loop caused by a self-referencing symlink.
-	epatch "${FILESDIR}/postgresql-9.1-tz-dir-overflow.patch"
-
-	if use pam ; then
-		sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
-			-i src/backend/libpq/auth.c || \
-			die 'PGSQL_PAM_SERVICE rename failed.'
-	fi
-
-	epatch_user
-}
-
-src_configure() {
-	case ${CHOST} in
-		*-darwin*|*-solaris*)
-			use nls && append-libs intl
-			;;
-	esac
-
-	export LDFLAGS_SL="${LDFLAGS}"
-	export LDFLAGS_EX="${LDFLAGS}"
-
-	local PO="${EPREFIX%/}"
-
-	econf \
-		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
-		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
-		--docdir="${PO}/usr/share/doc/${PF}" \
-		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
-		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
-		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
-		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
-		$(use_enable !pg_legacytimestamp integer-datetimes) \
-		$(use_enable threads thread-safety) \
-		$(use_with kerberos gssapi) \
-		$(use_with kerberos krb5) \
-		$(use_with ldap) \
-		$(use_with pam) \
-		$(use_with perl) \
-		$(use_with python) \
-		$(use_with readline) \
-		$(use_with ssl openssl) \
-		$(use_with tcl) \
-		$(use_with uuid ossp-uuid) \
-		$(use_with xml libxml) \
-		$(use_with xml libxslt) \
-		$(use_with zlib) \
-		"$(use_enable nls nls "$(wanted_languages)")"
-}
-
-src_compile() {
-	emake
-	emake -C contrib
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	emake DESTDIR="${D}" install -C contrib
-
-	dodoc README HISTORY doc/{TODO,bug.template}
-
-	# man pages are already built, but if we have the target make them,
-	# they'll be generated from source before being installed so we
-	# manually install man pages.
-	# We use ${SLOT} instead of doman for postgresql.eselect
-	insinto /usr/share/postgresql-${SLOT}/man/
-	doins -r doc/src/sgml/man{1,3,7}
-	if ! use server; then
-		# Remove man pages for non-existent binaries
-		for m in {initdb,pg_{controldata,ctl,resetxlog},post{gres,master}}; do
-			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
-		done
-	fi
-	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
-
-	insinto /etc/postgresql-${SLOT}
-	newins src/bin/psql/psqlrc.sample psqlrc
-
-	dodir /etc/eselect/postgresql/slots/${SLOT}
-	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
-		"${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
-
-	use static-libs || find "${ED}" -name '*.a' -delete
-
-	if use doc ; then
-		docinto html
-		dodoc doc/src/sgml/html/*
-
-		docinto sgml
-		dodoc doc/src/sgml/*.{sgml,dsl}
-	fi
-
-	if use server; then
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.confd" | newconfd - ${PN}-${SLOT}
-
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.init-pre_9.2" | newinitd - ${PN}-${SLOT}
-
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.service" | \
-			systemd_newunit - ${PN}-${SLOT}.service
-
-		newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
-
-		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
-
-		if use prefix ; then
-			keepdir /run/postgresql
-			fperms 0775 /run/postgresql
-		fi
-	fi
-}
-
-pkg_postinst() {
-	postgresql-config update
-
-	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
-
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog
-		elog "It looks like this is your first time installing PostgreSQL. Run the"
-		elog "following command in all active shells to pick up changes to the default"
-		elog "environment:"
-		elog "    source /etc/profile"
-	fi
-
-	if use server ; then
-		elog
-		elog "Gentoo specific documentation:"
-		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
-		elog
-		elog "Official documentation:"
-		elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
-		elog
-		elog "The default location of the Unix-domain socket is:"
-		elog "    ${EROOT%/}/run/postgresql/"
-		elog
-		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
-		elog "so that it contains your preferred locale in:"
-		elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-		elog
-		elog "Then, execute the following command to setup the initial database"
-		elog "environment:"
-		elog "    emerge --config =${CATEGORY}/${PF}"
-	fi
-}
-
-pkg_prerm() {
-	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
-		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
-		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
-
-		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
-		sleep 10
-		eend 0
-	fi
-}
-
-pkg_postrm() {
-	postgresql-config update
-}
-
-pkg_config() {
-	use server || die "USE flag 'server' not enabled. Nothing to configure."
-
-	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
-		&& source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
-	[[ -z "${DATA_DIR}" ]] \
-		&& DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
-
-	# environment.bz2 may not contain the same locale as the current system
-	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
-		unset LANG
-		unset LC_CTYPE
-		unset LC_NUMERIC
-		unset LC_TIME
-		unset LC_COLLATE
-		unset LC_MONETARY
-		unset LC_MESSAGES
-		unset LC_ALL
-		source "${EROOT%/}/etc/env.d/02locale"
-		[ -n "${LANG}" ] && export LANG
-		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
-		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
-		[ -n "${LC_TIME}" ] && export LC_TIME
-		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
-		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
-		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
-		[ -n "${LC_ALL}" ] && export LC_ALL
-	fi
-
-	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	einfo
-	einfo "Information on options that can be passed to initdb are found at:"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
-	einfo
-	einfo "PG_INITDB_OPTS is currently set to:"
-	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
-		einfo "    (none)"
-	else
-		einfo "    ${PG_INITDB_OPTS}"
-	fi
-	einfo
-	einfo "Configuration files will be installed to:"
-	einfo "    ${PGDATA}"
-	einfo
-	einfo "The database cluster will be created in:"
-	einfo "    ${DATA_DIR}"
-	einfo
-	while [ "$correct" != "true" ] ; do
-		einfo "Are you ready to continue? (y/n)"
-		read answer
-		if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
-			correct="true"
-		elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
-			die "Aborting initialization."
-		else
-			echo "Answer not recognized"
-		fi
-	done
-
-	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
-		eerror "The given directory, '${DATA_DIR}', is not empty."
-		eerror "Modify DATA_DIR to point to an empty directory."
-		die "${DATA_DIR} is not empty."
-	fi
-
-	einfo "Creating the data directory ..."
-	if [[ ${EUID} == 0 ]] ; then
-		mkdir -p "${DATA_DIR}"
-		chown -Rf postgres:postgres "${DATA_DIR}"
-		chmod 0700 "${DATA_DIR}"
-	fi
-
-	einfo "Initializing the database ..."
-
-	if [[ ${EUID} == 0 ]] ; then
-		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
-	else
-		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
-	fi
-
-	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
-		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
-		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
-	fi
-
-	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
-		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
-		# On the off-chance that you might need to work with UTF-8 encoded
-		# characters in PL/Perl
-		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
-	EOF
-
-	einfo "The autovacuum function, which was in contrib, has been moved to the main"
-	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
-	einfo "by default. You can disable it in the cluster's:"
-	einfo "    ${PGDATA%/}/postgresql.conf"
-	einfo
-	einfo "The PostgreSQL server, by default, will log events to:"
-	einfo "    ${DATA_DIR%/}/postmaster.log"
-	einfo
-	if use prefix ; then
-		einfo "The location of the configuration files have moved to:"
-		einfo "    ${PGDATA}"
-		einfo "To start the server:"
-		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
-		einfo "To stop:"
-		einfo "    pg_ctl stop -D ${DATA_DIR}"
-		einfo
-		einfo "Or move the configuration files back:"
-		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
-	else
-		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	fi
-}
diff --git a/dev-db/postgresql/postgresql-9.2.14-r1.ebuild b/dev-db/postgresql/postgresql-9.2.14-r1.ebuild
deleted file mode 100644
index f76e1e3..0000000
--- a/dev-db/postgresql/postgresql-9.2.14-r1.ebuild
+++ /dev/null
@@ -1,394 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
-		systemd user versionator
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
-
-SLOT="$(get_version_component_range 1-2)"
-
-SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
-
-LICENSE="POSTGRESQL GPL-2"
-DESCRIPTION="PostgreSQL RDBMS"
-HOMEPAGE="http://www.postgresql.org/"
-
-LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr
-		 zh_CN zh_TW"
-IUSE="doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python
-	  +readline selinux +server ssl static-libs tcl threads uuid xml zlib"
-
-for lingua in ${LINGUAS}; do
-	IUSE+=" linguas_${lingua}"
-done
-
-wanted_languages() {
-	local enable_langs
-
-	for lingua in ${LINGUAS} ; do
-		use linguas_${lingua} && enable_langs+="${lingua} "
-	done
-
-	echo -n ${enable_langs}
-}
-
-CDEPEND="
->=app-eselect/eselect-postgresql-1.2.0
-sys-apps/less
-virtual/libintl
-kerberos? ( virtual/krb5 )
-ldap? ( net-nds/openldap )
-pam? ( virtual/pam )
-perl? ( >=dev-lang/perl-5.8:= )
-python? ( ${PYTHON_DEPS} )
-readline? ( sys-libs/readline:0= )
-ssl? (
-	!libressl? ( >=dev-libs/openssl-0.9.6-r1:0= )
-	libressl? ( dev-libs/libressl:= )
-)
-tcl? ( >=dev-lang/tcl-8:0= )
-uuid? ( dev-libs/ossp-uuid )
-xml? ( dev-libs/libxml2 dev-libs/libxslt )
-zlib? ( sys-libs/zlib )
-"
-
-DEPEND="${CDEPEND}
-!!<sys-apps/sandbox-2.0
-sys-devel/bison
-sys-devel/flex
-nls? ( sys-devel/gettext )
-xml? ( virtual/pkgconfig )
-"
-
-RDEPEND="${CDEPEND}
-!dev-db/postgresql-docs:${SLOT}
-!dev-db/postgresql-base:${SLOT}
-!dev-db/postgresql-server:${SLOT}
-selinux? ( sec-policy/selinux-postgresql )
-"
-
-pkg_setup() {
-	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
-
-	enewgroup postgres 70
-	enewuser postgres 70 /bin/sh /var/lib/postgresql postgres
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Work around PPC{,64} compilation bug where bool is already defined
-	sed '/#ifndef __cplusplus/a #undef bool' -i src/include/c.h || die
-
-	# Set proper run directory
-	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
-		-i src/include/pg_config_manual.h || die
-
-	use server || epatch "${FILESDIR}/${PN}-${SLOT}-no-server.patch"
-
-	# Fix bug 486556 where the server would crash at start up because of
-	# an infinite loop caused by a self-referencing symlink.
-	epatch "${FILESDIR}/postgresql-9.2-9.4-tz-dir-overflow.patch"
-
-	if use pam ; then
-		sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
-			-i src/backend/libpq/auth.c || \
-			die 'PGSQL_PAM_SERVICE rename failed.'
-	fi
-
-	epatch_user
-}
-
-src_configure() {
-	case ${CHOST} in
-		*-darwin*|*-solaris*)
-			use nls && append-libs intl
-			;;
-	esac
-
-	export LDFLAGS_SL="${LDFLAGS}"
-	export LDFLAGS_EX="${LDFLAGS}"
-
-	local PO="${EPREFIX%/}"
-
-	econf \
-		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
-		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
-		--docdir="${PO}/usr/share/doc/${PF}" \
-		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
-		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
-		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
-		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
-		$(use_enable !pg_legacytimestamp integer-datetimes) \
-		$(use_enable threads thread-safety) \
-		$(use_with kerberos gssapi) \
-		$(use_with kerberos krb5) \
-		$(use_with ldap) \
-		$(use_with pam) \
-		$(use_with perl) \
-		$(use_with python) \
-		$(use_with readline) \
-		$(use_with ssl openssl) \
-		$(use_with tcl) \
-		$(use_with uuid ossp-uuid) \
-		$(use_with xml libxml) \
-		$(use_with xml libxslt) \
-		$(use_with zlib) \
-		"$(use_enable nls nls "$(wanted_languages)")"
-}
-
-src_compile() {
-	emake
-	emake -C contrib
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	emake DESTDIR="${D}" install -C contrib
-
-	dodoc README HISTORY doc/{TODO,bug.template}
-
-	# man pages are already built, but if we have the target make them,
-	# they'll be generated from source before being installed so we
-	# manually install man pages.
-	# We use ${SLOT} instead of doman for postgresql.eselect
-	insinto /usr/share/postgresql-${SLOT}/man/
-	doins -r doc/src/sgml/man{1,3,7}
-	if ! use server; then
-		# Remove man pages for non-existent binaries
-		for m in {initdb,pg_{controldata,ctl,resetxlog},post{gres,master}}; do
-			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
-		done
-	fi
-	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
-
-	insinto /etc/postgresql-${SLOT}
-	newins src/bin/psql/psqlrc.sample psqlrc
-
-	dodir /etc/eselect/postgresql/slots/${SLOT}
-	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
-		"${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
-
-	use static-libs || find "${ED}" -name '*.a' -delete
-
-	if use doc ; then
-		docinto html
-		dodoc doc/src/sgml/html/*
-
-		docinto sgml
-		dodoc doc/src/sgml/*.{sgml,dsl}
-	fi
-
-	if use server; then
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.confd" | newconfd - ${PN}-${SLOT}
-
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.init" | newinitd - ${PN}-${SLOT}
-
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.service" | \
-			systemd_newunit - ${PN}-${SLOT}.service
-
-		newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
-
-		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
-
-		if use prefix ; then
-			keepdir /run/postgresql
-			fperms 0775 /run/postgresql
-		fi
-	fi
-}
-
-pkg_postinst() {
-	postgresql-config update
-
-	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
-
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog
-		elog "It looks like this is your first time installing PostgreSQL. Run the"
-		elog "following command in all active shells to pick up changes to the default"
-		elog "environment:"
-		elog "    source /etc/profile"
-	fi
-
-	if use server ; then
-		elog
-		elog "Gentoo specific documentation:"
-		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
-		elog
-		elog "Official documentation:"
-		elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
-		elog
-		elog "The default location of the Unix-domain socket is:"
-		elog "    ${EROOT%/}/run/postgresql/"
-		elog
-		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
-		elog "so that it contains your preferred locale in:"
-		elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-		elog
-		elog "Then, execute the following command to setup the initial database"
-		elog "environment:"
-		elog "    emerge --config =${CATEGORY}/${PF}"
-	fi
-}
-
-pkg_prerm() {
-	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
-		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
-		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
-
-		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
-		sleep 10
-		eend 0
-	fi
-}
-
-pkg_postrm() {
-	postgresql-config update
-}
-
-pkg_config() {
-	use server || die "USE flag 'server' not enabled. Nothing to configure."
-
-	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
-		&& source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
-	[[ -z "${DATA_DIR}" ]] \
-		&& DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
-
-	# environment.bz2 may not contain the same locale as the current system
-	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
-		unset LANG
-		unset LC_CTYPE
-		unset LC_NUMERIC
-		unset LC_TIME
-		unset LC_COLLATE
-		unset LC_MONETARY
-		unset LC_MESSAGES
-		unset LC_ALL
-		source "${EROOT%/}/etc/env.d/02locale"
-		[ -n "${LANG}" ] && export LANG
-		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
-		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
-		[ -n "${LC_TIME}" ] && export LC_TIME
-		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
-		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
-		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
-		[ -n "${LC_ALL}" ] && export LC_ALL
-	fi
-
-	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	einfo
-	einfo "Information on options that can be passed to initdb are found at:"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
-	einfo
-	einfo "PG_INITDB_OPTS is currently set to:"
-	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
-		einfo "    (none)"
-	else
-		einfo "    ${PG_INITDB_OPTS}"
-	fi
-	einfo
-	einfo "Configuration files will be installed to:"
-	einfo "    ${PGDATA}"
-	einfo
-	einfo "The database cluster will be created in:"
-	einfo "    ${DATA_DIR}"
-	einfo
-	while [ "$correct" != "true" ] ; do
-		einfo "Are you ready to continue? (y/n)"
-		read answer
-		if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
-			correct="true"
-		elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
-			die "Aborting initialization."
-		else
-			echo "Answer not recognized"
-		fi
-	done
-
-	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
-		eerror "The given directory, '${DATA_DIR}', is not empty."
-		eerror "Modify DATA_DIR to point to an empty directory."
-		die "${DATA_DIR} is not empty."
-	fi
-
-	einfo "Creating the data directory ..."
-	if [[ ${EUID} == 0 ]] ; then
-		mkdir -p "${DATA_DIR}"
-		chown -Rf postgres:postgres "${DATA_DIR}"
-		chmod 0700 "${DATA_DIR}"
-	fi
-
-	einfo "Initializing the database ..."
-
-	if [[ ${EUID} == 0 ]] ; then
-		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
-	else
-		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
-	fi
-
-	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
-		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
-		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
-	fi
-
-	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
-		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
-		# On the off-chance that you might need to work with UTF-8 encoded
-		# characters in PL/Perl
-		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
-	EOF
-
-	einfo "The autovacuum function, which was in contrib, has been moved to the main"
-	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
-	einfo "by default. You can disable it in the cluster's:"
-	einfo "    ${PGDATA%/}/postgresql.conf"
-	einfo
-	einfo "The PostgreSQL server, by default, will log events to:"
-	einfo "    ${DATA_DIR%/}/postmaster.log"
-	einfo
-	if use prefix ; then
-		einfo "The location of the configuration files have moved to:"
-		einfo "    ${PGDATA}"
-		einfo "To start the server:"
-		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
-		einfo "To stop:"
-		einfo "    pg_ctl stop -D ${DATA_DIR}"
-		einfo
-		einfo "Or move the configuration files back:"
-		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
-	else
-		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	fi
-}
-
-src_test() {
-	if use server && [[ ${UID} -ne 0 ]] ; then
-		emake check
-
-		einfo "If you think other tests besides the regression tests are necessary, please"
-		einfo "submit a bug including a patch for this ebuild to enable them."
-	else
-		use server || \
-			ewarn 'Tests cannot be run without the "server" use flag enabled.'
-		[[ ${UID} -eq 0 ]] || \
-			ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
-
-		ewarn 'Skipping.'
-	fi
-}
diff --git a/dev-db/postgresql/postgresql-9.2.15.ebuild b/dev-db/postgresql/postgresql-9.2.15.ebuild
deleted file mode 100644
index f76e1e3..0000000
--- a/dev-db/postgresql/postgresql-9.2.15.ebuild
+++ /dev/null
@@ -1,394 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
-		systemd user versionator
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
-
-SLOT="$(get_version_component_range 1-2)"
-
-SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
-
-LICENSE="POSTGRESQL GPL-2"
-DESCRIPTION="PostgreSQL RDBMS"
-HOMEPAGE="http://www.postgresql.org/"
-
-LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr
-		 zh_CN zh_TW"
-IUSE="doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python
-	  +readline selinux +server ssl static-libs tcl threads uuid xml zlib"
-
-for lingua in ${LINGUAS}; do
-	IUSE+=" linguas_${lingua}"
-done
-
-wanted_languages() {
-	local enable_langs
-
-	for lingua in ${LINGUAS} ; do
-		use linguas_${lingua} && enable_langs+="${lingua} "
-	done
-
-	echo -n ${enable_langs}
-}
-
-CDEPEND="
->=app-eselect/eselect-postgresql-1.2.0
-sys-apps/less
-virtual/libintl
-kerberos? ( virtual/krb5 )
-ldap? ( net-nds/openldap )
-pam? ( virtual/pam )
-perl? ( >=dev-lang/perl-5.8:= )
-python? ( ${PYTHON_DEPS} )
-readline? ( sys-libs/readline:0= )
-ssl? (
-	!libressl? ( >=dev-libs/openssl-0.9.6-r1:0= )
-	libressl? ( dev-libs/libressl:= )
-)
-tcl? ( >=dev-lang/tcl-8:0= )
-uuid? ( dev-libs/ossp-uuid )
-xml? ( dev-libs/libxml2 dev-libs/libxslt )
-zlib? ( sys-libs/zlib )
-"
-
-DEPEND="${CDEPEND}
-!!<sys-apps/sandbox-2.0
-sys-devel/bison
-sys-devel/flex
-nls? ( sys-devel/gettext )
-xml? ( virtual/pkgconfig )
-"
-
-RDEPEND="${CDEPEND}
-!dev-db/postgresql-docs:${SLOT}
-!dev-db/postgresql-base:${SLOT}
-!dev-db/postgresql-server:${SLOT}
-selinux? ( sec-policy/selinux-postgresql )
-"
-
-pkg_setup() {
-	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
-
-	enewgroup postgres 70
-	enewuser postgres 70 /bin/sh /var/lib/postgresql postgres
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Work around PPC{,64} compilation bug where bool is already defined
-	sed '/#ifndef __cplusplus/a #undef bool' -i src/include/c.h || die
-
-	# Set proper run directory
-	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
-		-i src/include/pg_config_manual.h || die
-
-	use server || epatch "${FILESDIR}/${PN}-${SLOT}-no-server.patch"
-
-	# Fix bug 486556 where the server would crash at start up because of
-	# an infinite loop caused by a self-referencing symlink.
-	epatch "${FILESDIR}/postgresql-9.2-9.4-tz-dir-overflow.patch"
-
-	if use pam ; then
-		sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
-			-i src/backend/libpq/auth.c || \
-			die 'PGSQL_PAM_SERVICE rename failed.'
-	fi
-
-	epatch_user
-}
-
-src_configure() {
-	case ${CHOST} in
-		*-darwin*|*-solaris*)
-			use nls && append-libs intl
-			;;
-	esac
-
-	export LDFLAGS_SL="${LDFLAGS}"
-	export LDFLAGS_EX="${LDFLAGS}"
-
-	local PO="${EPREFIX%/}"
-
-	econf \
-		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
-		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
-		--docdir="${PO}/usr/share/doc/${PF}" \
-		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
-		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
-		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
-		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
-		$(use_enable !pg_legacytimestamp integer-datetimes) \
-		$(use_enable threads thread-safety) \
-		$(use_with kerberos gssapi) \
-		$(use_with kerberos krb5) \
-		$(use_with ldap) \
-		$(use_with pam) \
-		$(use_with perl) \
-		$(use_with python) \
-		$(use_with readline) \
-		$(use_with ssl openssl) \
-		$(use_with tcl) \
-		$(use_with uuid ossp-uuid) \
-		$(use_with xml libxml) \
-		$(use_with xml libxslt) \
-		$(use_with zlib) \
-		"$(use_enable nls nls "$(wanted_languages)")"
-}
-
-src_compile() {
-	emake
-	emake -C contrib
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	emake DESTDIR="${D}" install -C contrib
-
-	dodoc README HISTORY doc/{TODO,bug.template}
-
-	# man pages are already built, but if we have the target make them,
-	# they'll be generated from source before being installed so we
-	# manually install man pages.
-	# We use ${SLOT} instead of doman for postgresql.eselect
-	insinto /usr/share/postgresql-${SLOT}/man/
-	doins -r doc/src/sgml/man{1,3,7}
-	if ! use server; then
-		# Remove man pages for non-existent binaries
-		for m in {initdb,pg_{controldata,ctl,resetxlog},post{gres,master}}; do
-			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
-		done
-	fi
-	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
-
-	insinto /etc/postgresql-${SLOT}
-	newins src/bin/psql/psqlrc.sample psqlrc
-
-	dodir /etc/eselect/postgresql/slots/${SLOT}
-	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
-		"${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
-
-	use static-libs || find "${ED}" -name '*.a' -delete
-
-	if use doc ; then
-		docinto html
-		dodoc doc/src/sgml/html/*
-
-		docinto sgml
-		dodoc doc/src/sgml/*.{sgml,dsl}
-	fi
-
-	if use server; then
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.confd" | newconfd - ${PN}-${SLOT}
-
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.init" | newinitd - ${PN}-${SLOT}
-
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.service" | \
-			systemd_newunit - ${PN}-${SLOT}.service
-
-		newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
-
-		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
-
-		if use prefix ; then
-			keepdir /run/postgresql
-			fperms 0775 /run/postgresql
-		fi
-	fi
-}
-
-pkg_postinst() {
-	postgresql-config update
-
-	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
-
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog
-		elog "It looks like this is your first time installing PostgreSQL. Run the"
-		elog "following command in all active shells to pick up changes to the default"
-		elog "environment:"
-		elog "    source /etc/profile"
-	fi
-
-	if use server ; then
-		elog
-		elog "Gentoo specific documentation:"
-		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
-		elog
-		elog "Official documentation:"
-		elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
-		elog
-		elog "The default location of the Unix-domain socket is:"
-		elog "    ${EROOT%/}/run/postgresql/"
-		elog
-		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
-		elog "so that it contains your preferred locale in:"
-		elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-		elog
-		elog "Then, execute the following command to setup the initial database"
-		elog "environment:"
-		elog "    emerge --config =${CATEGORY}/${PF}"
-	fi
-}
-
-pkg_prerm() {
-	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
-		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
-		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
-
-		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
-		sleep 10
-		eend 0
-	fi
-}
-
-pkg_postrm() {
-	postgresql-config update
-}
-
-pkg_config() {
-	use server || die "USE flag 'server' not enabled. Nothing to configure."
-
-	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
-		&& source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
-	[[ -z "${DATA_DIR}" ]] \
-		&& DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
-
-	# environment.bz2 may not contain the same locale as the current system
-	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
-		unset LANG
-		unset LC_CTYPE
-		unset LC_NUMERIC
-		unset LC_TIME
-		unset LC_COLLATE
-		unset LC_MONETARY
-		unset LC_MESSAGES
-		unset LC_ALL
-		source "${EROOT%/}/etc/env.d/02locale"
-		[ -n "${LANG}" ] && export LANG
-		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
-		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
-		[ -n "${LC_TIME}" ] && export LC_TIME
-		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
-		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
-		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
-		[ -n "${LC_ALL}" ] && export LC_ALL
-	fi
-
-	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	einfo
-	einfo "Information on options that can be passed to initdb are found at:"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
-	einfo
-	einfo "PG_INITDB_OPTS is currently set to:"
-	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
-		einfo "    (none)"
-	else
-		einfo "    ${PG_INITDB_OPTS}"
-	fi
-	einfo
-	einfo "Configuration files will be installed to:"
-	einfo "    ${PGDATA}"
-	einfo
-	einfo "The database cluster will be created in:"
-	einfo "    ${DATA_DIR}"
-	einfo
-	while [ "$correct" != "true" ] ; do
-		einfo "Are you ready to continue? (y/n)"
-		read answer
-		if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
-			correct="true"
-		elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
-			die "Aborting initialization."
-		else
-			echo "Answer not recognized"
-		fi
-	done
-
-	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
-		eerror "The given directory, '${DATA_DIR}', is not empty."
-		eerror "Modify DATA_DIR to point to an empty directory."
-		die "${DATA_DIR} is not empty."
-	fi
-
-	einfo "Creating the data directory ..."
-	if [[ ${EUID} == 0 ]] ; then
-		mkdir -p "${DATA_DIR}"
-		chown -Rf postgres:postgres "${DATA_DIR}"
-		chmod 0700 "${DATA_DIR}"
-	fi
-
-	einfo "Initializing the database ..."
-
-	if [[ ${EUID} == 0 ]] ; then
-		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
-	else
-		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
-	fi
-
-	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
-		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
-		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
-	fi
-
-	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
-		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
-		# On the off-chance that you might need to work with UTF-8 encoded
-		# characters in PL/Perl
-		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
-	EOF
-
-	einfo "The autovacuum function, which was in contrib, has been moved to the main"
-	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
-	einfo "by default. You can disable it in the cluster's:"
-	einfo "    ${PGDATA%/}/postgresql.conf"
-	einfo
-	einfo "The PostgreSQL server, by default, will log events to:"
-	einfo "    ${DATA_DIR%/}/postmaster.log"
-	einfo
-	if use prefix ; then
-		einfo "The location of the configuration files have moved to:"
-		einfo "    ${PGDATA}"
-		einfo "To start the server:"
-		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
-		einfo "To stop:"
-		einfo "    pg_ctl stop -D ${DATA_DIR}"
-		einfo
-		einfo "Or move the configuration files back:"
-		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
-	else
-		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	fi
-}
-
-src_test() {
-	if use server && [[ ${UID} -ne 0 ]] ; then
-		emake check
-
-		einfo "If you think other tests besides the regression tests are necessary, please"
-		einfo "submit a bug including a patch for this ebuild to enable them."
-	else
-		use server || \
-			ewarn 'Tests cannot be run without the "server" use flag enabled.'
-		[[ ${UID} -eq 0 ]] || \
-			ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
-
-		ewarn 'Skipping.'
-	fi
-}
diff --git a/dev-db/postgresql/postgresql-9.2.17.ebuild b/dev-db/postgresql/postgresql-9.2.17.ebuild
deleted file mode 100644
index 73fdad1..0000000
--- a/dev-db/postgresql/postgresql-9.2.17.ebuild
+++ /dev/null
@@ -1,394 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
-		systemd user versionator
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
-
-SLOT="$(get_version_component_range 1-2)"
-
-SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
-
-LICENSE="POSTGRESQL GPL-2"
-DESCRIPTION="PostgreSQL RDBMS"
-HOMEPAGE="http://www.postgresql.org/"
-
-LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr
-		 zh_CN zh_TW"
-IUSE="doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python
-	  +readline selinux +server ssl static-libs tcl threads uuid xml zlib"
-
-for lingua in ${LINGUAS}; do
-	IUSE+=" linguas_${lingua}"
-done
-
-wanted_languages() {
-	local enable_langs
-
-	for lingua in ${LINGUAS} ; do
-		use linguas_${lingua} && enable_langs+="${lingua} "
-	done
-
-	echo -n ${enable_langs}
-}
-
-CDEPEND="
->=app-eselect/eselect-postgresql-1.2.0
-sys-apps/less
-virtual/libintl
-kerberos? ( virtual/krb5 )
-ldap? ( net-nds/openldap )
-pam? ( virtual/pam )
-perl? ( >=dev-lang/perl-5.8:= )
-python? ( ${PYTHON_DEPS} )
-readline? ( sys-libs/readline:0= )
-ssl? (
-	!libressl? ( >=dev-libs/openssl-0.9.6-r1:0= )
-	libressl? ( dev-libs/libressl:= )
-)
-tcl? ( >=dev-lang/tcl-8:0= )
-uuid? ( dev-libs/ossp-uuid )
-xml? ( dev-libs/libxml2 dev-libs/libxslt )
-zlib? ( sys-libs/zlib )
-"
-
-DEPEND="${CDEPEND}
-!!<sys-apps/sandbox-2.0
-sys-devel/bison
-sys-devel/flex
-nls? ( sys-devel/gettext )
-xml? ( virtual/pkgconfig )
-"
-
-RDEPEND="${CDEPEND}
-!dev-db/postgresql-docs:${SLOT}
-!dev-db/postgresql-base:${SLOT}
-!dev-db/postgresql-server:${SLOT}
-selinux? ( sec-policy/selinux-postgresql )
-"
-
-pkg_setup() {
-	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
-
-	enewgroup postgres 70
-	enewuser postgres 70 /bin/sh /var/lib/postgresql postgres
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Work around PPC{,64} compilation bug where bool is already defined
-	sed '/#ifndef __cplusplus/a #undef bool' -i src/include/c.h || die
-
-	# Set proper run directory
-	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
-		-i src/include/pg_config_manual.h || die
-
-	use server || epatch "${FILESDIR}/${PN}-${SLOT}-no-server.patch"
-
-	# Fix bug 486556 where the server would crash at start up because of
-	# an infinite loop caused by a self-referencing symlink.
-	epatch "${FILESDIR}/postgresql-9.2-9.4-tz-dir-overflow.patch"
-
-	if use pam ; then
-		sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
-			-i src/backend/libpq/auth.c || \
-			die 'PGSQL_PAM_SERVICE rename failed.'
-	fi
-
-	epatch_user
-}
-
-src_configure() {
-	case ${CHOST} in
-		*-darwin*|*-solaris*)
-			use nls && append-libs intl
-			;;
-	esac
-
-	export LDFLAGS_SL="${LDFLAGS}"
-	export LDFLAGS_EX="${LDFLAGS}"
-
-	local PO="${EPREFIX%/}"
-
-	econf \
-		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
-		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
-		--docdir="${PO}/usr/share/doc/${PF}" \
-		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
-		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
-		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
-		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
-		$(use_enable !pg_legacytimestamp integer-datetimes) \
-		$(use_enable threads thread-safety) \
-		$(use_with kerberos gssapi) \
-		$(use_with kerberos krb5) \
-		$(use_with ldap) \
-		$(use_with pam) \
-		$(use_with perl) \
-		$(use_with python) \
-		$(use_with readline) \
-		$(use_with ssl openssl) \
-		$(use_with tcl) \
-		$(use_with uuid ossp-uuid) \
-		$(use_with xml libxml) \
-		$(use_with xml libxslt) \
-		$(use_with zlib) \
-		"$(use_enable nls nls "$(wanted_languages)")"
-}
-
-src_compile() {
-	emake
-	emake -C contrib
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	emake DESTDIR="${D}" install -C contrib
-
-	dodoc README HISTORY doc/{TODO,bug.template}
-
-	# man pages are already built, but if we have the target make them,
-	# they'll be generated from source before being installed so we
-	# manually install man pages.
-	# We use ${SLOT} instead of doman for postgresql.eselect
-	insinto /usr/share/postgresql-${SLOT}/man/
-	doins -r doc/src/sgml/man{1,3,7}
-	if ! use server; then
-		# Remove man pages for non-existent binaries
-		for m in {initdb,pg_{controldata,ctl,resetxlog},post{gres,master}}; do
-			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
-		done
-	fi
-	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
-
-	insinto /etc/postgresql-${SLOT}
-	newins src/bin/psql/psqlrc.sample psqlrc
-
-	dodir /etc/eselect/postgresql/slots/${SLOT}
-	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
-		"${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
-
-	use static-libs || find "${ED}" -name '*.a' -delete
-
-	if use doc ; then
-		docinto html
-		dodoc doc/src/sgml/html/*
-
-		docinto sgml
-		dodoc doc/src/sgml/*.{sgml,dsl}
-	fi
-
-	if use server; then
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.confd" | newconfd - ${PN}-${SLOT}
-
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.init" | newinitd - ${PN}-${SLOT}
-
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.service" | \
-			systemd_newunit - ${PN}-${SLOT}.service
-
-		newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
-
-		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
-
-		if use prefix ; then
-			keepdir /run/postgresql
-			fperms 0775 /run/postgresql
-		fi
-	fi
-}
-
-pkg_postinst() {
-	postgresql-config update
-
-	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
-
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog
-		elog "It looks like this is your first time installing PostgreSQL. Run the"
-		elog "following command in all active shells to pick up changes to the default"
-		elog "environment:"
-		elog "    source /etc/profile"
-	fi
-
-	if use server ; then
-		elog
-		elog "Gentoo specific documentation:"
-		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
-		elog
-		elog "Official documentation:"
-		elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
-		elog
-		elog "The default location of the Unix-domain socket is:"
-		elog "    ${EROOT%/}/run/postgresql/"
-		elog
-		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
-		elog "so that it contains your preferred locale in:"
-		elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-		elog
-		elog "Then, execute the following command to setup the initial database"
-		elog "environment:"
-		elog "    emerge --config =${CATEGORY}/${PF}"
-	fi
-}
-
-pkg_prerm() {
-	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
-		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
-		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
-
-		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
-		sleep 10
-		eend 0
-	fi
-}
-
-pkg_postrm() {
-	postgresql-config update
-}
-
-pkg_config() {
-	use server || die "USE flag 'server' not enabled. Nothing to configure."
-
-	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
-		&& source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
-	[[ -z "${DATA_DIR}" ]] \
-		&& DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
-
-	# environment.bz2 may not contain the same locale as the current system
-	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
-		unset LANG
-		unset LC_CTYPE
-		unset LC_NUMERIC
-		unset LC_TIME
-		unset LC_COLLATE
-		unset LC_MONETARY
-		unset LC_MESSAGES
-		unset LC_ALL
-		source "${EROOT%/}/etc/env.d/02locale"
-		[ -n "${LANG}" ] && export LANG
-		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
-		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
-		[ -n "${LC_TIME}" ] && export LC_TIME
-		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
-		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
-		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
-		[ -n "${LC_ALL}" ] && export LC_ALL
-	fi
-
-	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	einfo
-	einfo "Information on options that can be passed to initdb are found at:"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
-	einfo
-	einfo "PG_INITDB_OPTS is currently set to:"
-	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
-		einfo "    (none)"
-	else
-		einfo "    ${PG_INITDB_OPTS}"
-	fi
-	einfo
-	einfo "Configuration files will be installed to:"
-	einfo "    ${PGDATA}"
-	einfo
-	einfo "The database cluster will be created in:"
-	einfo "    ${DATA_DIR}"
-	einfo
-	while [ "$correct" != "true" ] ; do
-		einfo "Are you ready to continue? (y/n)"
-		read answer
-		if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
-			correct="true"
-		elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
-			die "Aborting initialization."
-		else
-			echo "Answer not recognized"
-		fi
-	done
-
-	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
-		eerror "The given directory, '${DATA_DIR}', is not empty."
-		eerror "Modify DATA_DIR to point to an empty directory."
-		die "${DATA_DIR} is not empty."
-	fi
-
-	einfo "Creating the data directory ..."
-	if [[ ${EUID} == 0 ]] ; then
-		mkdir -p "${DATA_DIR}"
-		chown -Rf postgres:postgres "${DATA_DIR}"
-		chmod 0700 "${DATA_DIR}"
-	fi
-
-	einfo "Initializing the database ..."
-
-	if [[ ${EUID} == 0 ]] ; then
-		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
-	else
-		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
-	fi
-
-	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
-		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
-		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
-	fi
-
-	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
-		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
-		# On the off-chance that you might need to work with UTF-8 encoded
-		# characters in PL/Perl
-		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
-	EOF
-
-	einfo "The autovacuum function, which was in contrib, has been moved to the main"
-	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
-	einfo "by default. You can disable it in the cluster's:"
-	einfo "    ${PGDATA%/}/postgresql.conf"
-	einfo
-	einfo "The PostgreSQL server, by default, will log events to:"
-	einfo "    ${DATA_DIR%/}/postmaster.log"
-	einfo
-	if use prefix ; then
-		einfo "The location of the configuration files have moved to:"
-		einfo "    ${PGDATA}"
-		einfo "To start the server:"
-		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
-		einfo "To stop:"
-		einfo "    pg_ctl stop -D ${DATA_DIR}"
-		einfo
-		einfo "Or move the configuration files back:"
-		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
-	else
-		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	fi
-}
-
-src_test() {
-	if use server && [[ ${UID} -ne 0 ]] ; then
-		emake check
-
-		einfo "If you think other tests besides the regression tests are necessary, please"
-		einfo "submit a bug including a patch for this ebuild to enable them."
-	else
-		use server || \
-			ewarn 'Tests cannot be run without the "server" use flag enabled.'
-		[[ ${UID} -eq 0 ]] || \
-			ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
-
-		ewarn 'Skipping.'
-	fi
-}
diff --git a/dev-db/postgresql/postgresql-9.3.10-r1.ebuild b/dev-db/postgresql/postgresql-9.3.10-r1.ebuild
deleted file mode 100644
index 660f1a4c..0000000
--- a/dev-db/postgresql/postgresql-9.3.10-r1.ebuild
+++ /dev/null
@@ -1,394 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
-		systemd user versionator
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
-
-SLOT="$(get_version_component_range 1-2)"
-
-SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
-
-LICENSE="POSTGRESQL GPL-2"
-DESCRIPTION="PostgreSQL RDBMS"
-HOMEPAGE="http://www.postgresql.org/"
-
-LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr
-		 zh_CN zh_TW"
-IUSE="doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python
-	  +readline selinux +server ssl static-libs tcl threads uuid xml zlib"
-
-for lingua in ${LINGUAS}; do
-	IUSE+=" linguas_${lingua}"
-done
-
-wanted_languages() {
-	local enable_langs
-
-	for lingua in ${LINGUAS} ; do
-		use linguas_${lingua} && enable_langs+="${lingua} "
-	done
-
-	echo -n ${enable_langs}
-}
-
-CDEPEND="
->=app-eselect/eselect-postgresql-1.2.0
-sys-apps/less
-virtual/libintl
-kerberos? ( virtual/krb5 )
-ldap? ( net-nds/openldap )
-pam? ( virtual/pam )
-perl? ( >=dev-lang/perl-5.8:= )
-python? ( ${PYTHON_DEPS} )
-readline? ( sys-libs/readline:0= )
-ssl? (
-	!libressl? ( >=dev-libs/openssl-0.9.6-r1:0= )
-	libressl? ( dev-libs/libressl:= )
-)
-tcl? ( >=dev-lang/tcl-8:0= )
-uuid? ( dev-libs/ossp-uuid )
-xml? ( dev-libs/libxml2 dev-libs/libxslt )
-zlib? ( sys-libs/zlib )
-"
-
-DEPEND="${CDEPEND}
-!!<sys-apps/sandbox-2.0
-sys-devel/bison
-sys-devel/flex
-nls? ( sys-devel/gettext )
-xml? ( virtual/pkgconfig )
-"
-
-RDEPEND="${CDEPEND}
-!dev-db/postgresql-docs:${SLOT}
-!dev-db/postgresql-base:${SLOT}
-!dev-db/postgresql-server:${SLOT}
-selinux? ( sec-policy/selinux-postgresql )
-"
-
-pkg_setup() {
-	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
-
-	enewgroup postgres 70
-	enewuser postgres 70 /bin/sh /var/lib/postgresql postgres
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Work around PPC{,64} compilation bug where bool is already defined
-	sed '/#ifndef __cplusplus/a #undef bool' -i src/include/c.h || die
-
-	# Set proper run directory
-	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
-		-i src/include/pg_config_manual.h || die
-
-	use server || epatch "${FILESDIR}/${PN}-${SLOT}-no-server.patch"
-
-	# Fix bug 486556 where the server would crash at start up because of
-	# an infinite loop caused by a self-referencing symlink.
-	epatch "${FILESDIR}/postgresql-9.2-9.4-tz-dir-overflow.patch"
-
-	if use pam ; then
-		sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
-			-i src/backend/libpq/auth.c || \
-			die 'PGSQL_PAM_SERVICE rename failed.'
-	fi
-
-	epatch_user
-}
-
-src_configure() {
-	case ${CHOST} in
-		*-darwin*|*-solaris*)
-			use nls && append-libs intl
-			;;
-	esac
-
-	export LDFLAGS_SL="${LDFLAGS}"
-	export LDFLAGS_EX="${LDFLAGS}"
-
-	local PO="${EPREFIX%/}"
-
-	econf \
-		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
-		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
-		--docdir="${PO}/usr/share/doc/${PF}" \
-		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
-		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
-		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
-		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
-		$(use_enable !pg_legacytimestamp integer-datetimes) \
-		$(use_enable threads thread-safety) \
-		$(use_with kerberos gssapi) \
-		$(use_with kerberos krb5) \
-		$(use_with ldap) \
-		$(use_with pam) \
-		$(use_with perl) \
-		$(use_with python) \
-		$(use_with readline) \
-		$(use_with ssl openssl) \
-		$(use_with tcl) \
-		$(use_with uuid ossp-uuid) \
-		$(use_with xml libxml) \
-		$(use_with xml libxslt) \
-		$(use_with zlib) \
-		"$(use_enable nls nls "$(wanted_languages)")"
-}
-
-src_compile() {
-	emake
-	emake -C contrib
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	emake DESTDIR="${D}" install -C contrib
-
-	dodoc README HISTORY doc/{TODO,bug.template}
-
-	# man pages are already built, but if we have the target make them,
-	# they'll be generated from source before being installed so we
-	# manually install man pages.
-	# We use ${SLOT} instead of doman for postgresql.eselect
-	insinto /usr/share/postgresql-${SLOT}/man/
-	doins -r doc/src/sgml/man{1,3,7}
-	if ! use server; then
-		# Remove man pages for non-existent binaries
-		for m in {initdb,pg_{controldata,ctl,resetxlog},post{gres,master}}; do
-			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
-		done
-	fi
-	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
-
-	insinto /etc/postgresql-${SLOT}
-	newins src/bin/psql/psqlrc.sample psqlrc
-
-	dodir /etc/eselect/postgresql/slots/${SLOT}
-	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
-		"${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
-
-	use static-libs || find "${ED}" -name '*.a' -delete
-
-	if use doc ; then
-		docinto html
-		dodoc doc/src/sgml/html/*
-
-		docinto sgml
-		dodoc doc/src/sgml/*.{sgml,dsl}
-	fi
-
-	if use server; then
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.confd" | newconfd - ${PN}-${SLOT}
-
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.init-9.3" | newinitd - ${PN}-${SLOT}
-
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.service" | \
-			systemd_newunit - ${PN}-${SLOT}.service
-
-		newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
-
-		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
-
-		if use prefix ; then
-			keepdir /run/postgresql
-			fperms 0775 /run/postgresql
-		fi
-	fi
-}
-
-pkg_postinst() {
-	postgresql-config update
-
-	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
-
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog
-		elog "It looks like this is your first time installing PostgreSQL. Run the"
-		elog "following command in all active shells to pick up changes to the default"
-		elog "environment:"
-		elog "    source /etc/profile"
-	fi
-
-	if use server ; then
-		elog
-		elog "Gentoo specific documentation:"
-		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
-		elog
-		elog "Official documentation:"
-		elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
-		elog
-		elog "The default location of the Unix-domain socket is:"
-		elog "    ${EROOT%/}/run/postgresql/"
-		elog
-		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
-		elog "so that it contains your preferred locale in:"
-		elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-		elog
-		elog "Then, execute the following command to setup the initial database"
-		elog "environment:"
-		elog "    emerge --config =${CATEGORY}/${PF}"
-	fi
-}
-
-pkg_prerm() {
-	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
-		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
-		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
-
-		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
-		sleep 10
-		eend 0
-	fi
-}
-
-pkg_postrm() {
-	postgresql-config update
-}
-
-pkg_config() {
-	use server || die "USE flag 'server' not enabled. Nothing to configure."
-
-	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
-		&& source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
-	[[ -z "${DATA_DIR}" ]] \
-		&& DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
-
-	# environment.bz2 may not contain the same locale as the current system
-	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
-		unset LANG
-		unset LC_CTYPE
-		unset LC_NUMERIC
-		unset LC_TIME
-		unset LC_COLLATE
-		unset LC_MONETARY
-		unset LC_MESSAGES
-		unset LC_ALL
-		source "${EROOT%/}/etc/env.d/02locale"
-		[ -n "${LANG}" ] && export LANG
-		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
-		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
-		[ -n "${LC_TIME}" ] && export LC_TIME
-		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
-		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
-		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
-		[ -n "${LC_ALL}" ] && export LC_ALL
-	fi
-
-	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	einfo
-	einfo "Information on options that can be passed to initdb are found at:"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
-	einfo
-	einfo "PG_INITDB_OPTS is currently set to:"
-	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
-		einfo "    (none)"
-	else
-		einfo "    ${PG_INITDB_OPTS}"
-	fi
-	einfo
-	einfo "Configuration files will be installed to:"
-	einfo "    ${PGDATA}"
-	einfo
-	einfo "The database cluster will be created in:"
-	einfo "    ${DATA_DIR}"
-	einfo
-	while [ "$correct" != "true" ] ; do
-		einfo "Are you ready to continue? (y/n)"
-		read answer
-		if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
-			correct="true"
-		elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
-			die "Aborting initialization."
-		else
-			echo "Answer not recognized"
-		fi
-	done
-
-	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
-		eerror "The given directory, '${DATA_DIR}', is not empty."
-		eerror "Modify DATA_DIR to point to an empty directory."
-		die "${DATA_DIR} is not empty."
-	fi
-
-	einfo "Creating the data directory ..."
-	if [[ ${EUID} == 0 ]] ; then
-		mkdir -p "${DATA_DIR}"
-		chown -Rf postgres:postgres "${DATA_DIR}"
-		chmod 0700 "${DATA_DIR}"
-	fi
-
-	einfo "Initializing the database ..."
-
-	if [[ ${EUID} == 0 ]] ; then
-		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
-	else
-		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
-	fi
-
-	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
-		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
-		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
-	fi
-
-	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
-		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
-		# On the off-chance that you might need to work with UTF-8 encoded
-		# characters in PL/Perl
-		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
-	EOF
-
-	einfo "The autovacuum function, which was in contrib, has been moved to the main"
-	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
-	einfo "by default. You can disable it in the cluster's:"
-	einfo "    ${PGDATA%/}/postgresql.conf"
-	einfo
-	einfo "The PostgreSQL server, by default, will log events to:"
-	einfo "    ${DATA_DIR%/}/postmaster.log"
-	einfo
-	if use prefix ; then
-		einfo "The location of the configuration files have moved to:"
-		einfo "    ${PGDATA}"
-		einfo "To start the server:"
-		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
-		einfo "To stop:"
-		einfo "    pg_ctl stop -D ${DATA_DIR}"
-		einfo
-		einfo "Or move the configuration files back:"
-		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
-	else
-		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	fi
-}
-
-src_test() {
-	if use server && [[ ${UID} -ne 0 ]] ; then
-		emake check
-
-		einfo "If you think other tests besides the regression tests are necessary, please"
-		einfo "submit a bug including a patch for this ebuild to enable them."
-	else
-		use server || \
-			ewarn 'Tests cannot be run without the "server" use flag enabled.'
-		[[ ${UID} -eq 0 ]] || \
-			ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
-
-		ewarn 'Skipping.'
-	fi
-}
diff --git a/dev-db/postgresql/postgresql-9.3.10-r2.ebuild b/dev-db/postgresql/postgresql-9.3.10-r2.ebuild
deleted file mode 100644
index 7c60105..0000000
--- a/dev-db/postgresql/postgresql-9.3.10-r2.ebuild
+++ /dev/null
@@ -1,399 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
-		systemd user versionator
-
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
-
-SLOT="$(get_version_component_range 1-2)"
-
-SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
-
-LICENSE="POSTGRESQL GPL-2"
-DESCRIPTION="PostgreSQL RDBMS"
-HOMEPAGE="http://www.postgresql.org/"
-
-LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr
-		 zh_CN zh_TW"
-IUSE="doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python
-	  +readline selinux +server ssl static-libs tcl threads uuid xml zlib"
-
-for lingua in ${LINGUAS}; do
-	IUSE+=" linguas_${lingua}"
-done
-
-wanted_languages() {
-	local enable_langs
-
-	for lingua in ${LINGUAS} ; do
-		use linguas_${lingua} && enable_langs+="${lingua} "
-	done
-
-	echo -n ${enable_langs}
-}
-
-CDEPEND="
->=app-eselect/eselect-postgresql-1.2.0
-sys-apps/less
-virtual/libintl
-kerberos? ( virtual/krb5 )
-ldap? ( net-nds/openldap )
-pam? ( virtual/pam )
-perl? ( >=dev-lang/perl-5.8:= )
-python? ( ${PYTHON_DEPS} )
-readline? ( sys-libs/readline:0= )
-ssl? (
-	!libressl? ( >=dev-libs/openssl-0.9.6-r1:0= )
-	libressl? ( dev-libs/libressl:= )
-)
-tcl? ( >=dev-lang/tcl-8:0= )
-uuid? ( dev-libs/ossp-uuid )
-xml? ( dev-libs/libxml2 dev-libs/libxslt )
-zlib? ( sys-libs/zlib )
-"
-
-DEPEND="${CDEPEND}
-!!<sys-apps/sandbox-2.0
-sys-devel/bison
-sys-devel/flex
-nls? ( sys-devel/gettext )
-xml? ( virtual/pkgconfig )
-"
-
-RDEPEND="${CDEPEND}
-!dev-db/postgresql-docs:${SLOT}
-!dev-db/postgresql-base:${SLOT}
-!dev-db/postgresql-server:${SLOT}
-selinux? ( sec-policy/selinux-postgresql )
-"
-
-pkg_setup() {
-	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
-
-	enewgroup postgres 70
-	enewuser postgres 70 /bin/sh /var/lib/postgresql postgres
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Work around PPC{,64} compilation bug where bool is already defined
-	sed '/#ifndef __cplusplus/a #undef bool' -i src/include/c.h || die
-
-	# Set proper run directory
-	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
-		-i src/include/pg_config_manual.h || die
-
-	# Rely on $PATH being in the proper order so that the correct
-	# install program is used for modules utilizing PGXS in both
-	# hardened and non-hardened environments. (Bug #528786)
-	sed 's/@install_bin@/install -c/' -i src/Makefile.global.in || die
-
-	use server || epatch "${FILESDIR}/${PN}-${SLOT}-no-server.patch"
-
-	# Fix bug 486556 where the server would crash at start up because of
-	# an infinite loop caused by a self-referencing symlink.
-	epatch "${FILESDIR}/postgresql-9.2-9.4-tz-dir-overflow.patch"
-
-	if use pam ; then
-		sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
-			-i src/backend/libpq/auth.c || \
-			die 'PGSQL_PAM_SERVICE rename failed.'
-	fi
-
-	epatch_user
-}
-
-src_configure() {
-	case ${CHOST} in
-		*-darwin*|*-solaris*)
-			use nls && append-libs intl
-			;;
-	esac
-
-	export LDFLAGS_SL="${LDFLAGS}"
-	export LDFLAGS_EX="${LDFLAGS}"
-
-	local PO="${EPREFIX%/}"
-
-	econf \
-		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
-		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
-		--docdir="${PO}/usr/share/doc/${PF}" \
-		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
-		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
-		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
-		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
-		$(use_enable !pg_legacytimestamp integer-datetimes) \
-		$(use_enable threads thread-safety) \
-		$(use_with kerberos gssapi) \
-		$(use_with kerberos krb5) \
-		$(use_with ldap) \
-		$(use_with pam) \
-		$(use_with perl) \
-		$(use_with python) \
-		$(use_with readline) \
-		$(use_with ssl openssl) \
-		$(use_with tcl) \
-		$(use_with uuid ossp-uuid) \
-		$(use_with xml libxml) \
-		$(use_with xml libxslt) \
-		$(use_with zlib) \
-		"$(use_enable nls nls "$(wanted_languages)")"
-}
-
-src_compile() {
-	emake
-	emake -C contrib
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	emake DESTDIR="${D}" install -C contrib
-
-	dodoc README HISTORY doc/{TODO,bug.template}
-
-	# man pages are already built, but if we have the target make them,
-	# they'll be generated from source before being installed so we
-	# manually install man pages.
-	# We use ${SLOT} instead of doman for postgresql.eselect
-	insinto /usr/share/postgresql-${SLOT}/man/
-	doins -r doc/src/sgml/man{1,3,7}
-	if ! use server; then
-		# Remove man pages for non-existent binaries
-		for m in {initdb,pg_{controldata,ctl,resetxlog},post{gres,master}}; do
-			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
-		done
-	fi
-	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
-
-	insinto /etc/postgresql-${SLOT}
-	newins src/bin/psql/psqlrc.sample psqlrc
-
-	dodir /etc/eselect/postgresql/slots/${SLOT}
-	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
-		"${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
-
-	use static-libs || find "${ED}" -name '*.a' -delete
-
-	if use doc ; then
-		docinto html
-		dodoc doc/src/sgml/html/*
-
-		docinto sgml
-		dodoc doc/src/sgml/*.{sgml,dsl}
-	fi
-
-	if use server; then
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.confd" | newconfd - ${PN}-${SLOT}
-
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.init-9.3" | newinitd - ${PN}-${SLOT}
-
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.service" | \
-			systemd_newunit - ${PN}-${SLOT}.service
-
-		newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
-
-		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
-
-		if use prefix ; then
-			keepdir /run/postgresql
-			fperms 0775 /run/postgresql
-		fi
-	fi
-}
-
-pkg_postinst() {
-	postgresql-config update
-
-	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
-
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog
-		elog "It looks like this is your first time installing PostgreSQL. Run the"
-		elog "following command in all active shells to pick up changes to the default"
-		elog "environment:"
-		elog "    source /etc/profile"
-	fi
-
-	if use server ; then
-		elog
-		elog "Gentoo specific documentation:"
-		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
-		elog
-		elog "Official documentation:"
-		elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
-		elog
-		elog "The default location of the Unix-domain socket is:"
-		elog "    ${EROOT%/}/run/postgresql/"
-		elog
-		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
-		elog "so that it contains your preferred locale in:"
-		elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-		elog
-		elog "Then, execute the following command to setup the initial database"
-		elog "environment:"
-		elog "    emerge --config =${CATEGORY}/${PF}"
-	fi
-}
-
-pkg_prerm() {
-	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
-		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
-		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
-
-		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
-		sleep 10
-		eend 0
-	fi
-}
-
-pkg_postrm() {
-	postgresql-config update
-}
-
-pkg_config() {
-	use server || die "USE flag 'server' not enabled. Nothing to configure."
-
-	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
-		&& source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
-	[[ -z "${DATA_DIR}" ]] \
-		&& DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
-
-	# environment.bz2 may not contain the same locale as the current system
-	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
-		unset LANG
-		unset LC_CTYPE
-		unset LC_NUMERIC
-		unset LC_TIME
-		unset LC_COLLATE
-		unset LC_MONETARY
-		unset LC_MESSAGES
-		unset LC_ALL
-		source "${EROOT%/}/etc/env.d/02locale"
-		[ -n "${LANG}" ] && export LANG
-		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
-		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
-		[ -n "${LC_TIME}" ] && export LC_TIME
-		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
-		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
-		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
-		[ -n "${LC_ALL}" ] && export LC_ALL
-	fi
-
-	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	einfo
-	einfo "Information on options that can be passed to initdb are found at:"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
-	einfo
-	einfo "PG_INITDB_OPTS is currently set to:"
-	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
-		einfo "    (none)"
-	else
-		einfo "    ${PG_INITDB_OPTS}"
-	fi
-	einfo
-	einfo "Configuration files will be installed to:"
-	einfo "    ${PGDATA}"
-	einfo
-	einfo "The database cluster will be created in:"
-	einfo "    ${DATA_DIR}"
-	einfo
-	while [ "$correct" != "true" ] ; do
-		einfo "Are you ready to continue? (y/n)"
-		read answer
-		if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
-			correct="true"
-		elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
-			die "Aborting initialization."
-		else
-			echo "Answer not recognized"
-		fi
-	done
-
-	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
-		eerror "The given directory, '${DATA_DIR}', is not empty."
-		eerror "Modify DATA_DIR to point to an empty directory."
-		die "${DATA_DIR} is not empty."
-	fi
-
-	einfo "Creating the data directory ..."
-	if [[ ${EUID} == 0 ]] ; then
-		mkdir -p "${DATA_DIR}"
-		chown -Rf postgres:postgres "${DATA_DIR}"
-		chmod 0700 "${DATA_DIR}"
-	fi
-
-	einfo "Initializing the database ..."
-
-	if [[ ${EUID} == 0 ]] ; then
-		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
-	else
-		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
-	fi
-
-	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
-		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
-		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
-	fi
-
-	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
-		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
-		# On the off-chance that you might need to work with UTF-8 encoded
-		# characters in PL/Perl
-		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
-	EOF
-
-	einfo "The autovacuum function, which was in contrib, has been moved to the main"
-	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
-	einfo "by default. You can disable it in the cluster's:"
-	einfo "    ${PGDATA%/}/postgresql.conf"
-	einfo
-	einfo "The PostgreSQL server, by default, will log events to:"
-	einfo "    ${DATA_DIR%/}/postmaster.log"
-	einfo
-	if use prefix ; then
-		einfo "The location of the configuration files have moved to:"
-		einfo "    ${PGDATA}"
-		einfo "To start the server:"
-		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
-		einfo "To stop:"
-		einfo "    pg_ctl stop -D ${DATA_DIR}"
-		einfo
-		einfo "Or move the configuration files back:"
-		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
-	else
-		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	fi
-}
-
-src_test() {
-	if use server && [[ ${UID} -ne 0 ]] ; then
-		emake check
-
-		einfo "If you think other tests besides the regression tests are necessary, please"
-		einfo "submit a bug including a patch for this ebuild to enable them."
-	else
-		use server || \
-			ewarn 'Tests cannot be run without the "server" use flag enabled.'
-		[[ ${UID} -eq 0 ]] || \
-			ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
-
-		ewarn 'Skipping.'
-	fi
-}
diff --git a/dev-db/postgresql/postgresql-9.3.11.ebuild b/dev-db/postgresql/postgresql-9.3.11.ebuild
deleted file mode 100644
index eb7411a..0000000
--- a/dev-db/postgresql/postgresql-9.3.11.ebuild
+++ /dev/null
@@ -1,399 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
-		systemd user versionator
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
-
-SLOT="$(get_version_component_range 1-2)"
-
-SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
-
-LICENSE="POSTGRESQL GPL-2"
-DESCRIPTION="PostgreSQL RDBMS"
-HOMEPAGE="http://www.postgresql.org/"
-
-LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr
-		 zh_CN zh_TW"
-IUSE="doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python
-	  +readline selinux +server ssl static-libs tcl threads uuid xml zlib"
-
-for lingua in ${LINGUAS}; do
-	IUSE+=" linguas_${lingua}"
-done
-
-wanted_languages() {
-	local enable_langs
-
-	for lingua in ${LINGUAS} ; do
-		use linguas_${lingua} && enable_langs+="${lingua} "
-	done
-
-	echo -n ${enable_langs}
-}
-
-CDEPEND="
->=app-eselect/eselect-postgresql-1.2.0
-sys-apps/less
-virtual/libintl
-kerberos? ( virtual/krb5 )
-ldap? ( net-nds/openldap )
-pam? ( virtual/pam )
-perl? ( >=dev-lang/perl-5.8:= )
-python? ( ${PYTHON_DEPS} )
-readline? ( sys-libs/readline:0= )
-ssl? (
-	!libressl? ( >=dev-libs/openssl-0.9.6-r1:0= )
-	libressl? ( dev-libs/libressl:= )
-)
-tcl? ( >=dev-lang/tcl-8:0= )
-uuid? ( dev-libs/ossp-uuid )
-xml? ( dev-libs/libxml2 dev-libs/libxslt )
-zlib? ( sys-libs/zlib )
-"
-
-DEPEND="${CDEPEND}
-!!<sys-apps/sandbox-2.0
-sys-devel/bison
-sys-devel/flex
-nls? ( sys-devel/gettext )
-xml? ( virtual/pkgconfig )
-"
-
-RDEPEND="${CDEPEND}
-!dev-db/postgresql-docs:${SLOT}
-!dev-db/postgresql-base:${SLOT}
-!dev-db/postgresql-server:${SLOT}
-selinux? ( sec-policy/selinux-postgresql )
-"
-
-pkg_setup() {
-	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
-
-	enewgroup postgres 70
-	enewuser postgres 70 /bin/sh /var/lib/postgresql postgres
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Work around PPC{,64} compilation bug where bool is already defined
-	sed '/#ifndef __cplusplus/a #undef bool' -i src/include/c.h || die
-
-	# Set proper run directory
-	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
-		-i src/include/pg_config_manual.h || die
-
-	# Rely on $PATH being in the proper order so that the correct
-	# install program is used for modules utilizing PGXS in both
-	# hardened and non-hardened environments. (Bug #528786)
-	sed 's/@install_bin@/install -c/' -i src/Makefile.global.in || die
-
-	use server || epatch "${FILESDIR}/${PN}-${SLOT}-no-server.patch"
-
-	# Fix bug 486556 where the server would crash at start up because of
-	# an infinite loop caused by a self-referencing symlink.
-	epatch "${FILESDIR}/postgresql-9.2-9.4-tz-dir-overflow.patch"
-
-	if use pam ; then
-		sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
-			-i src/backend/libpq/auth.c || \
-			die 'PGSQL_PAM_SERVICE rename failed.'
-	fi
-
-	epatch_user
-}
-
-src_configure() {
-	case ${CHOST} in
-		*-darwin*|*-solaris*)
-			use nls && append-libs intl
-			;;
-	esac
-
-	export LDFLAGS_SL="${LDFLAGS}"
-	export LDFLAGS_EX="${LDFLAGS}"
-
-	local PO="${EPREFIX%/}"
-
-	econf \
-		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
-		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
-		--docdir="${PO}/usr/share/doc/${PF}" \
-		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
-		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
-		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
-		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
-		$(use_enable !pg_legacytimestamp integer-datetimes) \
-		$(use_enable threads thread-safety) \
-		$(use_with kerberos gssapi) \
-		$(use_with kerberos krb5) \
-		$(use_with ldap) \
-		$(use_with pam) \
-		$(use_with perl) \
-		$(use_with python) \
-		$(use_with readline) \
-		$(use_with ssl openssl) \
-		$(use_with tcl) \
-		$(use_with uuid ossp-uuid) \
-		$(use_with xml libxml) \
-		$(use_with xml libxslt) \
-		$(use_with zlib) \
-		"$(use_enable nls nls "$(wanted_languages)")"
-}
-
-src_compile() {
-	emake
-	emake -C contrib
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	emake DESTDIR="${D}" install -C contrib
-
-	dodoc README HISTORY doc/{TODO,bug.template}
-
-	# man pages are already built, but if we have the target make them,
-	# they'll be generated from source before being installed so we
-	# manually install man pages.
-	# We use ${SLOT} instead of doman for postgresql.eselect
-	insinto /usr/share/postgresql-${SLOT}/man/
-	doins -r doc/src/sgml/man{1,3,7}
-	if ! use server; then
-		# Remove man pages for non-existent binaries
-		for m in {initdb,pg_{controldata,ctl,resetxlog},post{gres,master}}; do
-			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
-		done
-	fi
-	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
-
-	insinto /etc/postgresql-${SLOT}
-	newins src/bin/psql/psqlrc.sample psqlrc
-
-	dodir /etc/eselect/postgresql/slots/${SLOT}
-	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
-		"${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
-
-	use static-libs || find "${ED}" -name '*.a' -delete
-
-	if use doc ; then
-		docinto html
-		dodoc doc/src/sgml/html/*
-
-		docinto sgml
-		dodoc doc/src/sgml/*.{sgml,dsl}
-	fi
-
-	if use server; then
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.confd" | newconfd - ${PN}-${SLOT}
-
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.init-9.3" | newinitd - ${PN}-${SLOT}
-
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.service" | \
-			systemd_newunit - ${PN}-${SLOT}.service
-
-		newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
-
-		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
-
-		if use prefix ; then
-			keepdir /run/postgresql
-			fperms 0775 /run/postgresql
-		fi
-	fi
-}
-
-pkg_postinst() {
-	postgresql-config update
-
-	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
-
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog
-		elog "It looks like this is your first time installing PostgreSQL. Run the"
-		elog "following command in all active shells to pick up changes to the default"
-		elog "environment:"
-		elog "    source /etc/profile"
-	fi
-
-	if use server ; then
-		elog
-		elog "Gentoo specific documentation:"
-		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
-		elog
-		elog "Official documentation:"
-		elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
-		elog
-		elog "The default location of the Unix-domain socket is:"
-		elog "    ${EROOT%/}/run/postgresql/"
-		elog
-		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
-		elog "so that it contains your preferred locale in:"
-		elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-		elog
-		elog "Then, execute the following command to setup the initial database"
-		elog "environment:"
-		elog "    emerge --config =${CATEGORY}/${PF}"
-	fi
-}
-
-pkg_prerm() {
-	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
-		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
-		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
-
-		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
-		sleep 10
-		eend 0
-	fi
-}
-
-pkg_postrm() {
-	postgresql-config update
-}
-
-pkg_config() {
-	use server || die "USE flag 'server' not enabled. Nothing to configure."
-
-	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
-		&& source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
-	[[ -z "${DATA_DIR}" ]] \
-		&& DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
-
-	# environment.bz2 may not contain the same locale as the current system
-	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
-		unset LANG
-		unset LC_CTYPE
-		unset LC_NUMERIC
-		unset LC_TIME
-		unset LC_COLLATE
-		unset LC_MONETARY
-		unset LC_MESSAGES
-		unset LC_ALL
-		source "${EROOT%/}/etc/env.d/02locale"
-		[ -n "${LANG}" ] && export LANG
-		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
-		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
-		[ -n "${LC_TIME}" ] && export LC_TIME
-		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
-		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
-		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
-		[ -n "${LC_ALL}" ] && export LC_ALL
-	fi
-
-	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	einfo
-	einfo "Information on options that can be passed to initdb are found at:"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
-	einfo
-	einfo "PG_INITDB_OPTS is currently set to:"
-	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
-		einfo "    (none)"
-	else
-		einfo "    ${PG_INITDB_OPTS}"
-	fi
-	einfo
-	einfo "Configuration files will be installed to:"
-	einfo "    ${PGDATA}"
-	einfo
-	einfo "The database cluster will be created in:"
-	einfo "    ${DATA_DIR}"
-	einfo
-	while [ "$correct" != "true" ] ; do
-		einfo "Are you ready to continue? (y/n)"
-		read answer
-		if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
-			correct="true"
-		elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
-			die "Aborting initialization."
-		else
-			echo "Answer not recognized"
-		fi
-	done
-
-	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
-		eerror "The given directory, '${DATA_DIR}', is not empty."
-		eerror "Modify DATA_DIR to point to an empty directory."
-		die "${DATA_DIR} is not empty."
-	fi
-
-	einfo "Creating the data directory ..."
-	if [[ ${EUID} == 0 ]] ; then
-		mkdir -p "${DATA_DIR}"
-		chown -Rf postgres:postgres "${DATA_DIR}"
-		chmod 0700 "${DATA_DIR}"
-	fi
-
-	einfo "Initializing the database ..."
-
-	if [[ ${EUID} == 0 ]] ; then
-		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
-	else
-		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
-	fi
-
-	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
-		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
-		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
-	fi
-
-	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
-		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
-		# On the off-chance that you might need to work with UTF-8 encoded
-		# characters in PL/Perl
-		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
-	EOF
-
-	einfo "The autovacuum function, which was in contrib, has been moved to the main"
-	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
-	einfo "by default. You can disable it in the cluster's:"
-	einfo "    ${PGDATA%/}/postgresql.conf"
-	einfo
-	einfo "The PostgreSQL server, by default, will log events to:"
-	einfo "    ${DATA_DIR%/}/postmaster.log"
-	einfo
-	if use prefix ; then
-		einfo "The location of the configuration files have moved to:"
-		einfo "    ${PGDATA}"
-		einfo "To start the server:"
-		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
-		einfo "To stop:"
-		einfo "    pg_ctl stop -D ${DATA_DIR}"
-		einfo
-		einfo "Or move the configuration files back:"
-		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
-	else
-		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	fi
-}
-
-src_test() {
-	if use server && [[ ${UID} -ne 0 ]] ; then
-		emake check
-
-		einfo "If you think other tests besides the regression tests are necessary, please"
-		einfo "submit a bug including a patch for this ebuild to enable them."
-	else
-		use server || \
-			ewarn 'Tests cannot be run without the "server" use flag enabled.'
-		[[ ${UID} -eq 0 ]] || \
-			ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
-
-		ewarn 'Skipping.'
-	fi
-}
diff --git a/dev-db/postgresql/postgresql-9.3.13.ebuild b/dev-db/postgresql/postgresql-9.3.13.ebuild
deleted file mode 100644
index bc1ce93..0000000
--- a/dev-db/postgresql/postgresql-9.3.13.ebuild
+++ /dev/null
@@ -1,399 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
-		systemd user versionator
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
-
-SLOT="$(get_version_component_range 1-2)"
-
-SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
-
-LICENSE="POSTGRESQL GPL-2"
-DESCRIPTION="PostgreSQL RDBMS"
-HOMEPAGE="http://www.postgresql.org/"
-
-LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr
-		 zh_CN zh_TW"
-IUSE="doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python
-	  +readline selinux +server ssl static-libs tcl threads uuid xml zlib"
-
-for lingua in ${LINGUAS}; do
-	IUSE+=" linguas_${lingua}"
-done
-
-wanted_languages() {
-	local enable_langs
-
-	for lingua in ${LINGUAS} ; do
-		use linguas_${lingua} && enable_langs+="${lingua} "
-	done
-
-	echo -n ${enable_langs}
-}
-
-CDEPEND="
->=app-eselect/eselect-postgresql-1.2.0
-sys-apps/less
-virtual/libintl
-kerberos? ( virtual/krb5 )
-ldap? ( net-nds/openldap )
-pam? ( virtual/pam )
-perl? ( >=dev-lang/perl-5.8:= )
-python? ( ${PYTHON_DEPS} )
-readline? ( sys-libs/readline:0= )
-ssl? (
-	!libressl? ( >=dev-libs/openssl-0.9.6-r1:0= )
-	libressl? ( dev-libs/libressl:= )
-)
-tcl? ( >=dev-lang/tcl-8:0= )
-uuid? ( dev-libs/ossp-uuid )
-xml? ( dev-libs/libxml2 dev-libs/libxslt )
-zlib? ( sys-libs/zlib )
-"
-
-DEPEND="${CDEPEND}
-!!<sys-apps/sandbox-2.0
-sys-devel/bison
-sys-devel/flex
-nls? ( sys-devel/gettext )
-xml? ( virtual/pkgconfig )
-"
-
-RDEPEND="${CDEPEND}
-!dev-db/postgresql-docs:${SLOT}
-!dev-db/postgresql-base:${SLOT}
-!dev-db/postgresql-server:${SLOT}
-selinux? ( sec-policy/selinux-postgresql )
-"
-
-pkg_setup() {
-	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
-
-	enewgroup postgres 70
-	enewuser postgres 70 /bin/sh /var/lib/postgresql postgres
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Work around PPC{,64} compilation bug where bool is already defined
-	sed '/#ifndef __cplusplus/a #undef bool' -i src/include/c.h || die
-
-	# Set proper run directory
-	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
-		-i src/include/pg_config_manual.h || die
-
-	# Rely on $PATH being in the proper order so that the correct
-	# install program is used for modules utilizing PGXS in both
-	# hardened and non-hardened environments. (Bug #528786)
-	sed 's/@install_bin@/install -c/' -i src/Makefile.global.in || die
-
-	use server || epatch "${FILESDIR}/${PN}-${SLOT}-no-server.patch"
-
-	# Fix bug 486556 where the server would crash at start up because of
-	# an infinite loop caused by a self-referencing symlink.
-	epatch "${FILESDIR}/postgresql-9.2-9.4-tz-dir-overflow.patch"
-
-	if use pam ; then
-		sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
-			-i src/backend/libpq/auth.c || \
-			die 'PGSQL_PAM_SERVICE rename failed.'
-	fi
-
-	epatch_user
-}
-
-src_configure() {
-	case ${CHOST} in
-		*-darwin*|*-solaris*)
-			use nls && append-libs intl
-			;;
-	esac
-
-	export LDFLAGS_SL="${LDFLAGS}"
-	export LDFLAGS_EX="${LDFLAGS}"
-
-	local PO="${EPREFIX%/}"
-
-	econf \
-		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
-		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
-		--docdir="${PO}/usr/share/doc/${PF}" \
-		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
-		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
-		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
-		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
-		$(use_enable !pg_legacytimestamp integer-datetimes) \
-		$(use_enable threads thread-safety) \
-		$(use_with kerberos gssapi) \
-		$(use_with kerberos krb5) \
-		$(use_with ldap) \
-		$(use_with pam) \
-		$(use_with perl) \
-		$(use_with python) \
-		$(use_with readline) \
-		$(use_with ssl openssl) \
-		$(use_with tcl) \
-		$(use_with uuid ossp-uuid) \
-		$(use_with xml libxml) \
-		$(use_with xml libxslt) \
-		$(use_with zlib) \
-		"$(use_enable nls nls "$(wanted_languages)")"
-}
-
-src_compile() {
-	emake
-	emake -C contrib
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	emake DESTDIR="${D}" install -C contrib
-
-	dodoc README HISTORY doc/{TODO,bug.template}
-
-	# man pages are already built, but if we have the target make them,
-	# they'll be generated from source before being installed so we
-	# manually install man pages.
-	# We use ${SLOT} instead of doman for postgresql.eselect
-	insinto /usr/share/postgresql-${SLOT}/man/
-	doins -r doc/src/sgml/man{1,3,7}
-	if ! use server; then
-		# Remove man pages for non-existent binaries
-		for m in {initdb,pg_{controldata,ctl,resetxlog},post{gres,master}}; do
-			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
-		done
-	fi
-	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
-
-	insinto /etc/postgresql-${SLOT}
-	newins src/bin/psql/psqlrc.sample psqlrc
-
-	dodir /etc/eselect/postgresql/slots/${SLOT}
-	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
-		"${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
-
-	use static-libs || find "${ED}" -name '*.a' -delete
-
-	if use doc ; then
-		docinto html
-		dodoc doc/src/sgml/html/*
-
-		docinto sgml
-		dodoc doc/src/sgml/*.{sgml,dsl}
-	fi
-
-	if use server; then
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.confd" | newconfd - ${PN}-${SLOT}
-
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.init-9.3" | newinitd - ${PN}-${SLOT}
-
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.service" | \
-			systemd_newunit - ${PN}-${SLOT}.service
-
-		newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
-
-		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
-
-		if use prefix ; then
-			keepdir /run/postgresql
-			fperms 0775 /run/postgresql
-		fi
-	fi
-}
-
-pkg_postinst() {
-	postgresql-config update
-
-	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
-
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog
-		elog "It looks like this is your first time installing PostgreSQL. Run the"
-		elog "following command in all active shells to pick up changes to the default"
-		elog "environment:"
-		elog "    source /etc/profile"
-	fi
-
-	if use server ; then
-		elog
-		elog "Gentoo specific documentation:"
-		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
-		elog
-		elog "Official documentation:"
-		elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
-		elog
-		elog "The default location of the Unix-domain socket is:"
-		elog "    ${EROOT%/}/run/postgresql/"
-		elog
-		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
-		elog "so that it contains your preferred locale in:"
-		elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-		elog
-		elog "Then, execute the following command to setup the initial database"
-		elog "environment:"
-		elog "    emerge --config =${CATEGORY}/${PF}"
-	fi
-}
-
-pkg_prerm() {
-	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
-		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
-		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
-
-		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
-		sleep 10
-		eend 0
-	fi
-}
-
-pkg_postrm() {
-	postgresql-config update
-}
-
-pkg_config() {
-	use server || die "USE flag 'server' not enabled. Nothing to configure."
-
-	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
-		&& source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
-	[[ -z "${DATA_DIR}" ]] \
-		&& DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
-
-	# environment.bz2 may not contain the same locale as the current system
-	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
-		unset LANG
-		unset LC_CTYPE
-		unset LC_NUMERIC
-		unset LC_TIME
-		unset LC_COLLATE
-		unset LC_MONETARY
-		unset LC_MESSAGES
-		unset LC_ALL
-		source "${EROOT%/}/etc/env.d/02locale"
-		[ -n "${LANG}" ] && export LANG
-		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
-		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
-		[ -n "${LC_TIME}" ] && export LC_TIME
-		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
-		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
-		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
-		[ -n "${LC_ALL}" ] && export LC_ALL
-	fi
-
-	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	einfo
-	einfo "Information on options that can be passed to initdb are found at:"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
-	einfo
-	einfo "PG_INITDB_OPTS is currently set to:"
-	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
-		einfo "    (none)"
-	else
-		einfo "    ${PG_INITDB_OPTS}"
-	fi
-	einfo
-	einfo "Configuration files will be installed to:"
-	einfo "    ${PGDATA}"
-	einfo
-	einfo "The database cluster will be created in:"
-	einfo "    ${DATA_DIR}"
-	einfo
-	while [ "$correct" != "true" ] ; do
-		einfo "Are you ready to continue? (y/n)"
-		read answer
-		if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
-			correct="true"
-		elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
-			die "Aborting initialization."
-		else
-			echo "Answer not recognized"
-		fi
-	done
-
-	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
-		eerror "The given directory, '${DATA_DIR}', is not empty."
-		eerror "Modify DATA_DIR to point to an empty directory."
-		die "${DATA_DIR} is not empty."
-	fi
-
-	einfo "Creating the data directory ..."
-	if [[ ${EUID} == 0 ]] ; then
-		mkdir -p "${DATA_DIR}"
-		chown -Rf postgres:postgres "${DATA_DIR}"
-		chmod 0700 "${DATA_DIR}"
-	fi
-
-	einfo "Initializing the database ..."
-
-	if [[ ${EUID} == 0 ]] ; then
-		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
-	else
-		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
-	fi
-
-	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
-		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
-		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
-	fi
-
-	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
-		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
-		# On the off-chance that you might need to work with UTF-8 encoded
-		# characters in PL/Perl
-		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
-	EOF
-
-	einfo "The autovacuum function, which was in contrib, has been moved to the main"
-	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
-	einfo "by default. You can disable it in the cluster's:"
-	einfo "    ${PGDATA%/}/postgresql.conf"
-	einfo
-	einfo "The PostgreSQL server, by default, will log events to:"
-	einfo "    ${DATA_DIR%/}/postmaster.log"
-	einfo
-	if use prefix ; then
-		einfo "The location of the configuration files have moved to:"
-		einfo "    ${PGDATA}"
-		einfo "To start the server:"
-		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
-		einfo "To stop:"
-		einfo "    pg_ctl stop -D ${DATA_DIR}"
-		einfo
-		einfo "Or move the configuration files back:"
-		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
-	else
-		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	fi
-}
-
-src_test() {
-	if use server && [[ ${UID} -ne 0 ]] ; then
-		emake check
-
-		einfo "If you think other tests besides the regression tests are necessary, please"
-		einfo "submit a bug including a patch for this ebuild to enable them."
-	else
-		use server || \
-			ewarn 'Tests cannot be run without the "server" use flag enabled.'
-		[[ ${UID} -eq 0 ]] || \
-			ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
-
-		ewarn 'Skipping.'
-	fi
-}
diff --git a/dev-db/postgresql/postgresql-9.4.5-r1.ebuild b/dev-db/postgresql/postgresql-9.4.5-r1.ebuild
deleted file mode 100644
index 787d029..0000000
--- a/dev-db/postgresql/postgresql-9.4.5-r1.ebuild
+++ /dev/null
@@ -1,426 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
-		systemd user versionator
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
-
-SLOT="$(get_version_component_range 1-2)"
-
-SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
-
-LICENSE="POSTGRESQL GPL-2"
-DESCRIPTION="PostgreSQL RDBMS"
-HOMEPAGE="http://www.postgresql.org/"
-
-LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr
-		 zh_CN zh_TW"
-IUSE="doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python
-	  +readline selinux +server ssl static-libs tcl threads uuid xml zlib"
-
-for lingua in ${LINGUAS}; do
-	IUSE+=" linguas_${lingua}"
-done
-
-wanted_languages() {
-	local enable_langs
-
-	for lingua in ${LINGUAS} ; do
-		use linguas_${lingua} && enable_langs+="${lingua} "
-	done
-
-	echo -n ${enable_langs}
-}
-
-CDEPEND="
->=app-eselect/eselect-postgresql-1.2.0
-sys-apps/less
-virtual/libintl
-kerberos? ( virtual/krb5 )
-ldap? ( net-nds/openldap )
-pam? ( virtual/pam )
-perl? ( >=dev-lang/perl-5.8:= )
-python? ( ${PYTHON_DEPS} )
-readline? ( sys-libs/readline:0= )
-ssl? (
-	!libressl? ( >=dev-libs/openssl-0.9.6-r1:0= )
-	libressl? ( dev-libs/libressl:= )
-)
-tcl? ( >=dev-lang/tcl-8:0= )
-xml? ( dev-libs/libxml2 dev-libs/libxslt )
-zlib? ( sys-libs/zlib )
-"
-
-# uuid flags -- depend on sys-apps/util-linux for Linux libcs, or if no
-# supported libc in use depend on dev-libs/ossp-uuid. For BSD systems,
-# the libc includes UUID functions.
-UTIL_LINUX_LIBC=( elibc_{glibc,uclibc,musl} )
-BSD_LIBC=( elibc_{Free,Net,Open}BSD )
-
-nest_usedep() {
-	local front back
-	while [[ ${#} -gt 1 ]]; do
-		front+="${1}? ( "
-		back+=" )"
-		shift
-	done
-	echo "${front}${1}${back}"
-}
-
-IUSE+=" ${UTIL_LINUX_LIBC[@]} ${BSD_LIBC[@]}"
-CDEPEND+="
-uuid? (
-	${UTIL_LINUX_LIBC[@]/%/? ( sys-apps/util-linux )}
-	$(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} ${BSD_LIBC[@]/#/!} dev-libs/ossp-uuid)
-)"
-
-DEPEND="${CDEPEND}
-!!<sys-apps/sandbox-2.0
-sys-devel/bison
-sys-devel/flex
-nls? ( sys-devel/gettext )
-xml? ( virtual/pkgconfig )
-"
-
-RDEPEND="${CDEPEND}
-!dev-db/postgresql-docs:${SLOT}
-!dev-db/postgresql-base:${SLOT}
-!dev-db/postgresql-server:${SLOT}
-selinux? ( sec-policy/selinux-postgresql )
-"
-
-pkg_setup() {
-	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
-
-	enewgroup postgres 70
-	enewuser postgres 70 /bin/sh /var/lib/postgresql postgres
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Work around PPC{,64} compilation bug where bool is already defined
-	sed '/#ifndef __cplusplus/a #undef bool' -i src/include/c.h || die
-
-	# Set proper run directory
-	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
-		-i src/include/pg_config_manual.h || die
-
-	use server || epatch "${FILESDIR}/${PN}-${SLOT}-no-server.patch"
-
-	# Fix bug 486556 where the server would crash at start up because of
-	# an infinite loop caused by a self-referencing symlink.
-	epatch "${FILESDIR}/postgresql-9.2-9.4-tz-dir-overflow.patch"
-
-	if use pam ; then
-		sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
-			-i src/backend/libpq/auth.c || \
-			die 'PGSQL_PAM_SERVICE rename failed.'
-	fi
-
-	epatch_user
-}
-
-src_configure() {
-	case ${CHOST} in
-		*-darwin*|*-solaris*)
-			use nls && append-libs intl
-			;;
-	esac
-
-	export LDFLAGS_SL="${LDFLAGS}"
-	export LDFLAGS_EX="${LDFLAGS}"
-
-	local PO="${EPREFIX%/}"
-
-	local i uuid_config=""
-	if use uuid; then
-		for i in ${UTIL_LINUX_LIBC[@]}; do
-			use ${i} && uuid_config="--with-uuid=e2fs"
-		done
-		for i in ${BSD_LIBC[@]}; do
-			use ${i} && uuid_config="--with-uuid=bsd"
-		done
-		[[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"
-	fi
-
-	econf \
-		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
-		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
-		--docdir="${PO}/usr/share/doc/${PF}" \
-		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
-		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
-		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
-		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
-		$(use_enable !pg_legacytimestamp integer-datetimes) \
-		$(use_enable threads thread-safety) \
-		$(use_with kerberos gssapi) \
-		$(use_with ldap) \
-		$(use_with pam) \
-		$(use_with perl) \
-		$(use_with python) \
-		$(use_with readline) \
-		$(use_with ssl openssl) \
-		$(use_with tcl) \
-		${uuid_config} \
-		$(use_with xml libxml) \
-		$(use_with xml libxslt) \
-		$(use_with zlib) \
-		"$(use_enable nls nls "$(wanted_languages)")"
-}
-
-src_compile() {
-	emake
-	emake -C contrib
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	emake DESTDIR="${D}" install -C contrib
-
-	dodoc README HISTORY doc/{TODO,bug.template}
-
-	# man pages are already built, but if we have the target make them,
-	# they'll be generated from source before being installed so we
-	# manually install man pages.
-	# We use ${SLOT} instead of doman for postgresql.eselect
-	insinto /usr/share/postgresql-${SLOT}/man/
-	doins -r doc/src/sgml/man{1,3,7}
-	if ! use server; then
-		# Remove man pages for non-existent binaries
-		for m in {initdb,pg_{controldata,ctl,resetxlog},post{gres,master}}; do
-			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
-		done
-	fi
-	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
-
-	insinto /etc/postgresql-${SLOT}
-	newins src/bin/psql/psqlrc.sample psqlrc
-
-	dodir /etc/eselect/postgresql/slots/${SLOT}
-	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
-		"${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
-
-	use static-libs || find "${ED}" -name '*.a' -delete
-
-	if use doc ; then
-		docinto html
-		dodoc doc/src/sgml/html/*
-
-		docinto sgml
-		dodoc doc/src/sgml/*.{sgml,dsl}
-	fi
-
-	if use server; then
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.confd" | newconfd - ${PN}-${SLOT}
-
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.init-9.3" | newinitd - ${PN}-${SLOT}
-
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.service" | \
-			systemd_newunit - ${PN}-${SLOT}.service
-
-		newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
-
-		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
-
-		if use prefix ; then
-			keepdir /run/postgresql
-			fperms 0775 /run/postgresql
-		fi
-	fi
-}
-
-pkg_postinst() {
-	postgresql-config update
-
-	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
-
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog
-		elog "It looks like this is your first time installing PostgreSQL. Run the"
-		elog "following command in all active shells to pick up changes to the default"
-		elog "environment:"
-		elog "    source /etc/profile"
-	fi
-
-	if use server ; then
-		elog
-		elog "Gentoo specific documentation:"
-		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
-		elog
-		elog "Official documentation:"
-		elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
-		elog
-		elog "The default location of the Unix-domain socket is:"
-		elog "    ${EROOT%/}/run/postgresql/"
-		elog
-		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
-		elog "so that it contains your preferred locale in:"
-		elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-		elog
-		elog "Then, execute the following command to setup the initial database"
-		elog "environment:"
-		elog "    emerge --config =${CATEGORY}/${PF}"
-	fi
-}
-
-pkg_prerm() {
-	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
-		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
-		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
-
-		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
-		sleep 10
-		eend 0
-	fi
-}
-
-pkg_postrm() {
-	postgresql-config update
-}
-
-pkg_config() {
-	use server || die "USE flag 'server' not enabled. Nothing to configure."
-
-	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
-		&& source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
-	[[ -z "${DATA_DIR}" ]] \
-		&& DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
-
-	# environment.bz2 may not contain the same locale as the current system
-	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
-		unset LANG
-		unset LC_CTYPE
-		unset LC_NUMERIC
-		unset LC_TIME
-		unset LC_COLLATE
-		unset LC_MONETARY
-		unset LC_MESSAGES
-		unset LC_ALL
-		source "${EROOT%/}/etc/env.d/02locale"
-		[ -n "${LANG}" ] && export LANG
-		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
-		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
-		[ -n "${LC_TIME}" ] && export LC_TIME
-		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
-		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
-		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
-		[ -n "${LC_ALL}" ] && export LC_ALL
-	fi
-
-	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	einfo
-	einfo "Information on options that can be passed to initdb are found at:"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
-	einfo
-	einfo "PG_INITDB_OPTS is currently set to:"
-	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
-		einfo "    (none)"
-	else
-		einfo "    ${PG_INITDB_OPTS}"
-	fi
-	einfo
-	einfo "Configuration files will be installed to:"
-	einfo "    ${PGDATA}"
-	einfo
-	einfo "The database cluster will be created in:"
-	einfo "    ${DATA_DIR}"
-	einfo
-	while [ "$correct" != "true" ] ; do
-		einfo "Are you ready to continue? (y/n)"
-		read answer
-		if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
-			correct="true"
-		elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
-			die "Aborting initialization."
-		else
-			echo "Answer not recognized"
-		fi
-	done
-
-	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
-		eerror "The given directory, '${DATA_DIR}', is not empty."
-		eerror "Modify DATA_DIR to point to an empty directory."
-		die "${DATA_DIR} is not empty."
-	fi
-
-	einfo "Creating the data directory ..."
-	if [[ ${EUID} == 0 ]] ; then
-		mkdir -p "${DATA_DIR}"
-		chown -Rf postgres:postgres "${DATA_DIR}"
-		chmod 0700 "${DATA_DIR}"
-	fi
-
-	einfo "Initializing the database ..."
-
-	if [[ ${EUID} == 0 ]] ; then
-		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
-	else
-		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
-	fi
-
-	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
-		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
-		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
-	fi
-
-	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
-		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
-		# On the off-chance that you might need to work with UTF-8 encoded
-		# characters in PL/Perl
-		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
-	EOF
-
-	einfo "The autovacuum function, which was in contrib, has been moved to the main"
-	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
-	einfo "by default. You can disable it in the cluster's:"
-	einfo "    ${PGDATA%/}/postgresql.conf"
-	einfo
-	einfo "The PostgreSQL server, by default, will log events to:"
-	einfo "    ${DATA_DIR%/}/postmaster.log"
-	einfo
-	if use prefix ; then
-		einfo "The location of the configuration files have moved to:"
-		einfo "    ${PGDATA}"
-		einfo "To start the server:"
-		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
-		einfo "To stop:"
-		einfo "    pg_ctl stop -D ${DATA_DIR}"
-		einfo
-		einfo "Or move the configuration files back:"
-		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
-	else
-		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	fi
-}
-
-src_test() {
-	if use server && [[ ${UID} -ne 0 ]] ; then
-		emake check
-
-		einfo "If you think other tests besides the regression tests are necessary, please"
-		einfo "submit a bug including a patch for this ebuild to enable them."
-	else
-		use server || \
-			ewarn 'Tests cannot be run without the "server" use flag enabled.'
-		[[ ${UID} -eq 0 ]] || \
-			ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
-
-		ewarn 'Skipping.'
-	fi
-}
diff --git a/dev-db/postgresql/postgresql-9.4.5-r2.ebuild b/dev-db/postgresql/postgresql-9.4.5-r2.ebuild
deleted file mode 100644
index 1db7047..0000000
--- a/dev-db/postgresql/postgresql-9.4.5-r2.ebuild
+++ /dev/null
@@ -1,431 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
-		systemd user versionator
-
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
-
-SLOT="$(get_version_component_range 1-2)"
-
-SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
-
-LICENSE="POSTGRESQL GPL-2"
-DESCRIPTION="PostgreSQL RDBMS"
-HOMEPAGE="http://www.postgresql.org/"
-
-LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr
-		 zh_CN zh_TW"
-IUSE="doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python
-	  +readline selinux +server ssl static-libs tcl threads uuid xml zlib"
-
-for lingua in ${LINGUAS}; do
-	IUSE+=" linguas_${lingua}"
-done
-
-wanted_languages() {
-	local enable_langs
-
-	for lingua in ${LINGUAS} ; do
-		use linguas_${lingua} && enable_langs+="${lingua} "
-	done
-
-	echo -n ${enable_langs}
-}
-
-CDEPEND="
->=app-eselect/eselect-postgresql-1.2.0
-sys-apps/less
-virtual/libintl
-kerberos? ( virtual/krb5 )
-ldap? ( net-nds/openldap )
-pam? ( virtual/pam )
-perl? ( >=dev-lang/perl-5.8:= )
-python? ( ${PYTHON_DEPS} )
-readline? ( sys-libs/readline:0= )
-ssl? (
-	!libressl? ( >=dev-libs/openssl-0.9.6-r1:0= )
-	libressl? ( dev-libs/libressl:= )
-)
-tcl? ( >=dev-lang/tcl-8:0= )
-xml? ( dev-libs/libxml2 dev-libs/libxslt )
-zlib? ( sys-libs/zlib )
-"
-
-# uuid flags -- depend on sys-apps/util-linux for Linux libcs, or if no
-# supported libc in use depend on dev-libs/ossp-uuid. For BSD systems,
-# the libc includes UUID functions.
-UTIL_LINUX_LIBC=( elibc_{glibc,uclibc,musl} )
-BSD_LIBC=( elibc_{Free,Net,Open}BSD )
-
-nest_usedep() {
-	local front back
-	while [[ ${#} -gt 1 ]]; do
-		front+="${1}? ( "
-		back+=" )"
-		shift
-	done
-	echo "${front}${1}${back}"
-}
-
-IUSE+=" ${UTIL_LINUX_LIBC[@]} ${BSD_LIBC[@]}"
-CDEPEND+="
-uuid? (
-	${UTIL_LINUX_LIBC[@]/%/? ( sys-apps/util-linux )}
-	$(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} ${BSD_LIBC[@]/#/!} dev-libs/ossp-uuid)
-)"
-
-DEPEND="${CDEPEND}
-!!<sys-apps/sandbox-2.0
-sys-devel/bison
-sys-devel/flex
-nls? ( sys-devel/gettext )
-xml? ( virtual/pkgconfig )
-"
-
-RDEPEND="${CDEPEND}
-!dev-db/postgresql-docs:${SLOT}
-!dev-db/postgresql-base:${SLOT}
-!dev-db/postgresql-server:${SLOT}
-selinux? ( sec-policy/selinux-postgresql )
-"
-
-pkg_setup() {
-	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
-
-	enewgroup postgres 70
-	enewuser postgres 70 /bin/sh /var/lib/postgresql postgres
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Work around PPC{,64} compilation bug where bool is already defined
-	sed '/#ifndef __cplusplus/a #undef bool' -i src/include/c.h || die
-
-	# Set proper run directory
-	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
-		-i src/include/pg_config_manual.h || die
-
-	# Rely on $PATH being in the proper order so that the correct
-	# install program is used for modules utilizing PGXS in both
-	# hardened and non-hardened environments. (Bug #528786)
-	sed 's/@install_bin@/install -c/' -i src/Makefile.global.in || die
-
-	use server || epatch "${FILESDIR}/${PN}-${SLOT}-no-server.patch"
-
-	# Fix bug 486556 where the server would crash at start up because of
-	# an infinite loop caused by a self-referencing symlink.
-	epatch "${FILESDIR}/postgresql-9.2-9.4-tz-dir-overflow.patch"
-
-	if use pam ; then
-		sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
-			-i src/backend/libpq/auth.c || \
-			die 'PGSQL_PAM_SERVICE rename failed.'
-	fi
-
-	epatch_user
-}
-
-src_configure() {
-	case ${CHOST} in
-		*-darwin*|*-solaris*)
-			use nls && append-libs intl
-			;;
-	esac
-
-	export LDFLAGS_SL="${LDFLAGS}"
-	export LDFLAGS_EX="${LDFLAGS}"
-
-	local PO="${EPREFIX%/}"
-
-	local i uuid_config=""
-	if use uuid; then
-		for i in ${UTIL_LINUX_LIBC[@]}; do
-			use ${i} && uuid_config="--with-uuid=e2fs"
-		done
-		for i in ${BSD_LIBC[@]}; do
-			use ${i} && uuid_config="--with-uuid=bsd"
-		done
-		[[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"
-	fi
-
-	econf \
-		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
-		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
-		--docdir="${PO}/usr/share/doc/${PF}" \
-		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
-		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
-		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
-		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
-		$(use_enable !pg_legacytimestamp integer-datetimes) \
-		$(use_enable threads thread-safety) \
-		$(use_with kerberos gssapi) \
-		$(use_with ldap) \
-		$(use_with pam) \
-		$(use_with perl) \
-		$(use_with python) \
-		$(use_with readline) \
-		$(use_with ssl openssl) \
-		$(use_with tcl) \
-		${uuid_config} \
-		$(use_with xml libxml) \
-		$(use_with xml libxslt) \
-		$(use_with zlib) \
-		"$(use_enable nls nls "$(wanted_languages)")"
-}
-
-src_compile() {
-	emake
-	emake -C contrib
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	emake DESTDIR="${D}" install -C contrib
-
-	dodoc README HISTORY doc/{TODO,bug.template}
-
-	# man pages are already built, but if we have the target make them,
-	# they'll be generated from source before being installed so we
-	# manually install man pages.
-	# We use ${SLOT} instead of doman for postgresql.eselect
-	insinto /usr/share/postgresql-${SLOT}/man/
-	doins -r doc/src/sgml/man{1,3,7}
-	if ! use server; then
-		# Remove man pages for non-existent binaries
-		for m in {initdb,pg_{controldata,ctl,resetxlog},post{gres,master}}; do
-			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
-		done
-	fi
-	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
-
-	insinto /etc/postgresql-${SLOT}
-	newins src/bin/psql/psqlrc.sample psqlrc
-
-	dodir /etc/eselect/postgresql/slots/${SLOT}
-	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
-		"${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
-
-	use static-libs || find "${ED}" -name '*.a' -delete
-
-	if use doc ; then
-		docinto html
-		dodoc doc/src/sgml/html/*
-
-		docinto sgml
-		dodoc doc/src/sgml/*.{sgml,dsl}
-	fi
-
-	if use server; then
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.confd" | newconfd - ${PN}-${SLOT}
-
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.init-9.3" | newinitd - ${PN}-${SLOT}
-
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.service" | \
-			systemd_newunit - ${PN}-${SLOT}.service
-
-		newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
-
-		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
-
-		if use prefix ; then
-			keepdir /run/postgresql
-			fperms 0775 /run/postgresql
-		fi
-	fi
-}
-
-pkg_postinst() {
-	postgresql-config update
-
-	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
-
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog
-		elog "It looks like this is your first time installing PostgreSQL. Run the"
-		elog "following command in all active shells to pick up changes to the default"
-		elog "environment:"
-		elog "    source /etc/profile"
-	fi
-
-	if use server ; then
-		elog
-		elog "Gentoo specific documentation:"
-		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
-		elog
-		elog "Official documentation:"
-		elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
-		elog
-		elog "The default location of the Unix-domain socket is:"
-		elog "    ${EROOT%/}/run/postgresql/"
-		elog
-		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
-		elog "so that it contains your preferred locale in:"
-		elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-		elog
-		elog "Then, execute the following command to setup the initial database"
-		elog "environment:"
-		elog "    emerge --config =${CATEGORY}/${PF}"
-	fi
-}
-
-pkg_prerm() {
-	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
-		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
-		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
-
-		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
-		sleep 10
-		eend 0
-	fi
-}
-
-pkg_postrm() {
-	postgresql-config update
-}
-
-pkg_config() {
-	use server || die "USE flag 'server' not enabled. Nothing to configure."
-
-	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
-		&& source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
-	[[ -z "${DATA_DIR}" ]] \
-		&& DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
-
-	# environment.bz2 may not contain the same locale as the current system
-	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
-		unset LANG
-		unset LC_CTYPE
-		unset LC_NUMERIC
-		unset LC_TIME
-		unset LC_COLLATE
-		unset LC_MONETARY
-		unset LC_MESSAGES
-		unset LC_ALL
-		source "${EROOT%/}/etc/env.d/02locale"
-		[ -n "${LANG}" ] && export LANG
-		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
-		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
-		[ -n "${LC_TIME}" ] && export LC_TIME
-		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
-		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
-		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
-		[ -n "${LC_ALL}" ] && export LC_ALL
-	fi
-
-	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	einfo
-	einfo "Information on options that can be passed to initdb are found at:"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
-	einfo
-	einfo "PG_INITDB_OPTS is currently set to:"
-	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
-		einfo "    (none)"
-	else
-		einfo "    ${PG_INITDB_OPTS}"
-	fi
-	einfo
-	einfo "Configuration files will be installed to:"
-	einfo "    ${PGDATA}"
-	einfo
-	einfo "The database cluster will be created in:"
-	einfo "    ${DATA_DIR}"
-	einfo
-	while [ "$correct" != "true" ] ; do
-		einfo "Are you ready to continue? (y/n)"
-		read answer
-		if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
-			correct="true"
-		elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
-			die "Aborting initialization."
-		else
-			echo "Answer not recognized"
-		fi
-	done
-
-	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
-		eerror "The given directory, '${DATA_DIR}', is not empty."
-		eerror "Modify DATA_DIR to point to an empty directory."
-		die "${DATA_DIR} is not empty."
-	fi
-
-	einfo "Creating the data directory ..."
-	if [[ ${EUID} == 0 ]] ; then
-		mkdir -p "${DATA_DIR}"
-		chown -Rf postgres:postgres "${DATA_DIR}"
-		chmod 0700 "${DATA_DIR}"
-	fi
-
-	einfo "Initializing the database ..."
-
-	if [[ ${EUID} == 0 ]] ; then
-		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
-	else
-		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
-	fi
-
-	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
-		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
-		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
-	fi
-
-	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
-		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
-		# On the off-chance that you might need to work with UTF-8 encoded
-		# characters in PL/Perl
-		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
-	EOF
-
-	einfo "The autovacuum function, which was in contrib, has been moved to the main"
-	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
-	einfo "by default. You can disable it in the cluster's:"
-	einfo "    ${PGDATA%/}/postgresql.conf"
-	einfo
-	einfo "The PostgreSQL server, by default, will log events to:"
-	einfo "    ${DATA_DIR%/}/postmaster.log"
-	einfo
-	if use prefix ; then
-		einfo "The location of the configuration files have moved to:"
-		einfo "    ${PGDATA}"
-		einfo "To start the server:"
-		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
-		einfo "To stop:"
-		einfo "    pg_ctl stop -D ${DATA_DIR}"
-		einfo
-		einfo "Or move the configuration files back:"
-		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
-	else
-		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	fi
-}
-
-src_test() {
-	if use server && [[ ${UID} -ne 0 ]] ; then
-		emake check
-
-		einfo "If you think other tests besides the regression tests are necessary, please"
-		einfo "submit a bug including a patch for this ebuild to enable them."
-	else
-		use server || \
-			ewarn 'Tests cannot be run without the "server" use flag enabled.'
-		[[ ${UID} -eq 0 ]] || \
-			ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
-
-		ewarn 'Skipping.'
-	fi
-}
diff --git a/dev-db/postgresql/postgresql-9.4.6.ebuild b/dev-db/postgresql/postgresql-9.4.6.ebuild
deleted file mode 100644
index da7c631..0000000
--- a/dev-db/postgresql/postgresql-9.4.6.ebuild
+++ /dev/null
@@ -1,431 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
-		systemd user versionator
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
-
-SLOT="$(get_version_component_range 1-2)"
-
-SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
-
-LICENSE="POSTGRESQL GPL-2"
-DESCRIPTION="PostgreSQL RDBMS"
-HOMEPAGE="http://www.postgresql.org/"
-
-LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr
-		 zh_CN zh_TW"
-IUSE="doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python
-	  +readline selinux +server ssl static-libs tcl threads uuid xml zlib"
-
-for lingua in ${LINGUAS}; do
-	IUSE+=" linguas_${lingua}"
-done
-
-wanted_languages() {
-	local enable_langs
-
-	for lingua in ${LINGUAS} ; do
-		use linguas_${lingua} && enable_langs+="${lingua} "
-	done
-
-	echo -n ${enable_langs}
-}
-
-CDEPEND="
->=app-eselect/eselect-postgresql-1.2.0
-sys-apps/less
-virtual/libintl
-kerberos? ( virtual/krb5 )
-ldap? ( net-nds/openldap )
-pam? ( virtual/pam )
-perl? ( >=dev-lang/perl-5.8:= )
-python? ( ${PYTHON_DEPS} )
-readline? ( sys-libs/readline:0= )
-ssl? (
-	!libressl? ( >=dev-libs/openssl-0.9.6-r1:0= )
-	libressl? ( dev-libs/libressl:= )
-)
-tcl? ( >=dev-lang/tcl-8:0= )
-xml? ( dev-libs/libxml2 dev-libs/libxslt )
-zlib? ( sys-libs/zlib )
-"
-
-# uuid flags -- depend on sys-apps/util-linux for Linux libcs, or if no
-# supported libc in use depend on dev-libs/ossp-uuid. For BSD systems,
-# the libc includes UUID functions.
-UTIL_LINUX_LIBC=( elibc_{glibc,uclibc,musl} )
-BSD_LIBC=( elibc_{Free,Net,Open}BSD )
-
-nest_usedep() {
-	local front back
-	while [[ ${#} -gt 1 ]]; do
-		front+="${1}? ( "
-		back+=" )"
-		shift
-	done
-	echo "${front}${1}${back}"
-}
-
-IUSE+=" ${UTIL_LINUX_LIBC[@]} ${BSD_LIBC[@]}"
-CDEPEND+="
-uuid? (
-	${UTIL_LINUX_LIBC[@]/%/? ( sys-apps/util-linux )}
-	$(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} ${BSD_LIBC[@]/#/!} dev-libs/ossp-uuid)
-)"
-
-DEPEND="${CDEPEND}
-!!<sys-apps/sandbox-2.0
-sys-devel/bison
-sys-devel/flex
-nls? ( sys-devel/gettext )
-xml? ( virtual/pkgconfig )
-"
-
-RDEPEND="${CDEPEND}
-!dev-db/postgresql-docs:${SLOT}
-!dev-db/postgresql-base:${SLOT}
-!dev-db/postgresql-server:${SLOT}
-selinux? ( sec-policy/selinux-postgresql )
-"
-
-pkg_setup() {
-	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
-
-	enewgroup postgres 70
-	enewuser postgres 70 /bin/sh /var/lib/postgresql postgres
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Work around PPC{,64} compilation bug where bool is already defined
-	sed '/#ifndef __cplusplus/a #undef bool' -i src/include/c.h || die
-
-	# Set proper run directory
-	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
-		-i src/include/pg_config_manual.h || die
-
-	# Rely on $PATH being in the proper order so that the correct
-	# install program is used for modules utilizing PGXS in both
-	# hardened and non-hardened environments. (Bug #528786)
-	sed 's/@install_bin@/install -c/' -i src/Makefile.global.in || die
-
-	use server || epatch "${FILESDIR}/${PN}-${SLOT}-no-server.patch"
-
-	# Fix bug 486556 where the server would crash at start up because of
-	# an infinite loop caused by a self-referencing symlink.
-	epatch "${FILESDIR}/postgresql-9.2-9.4-tz-dir-overflow.patch"
-
-	if use pam ; then
-		sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
-			-i src/backend/libpq/auth.c || \
-			die 'PGSQL_PAM_SERVICE rename failed.'
-	fi
-
-	epatch_user
-}
-
-src_configure() {
-	case ${CHOST} in
-		*-darwin*|*-solaris*)
-			use nls && append-libs intl
-			;;
-	esac
-
-	export LDFLAGS_SL="${LDFLAGS}"
-	export LDFLAGS_EX="${LDFLAGS}"
-
-	local PO="${EPREFIX%/}"
-
-	local i uuid_config=""
-	if use uuid; then
-		for i in ${UTIL_LINUX_LIBC[@]}; do
-			use ${i} && uuid_config="--with-uuid=e2fs"
-		done
-		for i in ${BSD_LIBC[@]}; do
-			use ${i} && uuid_config="--with-uuid=bsd"
-		done
-		[[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"
-	fi
-
-	econf \
-		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
-		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
-		--docdir="${PO}/usr/share/doc/${PF}" \
-		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
-		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
-		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
-		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
-		$(use_enable !pg_legacytimestamp integer-datetimes) \
-		$(use_enable threads thread-safety) \
-		$(use_with kerberos gssapi) \
-		$(use_with ldap) \
-		$(use_with pam) \
-		$(use_with perl) \
-		$(use_with python) \
-		$(use_with readline) \
-		$(use_with ssl openssl) \
-		$(use_with tcl) \
-		${uuid_config} \
-		$(use_with xml libxml) \
-		$(use_with xml libxslt) \
-		$(use_with zlib) \
-		"$(use_enable nls nls "$(wanted_languages)")"
-}
-
-src_compile() {
-	emake
-	emake -C contrib
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	emake DESTDIR="${D}" install -C contrib
-
-	dodoc README HISTORY doc/{TODO,bug.template}
-
-	# man pages are already built, but if we have the target make them,
-	# they'll be generated from source before being installed so we
-	# manually install man pages.
-	# We use ${SLOT} instead of doman for postgresql.eselect
-	insinto /usr/share/postgresql-${SLOT}/man/
-	doins -r doc/src/sgml/man{1,3,7}
-	if ! use server; then
-		# Remove man pages for non-existent binaries
-		for m in {initdb,pg_{controldata,ctl,resetxlog},post{gres,master}}; do
-			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
-		done
-	fi
-	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
-
-	insinto /etc/postgresql-${SLOT}
-	newins src/bin/psql/psqlrc.sample psqlrc
-
-	dodir /etc/eselect/postgresql/slots/${SLOT}
-	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
-		"${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
-
-	use static-libs || find "${ED}" -name '*.a' -delete
-
-	if use doc ; then
-		docinto html
-		dodoc doc/src/sgml/html/*
-
-		docinto sgml
-		dodoc doc/src/sgml/*.{sgml,dsl}
-	fi
-
-	if use server; then
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.confd" | newconfd - ${PN}-${SLOT}
-
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.init-9.3" | newinitd - ${PN}-${SLOT}
-
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.service" | \
-			systemd_newunit - ${PN}-${SLOT}.service
-
-		newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
-
-		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
-
-		if use prefix ; then
-			keepdir /run/postgresql
-			fperms 0775 /run/postgresql
-		fi
-	fi
-}
-
-pkg_postinst() {
-	postgresql-config update
-
-	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
-
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog
-		elog "It looks like this is your first time installing PostgreSQL. Run the"
-		elog "following command in all active shells to pick up changes to the default"
-		elog "environment:"
-		elog "    source /etc/profile"
-	fi
-
-	if use server ; then
-		elog
-		elog "Gentoo specific documentation:"
-		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
-		elog
-		elog "Official documentation:"
-		elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
-		elog
-		elog "The default location of the Unix-domain socket is:"
-		elog "    ${EROOT%/}/run/postgresql/"
-		elog
-		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
-		elog "so that it contains your preferred locale in:"
-		elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-		elog
-		elog "Then, execute the following command to setup the initial database"
-		elog "environment:"
-		elog "    emerge --config =${CATEGORY}/${PF}"
-	fi
-}
-
-pkg_prerm() {
-	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
-		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
-		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
-
-		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
-		sleep 10
-		eend 0
-	fi
-}
-
-pkg_postrm() {
-	postgresql-config update
-}
-
-pkg_config() {
-	use server || die "USE flag 'server' not enabled. Nothing to configure."
-
-	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
-		&& source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
-	[[ -z "${DATA_DIR}" ]] \
-		&& DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
-
-	# environment.bz2 may not contain the same locale as the current system
-	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
-		unset LANG
-		unset LC_CTYPE
-		unset LC_NUMERIC
-		unset LC_TIME
-		unset LC_COLLATE
-		unset LC_MONETARY
-		unset LC_MESSAGES
-		unset LC_ALL
-		source "${EROOT%/}/etc/env.d/02locale"
-		[ -n "${LANG}" ] && export LANG
-		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
-		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
-		[ -n "${LC_TIME}" ] && export LC_TIME
-		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
-		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
-		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
-		[ -n "${LC_ALL}" ] && export LC_ALL
-	fi
-
-	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	einfo
-	einfo "Information on options that can be passed to initdb are found at:"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
-	einfo
-	einfo "PG_INITDB_OPTS is currently set to:"
-	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
-		einfo "    (none)"
-	else
-		einfo "    ${PG_INITDB_OPTS}"
-	fi
-	einfo
-	einfo "Configuration files will be installed to:"
-	einfo "    ${PGDATA}"
-	einfo
-	einfo "The database cluster will be created in:"
-	einfo "    ${DATA_DIR}"
-	einfo
-	while [ "$correct" != "true" ] ; do
-		einfo "Are you ready to continue? (y/n)"
-		read answer
-		if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
-			correct="true"
-		elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
-			die "Aborting initialization."
-		else
-			echo "Answer not recognized"
-		fi
-	done
-
-	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
-		eerror "The given directory, '${DATA_DIR}', is not empty."
-		eerror "Modify DATA_DIR to point to an empty directory."
-		die "${DATA_DIR} is not empty."
-	fi
-
-	einfo "Creating the data directory ..."
-	if [[ ${EUID} == 0 ]] ; then
-		mkdir -p "${DATA_DIR}"
-		chown -Rf postgres:postgres "${DATA_DIR}"
-		chmod 0700 "${DATA_DIR}"
-	fi
-
-	einfo "Initializing the database ..."
-
-	if [[ ${EUID} == 0 ]] ; then
-		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
-	else
-		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
-	fi
-
-	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
-		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
-		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
-	fi
-
-	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
-		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
-		# On the off-chance that you might need to work with UTF-8 encoded
-		# characters in PL/Perl
-		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
-	EOF
-
-	einfo "The autovacuum function, which was in contrib, has been moved to the main"
-	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
-	einfo "by default. You can disable it in the cluster's:"
-	einfo "    ${PGDATA%/}/postgresql.conf"
-	einfo
-	einfo "The PostgreSQL server, by default, will log events to:"
-	einfo "    ${DATA_DIR%/}/postmaster.log"
-	einfo
-	if use prefix ; then
-		einfo "The location of the configuration files have moved to:"
-		einfo "    ${PGDATA}"
-		einfo "To start the server:"
-		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
-		einfo "To stop:"
-		einfo "    pg_ctl stop -D ${DATA_DIR}"
-		einfo
-		einfo "Or move the configuration files back:"
-		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
-	else
-		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	fi
-}
-
-src_test() {
-	if use server && [[ ${UID} -ne 0 ]] ; then
-		emake check
-
-		einfo "If you think other tests besides the regression tests are necessary, please"
-		einfo "submit a bug including a patch for this ebuild to enable them."
-	else
-		use server || \
-			ewarn 'Tests cannot be run without the "server" use flag enabled.'
-		[[ ${UID} -eq 0 ]] || \
-			ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
-
-		ewarn 'Skipping.'
-	fi
-}
diff --git a/dev-db/postgresql/postgresql-9.4.8.ebuild b/dev-db/postgresql/postgresql-9.4.8.ebuild
deleted file mode 100644
index 42b20ad..0000000
--- a/dev-db/postgresql/postgresql-9.4.8.ebuild
+++ /dev/null
@@ -1,431 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
-		systemd user versionator
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
-
-SLOT="$(get_version_component_range 1-2)"
-
-SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
-
-LICENSE="POSTGRESQL GPL-2"
-DESCRIPTION="PostgreSQL RDBMS"
-HOMEPAGE="http://www.postgresql.org/"
-
-LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr
-		 zh_CN zh_TW"
-IUSE="doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python
-	  +readline selinux +server ssl static-libs tcl threads uuid xml zlib"
-
-for lingua in ${LINGUAS}; do
-	IUSE+=" linguas_${lingua}"
-done
-
-wanted_languages() {
-	local enable_langs
-
-	for lingua in ${LINGUAS} ; do
-		use linguas_${lingua} && enable_langs+="${lingua} "
-	done
-
-	echo -n ${enable_langs}
-}
-
-CDEPEND="
->=app-eselect/eselect-postgresql-1.2.0
-sys-apps/less
-virtual/libintl
-kerberos? ( virtual/krb5 )
-ldap? ( net-nds/openldap )
-pam? ( virtual/pam )
-perl? ( >=dev-lang/perl-5.8:= )
-python? ( ${PYTHON_DEPS} )
-readline? ( sys-libs/readline:0= )
-ssl? (
-	!libressl? ( >=dev-libs/openssl-0.9.6-r1:0= )
-	libressl? ( dev-libs/libressl:= )
-)
-tcl? ( >=dev-lang/tcl-8:0= )
-xml? ( dev-libs/libxml2 dev-libs/libxslt )
-zlib? ( sys-libs/zlib )
-"
-
-# uuid flags -- depend on sys-apps/util-linux for Linux libcs, or if no
-# supported libc in use depend on dev-libs/ossp-uuid. For BSD systems,
-# the libc includes UUID functions.
-UTIL_LINUX_LIBC=( elibc_{glibc,uclibc,musl} )
-BSD_LIBC=( elibc_{Free,Net,Open}BSD )
-
-nest_usedep() {
-	local front back
-	while [[ ${#} -gt 1 ]]; do
-		front+="${1}? ( "
-		back+=" )"
-		shift
-	done
-	echo "${front}${1}${back}"
-}
-
-IUSE+=" ${UTIL_LINUX_LIBC[@]} ${BSD_LIBC[@]}"
-CDEPEND+="
-uuid? (
-	${UTIL_LINUX_LIBC[@]/%/? ( sys-apps/util-linux )}
-	$(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} ${BSD_LIBC[@]/#/!} dev-libs/ossp-uuid)
-)"
-
-DEPEND="${CDEPEND}
-!!<sys-apps/sandbox-2.0
-sys-devel/bison
-sys-devel/flex
-nls? ( sys-devel/gettext )
-xml? ( virtual/pkgconfig )
-"
-
-RDEPEND="${CDEPEND}
-!dev-db/postgresql-docs:${SLOT}
-!dev-db/postgresql-base:${SLOT}
-!dev-db/postgresql-server:${SLOT}
-selinux? ( sec-policy/selinux-postgresql )
-"
-
-pkg_setup() {
-	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
-
-	enewgroup postgres 70
-	enewuser postgres 70 /bin/sh /var/lib/postgresql postgres
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Work around PPC{,64} compilation bug where bool is already defined
-	sed '/#ifndef __cplusplus/a #undef bool' -i src/include/c.h || die
-
-	# Set proper run directory
-	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
-		-i src/include/pg_config_manual.h || die
-
-	# Rely on $PATH being in the proper order so that the correct
-	# install program is used for modules utilizing PGXS in both
-	# hardened and non-hardened environments. (Bug #528786)
-	sed 's/@install_bin@/install -c/' -i src/Makefile.global.in || die
-
-	use server || epatch "${FILESDIR}/${PN}-${SLOT}-no-server.patch"
-
-	# Fix bug 486556 where the server would crash at start up because of
-	# an infinite loop caused by a self-referencing symlink.
-	epatch "${FILESDIR}/postgresql-9.2-9.4-tz-dir-overflow.patch"
-
-	if use pam ; then
-		sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
-			-i src/backend/libpq/auth.c || \
-			die 'PGSQL_PAM_SERVICE rename failed.'
-	fi
-
-	epatch_user
-}
-
-src_configure() {
-	case ${CHOST} in
-		*-darwin*|*-solaris*)
-			use nls && append-libs intl
-			;;
-	esac
-
-	export LDFLAGS_SL="${LDFLAGS}"
-	export LDFLAGS_EX="${LDFLAGS}"
-
-	local PO="${EPREFIX%/}"
-
-	local i uuid_config=""
-	if use uuid; then
-		for i in ${UTIL_LINUX_LIBC[@]}; do
-			use ${i} && uuid_config="--with-uuid=e2fs"
-		done
-		for i in ${BSD_LIBC[@]}; do
-			use ${i} && uuid_config="--with-uuid=bsd"
-		done
-		[[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"
-	fi
-
-	econf \
-		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
-		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
-		--docdir="${PO}/usr/share/doc/${PF}" \
-		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
-		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
-		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
-		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
-		$(use_enable !pg_legacytimestamp integer-datetimes) \
-		$(use_enable threads thread-safety) \
-		$(use_with kerberos gssapi) \
-		$(use_with ldap) \
-		$(use_with pam) \
-		$(use_with perl) \
-		$(use_with python) \
-		$(use_with readline) \
-		$(use_with ssl openssl) \
-		$(use_with tcl) \
-		${uuid_config} \
-		$(use_with xml libxml) \
-		$(use_with xml libxslt) \
-		$(use_with zlib) \
-		"$(use_enable nls nls "$(wanted_languages)")"
-}
-
-src_compile() {
-	emake
-	emake -C contrib
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	emake DESTDIR="${D}" install -C contrib
-
-	dodoc README HISTORY doc/{TODO,bug.template}
-
-	# man pages are already built, but if we have the target make them,
-	# they'll be generated from source before being installed so we
-	# manually install man pages.
-	# We use ${SLOT} instead of doman for postgresql.eselect
-	insinto /usr/share/postgresql-${SLOT}/man/
-	doins -r doc/src/sgml/man{1,3,7}
-	if ! use server; then
-		# Remove man pages for non-existent binaries
-		for m in {initdb,pg_{controldata,ctl,resetxlog},post{gres,master}}; do
-			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
-		done
-	fi
-	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
-
-	insinto /etc/postgresql-${SLOT}
-	newins src/bin/psql/psqlrc.sample psqlrc
-
-	dodir /etc/eselect/postgresql/slots/${SLOT}
-	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
-		"${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
-
-	use static-libs || find "${ED}" -name '*.a' -delete
-
-	if use doc ; then
-		docinto html
-		dodoc doc/src/sgml/html/*
-
-		docinto sgml
-		dodoc doc/src/sgml/*.{sgml,dsl}
-	fi
-
-	if use server; then
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.confd" | newconfd - ${PN}-${SLOT}
-
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.init-9.3" | newinitd - ${PN}-${SLOT}
-
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.service" | \
-			systemd_newunit - ${PN}-${SLOT}.service
-
-		newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
-
-		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
-
-		if use prefix ; then
-			keepdir /run/postgresql
-			fperms 0775 /run/postgresql
-		fi
-	fi
-}
-
-pkg_postinst() {
-	postgresql-config update
-
-	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
-
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog
-		elog "It looks like this is your first time installing PostgreSQL. Run the"
-		elog "following command in all active shells to pick up changes to the default"
-		elog "environment:"
-		elog "    source /etc/profile"
-	fi
-
-	if use server ; then
-		elog
-		elog "Gentoo specific documentation:"
-		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
-		elog
-		elog "Official documentation:"
-		elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
-		elog
-		elog "The default location of the Unix-domain socket is:"
-		elog "    ${EROOT%/}/run/postgresql/"
-		elog
-		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
-		elog "so that it contains your preferred locale in:"
-		elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-		elog
-		elog "Then, execute the following command to setup the initial database"
-		elog "environment:"
-		elog "    emerge --config =${CATEGORY}/${PF}"
-	fi
-}
-
-pkg_prerm() {
-	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
-		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
-		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
-
-		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
-		sleep 10
-		eend 0
-	fi
-}
-
-pkg_postrm() {
-	postgresql-config update
-}
-
-pkg_config() {
-	use server || die "USE flag 'server' not enabled. Nothing to configure."
-
-	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
-		&& source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
-	[[ -z "${DATA_DIR}" ]] \
-		&& DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
-
-	# environment.bz2 may not contain the same locale as the current system
-	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
-		unset LANG
-		unset LC_CTYPE
-		unset LC_NUMERIC
-		unset LC_TIME
-		unset LC_COLLATE
-		unset LC_MONETARY
-		unset LC_MESSAGES
-		unset LC_ALL
-		source "${EROOT%/}/etc/env.d/02locale"
-		[ -n "${LANG}" ] && export LANG
-		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
-		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
-		[ -n "${LC_TIME}" ] && export LC_TIME
-		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
-		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
-		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
-		[ -n "${LC_ALL}" ] && export LC_ALL
-	fi
-
-	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	einfo
-	einfo "Information on options that can be passed to initdb are found at:"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
-	einfo
-	einfo "PG_INITDB_OPTS is currently set to:"
-	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
-		einfo "    (none)"
-	else
-		einfo "    ${PG_INITDB_OPTS}"
-	fi
-	einfo
-	einfo "Configuration files will be installed to:"
-	einfo "    ${PGDATA}"
-	einfo
-	einfo "The database cluster will be created in:"
-	einfo "    ${DATA_DIR}"
-	einfo
-	while [ "$correct" != "true" ] ; do
-		einfo "Are you ready to continue? (y/n)"
-		read answer
-		if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
-			correct="true"
-		elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
-			die "Aborting initialization."
-		else
-			echo "Answer not recognized"
-		fi
-	done
-
-	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
-		eerror "The given directory, '${DATA_DIR}', is not empty."
-		eerror "Modify DATA_DIR to point to an empty directory."
-		die "${DATA_DIR} is not empty."
-	fi
-
-	einfo "Creating the data directory ..."
-	if [[ ${EUID} == 0 ]] ; then
-		mkdir -p "${DATA_DIR}"
-		chown -Rf postgres:postgres "${DATA_DIR}"
-		chmod 0700 "${DATA_DIR}"
-	fi
-
-	einfo "Initializing the database ..."
-
-	if [[ ${EUID} == 0 ]] ; then
-		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
-	else
-		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
-	fi
-
-	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
-		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
-		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
-	fi
-
-	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
-		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
-		# On the off-chance that you might need to work with UTF-8 encoded
-		# characters in PL/Perl
-		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
-	EOF
-
-	einfo "The autovacuum function, which was in contrib, has been moved to the main"
-	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
-	einfo "by default. You can disable it in the cluster's:"
-	einfo "    ${PGDATA%/}/postgresql.conf"
-	einfo
-	einfo "The PostgreSQL server, by default, will log events to:"
-	einfo "    ${DATA_DIR%/}/postmaster.log"
-	einfo
-	if use prefix ; then
-		einfo "The location of the configuration files have moved to:"
-		einfo "    ${PGDATA}"
-		einfo "To start the server:"
-		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
-		einfo "To stop:"
-		einfo "    pg_ctl stop -D ${DATA_DIR}"
-		einfo
-		einfo "Or move the configuration files back:"
-		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
-	else
-		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	fi
-}
-
-src_test() {
-	if use server && [[ ${UID} -ne 0 ]] ; then
-		emake check
-
-		einfo "If you think other tests besides the regression tests are necessary, please"
-		einfo "submit a bug including a patch for this ebuild to enable them."
-	else
-		use server || \
-			ewarn 'Tests cannot be run without the "server" use flag enabled.'
-		[[ ${UID} -eq 0 ]] || \
-			ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
-
-		ewarn 'Skipping.'
-	fi
-}
diff --git a/dev-db/postgresql/postgresql-9.5.1.ebuild b/dev-db/postgresql/postgresql-9.5.1.ebuild
deleted file mode 100644
index 7fcf423..0000000
--- a/dev-db/postgresql/postgresql-9.5.1.ebuild
+++ /dev/null
@@ -1,431 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
-		systemd user versionator
-
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
-
-SLOT="$(get_version_component_range 1-2)"
-
-SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
-
-LICENSE="POSTGRESQL GPL-2"
-DESCRIPTION="PostgreSQL RDBMS"
-HOMEPAGE="http://www.postgresql.org/"
-
-LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr
-		 zh_CN zh_TW"
-IUSE="doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python
-	  +readline selinux +server ssl static-libs tcl threads uuid xml zlib"
-
-for lingua in ${LINGUAS}; do
-	IUSE+=" linguas_${lingua}"
-done
-
-wanted_languages() {
-	local enable_langs
-
-	for lingua in ${LINGUAS} ; do
-		use linguas_${lingua} && enable_langs+="${lingua} "
-	done
-
-	echo -n ${enable_langs}
-}
-
-CDEPEND="
->=app-eselect/eselect-postgresql-1.2.0
-sys-apps/less
-virtual/libintl
-kerberos? ( virtual/krb5 )
-ldap? ( net-nds/openldap )
-pam? ( virtual/pam )
-perl? ( >=dev-lang/perl-5.8:= )
-python? ( ${PYTHON_DEPS} )
-readline? ( sys-libs/readline:0= )
-ssl? (
-	!libressl? ( >=dev-libs/openssl-0.9.6-r1:0= )
-	libressl? ( dev-libs/libressl:= )
-)
-tcl? ( >=dev-lang/tcl-8:0= )
-xml? ( dev-libs/libxml2 dev-libs/libxslt )
-zlib? ( sys-libs/zlib )
-"
-
-# uuid flags -- depend on sys-apps/util-linux for Linux libcs, or if no
-# supported libc in use depend on dev-libs/ossp-uuid. For BSD systems,
-# the libc includes UUID functions.
-UTIL_LINUX_LIBC=( elibc_{glibc,uclibc,musl} )
-BSD_LIBC=( elibc_{Free,Net,Open}BSD )
-
-nest_usedep() {
-	local front back
-	while [[ ${#} -gt 1 ]]; do
-		front+="${1}? ( "
-		back+=" )"
-		shift
-	done
-	echo "${front}${1}${back}"
-}
-
-IUSE+=" ${UTIL_LINUX_LIBC[@]} ${BSD_LIBC[@]}"
-CDEPEND+="
-uuid? (
-	${UTIL_LINUX_LIBC[@]/%/? ( sys-apps/util-linux )}
-	$(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} ${BSD_LIBC[@]/#/!} dev-libs/ossp-uuid)
-)"
-
-DEPEND="${CDEPEND}
-!!<sys-apps/sandbox-2.0
-sys-devel/bison
-sys-devel/flex
-nls? ( sys-devel/gettext )
-xml? ( virtual/pkgconfig )
-"
-
-RDEPEND="${CDEPEND}
-!dev-db/postgresql-docs:${SLOT}
-!dev-db/postgresql-base:${SLOT}
-!dev-db/postgresql-server:${SLOT}
-selinux? ( sec-policy/selinux-postgresql )
-"
-
-pkg_setup() {
-	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
-
-	enewgroup postgres 70
-	enewuser postgres 70 /bin/sh /var/lib/postgresql postgres
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Work around PPC{,64} compilation bug where bool is already defined
-	sed '/#ifndef __cplusplus/a #undef bool' -i src/include/c.h || die
-
-	# Set proper run directory
-	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
-		-i src/include/pg_config_manual.h || die
-
-	# Rely on $PATH being in the proper order so that the correct
-	# install program is used for modules utilizing PGXS in both
-	# hardened and non-hardened environments. (Bug #528786)
-	sed 's/@install_bin@/install -c/' -i src/Makefile.global.in || die
-
-	use server || epatch "${FILESDIR}/${PN}-${SLOT}-no-server.patch"
-
-	# Fix bug 486556 where the server would crash at start up because of
-	# an infinite loop caused by a self-referencing symlink.
-	epatch "${FILESDIR}/postgresql-9.2-9.4-tz-dir-overflow.patch"
-
-	if use pam ; then
-		sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
-			-i src/backend/libpq/auth.c || \
-			die 'PGSQL_PAM_SERVICE rename failed.'
-	fi
-
-	epatch_user
-}
-
-src_configure() {
-	case ${CHOST} in
-		*-darwin*|*-solaris*)
-			use nls && append-libs intl
-			;;
-	esac
-
-	export LDFLAGS_SL="${LDFLAGS}"
-	export LDFLAGS_EX="${LDFLAGS}"
-
-	local PO="${EPREFIX%/}"
-
-	local i uuid_config=""
-	if use uuid; then
-		for i in ${UTIL_LINUX_LIBC[@]}; do
-			use ${i} && uuid_config="--with-uuid=e2fs"
-		done
-		for i in ${BSD_LIBC[@]}; do
-			use ${i} && uuid_config="--with-uuid=bsd"
-		done
-		[[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"
-	fi
-
-	econf \
-		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
-		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
-		--docdir="${PO}/usr/share/doc/${PF}" \
-		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
-		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
-		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
-		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
-		$(use_enable !pg_legacytimestamp integer-datetimes) \
-		$(use_enable threads thread-safety) \
-		$(use_with kerberos gssapi) \
-		$(use_with ldap) \
-		$(use_with pam) \
-		$(use_with perl) \
-		$(use_with python) \
-		$(use_with readline) \
-		$(use_with ssl openssl) \
-		$(use_with tcl) \
-		${uuid_config} \
-		$(use_with xml libxml) \
-		$(use_with xml libxslt) \
-		$(use_with zlib) \
-		"$(use_enable nls nls "$(wanted_languages)")"
-}
-
-src_compile() {
-	emake
-	emake -C contrib
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	emake DESTDIR="${D}" install -C contrib
-
-	dodoc README HISTORY doc/{TODO,bug.template}
-
-	# man pages are already built, but if we have the target make them,
-	# they'll be generated from source before being installed so we
-	# manually install man pages.
-	# We use ${SLOT} instead of doman for postgresql.eselect
-	insinto /usr/share/postgresql-${SLOT}/man/
-	doins -r doc/src/sgml/man{1,3,7}
-	if ! use server; then
-		# Remove man pages for non-existent binaries
-		for m in {initdb,pg_{controldata,ctl,resetxlog},post{gres,master}}; do
-			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
-		done
-	fi
-	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
-
-	insinto /etc/postgresql-${SLOT}
-	newins src/bin/psql/psqlrc.sample psqlrc
-
-	dodir /etc/eselect/postgresql/slots/${SLOT}
-	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
-		"${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
-
-	use static-libs || find "${ED}" -name '*.a' -delete
-
-	if use doc ; then
-		docinto html
-		dodoc doc/src/sgml/html/*
-
-		docinto sgml
-		dodoc doc/src/sgml/*.{sgml,dsl}
-	fi
-
-	if use server; then
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.confd" | newconfd - ${PN}-${SLOT}
-
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.init-9.3" | newinitd - ${PN}-${SLOT}
-
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.service" | \
-			systemd_newunit - ${PN}-${SLOT}.service
-
-		newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
-
-		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
-
-		if use prefix ; then
-			keepdir /run/postgresql
-			fperms 0775 /run/postgresql
-		fi
-	fi
-}
-
-pkg_postinst() {
-	postgresql-config update
-
-	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
-
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog
-		elog "It looks like this is your first time installing PostgreSQL. Run the"
-		elog "following command in all active shells to pick up changes to the default"
-		elog "environment:"
-		elog "    source /etc/profile"
-	fi
-
-	if use server ; then
-		elog
-		elog "Gentoo specific documentation:"
-		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
-		elog
-		elog "Official documentation:"
-		elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
-		elog
-		elog "The default location of the Unix-domain socket is:"
-		elog "    ${EROOT%/}/run/postgresql/"
-		elog
-		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
-		elog "so that it contains your preferred locale in:"
-		elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-		elog
-		elog "Then, execute the following command to setup the initial database"
-		elog "environment:"
-		elog "    emerge --config =${CATEGORY}/${PF}"
-	fi
-}
-
-pkg_prerm() {
-	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
-		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
-		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
-
-		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
-		sleep 10
-		eend 0
-	fi
-}
-
-pkg_postrm() {
-	postgresql-config update
-}
-
-pkg_config() {
-	use server || die "USE flag 'server' not enabled. Nothing to configure."
-
-	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
-		&& source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
-	[[ -z "${DATA_DIR}" ]] \
-		&& DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
-
-	# environment.bz2 may not contain the same locale as the current system
-	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
-		unset LANG
-		unset LC_CTYPE
-		unset LC_NUMERIC
-		unset LC_TIME
-		unset LC_COLLATE
-		unset LC_MONETARY
-		unset LC_MESSAGES
-		unset LC_ALL
-		source "${EROOT%/}/etc/env.d/02locale"
-		[ -n "${LANG}" ] && export LANG
-		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
-		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
-		[ -n "${LC_TIME}" ] && export LC_TIME
-		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
-		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
-		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
-		[ -n "${LC_ALL}" ] && export LC_ALL
-	fi
-
-	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	einfo
-	einfo "Information on options that can be passed to initdb are found at:"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
-	einfo
-	einfo "PG_INITDB_OPTS is currently set to:"
-	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
-		einfo "    (none)"
-	else
-		einfo "    ${PG_INITDB_OPTS}"
-	fi
-	einfo
-	einfo "Configuration files will be installed to:"
-	einfo "    ${PGDATA}"
-	einfo
-	einfo "The database cluster will be created in:"
-	einfo "    ${DATA_DIR}"
-	einfo
-	while [ "$correct" != "true" ] ; do
-		einfo "Are you ready to continue? (y/n)"
-		read answer
-		if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
-			correct="true"
-		elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
-			die "Aborting initialization."
-		else
-			echo "Answer not recognized"
-		fi
-	done
-
-	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
-		eerror "The given directory, '${DATA_DIR}', is not empty."
-		eerror "Modify DATA_DIR to point to an empty directory."
-		die "${DATA_DIR} is not empty."
-	fi
-
-	einfo "Creating the data directory ..."
-	if [[ ${EUID} == 0 ]] ; then
-		mkdir -p "${DATA_DIR}"
-		chown -Rf postgres:postgres "${DATA_DIR}"
-		chmod 0700 "${DATA_DIR}"
-	fi
-
-	einfo "Initializing the database ..."
-
-	if [[ ${EUID} == 0 ]] ; then
-		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
-	else
-		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
-	fi
-
-	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
-		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
-		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
-	fi
-
-	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
-		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
-		# On the off-chance that you might need to work with UTF-8 encoded
-		# characters in PL/Perl
-		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
-	EOF
-
-	einfo "The autovacuum function, which was in contrib, has been moved to the main"
-	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
-	einfo "by default. You can disable it in the cluster's:"
-	einfo "    ${PGDATA%/}/postgresql.conf"
-	einfo
-	einfo "The PostgreSQL server, by default, will log events to:"
-	einfo "    ${DATA_DIR%/}/postmaster.log"
-	einfo
-	if use prefix ; then
-		einfo "The location of the configuration files have moved to:"
-		einfo "    ${PGDATA}"
-		einfo "To start the server:"
-		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
-		einfo "To stop:"
-		einfo "    pg_ctl stop -D ${DATA_DIR}"
-		einfo
-		einfo "Or move the configuration files back:"
-		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
-	else
-		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	fi
-}
-
-src_test() {
-	if use server && [[ ${UID} -ne 0 ]] ; then
-		emake check
-
-		einfo "If you think other tests besides the regression tests are necessary, please"
-		einfo "submit a bug including a patch for this ebuild to enable them."
-	else
-		use server || \
-			ewarn 'Tests cannot be run without the "server" use flag enabled.'
-		[[ ${UID} -eq 0 ]] || \
-			ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
-
-		ewarn 'Skipping.'
-	fi
-}
diff --git a/dev-db/postgresql/postgresql-9.5.3.ebuild b/dev-db/postgresql/postgresql-9.5.3.ebuild
deleted file mode 100644
index 886d41c..0000000
--- a/dev-db/postgresql/postgresql-9.5.3.ebuild
+++ /dev/null
@@ -1,437 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
-		systemd user versionator
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
-
-SLOT="$(get_version_component_range 1-2)"
-
-SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
-
-LICENSE="POSTGRESQL GPL-2"
-DESCRIPTION="PostgreSQL RDBMS"
-HOMEPAGE="http://www.postgresql.org/"
-
-LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr
-		 zh_CN zh_TW"
-IUSE="doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python
-	  +readline selinux +server ssl static-libs tcl threads uuid xml zlib"
-
-for lingua in ${LINGUAS}; do
-	IUSE+=" linguas_${lingua}"
-done
-
-wanted_languages() {
-	local enable_langs
-
-	for lingua in ${LINGUAS} ; do
-		use linguas_${lingua} && enable_langs+="${lingua} "
-	done
-
-	echo -n ${enable_langs}
-}
-
-CDEPEND="
->=app-eselect/eselect-postgresql-1.2.0
-sys-apps/less
-virtual/libintl
-kerberos? ( virtual/krb5 )
-ldap? ( net-nds/openldap )
-pam? ( virtual/pam )
-perl? ( >=dev-lang/perl-5.8:= )
-python? ( ${PYTHON_DEPS} )
-readline? ( sys-libs/readline:0= )
-ssl? (
-	!libressl? ( >=dev-libs/openssl-0.9.6-r1:0= )
-	libressl? ( dev-libs/libressl:= )
-)
-tcl? ( >=dev-lang/tcl-8:0= )
-xml? ( dev-libs/libxml2 dev-libs/libxslt )
-zlib? ( sys-libs/zlib )
-"
-
-# uuid flags -- depend on sys-apps/util-linux for Linux libcs, or if no
-# supported libc in use depend on dev-libs/ossp-uuid. For BSD systems,
-# the libc includes UUID functions.
-UTIL_LINUX_LIBC=( elibc_{glibc,uclibc,musl} )
-BSD_LIBC=( elibc_{Free,Net,Open}BSD )
-
-nest_usedep() {
-	local front back
-	while [[ ${#} -gt 1 ]]; do
-		front+="${1}? ( "
-		back+=" )"
-		shift
-	done
-	echo "${front}${1}${back}"
-}
-
-IUSE+=" ${UTIL_LINUX_LIBC[@]} ${BSD_LIBC[@]}"
-CDEPEND+="
-uuid? (
-	${UTIL_LINUX_LIBC[@]/%/? ( sys-apps/util-linux )}
-	$(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} ${BSD_LIBC[@]/#/!} dev-libs/ossp-uuid)
-)"
-
-DEPEND="${CDEPEND}
-!!<sys-apps/sandbox-2.0
-sys-devel/bison
-sys-devel/flex
-nls? ( sys-devel/gettext )
-xml? ( virtual/pkgconfig )
-"
-
-RDEPEND="${CDEPEND}
-!dev-db/postgresql-docs:${SLOT}
-!dev-db/postgresql-base:${SLOT}
-!dev-db/postgresql-server:${SLOT}
-selinux? ( sec-policy/selinux-postgresql )
-"
-
-pkg_setup() {
-	use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
-
-	enewgroup postgres 70
-	enewuser postgres 70 /bin/sh /var/lib/postgresql postgres
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Work around PPC{,64} compilation bug where bool is already defined
-	sed '/#ifndef __cplusplus/a #undef bool' -i src/include/c.h || die
-
-	# Set proper run directory
-	sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
-		-i src/include/pg_config_manual.h || die
-
-	# Rely on $PATH being in the proper order so that the correct
-	# install program is used for modules utilizing PGXS in both
-	# hardened and non-hardened environments. (Bug #528786)
-	sed 's/@install_bin@/install -c/' -i src/Makefile.global.in || die
-
-	use server || epatch "${FILESDIR}/${PN}-${SLOT}-no-server.patch"
-
-	# Fix bug 486556 where the server would crash at start up because of
-	# an infinite loop caused by a self-referencing symlink.
-	epatch "${FILESDIR}/postgresql-9.2-9.4-tz-dir-overflow.patch"
-
-	if use pam ; then
-		sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
-			-i src/backend/libpq/auth.c || \
-			die 'PGSQL_PAM_SERVICE rename failed.'
-	fi
-
-	epatch_user
-}
-
-src_configure() {
-	case ${CHOST} in
-		*-darwin*|*-solaris*)
-			use nls && append-libs intl
-			;;
-	esac
-
-	export LDFLAGS_SL="${LDFLAGS}"
-	export LDFLAGS_EX="${LDFLAGS}"
-
-	local PO="${EPREFIX%/}"
-
-	local i uuid_config=""
-	if use uuid; then
-		for i in ${UTIL_LINUX_LIBC[@]}; do
-			use ${i} && uuid_config="--with-uuid=e2fs"
-		done
-		for i in ${BSD_LIBC[@]}; do
-			use ${i} && uuid_config="--with-uuid=bsd"
-		done
-		[[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"
-	fi
-
-	econf \
-		--prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
-		--datadir="${PO}/usr/share/postgresql-${SLOT}" \
-		--docdir="${PO}/usr/share/doc/${PF}" \
-		--includedir="${PO}/usr/include/postgresql-${SLOT}" \
-		--mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
-		--sysconfdir="${PO}/etc/postgresql-${SLOT}" \
-		--with-system-tzdata="${PO}/usr/share/zoneinfo" \
-		$(use_enable !alpha spinlocks) \
-		$(use_enable !pg_legacytimestamp integer-datetimes) \
-		$(use_enable threads thread-safety) \
-		$(use_with kerberos gssapi) \
-		$(use_with ldap) \
-		$(use_with pam) \
-		$(use_with perl) \
-		$(use_with python) \
-		$(use_with readline) \
-		$(use_with ssl openssl) \
-		$(use_with tcl) \
-		${uuid_config} \
-		$(use_with xml libxml) \
-		$(use_with xml libxslt) \
-		$(use_with zlib) \
-		"$(use_enable nls nls "$(wanted_languages)")"
-}
-
-src_compile() {
-	emake
-	emake -C contrib
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	emake DESTDIR="${D}" install -C contrib
-
-	dodoc README HISTORY doc/{TODO,bug.template}
-
-	# man pages are already built, but if we have the target make them,
-	# they'll be generated from source before being installed so we
-	# manually install man pages.
-	# We use ${SLOT} instead of doman for postgresql.eselect
-	insinto /usr/share/postgresql-${SLOT}/man/
-	doins -r doc/src/sgml/man{1,3,7}
-	if ! use server; then
-		# Remove man pages for non-existent binaries
-		for m in {initdb,pg_{controldata,ctl,resetxlog},post{gres,master}}; do
-			rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
-		done
-	fi
-	docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
-
-	insinto /etc/postgresql-${SLOT}
-	newins src/bin/psql/psqlrc.sample psqlrc
-
-	dodir /etc/eselect/postgresql/slots/${SLOT}
-	echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
-		"${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
-
-	use static-libs || find "${ED}" -name '*.a' -delete
-
-	if use doc ; then
-		docinto html
-		dodoc doc/src/sgml/html/*
-
-		docinto sgml
-		dodoc doc/src/sgml/*.{sgml,dsl}
-	fi
-
-	if use server; then
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.confd" | newconfd - ${PN}-${SLOT}
-
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.init-9.3" | newinitd - ${PN}-${SLOT}
-
-		sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
-			"${FILESDIR}/${PN}.service" | \
-			systemd_newunit - ${PN}-${SLOT}.service
-
-		newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
-
-		use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
-
-		if use prefix ; then
-			keepdir /run/postgresql
-			fperms 0775 /run/postgresql
-		fi
-	fi
-}
-
-pkg_postinst() {
-	postgresql-config update
-
-	if use alpha && use server ; then
-		ewarn "PostgreSQL 9.5+ no longer has native spinlock support on Alpha platforms."
-		ewarn "As a result, performance will be extremely degraded."
-	fi
-
-	elog "If you need a global psqlrc-file, you can place it in:"
-	elog "    ${EROOT%/}/etc/postgresql-${SLOT}/"
-
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog
-		elog "It looks like this is your first time installing PostgreSQL. Run the"
-		elog "following command in all active shells to pick up changes to the default"
-		elog "environment:"
-		elog "    source /etc/profile"
-	fi
-
-	if use server ; then
-		elog
-		elog "Gentoo specific documentation:"
-		elog "https://wiki.gentoo.org/wiki/PostgreSQL"
-		elog
-		elog "Official documentation:"
-		elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
-		elog
-		elog "The default location of the Unix-domain socket is:"
-		elog "    ${EROOT%/}/run/postgresql/"
-		elog
-		elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
-		elog "so that it contains your preferred locale in:"
-		elog "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-		elog
-		elog "Then, execute the following command to setup the initial database"
-		elog "environment:"
-		elog "    emerge --config =${CATEGORY}/${PF}"
-	fi
-}
-
-pkg_prerm() {
-	if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
-		ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
-		ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
-
-		ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
-		sleep 10
-		eend 0
-	fi
-}
-
-pkg_postrm() {
-	postgresql-config update
-}
-
-pkg_config() {
-	use server || die "USE flag 'server' not enabled. Nothing to configure."
-
-	[[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
-		&& source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	[[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
-	[[ -z "${DATA_DIR}" ]] \
-		&& DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
-
-	# environment.bz2 may not contain the same locale as the current system
-	# locale. Unset and source from the current system locale.
-	if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
-		unset LANG
-		unset LC_CTYPE
-		unset LC_NUMERIC
-		unset LC_TIME
-		unset LC_COLLATE
-		unset LC_MONETARY
-		unset LC_MESSAGES
-		unset LC_ALL
-		source "${EROOT%/}/etc/env.d/02locale"
-		[ -n "${LANG}" ] && export LANG
-		[ -n "${LC_CTYPE}" ] && export LC_CTYPE
-		[ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
-		[ -n "${LC_TIME}" ] && export LC_TIME
-		[ -n "${LC_COLLATE}" ] && export LC_COLLATE
-		[ -n "${LC_MONETARY}" ] && export LC_MONETARY
-		[ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
-		[ -n "${LC_ALL}" ] && export LC_ALL
-	fi
-
-	einfo "You can modify the paths and options passed to initdb by editing:"
-	einfo "    ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
-	einfo
-	einfo "Information on options that can be passed to initdb are found at:"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
-	einfo "    http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
-	einfo
-	einfo "PG_INITDB_OPTS is currently set to:"
-	if [[ -z "${PG_INITDB_OPTS}" ]] ; then
-		einfo "    (none)"
-	else
-		einfo "    ${PG_INITDB_OPTS}"
-	fi
-	einfo
-	einfo "Configuration files will be installed to:"
-	einfo "    ${PGDATA}"
-	einfo
-	einfo "The database cluster will be created in:"
-	einfo "    ${DATA_DIR}"
-	einfo
-	while [ "$correct" != "true" ] ; do
-		einfo "Are you ready to continue? (y/n)"
-		read answer
-		if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
-			correct="true"
-		elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
-			die "Aborting initialization."
-		else
-			echo "Answer not recognized"
-		fi
-	done
-
-	if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
-		eerror "The given directory, '${DATA_DIR}', is not empty."
-		eerror "Modify DATA_DIR to point to an empty directory."
-		die "${DATA_DIR} is not empty."
-	fi
-
-	einfo "Creating the data directory ..."
-	if [[ ${EUID} == 0 ]] ; then
-		mkdir -p "${DATA_DIR}"
-		chown -Rf postgres:postgres "${DATA_DIR}"
-		chmod 0700 "${DATA_DIR}"
-	fi
-
-	einfo "Initializing the database ..."
-
-	if [[ ${EUID} == 0 ]] ; then
-		su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
-	else
-		"${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
-	fi
-
-	if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
-		mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
-		ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
-	fi
-
-	cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
-		# This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
-		# On the off-chance that you might need to work with UTF-8 encoded
-		# characters in PL/Perl
-		plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
-	EOF
-
-	einfo "The autovacuum function, which was in contrib, has been moved to the main"
-	einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
-	einfo "by default. You can disable it in the cluster's:"
-	einfo "    ${PGDATA%/}/postgresql.conf"
-	einfo
-	einfo "The PostgreSQL server, by default, will log events to:"
-	einfo "    ${DATA_DIR%/}/postmaster.log"
-	einfo
-	if use prefix ; then
-		einfo "The location of the configuration files have moved to:"
-		einfo "    ${PGDATA}"
-		einfo "To start the server:"
-		einfo "    pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
-		einfo "To stop:"
-		einfo "    pg_ctl stop -D ${DATA_DIR}"
-		einfo
-		einfo "Or move the configuration files back:"
-		einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
-	else
-		einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
-		einfo "instead of 'pg_ctl'."
-	fi
-}
-
-src_test() {
-	if use server && [[ ${UID} -ne 0 ]] ; then
-		emake check
-
-		einfo "If you think other tests besides the regression tests are necessary, please"
-		einfo "submit a bug including a patch for this ebuild to enable them."
-	else
-		use server || \
-			ewarn 'Tests cannot be run without the "server" use flag enabled.'
-		[[ ${UID} -eq 0 ]] || \
-			ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
-
-		ewarn 'Skipping.'
-	fi
-}
diff --git a/dev-db/slony1/ChangeLog b/dev-db/slony1/ChangeLog
index 5eaf52b..0868a42 100644
--- a/dev-db/slony1/ChangeLog
+++ b/dev-db/slony1/ChangeLog
@@ -87,3 +87,14 @@
   Closes: https://github.com/gentoo/gentoo/pull/1936
   Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
 
+*slony1-2.2.5 (07 Oct 2016)
+
+  07 Oct 2016; Aaron W. Swenson <titanofold@gentoo.org> +slony1-2.2.5.ebuild:
+  Version Bump
+
+  Added 9.5 and 9.6 as suitable dependencies.
+
+  Bugs: 584778
+
+  Package-Manager: portage-2.2.28
+
diff --git a/dev-db/slony1/Manifest b/dev-db/slony1/Manifest
index 583da6e..651a70f 100644
--- a/dev-db/slony1/Manifest
+++ b/dev-db/slony1/Manifest
@@ -15,6 +15,8 @@
 DIST slony1-2.2.3.tar.bz2 1468030 SHA256 1321988b437bd3294a07dc5ed85dfa3c35d9413287a49e4503ec47763fa1d3a8 SHA512 6f762ec722eb844d0c0c2923e2c1bee48c6fbf973cf719553a9f40b090e2ba08885cd089818b17c56a662fe5f35eadb4b060554adcd5abab5a1a250356590519 WHIRLPOOL 71686448418a09566c1b5767a598f5ebe943b33cba9664ec7696e70e5d62adc2daa5e2618a6aced0faeac0a621527738cdf2e54553a74dd1c5e08c6850d90e7a
 DIST slony1-2.2.4-docs.tar.bz2 1448892 SHA256 0417194a9245e615dedc00ef463e1357df09b110ecab860ba45fef7e80dcf2cf SHA512 4a9ae11aaaa79d710b3454068eb92915fa6b96df5e6b9f532f2f0ddc51f2865d8928b94d2a496374f87435751574062987d14568d30e38e7e28535d1b4e845d6 WHIRLPOOL 096820fa5276b04d305cdfc17abaf7daf28b95caaa75e15c0807712733c343e37b0d30577a826fc061fc659c170e11079f6bee0a2fffff3ba605d3e02a8d59c1
 DIST slony1-2.2.4.tar.bz2 1467776 SHA256 846a878f50de520d151e7f76a66d9b9845e94beb8820727bf84ab522a73e65b5 SHA512 951ecb07ae9f8478affeeb5c968530f597c203b24341b600057107f53adcdc53afce7dd21893700bb8d0ebd26fceb0ebc60917c9f5992b315a2bce47a1d57867 WHIRLPOOL 8a29c24e735f140a915779b81a9f8b5aeaa7c75a4dc122fb8ba322c10aa8be8dfe38ec853f38a503f595b7685759241a169c430cf2a9ef6ddb7ebaa1b3f4448e
+DIST slony1-2.2.5-docs.tar.bz2 1449297 SHA256 7afd749215ca63d5f808c2c199096d4d665923b277edaf75b01e4a8bfdf90472 SHA512 cdd08fcea56f29e8e944cd975b613747cfcab75e70d88afdec79b2ede96dc2d1b35b294cd12c522780e513b4cd26c43da401d9570ca67759dbb2271797a380ac WHIRLPOOL 18206b34d03cb685389398f00d681707471b0cbf9cb3dcefb4cc99b24c35f37c10acc32e573a1c255f85881700efde9e1c8c3948596ebc84fbf5254af866b147
+DIST slony1-2.2.5.tar.bz2 1466439 SHA256 6f6dbd9619c615ed68bf6341a8158e42fc0adf6f5b609e6f8e4a0a0e37815241 SHA512 06c5d8c136b1560aa6a3b1b7bfbad09fb6bbff7e3c530ceaf0279d4564dd1518c69647368deac9eb19ea5059a2d78fef26f62bd34315f5f3415ca0f5cb0992aa WHIRLPOOL 3b9b96c41fbe9da03362a866d3bc81da38be82625a9d25378b69cf322ba6aba05fc15f0725ba3f878e4a9d2b5e6609e50ad6d602f480e6e1482d1953135ecb14
 EBUILD slony1-2.1.3.ebuild 1780 SHA256 6e243765a4236c9b6b921d9b330b0597f8adbf3b53548373fac2dcf9bac1a3dd SHA512 08ff8eebfd9527d530788428f17bbc9c07f645923b7dbe3bd8b45143d3738f7b43046d6f228e0378c902fcb92136f892dfea1fe2f5f67499b93c9c10506ceed7 WHIRLPOOL 0b03a00c68163cf61c7514e5f1a5f659155e910cb64a33902b50e4d4106beb7fbf458358d195f04a91f141d46c8c1b7f7b57ed97c111110762f310bce1d00bd9
 EBUILD slony1-2.1.4.ebuild 1826 SHA256 b7f46629b8cbf927da2d8c5ce6b0d71a4ae01ffb4cf7b2df9eb1ab96e494a1b4 SHA512 fd6bfd2fbfb767bbcce4c973b9c71c7c65aa7eb20f268a82245b5cab4403cbcb619724019753290864740505e340899d8378cd54073d5dd4eb78d298b27581b6 WHIRLPOOL 9ff32e4fddf9c481b0eb8cdfcbf164b3cf87839c8ee2926a833b4f1ec73f0c933d2c4fb9af7c752a1c781d8726cfcdbd9f630adf46280c759c73c0f5af28955c
 EBUILD slony1-2.2.0.ebuild 1703 SHA256 bf2b466a41ea555a4ba8690552e760cf916d1e2fd6565ad2de5034731383036c SHA512 609e277e22294c0686c62e922dd91b46f2df48a1150e36c7cd4a4989a90727d65e903cbab2700c756535432800c415892e80d03a738cbdde507b1fb780f1d408 WHIRLPOOL b3d2fbb556f48986b7b473edfbe87c58bdc5d9a8921ba52d818f8ff7cd421e694785f6ef12cbd733e73ec4079f33bd21f77948f12a2d5ed1d8b4163fab254975
@@ -22,6 +24,7 @@
 EBUILD slony1-2.2.2.ebuild 1703 SHA256 bf2b466a41ea555a4ba8690552e760cf916d1e2fd6565ad2de5034731383036c SHA512 609e277e22294c0686c62e922dd91b46f2df48a1150e36c7cd4a4989a90727d65e903cbab2700c756535432800c415892e80d03a738cbdde507b1fb780f1d408 WHIRLPOOL b3d2fbb556f48986b7b473edfbe87c58bdc5d9a8921ba52d818f8ff7cd421e694785f6ef12cbd733e73ec4079f33bd21f77948f12a2d5ed1d8b4163fab254975
 EBUILD slony1-2.2.3.ebuild 1736 SHA256 fd88022779576341e8d9c907a4f2eca052ce2acbaba579647669129b5517cce2 SHA512 5af19307013a1629c5e3a0f82b980eed2a5646638b0ea398ac420cafe16df26a5324b3e13ab30e4abbaab9c9f5f3df141b562792c54c654f60121ac906b908a3 WHIRLPOOL c2e58164b919f433ec5513719d8c8f6dee5c1efde40a64608dc8de332c4daf8a213a805945f711881352bde6dc387f50d5a36a50720e371189b980a564e96a83
 EBUILD slony1-2.2.4.ebuild 1736 SHA256 fd88022779576341e8d9c907a4f2eca052ce2acbaba579647669129b5517cce2 SHA512 5af19307013a1629c5e3a0f82b980eed2a5646638b0ea398ac420cafe16df26a5324b3e13ab30e4abbaab9c9f5f3df141b562792c54c654f60121ac906b908a3 WHIRLPOOL c2e58164b919f433ec5513719d8c8f6dee5c1efde40a64608dc8de332c4daf8a213a805945f711881352bde6dc387f50d5a36a50720e371189b980a564e96a83
-MISC ChangeLog 3372 SHA256 6989758c4c901069c37d4b5cdf9759c46858b0b1cda9caaab7890667a5cb67d7 SHA512 055386068859bf18a53fc8787142a9f4bbd726d99d140c1e5028433d301bbb37929aeffd024c2d706afcad2bab0233c43d3936d765e4660d62c98ac370a8d337 WHIRLPOOL f4c0ebde8b9107004837d620363f3af30de0c89c361cc2ef9ff5433800744b8249cfa3f73fbca6ff7286ff30a62be9fae5886311f57a5cd4a339be629284d7a9
+EBUILD slony1-2.2.5.ebuild 1471 SHA256 4429ece335ce6ecf62dd8272490e5d36e53e723ff26a0b7d9106b6f98a430c1b SHA512 3e36534981386a26de3f9e98c7b2c19e3dc942ef2532b1f9d44400582c5cd4e3a4433ae3135b4ad0ce1237fb1083d4aa4bc063626e734c42ee2bc23ba6030b4f WHIRLPOOL 77e05319d4c4c92fd4ab4e76464c461aa73d5a038dcb462a118702b383e0127fb59e70abdd298c1946eba8bdbaaf79c18dc77fd95810a05304867d27fd3ec67e
+MISC ChangeLog 3593 SHA256 484ed1254e8e4510f8cdcf6e99fdf3c085a40fcc7ca16125a24933203afd6ec1 SHA512 54d7038ada50956de574226a09469a95e65aeacc29d6541dd7c906eb68a7b8f04d139f00bf6e1cfe28c3b197d4f07811795556766333c8578b09649971759d4f WHIRLPOOL 770e3ffb1a772050c7c84f5463cedb6ca8c6bd751e203a9f628c4044946603b628b8d52b02c47cb07d8e7c3da73da36178f26de2c24bc9675d017c992c51dae8
 MISC ChangeLog-2015 7522 SHA256 1beae2cd26717609d247d0aa333445888d7ebdf324266781ddb6a68b31872bf0 SHA512 aa5a4c45cb810cebb3d8857d67206b49fbb96b85c76eb5896cc49a2b1582db0e1d861c3a44b3494358ad513a078424692a21d12eae38ed57229270641601adb5 WHIRLPOOL 5fbbbeda3b99ed5a66c495630e395daf8eb27ecc4207770fe4bbb359850c08a99996032a83521aa3262df60e06001535eb3816a18589f4838a82993a0f86ba67
 MISC metadata.xml 280 SHA256 5660ba07e5d7576fce822b35f72d04dcf8a747816e9cf5e5d553242f5b7d9a41 SHA512 efb5fb6652ac8cd75fff4eea8b2b044a2c9201cce2faf3bbe13a97565d150e64f9ba0dd8bb691a44a1b6726455306ea8b6c1b121678a721a82e7ea8b6589c94f WHIRLPOOL eea3f820c4a7f73d6fc893f55c9408f1c27da41bc9e8aa2c07bdd9e884d54945f2eaeb47230411f03160a09ca5f3da762df6f977fed5995a4ffe413b4bce53af
diff --git a/dev-db/slony1/slony1-2.2.5.ebuild b/dev-db/slony1/slony1-2.2.5.ebuild
new file mode 100644
index 0000000..2f1d431
--- /dev/null
+++ b/dev-db/slony1/slony1-2.2.5.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+
+inherit eutils versionator
+
+IUSE="doc perl"
+
+DESCRIPTION="A replication system for the PostgreSQL Database Management System"
+HOMEPAGE="http://slony.info/"
+
+# ${P}-docs.tar.bz2 contains man pages as well as additional documentation
+MAJ_PV=$(get_version_component_range 1-2)
+SRC_URI="http://main.slony.info/downloads/${MAJ_PV}/source/${P}.tar.bz2
+		 http://main.slony.info/downloads/${MAJ_PV}/source/${P}-docs.tar.bz2"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+DEPEND="|| (
+			dev-db/postgresql:9.6
+			dev-db/postgresql:9.5
+			dev-db/postgresql:9.4
+			dev-db/postgresql:9.3
+			dev-db/postgresql:9.2
+			dev-db/postgresql:9.1
+		)
+		dev-db/postgresql[server,threads]
+		perl? ( dev-perl/DBD-Pg )
+"
+
+pkg_setup() {
+	local PGSLOT="$(postgresql-config show)"
+	if [[ ${PGSLOT//.} < 91 ]] ; then
+		eerror "You must build ${CATEGORY}/${PN} against PostgreSQL 9.1 or higher."
+		eerror "Set an appropriate slot with postgresql-config."
+		die "postgresql-config not set to 9.1 or higher."
+	fi
+}
+
+src_configure() {
+	local myconf
+	use perl && myconf='--with-perltools'
+	econf ${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	dodoc INSTALL README SAMPLE TODO UPGRADING share/slon.conf-sample
+
+	if use doc ; then
+		cd "${S}"/doc
+		dohtml -r *
+	fi
+
+	newinitd "${FILESDIR}"/slony1.init slony1
+	newconfd "${FILESDIR}"/slony1.conf slony1
+}
diff --git a/dev-haskell/bifunctors/ChangeLog b/dev-haskell/bifunctors/ChangeLog
index 39d2470..980fa5b 100644
--- a/dev-haskell/bifunctors/ChangeLog
+++ b/dev-haskell/bifunctors/ChangeLog
@@ -97,3 +97,12 @@
 
   Package-Manager: portage-2.2.28
 
+  07 Oct 2016; Thomas Deutschmann <whissi@gentoo.org>
+  bifunctors-4.1.1.1.ebuild, bifunctors-4.2.1.ebuild, bifunctors-5.ebuild:
+  DESCRIPTION improved
+
+  Gentoo CI has detected a "CrappyDescription" problem in these ebuilds.
+  This commit will set a useful description to fix the QA problem.
+
+  Package-Manager: portage-2.3.1
+
diff --git a/dev-haskell/bifunctors/Manifest b/dev-haskell/bifunctors/Manifest
index db40cf9..8468169 100644
--- a/dev-haskell/bifunctors/Manifest
+++ b/dev-haskell/bifunctors/Manifest
@@ -3,9 +3,9 @@
 DIST bifunctors-4.2.1.tar.gz 11494 SHA256 cf8e6eed293f195ecb6e9e14115b5d3653cd32c6ff18971f4510988cc0a7c47f SHA512 850bf36f6a575e4f1c937f5d65f499a126b813d231a8cbe77aaab0c5f9462f67b25fcad8ff29629f90f95e201c3408d0290e9db4cfaf010a33bd0e7f336a0a05 WHIRLPOOL 7f0d5cb092bffb472348ac16154c10849d2a16cfd646fdc1b6f037ce7e335394e5e5b87d97008f72c8ca9a5b5f07f269fda0a0dfc0e766fc6d9b9353ac3a537f
 DIST bifunctors-5.tar.gz 10562 SHA256 41df923a03f15ba2d00335aea2409ebf48ee7585f0a1101f1ec282fe5a07298d SHA512 5d25764587e8f358687f0cb3b6b831980d267d43c5a67b16611405c9196094d107e05e369a0de55befb9731f8c561fe80859298511fde4f3cefae4a1a2672184 WHIRLPOOL d132e9d4beb1acac7da475cf869afb1d7d161924892cf259a155e74432612cb34d6a13d2336fcb36d94edf7471ca9cc8956b576e4cb6e07f51ef77755988ea79
 EBUILD bifunctors-3.2.0.1.ebuild 705 SHA256 8f0d113938afb37fcc6c38dcee928c1543f0c67e015f8081f63fbf7d0103b2f4 SHA512 b4df01d2a2a906f985f1e36546416648a89a7cfef4a9232733a4b0b84c424866d6a79a81fcfaf0ab581a93792a9be6028243692297640f4840cdc6f3c9510ad2 WHIRLPOOL cdc5cbe386050da791383102553e28590af6ebcdf66a86e9a65b18ad330c63e7a60f01afb65eac28e27910577f9ef48d53dadaf56b09340747840f693f17705a
-EBUILD bifunctors-4.1.1.1.ebuild 728 SHA256 e2bd719e34b3616f850d314ea560fc8877a28723fc5119d79768641e0ce28554 SHA512 7240bce2625c01e44c2f16e11383df3a45b85f9c3827d6aab5cfa20f2d973833b17c239006a0c9869faae656d45c580da8416d89d8cfcc280e2bf7487851f630 WHIRLPOOL afdbfff58be6d5f23d61426ce7fdf41c8349fd2ce8a0a2780c651b89af17d73880966d8cc198a259036b30d06dbaa021bc4d81631bfd5a097e8803d409b0f89b
-EBUILD bifunctors-4.2.1.ebuild 766 SHA256 45aabc8af7fa7c2fdac9cb0da38caa0656f67c9780cda86831770a19a9a21264 SHA512 d93172e3924ea15ad1dc5a785e7f7e59b1e23f0fbce105be7a4bac781334fc336f46005bbb7654d77d467696675c701d20363151b9f89e20c8d68c9c8400e0f9 WHIRLPOOL ec9a7f7c79689c6a4f7c737ae8dc3775a96969629f9e6fffcb21a601ee1d8fb9f65645b18258b00d70564526cd67e892bb736afe169964429909f4b6a9c9006a
-EBUILD bifunctors-5.ebuild 851 SHA256 791b135859ace9f67f5cb38b8269d50b7694bfbab6acb91f9b4cb66dcb5b3bd2 SHA512 db1708a8a012aea43d1bb0b8b763aa2efe73514a8f85e58281b8a9ea889f6f8e8c0e231c7987b5fa0f8d6543e047f1875dbd22e0f43b31c3b7568f4e7440d8e4 WHIRLPOOL 6d52ff477b7975b5cba62b7e53271b21b72a6ecf5b621d439620df61c2724a68c74c4b190073e00a7c68eb5a218cf335bab0b2ea8c70cb0c7a59b56bcba20c65
-MISC ChangeLog 3560 SHA256 ab222a8ac45e9040b736061a9a24d1333622c5c3b4e847d4e8da943bea78f7e6 SHA512 1c59294549bb4decb6212194c7c7899ec23a1726736ce00b6f338d00be5a7954583f363ab5dd6869b53d1d81fa2bd2762b5f9599b4a775324efd5bd50d94a7e7 WHIRLPOOL 6d55349647ffe2f8741968ef8d667ab10b0e62c7a101334b2a162cbd72f3f81b2a1b90d7c53abed13166bfced0311085042085e4078805859b5b70262cb4ba82
+EBUILD bifunctors-4.1.1.1.ebuild 771 SHA256 f8325343416925d972133681d6e5ac01eaf29dda31717fe814560858d3c1ef4e SHA512 746bc77d339a8a254a4cf1817bdb755ce144a8f34b14f14ac198134536a8f93e4a8cff734ff88348c072aa2ce187ac6c6f08704d69b7f787b5cfb3f3cd46e4dc WHIRLPOOL 55991fe0612c57b13965ab603f5c09809d8850d4d7c4350a2ab25d10f30bfc874c8df0f4f81b3b6e64d62a512184c0ac87ad5a4d8868652d827cd756475f73ac
+EBUILD bifunctors-4.2.1.ebuild 809 SHA256 91c69ab689577fe2507201d990ec92cb5c7d6ce1c84f1439a5beacbfa025e768 SHA512 2b24a118506611835a3862e85d23b6d666b8ec1950847dfbaad2aee19e67d4876385fab778e5e4c1f8675dbb698b2d4b4e5781f54dc68cc3634c9af386e83cec WHIRLPOOL a1c9e9d53e889135830f99b948f70445f9f243a1ccb085d28a850361d68b32d6bb0d80a5d116e7f844aac546be02b3c87912c018bc44cdfd76f16dbc864d1a8a
+EBUILD bifunctors-5.ebuild 894 SHA256 0eb8600d3fcd5bdb0ea7079752f5bfe1dd9facd69324888357487098413afd45 SHA512 a39217301bcd8f10874c8ea3645cfddfad69f4175994c2d5523c901a48e4c3b66c90bb1dee80c7797d0399099fcd2c005bb813e3071a63cc9476ea5c3865e822 WHIRLPOOL 28e7d10a995d06162f4dc2b28edceb7118eaa8a697dc70deacf7d37f269b13758b450f89a90afef102e8c8444978190d8b578ed3883e0d964915d2ca31e84a9a
+MISC ChangeLog 3888 SHA256 c27ea49ee8176ed450822e09f95f49e01374b6059416e1028c524ce451cdd297 SHA512 cb20f674a5df2ce2e92942a165806c71353fca1d6181c26ef15768776ee4fd5205b488280803b4d783fe2a3807666ceb82274b94224139800136c2c280fb2e34 WHIRLPOOL db8d4f49899a4e4d21039bb312e15b98716b0e42eb7f954cf8c08543f48d0f6b16b3ff4ead146bad9771b42e28836beb083837da8d29e16fc9412241e8509e4d
 MISC ChangeLog-2015 1440 SHA256 31b035e0cca6c5d3e9557856e082bfdb9a363d37b73b4b5f5965b0303efae217 SHA512 549ac18684831d636a7556375eb6d36546e374b6a1d6af9d6d802c9e039b5290d2eec2158b1b94d5fb42a8b4a26bd560c5aabcb4544d64242d68885ec499986a WHIRLPOOL 241f0a3bb599859007662f318709003e39078f9cb60c32da1a21c44791a7d407bfd11ddc4e77c974bcf65c7b2a493ba70c1c18d4bac7af78274d7f7d9f7c9493
 MISC metadata.xml 955 SHA256 053abcb2f1909e1de62072a4b9b23e8c685a0df038988877d4cb08f2b4d0cfd7 SHA512 7cd2d6c7c5061f9a7b820566cd6ad529e3988d21c26219d26f91afb473ba4fbddf995a9c456be441b8ab7680f62c3343f95c34de678b499e2152a6163b617915 WHIRLPOOL b0fe10856ee3001b86689d4a18bb0919b272736ef4b11dd4398a8555e602a028296dc4a06e7afda4a6542952ace1e516bcdf6a38863b451fdbcb31661dbef4ad
diff --git a/dev-haskell/bifunctors/bifunctors-4.1.1.1.ebuild b/dev-haskell/bifunctors/bifunctors-4.1.1.1.ebuild
index d253e98..ebc63c1 100644
--- a/dev-haskell/bifunctors/bifunctors-4.1.1.1.ebuild
+++ b/dev-haskell/bifunctors/bifunctors-4.1.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -9,7 +9,7 @@
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
 
-DESCRIPTION="Bifunctors"
+DESCRIPTION="Haskell 98 bifunctors, bifoldables and bitraversables"
 HOMEPAGE="https://github.com/ekmett/bifunctors/"
 SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
diff --git a/dev-haskell/bifunctors/bifunctors-4.2.1.ebuild b/dev-haskell/bifunctors/bifunctors-4.2.1.ebuild
index 0750342..35e369b 100644
--- a/dev-haskell/bifunctors/bifunctors-4.2.1.ebuild
+++ b/dev-haskell/bifunctors/bifunctors-4.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -9,7 +9,7 @@
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
 
-DESCRIPTION="Bifunctors"
+DESCRIPTION="Haskell 98 bifunctors, bifoldables and bitraversables"
 HOMEPAGE="https://github.com/ekmett/bifunctors/"
 SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
diff --git a/dev-haskell/bifunctors/bifunctors-5.ebuild b/dev-haskell/bifunctors/bifunctors-5.ebuild
index 0ba65fd..181383b 100644
--- a/dev-haskell/bifunctors/bifunctors-5.ebuild
+++ b/dev-haskell/bifunctors/bifunctors-5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -9,7 +9,7 @@
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
 
-DESCRIPTION="Bifunctors"
+DESCRIPTION="Haskell 98 bifunctors, bifoldables and bitraversables"
 HOMEPAGE="https://github.com/ekmett/bifunctors/"
 SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
diff --git a/dev-java/antlr/ChangeLog b/dev-java/antlr/ChangeLog
index 0d32a81..1297364 100644
--- a/dev-java/antlr/ChangeLog
+++ b/dev-java/antlr/ChangeLog
@@ -158,3 +158,22 @@
   -files/antlr-3.1.3-jdk-8.patch:
   remove unused patches
 
+  07 Oct 2016; James Le Cuirot <chewi@gentoo.org> antlr-3.5.2.ebuild,
+  antlr-4.5.1.ebuild:
+  3.5.2 + 4.5.1 stable on amd64, ppc64, x86 (ALLARCHES)
+
+  Package-Manager: portage-2.3.1
+
+  07 Oct 2016; James Le Cuirot <chewi@gentoo.org> -antlr-4.4.ebuild,
+  metadata.xml:
+  Remove old 4.4
+
+  Package-Manager: portage-2.3.1
+
+*antlr-4.5.3 (07 Oct 2016)
+
+  07 Oct 2016; James Le Cuirot <chewi@gentoo.org> +antlr-4.5.3.ebuild:
+  Version bump to 4.5.3
+
+  Package-Manager: portage-2.3.1
+
diff --git a/dev-java/antlr/Manifest b/dev-java/antlr/Manifest
index b769b48..405e07b 100644
--- a/dev-java/antlr/Manifest
+++ b/dev-java/antlr/Manifest
@@ -3,21 +3,20 @@
 AUX 3.5.2-test-fixes.patch 2093 SHA256 87ae32a7f74c62479bff31f7a6f00cd99d19ceb5d3657878ad72e5934d5bc2cb SHA512 dcdde9daabfb3379f85d831a594259b21e1cc0283f7f0972d42801cb144d6932fe5cccff576cc885614db3f9e07b98782c4932a03687658df35f698455588533 WHIRLPOOL 3252b6b7dabd2a13340b4302ee7666c901c7fd22bd05aab60cb23301a5c3e97f06bb5d901d0008695294e12840e58437cbc3e85fc35b5a9d5c9a5b603ba0c7cb
 AUX antlr-4.4-build.xml.patch 1181 SHA256 35fea0cecadd2da2cb11be61eed72cae6669872bcf4af818d34086035e905038 SHA512 84b0d94d6c7193be795cc8fe8ff94adca83434f8104d8814f925ea050fa85ccbd85b572ea5ddb5de6066f1169d3c577bae55ccf2cf2c7adcacaa900427aa2a17 WHIRLPOOL 225f61f9a1be5cf9b4e71b5b418f7f23479f51e387209a0b8414c4456f7b0836224d89d908000ed7cd45cb46a77ff209c07c1cfb079c8c1503e94e5fd582c558
 AUX antlr.pc.in 155 SHA256 31bf717831c33e3088958712f2c6629427a505ee0a48030e65b4f733e0bf277f SHA512 30fe3cb55ca8df57f60eb117a6c2670ffe24b590e3e19e5976c80a06750aa88d6eb392e3b6d6f6c545dbd178976a55bdf1de2b93b313e03231877781a9587757 WHIRLPOOL 1b6fa0e73c888f5f57d01087b562ab9427a1e08614d5cdc6e78321a23eee6c66db5773bf611f4a1637fb67fb1cb43c6181b544b84d713d7ead33e4e59fe041f7
-DIST 4.4.zip 1107695 SHA256 68a79e4accae4dfd9d45a8292fe9b2812c6a3ec1d903412e205a06ead083b8ae SHA512 5e4a92b3d0bb8583f52cbed554ef68909412cd3e9de7589870eead3359a6f5efb492029c3bcce50d6a19a220c83c809824dbde3d08a6b39a42e9fbe3eaef8ce4 WHIRLPOOL 80cf60f9679cd5d3cb512b2e1a9c4987d34fb7994a976b42c95351fb4670944343dd8b8cf0e1738b94cc177122dcf635ee5d1a262290f6b89a8e38d06adc2077
 DIST antlr-2.7.7.tar.gz 1816180 SHA256 853aeb021aef7586bda29e74a6b03006bcb565a755c86b66032d8ec31b67dbb9 SHA512 faa72d2ddcba434ef1233e70c1549e63eba67c00793966322e821cf7f015cccb804448cb92d8fbef0429f59928fad65ec954f8ffbda0acbb8e983de0806d349d WHIRLPOOL def5ac0ddfe5a65f9f7d5489d039048c5d630b46cd5626593bd12e9b393d5ec26884f90b013bcdf58511e26abbf06e0d7b3789a11298b017f7e70af2ec8dde4a
 DIST antlr-3.2.jar 1928009 SHA256 4c8737014e7ca0d2c85171edf37f5a26b2d8d8237c283357b81a3269b6848d38 SHA512 25a61404c4b41e48eeaed49d41122f9400092248a10eb776d75ce3513295870eca1acc4b06c74925284a27cc64ca0506e34de39fb91996f09727cc5cc72dd9a6 WHIRLPOOL 19d99c9f50339ee9ef31e9458ac3a44ce52aa89ed84f96be905d626e3a53d5e2bbdb2e8eb4c5ca16413e7493499b141f940dd200658f8e60e9ecbd777f83a84b
 DIST antlr-3.2.tar.gz 837320 SHA256 01548fa03ef1f0ed05a93f0749b65db8a35a191ad7ad34e1e6a6a2529ca2ef45 SHA512 8984221cd89253c033a4596dd56cd51b297393a53b4682f5ab401172745d343371bf0d45417fa286ce972add1b4e474f1f3091fa1345158dbfc040702d61607c WHIRLPOOL 40080efc13c88312aaa318cde097f240e711b477e264739ea71b6c246ede29ac48f42eccd55365af531eb428f1ca1d89386d7e5753b6bc35cad9bf937b70e6de
-DIST antlr-3.5.2-complete-no-st3.jar 1862097 SHA256 46531814ba9739cdf20c6c1789c252d3d95b68932813d79fb8bbfdf8d5840417 SHA512 227f56edfb8d1935fc0f5bd69a730a2230b173f38baa7837b6dac9b4a10c5d4a9b2eb806416b21bed2621bb0b8e0fb98a6f48da2660b326728326f078bc28ea9 WHIRLPOOL 5c5285894e2d4182650a8a573ae83996e1f463d6ce866ddcff43959b16cf1070c3042b21d80c9350865716a6719d15fcd42b7370b4af69b6eca863d26ffcc325
 DIST antlr-3.5.2-complete.jar 2456317 SHA256 26ca659f47d77384f518cf2b6463892fcd4f0b0d4d8c0de2addf697e63e7326b SHA512 560f208e38759b5e626de56816e1fce9c191c526c04ca782513859d468ac444d1e8e62c03870a68f8f9d8daee0f45fca465150e2bbfc71b46e46b952519044b1 WHIRLPOOL bdbbb081bf0aab83fa26a4a75f7f42487da688a5e3c765ea4cbd7b8c1bcb80b66e8b98bf95ee8bcd2acd60b4eacb6745f879cb899b672ea7fc4489d651a6f2e0
 DIST antlr-3.5.2.tar.gz 6927126 SHA256 529baf7d11f06b773543e25271c1a6e1735d2f8061f4866d1ea5c99a5d71ee1f SHA512 e2a0520093fb2a77dcd9d44f26a9fdd612dceaffb398c53b2b8cd29f4630830647ede29e8dd55b434cb2c165b0fd1d77968ec6e6de0798f14d9cdfd9e6fccd99 WHIRLPOOL a3a2bf81cc91a332725a4ce15dcccf10df5395b27a521656b1f3e80fed10197edc132fa2a8b9a259b2ee603320492b4b1f664692a967fdfdbb574d919b9aa20e
-DIST antlr-4.3-complete.jar 1340431 SHA256 da9afec193edcc4d8080a4897e77e1e2f6a0c0bc265fccb8c44ae10660f7a8f0 SHA512 669cc21ef72ec899509181b1ec77d918fce9dba3db165d9d7429e0058c58a9d716cbf274d7a54b6bd9143d95d9a902d82acfa5bcb5e6c805c4e9fdf90b83349e WHIRLPOOL f665a200850d294ee0f8c3127bb918a9c9625098a97a960afe08b3a3940ba2c2ad54099e34c82fab5058b668a721b3ed5621a85820d0aca0e16af2f81627c723
 DIST antlr-4.5.1-complete.jar 1478820 SHA256 9cff6c76bc5aafcbf51cac7f0974ae01e4f6119402e75436abbb97f8ab15c211 SHA512 1109087c44706694d75a7f88f6ce96e8653467d5721505db747e7e70a4f40a24469b1fb3ffcb327819bba1548b0025412e46a11a41e329b0ecf847cb1094238c WHIRLPOOL 54d8a59bbd935b84a76370645d57eb07ee9160297ad457106b7b773682f915c9632446fc818a9fb23ab37074c923b918c168a7eca98555513cfb4dfa2eb106e5
 DIST antlr-4.5.1.tar.gz 6158475 SHA256 faaaea662e7b4792fc2264bbefaf0e196e74f45ebe29ec638f978b008e6bb5ff SHA512 949306b0ee87a0c002664ee7ac0f32c43385c501b4e28f181417559ce09b07cc12a8441c3bb81f8a72feba3d4ccc693a3c03bcccad7fc81223cddb19e10468a9 WHIRLPOOL 00aeb41f8864d65d7693cf3ca4d36a10f094967fe96fefd67e4d64eb22d1502658ff2355125ab5e36f88a276d143247c0a2814cfcd990e08ec3fe6f6212ea42e
+DIST antlr-4.5.3-complete.jar 1485121 SHA256 a32de739cfdf515774e696f91aa9697d2e7731e5cb5045ca8a4b657f8b1b4fb4 SHA512 53dcadf3007c9bdbeb391ea72fb9bab7c086fa0b9d1d93b83050b2ebb726c2f52743b5ba944c68f6da513d915ab5e8721676d74d823c32484928ccad2a28f1e4 WHIRLPOOL 9547b9e18bbef393036feeff9608b14bb57916e27bb4a4e15f1842ed428a6ccbd6c3fc819cf322532876ec4500bca3e4d73194e3ed85662768240750f8db235e
+DIST antlr-4.5.3.tar.gz 6760401 SHA256 5eaf01d4994383029a7d5d9c4604d7c7dc3122b787b69c541821d0f4dc0e9f05 SHA512 d0e61baebb338e5e4e8eaf87aa6ef52a568ec51bc86bc07acf8f82be0c173ea4f0f85978dfd034c2642505888c0849663f6b6fb030c4c19e0571f29277fb54f7 WHIRLPOOL a58ccbe6b1bed2cbb77f689cc3b8a731abd480f689a2e2129eecbd68e843906ec8931f958e174c2bf463651018cd6facf97eb5eb4b7aba69ea337f26040fcdf3
 EBUILD antlr-2.7.7-r7.ebuild 1130 SHA256 89d084bbee89fa02c6948a8b3615e4bc1bef47543087ceef2a442b24c1bbdc39 SHA512 50f1c8ff3091462751598abfd96e03cc317cfb190b0b94e313be5193a08f8b2dbb955bfbcb9564ed76b78e6b65146c34e58855e76540466586d1d98dc8d159c1 WHIRLPOOL f7bcb159fc3645c8a6e1b7c5d0e1d7bd8d01c356d19992c5d569ba4a52b6d8d5ad7838e05527eef49b38e6983fdfd8dde19e1fbbbc232a212191427c3dbfa100
 EBUILD antlr-3.2.ebuild 3268 SHA256 1ce99320a2386ca33d24b6dbb2eecaca1e1571264ab79bd745ca674319b10ce4 SHA512 56cad29a4cedd89e459bbee0c70b1056bdb3a7541f79437de4b738ba38af3036dd2e8fb04224e3e535ea89fe176c556d88518c23b8988d2093d8b74efb9f9a42 WHIRLPOOL 559f92996420a60b73428782932cca2593ef834fec92e8eaece22cc0e431162569387165bb9a01a2fc655b458ee5d825e45913ea1cd4111e26bbb7475ef139ed
-EBUILD antlr-3.5.2.ebuild 3031 SHA256 de1b239e868fce6de8da34ab0bbe8da467fd7dac3141be4509bfde4cb3b696f1 SHA512 e2a85b1da066b534a6c25e7b8b1b9a0fb2cea4157c228e1dede48069d5a6abdcaac3a46e7f2674083337a07a290c7f8f08d5403016b0bb6aeedf74a4d92602e3 WHIRLPOOL cca194c004bf0d63f446fb51b76693a8455febbc63f9b1413a880875ae406618f1a33f8411f5b72a0fd68041c7775f34fa39d346b028f79aaad57a4ac2e17946
-EBUILD antlr-4.4.ebuild 1685 SHA256 29836d05923090a9dceaa6db4d37cdf7ee28b7e19a2098805deef30b4f5c0b3b SHA512 108c25f58c55f74e31653fa8677cd0502230d1dfbc7f6067445716e0ef8e71e588ff43079d9a969b258628739b8cacdcce05cade6b18e91bdd6c2a3ca7c4ff90 WHIRLPOOL a6a55f30efac01c052634b3b91758ea10f26c9ba66f6be0ab91566c5c8da6880ae318c5242933c44c97de51947490e2050972ac400c05d868500047ea677105b
-EBUILD antlr-4.5.1.ebuild 2488 SHA256 2bcc51417112e652a0db990cffcfd848304834cebd369a1c4413391eeba7c186 SHA512 94e4d8fe5e44b5c70cdf3d28a0c39723ef7c188ad61b3148e3cb54e529fdc01ae2ce558b75e11d3a3e0369605a00205bba1be8ecc851e9391dce2d9a45c145bf WHIRLPOOL 0cf504d16c8a5d6758c9df1c6e4e7b4ed86cf837aaaa9d6a6b8b16c0cfa286cb2e0a116fa95b1882c37dc77284fef4672952c7c3702fddfaac9383c9f69917ac
-MISC ChangeLog 5813 SHA256 e12866cd39fc785ddbfeb4f77a8950019e1a031a40c9b30f7e84f493fd1ac637 SHA512 5f4963306927cd556bce4a274cd0b23a724aab45b263f2eb6c14b997d7721528f63bbceadf9d0840a356354b7f7e1f7897a432fec43d6b1d09bedd12a4fa6a02 WHIRLPOOL 2ecd28391ada609fef460ff0994f2adb237d3e1dbd2b8ab431f35bfbc1b493e8cfe93deef13865af0132f59625e9b241ab283ba2d5a02fea2430d99d5f1a105d
+EBUILD antlr-3.5.2.ebuild 3028 SHA256 61240d166eef61c5ea0703d1585908b0fc035325126a4f59f332d00a18ba2ac9 SHA512 339d36f884b92829c546a4b9b1fc482ea2a4951c98194567cd40a5c70e32ef9a9af5fb566682aff2fe6812c49ed7559703ad4cc839bf92a9979da2fe11fd2fb8 WHIRLPOOL bae758724f2bbe76928ba378e05d93d5f86a64f3db8c4ee628bb57c66ee45bc500b22b2365b5360ed1671613a86597916a414b95660815faee18253ded4770d6
+EBUILD antlr-4.5.1.ebuild 2485 SHA256 26515f9c57edf61d15375c2d6a8d87f2ba1382038d3f51731a7f381619a5e2b5 SHA512 92c58339588d87b6c57d6db4c604a1b883621e8da9def844d763d48f3525e07f2dce3b90a659a24dbcc412906ed4514a5fd0762d587dafa5d2ba2108cfbe6292 WHIRLPOOL ef6bd011e756f85730ef4bc6fafa14adbfff230a27caa5848261c3fd76993aa91f76f323dd9b2dc056dadf8e10bb9fab967612d1c7f815fc367f5332a14f121a
+EBUILD antlr-4.5.3.ebuild 2488 SHA256 2bcc51417112e652a0db990cffcfd848304834cebd369a1c4413391eeba7c186 SHA512 94e4d8fe5e44b5c70cdf3d28a0c39723ef7c188ad61b3148e3cb54e529fdc01ae2ce558b75e11d3a3e0369605a00205bba1be8ecc851e9391dce2d9a45c145bf WHIRLPOOL 0cf504d16c8a5d6758c9df1c6e4e7b4ed86cf837aaaa9d6a6b8b16c0cfa286cb2e0a116fa95b1882c37dc77284fef4672952c7c3702fddfaac9383c9f69917ac
+MISC ChangeLog 6291 SHA256 18d9aded36b61c3df7ba2e56bdc663af5306b0af4e8662ecdf2a3e02fe62311f SHA512 a30c43069262bafd75a1fdb2652f470779c351bd52411303d615caaef9a7967325bf92fdb84a6e736b044352f2906ee38cd786eb1d0c6f695ab8b8d015a4e71c WHIRLPOOL 6e3a85948dce0280cd35e784d8e6be8225cb8d6bc4f036efcc17603c81fe2d2bce2cca5fc819788fe93553303c67f304579e57b058536b9f676006ad3c69cefd
 MISC ChangeLog-2015 16936 SHA256 5dbbce05d4b62d117a5cf5672ab4ddb30c31ff3a961db968477271d8342eb7c0 SHA512 9b807d940667545f211673047baf5fca4452643575f2512fc8976d9560e718f5abe893fc65e3a03432a74fb81ba0312bb462f56834e547b04280108e2b567f65 WHIRLPOOL 0e912f06b0329ff076e0f92876d7f105bd9f43a63ef5929d21aac05e67bc9f920941674edb671f3f407fd5093368e3f0f373e7d45225832801e81270a13b9424
-MISC metadata.xml 457 SHA256 26292f225dfa0fed6acd736b7b6c263e5611b228d68ad4377dba0e3ded053af2 SHA512 cabac5dd1d48c578e3131bf893459afc68c3eb61477a768649139f3aa1208091c5915a1062b7d7f490d868a06a4903f41142acf29227737ffa346d2e66e9863a WHIRLPOOL 8b9b4e30e0cd3634aab4797b65c91a47be934513091f41f721fd2bd2dc83d4e7deb6d2445ec9acd01cabba32d8739036ca683c7e045aa8f5ec553d45d08858da
+MISC metadata.xml 313 SHA256 7220aba897554ea2e6acbd77a56c97512713cdb8cf7a57c414086a15d1e05954 SHA512 01f11b9e45bc3c331d445213704287f1f034087930d4b55cbde700a483dcb64260d4805a4c2ec3686a99b59f3225999409d499cb63a40b3d8278d8a2e6213f57 WHIRLPOOL 2e6b243896ceb86db3f25760af12f386135e9545ef1ebff735f59541ea4b3b2870615b8ea857ee0b0322c616b4d4598ec4488e09de0a3205ba7e3383e656e3b2
diff --git a/dev-java/antlr/antlr-3.5.2.ebuild b/dev-java/antlr/antlr-3.5.2.ebuild
index acaad6f..a44d11a 100644
--- a/dev-java/antlr/antlr-3.5.2.ebuild
+++ b/dev-java/antlr/antlr-3.5.2.ebuild
@@ -12,7 +12,7 @@
 	http://www.antlr3.org/download/${P}-complete.jar" # Prebuilt version needed.
 LICENSE="BSD"
 SLOT="3.5"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc64 x86 ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 
 CDEPEND="dev-java/stringtemplate:4"
diff --git a/dev-java/antlr/antlr-4.4.ebuild b/dev-java/antlr/antlr-4.4.ebuild
deleted file mode 100644
index 409a9d4..0000000
--- a/dev-java/antlr/antlr-4.4.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-ant-2
-
-# List of jar files we need to get from the Internets.
-JAR_LIST=(antlr-3.5.2-complete-no-st3.jar antlr-4.3-complete.jar)
-
-DESCRIPTION="A parser generator for C++, C#, Java, and Python"
-HOMEPAGE="http://www.antlr.org/"
-SRC_URI="https://github.com/${PN}/${PN}4/archive/${PV}.zip
-http://www.antlr3.org/download/${JAR_LIST[0]}
-http://www.antlr.org/download/${JAR_LIST[1]}"
-LICENSE="BSD"
-SLOT="4"
-KEYWORDS="amd64 ~arm ppc64 x86 ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="gunit"
-
-CDEPEND="
-	>=dev-java/stringtemplate-3.2:0
-	gunit? ( dev-java/junit:4 )"
-
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.6"
-
-DEPEND="${RDEPEND}
-	>=virtual/jdk-1.6"
-
-S="${WORKDIR}/${PN}4-${PV}"
-
-src_prepare() {
-	# Disable manual download + lib directory creation.
-	epatch "${FILESDIR}"/${P}-build.xml.patch
-
-	# Create lib directory ourselves.
-	mkdir "${S}"/lib/
-
-	# Copy downloaded jars in lib directory.
-	for myjar in ${JAR_LIST[@]}; do
-		cp "${DISTDIR}"/${myjar} "${S}"/lib/
-	done
-}
-
-src_compile() {
-	eant -f build.xml
-}
-
-src_install() {
-	# Single jar like upstream
-	java-pkg_newjar dist/antlr-4.4-complete.jar antlr.jar
-	java-pkg_dolauncher antlr4 --main org.antlr.v4.Tool
-
-	if use gunit; then
-		java-pkg_dolauncher gunit --main org.antlr.v4.gunit.Interp
-	fi
-
-	if use source; then
-		java-pkg_dosrc tool/src/org \
-			runtime/Java/src/org
-	fi
-}
-
-pkg_postinst() {
-	elog "This ebuild only supports the Java backend for the time being."
-}
diff --git a/dev-java/antlr/antlr-4.5.1.ebuild b/dev-java/antlr/antlr-4.5.1.ebuild
index 6fe3fe4..e114ee8 100644
--- a/dev-java/antlr/antlr-4.5.1.ebuild
+++ b/dev-java/antlr/antlr-4.5.1.ebuild
@@ -14,7 +14,7 @@
 	http://www.antlr.org/download/${P}-complete.jar" # Prebuilt version needed.
 LICENSE="BSD"
 SLOT="4"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc64 x86 ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 
 CDEPEND="dev-java/antlr:3.5
diff --git a/dev-java/antlr/antlr-4.5.3.ebuild b/dev-java/antlr/antlr-4.5.3.ebuild
new file mode 100644
index 0000000..6fe3fe4
--- /dev/null
+++ b/dev-java/antlr/antlr-4.5.3.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A parser generator for many languages"
+HOMEPAGE="http://www.antlr.org/"
+SRC_URI="https://github.com/${PN}/${PN}4/archive/${PV}.tar.gz -> ${P}.tar.gz
+	http://www.antlr.org/download/${P}-complete.jar" # Prebuilt version needed.
+LICENSE="BSD"
+SLOT="4"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc test"
+
+CDEPEND="dev-java/antlr:3.5
+	dev-java/stringtemplate:4
+	dev-java/treelayout:0"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.6"
+
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.6
+	test? (
+		dev-java/hamcrest-core:1.3
+		dev-java/junit:4
+	)"
+
+S="${WORKDIR}/${PN}4-${PV}"
+JAVA_GENTOO_CLASSPATH="stringtemplate-4,treelayout"
+
+src_unpack() {
+	unpack ${P}.tar.gz
+}
+
+java_prepare() {
+	java-pkg_clean
+}
+
+src_configure() {
+	# TODO: Make java-config accept a jar@package query.
+	JAVA_GENTOO_CLASSPATH_EXTRA="${S}/${PN}-runtime.jar:$(java-pkg_getjar antlr-3.5 antlr-runtime.jar)"
+}
+
+src_compile() {
+	cd "${S}/runtime/Java/src"
+	local G PKG
+
+	for G in $(find * -name "*.g4"); do
+		PKG="${G%/*}"
+		PKG="${PKG//\//.}"
+		java -jar "${DISTDIR}/${P}-complete.jar" -package "${PKG}" "${G}" || die
+	done
+
+	JAVA_JAR_FILENAME="${S}/${PN}-runtime.jar" JAVA_PKG_IUSE="doc" java-pkg-simple_src_compile
+
+	cd "${S}/tool/src"
+	antlr3.5 $(find -name "*.g") || die
+	JAVA_JAR_FILENAME="${S}/${PN}-tool.jar" java-pkg-simple_src_compile
+	java-pkg_addres "${S}/${PN}-tool.jar" ../resources
+}
+
+src_install() {
+	java-pkg_dojar ${PN}-{runtime,tool}.jar
+	java-pkg_dolauncher ${PN}${SLOT} --main org.antlr.v4.Tool
+	use doc && java-pkg_dojavadoc runtime/Java/src/target/api
+	use source && java-pkg_dosrc runtime/Java/src/org tool/src/org
+}
+
+junit_suite() {
+	cd "${S}/$1-testsuite/test" || die
+	local CP=".:${S}/runtime-testsuite/test:${S}/${PN}-tool.jar:$(java-pkg_getjars hamcrest-core-1.3,junit-4,${JAVA_GENTOO_CLASSPATH}):${JAVA_GENTOO_CLASSPATH_EXTRA}"
+
+	local TESTS=$(find ${2:-*} -name "Test*.java")
+	TESTS="${TESTS//.java}"
+	TESTS="${TESTS//\//.}"
+
+	ejavac -classpath "${CP}" $(find ${2:-*} -name "*.java")
+	ejunit4 -classpath "${CP}" ${TESTS}
+}
+
+src_test() {
+	# Only run Java runtime tests as we haven't built other languages.
+	junit_suite runtime org/antlr/v4/test/runtime/java
+	junit_suite tool
+}
diff --git a/dev-java/antlr/metadata.xml b/dev-java/antlr/metadata.xml
index 7526b4d..f70ce39 100644
--- a/dev-java/antlr/metadata.xml
+++ b/dev-java/antlr/metadata.xml
@@ -5,11 +5,6 @@
 		<email>java@gentoo.org</email>
 		<name>Java</name>
 	</maintainer>
-	<use>
-		<flag name="gunit" restrict="&gt;=dev-java/antlr-3.1.3-r1">
-		  gUnit is a "Unit Test" framework for ANTLR grammars
-	  </flag>
-	</use>
 	<upstream>
 		<remote-id type="github">antlr/antlr4</remote-id>
 	</upstream>
diff --git a/dev-java/leiningen-bin/ChangeLog b/dev-java/leiningen-bin/ChangeLog
index 6254a15..d7797bd 100644
--- a/dev-java/leiningen-bin/ChangeLog
+++ b/dev-java/leiningen-bin/ChangeLog
@@ -15,3 +15,15 @@
 
   Package-Manager: portage-2.3.0
 
+*leiningen-bin-2.7.1 (07 Oct 2016)
+
+  07 Oct 2016; Kent Fredric <kentnl@gentoo.org> +leiningen-bin-2.7.1.ebuild:
+  Bump to 2.7.1
+
+  Upstream:
+  - Improved explanation in some errors.
+  - Don't require nil for version in managed deps.
+  - Fix a bug with snapshot dependencies for managed deps
+
+  Package-Manager: portage-2.3.1
+
diff --git a/dev-java/leiningen-bin/Manifest b/dev-java/leiningen-bin/Manifest
index 8a2ee84..a902a71 100644
--- a/dev-java/leiningen-bin/Manifest
+++ b/dev-java/leiningen-bin/Manifest
@@ -1,6 +1,9 @@
 AUX leinrc 37 SHA256 c75b525d9b7b0864a9a36811ed8b71dc7ce08c4a08ea46ea8e6fe3ed74de1847 SHA512 f948d5f355d43fdee6cf68d0dad39f53f72b341649869a6ca161f5d8c83bf30434ed03c51a7e01aaefa422ff4e93ca3db5680fd4c2af92f5393acde6e8aec7d0 WHIRLPOOL 10a9617766ed5f0da69dc8ec70e2e24f1a14a5b826f8d8b44ee533c40b684580250927217c56a32ea6cbecefc00ce72e226579b28d6e26545294b1af529d4dcb
 DIST leiningen-2.7.0-standalone.jar 15366772 SHA256 b0a53fd9fa73e9d87c04ef25ba1ca174b0c062b803108648d7157176ccde7435 SHA512 d42288c696d5b4d86c41a0ca9b8e748cdb9200c3adc23161b9b97b8c2f3da9c5bd811e2ddae265bf11d323b1449291e9914bf1e222aaf403e73ceef4084ed082 WHIRLPOOL d37e5a17680f08f7fae63051b6be7f8d12ee89d42bab1a6cafde6a4579b6d0ea4a772393031e286a57fc5b5d534674b0a270a32b39e9767a4dece70986bc94a4
 DIST leiningen-2.7.0.sh 4301 SHA256 3865ce138f0a5f175819d6929203bfbd84377d8d5b7720af59c8cfde2289a2b2 SHA512 241357de3f19dfe1c729c14d1540140fccdd6a6c7bae76d6ccfe7a28cdff95b01f52a671ccd2d6712e11ff33115c720906e34a5118ff6bb6d232520d77125f5d WHIRLPOOL 52fe0420a7f8da17a8e01504a515627b85383f6c28e31c9317d4cb51c80fb1236149d30f5b8b0dd73c10157a73e8877f3d7e235da1e95b3b78709c96016d2a8d
+DIST leiningen-2.7.1-standalone.jar 15370238 SHA256 2ddc7e89bbb45cf1ca3d666a10dce0d3f154b77ad201aa58f430e84e71587c47 SHA512 6f0ac01917b273c063dd16d8a5e98cba0265ba19766ce6a2c1e160367e3514e637c969f831384845e752cde015e1357eecac7141259e279584577f4f527bc08a WHIRLPOOL cdea21c8fef2ba1d7e4397d32ca1c4d5c7ffcf52ca088b8b1148c970c463ba219adbc11b208379659f3c255afbffe1edc7d82d38d67945fa85cdeb1713c3e3b0
+DIST leiningen-2.7.1.sh 4581 SHA256 c04efcae827ee0883bdf44abef87b5bfa7da6f4b9864b5395dc341d60985ba66 SHA512 88e52f843a9b3cc4ebe2d8ffef1bec5e52a9e1e492d69b75c1482f7a97f6bcb766360502a5f1270ced1f4c1419af8b0cccd79219dc333a7305d3e4b58082d1e6 WHIRLPOOL 577044d1cdc931a695677fdc748ecafba656fbc66d8137a32ccf8cbadfd7dc137e45c91efd953e4efe9d55fbdabfafabbbc5f14be09d5415971814f5257c7a73
 EBUILD leiningen-bin-2.7.0.ebuild 1536 SHA256 888ff3e41c970baefe148e8ac5d008d379ef2899ea1d3033bf202069f7907b12 SHA512 603db2941fdba3b26082c08a6f2b67c80ee30963a3187cb614b3a4fcc42565e00ca13c358c56521dbbb522a6ffc64528803388e425aa355ba95bd5afa31a5a2c WHIRLPOOL 3cf3963b80884cf659bf6079c6d04d0bee16779c261c8878f00578e20c9c6168949a52569b2628a79b26ad54c3574aadae4a2cc1ff4c9aa1242fd954dedfeebf
-MISC ChangeLog 512 SHA256 7fd65b0943d0266b762f2ab1200ba6b0f2d140da41cc4bbf4e9d4bdf0f5d4c0b SHA512 56cc7a812f249efda2cc2a738b3f412b62f801c0255c9ec45187ba844654eeb71252d3de5fe8b15309a4ab516bd95e33ad7a6fa3abf31b88816c1cc0c03e677b WHIRLPOOL c64712b19488e2d656c0f479abbc35614171a69dde729384539507f402f24acd08b2a1472488071019a27f96657d05587c0affc8d9ce5316d6e2e783053a1c17
+EBUILD leiningen-bin-2.7.1.ebuild 1536 SHA256 888ff3e41c970baefe148e8ac5d008d379ef2899ea1d3033bf202069f7907b12 SHA512 603db2941fdba3b26082c08a6f2b67c80ee30963a3187cb614b3a4fcc42565e00ca13c358c56521dbbb522a6ffc64528803388e425aa355ba95bd5afa31a5a2c WHIRLPOOL 3cf3963b80884cf659bf6079c6d04d0bee16779c261c8878f00578e20c9c6168949a52569b2628a79b26ad54c3574aadae4a2cc1ff4c9aa1242fd954dedfeebf
+MISC ChangeLog 839 SHA256 87781853d5087084954d3e1f14de0251e41f5a95a8b5da0570eea8dab1257f90 SHA512 833fe01637440f186b96e78dcc5601dc43643c92d86860e5980f418527eb7c38ee5134851d7ef765a09c19d10aafae5158685abd56d9b94549faa22af7bca5c3 WHIRLPOOL 24676c67347c1f98321ee4cc625919450303d35426405d8f1d9b3abc146750e9a46df0a8fc11a5a4476bd54be52b46d0190c8511ce91b122a0b5e894d73a3268
 MISC metadata.xml 322 SHA256 fa7a8f3b82c76b011f4835dca49ec7d0d4c66972f4fb9bb23ef46f03c58cee1c SHA512 d722bcf09067e7e1fba0e2461c58381f531f64cbaff4402fabf53a2e2cd002b77092a584b3c5bfb0e42faed02052027b9143f604a5f369200bb35a09232ee6e4 WHIRLPOOL dc532aac07cdcfc954d272cc0fa1c7a9f02db033f931ec2326e39fba064368f1f9438e5dea5b0d45168ebff8b8a26901ff17f6c3d10b9d4f01fec9847d99431d
diff --git a/dev-java/leiningen-bin/leiningen-bin-2.7.1.ebuild b/dev-java/leiningen-bin/leiningen-bin-2.7.1.ebuild
new file mode 100644
index 0000000..dfaafd5
--- /dev/null
+++ b/dev-java/leiningen-bin/leiningen-bin-2.7.1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+
+inherit java-pkg-2
+
+MY_PN="${PN%-bin}"
+MY_PNV="${MY_PN}-${PV}"
+
+DESCRIPTION="Automate Clojure projects without setting your hair on fire"
+HOMEPAGE="https://leiningen.org/"
+SRC_URI="
+	https://github.com/technomancy/${MY_PN}/releases/download/${PV}/${MY_PNV}-standalone.zip -> ${MY_PNV}-standalone.jar
+	https://raw.githubusercontent.com/technomancy/${MY_PN}/${PV}/bin/lein-pkg -> ${MY_PNV}.sh
+"
+
+LICENSE="EPL-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=virtual/jdk-1.6:*"
+DEPEND=">=virtual/jdk-1.6:*"
+
+RESTRICT="test"
+
+src_unpack() {
+	mkdir -p "${S}" || die "Can't mkdir ${S}"
+	cd "${S}"	|| die "Can't enter ${S}"
+	for file in ${A}; do
+		einfo "Copying ${file}"
+		cp "${DISTDIR}/${file}" "${S}/" || die "Can't copy ${file}"
+	done
+}
+
+src_prepare() {
+	einfo "Copying leinrc"
+	cp "${FILESDIR}/leinrc" "${S}/" || die "Can't copy leinrc"
+	einfo "Patching leinrc"
+	sed -i "s^@@PN@@^${PN}^" "${S}/leinrc" || die "Can't patch leinrc"
+
+	einfo "Renaming lein-pkg"
+	# Rename generically to help user patching
+	mv "${S}/${MY_PNV}.sh" "${S}/lein" || die "Can't rename to lein"
+
+	einfo "Patching lein"
+	java-pkg_init_paths_
+	sed -i "s|^LEIN_JAR=.*$|LEIN_JAR=${JAVA_PKG_JARDEST}/${PN}.jar|" "${S}/lein" \
+		|| die "Can't patch LEIN_JAR in lein"
+
+	default
+}
+
+src_compile() { :; }
+
+src_install() {
+	dobin "${S}/lein"
+	java-pkg_newjar "${MY_PNV}-standalone.jar"
+	insinto /etc
+	doins "${S}/leinrc"
+	fperms 0644 "/etc/leinrc"
+}
diff --git a/dev-java/netbeans-ide/ChangeLog b/dev-java/netbeans-ide/ChangeLog
index e3c1bd9..2e9cc14 100644
--- a/dev-java/netbeans-ide/ChangeLog
+++ b/dev-java/netbeans-ide/ChangeLog
@@ -119,3 +119,8 @@
 
   Package-Manager: portage-2.3.1
 
+  07 Oct 2016; Miroslav Šulc <fordfrog@gentoo.org> netbeans-ide-8.2.ebuild:
+  fixed issue #596362
+
+  Package-Manager: portage-2.3.1
+
diff --git a/dev-java/netbeans-ide/Manifest b/dev-java/netbeans-ide/Manifest
index b546bfa..728bf6c 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -145,7 +145,7 @@
 DIST netbeans-8.2-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17fb5b3275dab92939164602ad27569d73cb2 SHA512 a287681acc0771445f9389b22ca6fd855393c0b9e8885680d13c9157aa37b215162aac6f958d0831dc64a55fc21a391fdee13c3ab9a97ad416929c6a4710b619 WHIRLPOOL 0807ec60843a7e3a232fed52c91303ef47693fcdd364d5e12f2507ea6f073df4b18b0708efc92cce93580d4963cbefb85fa0c3962363542687bdc1e5e73bbb6c
 EBUILD netbeans-ide-8.0.2-r2.ebuild 29330 SHA256 6aa91df6cc57734b485b3b8a7ef449b6ebd369040028626822dbeb628224987e SHA512 c4ff8cc9c7a6bc2e0fc31dfc2ff57dcfbbff26b226a607eabe480efeb4830813c9b1c8f165f6bc9e0a1ebe6891a5718405d6c9b6622822a83815623d97c230ea WHIRLPOOL ccd93c87262aa64c54e2a9f5ba2890adc2a31fa41b3acef2b79a37117feb8648464c565a9c2fb672aa2a7caa6147ba54721bddc3f4e1029580d2237a30c0f45f
 EBUILD netbeans-ide-8.1-r2.ebuild 30303 SHA256 189cf1d363bf95a52eac33c7d3c0ba37282fbbc2586dd240043c31e8ec25aa3f SHA512 0828a4c27d5f86fd9623e038cf0547f17507e9c2310ca42fd993b17ba661a66b2ff19cd64489f666fd0bd0075a64fec8427e67d20afd79aa67cf8508e4b096a8 WHIRLPOOL be412cf0f61cfcf3c1f2932a0429dfdf715ff90a3e39b91dfbf03024a1bcf4f7b0a82b27ec286a0efd43402584b0953eb91a4043339bac44eacfb6c10a4521ca
-EBUILD netbeans-ide-8.2.ebuild 29524 SHA256 7e4c7dacab0363a0c3966a3c8004737f80405dc39bf7948fa9c06291527277e8 SHA512 1be3123690f9dd1a6fc1b21ab383ff6b3e39e43e32982bcccc41dfea25db9203dca09832eb016ad60a90e1360cfa12e2a85d2c5d644ba1206816b6c1df633d1b WHIRLPOOL 1e69d13e029b656b95fab996956f8349275caa90e1ed05205aaad0a9ea4df9c1e535d6e98adc30313c96ae8706b3ecf75e449ed16941e434c9f98fef339f9002
-MISC ChangeLog 4083 SHA256 a6df9ac0d85536f94067149c6dbe55b110281c27adc6ca669dd40f78cc03bdfa SHA512 1e8735a83d8b23b75e32eeac4bd5c9be4674ecb2d5268ec7a52f20b1141f49edd2478900e9a4bf982c796282fd973316e06998e0be3ab3e1582b699b55c78d16 WHIRLPOOL ddc268cc5b8ee4de62b00f8e1f7c849fbd79289f384a75f22ef11ac26e8aba6e4a654ebc5a91e4a67ac33c38224bde4331c5c79b0c481f766b27eef18cd4c7a7
+EBUILD netbeans-ide-8.2.ebuild 29530 SHA256 90a463cbcf7753c53f3928eb542ad745a81f3b2518e1d6da3f3e28a951e08cad SHA512 37ccead9a142e330c07e030b1957d17cde945ed4fbe9a13f62125f7762d83965919836fdce654c8c305a34d69d585184155799f55495f9247b8916ef780510ab WHIRLPOOL a7e1d1c148dd776698bffa0a1fcb8b7e4f31ff32a7059a1c0327a266eaa5ac8b768b7d7dbba16fd71844f6e8834d2edf884a9f8470df1e22b8ecb7b44e0a6540
+MISC ChangeLog 4217 SHA256 0b8e0cd58cb4fd0a4baf08dd0457f6165eb5e025c10edc6e675f30dc77da47b2 SHA512 845b8d7a5c2b990b8440fa8b90853b8c40d394c0c1e5ad3c9a344a34295ef5664bf4496224a65befddf443baa684d260b0976e1a165425b9565579ce08d214a4 WHIRLPOOL c4e22335f749c756ec162c44fb879e30d1b136bd18a5921a82ae79040ab7d270290e6138c8509c493bf648160f4c8096ba691962d2e173adfb4971e84f10c8c9
 MISC ChangeLog-2015 4395 SHA256 444dc2b61db813c6d2699b104f92d65563ba7dfeefca3cb09dede3288dfdf496 SHA512 c6c9c4d63be442a69759c467e5db91bfdd05e91b33b25c69f27537a7c20e20f2a82d1fe9b530f3bae2773d4c128ae30a60b2cf16f4e97a86253341b9a31ad8cf WHIRLPOOL e40df361cd0a457a961e804995dcc2d724e75276f48f1bd12016a24476a7dfed283444fc46c2543ba9a81c6c8b21caacc7c4b0256b7fc93af3c3f60f7b17ef85
 MISC metadata.xml 342 SHA256 d73bf5e0c12eca1d883dda7c037ccb446d7e565175670ab04916763366b8ba07 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3 WHIRLPOOL e6001c31ba2e7edad63d08ec6854b13fe9dcb73a2fde7715f13fc83a4eba943444ef0343c632facb9a0e4d5d74f05371e08c8b32f5893171fa85dc95b6bc36e6
diff --git a/dev-java/netbeans-ide/netbeans-ide-8.2.ebuild b/dev-java/netbeans-ide/netbeans-ide-8.2.ebuild
index bd42cc2..8c51a8f 100644
--- a/dev-java/netbeans-ide/netbeans-ide-8.2.ebuild
+++ b/dev-java/netbeans-ide/netbeans-ide-8.2.ebuild
@@ -89,7 +89,7 @@
 
 CDEPEND="~dev-java/netbeans-harness-${PV}
 	~dev-java/netbeans-platform-${PV}
-	dev-java/antlr:4
+	>=dev-java/antlr-4.5:4
 	dev-java/commons-compress:0
 	dev-java/commons-httpclient:3
 	dev-java/commons-logging:0
diff --git a/dev-java/stringtemplate/ChangeLog b/dev-java/stringtemplate/ChangeLog
index ada4a2b..3b24feb 100644
--- a/dev-java/stringtemplate/ChangeLog
+++ b/dev-java/stringtemplate/ChangeLog
@@ -120,3 +120,8 @@
   24 Jan 2016; Michał Górny <mgorny@gentoo.org> metadata.xml:
   Set appropriate maintainer types in metadata.xml (GLEP 67)
 
+  07 Oct 2016; James Le Cuirot <chewi@gentoo.org> stringtemplate-4.0.8.ebuild:
+  4.0.8 stable on amd64, ppc64, x86 (ALLARCHES)
+
+  Package-Manager: portage-2.3.1
+
diff --git a/dev-java/stringtemplate/Manifest b/dev-java/stringtemplate/Manifest
index 015f3ed..67be5b9 100644
--- a/dev-java/stringtemplate/Manifest
+++ b/dev-java/stringtemplate/Manifest
@@ -4,7 +4,7 @@
 DIST stringtemplate-3.2.1.tar.gz 1039803 SHA256 3a0adbb7510c2822ca515c635e1ff1469b3ac78f6d2072e48478876b9191de20 SHA512 fe4c50584dd3695514034845ba7b8fa300cf582b6b302797afadce990f2665759323f6a29ece1bc07dfab244cc00455b4106fe3ad6851165edbb8736ad7ec714 WHIRLPOOL be77636384fdc680d856e8840abf0f629d5115c67f2085db044767847a480b3e2be70bae1d3984172561d14661ae325c677017b55183ff7d2e10ae4c9f83b40e
 DIST stringtemplate-4.0.8.tar.gz 147305 SHA256 07013e36d16968b514092b1e33cbe53f811a70a12c96e2e56c2e97a4304431df SHA512 21e4936356a6d374bf92645f09351a495a5900a408ead8dce1903ed81d7fc70eb4b44b206b587b05ed87edb2d4792c1cf72907a9cb527e18373ba2e5f31b5724 WHIRLPOOL 61562310995301cd005eb6a553f973304e166bca0b10d59a7d0877d73599a3bd26a2abf4cc7cb0ff98b61a1ef869c08f2d6933833217cac67f92d992a9a6d53d
 EBUILD stringtemplate-3.2.1-r1.ebuild 1451 SHA256 f711c81918a305db2c324ce496dc6e949a945c8abe790f26f66b05b492d1ab16 SHA512 b03a5a595223e9d1a8688114078d915d62890364d6c14ce5f32b3ee2387d983d8f26de33e2a406f9747da51853c9ed663f50935355c6b5bc21b762c63fac7199 WHIRLPOOL e5e4c32b0fa377a3541205fd94ce34c6403d3dae839a72e2de2c70232aa041ff94c10a42e7cf15f4dba89a6f72b1dc09bf01497558f8e2fe463cec3b0e15f90b
-EBUILD stringtemplate-4.0.8.ebuild 2157 SHA256 fb441d421dea30a86e5af3a09bc092a47f70f40b4ff925dc014ee25d5fa883d5 SHA512 840596d6de43a4bb8aec9dcee6eb485e7013216e7ab2cc411adf60221e7da3877fd57459bd2a2092a785610b5012627116419e9aa3337c8dc4dd265a6ef61012 WHIRLPOOL 5185662b8f7770622fc636f42ebd0e6814df2eb7587e000c9d768edd404317c753964b76a310b8c7cf7787e1d7d1944d7343a5bc3003e551207aa60fc4c3c62a
-MISC ChangeLog 4272 SHA256 0a62e3722df3319acad9e879f0da266ee4bc3d076ac0a7b836032e7d4287bc88 SHA512 6474fe90d14b4859a945d6a5248f77b1dbd46e234e0a81aa4ce618f4429dfee5c4afa581f040e1f342858225842337bdd2a382094a85b1706cd968ea2e09b2af WHIRLPOOL c9ce6abcca218359518fe912f1e36cb1fd89e05013094377266c616c38ca5faf5c0bb175d6966080479f2b4ce26b8ffc99bd3c6bf80f0ed41fc83dac22afc825
+EBUILD stringtemplate-4.0.8.ebuild 2154 SHA256 05b99ec336b62aa1cc8ec7e537a43d687b1b3c5ce4f7b6e2178472a7db3eaf60 SHA512 9adb467a2ac0a84442726479419009b13894e0308331bdd98ddfe206ef8993b9f66f64308b88750055a1fe314cebcca39c99f6ee4d25e040d61c39e3316163cf WHIRLPOOL b48e849de51620b96cd425c0d43dce7e624c757ed4108b03a9702f2e3bba6b0ec50827588afd3c4c9ee5f5f3bbf9dadc9119bb57e035869703d352ccdf327cbb
+MISC ChangeLog 4434 SHA256 38585847092715bc7377c3a9cf0113edd6ba0ae9461526293767a450a47509da SHA512 e019d10a2a55f2a172f1feaf8d05b6d18a1664e7943692efac01918d26119fa513b180fff708515a32119b42cd1b8c7ffd63cccf2c7d42f23bbf7b0acc9ca69b WHIRLPOOL a4c166831af202cadf654004aea474fbfea9246bbb6888990d50c36ae12111ec5dcafb8f5ecf6308afd3ec54093c968491a3ae41f35076ec407f3d3778bb8cef
 MISC ChangeLog-2015 2134 SHA256 61bf0c3730bb32af668f74575e164d7fca6bdf98137fc00ccdce0f5d5af21d93 SHA512 8cf2b2d3bbe24341b90982f84bcb239b0400abb1f17bcb99f3c99eb65dde19c662648a89fc2aa397ac4ec20c99d28d67a95264183eee54e50605a9b9f618ce61 WHIRLPOOL b2306f5f602408da15505698d8a9fc84c41b9ab52a4b79dc2585d983df6a46d02d621929fa014eb99a0c4b1cb1b275f714c3b7e36cad5ff04238b675119a81d5
 MISC metadata.xml 322 SHA256 d2f1553c203cf0b889d411f67de018152ca45e9b7252a310788de2a4659a66e5 SHA512 76ac99f8c99d34b533c08ae008a9eb2ac2a3b64589df3d43460c93b78c3c53c45b944837cc7f5514e90afc2117554fb545306e74a2b2bcb5c8339c656998c449 WHIRLPOOL 293fbf2f1886359ddd2dcf4a4ec3c3b0bbd53b7a9cf1cb8de5091e9298298e19e907df4d680e8d722091678ea7395c1fdb3e5e92abafaf674e36b8ffcbaa3a2f
diff --git a/dev-java/stringtemplate/stringtemplate-4.0.8.ebuild b/dev-java/stringtemplate/stringtemplate-4.0.8.ebuild
index 183a91c..9d911232 100644
--- a/dev-java/stringtemplate/stringtemplate-4.0.8.ebuild
+++ b/dev-java/stringtemplate/stringtemplate-4.0.8.ebuild
@@ -15,7 +15,7 @@
 	http://www.antlr3.org/download/antlr-${ANTLR3}-complete.jar"
 LICENSE="BSD"
 SLOT="4"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND=">=virtual/jre-1.6"
diff --git a/dev-java/treelayout/ChangeLog b/dev-java/treelayout/ChangeLog
index 638599a..98e1f91 100644
--- a/dev-java/treelayout/ChangeLog
+++ b/dev-java/treelayout/ChangeLog
@@ -29,3 +29,8 @@
   24 Jan 2016; Michał Górny <mgorny@gentoo.org> metadata.xml:
   Set appropriate maintainer types in metadata.xml (GLEP 67)
 
+  07 Oct 2016; James Le Cuirot <chewi@gentoo.org> treelayout-1.0.2.ebuild:
+  1.0.2 stable on amd64, ppc64, x86 (ALLARCHES)
+
+  Package-Manager: portage-2.3.1
+
diff --git a/dev-java/treelayout/Manifest b/dev-java/treelayout/Manifest
index 6bee9f3..5f00a7b 100644
--- a/dev-java/treelayout/Manifest
+++ b/dev-java/treelayout/Manifest
@@ -1,4 +1,4 @@
 DIST treelayout-1.0.2.tar.gz 1007086 SHA256 e5f8dbf13cc1103b7eb96d297b1f31bcbe18c685f2f3dbda0ea56cb27aa4dc16 SHA512 89a627d8ab2f248bb9b22139de0a28f310deb555f78825f29f4acfd0df7b4c212c8df241b004f8452a4be8a0f7717ee996df3eef4dd88ca905f4ad211df92655 WHIRLPOOL cadb16ed599fca669f5b584eb9bb75c9c7b3eb718927886c33e82240732c7a2c2d6d198f8dbbd4bc2552d75f1eaa298087b7b2fbc6b549db448e607631ab44d0
-EBUILD treelayout-1.0.2.ebuild 983 SHA256 2806ece8d7e33a039a175d71804c4c4795c5fdfb8381877ca0116cf1cd17d1bd SHA512 f8ad3a27fb251fb6708e2a321c30cd02358a443fdb3130785a117b12164276e819bd5908a0c65321a53417f295ebd7b3815db5e8f90b41a92f7608ee5a3b62a3 WHIRLPOOL c6d09b178e21ac9ee549956907c1eb36b33f75376ae8dde9e822e8c76ad6ddd6275e2fb9bade300716bec1c263fb6f418410715f9ea8062943d207ada450ef97
-MISC ChangeLog 998 SHA256 b385f849e5ed6cb292f396465b3e27c168ba43a61a66d2fdf1245a7a8eb76d10 SHA512 c63c3ae5228ae5406258005f4ec99c736bf9efaaad4bd282756b582fa120b295408002c9337575e24ca15ae2ba5a48e584f9c9d112c91171b9314fffff03e2f7 WHIRLPOOL c9bdc9ac6624189b39cbfc4c32a148040b346bcf78d0f109c7179db999062f7b5ea4264c8a1801dcd4578d6bc6567d3966f20dabd79affb724ef0ab942bd4236
+EBUILD treelayout-1.0.2.ebuild 980 SHA256 bbd24d7c233b8997ed3622d1e79a532240bf86f80b58d2695b34a08892fdff5e SHA512 025b8fcf96efa0f92f9b4b8e13322016bf89d7cbbb5895c3273a1ca3fd6efe28907ab768f585d261d2f1e475d05aba7692d95459d492c28829021ab78d300dfc WHIRLPOOL 58c01c09d1132a11b4baf427c42cd87cd2d57099e249eac92b1e7c7fcbb25827e0c0e55863b15d8a0298e18e1b1a894ffc6292a5106cfe6c62b047a933b93e3d
+MISC ChangeLog 1156 SHA256 5260d5524352bf9d7074266a83c0662fcc9b69064f120fa86255c1a98b66d6a1 SHA512 c97306235e53f285578c74bbc6c77c0ef810c29ec8fb555f1ac83123a9470b94ccf27880ca29ad0916b7785702f0529ad33fcc09627d2b23d0c5ecc344fde3aa WHIRLPOOL 03220392e7d281ee56eace17a38ef91c8e2d635f218552347f9fb51c1303b3f8d2acf2d8bcc505e8a2d84b392a6885d3958bb3983b5859f024cfd38cae3dd4c3
 MISC metadata.xml 677 SHA256 4929d42ebbc68d8f031b22ee02bd8ad47452dd6a12d85d593870b0dd9c30c958 SHA512 2abe1f3836f0efbfa2d52873e93d396b496e4bf52b7b0ac2b7c1641329a7756a04295a6600473160b863dc64866dbd2d69b8443599090dd36a77dee99fc9d42b WHIRLPOOL 01a9e75b545e9fe4b309fe0dfbab257933e5c545b9b09ae31636fd5e99852fecad7b3f508268d40aff4a15294d02d7e315e5db6117abd5f28cb2c98f51dd9249
diff --git a/dev-java/treelayout/treelayout-1.0.2.ebuild b/dev-java/treelayout/treelayout-1.0.2.ebuild
index 0c8abef..f3d938d 100644
--- a/dev-java/treelayout/treelayout-1.0.2.ebuild
+++ b/dev-java/treelayout/treelayout-1.0.2.ebuild
@@ -13,7 +13,7 @@
 HOMEPAGE="https://github.com/abego/treelayout"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ppc64 x86"
 IUSE="test"
 
 RDEPEND=">=virtual/jre-1.6"
diff --git a/dev-lang/crystal/ChangeLog b/dev-lang/crystal/ChangeLog
index ed2b8af..be9fa95 100644
--- a/dev-lang/crystal/ChangeLog
+++ b/dev-lang/crystal/ChangeLog
@@ -138,3 +138,10 @@
 
   Package-Manager: portage-2.3.1
 
+*crystal-0.19.4 (07 Oct 2016)
+
+  07 Oct 2016; Sergei Trofimovich <slyfox@gentoo.org> +crystal-0.19.4.ebuild:
+  bump up to 0.19.4
+
+  Package-Manager: portage-2.3.1
+
diff --git a/dev-lang/crystal/Manifest b/dev-lang/crystal/Manifest
index bb0166a..d0e04a1 100644
--- a/dev-lang/crystal/Manifest
+++ b/dev-lang/crystal/Manifest
@@ -10,11 +10,15 @@
 DIST crystal-0.19.3-1-linux-i686.tar.gz 17414435 SHA256 583796b46cf6cf569d9292c7b781818a046fea4ad59346d397ad728dc0fad06d SHA512 4dd18fa8d764db0b2d299f79138a866ff0969f06bcc4405f2dca426ff80bb5db607f71e3d9aff8871217ca9a5a4e383eb5eb4a30a8a04313dbe7032be4a70865 WHIRLPOOL a3de3acaf04c84c4502b0fe9616eb56b13d3e14a102042f51badb94a0e96ca92fa910b2f2aa7d9d2d4718c8b5b1f5a460e9302b47362252c65c7a944f045c3cb
 DIST crystal-0.19.3-1-linux-x86_64.tar.gz 16859014 SHA256 e4284e4796e543f90e8e7bef8fb94455c5d98d1e29ed8f5519d13f07a962d335 SHA512 57c411a4d905e2ba20090203f52505628fc51148cfbd520af0c572939c22ad93a43b2e417d6809e4cc36e18e652d9d745922e6049b6456158cc33bbfebbb7ee9 WHIRLPOOL dc9efd4467fe8ac375a82dff65d17b5dab1548d6503abff288272f093b97dac49f78567a4bb9f331e95f4f0c5c56dc68d55a2dc4e1f819dac453fb78ece36077
 DIST crystal-0.19.3.tar.gz 1419010 SHA256 72954087131bd648735bc397cfd585204087a4b8ab7f927f0a054741381ea01f SHA512 a2484e3fd5c8c2a76fee44ca3af9c680fd09946b4a060faf1694c776d73dca68fbfb70d130a3544f6b8d89f8b1ad68a6ce284297276b53a5d86491cb17d78d66 WHIRLPOOL 2fb742221dadf7d956ad6a6a85b00862f1289e3cd45a0a8b7733259ec22d4f4d9a816628138fb6d0afabf233846537f89ec1af69f01caf11bb51039201b7c2d4
+DIST crystal-0.19.4-1-linux-i686.tar.gz 17453760 SHA256 ed03a81e614384f578e22a30ade9bed0149502ef28b874770994dcdd065ec10c SHA512 523b6b76549cddec7f957401bed1fb7a2e843340be0246f3199570b994d169cf88163eb1e49ba9f7f67622e2e059ba53724a3124a8c16c6482550020e54572c7 WHIRLPOOL c733d0d82788ac8e750159e4a8134f3e8861901a74aaa06ab3e69db7b25a234b46845097039ae0c6e85fae91197ad0558ed2d6732acc0d89afe3b49da8a15696
+DIST crystal-0.19.4-1-linux-x86_64.tar.gz 16884655 SHA256 f1e06bd5762abfb6b079252fa7062438f595df4e7d21593ecda0e775e2220e02 SHA512 70e4c8b5a24d2c8075f1774f8ee8eeb87e0c1cfc22b3c7a54ea9cb8d38c71d0d6b6a11ade907ac7d4205b7a9872444e29baf022beaf7c2e6624ef7b6ada7f113 WHIRLPOOL 284248c7a7f9f4efa944c000490c09a8f4fc301aec164d8b89d86193f6ba5f90801a3981bda4030fa7e6958c1bbbb8d4ae0eecf2afacdeecfe03e777d03676b2
+DIST crystal-0.19.4.tar.gz 1431890 SHA256 e239afa449744e0381823531f6af66407ba1f4b78767bd67a9bb09d9fcc6b9e4 SHA512 44127cbe022dfb596bab25d0d617f41e013537584f52d31df891c716a6b23612fc7e28a7000a1d02378f7a7410745f22e703084070f7e2bc61d467192e924505 WHIRLPOOL d580196ea63fc86e6f98cb995fad6fc2406a0327423b981e14c0c407cba85d8891a8df9d74cd2b17b96ee29e7f8ca55d791ee4dc52dedcd637e4effa769c13e4
 EBUILD crystal-0.15.0.ebuild 1614 SHA256 8c9bfc06c0d4fd12539de3320fdcd33015d644f8b268eb62511122f615f80db9 SHA512 fc14b510891b676e63854c0ddbe8bc9e86523f8018a66827d94734d79dc94ffdd40cb0c73c089d8ee4fceae720cdd7e0f687603c6f19e0520d055bc92b88cf57 WHIRLPOOL d1aed35f3f13e4bb8995a507e86a998763ef80e0effccc73e615bc4ec765d9f3ad1054beae629b4e30bf6547ccdfa1fed6495bfe7d6a619c9d9051ed8759b9c7
 EBUILD crystal-0.18.7.ebuild 1624 SHA256 e60ac28b73aca8d23b1ce7192471d0eb7fe8257eb0a24ba3ad48f3164aaf5457 SHA512 cb16c2139285bf356b58922652d60bee3b835926c357b4a36396c745f573cd3d9f4e57d5a9b3a695cc30f68609b563b2fa9c1f35f7beef9a88c1fe0221fcb631 WHIRLPOOL 0ffc3f92378e8b17a66bb967a7f7d2b072af7f9a79c55715e6ccb0941295198e83607db55b13f3c242652bf2502cd83cef17b2747dcd0e4a1921a8a1cc2716e2
 EBUILD crystal-0.19.0.ebuild 1626 SHA256 1a42a267581ed05d6f5cace7bcd0f72b1761a6fb28e997999ac65e466cee3836 SHA512 6b1ea07441321f23a9678e1dcd67fdee5c944f053bd487c7e2ed378a639541b3b8751ee58bd72399c98d803cf0585383cc34b48be08a85a56fe06f7003c3964a WHIRLPOOL f861c8bc704140563e49c4dcf0d2ac1d57e2d96d7b2c85d7fb651b637bbafc68a6520400b44736536836116f31df386a6073eaa5f201a34d892c79f4480c798d
 EBUILD crystal-0.19.1.ebuild 1608 SHA256 dad407a3dbdcd4218afbc25304d369525c827e174c0b0f0b552d8efc226b0c65 SHA512 dbc6ef0ab0dad84a04360721689df33c678ca179a97a118afdef77b60c3b84338f06ee8d277129aef70f27e96688a409ef02cfddc04d7a46db19b6588ca3704a WHIRLPOOL d172baa38fa7293e41df65738ef613f234e376b985599c056b69393306963cf6d3031927c59926c3eb34516d3184c087be5e2355088a1b96a606b8ebb46ca8b1
 EBUILD crystal-0.19.2.ebuild 1608 SHA256 dad407a3dbdcd4218afbc25304d369525c827e174c0b0f0b552d8efc226b0c65 SHA512 dbc6ef0ab0dad84a04360721689df33c678ca179a97a118afdef77b60c3b84338f06ee8d277129aef70f27e96688a409ef02cfddc04d7a46db19b6588ca3704a WHIRLPOOL d172baa38fa7293e41df65738ef613f234e376b985599c056b69393306963cf6d3031927c59926c3eb34516d3184c087be5e2355088a1b96a606b8ebb46ca8b1
 EBUILD crystal-0.19.3.ebuild 1608 SHA256 d9692ccd91144c0f226ea9404a718507518dff85606eabc4f08261a7e57540db SHA512 3b6a6069e8a1176b41a747e0911e5d73affd7ccd0d920e79dca903b8e111df58b4ad78af8fed9536794ed0276cff32e9bf1db1e677778aceae8218a8161d65be WHIRLPOOL 43f9fddb1969229175815ccb53eb17a120b4974ff7978f12c83a0c677855b127a59ab0db52cc7099de4c2a8e6ddafbcbdc1c696db18362dae0117f21dd54ef13
-MISC ChangeLog 4039 SHA256 564aab407d5fce833997aca61cc19ca7ce4563aace7787a3a39d888469fe9fa0 SHA512 049ee35f8d4cc292517b1b8d04f3f9402807bfa9443c6a13737014d0c713bef04be45bd4b91a098daf6dd5fb649f40269090f381ae76019d925f23b7b8cbe20b WHIRLPOOL 103a7776af7ee8861070332693155c065c128236dda56765863df8db6401a9df6ece820dda91e4d4032a49f2025e01204d78260bdedc7072d4f3108b59dd9a6f
+EBUILD crystal-0.19.4.ebuild 1608 SHA256 c227c09a91eebdd6ba5198e8f812042c1bb45783ff15ef9453a2d22e16da124c SHA512 e303bf3281b8a1967f9a0ccdfd44cf33023fc8e2d45d1c2ee6704ee00da35ab69548d283034ca329514eda0c1bc356a6a7201ff518f58b083cd636e080c07155 WHIRLPOOL 1f8b7b9764b0b0e105dde663e42e68a31237b79161c5e75b7f494e9a291cd929a3f1dc2e399502a484797dd72d5b768570b3784508ed5f0f0f7b64ba7df3e6cc
+MISC ChangeLog 4203 SHA256 52521346abee23ef301ccdbd8ac2a2a4fab8bcddf64711510fedf88119febda3 SHA512 84f9e81df022f6fb45092d2e1cd25bd0f5e8c59b5a8b7267a9f83c962bba576d8fdb4f25de6533186d7faea6b11d38a0ac4fe749d8740b8be590814d84dcdc7c WHIRLPOOL 26060644c98f8ece047dcdfe0c551f3119a3f82fcc512d8157cbf408f99a5bfb1593f9d6bd5b680c6f7b442e7a3096f8cf9706842e2f79aa7c2952ab9bfad446
 MISC metadata.xml 1025 SHA256 26a6bad869e48c18a3a7fb9f606023fde66cbcb41705eeb60fd1d5f9fcbf26a2 SHA512 02fe2d028574024cdd64ea4f16634950d7438db39c0c0ec2d2a6f4081c6d6c146c3b1379805eb8349eabb94c7131b2de1639c122f70b17a2ad01f279f800c4ce WHIRLPOOL 29e0ced292aafc16be430e6343771182c63e2af6e8ad6ea2f4f0aafd1a922057ed7960ad8ca07935b4604004ef0fbbc063dc8c0bfc5b224993e722a6561e137b
diff --git a/dev-lang/crystal/crystal-0.19.4.ebuild b/dev-lang/crystal/crystal-0.19.4.ebuild
new file mode 100644
index 0000000..2523f2f
--- /dev/null
+++ b/dev-lang/crystal/crystal-0.19.4.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+BV=0.19.4-1
+BV_AMD64=${BV}-linux-x86_64
+BV_X86=${BV}-linux-i686
+
+DESCRIPTION="The Crystal Programming Language"
+HOMEPAGE="http://crystal-lang.org"
+SRC_URI="https://github.com/crystal-lang/crystal/archive/${PV}.tar.gz -> ${P}.tar.gz
+	amd64? ( https://github.com/crystal-lang/crystal/releases/download/${PV}/crystal-${BV_AMD64}.tar.gz )
+	x86? ( https://github.com/crystal-lang/crystal/releases/download/${PV}/crystal-${BV_X86}.tar.gz )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc examples +xml +yaml"
+
+# dev-libs/boehm-gc[static-libs] dependency problem,  check the issue: https://github.com/manastech/crystal/issues/1382
+DEPEND="
+	>=sys-devel/llvm-3.8.0
+	dev-libs/boehm-gc[static-libs,threads]
+	dev-libs/libatomic_ops
+	dev-libs/libevent
+	dev-libs/libpcre
+	sys-libs/libunwind
+	dev-libs/pcl
+	dev-libs/gmp:0
+"
+RDEPEND="${DEPEND}
+	xml? ( dev-libs/libxml2 )
+	yaml? ( dev-libs/libyaml )
+"
+
+src_compile() {
+	emake \
+		release=1 \
+		threads=4 \
+		PATH="${WORKDIR}"/${PN}-${BV}/bin:"${PATH}" \
+		CRYSTAL_PATH=src \
+		CRYSTAL_CONFIG_VERSION=${PV} \
+		CRYSTAL_CONFIG_PATH="libs:${EPREFIX}/usr/$(get_libdir)/crystal"
+	use doc && emake doc
+}
+
+src_test() {
+	emake spec \
+		CRYSTAL_PATH=src \
+		CRYSTAL_CONFIG_VERSION=${PV}
+}
+
+src_install() {
+	insinto /usr/$(get_libdir)/crystal
+	doins -r src/.
+	dobin .build/crystal
+
+	insinto /usr/share/zsh/site-functions
+	newins etc/completion.zsh _crystal
+
+	use examples && dodoc -r samples
+
+	if use doc ; then
+		docinto api
+		dodoc -r doc/.
+	fi
+}
diff --git a/dev-lang/maude/Manifest b/dev-lang/maude/Manifest
index 0e10558..6bc2456 100644
--- a/dev-lang/maude/Manifest
+++ b/dev-lang/maude/Manifest
@@ -6,7 +6,7 @@
 DIST Maude-2.7.tar.gz 1663708 SHA256 f5da81556c3180aee6a9cf4cef2f0b9bb2ff3b7fcc7bb103cb4ac3f5770b2b89 SHA512 eb5225a7ec75df5f79d1e9c0d78c33427c0cf07bea83dae9e559d6d4cfc85fb03985596daf0c9c8794b34859510482f93b855254c1a3c650ee7520a3530a2070 WHIRLPOOL 252b51f303e7d5d22226bbfa96e8a62bd94bccc92403f40fce990ce6d0e3e57305b9f823ef3cf5f43f4386a4ce326032c7c17e47a0a4ad8bf86538e2e1435fa3
 DIST maude-2.6-extras.tar.xz 3157004 SHA256 64cd72026c345ff1c1edeca64f9a9fce8067e6df5eccdaeee4bfe7a0f07d3102 SHA512 0533f0f226057d2668052f360245f296d36129ec242ff0bfa91fada9db5bc347d276d3468c86fbac92f019f3a2f152c7cb4e58a7f1265c1fb5a8b1b496fac5cd WHIRLPOOL 7a5ea0bf49132ecb3b88f26432c8aedb7ce2f9632f4e9cbb5fa08ab36b65c9a165d58e4a880e8ea97eff91280e28fb01e224a61539b73b898f3e9b4cba34ce44
 EBUILD maude-2.6-r1.ebuild 1486 SHA256 6abbc1bef3557c2113ef0e1dbac545c1651ccb8bfc5ac262befb8e1f73c2beff SHA512 74875b80faf8f395d75983b6d9609b29f4f110b9a82cca02f7ee08334740637aa43a111c86f89129aae57a54db066769c7de66fb7d4ad9dc392d7be2d64c4cc9 WHIRLPOOL 2698cdc002c62f074966c0c56eed92cea50d62213431e6269a180d3314c959e586ef81975101f27ea5ee4dade7608ee4e70af24519494de802c6d487dd55606b
-EBUILD maude-2.7.ebuild 1357 SHA256 82fe26490f3cb580a148c992cf0a7d195120e2d54b84bf0c733d4a5cd6667fa6 SHA512 77d1dd37b7c49e25a9df16368a776737d94d88e98d0e977296fc07ff7dbe2a6eb65c7a4ab8d3f34326e3c1d5671a6a0bffe7ccd79c7ea548e8ad1a395ee3b4a0 WHIRLPOOL 40fe27522840175f85abf678ee25a52e2b82a73af23c213f51695ea87117eae8ee9cf24f08145484e769fe1b5084fe6b2992a2932629787a5f43d41f4e139626
+EBUILD maude-2.7.ebuild 1324 SHA256 b1c5ea0879887394b2ad874f5191dd304a63a646fba7b56d6d2f94b0bc46f036 SHA512 7b3eb653426845311aac5953b4b9de69e1148443c29ba869e9024319250f137e21af8a2dde05fa4cdc21e8ed8046a3ca92392f80bfb0365d4f6965b5f01e4fcc WHIRLPOOL cec0eff882a7adfd3118deb92477ab8fec75d74ce2ae1278cf86779f4c7091c3709a6096ac567c9950cf13693d22f56ce7f90b3baf2b3b0955051499229390cc
 MISC ChangeLog 2854 SHA256 6698f76d51261429cbb6bdfdcc1d7933e3df94dbe1e199ab505bf50d111f26a5 SHA512 32ede34519158ff1fab8b4b34b3e97fe7fb00d7e5f84caf4156e66dd8ee41a052fee63e3d99ae70463a33d2e21a5b8e49d92dc8ca1abd0ad81ed34d904bf8e7e WHIRLPOOL 357ab97ad5b5331f937a87813eee08608bb62541c54e2008fc0d2f93b4e369f97b06c36194b743cab020e9900d0580b30283dd974fc35bbe1c61868cdb3dabec
 MISC ChangeLog-2015 3206 SHA256 c99fb6f34d4d742f8f26b7d9154a3a233294d51d8c08af12c2278896b634d6ec SHA512 5af419ac889aef43b1c764ffbbc3d26d177cded2db0bf5de321fabcb935fcac195368380fb01c31b3a55dd7d97d77943b9097b0fa07822072d8e8838d24877b8 WHIRLPOOL ab63ecd18463f81cc88dae7713a1fd530c5171abc2c246c1fea1a599e70501e2c9c889ce395d90b2485e75cc6bd0893dfda110c41c240727153b8576ef02cb33
 MISC metadata.xml 702 SHA256 d2d1d8e28d9d14b09ab494926362be4008993cf030be00540daa8e6afebae161 SHA512 51984557a4f5a933e4fa14a49466574846310c0e4439ecc5b2b8ac4b61c8809dd3d01327807662c587eb7af9332f4fd3994d60364de1c70e07d63d01d97daa3c WHIRLPOOL 2f938a5d5d1f8ccba915293e5bb4a46d7efc1e1a359ed984239d4b7414393ff78cd159dceab93d825169888441c654b2e40268cd908b4f0388713a887f2e1c5c
diff --git a/dev-lang/maude/maude-2.7.ebuild b/dev-lang/maude/maude-2.7.ebuild
index b48d92e..e7a0f1f 100644
--- a/dev-lang/maude/maude-2.7.ebuild
+++ b/dev-lang/maude/maude-2.7.ebuild
@@ -4,14 +4,12 @@
 
 EAPI=6
 
-inherit autotools versionator
-
-MYP="${PN/m/M}-$(get_version_component_range 1-2)"
+inherit autotools
 
 DESCRIPTION="High-level specification language for equational and logic programming"
 HOMEPAGE="http://maude.cs.uiuc.edu/"
 SRC_URI="
-	http://maude.cs.illinois.edu/w/images/2/2d/${MYP}.tar.gz
+	http://maude.cs.illinois.edu/w/images/2/2d/${P^}.tar.gz
 	https://dev.gentoo.org/~jlec/distfiles/${PN}-2.6-extras.tar.xz"
 
 LICENSE="GPL-2"
@@ -20,7 +18,7 @@
 IUSE="doc examples"
 
 RDEPEND="
-	dev-libs/gmp:0=
+	dev-libs/gmp:0=[cxx]
 	dev-libs/libsigsegv
 	dev-libs/libtecla
 	sci-libs/buddy"
@@ -28,7 +26,7 @@
 	sys-devel/bison
 	sys-devel/flex"
 
-S="${WORKDIR}/${MYP}"
+S="${WORKDIR}/${P^}"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-2.5.0-prll.patch"
@@ -51,9 +49,10 @@
 	doins "${WORKDIR}"/${PN}-2.6-extras/full-maude.maude
 
 	# install docs and examples
-	use doc && dodoc "${WORKDIR}"/${PN}-2.6-extras/pdfs/*
+	use doc && dodoc -r "${WORKDIR}"/${PN}-2.6-extras/pdfs/.
 	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r "${WORKDIR}"/${PN}-2.6-extras/{manual,primer}-examples
+		docinto examples
+		dodoc -r "${WORKDIR}"/${PN}-2.6-extras/{manual,primer}-examples
+		docompress -x /usr/share/doc/${PF}/examples
 	fi
 }
diff --git a/dev-lang/mono/ChangeLog b/dev-lang/mono/ChangeLog
index b8c2f29..45f35ba 100644
--- a/dev-lang/mono/ChangeLog
+++ b/dev-lang/mono/ChangeLog
@@ -284,3 +284,11 @@
   RepoMan-Options: --include-arches="ppc"
   Signed-off-by: Agostino Sarubbo <ago@gentoo.org>
 
+*mono-4.6.1.3 (07 Oct 2016)
+
+  07 Oct 2016; Mikhail Pukhlikov <cynede@gentoo.org> -mono-4.6.0.245.ebuild,
+  +mono-4.6.1.3.ebuild:
+  bump
+
+  Package-Manager: portage-2.3.1
+
diff --git a/dev-lang/mono/Manifest b/dev-lang/mono/Manifest
index 7a3b06c..1b77074 100644
--- a/dev-lang/mono/Manifest
+++ b/dev-lang/mono/Manifest
@@ -27,13 +27,13 @@
 DIST mono-4.0.5.1.tar.bz2 96533206 SHA256 c2f42944dded3196c6449f90e79990f1951070a361a0dcc2350fc56e945bc229 SHA512 c0783f7b2e344ca00ea354d2723821636a2594345f7e1fd93bf84e9ba1b5501848d4f49b1538279aac9f6f333d296394322e08a9749fe2208340104aa594cd09 WHIRLPOOL ae9b0758c019003fc9ecdbd051974d547c59c24a4505e71c1fc7db8095bc98cdb486405e2ba1794bfb34ecc6bebeb8b5165a97ba8f596897887eb7f2da806b89
 DIST mono-4.4.0.148.tar.bz2 84897767 SHA256 38ad527608c26b2637472602d91d6af203dc4202be915e583fdc9e3a9252a5f3 SHA512 c1e0a7d589cc181fcfe36006879362ad0f5fca0d903fef723f7c4ed68dbd1eb2a7526b2e44c23f2b4c7b1cbcadeae6c7b004aab0643f09dc32640776892c3a22 WHIRLPOOL 9ada86d6026c0a139929a41b11e8849b7545f44be93ffa9c316a2877927d1883419bfb7f3aeb3b1dc593d6f9c0fe6e154e7e30285e70d25c75990c31ec704c85
 DIST mono-4.4.1.0.tar.bz2 85897587 SHA256 165e7686b5cbb1ab671b4cb2069207999c3d70044002190b6ec84bb1fdf62b4a SHA512 d9b6c57c2d9327ea551083b81a2e6cc222ded9a04862056b0dfded1c5df56efbfc4960097df034595012231fe50d172174ab7b3e3f2d8c4c6953ab2106b1cb6a WHIRLPOOL 99f16622c6d1902a7efff41d55d114ed214979c1d902a5dcbc257c180a1e68ed519beb5383db2358096e3f8425483983565c8f438552de36ffabe4bfad3f5fbd
-DIST mono-4.6.0.245.tar.bz2 83214380 SHA256 2981f518cace63bfe10953fecd57c7fef040077a1ac617967dde5466062c1327 SHA512 e454d83496d0e9dbfbbd79a48cab081cf9a32e9162369894f28de76cebd248b9c88da0346b7b91fd218239810199299187b6d6017d672e9dd491effc14273f15 WHIRLPOOL ad292d23b2655bbc5bc5cf9aa99ce8ea23bfa36791a79938dca98e97e95131af925ab520b9f787e80010d40d7fb7290d5eb2ed613cb6e678e3dd4d3126d2bd7b
+DIST mono-4.6.1.3.tar.bz2 83229465 SHA256 a5d4cec3d4676fcd7bcbc59b5ab12dc9a2481abbd10017a2ed737098a6b2e891 SHA512 b059fb00adbddf676d137c53a22cabdb86cedb829a25c1ed2d5b78bbd4bc38a0d3ec2cbc56cec91578e2e74478770cac147ac2b740531751585d6ed0bbc50e3b WHIRLPOOL ed080322b83549679c9b6fe8bac501df7390690508c32b97be47c1b0e3e020ba117aaad08250255409b0266b7270860acdf969d2342add1a918b38a635da1046
 EBUILD mono-2.10.9-r2.ebuild 7379 SHA256 6acfe25ba75bc4296acf77e1d3300fd523c07ce8a3d703b9e6a190a35d9ff9a4 SHA512 135a733053b434ab76693ed33d2a8c654b63d824ede527a74da5d485d66b7a9542304af967a0b6fd9ce21000178e4bc0c7c62a27e76bbb7395c6f1d6d68f4669 WHIRLPOOL 03d8b236d995365e7560ae90a1daf208159c3955d558ba237b5e088c921777bf233baea2c6ae6e8e65b5bfe9ac8380fa14163b343e803d59cec000e93e9450b6
 EBUILD mono-3.12.1.ebuild 3800 SHA256 6ae54b4b17b3a7104a352275dc3264be9891c6bb8b18ebd069360b33e341fdff SHA512 affd93f3220a729b6bb695b62b87abf89777b514b749610ea45d9bd582958d118018109fef8ef006695cb0f17c430159d83edff70c5e20824f88d22a16e2ad62 WHIRLPOOL 0bda0603dc34f3e4f75caedf1980abc2803b1195f1e9ae7557597b4bedfabd3c568a225f52a87a2494d9de2800b21f1f5310ac9daeff6e0d9ebc6a5b6c874746
 EBUILD mono-4.0.5.1.ebuild 3358 SHA256 4c59e2bc0b0284b11196c676b4d2e9e9d18ca96ad89263ee33cd6e75e74c60ba SHA512 7fb47467ae0ea7308daa8fe33f4e765c85af43203d33808be2e23098cc7a2d0dc283842fbbde058160418c7ff98c75280712777ee304454635e0cd502496988e WHIRLPOOL e58351becbefbf18d390809ec48f6cb292360bc0ed49e401392b723171c936963c15cbdd917e62619dd8a830059f6b916bee1f819e307b54522dd08eab5708d3
 EBUILD mono-4.4.0.148.ebuild 3448 SHA256 9315f7d85341e03aa93972ccdc13b8767d25096f2a4980af700af13614d9264c SHA512 da821620c0b333d743623ca93187bc8229e92298f5601b5b4e51e0a1e89ac35fcd5e94159ed5fd0e23dde0e143596fa23780c40f7472fbc9148aa216e570eae3 WHIRLPOOL 6d901228e6630c99014ff5d74eced5a41377f2e7883eb4b3bb2f47d29c387b143000efc2131fdbc877293cd83750fdf22cf8958749525bba6207b4acaabad7f6
 EBUILD mono-4.4.1.0.ebuild 3370 SHA256 be2bc5ede2c71d3c394db0b86fa592956835bd4a2cf1be5aea66603215919629 SHA512 c88d061396f8a793a4bf71da51c005f9654d6bdee5715139c8784379a60557741518e1adc3068a7b909c20de993b3188590502301cf3eb3766615c97cc38faeb WHIRLPOOL 6c6abccc68607e20875bd9d4c3676ca0deb06a37cc532bffb9e7fe74e190c8c2f3c6edc0cbd1caaf5771c8beda2b667012d373026976d8f070c330a830ef8ffb
-EBUILD mono-4.6.0.245.ebuild 3373 SHA256 467acc4c81e015745094bdff93b0d16160b01ae99cda63ab2166bf2724f548ce SHA512 0b2149752dfa585705144ec82ec895f47a66302c948af669c01563cd0696f813fa90fd0fcbdeb38a78314a3a8ce1a56298ef1b2573371c87720e650ee3754ec5 WHIRLPOOL 07c54eefc2056537489cc89f42a09339d656b33d3dd295eb74dc145a3ba24009270851e91d724ad4b67401999511f049b3dea9e17f0cb6c519b5fb0bb559334b
-MISC ChangeLog 9241 SHA256 61831033c57df4ae1178dc33b2b3d1ebd5da432a815758b38b77a286b6b812a1 SHA512 e811c09963b7e4f362943f43d4a8e8a499016ce9b8cc0c5984f03667ad3da3308219418266d7b3449b5d4f27483d129751574be57868ca5a0e2f36e6827c4a4e WHIRLPOOL cc5da88cc1996e4ca197dbddf32d1982eb6b0c0427a6b828f1df1f423dd7b6bbd5a263ea132915df3f8b446acd1738b4a6aa2ca832468b02046abea147a2d89e
+EBUILD mono-4.6.1.3.ebuild 3373 SHA256 467acc4c81e015745094bdff93b0d16160b01ae99cda63ab2166bf2724f548ce SHA512 0b2149752dfa585705144ec82ec895f47a66302c948af669c01563cd0696f813fa90fd0fcbdeb38a78314a3a8ce1a56298ef1b2573371c87720e650ee3754ec5 WHIRLPOOL 07c54eefc2056537489cc89f42a09339d656b33d3dd295eb74dc145a3ba24009270851e91d724ad4b67401999511f049b3dea9e17f0cb6c519b5fb0bb559334b
+MISC ChangeLog 9413 SHA256 fe5e9117a50b8599c3ee38861bf49cf3f4f6839ba9727ccdd3670b5a21771b61 SHA512 2c1d1babc65e9a9ca129ae19c89fb444b74342dc4575ab82bd54f54b70ae61b92395b09560499b48adbbb104832fbd23cf51944b1d844a3be6ca6c474f7352e8 WHIRLPOOL 89b09d77dd0ea573bc85a4b9dda943b951fcda1c8fa313141e28170026c2246ae922f3a782f849ee8cf35d44ac83521f1406de744d41cc9659b6405d96eceda8
 MISC ChangeLog-2015 52096 SHA256 ccf206c864bd20b2496ea7701715d5339aba1ece26e3ab626e5eae7627c65403 SHA512 4523f645c1fdfc5646060436500eabfa16b5c708fd5c997621a3256683fe51c12b8d3851c3d93e6456f3d52e0a91e9d3a3ad6b6e983325f411faeece133a829a WHIRLPOOL 20049953e12cad3024ac5915dcfbd6f656600b920d60349e8d0c921ef0fdcd845ed39925748c50df89f0073f057b7a3b1117fe405ffa0dc815e174032f690f7d
 MISC metadata.xml 507 SHA256 9d113683d7a883d50166e0d28df4d26bd3bdd78097c1ec76329187d15321b0a1 SHA512 e072a1abbf66276b0d139c3e918593010312c2059a0c6feba7b324689cdf90efe28bef0286ad9888125acfdd1fed2dee3e05e79a0aeb7f9ec1809bd128cf8a20 WHIRLPOOL fa321f42a4471c645450e57b0464e4bf8968ebfe91346cac703098e8f5eb62f51d7abb4c346acf5816cf96b5b03b5dc72914e113dbd801c86276600cc3931130
diff --git a/dev-lang/mono/mono-4.6.0.245.ebuild b/dev-lang/mono/mono-4.6.1.3.ebuild
similarity index 100%
rename from dev-lang/mono/mono-4.6.0.245.ebuild
rename to dev-lang/mono/mono-4.6.1.3.ebuild
diff --git a/dev-lang/tuprolog/ChangeLog b/dev-lang/tuprolog/ChangeLog
index 5d35470..f74bfc5 100644
--- a/dev-lang/tuprolog/ChangeLog
+++ b/dev-lang/tuprolog/ChangeLog
@@ -117,3 +117,8 @@
 
   Package-Manager: portage-2.2.26
 
+  07 Oct 2016; Keri Harris <keri@gentoo.org> tuprolog-2.9.2.ebuild:
+  2.9.2 stable on amd64. #596454
+
+  Package-Manager: portage-2.3.0
+
diff --git a/dev-lang/tuprolog/Manifest b/dev-lang/tuprolog/Manifest
index 4d307dc..6641812 100644
--- a/dev-lang/tuprolog/Manifest
+++ b/dev-lang/tuprolog/Manifest
@@ -13,7 +13,7 @@
 EBUILD tuprolog-2.4.0_rc5.ebuild 1109 SHA256 05845b0c6060332c655fa31351f3e67284f8b6c7c9666c0f1555d27338dcb3fb SHA512 15e09c5d926b5e49e004b6451057f4ca16b2162f8a7de64dac0aaf592844fb8e60a35f69e1e9edf3eedd0fc18f68942225b8caa9eeef964850bf8d2288ab5f60 WHIRLPOOL 9e7cec1b518b198321c769576145a17c94c72226c348f36b59ebdecce61f2af237d4bce2455ecb763a7f399b045dea94a06495c8a6c621c71656fe065cd45920
 EBUILD tuprolog-2.7.2.ebuild 1171 SHA256 e9db00fa1a2b0a520be129f62267055bb1e6be6f8cb89c7436a859cc36f0f660 SHA512 50dc28df5745370328578730478bb000a9b6c62c465ee6d5d154aabd4c19d3d9b5da3cccfe2583e8d30bb5f2bc9f53696d7e7dbff6ed1b25ccbf08a587e2aa57 WHIRLPOOL 363cc83993a93276e75773a540f75aa50a6c1951701caea4602bde558b983a0de3715d6da1a68632cb554fe0fae00f63bd5c5138062c15841796e4ee7ee27694
 EBUILD tuprolog-2.9.0.ebuild 1157 SHA256 31ef62186928eeb0f3928714a00f1c45690fab04a434fa3955bb16a99542dfe0 SHA512 22405d183bec63b97cc845509067f8e1f94f2cf6bd6fc0510bdc0b04ab87daba2a157d88121b5c5f60dadaeb507c6f5248e5fd9b1f9932b1072cc3ee5a4f086b WHIRLPOOL 9ecdbd6923c6b15af388d192c5d4fa25fee832bbfb326849c6bd5b7dfd3bb749194845608c22b6b6b0e7a30e339c78db1d98f4e5ab1032cede6a0459422d8bf0
-EBUILD tuprolog-2.9.2.ebuild 1363 SHA256 77619d25ac9f060475a5f7d1b10efb43a49d1e699c897899b9102449bb1a5267 SHA512 dce1e8f9f1c2ea101ccb740cf4146582fdf2edafd8846c574744e2fc8c274b2b9e606cb272aeaf36481d2d9af1133da58426d949049601fcd8146573547615c2 WHIRLPOOL d78a376f4c567674753a5828278d39becdba3807ddac3fabba15df5dd4fcae27e63114bc57817ebf103862a43e788741feaa2560889456b165962c6ee7d8aa70
-MISC ChangeLog 4497 SHA256 494c38cd864053a52527ace9de39f8e99650b58d5517b6aaee7157180129fb49 SHA512 53b2f9c7d7410f6a2761206be067b866cbbec53f55a8b1316fec9fcd18ecfd2f64f0df8553d42ba442720b84ec4d3b53aada3dd12ca95992abcb2a53b2f242fc WHIRLPOOL c5dc933f6afb74f16415ec94d3980fe8e8137d32d8ebd31ea3d2e8df6cc8525e512d63a437191eda7c717b7d9a10934ce66478154cb97db2d0ef4fee262e25fb
+EBUILD tuprolog-2.9.2.ebuild 1362 SHA256 a630cb8cd016c3fb53a19de8f44eb21b187210f3e23eb354c8d04a43824da834 SHA512 d81c621561d4a20d80727a2c5643a238b3cd87ddaae3f5b74882e76181376a5ee75f07e77571df76a8113c2767c6f2148c9b3d0d10ea0c41f4aec24fbfeb794d WHIRLPOOL 63ead136448c61ddd571866751792ab80efad317e78481dacc2b1e2c0ea1f33f81bce131d16fb0081d4970b6249a64c065a1ce2fc01ac92a9bff962375abcf45
+MISC ChangeLog 4633 SHA256 5314cc57930b5958ad5e4e9a6572ec072c2948e3e61ecc71bc017a813159d671 SHA512 4a2e4b784ad49fa83934fe7e778f09603b4a60cce6c9673d2ba2ff874e0c8b48dce829da42cd96d0e3555015ada0cfd08af1c8feb3b973ee06a38f54e91eca69 WHIRLPOOL 856c887763eb19dc3cd3ebf4e7394683f350a5d1f5e4b94ab33b3b53fe8380afb3b1d250ee14bc36247b237ac3120c6abb66c671039627c58c0db05af3e4c725
 MISC ChangeLog-2015 7704 SHA256 ac099edb4c980cb81ab895e1f6715d48cbf525d93705b6fa3b5848bd82882306 SHA512 0bb646521b12040d795ad30f7b74bbc6e38cd7c1e495965fef5ddd951b21351255feb1d3b3adfe87b271e69d92a26e9e7b360ccd4b389bb3cc331f1c12678d5c WHIRLPOOL 2b8cff10deba01bb1ed05ed9d428733e143834e234821a97beb2c64d61006749cc138a80890bbfcba3cb799882a69832eebb318b53c3760abf15f2f57f847672
 MISC metadata.xml 318 SHA256 97061d967a3562a713a4e95455e8e272026dea67d98fdf17a9d7ed34bce40611 SHA512 6a43476b9ed9a343488c8a80908e8b4fcb96c75d9a3e6b6c05c22d8ffb87f5c8df8a3cfd2db5297f60236d6740ab0770e68e1acb4c457398a280df9dc4c266a9 WHIRLPOOL fc6d9a13b5fea0ee6f4ee379521680bddeda3f48ba0a0db488a23e4c60a2e514f64607d1e041993111c90f0bc478d1e321f29b116b6fdcb2760e54ad16dc3b9d
diff --git a/dev-lang/tuprolog/tuprolog-2.9.2.ebuild b/dev-lang/tuprolog/tuprolog-2.9.2.ebuild
index 10ce06a..0021725 100644
--- a/dev-lang/tuprolog/tuprolog-2.9.2.ebuild
+++ b/dev-lang/tuprolog/tuprolog-2.9.2.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="doc examples test"
 
 RDEPEND=">=virtual/jdk-1.7:=
diff --git a/dev-libs/beignet/ChangeLog b/dev-libs/beignet/ChangeLog
index 49f349b..eff9058 100644
--- a/dev-libs/beignet/ChangeLog
+++ b/dev-libs/beignet/ChangeLog
@@ -69,3 +69,14 @@
 
   Package-Manager: portage-2.3.1
 
+  07 Oct 2016; Marek Szuba <marecki@gentoo.org> beignet-1.1.2.ebuild,
+  beignet-1.2.0.ebuild:
+  require <x11-libs/libdrm-2.4.71
+
+  Beignet releases presently do not compile against newer libdrm versions, see
+  the upstream bug https://bugs.freedesktop.org/show_bug.cgi?id=98090 .
+
+  Gentoo-Bug: 596266
+
+  Package-Manager: portage-2.3.1
+
diff --git a/dev-libs/beignet/Manifest b/dev-libs/beignet/Manifest
index 4b8ff4c..48e1c14 100644
--- a/dev-libs/beignet/Manifest
+++ b/dev-libs/beignet/Manifest
@@ -5,7 +5,7 @@
 AUX no-hardcoded-cflags.patch 725 SHA256 21ad273629b9aad2ab0ea3cb0e5b8397e891381f72f4419d2d96a7c2d336191d SHA512 288e7eb859cca31300cb63b73253b1f9df745b8445def812fbbca6b7cf96a9db3d5ee882deabfd0be0bcc3b1332f04edf564ca6a8ff2a2905ed8f7f2fc849fe9 WHIRLPOOL a912687246d9b96456db7ec2925ed1a9501622380df6f5178e580a1ed4e2ac55faa0017f4fa61881c3934863fca70902fa896fe9c4ce50603ab8241a177836b4
 DIST beignet-1.1.2-source.tar.gz 948241 SHA256 6a8d875afbb5e3c4fc57da1ea80f79abadd9136bfd87ab1f83c02784659f1d96 SHA512 25b7118976c385ad3b9db01afd3c9494ff9d050d44ee4266042abb4215747d8bb5086c06697f754956f562ea2b6e5ec51d51bbd651e8cd7cd0eb14eb8c83fbd4 WHIRLPOOL c3bfb7f4fa3c97bbd202ace868a08dce48753cac547b075e4c30cfff21cffcc5520ef4ef77b4e15fa8574a798f41a920e44503a160a1888e9ee4f2a737b37e82
 DIST beignet-1.2.0-source.tar.gz 1076674 SHA256 fc7af19efb7596b04510d26c558a576eba3e95e1ef86fd6951213c6a4bf58bff SHA512 f6c0de7d6a301352125d53c843d8c4a9728526b06b215093424720e7c17eb99f8cfc4b70c61e035d5cb36ca7666c6e772fe0d7818d91421104fa1ed350d637f1 WHIRLPOOL 9ac0195b16ff0ed186dbc5e0bfb6ee3027d0426d7e2401238b69b934a010d365eb6941cd80e3650e600cbcac8d31f819e2adb67452394b07a903aad72c1e11d7
-EBUILD beignet-1.1.2.ebuild 2226 SHA256 e3efb80e54309cc3a1131e8c79bf06b2726849fc2726186e2dc177bdab781c54 SHA512 cdf9fe33efe322ec089e2a01f446474925419a775985f4d1c1faf2217bb3e9ff1bd9e9d866421421612c34f186417cf41bb790fddf9ee971d78ad6e4604e5d97 WHIRLPOOL 7888990899c2a3b2c27520596a3a30690e83d535e00bb68373bb8db3900ee74c2a11e9b7bbd5e783c3b19f69743c24251f48c4f2a9431cf636fffc9494cd89a5
-EBUILD beignet-1.2.0.ebuild 2256 SHA256 9e8d6e3b93d41522639bf595228322d1edc4ab1c73ff247a2b431fb14ccd8f67 SHA512 3bff4c5b3e6a2848f88aa6dc528ba05f935b7754be52b25d767ffe0a6ec0f383fdd9a1802d83c0ef9eb1ca280937ccf0a8804196cd54ec6eef23d1cf7cc79df4 WHIRLPOOL fb5ae8f6e2bb560bb5d6a30c44b5ee6dc406a8be3d38cf4f862594767352eeb8f73b66d65b61a9f4d9708a5e171b5ce7f40da10cdd204a564d764383ef9d0160
-MISC ChangeLog 2127 SHA256 4ffbf66b48cc291707e28781931bc0214bc9714620d8b9b58b502c29a462744a SHA512 60189420d9eae6070348e9bc700a2c28c602246f6762aafcaa5dc5abaf299b4e64cf4208f4276c09a231ae6a752b57f8bb78e963eb37b88b8743fab9808d2794 WHIRLPOOL f0972a8e1a41b4237d5fcee73d7473df8fe927761fa27d233c129eda187eaaf9f93ee5221d0d26b5aa600d77ff497bf58bcab49d7f4f6b6a74146f56e5905d97
+EBUILD beignet-1.1.2.ebuild 2234 SHA256 6e30bee1df742ece0ac562cf68853564f23927890368babe3b46d47fea3c3b4c SHA512 c4a5bb50068798534fbaa271f5a4c60a92fcc61b493471e3214cf59d694d69b6584f18b0f89e0ca12c0f62023c90ffd5f053159c45ff0a06eee20d79ffea75b7 WHIRLPOOL 4b344efb7d516448078c3a26aa1ad9ba3730b9a8695faafd0322cb4fc6f8c4b86d5df78eafbb2ed4eb027d1debb7716610d2a6614988bd9d6f108b6a7202f6d5
+EBUILD beignet-1.2.0.ebuild 2264 SHA256 592ca89090a6016a7c587179362e5a3ecfe45ac4bd2c28a4e4e77ecf0cf28341 SHA512 0c2db53adcb0b295a1fc3be1553ccdfc12a060a0f6ad8bbc1cece072b50901b991609dabcccb2de441e4375ef148740d0e1b63058621fb32a4d383cbc6829593 WHIRLPOOL 2664511f9500804e146194917495b231154cf912c25b79e9ff29d8cd4024dd442a1bf0c9da8f658eb1726b034df619de1ea0cb8ba31099958d37cbe1fd2f8f57
+MISC ChangeLog 2464 SHA256 4a97e7a110f5fe0b24e3e7f88d9ad0f2778ac2d167c69a0c25b4aca2ce2e1e83 SHA512 47c84853d7dba7ca0174db8fe5c3dda5eb26104879440f69fb0a4f3dac4af6d6ea30be94587d77928913c200163dbce0a644f8b2bd4e95419fcf8899d4a6df14 WHIRLPOOL 84765bc833e53467e7511ad6eccba8c9031f7f149307b6b4b34b090167ad279f1790866f4d16a40e1e757ff8fca52340c3c3c0ea4975cdee479e7a1024109b25
 MISC metadata.xml 245 SHA256 1cbbdb363f68b45429ec1f8c22f5c47251f2376210c285a59e0cf6f905131563 SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a WHIRLPOOL 1c76cb23b2bece7265391203746461cfef14ac3966ecb8c411739ba4f7214bd6952deeb910c04f9f3bf6c60f9847ca006654100a6f76e06a90fa2da2f5a68048
diff --git a/dev-libs/beignet/beignet-1.1.2.ebuild b/dev-libs/beignet/beignet-1.1.2.ebuild
index 2ec9a1f..6a46dba 100644
--- a/dev-libs/beignet/beignet-1.1.2.ebuild
+++ b/dev-libs/beignet/beignet-1.1.2.ebuild
@@ -30,7 +30,7 @@
 	sys-devel/clang
 	>=sys-devel/llvm-3.5
 	<sys-devel/llvm-3.8
-	x11-libs/libdrm[video_cards_intel]
+	<x11-libs/libdrm-2.4.71[video_cards_intel]
 	x11-libs/libXext
 	x11-libs/libXfixes"
 RDEPEND="${COMMON}
diff --git a/dev-libs/beignet/beignet-1.2.0.ebuild b/dev-libs/beignet/beignet-1.2.0.ebuild
index ac2bb7d..929b794 100644
--- a/dev-libs/beignet/beignet-1.2.0.ebuild
+++ b/dev-libs/beignet/beignet-1.2.0.ebuild
@@ -30,7 +30,7 @@
 	sys-devel/clang
 	>=sys-devel/llvm-3.5
 	<sys-devel/llvm-3.9
-	x11-libs/libdrm[video_cards_intel]
+	<x11-libs/libdrm-2.4.71[video_cards_intel]
 	x11-libs/libXext
 	x11-libs/libXfixes"
 RDEPEND="${COMMON}
diff --git a/dev-ml/js_of_ocaml/ChangeLog b/dev-ml/js_of_ocaml/ChangeLog
index 8b56066..6da18cc 100644
--- a/dev-ml/js_of_ocaml/ChangeLog
+++ b/dev-ml/js_of_ocaml/ChangeLog
@@ -179,3 +179,16 @@
 
   Package-Manager: portage-2.3.0
 
+  07 Oct 2016; Alexis Ballier <aballier@gentoo.org> -js_of_ocaml-2.8.1.ebuild:
+  remove  old
+
+  Package-Manager: portage-2.3.1
+
+*js_of_ocaml-2.8.2-r1 (07 Oct 2016)
+
+  07 Oct 2016; Alexis Ballier <aballier@gentoo.org> -js_of_ocaml-2.8.2.ebuild,
+  +js_of_ocaml-2.8.2-r1.ebuild, js_of_ocaml-9999.ebuild:
+  move ocamlbuild to rdepend and add := dep on it
+
+  Package-Manager: portage-2.3.1
+
diff --git a/dev-ml/js_of_ocaml/Manifest b/dev-ml/js_of_ocaml/Manifest
index 5a3ab67..352dcc5 100644
--- a/dev-ml/js_of_ocaml/Manifest
+++ b/dev-ml/js_of_ocaml/Manifest
@@ -1,8 +1,6 @@
-DIST js_of_ocaml-2.8.1.tar.gz 1329825 SHA256 954ed80b3f37e10666e36ffa3c1d846e1913b8c7be9f0af79889f829b1333e1e SHA512 bce4b173c29396ce7f28f12afd3185cdf402150a7390b9f5a21f14f71e72b3e5ae16234ed65e9d7b18ed2c0de524b658495d62d4673dfe3e61d5f0556b5a125c WHIRLPOOL ac66e7fa70e7365dc5a404d95b9f14186d727756df3aaebfa5d433237d33cb1f070ad74db12136b2a2b2db75b3eac127729343838f361000f962f2a5bc309d79
 DIST js_of_ocaml-2.8.2.tar.gz 1334891 SHA256 93d55c7a4883783acb3eee4c6a126993f548f1467d1f08a8d72fa30385a673c4 SHA512 07550311b53a54ec55b5b1e63acbf8eee4757d643cf9639efb035faa029cde4b47c46d732dd2fa3ec0606edf1ef094d096a375c694b0b7255ada16e0c632c4ed WHIRLPOOL 6eac8dccd5217aaa91dc3f899a6ec949afff725dcd1d60276660b0c2e4ca71faf2d55c0a747a3cab05ca55cf7962aa4dbcd2679ec4f8639c7ccbdf414a105d56
-EBUILD js_of_ocaml-2.8.1.ebuild 1612 SHA256 d50560b0738c75a961483650863f97ba4e6d8ea9b3cc915c4d3b4131a1012d60 SHA512 9cf084a9a973edf3029864f13164ee190fb91e16960b72303845d2c94a0175c25a2206ae2b38e616b9fb261c52de344050540b3a54e84ea9f3fc5d0fdd5e4498 WHIRLPOOL 62b94af871ced5eae7a0f13c545c2bfc7edd1058fea765c6b6511b06be8583a124e7742bfd385487367044a65ffa632a0f3e16b23558826bf0ac5bb099ddaf9f
-EBUILD js_of_ocaml-2.8.2.ebuild 1774 SHA256 7efb8967bf705b1deaf6c5a97e9942288f8eaf5a47b460bdf5706f17991d2fec SHA512 73977903c4aae934f444eb11b8c1afb23ef89d33abe3dcf392270c1405480ab0d8dce1a481bdf5cc334904f171f47b757586485f60364243457139a2ba5a7c60 WHIRLPOOL 1d7136d290abf5b6998a249296e7b97bcf74fb73afd7aa31a89c0e4a2f715d38eb91550aab44103a14898e77445fa2f266959125a5cd888ea91a8f205104b655
-EBUILD js_of_ocaml-9999.ebuild 1774 SHA256 7efb8967bf705b1deaf6c5a97e9942288f8eaf5a47b460bdf5706f17991d2fec SHA512 73977903c4aae934f444eb11b8c1afb23ef89d33abe3dcf392270c1405480ab0d8dce1a481bdf5cc334904f171f47b757586485f60364243457139a2ba5a7c60 WHIRLPOOL 1d7136d290abf5b6998a249296e7b97bcf74fb73afd7aa31a89c0e4a2f715d38eb91550aab44103a14898e77445fa2f266959125a5cd888ea91a8f205104b655
-MISC ChangeLog 5872 SHA256 83b7f6082ec7f374245e6ce7e85cea3c52a1d11cda6fb195303b70b85ffae9fe SHA512 736818460237a0bfb5eb66528d81ebf5a78309ad7f385abc573df437fafe2203e97a97b583d0e92785ccda0a07982bbbbb6fbc2dc07415b15fc23fa1b5e328df WHIRLPOOL 5c910acf2370c3680a8de296e4b90fa6dcb1faa584ae89dcb614077153583f6b0234497669620b76360f68f25181c34d845ce6847662db6540f2434d40d2cffe
+EBUILD js_of_ocaml-2.8.2-r1.ebuild 1776 SHA256 bdb3073051d59f5b61ec221cda865cd9770156fc8925041ad0b94b1f92361b67 SHA512 540fba9d5f51d2a114f427f692570d18f1d9b88b9dfb9e7f18e7ecdeaf35736823538b94cef0226a1477b92dfe2dce5bd1481a95f280b13820afea28ae1c90a4 WHIRLPOOL e457791075cc589f85f9191487a37ff48a4a1556b447537dfbca520711b907f1358597cc1a59ecdcdedcb70b994079ed3cbd26c7eb7ef993f97c968402879220
+EBUILD js_of_ocaml-9999.ebuild 1776 SHA256 bdb3073051d59f5b61ec221cda865cd9770156fc8925041ad0b94b1f92361b67 SHA512 540fba9d5f51d2a114f427f692570d18f1d9b88b9dfb9e7f18e7ecdeaf35736823538b94cef0226a1477b92dfe2dce5bd1481a95f280b13820afea28ae1c90a4 WHIRLPOOL e457791075cc589f85f9191487a37ff48a4a1556b447537dfbca520711b907f1358597cc1a59ecdcdedcb70b994079ed3cbd26c7eb7ef993f97c968402879220
+MISC ChangeLog 6258 SHA256 e5a5cab0f044628ad2667c7533323ec5886e82a46bd78c093bc379536403e0a5 SHA512 3ac1cee57704e0714c5dd3eab32003ae0e2d912b98bf938796c8011ff6e79924d87f1048d1190c469f3dfd753c9be8cafa6273145007d7b871ca02c2f9c7b9f8 WHIRLPOOL 151fbb4f694d67dd4ad6199cb1e48d547a43c9e904d0ed1adceae82c18207028d57e77bb7be7a1b256e4b93498dfc39cf98d171377caa317b2d1b88c1dc36105
 MISC ChangeLog-2015 1539 SHA256 f0dfbb15984ab92d613f09b96bc86a05be641ec3a13482947c465f987f787e2e SHA512 333c791c741b1806df4047cd341bc09e76eb8c8bea90a3801edc4fa92b0253cc189916927a9a598c5feecf61d6d6d818c0fa3e8b8a90219223de44c93ee7950e WHIRLPOOL a54be90b4ca060d014aa8a8bb657321ab4ebc561ddb424560d75a6c1c5c40271786de359c50fe43243b04990ec0bf7c417a92774622c2fe0f867be20d7b04b95
 MISC metadata.xml 765 SHA256 bc65596a561eea366eff8ed3c73d1ecbb6cd3bb235225a0581d41c49e166f056 SHA512 54ee980de21f97f3b832e5368df1f096648009e0afa619acb98d1b0a4ff369a9cc60e3b56fbd524dd164681beb05235b42ed8f11197b069e6f6c1285b9ecba63 WHIRLPOOL 208d6d93a1dfaf84ad75de34bd0a9e791a418b24c4c779b22f02b6c6862b2581df8b05b1674a682d6b4644cd426fd04e9ca5da8ef68e52051bcc53ef9994fb33
diff --git a/dev-ml/js_of_ocaml/js_of_ocaml-2.8.1.ebuild b/dev-ml/js_of_ocaml/js_of_ocaml-2.8.1.ebuild
deleted file mode 100644
index 58bce36..0000000
--- a/dev-ml/js_of_ocaml/js_of_ocaml-2.8.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit findlib eutils
-
-DESCRIPTION="A compiler from OCaml bytecode to javascript"
-HOMEPAGE="http://ocsigen.org/js_of_ocaml/"
-SRC_URI="https://github.com/ocsigen/js_of_ocaml/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1-with-linking-exception"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE="+async +ocamlopt doc +deriving +ppx +ppx-deriving +react +xml X"
-
-RDEPEND="
-	>=dev-lang/ocaml-3.12:=[ocamlopt?,X?]
-	>=dev-ml/lwt-2.4.4:=
-	async? ( dev-ml/async_kernel:= )
-	react? ( dev-ml/react:=  dev-ml/reactiveData:= )
-	xml? ( >=dev-ml/tyxml-4:= )
-	ppx? ( dev-ml/ppx_tools:= )
-	ppx-deriving? ( dev-ml/ppx_deriving:= )
-	dev-ml/cmdliner:=
-	dev-ml/menhir:=
-	dev-ml/ocaml-base64:=
-	dev-ml/camlp4:=
-	dev-ml/cppo:=
-	deriving? ( >=dev-ml/deriving-0.6:= )"
-DEPEND="${RDEPEND}
-	dev-ml/ocamlbuild"
-
-src_configure() {
-	printf "\n\n" >> Makefile.conf
-	use ocamlopt || echo "BEST := byte" >> Makefile.conf
-	use ocamlopt || echo "NATDYNLINK := NO" >> Makefile.conf
-	use deriving || echo "WITH_DERIVING := NO" >> Makefile.conf
-	use X || echo "WITH_GRAPHICS := NO" >> Makefile.conf
-	use react || echo "WITH_REACT := NO" >> Makefile.conf
-	use ppx || echo "WITH_PPX := NO" >> Makefile.conf
-	use ppx-deriving || echo "WITH_PPX_PPX_DERIVING := NO" >> Makefile.conf
-	use async || echo "WITH_ASYNC := NO" >> Makefile.conf
-}
-
-src_compile() {
-	emake -j1
-	use doc && emake doc
-}
-
-src_install() {
-	findlib_src_preinst
-	emake BINDIR="${ED}/usr/bin/" install
-	dodoc CHANGES README.md
-	use doc && dohtml -r doc/api/html/
-}
diff --git a/dev-ml/js_of_ocaml/js_of_ocaml-2.8.2.ebuild b/dev-ml/js_of_ocaml/js_of_ocaml-2.8.2-r1.ebuild
similarity index 97%
rename from dev-ml/js_of_ocaml/js_of_ocaml-2.8.2.ebuild
rename to dev-ml/js_of_ocaml/js_of_ocaml-2.8.2-r1.ebuild
index 41d79c3..9e1c155 100644
--- a/dev-ml/js_of_ocaml/js_of_ocaml-2.8.2.ebuild
+++ b/dev-ml/js_of_ocaml/js_of_ocaml-2.8.2-r1.ebuild
@@ -37,9 +37,9 @@
 	dev-ml/camlp4:=
 	dev-ml/cppo:=
 	dev-ml/uchar:=
+	dev-ml/ocamlbuild:=
 	deriving? ( >=dev-ml/deriving-0.6:= )"
-DEPEND="${RDEPEND}
-	dev-ml/ocamlbuild"
+DEPEND="${RDEPEND}"
 
 src_configure() {
 	printf "\n\n" >> Makefile.conf
diff --git a/dev-ml/js_of_ocaml/js_of_ocaml-9999.ebuild b/dev-ml/js_of_ocaml/js_of_ocaml-9999.ebuild
index 41d79c3..9e1c155 100644
--- a/dev-ml/js_of_ocaml/js_of_ocaml-9999.ebuild
+++ b/dev-ml/js_of_ocaml/js_of_ocaml-9999.ebuild
@@ -37,9 +37,9 @@
 	dev-ml/camlp4:=
 	dev-ml/cppo:=
 	dev-ml/uchar:=
+	dev-ml/ocamlbuild:=
 	deriving? ( >=dev-ml/deriving-0.6:= )"
-DEPEND="${RDEPEND}
-	dev-ml/ocamlbuild"
+DEPEND="${RDEPEND}"
 
 src_configure() {
 	printf "\n\n" >> Makefile.conf
diff --git a/dev-ml/ocamlbuild/ChangeLog b/dev-ml/ocamlbuild/ChangeLog
index d06e10e..701f63c 100644
--- a/dev-ml/ocamlbuild/ChangeLog
+++ b/dev-ml/ocamlbuild/ChangeLog
@@ -30,3 +30,19 @@
 
   Package-Manager: portage-2.2.28
 
+*ocamlbuild-0.9.3 (07 Oct 2016)
+
+  07 Oct 2016; Alexis Ballier <aballier@gentoo.org> +ocamlbuild-0.9.3.ebuild:
+  bump to 0.9.3
+
+  Package-Manager: portage-2.3.1
+
+  07 Oct 2016; Thomas Deutschmann <whissi@gentoo.org> ocamlbuild-0.9.2.ebuild,
+  ocamlbuild-0.9.3.ebuild:
+  DESCRIPTION improved
+
+  Gentoo CI has detected a "CrappyDescription" problem in these ebuilds.
+  This commit will set a useful description to fix the QA problem.
+
+  Package-Manager: portage-2.3.1
+
diff --git a/dev-ml/ocamlbuild/Manifest b/dev-ml/ocamlbuild/Manifest
index 8771d39..058cef7 100644
--- a/dev-ml/ocamlbuild/Manifest
+++ b/dev-ml/ocamlbuild/Manifest
@@ -1,4 +1,6 @@
 DIST ocamlbuild-0.9.2.tar.gz 163014 SHA256 257a3961da1aa47deb3de8da238ebe1daf13a73efef2228f97a064a90f91c6bc SHA512 6f6fa2ca0030256b61a9f93275f26327a032594a1ddd288e1eb9f4c41dfc139e4cdb6cd66ae8e383dd2f8aabb435181abfbf6b4aa0892ef6fa420c29e33b391a WHIRLPOOL 4b1285a3177787c9d4d1e4581dec4079a1144568512c8871b2ed9436bea941c9447130af616c418d7c18157f0818de26f6344635c7e63e4ec13acaa5229cf77a
-EBUILD ocamlbuild-0.9.2.ebuild 951 SHA256 7f202eb61c986042db145d507c42e2d217ef0163a5fb25e68f0f46939b8fb584 SHA512 d059835d0a811b4a602a4bf704d307ae7b50a6040d44fe6e4a323c66cd0cf7f602b7caab09dc177d4dfc07e8f9c2fa3574c4a2b2018e9a64a6bfb780fdb06407 WHIRLPOOL 12827d9f8505f205f74d3605cd460ca69dfd5daa970b22afaed43013ddbd2351162b8bda868889c7ea9925e4f8f3a0929bd15b3d640cce1c9726191af9553c40
-MISC ChangeLog 972 SHA256 86d3c3fe032f372a33fd19d1bca817967a2a8b3104ae4715901f94bb68c4b903 SHA512 04dfcdaa5ef2d17262d31c5d97581ba3c28eff22731851c299afeee94100ad16dbb10de4a75a835a166aac85bc67991bd3d73d74d5ad7d847cb6ebd2efc24c3b WHIRLPOOL 303a645d2da68fad41b93201ee09c2f7703a5605a965925037874b759c44234f80883c45087a0bf041dae9ec9a345578360fbbebabdc9202094001a94443df82
+DIST ocamlbuild-0.9.3.tar.gz 191583 SHA256 32e4824906888c61244909eab0d2c22d31f18fc9579873a070a4cf7947c2c0a9 SHA512 49ab3a13d48f8f554c85ebc8ce9cbc5a5e63112c2d50215a6f4be78cc21c6e93bd5d657ea45584cfbfa00d182d99adad0fbb706e8121b71ea3ecf4830fd947dd WHIRLPOOL 50dcc7146ea0cc567c955d01fc4d5fad36d056c8b99f74b5ee3cbc69d9a68a37c4448b3215430a5f39272375ade3917b168778e36f5d2e9308e41cc6b7afeb33
+EBUILD ocamlbuild-0.9.2.ebuild 1019 SHA256 7a543591bbac0e58dfbb7880743c0b72cfa40cc9f8225a92368654ad57688cf9 SHA512 c1e2842b4a9df01a5355869a566e6fe7c850594ef3eb268e0a0b09f4f678f1b91695744f8355a1bac438a9bad2fd9c7d660c1a7bccf7b47a2d7dc6bf82452b87 WHIRLPOOL 4b90f30db86b758064f5ef01734cdc41ba237f668c1e0cb6499b320bf64c74ee8cff29a5cd25585ec2e8db5768490599aa9385add99cda29d3b38dac58f54cff
+EBUILD ocamlbuild-0.9.3.ebuild 1019 SHA256 7a543591bbac0e58dfbb7880743c0b72cfa40cc9f8225a92368654ad57688cf9 SHA512 c1e2842b4a9df01a5355869a566e6fe7c850594ef3eb268e0a0b09f4f678f1b91695744f8355a1bac438a9bad2fd9c7d660c1a7bccf7b47a2d7dc6bf82452b87 WHIRLPOOL 4b90f30db86b758064f5ef01734cdc41ba237f668c1e0cb6499b320bf64c74ee8cff29a5cd25585ec2e8db5768490599aa9385add99cda29d3b38dac58f54cff
+MISC ChangeLog 1439 SHA256 886158e5f643013f5189ba3530aa92038c8e32bf73e6a2ca82ecc702d0785920 SHA512 25857a8c3c55e7f22b0909fe122fa7694cd8f3771079066a6bb97a4002cf1a3eb303067f3a7f5405f65c4765642094c9b78974cd6100c0f3ebf28a0ee77702c0 WHIRLPOOL 518e95b5c16278c5cd6728ca6197efc1a7729bdb56948487af5ca8b214e26f6502f05c1186605c4e6bd4d5f9cf17aab3f2b2f3ba7653880d7f88ef5142d450d4
 MISC metadata.xml 243 SHA256 5e9b58b0b795266f973d066675839499e3a56d7d932d702404a4b91ded8eb26c SHA512 1c5b4b2163017e496999d1f87e5c9c5ac6c11b2e9187450ccfb3df258f34e54d278972f04ee0e8429476c6f87e091a869ac2a28c6e8c8e6d20678c3e74061449 WHIRLPOOL 085df2e84901cbe563c7c1d30d04c229547f15f8ee26ac61d44d07c3f6999f2bbfa4cf309963172fb507cce5450d27598b762c3ccab92351601965c3afc05e3a
diff --git a/dev-ml/ocamlbuild/ocamlbuild-0.9.2.ebuild b/dev-ml/ocamlbuild/ocamlbuild-0.9.2.ebuild
index 7fe9092..c18f0d6 100644
--- a/dev-ml/ocamlbuild/ocamlbuild-0.9.2.ebuild
+++ b/dev-ml/ocamlbuild/ocamlbuild-0.9.2.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-DESCRIPTION="OCamlbuild"
+DESCRIPTION="Generic build tool with built-in rules for building OCaml library and programs"
 HOMEPAGE="https://github.com/ocaml/ocamlbuild"
 SRC_URI="https://github.com/ocaml/ocamlbuild/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
diff --git a/dev-ml/ocamlbuild/ocamlbuild-0.9.3.ebuild b/dev-ml/ocamlbuild/ocamlbuild-0.9.3.ebuild
new file mode 100644
index 0000000..c18f0d6
--- /dev/null
+++ b/dev-ml/ocamlbuild/ocamlbuild-0.9.3.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Generic build tool with built-in rules for building OCaml library and programs"
+HOMEPAGE="https://github.com/ocaml/ocamlbuild"
+SRC_URI="https://github.com/ocaml/ocamlbuild/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="+ocamlopt"
+
+DEPEND=">=dev-lang/ocaml-4.02.3-r1:=[ocamlopt?]"
+RDEPEND="${DEPEND}
+	!<dev-ml/findlib-1.6.1-r1
+"
+
+src_configure() {
+	emake -f configure.make Makefile.config \
+		PREFIX="${EPREFIX}/usr" \
+		BINDIR="${EPREFIX}/usr/bin" \
+		LIBDIR="$(ocamlc -where)" \
+		OCAML_NATIVE=$(usex ocamlopt true false) \
+		OCAML_NATIVE_TOOLS=$(usex ocamlopt true false) \
+		NATDYNLINK=$(usex ocamlopt true false)
+}
+
+src_install() {
+	emake CHECK_IF_PREINSTALLED=false DESTDIR="${D}" install
+	dodoc Changes
+}
diff --git a/dev-ml/qcheck/ChangeLog b/dev-ml/qcheck/ChangeLog
deleted file mode 100644
index d02252b..0000000
--- a/dev-ml/qcheck/ChangeLog
+++ /dev/null
@@ -1,46 +0,0 @@
-# ChangeLog for dev-ml/qcheck
-# Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2
-# (auto-generated from git log)
-
-*qcheck-0.4.0.1 (16 Oct 2015)
-
-  16 Oct 2015; Matthew Brewer <tomboy64@sina.cn> +metadata.xml,
-  +qcheck-0.4.0.1.ebuild:
-  new ebuild
-
-  - needed as a transitive dependency for Libre S3 1.1 (net-misc/libres3)
-
-  21 Oct 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
-  Update remote-ids
-
-  Signed-off-by: Justin Lecher <jlec@gentoo.org>
-
-  24 Jan 2016; Michał Górny <mgorny@gentoo.org> metadata.xml:
-  Unify quoting in metadata.xml files for machine processing
-
-  Force unified quoting in all metadata.xml files since lxml does not
-  preserve original use of single and double quotes. Ensuring unified
-  quoting before the process allows distinguishing the GLEP 67-related
-  metadata.xml changes from unrelated quoting changes.
-
-  24 Jan 2016; Michał Górny <mgorny@gentoo.org> metadata.xml:
-  Replace all herds with appropriate projects (GLEP 67)
-
-  Replace all uses of herd with appropriate project maintainers, or no
-  maintainers in case of herds requested to be disbanded.
-
-  24 Jan 2016; Michał Górny <mgorny@gentoo.org> metadata.xml:
-  Set appropriate maintainer types in metadata.xml (GLEP 67)
-
-  10 Feb 2016; Matthew Brewer <tomboy64@sina.cn> metadata.xml:
-  update metadata.xml to contain a name-tag for tomboy64@sina.cn
-
-  Package-Manager: portage-2.2.26
-  RepoMan-Options: --ignore-arches
-
-  13 Feb 2016; Matthew Brewer <tomboy64@sina.cn> metadata.xml:
-  fix remote-id in metadata.xml
-
-  Package-Manager: portage-2.2.26
-  RepoMan-Options: --ignore-arches
-
diff --git a/dev-ml/qcheck/Manifest b/dev-ml/qcheck/Manifest
deleted file mode 100644
index f222401..0000000
--- a/dev-ml/qcheck/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST qcheck-0.4.0.1.tar.gz 55783 SHA256 4c90f4babc35ed9672b9a48d69c480812b030e7194c617614a8b2d11d023ad65 SHA512 9a8476749ee5d97708d3f074e3c948511231aef8a49029c8d284a9d1413f2f5bb3b6bd048ec0998e4e762171626613a81f9275224ad16900094e735f4c82f057 WHIRLPOOL be8dcef3e6b8761fac35df1c41b2adc49f8afeaf7d06c1ba92ebba7ce6ac4a7f0fab213e2360277c074051f5ac48cad0b45069a6a1b8b3b3a6edcac72b769e21
-EBUILD qcheck-0.4.0.1.ebuild 594 SHA256 e9cbf8f678e454f642815125cbed275cb460c0b2afa615311f9c3064ce8fe8e2 SHA512 f14d8a7a158318c3e119db42959890a452d5531b2a6d63778a5b3168b7a0eed9c350889f26cdbdf24677d952c58d9e55cae4ec7925fe8ecb505adec99bd8728f WHIRLPOOL 6a45d533ae360dac5a237dccbc3af5f72c7b3f004a26997731509dddf97efdf5ea930698c934406fecddb53e1cf94ab183f118ce00acd209591fec54baed8621
-MISC ChangeLog 1610 SHA256 c031603cfa390de1eb95a18c87e2e8c4f2e2f2ee5fcd7c0eefaff530b7683547 SHA512 800f6f2b34f36a31cb0e43175f7da88ee944b4c2238f6b7c9dadda975465e75eddcca062815803f361ab61f03376bccd69dc662a20ffcd94914aea7f530c20e5 WHIRLPOOL 447857e7d84207a23bc9a9124058f7761c0d2a0fa0cbd1efef2fff8ea452d51557b1cea923678dfa2678a2158948d4db37ed007c30aa43727605ff0a30e58b35
-MISC metadata.xml 756 SHA256 70c8e38db00b0e14e560b17f8cd84aecdec19050e1b8df30a8022a53400ec472 SHA512 368eb5316d395684414b56779a2e93dc07b34b2885fa5faa7056c79b14562ccd6f682e98b35a0d6fcdd1edd55dcf08355236fcd3e74c687c10a0904ce91afc51 WHIRLPOOL 26e9d590a4c1333849a7f886fb00ac67d69e8d1b37bc4bb8b29d1e2b27a61a51f73964a186fb4f951635f7605bf308ef6c5a95f10fc1f232722162e508559ccb
diff --git a/dev-ml/qcheck/metadata.xml b/dev-ml/qcheck/metadata.xml
deleted file mode 100644
index 54a420d..0000000
--- a/dev-ml/qcheck/metadata.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-    <maintainer type="person">
-        <email>tomboy64@sina.cn</email>
-        <name>M.B.</name>
-        <description>Maintainer, assign bugs to him</description>
-    </maintainer>
-    <maintainer type="project">
-        <email>ml@gentoo.org</email>
-        <name>Gentoo ML Project</name>
-    </maintainer>
-    <maintainer type="project">
-        <email>proxy-maint@gentoo.org</email>
-        <name>Proxy Maintainers</name>
-    </maintainer>
-    <use>
-        <flag name="ounit">Enable integration with ounit</flag>
-    </use>
-    <upstream>
-        <remote-id type="github">c-cube/qcheck</remote-id>
-    </upstream>
-</pkgmetadata>
diff --git a/dev-ml/qcheck/qcheck-0.4.0.1.ebuild b/dev-ml/qcheck/qcheck-0.4.0.1.ebuild
deleted file mode 100644
index 30bdabd..0000000
--- a/dev-ml/qcheck/qcheck-0.4.0.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-OASIS_BUILD_DOCS=1
-
-inherit oasis
-
-DESCRIPTION="QuickCheck inspired property-based testing for OCaml"
-HOMEPAGE="https://github.com/c-cube/qcheck"
-SRC_URI="https://github.com/c-cube/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+ounit"
-
-RDEPEND="
-	ounit? ( >=dev-ml/ounit-2:= )
-"
-DEPEND="
-	${RDEPEND}
-"
-
-src_configure() {
-	oasis_configure_opts="
-		$(use_enable ounit)
-	" oasis_src_configure
-}
-
-DOCS=( CHANGELOG.md README.md )
diff --git a/dev-ml/stringext/ChangeLog b/dev-ml/stringext/ChangeLog
index eeb8808..43d3448 100644
--- a/dev-ml/stringext/ChangeLog
+++ b/dev-ml/stringext/ChangeLog
@@ -68,3 +68,15 @@
 
   Package-Manager: portage-2.3.0
 
+*stringext-1.4.3 (07 Oct 2016)
+
+  07 Oct 2016; Alexis Ballier <aballier@gentoo.org> +stringext-1.4.3.ebuild:
+  bump to 1.4.3
+
+  Package-Manager: portage-2.3.1
+
+  07 Oct 2016; Alexis Ballier <aballier@gentoo.org> -stringext-1.4.2.ebuild:
+  remove old
+
+  Package-Manager: portage-2.3.1
+
diff --git a/dev-ml/stringext/Manifest b/dev-ml/stringext/Manifest
index 1dcafa6..273ef6b 100644
--- a/dev-ml/stringext/Manifest
+++ b/dev-ml/stringext/Manifest
@@ -1,4 +1,4 @@
-DIST stringext-1.4.2.tar.gz 49194 SHA256 1f0c108785ab4d80650748779fea38837a80fcf89f2b1ce9ccbbcc300134fdec SHA512 dd35b90d68f156ec6845fbd1c9b2c479874559696ea2a964c2b78a7ded61f128066a4752670b8db3c4dc0bde82fb6bce02733615c4950256c7071ae1c43b4b69 WHIRLPOOL c338647b23d426777c07febbe8494871471ee400cd8cb543f5d18a15c817986bd72a8e9028341e049cd7eb56427e3ca38d82939dbe981c98ec05ea4444c375f3
-EBUILD stringext-1.4.2.ebuild 516 SHA256 7a040e69ea5e4aeb9dd374b32b8407d671b1452430aed6a13031217d0c981be9 SHA512 a05971ca7f1ad10d0b57fa1bd82095263526c8596436cd2968a6016cba670a01e9b282809959cce1dfc0787f8034ceba2894d193971e94f0add73d144efde275 WHIRLPOOL 2b4763fac1d7960b8fb84457b4579e647899959b7662e4b8a58c5130f1417384fe0f385c6072605ca739dfefa136576d742862a653759b43d75c68d3f604d1b7
-MISC ChangeLog 2248 SHA256 e70e5027df06435712c9e6cb1bc40bba628e6459ebd97ca2bab7024862fdf978 SHA512 32088d1933be8d381fa8262b8c18e9129ab43cc1f76e124c6d83c5a9e59e0113582b496959cbd701c79e16d3322b88f045329f5f57e8c09db40dedd15ab981bb WHIRLPOOL 4b4d8ac6dbc9a43285a2f16040ad3113ba4e9e1a4557d694f33b98257d7dcedad5492a6a3f0de5f298619897b298df1e7cbbc0afd9cd4bb05ac0d0875cb1ffe7
+DIST stringext-1.4.3.tar.gz 49255 SHA256 d0695d0d97663f3e841f0b01ecfbe463018ba307118604914b71c601aca3e6a5 SHA512 f6d6ad9e6cd89fb499f2ef449eede448fe9d67912644f44ffadf4e869326bc20fd839d7e725a133e4a81ca8ba98497fd02307efb9f9f62cbad4308e18123ffb5 WHIRLPOOL 796a0572f1202cac6415ec148272971e9eb6fdf512644a21b7545483b647f1fd1b722a7634d6f9624d4bde9774152491dbe9d7713c32f9a1970b16d1d2cf87e5
+EBUILD stringext-1.4.3.ebuild 495 SHA256 cdd5cb853ce5d933eb9040919926ccd40447dec65befe696044658895761bb1d SHA512 4396b64961e0eb6eb302f1feb54f4eecf8a592b4e0e586c7980f5b039c67ca783d93fba055fc832597d227ef63d1736acda953d4b7d6f8bf4d6f5dee378cda13 WHIRLPOOL cee62c3f3dfc4882974b467881bef215299c87e3cb71831ff7ce1bd28e04d1b5ff6f95f81d6f9886ddc8250329ec7fe71b6c4f67c255790db2540ac4bb350a44
+MISC ChangeLog 2533 SHA256 1e60d0d05e5749c5c36eb54b84f05ebb3ce9d80fc7646066f17b3d5258d2d81f SHA512 f6abcfe240554abdc1cb86903eac7f91ddc6692ea0b58a8a28e515a2d44823177668a3da8ccea4b4210140231ba4eb9f19fa878456833dd0b852d3406c56a37d WHIRLPOOL 602462372c17fcee993ca608ff12f66862e7efb01d6dc471f25ec2826040eee42256015105c2bec338044a112558e7b3f5cc85db3064c458373cdae0e7074a2d
 MISC metadata.xml 677 SHA256 585b17b34516c6f915e1b21aa614ab9c67970e9f97e91bde91e3639eb75f85ab SHA512 f541f0f09025cf29de7567c1f7b32512b10a241565f5a418fe83ce88f4804091a7b551500ce4cbb762a6dc3ed0efc88e7fd7601570a9070f4cb21eef27295424 WHIRLPOOL 56f41aaf8a228f6bb7ecbb2eaf0e260c4d005b4719ede3345ca01f69d91059e32b3b6af554a4ae1f677174c547ccda20b39f0f639660d3288fbd65dcb4038aca
diff --git a/dev-ml/stringext/stringext-1.4.2.ebuild b/dev-ml/stringext/stringext-1.4.3.ebuild
similarity index 81%
rename from dev-ml/stringext/stringext-1.4.2.ebuild
rename to dev-ml/stringext/stringext-1.4.3.ebuild
index 25377ce..3982d51 100644
--- a/dev-ml/stringext/stringext-1.4.2.ebuild
+++ b/dev-ml/stringext/stringext-1.4.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -16,12 +16,12 @@
 KEYWORDS="~amd64"
 IUSE=""
 
-DEPEND="
-	test? ( dev-ml/qcheck[ounit(-)] )
-	>=dev-lang/ocaml-4:=
-"
 RDEPEND="
 	>=dev-lang/ocaml-4:=
 "
+DEPEND="
+	${RDEPEND}
+	test? ( dev-ml/iTeML )
+"
 
 DOCS=( README.md )
diff --git a/dev-perl/DBD-mysql/ChangeLog b/dev-perl/DBD-mysql/ChangeLog
index c8c81b4..d00643b 100644
--- a/dev-perl/DBD-mysql/ChangeLog
+++ b/dev-perl/DBD-mysql/ChangeLog
@@ -191,3 +191,37 @@
 
   Package-Manager: portage-2.3.1
 
+  07 Oct 2016; Kent Fredric <kentnl@gentoo.org> DBD-mysql-4.32.0-r1.ebuild,
+  DBD-mysql-4.36.0.ebuild:
+  Fix mysql-client dependencies re bug #595970
+
+  This means pulling virtual/mysql is only now down with USE=embedded,
+  and client-libraries are now slot-upgradeable when you upgrade the virtual.
+
+  Enforcing SSL happens is still on the todo-list, but turns out, most
+  backends support SSL in all cases, only mysql-connector-c is an exemption.
+
+  Package-Manager: portage-2.3.1
+
+*DBD-mysql-4.36.0-r1 (07 Oct 2016)
+*DBD-mysql-4.32.0-r2 (07 Oct 2016)
+
+  07 Oct 2016; Kent Fredric <kentnl@gentoo.org> -DBD-mysql-4.32.0-r1.ebuild,
+  +DBD-mysql-4.32.0-r2.ebuild, -DBD-mysql-4.36.0.ebuild,
+  +DBD-mysql-4.36.0-r1.ebuild:
+  r1 bump to force slot-dep recompilation
+
+  Package-Manager: portage-2.3.1
+
+*DBD-mysql-4.37.0 (07 Oct 2016)
+
+  07 Oct 2016; Kent Fredric <kentnl@gentoo.org> +DBD-mysql-4.37.0.ebuild:
+  Bump to 4.37.0 re bug #596424
+
+  Upstream:
+  - Fix for possible buffer overflow in prepared statements, CVE-2016-1246
+
+  Bug: https://bugs.gentoo.org/596424
+
+  Package-Manager: portage-2.3.1
+
diff --git a/dev-perl/DBD-mysql/DBD-mysql-4.32.0-r1.ebuild b/dev-perl/DBD-mysql/DBD-mysql-4.32.0-r2.ebuild
similarity index 91%
rename from dev-perl/DBD-mysql/DBD-mysql-4.32.0-r1.ebuild
rename to dev-perl/DBD-mysql/DBD-mysql-4.32.0-r2.ebuild
index a183ad6..cc31810 100644
--- a/dev-perl/DBD-mysql/DBD-mysql-4.32.0-r1.ebuild
+++ b/dev-perl/DBD-mysql/DBD-mysql-4.32.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -16,7 +16,9 @@
 
 RDEPEND="dev-perl/DBI
 	dev-perl/Test-Deep
-	virtual/mysql[embedded?]"
+	virtual/libmysqlclient:=
+	embedded? ( virtual/mysql[embedded] )
+"
 DEPEND="${RDEPEND}"
 
 src_prepare() {
diff --git a/dev-perl/DBD-mysql/DBD-mysql-4.36.0.ebuild b/dev-perl/DBD-mysql/DBD-mysql-4.36.0-r1.ebuild
similarity index 96%
rename from dev-perl/DBD-mysql/DBD-mysql-4.36.0.ebuild
rename to dev-perl/DBD-mysql/DBD-mysql-4.36.0-r1.ebuild
index 86b05ba..ebde1a9 100644
--- a/dev-perl/DBD-mysql/DBD-mysql-4.36.0.ebuild
+++ b/dev-perl/DBD-mysql/DBD-mysql-4.36.0-r1.ebuild
@@ -19,7 +19,8 @@
 IUSE="embedded test +ssl"
 
 RDEPEND=">=dev-perl/DBI-1.609.0
-	virtual/mysql[embedded?]
+	virtual/libmysqlclient:=
+	embedded? ( virtual/mysql[embedded] )
 "
 DEPEND="${RDEPEND}
 	virtual/perl-ExtUtils-MakeMaker
diff --git a/dev-perl/DBD-mysql/DBD-mysql-4.36.0.ebuild b/dev-perl/DBD-mysql/DBD-mysql-4.37.0.ebuild
similarity index 95%
copy from dev-perl/DBD-mysql/DBD-mysql-4.36.0.ebuild
copy to dev-perl/DBD-mysql/DBD-mysql-4.37.0.ebuild
index 86b05ba..32ed103 100644
--- a/dev-perl/DBD-mysql/DBD-mysql-4.36.0.ebuild
+++ b/dev-perl/DBD-mysql/DBD-mysql-4.37.0.ebuild
@@ -5,7 +5,7 @@
 EAPI=6
 
 DIST_AUTHOR=MICHIELB
-DIST_VERSION=4.036
+DIST_VERSION=4.037
 inherit eutils perl-module
 
 DESCRIPTION="MySQL driver for the Perl5 Database Interface (DBI)"
@@ -19,7 +19,8 @@
 IUSE="embedded test +ssl"
 
 RDEPEND=">=dev-perl/DBI-1.609.0
-	virtual/mysql[embedded?]
+	virtual/libmysqlclient:=
+	embedded? ( virtual/mysql[embedded] )
 "
 DEPEND="${RDEPEND}
 	virtual/perl-ExtUtils-MakeMaker
diff --git a/dev-perl/DBD-mysql/Manifest b/dev-perl/DBD-mysql/Manifest
index d2c6913..81497e9 100644
--- a/dev-perl/DBD-mysql/Manifest
+++ b/dev-perl/DBD-mysql/Manifest
@@ -1,8 +1,10 @@
 AUX DBD-mysql-print_embedded_options.patch 616 SHA256 b1aeee3f0d34a909509b30b0713c1e9385061e2d5518f5210fd90c6d15d07348 SHA512 da7bbc1b65e58128af4c19673827c342de94e811b6ab20ff6844646eb7d6afdff79b61aaa6033ae2ac3d8dce8140f78505961e3da49306b5034a6c3eb5ba8157 WHIRLPOOL e7c755168a0d1c2cf6eeaf6c6fb68ad0ab16c20425adb1375cc40165b08606c309b88e22c320f4c5ceb0adcdf6aca009038ac8a99cd3fdf3907bbba1fbe087f2
 DIST DBD-mysql-4.032.tar.gz 146476 SHA256 b8e681e719d8f2d1cecb9e8603e13483b09b56508629b079022778e7dfd7bfb6 SHA512 7e7ebaed07f0540079854294cc3ab4a4554fd0f850dd0927b2485cc985c2c9f5b70a650d971027c883cc4d8450020245656f6ff1f792a56d1a2d4b45402d73d0 WHIRLPOOL 79b94c7c85406e0f3a0469c8017594f81f6151eab3059d483c50326222fdb920d12db04a5382dbdc2862cf853e1c421fe0d7acc4a35b131a0f9d39c2d79f5d0b
 DIST DBD-mysql-4.036.tar.gz 146513 SHA256 5c48a823f86b8110ccb6504c6176ca248b52f56829dd4548bc39c3509f4154cf SHA512 2bfc5151b54559277f5e1949abc702eb373323998c641d199e3b2ba30f4b4ca449fc728fbd4f5ed05af53602e8f8772c2de9b1dd6db36f5af85a3c7799daab19 WHIRLPOOL db173ca8ce560bdbf4120b992c7ebb40feb73a3bd12b1a4f773a5ae7f4daadb77f65111cd3b97329470eaf1f9b7702d0a501180bb12ad622892126cb8e1fcd3d
-EBUILD DBD-mysql-4.32.0-r1.ebuild 1299 SHA256 3c1923659a53f2ef43ad387f1d2f63b5de2da55904362319f05fffc06bca6980 SHA512 495f4ff636ac7e3d91336888df250f54c2a0ba1f6a263c95b04b178575246214dfe4c8956ecc3aab30e2b95406714fe495cfe05eedd078d3e0c8bb39025dfe23 WHIRLPOOL c67920fc6ccb7fa8afcb0390ac2f5b56aabd684f9c4fcbf3b81530d226505314d8b40f302260aa07f7101f6f2fb6ef24d9e88c329329de056d17f7958d06368e
-EBUILD DBD-mysql-4.36.0.ebuild 1960 SHA256 a2e1cc39c655979bf28718d6434ccf8948da63b1abc757fa7dbc3b122d9c6c55 SHA512 2808c4fe06f05519888fa7ff501bfac3458c7866bbf11884c46a52a280736f7c5607a475333c855c012a164ebcc1cc868707c959a625bf461da01e89349fc06f WHIRLPOOL 2ac5687e1d23b95d04cca4f94153ced42cbdd368ecb9bcc81bb7395c3514408b9b19ada9a7d48ae1a1cfd2a6373aa66188300b299cd01ca09adb8b8bcfb67f25
-MISC ChangeLog 6425 SHA256 d00bd58d7735c5877c3fb019ec0f75bc20d00525d3a0f5637c90dfe24b7128a1 SHA512 3c1dc49e3a05bb7e759f618b739e99f35b865408258b3064d8ad7eeef3415d1d9ec430e2f610b3c68871a4e806747f7a38205b759b7d235d80930be487421047 WHIRLPOOL cc682d82f6c08fe846eead63568e788a238d64f68f2391e84a807cc51628245a53ac3b8d99b55e5c1ed2b9ccf099cde5c8f2eaf6c4e52db39ace32b393c9bb2d
+DIST DBD-mysql-4.037.tar.gz 146639 SHA256 df578acef28ed3f6aaae52dc98e6821a1407d3bfa88585255729bb0ebfed3cfc SHA512 3bda6ea18d29e32028b7eb93cd06fdbabbadafa66f982556298a68980c42a7b5236872113696e6d2df66a345049d1e63bc90ab358c8631f0cbea187780e514af WHIRLPOOL 2cd51fb258de4877010d6d5f88a27f8e251d86b311d5d7dc3b62a46e7d6ac87facaad7c2bbba6c7f306d91d106e7a713fb21c2f1b7d2934e989aa30794d38a7f
+EBUILD DBD-mysql-4.32.0-r2.ebuild 1339 SHA256 dbf62d36d271b932da6606a276bd0fd5d2d2d625135e227f0ce4acd8b0a5e007 SHA512 8bc92654068be535e7be6e12e860fb517b27efbb69bcd0de46173d6fbcbe31d0578f6a6ff04df9ea6a21da830960ed7d617c73d3dcd6684f1a79a43dd01996cc WHIRLPOOL fed05412312bdc543e3d054b9fea9a59c6b694929dfb0224ada02456173878d5606b2f0fd117d6fab9b0b7be3864ac511e08d38fb545ca6ace707c01282b6eac
+EBUILD DBD-mysql-4.36.0-r1.ebuild 1999 SHA256 600adb86abb39694df35072f5722aee91059e5a11a6d7054267243606ebc3958 SHA512 a759f8f4fcb2ac1d964dc4ba25619f77cdd9994db7a441d39783865de6330c7f29b8b73f2ce94f9deda4739672fd797b5c526fdd01629716522e2497ca532aca WHIRLPOOL 7008cbc880b7daa8880110a2eec48b13a81ab20768d89ec0972b04d2b74e1eccc5a2b53f0a4f0741b87700fd465f5593b0bbd85a250f9170044364bcfb503e6f
+EBUILD DBD-mysql-4.37.0.ebuild 1999 SHA256 f9bf4767adefc8ec9d297777058c2a71bf07ae762b66eb09da721ec5981e2193 SHA512 7b48e5930e5124ce5364adaf165c0bf1a0594d06fc06f216a43aec6f3f85295eb9bda7b05e0ef735304229d5ae899f28eb6b013854bf39f0d292eb34adb7f2db WHIRLPOOL b2a4c0afd15f9fa92803742457c025a2d9414b64e4a228183d91fbd844f2c8262dae15f5d5642c36b640e35456bbc385434f8bf8a8b42c4f5d35712b49d9fd66
+MISC ChangeLog 7523 SHA256 3d623a2e10a688e5c21c886615c253808e5636ad151279a7a63ecf167f3282e8 SHA512 209121a0481fd84b6205bb7634f1fe459fb9dcf356f5707a22dfc6d98cc493a81ce76230fa2672523c9b3c1e95a479fbbffd84cff531a78c6b4884d5447f2ab5 WHIRLPOOL 0b6ba2a689727afa62357b2a8d9ebdf56f0350e623d3fb073bbc94d4ad7c92a25fb5c3ed5d4f7723cab9d0093193761481cd7a5d9a80d32ec49da73aaca90fbe
 MISC ChangeLog-2015 18791 SHA256 1796f018ebff137151c507b7a0cc3defac5afdfca0fa10e144466238c4093528 SHA512 33a5b0898371d1111140b1e9c955b6eba2cebe14e6101e961e2df42d28e6326770cd1e1442b8feb4f46a120fce40d302faa3f3d42588cf02482cf4970f6b985a WHIRLPOOL 3222bbb849b246d86d5f3467acdf4ad695362290aeff4d7d78b06fc19dc0d245cf708dd9d1dba0e3b3df1c480029fe366d0d3171eba3a9f765e4cf8476e19873
 MISC metadata.xml 876 SHA256 67872e1995bdaa45b2aa15c393a1eeb52c48ed6f03d50d4cba8799dccdb4663d SHA512 05226b4f30741e8d77f5174491aee480a958e3cdf9b9484ff261b975805b82eee9ff865df97891c6107307c5cc19994764110f5461c3e80c9d8828b34e076968 WHIRLPOOL 930090d6497d7507c91f2761dde06e0059df49298318ba5a0b2d83b0182b031408413a2ecb57df549a391fbf3bed229355bfc1583c3e45ce2db91da64441b7b8
diff --git a/dev-python/dill/ChangeLog b/dev-python/dill/ChangeLog
index 1b283c8..607739b 100644
--- a/dev-python/dill/ChangeLog
+++ b/dev-python/dill/ChangeLog
@@ -11,3 +11,10 @@
 
   Package-Manager: portage-2.2.28
 
+  06 Oct 2016; Patrice Clement <monsieurp@gentoo.org> dill-0.2.5.ebuild:
+  keyword for ppc.
+
+  Gentoo-Bug: https://bugs.gentoo.org/594020
+
+  Package-Manager: portage-2.3.0
+
diff --git a/dev-python/dill/Manifest b/dev-python/dill/Manifest
index 016b5e2..f8ccb32 100644
--- a/dev-python/dill/Manifest
+++ b/dev-python/dill/Manifest
@@ -2,5 +2,5 @@
 AUX dill-0.2.5-remove-install_requires.patch 906 SHA256 5e87b1f2e89303e346e67c9489e5f1efbf8b80462391ca3878ea8269cbaa14ac SHA512 f984248a8280a1cf97bca6a8ad90f8d648da106a74c67dfe29f62e5d8591d7cfcb608bf827729430f0463f6ad0846dba094a030b5c2c3e3f8f387f39803f737e WHIRLPOOL 706b9669111e6d97051308f34cfaf91c1f877f1aad19836cce20e688fde030e24808af8ee7d2b763432817f4c1b49e2d6b36c8bea8b13b08917ab98877a15f7c
 DIST dill-0.2.5.tgz 60572 SHA256 431c9d46e190dcdf1397234cf659d66e2e22e33b0474ed6ee2d0b16c9c0ea319 SHA512 94942a736b4c2e1558eb9475f9bafe3a24f88a976abf9880beec386497a2bc769cb9be6bbfd2baac006c92578c372f5dfcfa165c5649876ea5076a3b207de6fc WHIRLPOOL b0af3e279ad937f36450f25711412b7e48928515e4721fee3d91663c4ec629357b6d8f3c661f1ac56d3f7343a3bef717a368386bd8983991e06a4ce0f78ae1f9
 EBUILD dill-0.2.5.ebuild 543 SHA256 3da250ededf7ef59c334a141a72415e8ea93df9aa35b1cfade7bfb371a76e3af SHA512 b6a0a2b0eb2410549c56adf589183d2f14b7297d04cc50c15211865441f7065a8b1602a532b18120e99d1ebf6562ee51dccc7780224c38b1c8d2fe169c83ab78 WHIRLPOOL ed504502540ecb6803473bd4d25f48f1056730cc53af02b166c6c6b9442bfa1f07af6fdf2b4a89152a20568ebcb5ed9a362c88b122865ed65ef1e08ac69e32ea
-MISC ChangeLog 411 SHA256 a34aa608d25bbec4e4f0bb0e55c774ca453937fd7548cf24c41945853c051386 SHA512 7c81268c804a75e5b2885750cee083ff402af8b94bfe47a80d00341069fa361c1f765a24a0163de826b4abe9b69edbaf6088a4c7d5175a8f87ac4b6a2aa3a435 WHIRLPOOL 9608f83e868217e8320c054eab2a93830f97c7f05001e468c656bc938bd8c4249e195eea7c18e7e3da2042a88f76e1ef9eed83216f3a5be6507096288a2c9be6
+MISC ChangeLog 584 SHA256 67faf3c55103290e2a9646ed06fdf87aa9bbb616421a15627b5fcf2fd9a282b0 SHA512 d61e9723a0bd2d1f30e9c3a9a08827da42938383a7db53e203fa0f33d78deab4130947d85687eff64ac42dd1a2558f7e0a0b78db31bb6416f4feb5534d27425d WHIRLPOOL 34aff99293e2d0089f48b56ec8197667d07e858a355ac0e6ec8f8fdde61d54cb197c479ac49b493c2ce8911e6cc0f3d9d645953abd7ad6f150d0e106b3bc13a3
 MISC metadata.xml 971 SHA256 ab1e928df07d5cb6379870e89c5c7543a42f132d0dd066a04f4a3794f82942c2 SHA512 6dbac6b4684df0f0ca183d998a8c8aaeaa5557d4f20652de04b263a9195b28e56adb7657ab12aebc63715efd2de242b55f3b17648a0337d689756fc4726e5094 WHIRLPOOL bb511abf04b29ac539657380fe2ae17d80fcda8a5e3e42ce074ad90970a18d00c5d8c3e0d051e601ddbab82796490a7a9647e4f2c1cc95f29f405f0e7c6e3a6b
diff --git a/dev-python/hpack/ChangeLog b/dev-python/hpack/ChangeLog
new file mode 100644
index 0000000..0a7eaf2
--- /dev/null
+++ b/dev-python/hpack/ChangeLog
@@ -0,0 +1,14 @@
+# ChangeLog for dev-python/hpack
+# Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2
+# (auto-generated from git log)
+
+*hpack-2.3.0 (07 Oct 2016)
+
+  07 Oct 2016; Brian Dolbec <dolsen@gentoo.org> +hpack-2.3.0.ebuild,
+  +metadata.xml:
+  New package, dependency for dev-python/hyper-h2
+
+  Also an indirect dependency of dev-python/twisted
+
+  Package-Manager: portage-2.3.1
+
diff --git a/dev-python/hpack/Manifest b/dev-python/hpack/Manifest
new file mode 100644
index 0000000..004c27f
--- /dev/null
+++ b/dev-python/hpack/Manifest
@@ -0,0 +1,4 @@
+DIST hpack-2.3.0.tar.gz 41610 SHA256 51bd9aa8151efd190d70fe87991b1e3b79be0f93f0e34088fba2a8d34877a0a9 SHA512 a3d13da105482bb258ee3a2314b2629215028777f84127f71359f08819c96af088a3952bb0a74435472035d10ee6e3943cdad689a28f04cbc12cddcc4af9a8a7 WHIRLPOOL 8f47b6c2a78f915b009c35ecefa517486c27eb45f0b99834718152e14f9e934c23d52981c87b0c39af28fb9cb58d94e5eda07db2e999c37900b76b7aefd64b08
+EBUILD hpack-2.3.0.ebuild 1206 SHA256 c9a1b68fcf26c896f4c5c5366b4f5e179310b6f161ddacdcac3571cf555a6c76 SHA512 3b8f9438476421f8f2ce77401d0b00936f0a4e8d3c160b0a92b91e619dc66024091fd0221a5f7fbf02afb737f6a5db0a1f016eb4c3012a9c48b40adbdbd5e00a WHIRLPOOL 885e4d63f6acdc70f3f7672cfe962e58d38d1af1e8f6dd5f1e847f2c548e44306fdb358621f26d3ba155ecf5fbd663b04d33798b5821236a87178ced6e06d7bc
+MISC ChangeLog 388 SHA256 b29fd04ebcec247f196cd2c54f0802308efd801d5cc5a5569ad1a85f1bd7cafa SHA512 9c856fe1f43d7aaef5442cef790aba08be8192290f9d2f01d805947e89143e304c519cad1948ecc7020c6e7380deb8b64ee07a30539bdce2758f68f15a6eb0a7 WHIRLPOOL d1b042e065b59657913bc5c164c09db2048f63ac2b4b32afdffac8eb0d5844a1fd3aebfd46583542cae420875f43c49cab0b8a7edd1037fd2d176914d4025c13
+MISC metadata.xml 804 SHA256 dae2654faa38c66b788be824482d57ae8584c70537d3f7eda9cc0e9f6cda9d78 SHA512 c74ca4b8b7d9e0f78210c6656aaa0e1141658c4aa29d77e10626ebcefa4148c021224acbdedb46d3395fc51c865b7908708dfa1ac96df4c5a9b4c58e4d5607b8 WHIRLPOOL 12131803201c57437a9bb2bba0764e3930df34cb9986792374d6895a5dbca2624709629993626d971645484eb0371f1af5fa2c0a20d1447499ea779bb0ec44cc
diff --git a/dev-python/hpack/hpack-2.3.0.ebuild b/dev-python/hpack/hpack-2.3.0.ebuild
new file mode 100644
index 0000000..7bd3591
--- /dev/null
+++ b/dev-python/hpack/hpack-2.3.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5} pypy)
+
+inherit distutils-r1
+
+DESCRIPTION="Pure-Python HPACK header compression"
+HOMEPAGE="http://python-hyper.org/hpack https://pypi.python.org/pypi/hpack"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+	test? (
+		>=dev-python/pytest-2.9.2[${PYTHON_USEDEP}]
+		>=dev-python/pytest-cov-2.3.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-xdist-1.14.0[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-3.4.2[${PYTHON_USEDEP}]
+	)
+"
+
+python_prepare_all() {
+	# Remove a test that is not part of the mainstream tests
+	# Also, it's data directory is not included in the release
+	rm test/test_hpack_integration.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all(){
+	use doc && emake -C docs html
+}
+
+python_test() {
+	PYTHONPATH="${S}/test:${BUILD_DIR}/lib" \
+		py.test -v hpack test/|| die
+	cd test
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/hpack/metadata.xml b/dev-python/hpack/metadata.xml
new file mode 100644
index 0000000..e0b56ef
--- /dev/null
+++ b/dev-python/hpack/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>dol-sen@gentoo.org</email>
+		<description>Primary maintainer</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<maintainer>
+			<email>cory@lukasa.co.uk</email>
+			<name>Cory Benfield</name>
+		</maintainer>
+		<remote-id type="pypi">hpack</remote-id>
+	</upstream>
+	<longdescription>This module contains a pure-Python HTTP/2 header encoding
+		(HPACK) logic for use in Python programs that implement HTTP/2. It
+		also contains a compatibility layer that automatically enables the use
+		of nghttp2 if it’s available.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-python/hyper-h2/ChangeLog b/dev-python/hyper-h2/ChangeLog
new file mode 100644
index 0000000..87afced
--- /dev/null
+++ b/dev-python/hyper-h2/ChangeLog
@@ -0,0 +1,12 @@
+# ChangeLog for dev-python/hyper-h2
+# Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2
+# (auto-generated from git log)
+
+*hyper-h2-2.4.0 (07 Oct 2016)
+
+  07 Oct 2016; Brian Dolbec <dolsen@gentoo.org> +hyper-h2-2.4.0.ebuild,
+  +metadata.xml:
+  New package, new dependency of dev-python/twisted
+
+  Package-Manager: portage-2.3.1
+
diff --git a/dev-python/hyper-h2/Manifest b/dev-python/hyper-h2/Manifest
new file mode 100644
index 0000000..2a63438
--- /dev/null
+++ b/dev-python/hyper-h2/Manifest
@@ -0,0 +1,4 @@
+DIST hyper-h2-2.4.0.tar.gz 77440 SHA256 c673efad0b8ee3c3c604375dd5e0c3dbc74f3c4e0385dae120d22b7d6f6ec301 SHA512 76835d6c97d4aed515b460bdbbcb8aea1ea061a416386cadf66a0e9b3c213a9ffe67948ce49b922d99e1895615a03159aa6aed198857e1ce73eb734b8bd9a016 WHIRLPOOL 9a5c1d313f53ee842403c77a8324aa432ff3d04d3d3737f6f7da83e5ff85e51ea6794419fa8886368cf34d4a7be3ff3b7ed19eb13a74ef8318fad738a71b9ef4
+EBUILD hyper-h2-2.4.0.ebuild 876 SHA256 81fca2cc6d1c42fc2f7ddeff5717f400230337a8729372463e118a82707fb43f SHA512 680c75f0108dae0fe37a04997182d461525e9f6d102896949a12a8667fc8416f3c2380e688996cac8681c0959b061d373fe4e8dfdebaccf366d17231c5960577 WHIRLPOOL 920b120d5cf487d64f4c09a3d663d0555b2116988b41709846892231a0d9210a512b2a219631cb34487b2737b630a1212ae7e3676708fafc9b01f12fa3d4d464
+MISC ChangeLog 346 SHA256 a29f103cbe25003f79e9ba5293bd17578e0c06fe33b2a4b89e82da2b9087c85a SHA512 379add2c6116a243f2fb018ac4291b6e6544c8de65f3f74b0e770b5a8afa63d1287f529d4fb25c4dd267086745f741be69bdc27390b71d46062b2616ff5dc034 WHIRLPOOL 9317277da2bf131cb9aa9d8180ffbd5c0944efcd82fc1e936c9787174a83f482b6d08bfa63a130092dbe9d593f248f5fa2b87089e48a70976d4f2f59d18e0083
+MISC metadata.xml 796 SHA256 3996e195c4d583f8dbe37e5b664e25393a315bc3bf866a4046127ac91551d7ff SHA512 0fd255ce4d64977a595bbee613f96390a3d75afbde0ba3e4aaee3014a4b2680c7d7aefc89ea31338ecff55f1ea424930bb5a787f44145b98870d1041fd4b99d1 WHIRLPOOL 6e4a12367cae8cf3836ba2830d6dc4c7514c2301a01a1913e6149d63e7789b5e56e98d8c29b71b68c71201e7b4bbdc94fb59a53ca069a033471068d8fef59edf
diff --git a/dev-python/hyper-h2/hyper-h2-2.4.0.ebuild b/dev-python/hyper-h2/hyper-h2-2.4.0.ebuild
new file mode 100644
index 0000000..fbf71d6
--- /dev/null
+++ b/dev-python/hyper-h2/hyper-h2-2.4.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5} pypy)
+
+inherit distutils-r1
+
+MY_PN="h2"
+
+DESCRIPTION="HTTP/2 State-Machine based protocol implementation"
+HOMEPAGE="http://python-hyper.org/h2 https://pypi.python.org/pypi/h2"
+SRC_URI="mirror://pypi/${P:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-python/hyperframe-4.0.1[${PYTHON_USEDEP}]
+	<dev-python/hyperframe-5.0.0[${PYTHON_USEDEP}]
+	>=dev-python/hpack-2.2.0[${PYTHON_USEDEP}]
+	<dev-python/hpack-3.0.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '>=dev-python/enum34-1.0.4[${PYTHON_USEDEP}]' python2_7)
+	$(python_gen_cond_dep '<dev-python/enum34-2.0.0[${PYTHON_USEDEP}]' python2_7)
+"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_PN}-${PV}
diff --git a/dev-python/hyper-h2/metadata.xml b/dev-python/hyper-h2/metadata.xml
new file mode 100644
index 0000000..7a636dc
--- /dev/null
+++ b/dev-python/hyper-h2/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>dol-sen@gentoo.org</email>
+		<description>Primary maintainer</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<maintainer>
+			<email>cory@lukasa.co.uk</email>
+			<name>Cory Benfield</name>
+		</maintainer>
+		<remote-id type="pypi">h2</remote-id>
+	</upstream>
+	<longdescription>A pure-Python implementation of a HTTP/2 protocol stack.
+		It’s written from the ground up to be embeddable in whatever program
+		you choose to use, ensuring that you can speak HTTP/2 regardless of
+		your programming paradigm.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-python/hyperframe/ChangeLog b/dev-python/hyperframe/ChangeLog
new file mode 100644
index 0000000..c551117
--- /dev/null
+++ b/dev-python/hyperframe/ChangeLog
@@ -0,0 +1,14 @@
+# ChangeLog for dev-python/hyperframe
+# Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2
+# (auto-generated from git log)
+
+*hyperframe-4.0.1 (07 Oct 2016)
+
+  07 Oct 2016; Brian Dolbec <dolsen@gentoo.org> +hyperframe-4.0.1.ebuild,
+  +metadata.xml:
+  New package, dependency of dev-python/hyper-h2
+
+  Also an indirect dependency of dev-python/twisted
+
+  Package-Manager: portage-2.3.1
+
diff --git a/dev-python/hyperframe/Manifest b/dev-python/hyperframe/Manifest
new file mode 100644
index 0000000..41791f2
--- /dev/null
+++ b/dev-python/hyperframe/Manifest
@@ -0,0 +1,4 @@
+DIST hyperframe-4.0.1.tar.gz 16110 SHA256 8a57365b9c5046819fb7bb9c47eb4b44fd4385b976edf3518940f11725c04e43 SHA512 0970faf8711b12b4be2cb4a41b4be6d067eea57c40ee063e2ea0c15b148f1eed0214b29c9e8a4341ed453edd8679b55f290c3818157d66f247dc4ab8e3d369b9 WHIRLPOOL ad7283e6f70dabaf932ba77600ededeca357b6fb97ea3e32e2a9d687474bea15618dfc69b3ce8b4864563d05813472e0ddb6000c59f890b3c2fff4b2d8a4a500
+EBUILD hyperframe-4.0.1.ebuild 460 SHA256 779e2cc039e2def46fa5c33c3d17b185f69feaa3f7ee93e75fb91b8ab9764f09 SHA512 8f2c359fc5b61fa1b086253cc6dc639cd97bceeffbcb7aa34cae4df9ab0a41e4d43172e0ca6cac1fdecdb2ae2fe26e92373a6b8f9175585dad857eb1d68f454f WHIRLPOOL 49619fcba89851dfd7c89a7bc66a75bf0c84ed4c58b68dbf552fddd2fef623b2610bbafd5bdbfec92ecb02c1b7c3e990dcf84fab54465162c760b581bb3a2e96
+MISC ChangeLog 402 SHA256 266512a49c623beb38f5eed24f4783880ae09a3c53e21521559c462c4137ab98 SHA512 fffdb03412b1263c521f87c83c34e5e0081c14676e349f8ca074f6f39206a08ab062d9451d25785852020e755a0e226c64ae9c3e1f2b43c821bf0df14d75c6ac WHIRLPOOL 6c313a5fbcd914e14e9202c751b2bdea3c9b550652cb779988142e6cf5794cf3626dfd5ca899162b3654ff12cf3592e110b3ef4789b39f15544c71666bd79d93
+MISC metadata.xml 751 SHA256 0ab288af8cd533ae9f98534d54d8c1a147085a3e563c131d02c33e811d512c97 SHA512 f19025dd1515ded12777f16532d8d725e7ccd8fe15faab1940d90299e3a9062027adb606fa6f8a4204fe0b1e7a719057444964aa7ac78bcf84fd6876b9a59c6d WHIRLPOOL b592c65cc40bcc66380ddacbc1025321797a5c98591b0e80fb804dd6c537ab1834d58fcdff317c9c50a93d51582044375efa0d4016542c424dc368e150480b4d
diff --git a/dev-python/hyperframe/hyperframe-4.0.1.ebuild b/dev-python/hyperframe/hyperframe-4.0.1.ebuild
new file mode 100644
index 0000000..f9070cf
--- /dev/null
+++ b/dev-python/hyperframe/hyperframe-4.0.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5} pypy)
+
+inherit distutils-r1
+
+DESCRIPTION="HTTP/2 framing layer for Python"
+HOMEPAGE="http://python-hyper.org/hyperframe https://pypi.python.org/pypi/hyperframe"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
diff --git a/dev-python/hyperframe/metadata.xml b/dev-python/hyperframe/metadata.xml
new file mode 100644
index 0000000..0d50723
--- /dev/null
+++ b/dev-python/hyperframe/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>dol-sen@gentoo.org</email>
+		<description>Primary maintainer</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<maintainer>
+			<email>cory@lukasa.co.uk</email>
+			<name>Cory Benfield</name>
+		</maintainer>
+		<remote-id type="pypi">hyperframe</remote-id>
+	</upstream>
+	<longdescription>This library contains the HTTP/2 framing code used in the
+		hyper project. It provides a pure-Python codebase that is capable of
+		decoding a binary stream into HTTP/2 frames.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-python/hypothesis/ChangeLog b/dev-python/hypothesis/ChangeLog
index cbd7878..94a0d83 100644
--- a/dev-python/hypothesis/ChangeLog
+++ b/dev-python/hypothesis/ChangeLog
@@ -299,3 +299,10 @@
   -hypothesis-3.1.0.ebuild, -hypothesis-3.4.0.ebuild:
   remove old
 
+*hypothesis-3.5.3 (07 Oct 2016)
+
+  07 Oct 2016; Brian Dolbec <dolsen@gentoo.org> +hypothesis-3.5.3.ebuild:
+  Version bump, adds the new dev-python/uncompyle6 dep
+
+  Package-Manager: portage-2.3.1_p8
+
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index 398cd1d..91d47aa 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -1,7 +1,9 @@
 DIST hypothesis-1.19.0.tar.gz 86227 SHA256 0e977a3492f5488ed9dd4a872cefae0934ad4ccd0229a6c483ef5ca0aaaddd6d SHA512 3b2cd671498bd0bc88c93b2753f35b02f737533dd8dbc786420a37a417d145e4f1c579741966394f85b7df4939e61f77315e6158b29e22f9bde07d31e161e009 WHIRLPOOL 52b444e6e3fa0c514ebb9816cd489b2441b213581e241f76ab5aa5c410ca08bedef92f0b608c32c421f74ba84a0e26850a2aaf9f2d9f7229aa176d9e501175a0
 DIST hypothesis-3.4.2.tar.gz 71270 SHA256 87a6b96670d52d9c30fff1342adec178822cd472775588d998bd860c05409688 SHA512 355815a11c57448a175a984d1ad6e87dcd9cc954acf312bfeff4ec499678166be6b9751173307748ff8b2d325b502cd31151e883e2a52f2d51a0395436bdb039 WHIRLPOOL 839bdc774f3889b0243119a81a9caa9eb29918dbf79ed7f5d7a1d15bab2e2ad6cfcd41948ab8b249c7bfecec3271aab99724b2eb2bde340136d9d9253f1fdeef
+DIST hypothesis-3.5.3.tar.gz 73052 SHA256 25bdf9bd507f6c66b33c11c8c8ba31c3a6a6969e9b2035554fde69ceed84633d SHA512 1b22715e3ead84075d58c3e6ddfc074f542b2bce077e4e63fadd5910266bad81b3393b8a5c8d3b77e6f73e6987428fc92bd38a2d02003b5f490dd4ce08bca34c WHIRLPOOL 61ae670ca5167bdf5dae3fccb53bca9504d7470a6a5f159e5631b8a772da66f94ef5f0113029f189137757a70c261fb8ec2efdc2e92ab9060f19cdf4a1156698
 EBUILD hypothesis-1.19.0.ebuild 848 SHA256 18ca55009bb5540a054d9e97e8d8c29ed184bb0a22c5bf31501adb2e5f030765 SHA512 eb06006b2efd622c097676d9219773469c45149529bcc6440380da2a438a56dce8fb10c2e6cb9d89eebfb101b6820c632722b9482e0cf33b87dab2650100165b WHIRLPOOL 7d84c67eaa6bca8d894bfbdb552e551230dc19390467306c04b999ec3c57abaa298d01efa4a5b60e21f0a8541f9f02df1326c005f3f48659eb4dd0b174fb23d5
 EBUILD hypothesis-3.4.2.ebuild 857 SHA256 e0d7d0af0c01cd0edbcfc5ff804e143d13235ea0825a0bc08aa06d18129e6de1 SHA512 06178e5c2e2fe30bf93b1adb088b30cec5715eb6aaedf600013da20c7b5bc41a36e241c622c7e92b7a4b1aa5d8f3421fbc6080ecf0016ef24d2c92f11f97dd30 WHIRLPOOL 2a858b089642b9437486458cc5d3be408d367df23433249de31c5db3286490d30c89376d066b1ca8548ca4326e0f65f63448ea9a3b35198fae759ea520e8a5e7
-MISC ChangeLog 9281 SHA256 1137bfab77ccc7ee5e81f516759c73becc293a70e22855a1609bacc8b1d3d619 SHA512 56a681dc64e63a8b544651222751636701264dca31918472a2875e71d7a2b008df684f2bf29b1c7b27b29beff66c7fe99916a376250a1d6cbf5aed141b27f3eb WHIRLPOOL aa72df21d4549e87d3de2cee247449bc9766d72289711f10fe39c82125f5ba88ebf8c19fc052e741afa7b4fe7cb125558b284784387480f3760a1bce5921bbae
+EBUILD hypothesis-3.5.3.ebuild 940 SHA256 769200e619ea08b2f4370e86a7bd1b97e46eb7784602f6f471b13f063c27d32b SHA512 2ad9ae63c4e7f11c4bc6bb95a79292bdc80bd878ad67c97cffc2b1f25a5e5716925814ea60346fa15b10b6ca5b001c9365fb18e8c2e2d5d32400d4d6e0213877 WHIRLPOOL 97ac32e07ea4b93440facf1661d2616d96d84258ad52c3d7e8e4c688e2dfef5621e6f443d4ec509e8d1664ad1a274e368e426c916ff1c21568dc3bf059745fa7
+MISC ChangeLog 9481 SHA256 633ddcd1eeec36252759a87c5ccf3c56aa903bc3533e933ef10976732da9bec0 SHA512 da415ef0df2b0a8cd0efcce9ed83d4f4edb1e841ea8ee65dac95f6cb7f9829b5c39531639c13dcf8245dc63e0ac5c1ece4fbd1f2aab1878bd0519b873c24b162 WHIRLPOOL be680eaf1b7901ed32ea783c4b211b566d564e50c0fd9f4bb44c64e75bf6d59da7481d8e0a2ca350049a8acc9c6b7d9379ab551a67d5047477c05c7132bc04d0
 MISC ChangeLog-2015 643 SHA256 8bd7afabf7b29c9cef84286964de6f612b036e52c56234c7daf0ef38463425bd SHA512 6d0960bab281c57ff2ed827062421fd636f8dfe1b388530fe02858883158d2a47cb95521736d23799f8928e2d7a8c108894dd05b8725531da9156df850bac405 WHIRLPOOL 40eb3e014b2dac792d9668b27c1281f7044878bb26224141a030a92f265d3e83a651c3faeb4c92e3655502f1205f53e9bc7fd7afc8059fb178fc808670a00cca
 MISC metadata.xml 373 SHA256 2fda97bf4d44f275db884f4b903ffa81d147e4ed6a7815c99c794508a7079992 SHA512 4afd72d123e00422c0262cb4ffb53daef620f34ffdfa67480114bb065de64b99ccff6286945ca3a8c4db999f7f87d3fa081bf50cf7b9b8571e7fcc6e7644c047 WHIRLPOOL 3a80f3d28a5637dc0629758db3c11e2880bfdf6c391fa48f6bc1f0772b0cb08f28b732484a96fa09f970344e778bd46818fc967d3623bd5fb1e5511a0f41bb90
diff --git a/dev-python/hypothesis/hypothesis-3.5.3.ebuild b/dev-python/hypothesis/hypothesis-3.5.3.ebuild
new file mode 100644
index 0000000..30fce5c
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-3.5.3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} pypy )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="https://github.com/DRMacIver/hypothesis https://pypi.python.org/pypi/hypothesis"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7)
+	dev-python/uncompyle6[${PYTHON_USEDEP}]
+"
+RDEPEND="${DEPEND}"
+
+pkg_postinst() {
+	optfeature "datetime support" dev-python/pytz
+	optfeature "numpy support" dev-python/numpy
+	optfeature "django support" dev-python/django dev-python/pytz
+	optfeature "pytest support" dev-python/pytest
+#	optfeature "fake-factory support" dev-python/fake-factory
+}
diff --git a/dev-python/priority/ChangeLog b/dev-python/priority/ChangeLog
new file mode 100644
index 0000000..b6bdf39
--- /dev/null
+++ b/dev-python/priority/ChangeLog
@@ -0,0 +1,15 @@
+# ChangeLog for dev-python/priority
+# Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2
+# (auto-generated from git log)
+
+*priority-1.2.0 (07 Oct 2016)
+
+  07 Oct 2016; Brian Dolbec <dolsen@gentoo.org> +metadata.xml,
+  +priority-1.2.0.ebuild:
+  New package, new dep of twisted
+
+  CVE-2016-6580: All versions of this library prior to 1.2.0 are vulnerable to
+  a denial of service attack...
+
+  Package-Manager: portage-2.3.1_p8
+
diff --git a/dev-python/priority/Manifest b/dev-python/priority/Manifest
new file mode 100644
index 0000000..7834ea2
--- /dev/null
+++ b/dev-python/priority/Manifest
@@ -0,0 +1,4 @@
+DIST priority-1.2.0.tar.gz 12064 SHA256 70468e7f43c4bb19cd966d63f78367d8c5af68828611aa3f3e5d77b8948cd2d4 SHA512 00cac802a7d4a6960e71d6d5552c2649becb07e9bd124421b8a391f3681ecdfcc4928725cfffe1011143789b75b8660bd178dbef1f7ebfadd25057d9d7f22dee WHIRLPOOL b1a2d5d9f64e22f341d6ee8f0e0dc43e4fdd2cebb0330ff186be12dbf3e676a20e17b1e27dae1eb7679e6debffaed92eeb2cc88f45fc8180bbc13cca8df2b7e4
+EBUILD priority-1.2.0.ebuild 849 SHA256 2c5190b69bb7f0baff40c2e2796978ac93e8b3e526adca5465d41fc03d824092 SHA512 3885dbd68ce265b48fd84a7cd54db4d50715caf06e87c1f5cdc1b21ea962600b0053e09d8908e31e57a35ce04b4046756d6717810155ebcadfe597f655307ce5 WHIRLPOOL e75e6507d2716b8a3e043d2ec63eb3b640248c706cc87daeee7da9f0102d3dd8abf94d498ced85dc7636043c46dd4adfaf43783e44315c80131f6f54c88e8468
+MISC ChangeLog 443 SHA256 c409879d937dad2bd801c47162157388bab0898f56f01785e21585a469a31ca7 SHA512 9311db2ede108dcc00a9db92d96b41a456a9228f6c5193fe2010d0ff0df8d927e15841e848484a2c697061c0e2ea6fe7a168a448c905c3b9285ee38714b54745 WHIRLPOOL e13f4da7c837c88d382b4c2089b034d7411e614da8b735bfb7d5386c5f71561667238ebffeea0eb89194988cdcb8138ee4df44a664eead7d55837c1fdad5ff45
+MISC metadata.xml 905 SHA256 665154d746702ab7ab4cfc50eb413e1d48e6bbe6cc9246720d4acb1cb7f4d555 SHA512 23cee64177ac2a84aefce183e9d94be29685a7a78ebb519d2baa3c2c48afac9da2d08457b75926957d1b37edf0def8d58afd0a23b0cc6fbbedb871f485d845d1 WHIRLPOOL 7d98f1625c0eb872dafc4a4cac85d115f6bc1469b36da9612eaecc7525c0a43d3080926334722417b87c20426b587d7d3ff185f3ab9f17473236fd2ae9440fa2
diff --git a/dev-python/priority/metadata.xml b/dev-python/priority/metadata.xml
new file mode 100644
index 0000000..b087972
--- /dev/null
+++ b/dev-python/priority/metadata.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>dol-sen@gentoo.org</email>
+		<description>Primary maintainer</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<maintainer>
+			<email>cory@lukasa.co.uk</email>
+			<name>Cory Benfield</name>
+		</maintainer>
+		<remote-id type="pypi">priority</remote-id>
+	</upstream>
+	<longdescription>Priority is a pure-Python implementation of the priority
+		logic for HTTP/2, set out in RFC 7540 Section 5.3 (Stream Priority).
+		This logic allows for clients to express a preference for how the
+		server allocates its (limited) resources to the many outstanding HTTP
+		requests that may be running over a single HTTP/2 connection.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-python/priority/priority-1.2.0.ebuild b/dev-python/priority/priority-1.2.0.ebuild
new file mode 100644
index 0000000..e7b9d0d
--- /dev/null
+++ b/dev-python/priority/priority-1.2.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5} pypy)
+
+inherit distutils-r1
+
+DESCRIPTION="A pure-Python implementation of the HTTP/2 priority tree"
+HOMEPAGE="http://python-hyper.org/priority https://github.com/python-hyper/priority https://pypi.python.org/pypi/priority"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND=""
+
+DEPEND="
+	test? (
+		>=dev-python/pytest-2.9.2[${PYTHON_USEDEP}]
+		>=dev-python/pytest-cov-2.3.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-xdist-1.14.0[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-3.4.2[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	PYTHONPATH="${S}/test:${BUILD_DIR}/lib" py.test -v || die "Tests failed under ${EPYTHON}"
+	cd test
+}
diff --git a/dev-python/pytest-cov/ChangeLog b/dev-python/pytest-cov/ChangeLog
index 3673ae1..409c781 100644
--- a/dev-python/pytest-cov/ChangeLog
+++ b/dev-python/pytest-cov/ChangeLog
@@ -133,3 +133,14 @@
   Package-Manager: portage-2.2.27
   Signed-off-by: Justin Lecher <jlec@gentoo.org>
 
+*pytest-cov-2.3.1 (07 Oct 2016)
+
+  07 Oct 2016; Brian Dolbec <dolsen@gentoo.org>
+  +files/fix-for-deprecation-warnings.patch, +pytest-cov-2.3.1.ebuild:
+  Version bump, adds a new pkg dep
+
+  New dep added: dev-python/sphinx-pydoc-enhanced-theme
+  The new dep is the reason for the keywords being dropped.
+
+  Package-Manager: portage-2.3.1_p8
+
diff --git a/dev-python/pytest-cov/Manifest b/dev-python/pytest-cov/Manifest
index 99b271a..866ecfe 100644
--- a/dev-python/pytest-cov/Manifest
+++ b/dev-python/pytest-cov/Manifest
@@ -1,13 +1,16 @@
+AUX fix-for-deprecation-warnings.patch 678 SHA256 139b0154d8e14765776f16d733333e36fa8bb812fcc715bdcfb804eb666d433f SHA512 3f20f6ef0514d676259e6bfd5c10c1877c4237a4a87161352adeda355dac693a6a43b8be3b29848feca433a9ead3e96967d8e255b62e3b60d816127eb17c4cae WHIRLPOOL db774ddb247bbe1eb535e2d4ddb181a58d44bf3a62ab8608e632d4705ae5eb642d3285b701b176b1d758bc1b64ccbc4bcdbcae8005f88c120eab4004eb9c28e9
 DIST pytest-cov-1.6.tar.gz 8257 SHA256 2e803c89f11e0344111670349f6ef401f831e85cbd287b0c5d61917da5aac454 SHA512 36c18e8e731613f2412e8e377f1911704d4af23a82fe66b822547850c3343204f682d3464c97f2cb4360f5090e7a58e5ac9679e83ae90adc0ccdb5b0e467430f WHIRLPOOL 41543b2e7f61d61d754bfef4c307fc135ab0d69b10d9e057f64bd3f4cacbc6e47316e478dbd797dd7aea0a8360bad5cc183214c742c749991fd5fe73b96503f2
 DIST pytest-cov-1.8.1.tar.gz 8649 SHA256 31e5198c06f290e1e813d30ddd063a0401d9e3a698129ca44267781673a71285 SHA512 dff6c6345bdc2d219800782d7acb3d301c8d67314f0f4af983daa0942a8c97768a2ce6c64f11529a3d8d876c218c62dbf08b7a63cc7345072e70bbc85ad4d112 WHIRLPOOL 90f024e0388323a5d1bd8ffd439c3c6cfb242ac2f539d391f4139a6ab2e251c6ff01831e9a261506d2c1552f1beeacc99db43d3b98a3663828083fec1ae722f8
 DIST pytest-cov-2.1.0.tar.gz 25992 SHA256 6e86c3ae3be9930fa3f1402651819b00169fb5e963d29ed03d390d152a608506 SHA512 f763e611b19f6769183583d275e28467f7cc5cc8a8fe5a4d3eb798ddf8d4e008732ec8c29b757aaf0fba0f5a660d92729499f3d388693f631ba73cc7a570d738 WHIRLPOOL 1ece60dea2fc1ff2da342313a0e67ee63a63cf35ece930f92b59c2283522698df0be4c10fb6951d3afff9fb1acffd37d207dcc4f0400109cb4f8c830d69a5857
 DIST pytest-cov-2.2.0.tar.gz 29965 SHA256 2231d43f07760d6904dadceabca53ab16ef95ba58fff393861b64c0cab96c9d1 SHA512 3e6a2b648b12eff3d8f0aad12dda35a05820f6073e7f87e9c92ed6cca00fe031750da8f6c37eb81cf6ca7b2e4975dafffd7e3e901cb7b91e5c53c83b6e6b8420 WHIRLPOOL 9feff5557af5f4101e9ae508febf3479472781544b54345d5f53f0f19df5f40eb5af4ada2b44037f590445761ee9d3bffe14d729c465f880951d714eeb6ae491
 DIST pytest-cov-2.2.1.tar.gz 33154 SHA256 a8b22e53e7f3b971454c35df99dffe21f4749f539491e935c55d3ff7e1b284fa SHA512 8f20cf1c42b4415c7decf8407582e64045c599aedf1970160d02e35e723f56fa095af26ee4390eabf2d32e209898b0a3dae8b7212ac81ecda64d6dbc7c83f790 WHIRLPOOL 92386bd1ff532e0c98f1dc01b3583315a626a030fb4f38e39eb4f8755e83f3901873fdcd406f9c8bc6393040fa198cc416dae5e176e88084ed6fb16264d3c056
+DIST pytest-cov-2.3.1.tar.gz 35378 SHA256 fa0a212283cdf52e2eecc24dd6459bb7687cc29adb60cb84258fab73be8dda0f SHA512 79770beb53fbb43b5d68311c2efd0accbfd890ab6dad299da8c1c0b3d26b54d984807313b1507900cda7004bfb50fedc0bd4341cfcfce47849a4f24fc8184f11 WHIRLPOOL 8b0fe223f0cbae0bb9c85b3d8d7f80456e164f3565bd7ba146b0eb34c1fd06c0447405dccd2642f0a4aec1819ff74277d2eb9b076e61438fbf69b35c472755e0
 EBUILD pytest-cov-1.6.ebuild 572 SHA256 fc9f2b1c216501b30ce9e975e8cf9c5e64aefc1ddca3686b469d1f643c5bbf3b SHA512 7956a6108fba0ca94ad62c3d596b94559ddfb5b8889649bb1f6c78cb8ba6918724634f1ec8d6d068bdeb77c57af1baa1f3f5d0e336d87b006a5e4e18583b94b8 WHIRLPOOL ae1b69843b93a6853a6d7738833b9e63c652c7a9fb9119b31c6afcc4d0b4bc32f592fdad0689cc5d07f69c22241b1522d81bfef17759de309a705f3a16b09573
 EBUILD pytest-cov-1.8.1.ebuild 970 SHA256 585bda4ac909cdf30e333345c962df09a3d87080488ad6496a0e11f4180fac3f SHA512 c0f4d579480c173438bf628d2224eb6058b4eb2391583104bf10a206f4030facd0a2441abda989d1a8779fddc947871b4d10cf273ab0e83c60a4b00037f078ab WHIRLPOOL 5e8ed013e9147c1b90bd940ed2701f81d10cbc829e0f1d60f093605c049617d9b4f09dbaebf22fce66774a24a590dde2ee2128de671777b0dfb2c09b5e4569d6
 EBUILD pytest-cov-2.1.0.ebuild 1098 SHA256 025b47f77c2118f67df9add35b8a48f1d1ad94fae1ece969755cf52ca70d5da3 SHA512 eb4ae9f71b1bb926d67fc6e5c05e249b57264844f5e54d9f687b2f7d7f6a9ae061a2636cb9bc7fa367a8c09e0a5c3e83dd3b7605159a3712673e8b161fb2c4ac WHIRLPOOL a6885d1803d61bb96f191626fc53ae7872dfa116766dda9ce52ded2aae860c03e06f839aa2e0f080dc94fc78c0806c3c5f9936a1f5ccca92166953c149bb1bb9
 EBUILD pytest-cov-2.2.0.ebuild 1271 SHA256 cb6a9c940e6c6ca6b0971b7261e032cddd2b21e5196dba2a418eca9a6a675df6 SHA512 3379219e147c991e0bf94aeefbbd51c532d8d779c02166e6e6781fda6a37909bf64ba4b589167683885b368accacdeccad87045dae779a378d4728e1ae96f0ff WHIRLPOOL 3c500e6325e1c158b514d3cb5ce0f3514650b03733d5f5cda0a1f20b9de564ec1b61e0c5b74ab8d6136e62ae34aae0414e9b982ee406a99e2bae36ee2d64afe0
 EBUILD pytest-cov-2.2.1.ebuild 1269 SHA256 67a31b9c8e5dd6e1145176122aeb3d16dd9576fd36b416b11202fb1e5243e507 SHA512 b30db9a9210bfffaac8429c13cb41c1ab7bc1346c3607a367c16686ac42f69d30b4e27f7cb205c71e65ae00720c21934cb4d189d4872155e350d0fa4de43af3d WHIRLPOOL 2bbdc40f680d01e1c82101f4d833976044ed5801e29e43e979553e59b9dd36d6b3ad76ad6995d98ad5497ad671f093e5378bc0866c1796bdfb0dff9be0ac7880
-MISC ChangeLog 4410 SHA256 7f3b41938c2b0ef765be6af7bdfdda9ee10920406dd399cd2a0e123263ed226e SHA512 ad2d0b6b50250339a1f4019cb029709b06a51bc56139c48d11b574cb09d1b795635ee48fdf902ee13632c24d38f0bc6b9397bbc6ac37f36f755c90b5df01c5c0 WHIRLPOOL b1dca450052ed74a7c4ae45c4183aadd7f17efef93c0fa3fca6ad22111fa2810b5440fc3d8b3c5e077d54517daf27163b926fe4d6339d2cd2e82c80984801741
+EBUILD pytest-cov-2.3.1.ebuild 1495 SHA256 1e26f12b07b96decaa6951f288ce0f80a24247201893663c9e0a02f87bd2a836 SHA512 fc7defbd55378c184af72dad6285cfa78d775728c05aa1915ae150fa4bf7540653bb83185cd24f3b7a1234907aad564406b47703dd706d8d5ff912c131818bb7 WHIRLPOOL 9bdd975e2822e656230bc49bb32fdfa66c32ae69323aefa1bbae23711a347b3f162767f1416fc7561c157dc3cb70e4e4f6070351555c7df6bf6a30a49d15ffcf
+MISC ChangeLog 4752 SHA256 800ade8b1a4dd03e111fc8a94fca08d1417c149b10dc5634f5d2672092897165 SHA512 e2ff2335bc456b4a3d567273848e57caa246f64ad742e3c41eac7fef6cbff6ae2c4cc81c09ef3b8b98727cc89746faf9ead2c71019091ec35db6953603967207 WHIRLPOOL b893e54bb258059de641a461462ed99e1ded5d8dacef4a3f7c07a5dc3bab4d7688c3a1b04f85a5561c4b81a9cd74ecae440bae9966a7dea5bd491043163b74e9
 MISC ChangeLog-2015 2344 SHA256 25d246201957d79d2b47312c02ad85d82be8467c35c4b9606e9cb69025245022 SHA512 4dd742cecc1577782e6a5aa320add68a841b8d06c7edd4cbbc84bb561a9a05c43ce56b39ddd063588a8a0db899f365b8cbf4865daa2ec641a888e473fb92df46 WHIRLPOOL 2c66ad76f3dbb63bc8cb0e827e957332f5902bff167f230d0711e551f6893d215547db7e3d2264979779176dc429c406a3e9da9ac73eb9596ae61453c71d5a95
 MISC metadata.xml 460 SHA256 3566a7f296e00e83979402930101a9ebaa79a2674adb349f5bb30d6e2cd82f41 SHA512 5600a6e66b683a30d6252699a28fecf727bdbbad6ef40cec0fabb89f5afd3a0cf1e2b8e2b80ffa6cc144ac03f5e7066117d72fc968492bd3b1d6c89a8b035228 WHIRLPOOL 5f8b3d37702903b24acd65d6a5c5c177d50c7eb2fd8f711d8e8b4246ce95117419d0ed0eafab03fb26a10adb246df64fb3ff4b5d7f36fb1b585cc8c97fac621e
diff --git a/dev-python/pytest-cov/files/fix-for-deprecation-warnings.patch b/dev-python/pytest-cov/files/fix-for-deprecation-warnings.patch
new file mode 100644
index 0000000..a555ca5
--- /dev/null
+++ b/dev-python/pytest-cov/files/fix-for-deprecation-warnings.patch
@@ -0,0 +1,16 @@
+diff --git a/tests/test_pytest_cov.py b/tests/test_pytest_cov.py
+index 6cbf341..614e53c 100644
+--- a/tests/test_pytest_cov.py
++++ b/tests/test_pytest_cov.py
+@@ -337,7 +337,10 @@ def test_central_nonspecific(testdir):
+     ])
+ 
+     # multi-module coverage report
+-    assert any(line.startswith('TOTAL ') for line in result.stdout.lines[-4:])
++    # Fix test failure due to pytest deprecation warnings being
++    # added to the expected output.  Look in entire output lines instead.
++    # assert any(line.startswith('TOTAL ') for line in result.stdout.lines[-4:])
++    assert any(line.startswith('TOTAL ') for line in result.stdout.lines[-10:])
+ 
+     assert result.ret == 0
+ 
diff --git a/dev-python/pytest-cov/pytest-cov-2.3.1.ebuild b/dev-python/pytest-cov/pytest-cov-2.3.1.ebuild
new file mode 100644
index 0000000..bcd9ef4
--- /dev/null
+++ b/dev-python/pytest-cov/pytest-cov-2.3.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5}} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="py.test plugin for coverage reporting"
+HOMEPAGE="https://github.com/pytest-dev/pytest-cov https://pypi.python.org/pypi/pytest-cov"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	>=dev-python/py-1.4.22[${PYTHON_USEDEP}]
+	>=dev-python/pytest-2.7.3[${PYTHON_USEDEP}]
+	>=dev-python/cov-core-1.14.0[${PYTHON_USEDEP}]
+	>=dev-python/coverage-3.7.1[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx-py3doc-enhanced-theme[${PYTHON_USEDEP}]
+	)
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/virtualenv[${PYTHON_USEDEP}]
+		dev-python/process-tests[${PYTHON_USEDEP}]
+		|| (
+			>=dev-python/pytest-2.8.0[${PYTHON_USEDEP}]
+			dev-python/pytest-cache[${PYTHON_USEDEP}]
+		)
+		=dev-python/pytest-xdist-1.15.0[${PYTHON_USEDEP}]
+		dev-python/pytest-capturelog[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/fix-for-deprecation-warnings.patch"
+)
+
+python_compile_all() {
+	use doc && sphinx-build -b html docs _build/html
+}
+
+python_test() {
+	PYTHONPATH="${S}/tests:${BUILD_DIR}/lib" \
+		PYTEST_PLUGINS=${PN/-/_} \
+		py.test -v -v -x || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( _build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pytest-xdist/ChangeLog b/dev-python/pytest-xdist/ChangeLog
index e30abb6..ebb98bf 100644
--- a/dev-python/pytest-xdist/ChangeLog
+++ b/dev-python/pytest-xdist/ChangeLog
@@ -88,3 +88,12 @@
 
   Signed-off-by: Ian Delaney <idella4@gentoo.org>
 
+*pytest-xdist-1.15.0 (07 Oct 2016)
+
+  07 Oct 2016; Brian Dolbec <dolsen@gentoo.org> +pytest-xdist-1.15.0.ebuild:
+  Version bump, adds new deps
+
+  Drop keywords due to new deps.
+
+  Package-Manager: portage-2.3.1_p8
+
diff --git a/dev-python/pytest-xdist/Manifest b/dev-python/pytest-xdist/Manifest
index 858c6bb..3fc547c 100644
--- a/dev-python/pytest-xdist/Manifest
+++ b/dev-python/pytest-xdist/Manifest
@@ -1,7 +1,9 @@
 DIST pytest-xdist-1.13.1.tar.gz 110007 SHA256 4382d7a944c1e2b1dc17fee3fd3575495fb10236a3b6e95cc6955db04984bc3c SHA512 3bb295c0afbcb0f238bdd41dfd1a395f0ba16b8151643aecc25aae13ac7c58d36d26ff4bab197673a9679d1f3436acd05b5ff50107b3128e647de892a6d04e3f WHIRLPOOL 643b23c755eb43c7b6965e588b58547c9ef63d3c225cddb97868c659ab3234bc6bc204575bc48c7f18a498cb0e595b8550928ba92ec5945a936e959f773504b3
 DIST pytest-xdist-1.14.zip 106585 SHA256 4a5e1199122fa29e3017d8d189f59ccc5d82e841474ba2a1eec0e89606153623 SHA512 4cafae77736da6880e8dd42aaa91f68bbc959ff7dabcd231018b144b54f96ccf1b11abb09474e260876bbdf731053005fdbd348ac87461f303d8f8f7af643e36 WHIRLPOOL 7d1f57a6d5cbf08661254f3f47d72c3cfbe931f14985c4b24abb627bd10fdc3f2fa21d05085766c0ed425e74713f991b53bdde957bd64ea4f64a206c2f4feffc
+DIST pytest-xdist-1.15.0.tar.gz 87799 SHA256 6238395f8bd050f9288a3b10f34330edece80f4424cf2b4204d6e7d622f0f00b SHA512 6429bd0c85024a2dcb453e4264f06d4a548637c4dcdeabf73d2b78a112ace70ff61cf0849a4845cc70a7650d10a99e5fe1087d3b7dba4b941ec0a771fc9338ed WHIRLPOOL 0454f615c24b14a86aba58c7bc9dbc2b43af82551ae3912358603450f0e3ac94e849eb2fc57bdda8bd1de5201111a3986d2c12c9f2923f4296718ffee84d661b
 EBUILD pytest-xdist-1.13.1.ebuild 853 SHA256 17fe8cd9abc395e733db1ee7bde9adb2ab22e4d23b8b1cb2f93446c2ab046f32 SHA512 bc408f798c56bcb2b7de39bd9a868893e7ae7e0fa367f1284f0b81813b3939f75d07e7df5e52f5f59c8a622b0916a98d99065a0f493e798e16f6bcf4ad0c7ae5 WHIRLPOOL c34a0f460a8f330415f2701ec40e018ec9c35387618e98509a39478824374ff5c8973ad8cb5945eac080983e8d6f216d2dccff21344f76d7918539f51171838a
 EBUILD pytest-xdist-1.14-r1.ebuild 911 SHA256 6f55340f697b8967b1e929d26b4bf42f961765648fdf0d0e3a8868b6dd987819 SHA512 1539a054f87b543978ba27b377e24da74c22c48f2091d2be470b8c0fa6e5e23f7c71df769a133971b4b8b4b4e318ceec60d59426262abf2ab1a50857741319d0 WHIRLPOOL 70de19fa64ad069882960aca4d8d26245659e0df8b7c5d85e4ce0c7628e13ece2655ac6584ce9dc937d26565755425cd6e93798442c1e40a5c7d50e443c3fdae
 EBUILD pytest-xdist-1.14.ebuild 866 SHA256 88f9157389a054f85a7c3f4eabfea5b252c36765536302de8059cf0090622253 SHA512 dd42f8fd42826bcad157a8a57596ecce84a62ab0484ad7728c9fa93dd77128558ff8038ffdd65424bb8838d81ba9f9569b0f5a81636a39a1c23dd328deafd105 WHIRLPOOL 335b7ad2c3c207879bb8dadb417d957f6097e72f19c91aa9229886c40090514d770b28fff8ccaf225a0c73ac700f5ed4412e30e726c785425c29f66c9ae1f137
-MISC ChangeLog 2745 SHA256 efa2f73af28a495e1519de1137d9840aa4608f0d3da0f51be71fe29071908d99 SHA512 762838a492104752af246b133c0881f4becc0e8013709d4714a2545d39254df703b26878c8d60b4b681c6cebba51f2bfda23ef899d5df3b3e2ac91293cb33561 WHIRLPOOL edef070625afe9962b6a110b4186b8ef12cfc734d74058ac073c3fdf653dc90e97b1ed03700dbbedf3819df1cbc8469fad8ac30824d7d7562c757c64ca9925b6
+EBUILD pytest-xdist-1.15.0.ebuild 965 SHA256 a68947301da944a2445c29ac3d526c8c6678dda8f0105e8aeebc546adcb8dc17 SHA512 40c7c18e82d867cb6f7e79145ebcee2e22ca7419ed8434cc42886b1254304d8ec8119bc097ada3ed556ff50bd278e0b4d82132000e57b14f4771dd006009e924 WHIRLPOOL 60bfac7b0d5ed1750946a2da489e8a3da0005b6f4cc1258526e0cb1d42d6f511cd9d56baca272fa11c716223de92862d5211a23743398adb80cfcc22beb2ae3c
+MISC ChangeLog 2960 SHA256 5a287de525283f7b2d75e1af523d2b8fb8a62b311ed880f64b651bf72f503645 SHA512 7cf895ca3109ad42dc3e987d31e0a85c501ffc75c5a25731dbf0be1f859c6cca0bb33b9717e561cf594ddef17aedca9b7e392c70870fdfca2bab4aff8c5d6afc WHIRLPOOL 4f48966e0cd05974653412e1f4e29ba1aaf62ffa4e0311bc6dcd92bd6dde190f5c4822cc6521ef93eaef12702f8debfe6d57103eca44471b34e7bc3c750d99c8
 MISC metadata.xml 429 SHA256 73ac3c3c930e2cdc91f8d5f5bd43237eca57dc7ee5bc545fa800acbd072c6095 SHA512 f25800e22c2d0c60991a0544f69e253c5751affd7ba178fdb6fda167baed0b9756bfba1fd850908d9ed05c5cf2091848d91593eec7346d00462cfb54aa1864ae WHIRLPOOL a6d5e70bf96079c7c9ea7886fb0a1f2eda9b01cbc4415d8f71a10afb0c21e68a873fe3ac5434ba30558a26eef0539d5616fa041cddf53b8102771054fafb3ceb
diff --git a/dev-python/pytest-xdist/pytest-xdist-1.15.0.ebuild b/dev-python/pytest-xdist/pytest-xdist-1.15.0.ebuild
new file mode 100644
index 0000000..5541df4
--- /dev/null
+++ b/dev-python/pytest-xdist/pytest-xdist-1.15.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Distributed testing and loop-on-failing modes"
+HOMEPAGE="https://pypi.python.org/pypi/pytest-xdist https://github.com/pytest-dev/pytest-xdist2"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/execnet-1.1[${PYTHON_USEDEP}]
+	>=dev-python/pytest-2.4.2[${PYTHON_USEDEP}]
+	>=dev-python/py-1.4.22[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		dev-python/pyflakes[${PYTHON_USEDEP}]
+		dev-python/readme[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	find -name __pycache__ -exec rm -r '{}' + || die
+	py.test -vv -x || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/pytest/ChangeLog b/dev-python/pytest/ChangeLog
index 120a1ca..c5e4b8d 100644
--- a/dev-python/pytest/ChangeLog
+++ b/dev-python/pytest/ChangeLog
@@ -354,3 +354,10 @@
   Package-Manager: portage-2.3.1
   RepoMan-Options: --ignore-arches
 
+*pytest-3.0.3 (07 Oct 2016)
+
+  07 Oct 2016; Brian Dolbec <dolsen@gentoo.org> +pytest-3.0.3.ebuild:
+  Version bump
+
+  Package-Manager: portage-2.3.1_p8
+
diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest
index 1421367..7e455b3 100644
--- a/dev-python/pytest/Manifest
+++ b/dev-python/pytest/Manifest
@@ -4,11 +4,13 @@
 DIST pytest-2.8.2.tar.gz 563955 SHA256 da2fc57320dd11f621d166634c52b989aa2291af1296c32a27a11777aa4128b9 SHA512 0df6e0421d1575e1efc0bb0550c5993f802777cb616ab1514bf12ed11eb5ec35a142dd837ff65659989268c36e441e18108369991cd3d458d357aac6ba433991 WHIRLPOOL ea917f4aaec444d6edc830b4ec66f7adb305031f11328e47d12a609ec92368a5c56e9cf8e24bd1a9a4a6a0746b43133f0d9821cf27d74c15ed2a83a705ee6030
 DIST pytest-2.8.7.tar.gz 564943 SHA256 fc4c86be54fce08e4b85b646a736efa18c6cde7599c1d2919f4f74629e018baf SHA512 c7f626ceb599811caeab4646389a2c489dd22d766c772d6ca686098cef9a11dca47ef41a4a4b811110f358bca1f1a678b549b2adfea48317ae70cf166289b371 WHIRLPOOL c3849f1a9f62c05c1ce20593f32ee513aee87853914be4099503cd47b068732df99605a0a4db9a3a7add4ef2a85f4d5376acf1a2e3f48f5d438433f200cb6196
 DIST pytest-3.0.2.tar.gz 727551 SHA256 64d8937626dd2a4bc15ef0edd307d26636a72a3f3f9664c424d78e40efb1e339 SHA512 38485c73f9df3c76b7b920b6957ffe4fbfd32ca0c46b73a53375a40586a482d270bf71b4457b68d48815d50ad173824b269ece255692ae0d1b13f0b1885ce54f WHIRLPOOL b6954a95e5f7d9b904c7543a09c2ef237c76c3a35bcd3e24c402a02aec3b35a19cdb952ac38af4ce43ae516cb5ac52023a0d91f2c587343265edd6d493145e8a
+DIST pytest-3.0.3.tar.gz 731934 SHA256 f213500a356800a483e8a146ff971ae14a8df3f2c0ae4145181aad96996abee7 SHA512 ec0b4a5f0d6673a339c5a70b402c004c23db7001005454329eeaea15d890f53b8f2740f6c6254499d0f915b9058bfdfa535d9f22847bb382a060d65204fce4af WHIRLPOOL 1883909fa23832e674cf912b1d88957dd435143dc124df5454c08ad02c8077473168f749ea94539c2c4b5cf08648a0bce7e90937bbdacd4bb69a4ccf15ecff23
 EBUILD pytest-2.7.2.ebuild 1912 SHA256 f8a538a86b9e5d9478c34a8ade6875edd1023c68fc7300e1152f7f7a5c134326 SHA512 a8418d91cb994f6c9980e76be9226cfa1a7a5c1054df97b7499f77f35779bb9be8c84792add02771e385aa60e216a9554dbef6b8c1d13ed035e358949e6ad6fe WHIRLPOOL 64443f3d857a91be9cdab78a64f052602d213f4e13f46973e3670879340a832c5b696bdeb8168bdb8ec3f4838dc6556d41ac025ef12490dc0c1403b429f9d1ab
 EBUILD pytest-2.8.2.ebuild 2462 SHA256 84c542d36e22e9a30c386e91bb41fd794c0313009709a396071eb5d9aa39e8df SHA512 cc541dccd89b647b933e9c14af0c5024acf0e8bbdf43149ee1478901817576c166760e5e093348ea30c2e86f104b4ceb09490d32b643474f64e58152f3c728d8 WHIRLPOOL bb378ae885e165cfef347d6db58ad2b2569cd88a903a65b49b5a3c30c2e37cb6386421125e3edfdc06f6f97ce38d7ee78afa8d004aa71d32c1530129f94e4016
 EBUILD pytest-2.8.7.ebuild 2264 SHA256 f745b399257536bd6d083c0da7096e3ea677e03223cc4c3e1b225c7b74474118 SHA512 f84faaa0d605416d761e15483cbc0c4b8b81ca6e989c862d5b8a451e4d004c2ed28dfca50ec800afc4ccac901686270cb02d88864622e7e04e9366e4f2f6065f WHIRLPOOL a388f4df78a47fd5c5895c6d3553b5058328cc0881ed84c376c4cc369c89ae1cbdad7badfcc0c077546d1abf5dca2c2d84c7b03dc027f63345c0de57f740108a
 EBUILD pytest-3.0.2.ebuild 1773 SHA256 ce24201ff83040c5e4bdf48c747746f2f7990e632907d2b7cb4709b2038ef723 SHA512 93b794461ca3fe1850c3f868eee6836409b02473afe4f2bd19851b489446c785b55c5a3e04bdde7b9824eb0030dc61e663f324880e4aced3b663e696d8b57849 WHIRLPOOL d7cbcf9fec2077c1673f93554f13cb5384a5373e22907a693dbd35931745cb52d37e91c7fa64e805703c5efdd5f90e340f33f67772b7490ce74d809f2e72076b
+EBUILD pytest-3.0.3.ebuild 1892 SHA256 fe7dcece0807d69360bfbfb97153a282998ade5f4254e5b6c7bbd7ce42d34be9 SHA512 e6e7c1fc81df6a26475ec6fcbc62d655d32cf0b6289f803dd4644fc177f181fd26c12ae3974f259afaf391eb5e1f4b1c39e7af86367c6c97fa30ed561d08c271 WHIRLPOOL 3e16148914c3b6d1923926b42e8f184c2de396583c90e5aa964577623a1b33d1016e445d6537fc6636acffb5361099b06c1715d53ddb9998c2064ad007249461
 EBUILD pytest-9999.ebuild 2038 SHA256 0a8f96bae74200f651afbc0233d34fed242e376c5b0b0d8ed443e950a6b3ea8b SHA512 298d1beb7839500176e9c8f9e577629f3c4a1a4dfb9f009dc96b68692182405df2d29689e82191b85d72a9504a6a67b3685b165bc868c77e4830671ee8cb9873 WHIRLPOOL bc10257a76ec0f7fe8d253b5c901c13dea8670b3bb6ada0583cdfe17401cf66232982de6ae4772c8a5397d6b1bbcf4fb53b9a842289f403b7feb251faa94515e
-MISC ChangeLog 10795 SHA256 1a5a08bed01214d22b1ea50b02f89498afd1d25893a3e5637e951ddc3e808e0b SHA512 90a390607bb8f2a66663e7f0dd83eb042ddb1eab6701cff7d91fe5b0ae26a2e7b595b63da751110864a5ee74b43a9154b47ef48798acca6848a8ed8c85b2edd6 WHIRLPOOL 7496e6421d4cb8c519106e4901052b99073aac548919de1955e0736b4e895ce7a0f08539a8a8b79053cbde77e4e81ce710a9e7da8bf3ff78310d73084ad21149
+MISC ChangeLog 10947 SHA256 955e0f8e5ea0bb923b3915559b584b30d2b31cbe97215e8e2ff11460748d4ceb SHA512 edf263e98402efe21b3dd2eee4ec60221937bfd9bc381a5bfc946501b58950ce2bc48b5e7009f817f2c86316a7f59e7030614021d073d30f0ecc8c32df4c0505 WHIRLPOOL 0fdb81d0e261263fc6654a55b525c908cb9127337fdfc77c23522fec3c9bc7bcf2f9373a230226fdf4e1d5b0b2e4341f643cd1eeac6cf770e4216b061d0aef00
 MISC ChangeLog-2015 15727 SHA256 8688ac25ad7926b19068286232de9d74fa6467f88f6c99582453f38a2ead5d1a SHA512 89b9562c4422f790f85ffe60be51514edc74f1026120e8f08f6a239d129320f5009cc12b71712e9f109739986d16edbafb907c65cb81f575789229103ee3a79f WHIRLPOOL b6ee4db981666b1152843a0ac5e5dd708a9848044fd5c7a0b1d38c27568e64d05151a307f77574beb4001f0523d3652ab7ee5c5a181fba48a7402f274ae4a045
 MISC metadata.xml 309 SHA256 111a0412dd611ef0aac38a927660dd833b1bef90e3fa0df26af5de7d5d2cc437 SHA512 ba53c13ac716488e3e5dadf5dcfcb697dc9bb13f89e9d0fb98b9a5a6e36cafeeb64d1348008f42497117bf46fb6f3bc288c10a68c4d5ab53c9c02a3ae61b594f WHIRLPOOL de2705c5d611e06874c6cc2e1da2cccc3c2c65c36cb9bf21d9da5a07ae8bb8f038ab9c80a6ff87d4448f258508ef5ebafef68640049f1087c8dcac04eac4783d
diff --git a/dev-python/pytest/pytest-3.0.3.ebuild b/dev-python/pytest/pytest-3.0.3.ebuild
new file mode 100644
index 0000000..fef1880
--- /dev/null
+++ b/dev-python/pytest/pytest-3.0.3.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Simple powerful testing with Python"
+HOMEPAGE="http://pytest.org/ https://pypi.python.org/pypi/pytest"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+# When bumping, please check setup.py for the proper py version
+PY_VER="1.4.29"
+COMMON_DEPEND="
+	>=dev-python/py-${PY_VER}[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/hypothesis-3.5.2[${PYTHON_USEDEP}]
+		>dev-python/pytest-xdist-1.13[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	!dev-python/logilab-common
+"
+
+python_prepare_all() {
+	chmod o-w *egg*/* || die
+	# Disable versioning of py.test script to avoid collision with
+	# versioning performed by the eclass.
+	sed -e "s/return points/return {'py.test': target}/" -i setup.py || die "sed failed"
+	grep -qF "py>=${PY_VER}" setup.py || die "Incorrect dev-python/py dependency"
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# test_nose.py not written to suit py3.2 in pypy3
+	if [[ "${EPYTHON}" == pypy3 ]]; then
+		"${PYTHON}" "${BUILD_DIR}"/lib/pytest.py -x -v \
+			--ignore=testing/BUILD_nose.py \
+			|| die "tests failed with ${EPYTHON}"
+	else
+		"${PYTHON}" "${BUILD_DIR}"/lib/pytest.py -v testing || die "tests failed with ${EPYTHON}"
+	fi
+}
+
+python_compile_all(){
+	use doc && emake -C doc/en html
+	distutils-r1_python_compile_all
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( doc/en/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/python_orocos_kdl/ChangeLog b/dev-python/python_orocos_kdl/ChangeLog
index e477a2c..b60185c 100644
--- a/dev-python/python_orocos_kdl/ChangeLog
+++ b/dev-python/python_orocos_kdl/ChangeLog
@@ -70,3 +70,12 @@
   * dev-util/wstool-0.1.13 (upstream tarball changed)
   * dev-util/rosdep-0.11.5 (upstream tarball deleted)
 
+*python_orocos_kdl-1.3.0-r2 (07 Oct 2016)
+
+  07 Oct 2016; Alexis Ballier <aballier@gentoo.org> +files/gentoo.patch,
+  -python_orocos_kdl-1.3.0-r1.ebuild, +python_orocos_kdl-1.3.0-r2.ebuild,
+  python_orocos_kdl-9999.ebuild:
+  install package.xml in /usr/share/ros_packages/$PN
+
+  Package-Manager: portage-2.3.1
+
diff --git a/dev-python/python_orocos_kdl/Manifest b/dev-python/python_orocos_kdl/Manifest
index de528b2..9df01df 100644
--- a/dev-python/python_orocos_kdl/Manifest
+++ b/dev-python/python_orocos_kdl/Manifest
@@ -1,6 +1,7 @@
+AUX gentoo.patch 561 SHA256 22d4f5a75208bd08455b10ff60ffb3345140af039121f2511b551a91b4db48e6 SHA512 ede9c1ded237af5d2994846ebe29f7cafff93d68485f7e6a687453bcbfbbc406da837482335b620ad8dfa986c1c69c58004656b9821c6067efc523bcb8d15820 WHIRLPOOL f3cf0fde81c788a68f375b073e005413a2e1827ee1122a8035eaa90dadeb465fb4a6ad38c1b2397663bf62eb2d615d91c894dcb6c9118a3d2f9a50e7007e4019
 AUX py3.patch 2597 SHA256 d1a6b84f5413da30a0d531d98e1156f33ab162aa98e29bebe422cc20fe67cb4f SHA512 d34d0f4470c56a9b09d7d3b788c82b47088e937b19bf2b7f8dfb7c950a2d718952af1674f682f97030e6fd5ab17f9126c92902f310459c9341a8d0b38dcc205f WHIRLPOOL 4831381c6d2c5464ab5f6fa7dfc59d9ab5c4fdfc228f775762bc0a8a670717ad50d6e5d38eb56392df872a6410313b02af9d0cddc28bec4477633a45ecadf0d6
 DIST orocos_kinematics_dynamics-1.3.0.tar.gz 200229 SHA256 7be2dd5e4f4c1ceac2cdf1f4fae3d94d4ffd9fc1af8d483c05f04e80ef84b3f9 SHA512 09ff63f74f1eac3ee8b1090364e0d95b4ae96c9d4435ca34adacb3ded7385f948ddca9be2c1c2c2214c9342b17bbffb7da89ba9b7cd402e7fd4f2c6dbd06a930 WHIRLPOOL 4085fa4aba77e0c24a3c1aab4ab5f98e8b349037525e6a596ff027075ea1dcd33c4f13fa3abd61bbe6a2a3bd13b62616d7b614c030ecda8343be3ed59406bae6
-EBUILD python_orocos_kdl-1.3.0-r1.ebuild 1199 SHA256 2dea2494305ce8b16f67640c43fba24ffee59956ddcd58e1387fd85c6b6d5522 SHA512 dda2955be638e6d4d77b65221fa3154c040ee8cc6137face23f6259dd198a93852364b09cfa69fd71575bef743d4b99912f93b14ee784aa88c8bcee7fcf3952e WHIRLPOOL 0a1453fdd578e1a7dd9ba92650bb8ed0563e6f74c3357eee679d3e316cfbe62286c9b276fd670d15b9ec32005d06db54b4c0f1e08df160baca66b56b18381b38
-EBUILD python_orocos_kdl-9999.ebuild 1163 SHA256 29fdb9cc47c2a2bcfb2ad835e70c1278063c91ba0143483047b2256699d4598b SHA512 04f3a9b92ec53c5be14869e7b77515e97bbf90ec49c3528e8fc917fbaff7abb754fb9baba429243baefc6b3493b7ef448a700b126780db760f3c5cfe7d69c240 WHIRLPOOL 882dfb0762fecaf77243904edd6fe494a826f4efcc2fc9e1c2e49b7f1fe844bfbb54c249ddae9e243016da6b06a12285b16eb62e520a929fde9e8c06c3c69647
-MISC ChangeLog 2747 SHA256 353d516826fc400893568d25d2ff2250d84753d35d2902cdfee168e6b2522236 SHA512 a9af0feeb0fc8a32c9a6ffc0a3102bb3f9f983b35621ce24f512d7ad5c5ca475901fcc765e287cb4267bfc74d6049a0e099aa121a1f9e944ce484d7525b7243b WHIRLPOOL edbeb0489853ac001d8df6614ff49eedb94185364c1007e86a43b2dd7149344bdbbc21dab55c2862475393db1755c78e1c3baae9bb383fddac9b80332a1f6995
+EBUILD python_orocos_kdl-1.3.0-r2.ebuild 1226 SHA256 6b6e9a4a291711c5b0e0420dbbfbeaa384e8b157384c9a57c922109d616afaac SHA512 2e5c80d88ef2239d966ea755494f8164b0dfa62bc9d1496203a59619fd20792e4f7dcdaec15d5122bf1a54b01654955cbe1d267f36d0516c3f778b420145c6bf WHIRLPOOL f39670a38dbc2b9e539239200eb8b7ad35be76fefa3d5474abbe8ae4a033aa2e57b7a0452c3f57b73149b2f1d6f11970c2548fb5f2effeb0462d354c48203837
+EBUILD python_orocos_kdl-9999.ebuild 1202 SHA256 5c73d12f1a299e3a2b04026a8d6642818ff86c1e2a1bf38894ba742df729b636 SHA512 3d035b9060376c39fa53e8f5c7a344ea11157432de258b96f1d9f5245250e225c38399579caee23e90665a7a50350d3b416f8d4632d1457165cd07bd22b1c2b2 WHIRLPOOL 693f6fed809368a855027e033fa0cad0279253cf95f6c2c5abdbd78d6a688964e27510a3ef4cf9b655341319f12c5fbb070d1cdc72eb11ae544858862ed8340f
+MISC ChangeLog 3058 SHA256 39aafb33f774d9f19583f5f2a625641d86909d6756537ce22f9068bcc927a709 SHA512 ad43ff2cc74d585f89b40a80e8716181fcb4b6922baf630fcf099d193b7ad182b991f49f5ceb53ef729280fe402bd5da4803254d44d101024e682f82dbf46596 WHIRLPOOL c01470074ccff1302615a4096c76e3482df99cdb6695e3a16396cdfd2cf8e5b09a08d152e1ca850191cd5ef0c43c436df5a9ae6d882610dfdc4fd4420fa773e5
 MISC metadata.xml 347 SHA256 36c72daab2dd6ad4adf2df67c2f0af790567f2a1e0a5d8798f691bc0ba084105 SHA512 a32a6de7eece8df29d9542f14dccacb7d046e7205af6bd996d41279175111c9416cddf78cc8a87e2319cc1b25bf880b38e8d2d0573ba6747820a5c328d809074 WHIRLPOOL d63a0dfa5b416524cf0653f55ba2953f31b2aa0c098d98bcb073fd9ac0a017eb5c755e4665686a1a6e4ab1039df0d2d084e87596daa773983ce94c2adbeeaa6a
diff --git a/dev-python/python_orocos_kdl/files/gentoo.patch b/dev-python/python_orocos_kdl/files/gentoo.patch
new file mode 100644
index 0000000..f5e6638
--- /dev/null
+++ b/dev-python/python_orocos_kdl/files/gentoo.patch
@@ -0,0 +1,11 @@
+Index: python_orocos_kdl/CMakeLists.txt
+===================================================================
+--- python_orocos_kdl.orig/CMakeLists.txt
++++ python_orocos_kdl/CMakeLists.txt
+@@ -21,4 +21,4 @@ set(SIP_EXTRA_OPTIONS "-o")
+ set(PYTHON_SITE_PACKAGES_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/${PYTHON_SITE_PACKAGES})
+ add_sip_python_module(PyKDL PyKDL/PyKDL.sip ${orocos_kdl_LIBRARIES})
+ 
+-install(FILES package.xml DESTINATION share/python_orocos_kdl)
+\ No newline at end of file
++install(FILES package.xml DESTINATION share/ros_packages/python_orocos_kdl)
diff --git a/dev-python/python_orocos_kdl/python_orocos_kdl-1.3.0-r1.ebuild b/dev-python/python_orocos_kdl/python_orocos_kdl-1.3.0-r2.ebuild
similarity index 91%
rename from dev-python/python_orocos_kdl/python_orocos_kdl-1.3.0-r1.ebuild
rename to dev-python/python_orocos_kdl/python_orocos_kdl-1.3.0-r2.ebuild
index 928ce27..a281238 100644
--- a/dev-python/python_orocos_kdl/python_orocos_kdl-1.3.0-r1.ebuild
+++ b/dev-python/python_orocos_kdl/python_orocos_kdl-1.3.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -32,7 +32,7 @@
 	dev-python/sip[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/py3.patch" )
+PATCHES=( "${FILESDIR}/py3.patch" "${FILESDIR}/gentoo.patch" )
 
 if [ "${PV#9999}" != "${PV}" ] ; then
 	S=${WORKDIR}/${P}/python_orocos_kdl
diff --git a/dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild b/dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild
index 036c759..2d7c718 100644
--- a/dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild
+++ b/dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -32,6 +32,7 @@
 	dev-python/sip[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/gentoo.patch" )
 
 if [ "${PV#9999}" != "${PV}" ] ; then
 	S=${WORKDIR}/${P}/python_orocos_kdl
diff --git a/dev-python/rospkg/ChangeLog b/dev-python/rospkg/ChangeLog
index 3c137d5..c467fcd 100644
--- a/dev-python/rospkg/ChangeLog
+++ b/dev-python/rospkg/ChangeLog
@@ -101,3 +101,18 @@
 
   Package-Manager: portage-2.3.1
 
+  07 Oct 2016; Alexis Ballier <aballier@gentoo.org> -rospkg-1.0.38.ebuild,
+  -rospkg-1.0.39.ebuild, -rospkg-1.0.40.ebuild:
+  remove old
+
+  Package-Manager: portage-2.3.1
+
+*rospkg-1.0.41-r1 (07 Oct 2016)
+
+  07 Oct 2016; Alexis Ballier <aballier@gentoo.org> -files/norecurse.patch,
+  -rospkg-1.0.41.ebuild, +rospkg-1.0.41-r1.ebuild, rospkg-9999.ebuild:
+  drop norecurse patch now that ROS_PACKAGE_PATH is installed in
+  /usr/share/ros_packages.
+
+  Package-Manager: portage-2.3.1
+
diff --git a/dev-python/rospkg/Manifest b/dev-python/rospkg/Manifest
index d95fa01..c8fc19a 100644
--- a/dev-python/rospkg/Manifest
+++ b/dev-python/rospkg/Manifest
@@ -1,12 +1,5 @@
-AUX norecurse.patch 2493 SHA256 8828779c37ba42e782d4ba091c199775c8f7fed43b1cd69a4877a599f9fdc8ef SHA512 768cf5cf66db4e07b4a4a975ca2f3003491a4d5427a1444925d2555e67c39465bbbe6a220c2714bd48f84cac57fb34d8d24e2cb1070efbae91aabe4556828be1 WHIRLPOOL 0bbe36294c29b4929272355f2e792e47a7a97370b7a7347837728d5c866843e31316e8305021c546a6f780ec5293acee9de33106d53e060a3f65d975658b7856
-DIST rospkg-1.0.38.tar.gz 89321 SHA256 1a1567d3e33c3910518dbfbb09760c499153b1c0ad6b8ddc5045488c11db43e4 SHA512 21cc9057a445b06db66b454e46c3ecdf8d83e54bbf4c204c63b13278dc93cdad60a80f4cab29eba7bc1811d43b406f91435499f7e58fa97814302dfb786f483e WHIRLPOOL 109e8d5ddc3f432c28959b7e6f15703aa2d67cd3ee524e4964e5388a7982b6aea144e5afcf0d22add230e33beb485ade0656025b77f2b56be75d313aa1e52870
-DIST rospkg-1.0.39.tar.gz 89428 SHA256 36533bc98c57b0ee99b05b8e22160c1ee3393cd6aec7f87840b420ed7e8464cf SHA512 c68fe32479e6c800927c73bd6e35a9f644c550a79181525f16713683ad196f2ac0425e5f9eea8eff2ea919de39867b0f31c929f618804aaa93a234f28f16c579 WHIRLPOOL ad446b8f9d21443b7b3416065244964b94a9b0254dee119d7f70ddaaea8b2202401094d6c725629537d97f33429d0f63866dc4c5c7d098d2a8216382e946637a
-DIST rospkg-1.0.40.tar.gz 39548 SHA256 ccd1d635319d41b79139b7336af64fc17a48a69ce0d728c1578c78f6350dbe1c SHA512 92a4760922b3d12850ab4a5ab8298048529d9cb427e85e3105b7b45e3c1f061351ee9611aa4b3ee29944e2d5185481b1d96593c04b25109156eb8e8aaafab0ea WHIRLPOOL e2b0b92228a03ed4d4e31d283f34708d99bb1f3d484a892a3d883110af9f63d78df46ef84c07c368250aba12955cd1f8cbea0db1d539fcf0b02951ec677159d2
 DIST rospkg-1.0.41.tar.gz 89625 SHA256 19e0ebf751a716e312ad848ab2b545f6634d87573109b6164438db210f1f1c12 SHA512 d831ed5da8c5cf8d01cafcb83c879ef17647bdd8ec40f58e27766c5843bba118553daa932e18d9448120ce0be3e89f20a0ddd728c38ce47b2b3a41fb537123b5 WHIRLPOOL cb1e3a5dec83f0b1612df8dbbf46c845f970916259084fd9c2b8b80d0bb8ea0bc59bf064685461ec64637259c36cedb45f4f431656627beedfddf0c915ad4762
-EBUILD rospkg-1.0.38.ebuild 1233 SHA256 c4e0142f9e580e8075013c87ca1650ae8c97d76717cfc694477875eb1f19cb26 SHA512 35c375932622d1d905a7eccc59218998d7c4989887556425889b8e117064dc3ff8651e914ec28d23c07953da11945b1a2f553316345147602013d96ac2d92e3e WHIRLPOOL f09ae4834b21a8e03a61392fbd7fba53a49ee75d4ccbfd4f21732a53a17f2f969c16d21a908c5da90163823bf72bad70c9f94503fa6caf4dba8945e99123ba21
-EBUILD rospkg-1.0.39.ebuild 1233 SHA256 c4e0142f9e580e8075013c87ca1650ae8c97d76717cfc694477875eb1f19cb26 SHA512 35c375932622d1d905a7eccc59218998d7c4989887556425889b8e117064dc3ff8651e914ec28d23c07953da11945b1a2f553316345147602013d96ac2d92e3e WHIRLPOOL f09ae4834b21a8e03a61392fbd7fba53a49ee75d4ccbfd4f21732a53a17f2f969c16d21a908c5da90163823bf72bad70c9f94503fa6caf4dba8945e99123ba21
-EBUILD rospkg-1.0.40.ebuild 1233 SHA256 a2b53a9136b63a3e0dc71136d02aa1edf6807532add2403e3dcd4bcbbc7b600d SHA512 916b1b1320b84c452a5b10effb30278b2ed8454dfaa614be1b2af3c8b22693df67ab807513c1af4eae6041ac0a95f3251495ed7f07a5b1f5d84538e99ee19a73 WHIRLPOOL 52eed2d4355f4ab00944f8ba1318221230b761027a0ebb901afd0944584d8f1e23d25125fafc50fd9a47139f27326826acb255b14e8e2ec78fb749ce00a21f72
-EBUILD rospkg-1.0.41.ebuild 1233 SHA256 a2b53a9136b63a3e0dc71136d02aa1edf6807532add2403e3dcd4bcbbc7b600d SHA512 916b1b1320b84c452a5b10effb30278b2ed8454dfaa614be1b2af3c8b22693df67ab807513c1af4eae6041ac0a95f3251495ed7f07a5b1f5d84538e99ee19a73 WHIRLPOOL 52eed2d4355f4ab00944f8ba1318221230b761027a0ebb901afd0944584d8f1e23d25125fafc50fd9a47139f27326826acb255b14e8e2ec78fb749ce00a21f72
-EBUILD rospkg-9999.ebuild 1233 SHA256 c4e0142f9e580e8075013c87ca1650ae8c97d76717cfc694477875eb1f19cb26 SHA512 35c375932622d1d905a7eccc59218998d7c4989887556425889b8e117064dc3ff8651e914ec28d23c07953da11945b1a2f553316345147602013d96ac2d92e3e WHIRLPOOL f09ae4834b21a8e03a61392fbd7fba53a49ee75d4ccbfd4f21732a53a17f2f969c16d21a908c5da90163823bf72bad70c9f94503fa6caf4dba8945e99123ba21
-MISC ChangeLog 3224 SHA256 5298bd56ada209af9216f18b3fb0020b9295939a5487f5a176e406e9d557a2a2 SHA512 2de331865d49ea382d8fd17cb3554d003784b677823925d63f434c9e6496e2d2e397ac7c967e0f9b5f2e8da46a9b00edd4787cfc406c4c3c76404577bccac6d3 WHIRLPOOL 2cc77e958908401649f6dffb3c7a149fe2c9d20e400f1ae2e4377f4ea5c2878fb8981812319e77fbc2cdbe42dfe19d6ecbf45f6240cd103a2597395a23dee8f9
+EBUILD rospkg-1.0.41-r1.ebuild 1021 SHA256 10787145cd25d4b408ec1c859614456ac674083b2c150c85a06ddc8e9628278e SHA512 545325c0fcf1abd96a6a87af4cd40707f8cce7ae6b38e59bbb6e089f8bc694e5082aa0e3699cbc765f80b6c3fe3a97f68f182fc82776273c9d5f164277fdb938 WHIRLPOOL ecf13b58a8063dfca6d90490a0ce0512f6aa0e0f0626abaa6f73cfa3dcb1769f76f6199949753119f246e0c92894ee4211167c2caf4aba1842cfcef7f4a31653
+EBUILD rospkg-9999.ebuild 1021 SHA256 10787145cd25d4b408ec1c859614456ac674083b2c150c85a06ddc8e9628278e SHA512 545325c0fcf1abd96a6a87af4cd40707f8cce7ae6b38e59bbb6e089f8bc694e5082aa0e3699cbc765f80b6c3fe3a97f68f182fc82776273c9d5f164277fdb938 WHIRLPOOL ecf13b58a8063dfca6d90490a0ce0512f6aa0e0f0626abaa6f73cfa3dcb1769f76f6199949753119f246e0c92894ee4211167c2caf4aba1842cfcef7f4a31653
+MISC ChangeLog 3702 SHA256 17d0ee1a35667eeacc39f4a152b3898e5021154ccf54a04ed16f392d52651cb4 SHA512 f5abcaebc7bf96db860a0807d71a8e43ab46872376830f6023ad441924629842a374757d2f52d0dceec3d23f1b0e679c8b288a82e1526edb26c6edaaab78428c WHIRLPOOL 4f8490b5e060697b4ea1fdf33bad77b7e68fbfd169e1fa519086d9fd876e30b2cbc2779a38d0f39eb66ff1a705c3c97c77859a7df4f4320cd2fa96cf850d9e44
 MISC metadata.xml 339 SHA256 d82004a55dd7c03fbb548e4af6bdfa81d884e3628b7413cd4387669001193a2c SHA512 c9e10c6eecb919a284258e818a9830f6ba2afe095a9f4c565bf086855d5bbb26bf6973455c62a38ab4e20eb88da1f3d44b97597b197ca30227a7e7438a84d8a7 WHIRLPOOL f0c205f78ca65c5afc7d5dfaa82d21c68afb24575e03c6797de29874a35f96e44f498384c96430b5b352a4e740bc0e8637b8e8854306b2dab8a31214b53bc8d7
diff --git a/dev-python/rospkg/files/norecurse.patch b/dev-python/rospkg/files/norecurse.patch
deleted file mode 100644
index 4b7aae9..0000000
--- a/dev-python/rospkg/files/norecurse.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-commit c2e06e0ea0b4a1cbb67049ab77a80f53646fb0b2
-Author: Alexis Ballier <aballier@gentoo.org>
-Date:   Tue Dec 23 12:27:19 2014 +0100
-
-    Add support for rospack_norecurse to avoid recursing into all subdirectories when looking for a package.
-    
-    I am installing ros into /usr, hence this searches in /usr/share. I have a lot of directories, not ROS related, into /usr/share (e.g. a full TeX Live install), and I get these timings:
-    
-    Without rospack_norecurse in /usr/share:
-    $ time rosversion rospack
-    2.2.5
-    
-    real    0m2.861s
-    user    0m1.588s
-    sys     0m1.267s
-    
-    With rospack_norecurse in /usr/share:
-    $ time rosversion rospack
-    2.2.5
-    
-    real    0m0.135s
-    user    0m0.100s
-    sys     0m0.034s
-    
-    This is on a desktop with a SSD drive. On an arm board, with much less packages in /usr/share but way much slower I/O I remember hitting the 10 seconds timeout for roscore to start.
-
-diff --git a/src/rospkg/rospack.py b/src/rospkg/rospack.py
-index e55acec..7ed98de 100644
---- a/src/rospkg/rospack.py
-+++ b/src/rospkg/rospack.py
-@@ -42,7 +42,7 @@ from .stack import parse_stack_file, InvalidStack
- _cache_lock = Lock()
- 
- 
--def list_by_path(manifest_name, path, cache):
-+def list_by_path(manifest_name, path, cache, recurse=True):
-     """
-     List ROS stacks or packages within the specified path.
- 
-@@ -53,6 +53,7 @@ def list_by_path(manifest_name, path, cache):
-     :param manifest_name: MANIFEST_FILE or STACK_FILE, ``str``
-     :param path: path to list resources in, ``str``
-     :param cache: path cache to update. Maps resource name to directory path, ``{str: str}``
-+    :param recurse: search recursively in subdirectories ``bool``
-     :returns: complete list of resources in ROS environment, ``[str]``
-     """
-     resources = []
-@@ -89,9 +90,15 @@ def list_by_path(manifest_name, path, cache):
-             # optimization for stacks.
-             del dirs[:]
-             continue #leaf     
--        elif 'rospack_nosubdirs' in files:
-+        elif 'rospack_nosubdirs' in files or not recurse:
-             del dirs[:]
-             continue  #leaf
-+        elif 'rospack_norecurse' in files:
-+            for sd in dirs:
-+                spath = os.path.join(d, sd)
-+                resources += list_by_path(manifest_name, spath, cache, False)
-+            del dirs[:]
-+            continue
-         # remove hidden dirs (esp. .svn/.git)
-         [dirs.remove(di) for di in dirs if di[0] == '.']
-     return resources
diff --git a/dev-python/rospkg/rospkg-1.0.38.ebuild b/dev-python/rospkg/rospkg-1.0.38.ebuild
deleted file mode 100644
index 5185441..0000000
--- a/dev-python/rospkg/rospkg-1.0.38.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/ros-infrastructure/rospkg"
-fi
-
-inherit ${SCM} distutils-r1
-
-DESCRIPTION="Standalone Python library for the ROS package system"
-HOMEPAGE="http://wiki.ros.org/rospkg"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-	KEYWORDS=""
-	# Needed for tests
-	S="${WORKDIR}/${PN}"
-	EGIT_CHECKOUT_DIR="${S}"
-else
-	SRC_URI="http://download.ros.org/downloads/${PN}/${P}.tar.gz
-		https://github.com/ros-infrastructure/rospkg/archive/${PV}.tar.gz -> ${P}.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test"
-
-RDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-	)
-"
-PATCHES=(
-	"${FILESDIR}/norecurse.patch"
-)
-
-python_test() {
-	nosetests --with-coverage --cover-package=rospkg --with-xunit test || die
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	# Avoid recursing into /usr/share when looking for packages.
-	dodir /usr/share
-	touch "${ED}/usr/share/rospack_norecurse"
-}
diff --git a/dev-python/rospkg/rospkg-1.0.39.ebuild b/dev-python/rospkg/rospkg-1.0.39.ebuild
deleted file mode 100644
index 5185441..0000000
--- a/dev-python/rospkg/rospkg-1.0.39.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/ros-infrastructure/rospkg"
-fi
-
-inherit ${SCM} distutils-r1
-
-DESCRIPTION="Standalone Python library for the ROS package system"
-HOMEPAGE="http://wiki.ros.org/rospkg"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-	KEYWORDS=""
-	# Needed for tests
-	S="${WORKDIR}/${PN}"
-	EGIT_CHECKOUT_DIR="${S}"
-else
-	SRC_URI="http://download.ros.org/downloads/${PN}/${P}.tar.gz
-		https://github.com/ros-infrastructure/rospkg/archive/${PV}.tar.gz -> ${P}.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test"
-
-RDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-	)
-"
-PATCHES=(
-	"${FILESDIR}/norecurse.patch"
-)
-
-python_test() {
-	nosetests --with-coverage --cover-package=rospkg --with-xunit test || die
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	# Avoid recursing into /usr/share when looking for packages.
-	dodir /usr/share
-	touch "${ED}/usr/share/rospack_norecurse"
-}
diff --git a/dev-python/rospkg/rospkg-1.0.40.ebuild b/dev-python/rospkg/rospkg-1.0.41-r1.ebuild
similarity index 82%
rename from dev-python/rospkg/rospkg-1.0.40.ebuild
rename to dev-python/rospkg/rospkg-1.0.41-r1.ebuild
index 9939d92..666d51a 100644
--- a/dev-python/rospkg/rospkg-1.0.40.ebuild
+++ b/dev-python/rospkg/rospkg-1.0.41-r1.ebuild
@@ -39,18 +39,7 @@
 		dev-python/coverage[${PYTHON_USEDEP}]
 	)
 "
-PATCHES=(
-	"${FILESDIR}/norecurse.patch"
-)
 
 python_test() {
 	nosetests --with-coverage --cover-package=rospkg --with-xunit test || die
 }
-
-src_install() {
-	distutils-r1_src_install
-
-	# Avoid recursing into /usr/share when looking for packages.
-	dodir /usr/share
-	touch "${ED}/usr/share/rospack_norecurse"
-}
diff --git a/dev-python/rospkg/rospkg-1.0.41.ebuild b/dev-python/rospkg/rospkg-1.0.41.ebuild
deleted file mode 100644
index 9939d92..0000000
--- a/dev-python/rospkg/rospkg-1.0.41.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/ros-infrastructure/rospkg"
-fi
-
-inherit ${SCM} distutils-r1
-
-DESCRIPTION="Standalone Python library for the ROS package system"
-HOMEPAGE="http://wiki.ros.org/rospkg"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-	KEYWORDS=""
-	# Needed for tests
-	S="${WORKDIR}/${PN}"
-	EGIT_CHECKOUT_DIR="${S}"
-else
-	SRC_URI="http://download.ros.org/downloads/${PN}/${P}.tar.gz
-		https://github.com/ros-infrastructure/rospkg/archive/${PV}.tar.gz -> ${P}.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test"
-
-RDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-	)
-"
-PATCHES=(
-	"${FILESDIR}/norecurse.patch"
-)
-
-python_test() {
-	nosetests --with-coverage --cover-package=rospkg --with-xunit test || die
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	# Avoid recursing into /usr/share when looking for packages.
-	dodir /usr/share
-	touch "${ED}/usr/share/rospack_norecurse"
-}
diff --git a/dev-python/rospkg/rospkg-9999.ebuild b/dev-python/rospkg/rospkg-9999.ebuild
index 5185441..666d51a 100644
--- a/dev-python/rospkg/rospkg-9999.ebuild
+++ b/dev-python/rospkg/rospkg-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -39,18 +39,7 @@
 		dev-python/coverage[${PYTHON_USEDEP}]
 	)
 "
-PATCHES=(
-	"${FILESDIR}/norecurse.patch"
-)
 
 python_test() {
 	nosetests --with-coverage --cover-package=rospkg --with-xunit test || die
 }
-
-src_install() {
-	distutils-r1_src_install
-
-	# Avoid recursing into /usr/share when looking for packages.
-	dodir /usr/share
-	touch "${ED}/usr/share/rospack_norecurse"
-}
diff --git a/dev-python/selectors34/ChangeLog b/dev-python/selectors34/ChangeLog
index 5109e5d..0290a8c 100644
--- a/dev-python/selectors34/ChangeLog
+++ b/dev-python/selectors34/ChangeLog
@@ -12,3 +12,10 @@
 
   Package-Manager: portage-2.3.0
 
+  06 Oct 2016; Patrice Clement <monsieurp@gentoo.org> selectors34-1.1.ebuild:
+  keyword for ppc.
+
+  Gentoo-Bug: https://bugs.gentoo.org/594026
+
+  Package-Manager: portage-2.3.0
+
diff --git a/dev-python/selectors34/Manifest b/dev-python/selectors34/Manifest
index 13a65de..6807fb1 100644
--- a/dev-python/selectors34/Manifest
+++ b/dev-python/selectors34/Manifest
@@ -1,4 +1,4 @@
 DIST selectors34-1.1.tar.gz 10525 SHA256 84b3743b9046461aebbcd13c15e79ab91e79acfb6e030b54a0ec6360ae0bbc52 SHA512 3c9cae461d7bc629a5ac2f17e7a5967d4a2865528b34e94e1164521e9d720381cca2c395ba62c0f67a4b9db34644dd031c2576a5017282bf4791c805c467408a WHIRLPOOL 67d07956c9c35e3a43e41033254b4ddff86271376f9d72a2503d9bc5e1f8ee5900384a5a71472a77c5c51e9025d7873d57c8f4797ab2035d7cd22e7ba99c0af8
 EBUILD selectors34-1.1.ebuild 506 SHA256 e71dffb0b12375a2d1dfb05768f5b831d3062ac08ce7d12d45ffa03239233c70 SHA512 077712731b5be9fe3e6bf85fea0427f6d1f7f5176d07f6c695fc47fbe499c1b422af7db7bb3d49bb69111d4c326890570075a4102d8071fc7a33a46b7146c43b WHIRLPOOL edd27aa8f38476b9905722f7d196d2f250a1eab04493f4cbc75ad855f635a48fba641f4d2095f56cd4ca1cc85f7c98abaa34006ff6099f2155a3a7656f20fbf7
-MISC ChangeLog 381 SHA256 8e830982dc67e8ccf629d4323c603ed9ddb63f7c715c7d62788e047e9f40dfcb SHA512 42cd4b5ca402d6b62230b9f31fbfd827756c819ced7cf55807c6a1fb831c7bd274edd694557c149af0fc0f87ea455e78f1dc9db3c5b099b64b88f68dfbadae4f WHIRLPOOL a6ab4b79ce5a961d2e7afd4c506e0410207d26611762055146ea76c15680d918887b8fd488c3d22c08d5ea607fa03d88923026944e9757df44b79c12f383ac45
+MISC ChangeLog 559 SHA256 abb7476eb3e2546f1644df1d6a80bf1f5f7ad7af76de4688a2ca0639c1b39a94 SHA512 91eb242aea9540f6532ad9620917e51128c2f43869eaff1d569eb890dc713cb576ab9eea4493ecbf52d0990209e8ae573bf7a3402cbbe27d7a070b90f51c8660 WHIRLPOOL 46f6faaace9847431d5325c14f3738dcf78381e3a322632e772ac5973922e294a97f91f4a05cd5345fcbd5d70512f6279c0749b66c4df2f3db5b6625ccf823b2
 MISC metadata.xml 493 SHA256 b9383eb360f0010deb11e277d22755e6e0bb05c59f9c6b500772ec6a517f04b5 SHA512 cd40605757a0be68ed1ee74421e24ac6d5d7471deedec54b7843ba954cc347d3c9109c9d82bf64bbe1209746e632680494a30cbcdc8f8db18d980ef3e4003ab5 WHIRLPOOL f402784f6392046f73739d1eda5fb596da3ccb664878db0e6e9e28109aac7db57c04cdc1a80f689e2d20065989f87e65f52adcb1c542bbf44b564d7096d556bb
diff --git a/dev-python/sepolgen/ChangeLog b/dev-python/sepolgen/ChangeLog
index 924de16..6ad802d 100644
--- a/dev-python/sepolgen/ChangeLog
+++ b/dev-python/sepolgen/ChangeLog
@@ -110,3 +110,11 @@
 
   Package-Manager: portage-2.3.0
 
+*sepolgen-2.6_rc2 (07 Oct 2016)
+
+  07 Oct 2016; Jason Zaman <perfinion@gentoo.org> -sepolgen-2.6_rc1.ebuild,
+  +sepolgen-2.6_rc2.ebuild, sepolgen-9999.ebuild:
+  bump to 2.6_rc2
+
+  Package-Manager: portage-2.3.0
+
diff --git a/dev-python/sepolgen/Manifest b/dev-python/sepolgen/Manifest
index d51a536..3e71d62a0 100644
--- a/dev-python/sepolgen/Manifest
+++ b/dev-python/sepolgen/Manifest
@@ -1,9 +1,9 @@
 AUX 0030-default-path-for-tests-also-needed-bug-467264.patch 891 SHA256 9e8627ca85ce1ff98933b9e8c8ab00c6ac320ecec3d082a91b790f9c1cebbf31 SHA512 d4e6cc6084bc76ac1394392a8107b2432ca885b88d8b3252507d28a192022e6252bce7d8a666edbc5a36362ceb76a2157008fc3a110a892964c40904607412b5 WHIRLPOOL b981c25dc65e63f72d7646eaff77b8de92589548c272906f73e1a729b7f54ecd57f0502ed453f95bbdf6d9e85a1a087728ec2c5ec3e2eeabc61bd36487fd4842
 DIST sepolgen-1.2.3.tar.gz 367644 SHA256 3ee1745257fa55301070219c77978c7c9eeb9aa595ce0b6b29c3baa4687d5cf0 SHA512 5fe023f983dc0fe1855da24835cb9bb466ac6c44d07fa939416740ca64968c039be2febff79b2a4c593e54c5ae81448dd06020e9160e4f84eea95d8c0d2b910f WHIRLPOOL 65c663a3398f1ae64e8bf233828701481ac2ee68fa75f2271596628c7dcc80c1193166cfb950f8faa86988c0b309cfbb59f15f38131a9f1f2680b754518bba11
-DIST sepolgen-2.6-rc1.tar.gz 367934 SHA256 5d1ee9a86d75f08b3443e4f17a9098bf3bdc7d2a77a64dcdd5d6230f6d4621cb SHA512 80fe7a3a30d632d0736ca69527ecacded1a35cc2115fcaab526f8eed56f12d77b453dc0eb7230790d5774631ee2d7c3fdae54fb734da30de46faea6fd9c96711 WHIRLPOOL 35d3d32e29f967e691658f8a30ce274c34d2e656bff3a1df04ba3b054631afe8e717f76dbd8524e91a0c9c45e64471b398af85b1ab20a4beac87f70ca62b3ca8
+DIST sepolgen-2.6-rc2.tar.gz 368014 SHA256 06c6e9d78b3628bfc056ace4a9f0aca4a5f62ea4283c3867e971cf485ebcb6cc SHA512 2d545f666db9c283643702863c022dde7dab9d1e15cd4895a07e6c20dba651d366ec1382f2319aff320c46fb15e928afe1619444ac95050e757916752715ba9b WHIRLPOOL 62cf9d3c0606d49263074adc205842a05a36b9147ae4434f6d612a18fee98dfbd87ec4afcb0e7308ea7ba5072328d8ec5f6c8b944bbb40eef8ca377d3b2684ab
 EBUILD sepolgen-1.2.3.ebuild 2246 SHA256 868d4d28f7af14014a450b53227ca9df2884dad09e0267bd059b88a5eb50f0cd SHA512 2e0a8e9f139006d4fa9b3031b4b54f4cf6535a5be2b1ec8afc9b3500b98f0590022b992d644fefebabd4b14cb068c6dc988d3c3a3caaf13d0e364b8189ca9c87 WHIRLPOOL ea712d627c67a6b22d1dea83d65149301efde4d06860ac7fcf462e8a0b746c136b892ef4ea7cd1fd7989de616ecb3248a60a54f47c486040cf77416eb86cef85
-EBUILD sepolgen-2.6_rc1.ebuild 2249 SHA256 dbbd09789211d6d6fa9a36e42da94243895cf5a8cb5c9d0656df796631b2a04c SHA512 68d690e22c6c0a98c0968da8a355f75e276ab8f50e0168ac95796924db5949e64b41dedadbfe2a523c49ed231a17b44372f3464cc2724a758828b236ba76b43a WHIRLPOOL a9a99b0e8cd0cb8ddc23fbccd2ba1d126087ceb44240b4b494c9d59168c9bd2919c25b072d36c48df89c479b7b6e4e9a4aac0c144647a2c0235ee186ece1b1c5
-EBUILD sepolgen-9999.ebuild 2249 SHA256 dbbd09789211d6d6fa9a36e42da94243895cf5a8cb5c9d0656df796631b2a04c SHA512 68d690e22c6c0a98c0968da8a355f75e276ab8f50e0168ac95796924db5949e64b41dedadbfe2a523c49ed231a17b44372f3464cc2724a758828b236ba76b43a WHIRLPOOL a9a99b0e8cd0cb8ddc23fbccd2ba1d126087ceb44240b4b494c9d59168c9bd2919c25b072d36c48df89c479b7b6e4e9a4aac0c144647a2c0235ee186ece1b1c5
-MISC ChangeLog 3729 SHA256 e8bc0fefddca59146166184743875971f604b549a2d96d34dafa6eee3915c25c SHA512 6d998d56b4b48fd55ed6e9bada6b358231f50466420ad7bd980694b42a0e3bf797bbfa97af9e11361643c07df1389809ef17e2f4228defc34a5f5844cfc2bd87 WHIRLPOOL b2c7f8803cca315de2a6328a9a8abd01617e91a135e72bd1f21f7abb9f2a24d54785b63e15deda32a86e309df9ca087e18347f835c93a843490e7d4d52849ea2
+EBUILD sepolgen-2.6_rc2.ebuild 2249 SHA256 fcb567c71fe64331b9b6d258326c8d55e68f5cfdad60a55c7159ca935a693436 SHA512 28039ad3b783066927422daf02ba779b8038e327b521eb65a9cd34c125da26a79a45d4cbbf7db00ad9fb07a5f5b5c02697da61e7ec55592f4deb29d3a30198ef WHIRLPOOL 20e26bd9399f7b08f077e2216fb033bb8e75995a32d5eb918867ceb6f75a35ddb8740e019c713775f12f8eeb9f8412525212d9bee1c4660ae4ef143c44c18454
+EBUILD sepolgen-9999.ebuild 2249 SHA256 fcb567c71fe64331b9b6d258326c8d55e68f5cfdad60a55c7159ca935a693436 SHA512 28039ad3b783066927422daf02ba779b8038e327b521eb65a9cd34c125da26a79a45d4cbbf7db00ad9fb07a5f5b5c02697da61e7ec55592f4deb29d3a30198ef WHIRLPOOL 20e26bd9399f7b08f077e2216fb033bb8e75995a32d5eb918867ceb6f75a35ddb8740e019c713775f12f8eeb9f8412525212d9bee1c4660ae4ef143c44c18454
+MISC ChangeLog 3941 SHA256 c5145d496c207a60209df42d21a4c0716d5b9a8165fe4d27e5ee0ce27718157c SHA512 5cefe7753696a089fde5c14b1849cc6daaee10604ae8f4a31c834615b77efd15a8896331e504da29c7f7831c6f11488c755c3b1b706f4ae25c89031b12fe9677 WHIRLPOOL 7eae95f1e99a3cec8b08d962a878835439814166a51de3f162735ed4e8c1e1e1e4e6a15c5c8be0478c30afb7c4f450b2fb9ea31f64a8471c29922cd39bf19a53
 MISC ChangeLog-2015 8639 SHA256 4c6103f1923127d465b15fda2927907b2558b7bee67afe7ae17e7132aa581b21 SHA512 ab752e0207cbf5b70f07b8d05439133bf5b85ac46dfe6c0777c830585d5ead4168a96c179e0ea15206b735b093a4328aea540abfc975974c4499be195e1e4f1b WHIRLPOOL cccf452218908955e52e694acadbc0d1b368730096071f190430b820ada3bdeb328bbc6331a8654f2392eb36b0d5bbc0a7693b9d39183655620a058d81df94c9
 MISC metadata.xml 407 SHA256 9757a59cd9286acd8db9ab5750934a37f023c04308e035d76ac6698790a9d008 SHA512 576b46fd09a9a48f19132f006edf0ed27d864d0095415121db0e0ef64013fe6d35b220d305e6042cfb10f51cb05317cea7ea739905675126ed8191a752eb610e WHIRLPOOL 1f14482a8b658937bb20fc6c1a75d8b880564ec5ac66febb8a797827258211eefab8b8f55ba5697a50381b06c0b5b4a423e5545e270bc1a38db36f67bd04d9ea
diff --git a/dev-python/sepolgen/sepolgen-2.6_rc1.ebuild b/dev-python/sepolgen/sepolgen-2.6_rc2.ebuild
similarity index 98%
rename from dev-python/sepolgen/sepolgen-2.6_rc1.ebuild
rename to dev-python/sepolgen/sepolgen-2.6_rc2.ebuild
index d829a84..37d54b6 100644
--- a/dev-python/sepolgen/sepolgen-2.6_rc1.ebuild
+++ b/dev-python/sepolgen/sepolgen-2.6_rc2.ebuild
@@ -8,7 +8,7 @@
 inherit python-r1
 
 MY_P="${P//_/-}"
-MY_RELEASEDATE="20160930"
+MY_RELEASEDATE="20161006"
 
 DESCRIPTION="SELinux policy generation library"
 HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
diff --git a/dev-python/sepolgen/sepolgen-9999.ebuild b/dev-python/sepolgen/sepolgen-9999.ebuild
index d829a84..37d54b6 100644
--- a/dev-python/sepolgen/sepolgen-9999.ebuild
+++ b/dev-python/sepolgen/sepolgen-9999.ebuild
@@ -8,7 +8,7 @@
 inherit python-r1
 
 MY_P="${P//_/-}"
-MY_RELEASEDATE="20160930"
+MY_RELEASEDATE="20161006"
 
 DESCRIPTION="SELinux policy generation library"
 HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
diff --git a/dev-python/spark-parser/ChangeLog b/dev-python/spark-parser/ChangeLog
new file mode 100644
index 0000000..398a3c2
--- /dev/null
+++ b/dev-python/spark-parser/ChangeLog
@@ -0,0 +1,12 @@
+# ChangeLog for dev-python/spark-parser
+# Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2
+# (auto-generated from git log)
+
+*spark-parser-1.4.0 (07 Oct 2016)
+
+  07 Oct 2016; Brian Dolbec <dolsen@gentoo.org> +metadata.xml,
+  +spark-parser-1.4.0.ebuild:
+  New package, dep of new dev-python/uncompyle6 pkg
+
+  Package-Manager: portage-2.3.1_p8
+
diff --git a/dev-python/spark-parser/Manifest b/dev-python/spark-parser/Manifest
new file mode 100644
index 0000000..f41c0dcb
--- /dev/null
+++ b/dev-python/spark-parser/Manifest
@@ -0,0 +1,4 @@
+DIST spark_parser-1.4.0.tar.gz 99006 SHA256 282fe0d19de48d5fda6148032e47c822e2f088a5ff050cb7544f2bc2e701ede4 SHA512 1236fcfabcf4b829f70db240fd76baabc79873c03e96d9fdd92e6c23661e144c1b32d317a51f96f683bc6f96763cac0989709e344e53410ae949d30305dfadef WHIRLPOOL 1e8bfc67950e973fc80313d53f3df0da90c083da4482de1e2fac0fb2eb8698140aa1fda93cb0018b127b42a11cd3e8f68b2bfed77f43df9ed392ba668363eba5
+EBUILD spark-parser-1.4.0.ebuild 706 SHA256 5a64979f7e1a59db74bd72a8fed9c5b2f4578782ff39602610471d5f700b08d3 SHA512 af0a74e97ab13a9820cede0311f2bc89db59e1658751391dc5f10b9350552fd233d066851e46c1dff5d2e521172c63774176d9e0f68aac26e53912a476c74420 WHIRLPOOL 3db5cd00186cd9ed1990c7b6da51d188cf45c1b7df7ab9063d4efef1dfb1b73ae8eeddad063ffa9d22a8a5bc8018ab8b9f52f66829dbfca04652fda101f5f080
+MISC ChangeLog 361 SHA256 f4a03e739f532285d1cfcae8475c1dcbca3c0ee53d906f0751195a743ecfb464 SHA512 726c43f1c720bfab91d3fc71cebc0893fcfe5b97e643081af67cef4d1e5b11f4d78217c0f2866639a44827c9f56e1245a07825953b3b020ff8296121e905cef9 WHIRLPOOL 8e6a996fd8494544847ada66f18df1357de8753be03df710d34b534550ca4328a8b441742bafa2cc768e5c23ee7c7fc48983cb9892fdefd25ce1d4115bd7d11f
+MISC metadata.xml 861 SHA256 64f285e189b5d46a279ee0813d402c977b790eda0d62d05010a763bb65e23395 SHA512 c7519a30b38f2d44fe4cf18e437efc3e5ff14c6d29f720e9093d71adc0eb61b32a7212d4358de5171eec34c1fc22527124e9daeeb8a3d2e8303f366f129c2049 WHIRLPOOL da84736435747d9c3f92c8a6d0e71c56e31d88c32caa6256d1a3fd9a7e533bdbf1c8cc7b68af58d3b905bc82419b8ee8608ec0c64805eff79a8762d01bf7a30a
diff --git a/dev-python/spark-parser/metadata.xml b/dev-python/spark-parser/metadata.xml
new file mode 100644
index 0000000..978a6c9
--- /dev/null
+++ b/dev-python/spark-parser/metadata.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>dol-sen@gentoo.org</email>
+		<description>Primary maintainer</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<maintainer>
+			<email>rb@dustyfeet.com</email>
+			<name>Rocky Bernstein</name>
+		</maintainer>
+		<remote-id type="pypi">spark_parser</remote-id>
+	</upstream>
+	<longdescription>SPARK stands for Scanning, Parsing, and Rewriting Kit.
+		It uses Jay Early’s algorithm for parsing context free grammars, and
+		comes with some generic Abstract Syntax Tree routines. There is also a
+		prototype scanner which does its job by combining Python regular
+		expressions.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-python/spark-parser/spark-parser-1.4.0.ebuild b/dev-python/spark-parser/spark-parser-1.4.0.ebuild
new file mode 100644
index 0000000..9ca7566
--- /dev/null
+++ b/dev-python/spark-parser/spark-parser-1.4.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5} pypy)
+
+inherit distutils-r1
+
+MY_PN="spark_parser"
+
+DESCRIPTION="An Early-Algorithm Context-free grammar Parser"
+HOMEPAGE="https://github.com/rocky/python-spark/ https://pypi.python.org/pypi/spark_parser"
+SRC_URI="mirror://pypi/${P:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/nose-1.0[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+python_test() {
+	emake check
+}
diff --git a/dev-python/sphinx-py3doc-enhanced-theme/ChangeLog b/dev-python/sphinx-py3doc-enhanced-theme/ChangeLog
new file mode 100644
index 0000000..a358d83
--- /dev/null
+++ b/dev-python/sphinx-py3doc-enhanced-theme/ChangeLog
@@ -0,0 +1,12 @@
+# ChangeLog for dev-python/sphinx-py3doc-enhanced-theme
+# Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2
+# (auto-generated from git log)
+
+*sphinx-py3doc-enhanced-theme-2.3.2 (07 Oct 2016)
+
+  07 Oct 2016; Brian Dolbec <dolsen@gentoo.org> +metadata.xml,
+  +sphinx-py3doc-enhanced-theme-2.3.2.ebuild:
+  New package, new dep of dev-python/pytest-cov-2.3.1
+
+  Package-Manager: portage-2.3.1_p8
+
diff --git a/dev-python/sphinx-py3doc-enhanced-theme/Manifest b/dev-python/sphinx-py3doc-enhanced-theme/Manifest
new file mode 100644
index 0000000..463d69b
--- /dev/null
+++ b/dev-python/sphinx-py3doc-enhanced-theme/Manifest
@@ -0,0 +1,4 @@
+DIST sphinx-py3doc-enhanced-theme-2.3.2.tar.gz 41894 SHA256 af600d39d4ffa6cb27d499730ac42af34045f5553ca5eadc087d865d6f32c602 SHA512 efeeaf1bbb7f5557f5e1500dd0a49aa001b714f329f594e95676d8833eede7eb5e0fa978257caeab9630360b05f48132ffb00137262c7a5b663cae6a009ed42d WHIRLPOOL b536517b64c398c9db7d664b633279915848f5741675e83362227d1905271dbda9b744ba6d09353c1a45c3cdb6f0b3f580a29b9d9e8da9a330aa0e821e51b643
+EBUILD sphinx-py3doc-enhanced-theme-2.3.2.ebuild 518 SHA256 b64c1261d97f86153ce41cba1c72eef1b135762d6263e073c8bd54086cbe8777 SHA512 5e1f53bfa7555eb10d09c8c274ffb530fe84be2fc8c35cfd11398dedacf548ac8e5bf47ddb3d47d2532ae64c382730ec087c429f6d658d2e9bf0e3fc0c93526d WHIRLPOOL 92022ee97b8cedf6da32a38afff324a162a8ea6cc585c5fe363770a5cb7303a5ebe039f646b7abec6935fe1c6711c9ea5b77fa33685fce95ed756001c09dfb97
+MISC ChangeLog 411 SHA256 5450c08fb4114b7b147f465183e2a6bf29a2cf864617372c59e6d6971b87731c SHA512 0d02ec2f9e2f63cea93711adbf625f37ce84a293408b6859d38361e5cff9ba95d019bbf136e1ba18c2c8e2c8dcbdef40fb300d2c65e2ad33a2d5f80300492564 WHIRLPOOL acd1c164184a110475029b88f2cd3a5195d4f0a318bd42786841c8731d9977338815e7b588532fb014e8046c599e059eb96b854ebe1d762805028befd8216809
+MISC metadata.xml 603 SHA256 14cee41e41685431e2671ba7ca303173000b529f336b3bed52c2d7d8d7b13c32 SHA512 fdea602226a16908619d52f6ed5d310e6696989c5aadc646f1d13fd17dee43ef7492bffc9cc3690cb4c2c016cf8e9ce4ba2295c51f153f9d505b5507b8a6e78f WHIRLPOOL c3d903836d754b57e739c032fd4155802f509723effa639a7a39ec330bbf17cb27e47c1bfa1c676f2c89742de01707d7370a0a0a26e8d63192d1f12d868b8996
diff --git a/dev-python/sphinx-py3doc-enhanced-theme/metadata.xml b/dev-python/sphinx-py3doc-enhanced-theme/metadata.xml
new file mode 100644
index 0000000..741093d
--- /dev/null
+++ b/dev-python/sphinx-py3doc-enhanced-theme/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>dol-sen@gentoo.org</email>
+		<description>Primary maintainer</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<maintainer>
+			<email>contact@ionelmc.ro</email>
+			<name>Ionel Cristian Mărieș</name>
+		</maintainer>
+		<remote-id type="pypi">sphinx-py3doc-enhanced-theme</remote-id>
+	</upstream>
+	<longdescription></longdescription>
+</pkgmetadata>
diff --git a/dev-python/sphinx-py3doc-enhanced-theme/sphinx-py3doc-enhanced-theme-2.3.2.ebuild b/dev-python/sphinx-py3doc-enhanced-theme/sphinx-py3doc-enhanced-theme-2.3.2.ebuild
new file mode 100644
index 0000000..4fd3c6f
--- /dev/null
+++ b/dev-python/sphinx-py3doc-enhanced-theme/sphinx-py3doc-enhanced-theme-2.3.2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_{4,5}} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Enhanced Sphinx theme (based on Python 3 docs)"
+HOMEPAGE="https://github.com/ionelmc/sphinx-py3doc-enhanced-theme https://pypi.python.org/pypi/sphinx-py3doc-enhanced-theme"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
diff --git a/dev-python/twisted/ChangeLog b/dev-python/twisted/ChangeLog
new file mode 100644
index 0000000..bddb40e95
--- /dev/null
+++ b/dev-python/twisted/ChangeLog
@@ -0,0 +1,18 @@
+# ChangeLog for dev-python/twisted
+# Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2
+# (auto-generated from git log)
+
+*twisted-16.3.2 (07 Oct 2016)
+*twisted-16.2.0 (07 Oct 2016)
+
+  07 Oct 2016; Brian Dolbec <dolsen@gentoo.org> +files/twistd.conf,
+  +files/twistd.init, +files/twisted-core-9.0.0-respect_TWISTED_DISABLE_WRITIN
+  G_OF_PLUGIN_CACHE.patch, +metadata.xml, +twisted-16.2.0.ebuild,
+  +twisted-16.3.2.ebuild:
+  New monolithic release twisted package
+
+  Twisted has changed to a single release pkg.
+  This new pkg. now has python3 support.
+
+  Package-Manager: portage-2.3.1_p8
+
diff --git a/dev-python/twisted/Manifest b/dev-python/twisted/Manifest
new file mode 100644
index 0000000..bd28c39
--- /dev/null
+++ b/dev-python/twisted/Manifest
@@ -0,0 +1,9 @@
+AUX twistd.conf 277 SHA256 aa2ffa5b128973bc0c58a1251b8bbb56f6f890728bc902805ea2db7606416119 SHA512 76d44caebab8404f16937c2515ad9ae8236732a48c7127366f7fa22c6ed3d88ace2d33b832a6d95f775973d41b7caf75344805fe5b01e964c04eb710bf3c89fb WHIRLPOOL 89223406ed730b82c5bf7b8d62bd0f12dbe1a1ab0ac69943fb0192970ea98870d369397a0dccbf0952d9e44abfaf2e897063c6e398efc6b4a7050fbf01593289
+AUX twistd.init 563 SHA256 cb0ee0ff81d50f673b4359b1329e72352e6f5d32f061aba5f8d1f9806f0ec217 SHA512 7860601beba1efda2b0a045b2a044ec33caff9ee915d45225c05e281760a68da349b4c45080600177aab32aa806714327acf3cf5dda92be0874f781f129bb129 WHIRLPOOL bbf71d8496a67e7d9da08a3958ae02be96c86894a665462af899bc551e9e823f65963fcf797fa53571c56b76bdb229c3ee1de51845600ee2ebb312c9bc681fa0
+AUX twisted-core-9.0.0-respect_TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE.patch 419 SHA256 f8e35bfeb14010ddd2c372fc5a9ae2ce0c72aa67bd452b2ccd12368f31c28818 SHA512 b77cdc6f7df5a283075f1bde7f974482cb5c5f49c9189b0f3fc3a39da18fbb7ade30a115cd76cc4241d5bc8727994cfcc1e96aaa835c68f753b6ac3523438a63 WHIRLPOOL 8cf0d43049624a779d370f785cd45c1de5ed0ac0a9de661ef48442f05f54cb773a6e0cbf2b0408bae0a689f5693e91fd259d156520f58b2097dd0fdb1572bf29
+DIST Twisted-16.2.0.tar.bz2 2942537 SHA256 a090e8dc675e97fb20c3bb5f8114ae94169f4e29fd3b3cbede35705fd3cdbd79 SHA512 a1942c15a84946e8bd4833801fffe7be01443560209972e10043262fd17a73c5d0c50592bd037130b6a1de08d7223cbdc1e2398c8c67f559d42e3e8ec81df840 WHIRLPOOL f847d57b833f7fbd9135c4a07af163afaa1e7a821d3aa657b34b2b465540bdce6472682ec20d7f8244117e99a4301e485afe6a765c07b7b64ac9bc90a9592af4
+DIST Twisted-16.3.2.tar.bz2 2916410 SHA256 22c32e68feb6be7ea68bcbc8f89184f06b5693a9f1b59d052927d19597645967 SHA512 6ddca880a06087717487d8a5cc128da81f1acbc97e5c372b1ba51eaeb87390ae7f91925e8e4cc90f29df21692bc11b6e0fe3772341b8488940895e57942e5149 WHIRLPOOL ad381b36f94351c15713e35d6312bae35c78ff90eb485892131f7db8c89168ccf5ddbc9d486bfeb47db695e75280bc73401194c6b36815c5859cc945d0191a7b
+EBUILD twisted-16.2.0.ebuild 3700 SHA256 b64384b9aff720158d1bcb87d02290fb4848c4450d50eceb81f6e67affa5b028 SHA512 e3e10f90bb69013ce2590e1dd9104ec024efc7b2d69765d5786d2232d286d07ebf423b00f42c84fd3b805d8aac3e7eb1b75aa70b1cba78dd4e1958a3e1070a95 WHIRLPOOL 5e21363fec96c0fb80d61bdf09bf62ad66ea943e73f39c7ef1a1432d9cc05fc42fcaba9e5692eaa09443d6f31fa406ad9f851fec8c8715f2b3551760c724d972
+EBUILD twisted-16.3.2.ebuild 4064 SHA256 85878f8026acde1e5f40289274f3a5c5439ffdf61027260625eaf3a96e47a4cf SHA512 940b07d92795a91765a20e5b03bae018e6bf111c0d515c2f9b0a3adf10332b8c06b3bdab9b0cb9906264fee1544c58f1b5e8284a1b6f9a496adeb8bc797fb155 WHIRLPOOL 2d2df5105b863c7f5c910f528611948f3aa53d12dc9624e6d4e36b4d04c786bae802151ff675405ff8b2a744dbc7229aaffeacceef3b53e30b098f353ae768fe
+MISC ChangeLog 606 SHA256 2caff695180c8c61e31f8ae645d0ba72834e02c971c74b91a7daf53c7b288465 SHA512 084903f60b354802bcfb4ad15dad1f507717f8cae867fc38c7e6c382b308813faa2c69ea58cd052ccf490d79276dff1b0abb806b4135cc96a23e42ae1485a50a WHIRLPOOL 97f984f8d78bde3a98cd51352bb193094214012bb31cd27929551f5b71166fd646dc07ddf85a36c626e730f2b5f0ae05f728cc06cc5290e5a4a6073a0d6e2a9a
+MISC metadata.xml 1470 SHA256 5bc6995877716ca6f8f91939424e0925648f46aaad9882840e7bf8d30cbac8c7 SHA512 8fca93d66a8d78e64be8b661cec004e2a8222101de0a312ad7da79c8a19daa241089cfc31e73cd866bf683c59d2a0db5e11d72be77b97eab92ace542d2bd6e68 WHIRLPOOL 8646de87541cfa5f196f5f39ca1c1f5af81a4161bed1182eaad96fb6d38467863b34cfb0f394eed6f64c8ce5794e2d3c66070fede4eea85922e3f6949942671f
diff --git a/dev-python/twisted/files/twistd.conf b/dev-python/twisted/files/twistd.conf
new file mode 100644
index 0000000..53788cd
--- /dev/null
+++ b/dev-python/twisted/files/twistd.conf
@@ -0,0 +1,7 @@
+
+# These are passed to twistd.
+# TWISTD_OPTS="--no_save --logfile=/var/log/twistd -y /etc/twistd.tac"
+# TWISTD_OPTS="--no_save --logfile=/var/log/twistd -f /etc/twistd.tap"
+
+# Make any additions to PYTHONPATH the twistd needs here.
+# PYTHONPATH="/path/to/extra/python/modules"
diff --git a/dev-python/twisted/files/twistd.init b/dev-python/twisted/files/twistd.init
new file mode 100644
index 0000000..b031b00
--- /dev/null
+++ b/dev-python/twisted/files/twistd.init
@@ -0,0 +1,25 @@
+#!/sbin/openrc-run
+
+depend() {
+	need net
+}
+
+start() {
+	if [ -z "${TWISTD_OPTS}" ]; then
+		eerror "TWISTD_OPTS is not set!"
+		eerror "You need to configure twistd in /etc/conf.d/twistd."
+		return 1
+	fi
+	export PYTHONPATH
+	ebegin "Starting twistd"
+	start-stop-daemon --start --quiet --pidfile /var/run/twistd.pid \
+		--exec /usr/bin/twistd -- --pidfile /var/run/twistd.pid \
+			${TWISTD_OPTS}
+	eend $? "Failed to start twistd"
+}
+
+stop() {
+	ebegin "Stopping twistd"
+	start-stop-daemon --stop --quiet --pidfile /var/run/twistd.pid 
+	eend $? "Failed to stop twistd"
+}
diff --git a/dev-python/twisted/files/twisted-core-9.0.0-respect_TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE.patch b/dev-python/twisted/files/twisted-core-9.0.0-respect_TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE.patch
new file mode 100644
index 0000000..2fe22f1
--- /dev/null
+++ b/dev-python/twisted/files/twisted-core-9.0.0-respect_TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE.patch
@@ -0,0 +1,11 @@
+--- twisted/plugin.py
++++ twisted/plugin.py
+@@ -174,7 +174,7 @@
+             if pluginKey not in existingKeys:
+                 del dropinDotCache[pluginKey]
+                 needsWrite = True
+-        if needsWrite:
++        if needsWrite and os.environ.get("TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE") is None:
+             try:
+                 dropinPath.setContent(pickle.dumps(dropinDotCache))
+             except:
diff --git a/dev-python/twisted/metadata.xml b/dev-python/twisted/metadata.xml
new file mode 100644
index 0000000..bb89489
--- /dev/null
+++ b/dev-python/twisted/metadata.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>dol-sen@gentoo.org</email>
+		<description>maintainer</description>
+	</maintainer>
+	<upstream>
+		<maintainer>
+			<email>twisted-python@twistedmatrix.com</email>
+			<name>Twisted Matrix Laboratories</name>
+		</maintainer>
+		<remote-id type="pypi">Twisted</remote-id>
+	</upstream>
+	<use>
+		<flag name="conch">include Twisted SSHv2 implementation</flag>
+		<flag name="http2">include http2 support</flag>
+		<flag name="serial">include serial port support</flag>
+	</use>
+	<longdescription>Twisted is an event-based framework for internet
+		applications, supporting Python 2.7 and Python 3.3+. It includes
+		modules for many different purposes, including the following:
+
+twisted.web: HTTP clients and servers, HTML templating, and a WSGI server
+twisted.conch: SSHv2 and Telnet clients and servers and terminal emulators
+twisted.words: Clients and servers for IRC, XMPP, and other IM protocols
+twisted.mail: IMAPv4, POP3, SMTP clients and servers
+twisted.positioning: Tools for communicating with NMEA-compatible GPS receivers
+twisted.names: DNS client and tools for making your own DNS servers
+twisted.trial: A unit testing framework that integrates well with Twisted-based code.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-python/twisted/twisted-16.2.0.ebuild b/dev-python/twisted/twisted-16.2.0.ebuild
new file mode 100644
index 0000000..7f47bfc
--- /dev/null
+++ b/dev-python/twisted/twisted-16.2.0.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_{4,5})
+PYTHON_REQ_USE="threads(+)"
+TWISTED_PN="Twisted"
+
+inherit eutils flag-o-matic twisted-r1
+
+DESCRIPTION="An asynchronous networking framework written in Python"
+SRC_URI="http://twistedmatrix.com/Releases/${TWISTED_PN}"
+SRC_URI="${SRC_URI}/${TWISTED_RELEASE}/${TWISTED_P}.tar.bz2"
+
+#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~x86"
+IUSE="conch crypt serial +soap test"
+
+RDEPEND=">=dev-python/zope-interface-3.6.0[${PYTHON_USEDEP}]
+	conch? (
+		dev-python/gmpy[${PYTHON_USEDEP}]
+		dev-python/pyasn1[${PYTHON_USEDEP}]
+		>=dev-python/cryptography-0.9.1[${PYTHON_USEDEP}]
+		>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
+	)
+	crypt? (
+		>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
+		dev-python/service_identity[${PYTHON_USEDEP}]
+		dev-python/idna[${PYTHON_USEDEP}]
+	)
+	serial? ( dev-python/pyserial[${PYTHON_USEDEP}] )
+	soap? ( $(python_gen_cond_dep 'dev-python/soappy[${PYTHON_USEDEP}]' python2_7) )
+"
+DEPEND="
+	!dev-python/twisted-core
+	!dev-python/twisted-conch
+	!dev-python/twisted-mail
+	!dev-python/twisted-names
+	!dev-python/twisted-words
+	!dev-python/twisted-web
+	test? (
+		dev-python/gmpy[${PYTHON_USEDEP}]
+		dev-python/pyasn1[${PYTHON_USEDEP}]
+		>=dev-python/cryptography-0.9.1[${PYTHON_USEDEP}]
+		>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
+		dev-python/service_identity[${PYTHON_USEDEP}]
+		dev-python/idna[${PYTHON_USEDEP}]
+		dev-python/pyserial[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/soappy[${PYTHON_USEDEP}]' python2_7)
+	)
+"
+
+PATCHES=(
+	# Respect TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE variable.
+	"${FILESDIR}/${PN}-core-9.0.0-respect_TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE.patch"
+)
+
+python_prepare_all() {
+	# Remove some tests known to fail due to the network sandbox
+	rm -R twisted/pair/test/test_*.py || die "rm twisted/pair/test/test_*.py FAILED"
+	# Possibly due to over taxing of the distutils_install_for_testing function
+	rm twisted/python/test/test_release.py || die "rm twisted/python/test/test_release.py FAILED"
+	if [[ "${EUID}" -eq 0 ]]; then
+		# Disable tests failing with root permissions.
+		sed \
+			-e "s/test_newPluginsOnReadOnlyPath/_&/" \
+			-e "s/test_deployedMode/_&/" \
+			-i twisted/test/test_plugin.py
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	if ! python_is_python3; then
+		# Needed to make the sendmsg extension work
+		# (see http://twistedmatrix.com/trac/ticket/5701 )
+		local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
+		local -x CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
+	fi
+
+	distutils-r1_python_compile
+}
+
+python_test() {
+	distutils_install_for_testing
+
+	pushd "${TEST_DIR}"/lib > /dev/null || die
+
+	if ! "${TEST_DIR}"/scripts/trial twisted; then
+		die "Tests failed with ${EPYTHON}"
+	fi
+
+	popd > /dev/null || die
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	cd "${D%/}$(python_get_sitedir)" || die
+
+	# create 'Twisted' egg wrt bug #299736
+	#local egg=( Twisted_Core*.egg-info )
+	#[[ -f ${egg[0]} ]] || die "Twisted_Core*.egg-info not found"
+	#ln -s "${egg[0]}" "${egg[0]/_Core/}" || die
+
+	# own the dropin.cache so we don't leave orphans
+	touch twisted/plugins/dropin.cache || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	newconfd "${FILESDIR}/twistd.conf" twistd
+	newinitd "${FILESDIR}/twistd.init" twistd
+}
+
+pkg_postinst(){
+	einfo "Install complete"
+}
+
+pkg_postrm(){
+	einfo ""
+}
diff --git a/dev-python/twisted/twisted-16.3.2.ebuild b/dev-python/twisted/twisted-16.3.2.ebuild
new file mode 100644
index 0000000..59abe77
--- /dev/null
+++ b/dev-python/twisted/twisted-16.3.2.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_{4,5})
+PYTHON_REQ_USE="threads(+)"
+TWISTED_PN="Twisted"
+
+inherit eutils flag-o-matic twisted-r1
+
+DESCRIPTION="An asynchronous networking framework written in Python"
+SRC_URI="http://twistedmatrix.com/Releases/${TWISTED_PN}"
+SRC_URI="${SRC_URI}/${TWISTED_RELEASE}/${TWISTED_P}.tar.bz2"
+
+# Dropped keywords due to new deps not keyworded
+#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~x86"
+IUSE="conch crypt http2 serial +soap test"
+
+RDEPEND=">=dev-python/zope-interface-3.6.0[${PYTHON_USEDEP}]
+	conch? (
+		dev-python/gmpy[${PYTHON_USEDEP}]
+		dev-python/pyasn1[${PYTHON_USEDEP}]
+		>=dev-python/cryptography-0.9.1[${PYTHON_USEDEP}]
+		>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
+	)
+	crypt? (
+		>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
+		dev-python/service_identity[${PYTHON_USEDEP}]
+		dev-python/idna[${PYTHON_USEDEP}]
+	)
+	serial? ( dev-python/pyserial[${PYTHON_USEDEP}] )
+	soap? ( $(python_gen_cond_dep 'dev-python/soappy[${PYTHON_USEDEP}]' python2_7) )
+	http2? (
+		>=dev-python/hyper-h2-2.3.0[${PYTHON_USEDEP}]
+		<dev-python/hyper-h2-3.0[${PYTHON_USEDEP}]
+		>=dev-python/priority-1.1.0[${PYTHON_USEDEP}]
+		<dev-python/priority-2.0[${PYTHON_USEDEP}]
+	)
+	!dev-python/twisted-core
+	!dev-python/twisted-conch
+	!dev-python/twisted-lore
+	!dev-python/twisted-mail
+	!dev-python/twisted-names
+	!dev-python/twisted-news
+	!dev-python/twisted-pair
+	!dev-python/twisted-runner
+	!dev-python/twisted-words
+	!dev-python/twisted-web
+"
+DEPEND="
+	test? (
+		dev-python/gmpy[${PYTHON_USEDEP}]
+		dev-python/pyasn1[${PYTHON_USEDEP}]
+		>=dev-python/cryptography-0.9.1[${PYTHON_USEDEP}]
+		>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
+		dev-python/service_identity[${PYTHON_USEDEP}]
+		dev-python/idna[${PYTHON_USEDEP}]
+		dev-python/pyserial[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	# Respect TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE variable.
+	"${FILESDIR}/${PN}-core-9.0.0-respect_TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE.patch"
+)
+
+python_prepare_all() {
+	# Remove some tests known to fail due to the network sandbox
+	rm -R twisted/pair/test/test_*.py || die "rm twisted/pair/test/test_*.py FAILED"
+	# Possibly due to over taxing of the distutils_install_for_testing function
+	rm twisted/python/test/test_release.py || die "rm twisted/python/test/test_release.py FAILED"
+	if [[ "${EUID}" -eq 0 ]]; then
+		# Disable tests failing with root permissions.
+		sed \
+			-e "s/test_newPluginsOnReadOnlyPath/_&/" \
+			-e "s/test_deployedMode/_&/" \
+			-i twisted/test/test_plugin.py
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	if ! python_is_python3; then
+		# Needed to make the sendmsg extension work
+		# (see http://twistedmatrix.com/trac/ticket/5701 )
+		local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
+		local -x CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
+	fi
+
+	distutils-r1_python_compile
+}
+
+python_test() {
+	distutils_install_for_testing
+
+	pushd "${TEST_DIR}"/lib > /dev/null || die
+
+	if ! "${TEST_DIR}"/scripts/trial twisted; then
+		die "Tests failed with ${EPYTHON}"
+	fi
+
+	popd > /dev/null || die
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	cd "${D%/}$(python_get_sitedir)" || die
+
+	# create 'Twisted' egg wrt bug #299736
+	#local egg=( Twisted_Core*.egg-info )
+	#[[ -f ${egg[0]} ]] || die "Twisted_Core*.egg-info not found"
+	#ln -s "${egg[0]}" "${egg[0]/_Core/}" || die
+
+	# own the dropin.cache so we don't leave orphans
+	touch twisted/plugins/dropin.cache || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	newconfd "${FILESDIR}/twistd.conf" twistd
+	newinitd "${FILESDIR}/twistd.init" twistd
+}
+
+pkg_postrm(){
+	# pre portage-2.3.2 release workaround for bug 595028
+	cd "${HOME}"
+	_distutils-r1_run_foreach_impl twisted-r1_update_plugin_cache
+}
diff --git a/dev-python/txaio/ChangeLog b/dev-python/txaio/ChangeLog
index 11c7d6c..ea6adba 100644
--- a/dev-python/txaio/ChangeLog
+++ b/dev-python/txaio/ChangeLog
@@ -101,3 +101,8 @@
 
   Package-Manager: portage-2.3.1
 
+  07 Oct 2016; Brian Dolbec <dolsen@gentoo.org> txaio-2.5.1-r1.ebuild:
+  Add pypi homepage
+
+  Package-Manager: portage-2.3.1_p8
+
diff --git a/dev-python/txaio/Manifest b/dev-python/txaio/Manifest
index ce108b9..b9fd80c 100644
--- a/dev-python/txaio/Manifest
+++ b/dev-python/txaio/Manifest
@@ -8,7 +8,7 @@
 EBUILD txaio-2.2.0.ebuild 1160 SHA256 b2b977eec781d78645e961d2b555bb8adee291cc2fa4e4a03ac83afdc01aebea SHA512 dcfb0f7636bd7b71c401d8614da832925c1f5fb4d7965d139c8701ad306497bf140976d173ef74694b92da98ccd29784ea14de219ba2729027c02f2f4b584711 WHIRLPOOL 36d257e1b5f06900ebc7f15cb4249192ededdaf305f18b934095870adeefabad0fbad96b99d0106716da08e097a7dc0233f7f9dd91f7fbdb3499f3c14a86d3b1
 EBUILD txaio-2.2.1.ebuild 1160 SHA256 b2b977eec781d78645e961d2b555bb8adee291cc2fa4e4a03ac83afdc01aebea SHA512 dcfb0f7636bd7b71c401d8614da832925c1f5fb4d7965d139c8701ad306497bf140976d173ef74694b92da98ccd29784ea14de219ba2729027c02f2f4b584711 WHIRLPOOL 36d257e1b5f06900ebc7f15cb4249192ededdaf305f18b934095870adeefabad0fbad96b99d0106716da08e097a7dc0233f7f9dd91f7fbdb3499f3c14a86d3b1
 EBUILD txaio-2.3.1.ebuild 1160 SHA256 b2b977eec781d78645e961d2b555bb8adee291cc2fa4e4a03ac83afdc01aebea SHA512 dcfb0f7636bd7b71c401d8614da832925c1f5fb4d7965d139c8701ad306497bf140976d173ef74694b92da98ccd29784ea14de219ba2729027c02f2f4b584711 WHIRLPOOL 36d257e1b5f06900ebc7f15cb4249192ededdaf305f18b934095870adeefabad0fbad96b99d0106716da08e097a7dc0233f7f9dd91f7fbdb3499f3c14a86d3b1
-EBUILD txaio-2.5.1-r1.ebuild 1722 SHA256 88c1fdac1ae1b7f2787c088362d94ed2e430468b5a806aa66b3659abc05d0b2b SHA512 01d044b1b6274bc43189702bb7f7f5703f87bc6d7a5cfdc045fcedc332406c43742d8d0a20f7704ab59b95e63ece9e7d55fbdb2859625eae6b8ed50b1be7d498 WHIRLPOOL fe5523a1a4028730fa233a6e1bff323d66515796b711959ab84f65edbfcbde0e241fc18d262d759a6f34aeeff1b674d6784d7d621801f8a5637497faf80cc11e
-MISC ChangeLog 3301 SHA256 29ffbfa4d66b068a074d65140b29c4f5f89da4153083c4ebb9db90132395ad09 SHA512 1f41c3190d54ace12db4612dfd84a4a1c919befacb6ca94174fd739e62146643b3c9289103cdd1590bf2519656bff219b0881d14e1ab3ba0c27632dfa2e91f85 WHIRLPOOL a115ffd4981f8221a81c12978ac575a3baec144ebf3fef93bd54724ac1e8c3ff2e994a4732ff483770bd425dd6dfbf7e679e7ca21d60bcd580065c6b037ffb8b
+EBUILD txaio-2.5.1-r1.ebuild 1757 SHA256 a46f9eb70b626f478b6346985d6dbfc1df55e6be9ee2d20554da6619b3d96fd6 SHA512 d0d77a71bceb511cb5ef88be2b187bf6e8753bc2c6cd9ce9b408a85ea2dab541e796d99ded766f5cad7e6c8506f01c30e69ca9de0f3ce5f5551b4bc97a5a25f8 WHIRLPOOL b97e568618ae41c0972c00995356256c67baf27092a9fadf8f7291f6ea4aa1947c10f6a035da0ef5bed77165e5d4e3102e88846e63c57973e50f31102e664cb0
+MISC ChangeLog 3430 SHA256 8551af10782edd4476520bcac20ccc4c726ac5e0d582f008d071bb013a465e1a SHA512 9c87510e2847e3db504a3f243eda8f92896cb40702f8adf90b2379790064b120b1c21771cb4947aad6a1177fc02925855716daa6d8f4232d4bc987beaf7e2fe5 WHIRLPOOL d12dd52e9fbd62bf02bfc946aa378c070e6424daf6939c5eb97ba23738ac949bca1b7d65ab8f72b6550da51fe8cf516263cde6fec690f9fc3d303258008e560d
 MISC ChangeLog-2015 487 SHA256 c7e099eb32a33292f191a69744ab9b8be296c75dffd0f29fa4e28b35849d95aa SHA512 db64ff4cd7a36ace385866dff14894c324469aa665eb52b0ab694b1ae9f24bd94d8e34d3741183e843fded4acb4115eb5477d98538373a077b2e06f354a35319 WHIRLPOOL 6343245654e58ab38e2e1f99a8fb826f7fde87481f03fac117b131c0f218ec92f658326da4aa664a33cbae455f994a61311c10729bbc70221bd3c4b43dc7d2a3
 MISC metadata.xml 361 SHA256 448c4b49d6e96d40319ef381adf4d75b8e5ada69d5a7cabf620c6965364bb6f0 SHA512 e812584d014fd0d1ce95e608fe93e56c9f17447e07a0e7e4671a070a86ac8f07563710cd8ba22b8fbce9ebc9388ab74175e8c0e8782f09e6d1b11be26c73a0de WHIRLPOOL 403764d756fa9000349636e51d74fe48b8aede99d72bbd73f090190833e3749efe72e7f051914c11f5e913d79b9ddf8e5e1bb69c39490d7dbd02b97cb0056956
diff --git a/dev-python/txaio/txaio-2.5.1-r1.ebuild b/dev-python/txaio/txaio-2.5.1-r1.ebuild
index 91d1262..159a900 100644
--- a/dev-python/txaio/txaio-2.5.1-r1.ebuild
+++ b/dev-python/txaio/txaio-2.5.1-r1.ebuild
@@ -8,7 +8,7 @@
 inherit distutils-r1
 
 DESCRIPTION="Compatibility API between asyncio/Twisted/Trollius"
-HOMEPAGE="https://github.com/crossbario/txaio"
+HOMEPAGE="https://github.com/crossbario/txaio https://pypi.python.org/pypi/txaio"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/uncompyle6/ChangeLog b/dev-python/uncompyle6/ChangeLog
new file mode 100644
index 0000000..7fe96ec
--- /dev/null
+++ b/dev-python/uncompyle6/ChangeLog
@@ -0,0 +1,12 @@
+# ChangeLog for dev-python/uncompyle6
+# Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2
+# (auto-generated from git log)
+
+*uncompyle6-2.8.3 (07 Oct 2016)
+
+  07 Oct 2016; Brian Dolbec <dolsen@gentoo.org> +metadata.xml,
+  +uncompyle6-2.8.3.ebuild:
+  New package, new dep for dev-python/hypothesis-3.5.*
+
+  Package-Manager: portage-2.3.1_p8
+
diff --git a/dev-python/uncompyle6/Manifest b/dev-python/uncompyle6/Manifest
new file mode 100644
index 0000000..60c5b5b
--- /dev/null
+++ b/dev-python/uncompyle6/Manifest
@@ -0,0 +1,4 @@
+DIST uncompyle6-2.8.3.tar.gz 504536 SHA256 213a5742d89d528e539121ab68b8d897a9fc60997ec30f6ec0764b6ca2d4a543 SHA512 635983a945a05f649d0f78191c59f6d1f0a7c922ad3bc8fc53396514a4cd133cdef228bac3189cd04d0c2104fb5da128f0ad8f868f6cfdd0bf3a0d52e08e773d WHIRLPOOL 93b1085e1b92e6dbfad39f27094636303d022298ee17460ea0f95d3338c6f0f1c03c6a0584d4805375c491e21fa7ca8e8b709532e6d9d1973d9a0b323734441b
+EBUILD uncompyle6-2.8.3.ebuild 1107 SHA256 c167322024e14755c10029f28854e7793fad44fcad686cc3d818750f97eb8e9f SHA512 222ff0b63a32fc16c4c46619898c7515d020557297133ba422002ec5f95c9e6d7712d260978247a0883cad9e02b883ea6beaffff6aa34b14e07de15df0c953c5 WHIRLPOOL 902987ccf3ee635975cf5084ec46e74f0ce9d74738232ab0bbb6411ac24a7dd9ca714bb99d339df7bf2a1c293265d766db2a1d6c8060b78ec046d92296633361
+MISC ChangeLog 358 SHA256 24d5052b18c7a4e61426966960f756ff06669e76ae95502c8eeea123988f5fe9 SHA512 a134454c1636fcb6c91249f598d2e16f4c50078aa0a2e25ab9bfa535ec50404eeda5d27ecb9e1b5aec8d1f18f4d5f60bbf766186fc2d25d28821f5685d3651d5 WHIRLPOOL edbaceefda242cd94e939340753deb9f9e340ffd4f75e1640a17f289e771505b663b9ab0fcc07965d8c8bb81537e7014383e98ecca02474f8c1edd814f11aacc
+MISC metadata.xml 573 SHA256 00accbc41aac6e2ee7efcbfa4ee8325ba800235c4c777617b1a1064d9c51fc01 SHA512 f12497634b9f0d4cae4838786c338327f2e60d25d8627f81e76b09050b47f13f0b1d2115d62f60d4ec567b1aab5d3bdc94427969a285bf42017859f6ad7af496 WHIRLPOOL 76f421089a66f83735c3c08b093f7e7c3229b3f35a7e5a14dbc0dadf83a06f83e30b833411db40b5551e1216098c048c4a9826cb4d3787740831e019095cb3d3
diff --git a/dev-python/uncompyle6/metadata.xml b/dev-python/uncompyle6/metadata.xml
new file mode 100644
index 0000000..14eb52a
--- /dev/null
+++ b/dev-python/uncompyle6/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>dol-sen@gentoo.org</email>
+		<description>Primary maintainer</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<maintainer>
+			<email>rb@dustyfeet.com</email>
+			<name>Rocky Bernstein</name>
+		</maintainer>
+		<remote-id type="pypi">PyQRCode</remote-id>
+	</upstream>
+	<longdescription></longdescription>
+</pkgmetadata>
diff --git a/dev-python/uncompyle6/uncompyle6-2.8.3.ebuild b/dev-python/uncompyle6/uncompyle6-2.8.3.ebuild
new file mode 100644
index 0000000..1fdfe44
--- /dev/null
+++ b/dev-python/uncompyle6/uncompyle6-2.8.3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Python cross-version byte-code deparser"
+HOMEPAGE="https://github.com/rocky/python-uncompyle6/ https://pypi.python.org/pypi/umcompyle6"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND=">=dev-python/xdis-2.3.0
+	>=dev-python/spark-parser-1.4.0"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+	)
+"
+
+# Tests are somewhat sketchy...
+# the main repo has makefiles and commands that don't reflect the actual
+# available options for the commands they are giving.
+# This test does not produce errors, but also does not seem to update the
+# files ok, failed,...  just the # of files tested
+python_test() {
+	PYTHONPATH="${S}/test:${BUILD_DIR}/lib" \
+		${EPYTHON} test/test_pyenvlib.py --verify --all || die \
+		"Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/xdis/ChangeLog b/dev-python/xdis/ChangeLog
new file mode 100644
index 0000000..cac9d66
--- /dev/null
+++ b/dev-python/xdis/ChangeLog
@@ -0,0 +1,12 @@
+# ChangeLog for dev-python/xdis
+# Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2
+# (auto-generated from git log)
+
+*xdis-2.3.1 (07 Oct 2016)
+
+  07 Oct 2016; Brian Dolbec <dolsen@gentoo.org> +metadata.xml,
+  +xdis-2.3.1.ebuild:
+  New package, dep of dev-python/uncompyle6
+
+  Package-Manager: portage-2.3.1_p8
+
diff --git a/dev-python/xdis/Manifest b/dev-python/xdis/Manifest
new file mode 100644
index 0000000..84583b6
--- /dev/null
+++ b/dev-python/xdis/Manifest
@@ -0,0 +1,4 @@
+DIST xdis-2.3.1.tar.gz 69207 SHA256 9b28426a5b476b6740b83063604de7ef4af8b721a5da5894145fbae8921d25ae SHA512 5015914a13296d04e71050c2e916fd5770bfe8bba1f92bf3c64bca06365ea7547cbb216d7cfca19fdcef60af3943fa4ba4e7c27895b1da9c6240daf990051927 WHIRLPOOL c30ae717289c73069efbdb70cdd6388bb009e945c967de53b159aa2f8a606cdca8e28b265b4da56b7f77ab01b8a415b8d8d8b7e1b972370121ab86b18d8921e7
+EBUILD xdis-2.3.1.ebuild 1074 SHA256 acef74da40f84347356668bf7b8b1e49f6c21823af40a122d70eae3e46718a51 SHA512 17dab41483fa1aff3dee40ee6dc132f915895199b6a12d5b995310b452243a239e523ec87ea95a06baead6a3a2b47a708ce6a2cfe3314c2343385671c76796cb WHIRLPOOL e667bb5237667dc2da74a3c7c9aaf83a02da1c723add1e470358618d9075a6603d6ca5d24d4e71f8a18f700a41e2ab1a43dd6b75f8e042ff25985630e8102a4d
+MISC ChangeLog 329 SHA256 ad4cf05c4bc0948b6211e7a7f80e9ed4ef9bf7cb3094290a211efe93a0a906e0 SHA512 3a8a65b0de970009683a92ef9cffb185bdc709e7a53626e997d37710678ffce818a834749e6fe8def9665ca69360552ef4b0f69ce81a6195b092353d029dff35 WHIRLPOOL 391dbe7f8cfe2c2c350e6bbeb9e76ddbca8e3ee630cdaaefaea594db3285f93993625885568eaeda9bcbdf31c7504d9372885dff104ac363e6ea45b2244593ad
+MISC metadata.xml 875 SHA256 fb5f0cefe4830c3e2ab5f48b44381b1f66619e2495556f78a5530ab6517f2f07 SHA512 ba867af65d7561de6b2056112265a52d8e090b866aa0f7b2012e4d2104e878347f6a1d8d7c3a575c267f0d8d1de7600d4de3f9af921e8704f2c64f9f530233d9 WHIRLPOOL c756e21058818565ac3acb6721f603a2e8b9086c9417e42ff0251fa5d11c1ebf7d6858c2e3a23969accaf2e7f10cb868a84324143aa9797976270847801d4f25
diff --git a/dev-python/xdis/metadata.xml b/dev-python/xdis/metadata.xml
new file mode 100644
index 0000000..b836acc
--- /dev/null
+++ b/dev-python/xdis/metadata.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>dol-sen@gentoo.org</email>
+		<description>Primary maintainer</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<maintainer>
+			<email>rb@dustyfeet.com</email>
+			<name>Rocky Bernstein</name>
+		</maintainer>
+		<remote-id type="pypi">spark_parser</remote-id>
+	</upstream>
+	<longdescription>This Python module allows you to disassemble bytecode from
+		different versions of Python than you are running on. It can marshal
+		load Python bytecodes from different versions of Python. The
+		command-line routine pydisasm will show disassembly output using Python
+		3.5 disassembly conventions
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-python/xdis/xdis-2.3.1.ebuild b/dev-python/xdis/xdis-2.3.1.ebuild
new file mode 100644
index 0000000..f97ccb2
--- /dev/null
+++ b/dev-python/xdis/xdis-2.3.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy)
+
+inherit distutils-r1
+
+DESCRIPTION="Python cross-version byte-code disassembler and marshal routines"
+HOMEPAGE="https://github.com/rocky/python-xdis/ https://pypi.python.org/pypi/xdis"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND=">=dev-python/six-1.10.0[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+python_prepare_all() {
+	# Remove the 3.3 specific code from being run
+	rm -R "test_unit/3.3" || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	PYTHONPATH="${S}/test:${S}/test_unit:${BUILD_DIR}/lib" \
+		py.test -v || die "Tests failed under ${EPYTHON}"
+	cd test
+	PYTHONPATH="${S}/test:${BUILD_DIR}/lib" \
+		${EPYTHON} test_pyenvlib.py --verify --simple --compile || die \
+		"Tests failed under ${EPYTHON}"
+}
diff --git a/dev-ros/compressed_depth_image_transport/ChangeLog b/dev-ros/compressed_depth_image_transport/ChangeLog
index f7bf66c..f6e69a5 100644
--- a/dev-ros/compressed_depth_image_transport/ChangeLog
+++ b/dev-ros/compressed_depth_image_transport/ChangeLog
@@ -61,3 +61,11 @@
   24 Jan 2016; Michał Górny <mgorny@gentoo.org> metadata.xml:
   Set appropriate maintainer types in metadata.xml (GLEP 67)
 
+*compressed_depth_image_transport-1.9.5 (07 Oct 2016)
+
+  07 Oct 2016; Alexis Ballier <aballier@gentoo.org>
+  +compressed_depth_image_transport-1.9.5.ebuild:
+  Bump to 1.9.5.
+
+  Package-Manager: portage-2.3.1
+
diff --git a/dev-ros/compressed_depth_image_transport/Manifest b/dev-ros/compressed_depth_image_transport/Manifest
index eeb5b93..05c24fe 100644
--- a/dev-ros/compressed_depth_image_transport/Manifest
+++ b/dev-ros/compressed_depth_image_transport/Manifest
@@ -1,7 +1,9 @@
 DIST image_transport_plugins-1.9.2.tar.gz 23734 SHA256 b610f50cdbab30abaa94980b22a444c5d898c571e3f57f0cf83ecde53877fdf0 SHA512 5ac7429cf61699f1827fdf15374aee5d951cd6aa77321f245bfe4e9771647e1bae5902646f30cb88019675e48732cd4f705eafe0931268684a449bef356bf972 WHIRLPOOL 7136449bf3fbc5f161a89c4fabac2d24fc4d4548186895e95a0aa7175ac196b5859d63da0cd59b418a570c10c767f19a8a9e7d0d408cd2c0517bff5407a512df
 DIST image_transport_plugins-1.9.3.tar.gz 25291 SHA256 2d9b10f1e3c22145d58ba922dcafc72b149bb4561e641fff17eddf1510294271 SHA512 51ec14f5bef48e337146e303a4b87290c932d418621e3ae65d5a2f96247c4d0e9ac63df5c4e102f1532737448b272f07e2ce841030a33b8701febacad1698781 WHIRLPOOL c255da767e2dd668eef9499e26822b7eb3d6c144343287a34e3d396574776b29eff2ed90c384f99e1f9b53031a0f6d14a7311c0d2022bd4fc46af53c0a432025
+DIST image_transport_plugins-1.9.5.tar.gz 26268 SHA256 a3dcd3af617bcafba5b8dab5fbd89183fbaf31798ee4e4e63a91059fa110168c SHA512 54f459719a386f028578889f9b88b8b080f495d75899cee6c8bfb58204970fb2395b2a8da70034eb391ba62f4ce462cb89b97bcdc576a177444613076b5ed02c WHIRLPOOL 1796f983cd0a904b6cce58ecec4a59034ab23ca8ca7a3c2a9b3fa8764d60c1426754c3a6bdb9eaf8bcff1859768af76b3d4f3a3350ee6cd6af5cc89f90ae639a
 EBUILD compressed_depth_image_transport-1.9.2-r1.ebuild 571 SHA256 e5108e88508195e3bc3f8b78e4d4c813251b2d174e10aacd512438ada9564d0e SHA512 d752f951912b56a1fc16d943d77746973176b8951edd7f852d987f0c7d748dd914a9000f7734c241d43bc32e1cf64cf9edd29d25cbc0550d55961cd8b0adecc3 WHIRLPOOL 8cb34291682bd20a7de7452afea4d8b361878a0d9e6e508ab302fd92ea93d2d974cb91c4527ab849a8fb9641a99a54f8656ccf8f9596d248aabccdfeb0cb0174
 EBUILD compressed_depth_image_transport-1.9.3.ebuild 559 SHA256 b17492dd10ce45ba6a289d392cb8c9f7f32434def4fbaec0714fba6957378864 SHA512 e5a4f6589f107b71c8023ce1b216d110245ca3eb8d89ccb2c9bc83b2b208a0282624b4d28e451da928759508cae12a6dcf02c112a2e56e81554b63d8e74ff55e WHIRLPOOL 391247950a2f7b77f58da4f34f1cd5c638564bc0dc10ce09935dcee7d9de75b5512dec37085e28fe4edbeaef6f2c14bcfde1341ce05293840bb24c2fb76fdb4e
+EBUILD compressed_depth_image_transport-1.9.5.ebuild 559 SHA256 cf459d94d442d45b8f445e876d3576dddab80be36743c78ed3a37eb8fbb17d80 SHA512 5206d9255a449dc71293f5285aacb127bc8d626b0876c45e6128fbb881c514064e4c9c198e83702c7872858ca2b24e5818e55301eb81e47a842d145331f94ca5 WHIRLPOOL 2a426540edf4baf3ce4ffabc97da455cf87db7484b44144cbc1071bb8097f42a71faa0adf29cbe0e16407dbb627c79b7bca6a64ba1a67dd94b5c1d9cd0e2ffe4
 EBUILD compressed_depth_image_transport-9999.ebuild 559 SHA256 b17492dd10ce45ba6a289d392cb8c9f7f32434def4fbaec0714fba6957378864 SHA512 e5a4f6589f107b71c8023ce1b216d110245ca3eb8d89ccb2c9bc83b2b208a0282624b4d28e451da928759508cae12a6dcf02c112a2e56e81554b63d8e74ff55e WHIRLPOOL 391247950a2f7b77f58da4f34f1cd5c638564bc0dc10ce09935dcee7d9de75b5512dec37085e28fe4edbeaef6f2c14bcfde1341ce05293840bb24c2fb76fdb4e
-MISC ChangeLog 2301 SHA256 fa7bf04889b75f3bb2636fe87f7b45696c5706ba3e68e0ecbdad7d2a8e1fe029 SHA512 a3b458ca560e84c255e8c4838992cf68c35dcdb21182f73779c333b3adaadad97cc4a0d92c8c65de5a8646d1cdf678efa1d564355a94a42d9c86d26f639a5fab WHIRLPOOL 201acb64cd92feb9f9cbfe036bcd42fa41b4c936a441873e5669ae8330ecdd9d8f3340ba772d9b25ce03fe52153f5a683abc15d04976b47571db43e4bdf3a9a9
+MISC ChangeLog 2510 SHA256 6824adcbc23b4e477cf19b2648df67a22d8434f807c68543d5f67e7f3db1b2ef SHA512 ef791a6f94a69064fd5b3594d7f4c4b7c41a23d5e074f06f902b3f7b60bc67e159f6165ce03be5d7c5f425595c819661038d3e41c965645f429e2a2d5d75cafb WHIRLPOOL 0eb45d9a2c6b76083630f4cf9a4c90a749655c4769e3a1d6fcc42bdaec57738419b65a9150d68ed78ebada5b7e2f4172c3857a20173231bfa18149979dc2d075
 MISC metadata.xml 352 SHA256 7531295b37e1b7807944e69f310c2892596e0fe8ed15decb854b1c687ce48422 SHA512 855c756eea98c52acb020fb394646008db35b41b864a0983f67bbf07ffce658d394c0de13d6622286770e4aa4152b74f2f6028c575b11b66233431d1fffa0347 WHIRLPOOL e87c5707d2ab0f2d6e03b845b2fffa93bb023722d1d6635013e4341052c5bd58bc6010ab0e82ed9959f80cdfb68383bc395f8752f0cd6f6d20b708c78a3cec5c
diff --git a/dev-ros/compressed_depth_image_transport/compressed_depth_image_transport-1.9.5.ebuild b/dev-ros/compressed_depth_image_transport/compressed_depth_image_transport-1.9.5.ebuild
new file mode 100644
index 0000000..0a22bed
--- /dev/null
+++ b/dev-ros/compressed_depth_image_transport/compressed_depth_image_transport-1.9.5.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-perception/image_transport_plugins"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Plugin to image_transport for transparently sending depth images using PNG compression"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/cv_bridge
+	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
+	dev-ros/image_transport
+	media-libs/opencv
+"
+DEPEND="${RDEPEND}"
diff --git