Sync with portage [Tue May 26 15:07:39 MSK 2015].

2015-05-26 15:07:39 +03:00 · 2015-05-26 15:07:39 +03:00 · f6a3676c4a
commit f6a3676c4a
parent a0e65dac81
2966 changed files with 7640 additions and 4084 deletions
--- a/app-admin/consul-template/Manifest
+++ b/app-admin/consul-template/Manifest
@ -0,0 +1,14 @@
+DIST consul-template-0.9.0.tar.gz 69085 SHA256 5277cc43b61d531630854d707cd7a51bdd84328d8c30bc330dd2e2aa8898ede8 SHA512 39da6029d818f3ee0b9aba332f0a645c9e381b1115549dcc6945245c4dee53cd3d503e3dc3da4c4394192989798b242994b53e3256755ffe02c4b3c9296139d3 WHIRLPOOL 1ba0d1c2a2a9c8617338901f85916e25460155979dda9604752bc62c289e40d904ad27f2c31ca2491936289519d4f09fe72bbe4c176035880f01c789fdf74db2
+DIST copystructure-6fc66267e9da7d155a9d3bd489e00dad02666dc6.tar.gz 4028 SHA256 4e7271e88e101ac324f799c421b1c8c1477d1f54048d6b6b1ff3930498870272 SHA512 3c804e126f676cb7a6c5af775b7fdf6a3b591b42315707ebb83a66a96f583eac414e01402bc489d9b218b64db7780f57bd5a4bd922aff59dca068b869f825de5 WHIRLPOOL 3be054304612292adef0361bbd2d94d51c4186d4a66bf949d326345da0f7f5c6f5558c0db62fb1ed1144899155f5c63ceeb9243c267b82605b024cf6898f31ba
+DIST errwrap-7554cd9344cec97297fa6649b055a8c98c2a1e55.tar.gz 8320 SHA256 e77d6aa78ef6342b21358d689edcd043778c5623af5a9b2690ed8e3fa4ea7db0 SHA512 da45b1696253bebe012f3d0e624a63dd11ad1a613d81cc302f2ea6f096f29a8d81015b9c00363bd2590c4cacc59de52a27e84435a7b4ad6512485cdd87df11c0 WHIRLPOOL 5c6013d852711e001a0eca6a3ad11f64e006be527cfc0b46db21049af97506730b48cfe1b2fac10bcfc66f61dce69023f20b06c83558e80ce337d75a127aa90d
+DIST go-metrics-a54701ebec11868993bc198c3f315353e9de2ed6.tar.gz 11268 SHA256 2f4206d5d50eaab383cdc4f5c57179e285b93649c028a69dd9e2a4a45b69afe3 SHA512 e3da3f7b98edd32da5c3381afc3e92021b92416d7ea9de0423a05c06bc9ff808e28d29ca9f689c0029809a4b1643819954039516d6ab5890bb5512f5fe99fd6d WHIRLPOOL 815f83ae08bb6a37ee1774a718a8c3b4087ee9a95f190b8a77453f0d1ba1ca88a331e8be12b2f63d0c1fdb9472f2ff35786b94eaf1f61f5cb33fe1e6d9e4e460
+DIST go-msgpack-71c2886f5a673a35f909803f38ece5810165097b.tar.gz 49485 SHA256 c32b90e67762a375981b38154cae65222bb1aaa7722727d0225d5f8de773e4c8 SHA512 e4141e664c3237f7ab4c283b110d04e933bfb36a9d57af374ab42fed00a4ad6d8399e3399b206eebe76c5e142746412b2ada6c20b1ec09088f3bb7d82a7b01a9 WHIRLPOOL 1434e72897de4063515a0d3319e96b066406c110e3e36f710970886ba6ec9411f71908d9696a4528ee0fcb88bea54ab9c064faa230761ce38b82bb5506a2c073
+DIST go-multierror-fcdddc395df1ddf4247c69bd436e84cfa0733f7e.tar.gz 8058 SHA256 af90f9be029c091eb011ff25d270772fdb51edf3c6396cf99f224c4e7ad724c3 SHA512 f5cb12407f9bc986867a274c623037edab04f8e2b664c7d4db3bb7e32f970dd073a3d233d18549a5f01b5e88abff0eb0c1fcf79b6696a531c208e6fe8137080e WHIRLPOOL c997792a5c1b3029b32d0fad3a55a281b5ced2bef306367a1fd49df75cab831b93a3752e76f8a18ce5d08e155f66b3826aa5d9878fb9655821cef7a69b71de31
+DIST go-radix-0bab926c3433cfd6490c6d3c504a7b471362390c.tar.gz 5446 SHA256 f4e628adceee06d7717dce0bf566d5ebd8c009599807f2436b3cda259011b331 SHA512 350904076752e2fda17e9c2891a50b037d2ca165924880d6d5e466b8ed76685d79ff00bbbfbe9a665668e0ebde23c87129d3c1c4bf27ffe0c034df160db9d08f WHIRLPOOL 8571b9e818904a56ea16c35883725013d2009dc294acfdf4f28920a03baff36ffcd3d4d6d8be0ecfc78eefbfeef57e4b2ca224f2ce37d665caae724389346f88
+DIST go-syslog-42a2b573b664dbf281bd48c3cc12c086b17a39ba.tar.gz 4397 SHA256 378f5249729661db9d0c65030fbf636f6ec1d60ee926e67abf8c6dd7921d3907 SHA512 42257d0599936bb215f4a9f9189518418f02bc43e4d7417823ea460bfc45c6fd1f9b0bf5a35dd73881b57cd9e892c702b813a68fe6e417e82dd31c6635c1b24e WHIRLPOOL 26cf1464bf0899ae9bad0067481f57a121433c5fe7c93fef92523a157d7906b8c1c4216c2a4fe738222e4afaa85fc0a7b7b29149254125a3e8b2e7064add6cb1
+DIST go-zookeeper-d0e0d8e11f318e000a8cc434616d69e329edc374.tar.gz 24950 SHA256 773f4428d6eb2bcc53726fc2af7f495d30fd6d962ed182b7ec2edc8f8ad55ef3 SHA512 c1ac076b2abf9106c185c29158fdf8b3a74ea41458f336b5ebc2f5f13168ec6f06be14cbc3df61c1307a0fa4381d2f4f7cd8b569411152ae748c7fe12896bd24 WHIRLPOOL 94bb9b02d4c7e8eafa0fce1d6d9b79a6cf8007d9774a42267cb92673a89d9c30e60a7eb4d2cd464fbdc5e2e644649d3a980a3c92d6badfbf092f99a99306729e
+DIST golang-lru-995efda3e073b6946b175ed93901d729ad47466a.tar.gz 7872 SHA256 cac6e889020e8b31e46d50b98e0af9acbb44bf352ad0ca9d30db79b6235849e2 SHA512 29eee70cbdc9c712d1cece1f911f3a74ebfd44318b91dcd1932f0bff031286f0a80db93772dd04be350c0cca3cc77c0676659ef0f85229f31a1140e23c1fc3f5 WHIRLPOOL c4711d30caf5c2d880aeec7330bc06011dc4e741e305f6dcac8d983734b3706cb5967b06755f7684370ca61a91f356a97c9866ffda0e275e26bb11d3a74d0145
+DIST hcl-513e04c400ee2e81e97f5e011c08fb42c6f69b84.tar.gz 28692 SHA256 109ec067ff8ff7f30538e0d2ba1384c1fe25694c99d56972003b1c669d19d0b2 SHA512 90f568373d20cccbb56ada29257bd2ea808bbacb668fd1b82e71abf8f5e2592b4a58dc5d3f1174a2b38c660316cd0227eb333e747aae7a846e94168ebe9d2297 WHIRLPOOL cf5685f25d3c3b69d330e30ad089e2cbc9c6636b0f2ac4933638d6bcad06aa5a50f92d5228a1f1ddabd5e0f8187bc5b16f38f4a3bd86bbbf161a5409d5102ec0
+DIST logutils-367a65d59043b4f846d179341d138f01f988c186.tar.gz 7704 SHA256 9b2173d9277574adbc45400101cb0b65534a5cd3defe62eeb3bff652eeb3e34c SHA512 9a4444fbae3bd1c0b2391981edf2f8155ebdd90a14a367f718bc7bcdced68b37b563ae38141fc3cb35409ff70820bd32b5a44cb218630418bce37f78181ef109 WHIRLPOOL 4973a7ef035807c9ef1135cface87cce4707910e6c33cece87dc8200df5e3d3c351d129ce20214e2cbf6bf58a7b040e9d1c5e12f5414cf37e45890a6a8ec439c
+DIST mapstructure-442e588f213303bec7936deba67901f8fc8f18b1.tar.gz 12220 SHA256 b4fa5d3b888734f849c5d6784fc1c5749e4ece168fda65c604676fca39c085d2 SHA512 de79f2579a086cccc047b280ae7e2b5dc5f8a95d504ead9d7f0cbaf01e70d37cb4eea8e7ab9aec446a7c2f1771152add3e2e488c18963d63ca3dac43ed2a33b7 WHIRLPOOL ecf8bd2bc9e50bb9e5ad3b6ebb04f5fdc10cf0e515f25d1381bbd1591c074887706b7c25f03a749ff212555fc537534056dab58eaece9357de9045ba2edd9a51
+DIST reflectwalk-242be0c275dedfba00a616563e6db75ab8f279ec.tar.gz 4290 SHA256 70ccfe92748dcc9e23460f6cedaeb4dd3f4807cc76241298b954beb71448cce6 SHA512 50ceea50f26307903138d5a0e0c395863ae662993a58d2053fce79ca49b0a17f9ba863adcdf4053cd9eb6592c91de02671be486ec4693449439b2b634be55fc1 WHIRLPOOL 4f88fd9ea461838acbf1344be39e9ecc1494ac8ae060917e27f16a6e5b19833b41be23dd8c0638c22933991b802f2f6dfc72e0bb772828bb43b020a08f22f1b1
--- a/app-admin/consul-template/consul-template-0.9.0.ebuild
+++ b/app-admin/consul-template/consul-template-0.9.0.ebuild
@ -0,0 +1,103 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/consul-template/consul-template-0.9.0.ebuild,v 1.1 2015/05/26 03:54:54 zmedico Exp $
+
+EAPI=5
+
+inherit systemd user
+
+KEYWORDS="~amd64"
+DESCRIPTION="Generic template rendering and notifications with Consul"
+GO_PN="github.com/hashicorp/${PN}"
+HOMEPAGE="http://${GO_PN}"
+LICENSE="MPL-2.0"
+SLOT="0"
+IUSE="test"
+
+DEPEND=">=dev-lang/go-1.4
+	test? ( dev-go/go-tools )
+	app-admin/consul
+	app-admin/vault"
+RDEPEND=""
+
+SRC_URI="https://${GO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+https://github.com/hashicorp/go-multierror/archive/fcdddc395df1ddf4247c69bd436e84cfa0733f7e.tar.gz -> go-multierror-fcdddc395df1ddf4247c69bd436e84cfa0733f7e.tar.gz
+https://github.com/armon/go-radix/archive/0bab926c3433cfd6490c6d3c504a7b471362390c.tar.gz -> go-radix-0bab926c3433cfd6490c6d3c504a7b471362390c.tar.gz
+https://github.com/hashicorp/errwrap/archive/7554cd9344cec97297fa6649b055a8c98c2a1e55.tar.gz -> errwrap-7554cd9344cec97297fa6649b055a8c98c2a1e55.tar.gz
+https://github.com/armon/go-metrics/archive/a54701ebec11868993bc198c3f315353e9de2ed6.tar.gz -> go-metrics-a54701ebec11868993bc198c3f315353e9de2ed6.tar.gz
+https://github.com/hashicorp/go-msgpack/archive/71c2886f5a673a35f909803f38ece5810165097b.tar.gz -> go-msgpack-71c2886f5a673a35f909803f38ece5810165097b.tar.gz
+https://github.com/hashicorp/go-syslog/archive/42a2b573b664dbf281bd48c3cc12c086b17a39ba.tar.gz -> go-syslog-42a2b573b664dbf281bd48c3cc12c086b17a39ba.tar.gz
+https://github.com/hashicorp/golang-lru/archive/995efda3e073b6946b175ed93901d729ad47466a.tar.gz -> golang-lru-995efda3e073b6946b175ed93901d729ad47466a.tar.gz
+https://github.com/hashicorp/hcl/archive/513e04c400ee2e81e97f5e011c08fb42c6f69b84.tar.gz -> hcl-513e04c400ee2e81e97f5e011c08fb42c6f69b84.tar.gz
+https://github.com/hashicorp/logutils/archive/367a65d59043b4f846d179341d138f01f988c186.tar.gz -> logutils-367a65d59043b4f846d179341d138f01f988c186.tar.gz
+https://github.com/mitchellh/copystructure/archive/6fc66267e9da7d155a9d3bd489e00dad02666dc6.tar.gz -> copystructure-6fc66267e9da7d155a9d3bd489e00dad02666dc6.tar.gz
+https://github.com/mitchellh/mapstructure/archive/442e588f213303bec7936deba67901f8fc8f18b1.tar.gz -> mapstructure-442e588f213303bec7936deba67901f8fc8f18b1.tar.gz
+https://github.com/mitchellh/reflectwalk/archive/242be0c275dedfba00a616563e6db75ab8f279ec.tar.gz -> reflectwalk-242be0c275dedfba00a616563e6db75ab8f279ec.tar.gz
+https://github.com/samuel/go-zookeeper/archive/d0e0d8e11f318e000a8cc434616d69e329edc374.tar.gz -> go-zookeeper-d0e0d8e11f318e000a8cc434616d69e329edc374.tar.gz"
+STRIP_MASK="*.a"
+S="${WORKDIR}/src/${GO_PN}"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+get_archive_go_package() {
+	local archive=${1} uri x
+	for x in ${SRC_URI}; do
+		if [[ ${x} == http* ]]; then
+			uri=${x}
+		elif [[ ${x} == ${archive} ]]; then
+			break
+		fi
+	done
+	uri=${uri#https://}
+	echo ${uri%/archive/*}
+}
+
+unpack_go_packages() {
+	local go_package x
+	# Unpack packages to appropriate locations for GOPATH
+	for x in ${A}; do
+		unpack ${x}
+		go_package=$(get_archive_go_package ${x})
+		mkdir -p src/${go_package%/*}
+		mv ${go_package##*/}-* src/${go_package} || die
+	done
+}
+
+src_unpack() {
+	unpack_go_packages
+	export GOPATH=${WORKDIR}
+}
+
+src_prepare() {
+	sed -e 's|build: deps|build:|'  -e 's|test: deps|test:|' \
+		-i Makefile || die
+
+	# Disable tests that fail under network-sandbox
+	sed -e 's:TestRun_onceFlag(:_\0:' -i cli_test.go || die
+	sed -e 's:TestRunner_quiescence(:_\0:' -i runner_test.go || die
+}
+
+src_compile() {
+	emake build
+}
+
+src_install() {
+	local x
+
+	dobin bin/${PN}
+	dodoc README.md
+
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+	systemd_dounit "${FILESDIR}/${PN}.service"
+
+	keepdir /etc/${PN}.d
+	insinto /etc/${PN}.d
+	doins "${FILESDIR}/"*.json.example
+}
--- a/app-admin/consul-template/consul-template-9999.ebuild
+++ b/app-admin/consul-template/consul-template-9999.ebuild
@ -0,0 +1,69 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/consul-template/consul-template-9999.ebuild,v 1.1 2015/05/26 03:54:54 zmedico Exp $
+
+EAPI=5
+
+inherit git-r3 systemd user
+
+KEYWORDS=""
+DESCRIPTION="Generic template rendering and notifications with Consul"
+GO_PN="github.com/hashicorp/${PN}"
+HOMEPAGE="http://${GO_PN}"
+EGIT_REPO_URI="git://${GO_PN}.git"
+LICENSE="MPL-2.0"
+SLOT="0"
+IUSE="test"
+
+DEPEND=">=dev-lang/go-1.4
+	test? ( dev-go/go-tools )
+	app-admin/consul
+	app-admin/vault"
+RDEPEND=""
+
+SRC_URI=""
+STRIP_MASK="*.a"
+S="${WORKDIR}/src/${GO_PN}"
+EGIT_CHECKOUT_DIR="${S}"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_unpack() {
+	export GOPATH=${WORKDIR}
+	git-r3_src_unpack
+	go get -d -v ./... $(go list -f '{{range .TestImports}}{{.}} {{end}}' ./...) || die
+}
+
+src_prepare() {
+	sed -e 's|build: deps|build:|'  -e 's|test: deps|test:|' \
+		-i Makefile || die
+
+	# Disable tests that fail under network-sandbox
+	sed -e 's:TestRun_onceFlag(:_\0:' -i cli_test.go || die
+	sed -e 's:TestRunner_quiescence(:_\0:' -i runner_test.go || die
+}
+
+src_compile() {
+	emake build
+}
+
+src_install() {
+	local x
+
+	dobin bin/${PN}
+	dodoc README.md
+
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+	systemd_dounit "${FILESDIR}/${PN}.service"
+
+	keepdir /etc/${PN}.d
+	insinto /etc/${PN}.d
+	doins "${FILESDIR}/"*.json.example
+}
--- a/app-admin/consul-template/files/consul-template.confd
+++ b/app-admin/consul-template/files/consul-template.confd
@ -0,0 +1,7 @@
+# you can change the init script behavior by setting those parameters
+# - group (default: consul-template)
+# - pidfile (default: /run/consul-template/consul-template.pid)
+# - user (default: consul-template)
+
+# extra arguments for the consul agent
+command_args="-config=/etc/consul-template.d"
--- a/app-admin/consul-template/files/consul-template.initd
+++ b/app-admin/consul-template/files/consul-template.initd
@ -0,0 +1,25 @@
+#!/sbin/openrc-run
+# Copyright 2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/consul-template/files/consul-template.initd,v 1.1 2015/05/26 03:54:54 zmedico Exp $
+
+description="consul-template agent"
+group=${group:-${SVCNAME}}
+pidfile=${pidfile:-"/run/${SVCNAME}/${SVCNAME}.pid"}
+user=${user:-${SVCNAME}}
+
+command="/usr/bin/${SVCNAME}"
+command_args="agent -config-dir=/etc/consul-template.d ${command_args}"
+command_background="true"
+start_stop_daemon_args="--user ${user} --group ${group} \
+	--stdout /var/log/${SVCNAME}/${SVCNAME}.log \
+	--stderr /var/log/${SVCNAME}/${SVCNAME}.log"
+
+depend() {
+	need net
+	after net
+}
+
+start_pre() {
+	checkpath -d -m 0755 -o "${user}":"${group}" "${pidfile%/*}"
+}
--- a/app-admin/consul-template/files/consul-template.service
+++ b/app-admin/consul-template/files/consul-template.service
@ -0,0 +1,15 @@
+[Unit]
+Description=consul-template daemon
+Requires=network-online.target
+After=network-online.target
+
+[Service]
+User=consul-template
+Environment=CONSUL_TEMPLATE_DAEMON_OPTS="-config=/etc/consul-template.d"
+ExecStart=/usr/bin/consul-template $CONSUL_TEMPLATE_DAEMON_OPTS
+Restart=on-failure
+SuccessExitStatus=12
+ExecReload=/bin/kill -HUP $MAINPID
+
+[Install]
+WantedBy=default.target
--- a/app-admin/consul-template/files/localhost.json.example
+++ b/app-admin/consul-template/files/localhost.json.example
@ -0,0 +1 @@
+consul = "127.0.0.1:8500"
--- a/app-admin/consul-template/metadata.xml
+++ b/app-admin/consul-template/metadata.xml
@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>zmedico@gentoo.org</email>
+  </maintainer>
+</pkgmetadata>
--- a/app-admin/consul/consul-0.5.2.ebuild
+++ b/app-admin/consul/consul-0.5.2.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/consul/consul-0.5.2.ebuild,v 1.2 2015/05/24 21:38:02 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/consul/consul-0.5.2.ebuild,v 1.3 2015/05/25 19:12:07 zmedico Exp $

 EAPI=5

@ -143,7 +143,16 @@ src_install() {
 	newconfd "${FILESDIR}/consul.confd" "${PN}"
 	systemd_dounit "${FILESDIR}/consul.service"

-	insinto /usr/lib/go
 	find "${WORKDIR}"/{pkg,src} -name '.git*' -exec rm -rf {} \; 2>/dev/null
-	doins -r "${WORKDIR}"/{pkg,src}
+	find "${WORKDIR}"/src/${GO_PN} -mindepth 1 -maxdepth 1 -type f -delete
+	while read -r -d '' x; do
+		x=${x#${WORKDIR}/src}
+		[[ -d ${WORKDIR}/pkg/${KERNEL}_${ARCH}/${x} ||
+			-f ${WORKDIR}/pkg/${KERNEL}_${ARCH}/${x}.a ]] && continue
+		rm -rf "${WORKDIR}"/src/${x}
+	done < <(find "${WORKDIR}"/src/${GO_PN} -mindepth 1 -maxdepth 1 -type d -print0)
+	insinto /usr/lib/go/pkg/${KERNEL}_${ARCH}/${GO_PN%/*}
+	doins -r "${WORKDIR}"/pkg/${KERNEL}_${ARCH}/${GO_PN}
+	insinto /usr/lib/go/src/${GO_PN%/*}
+	doins -r "${WORKDIR}"/src/${GO_PN}
 }
--- a/app-admin/consul/consul-9999.ebuild
+++ b/app-admin/consul/consul-9999.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/consul/consul-9999.ebuild,v 1.2 2015/05/24 21:38:02 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/consul/consul-9999.ebuild,v 1.3 2015/05/25 19:12:07 zmedico Exp $

 EAPI=5

@ -99,7 +99,16 @@ src_install() {
 	newconfd "${FILESDIR}/consul.confd" "${PN}"
 	systemd_dounit "${FILESDIR}/consul.service"

-	insinto /usr/lib/go
 	find "${WORKDIR}"/{pkg,src} -name '.git*' -exec rm -rf {} \; 2>/dev/null
-	doins -r "${WORKDIR}"/{pkg,src}
+	find "${WORKDIR}"/src/${GO_PN} -mindepth 1 -maxdepth 1 -type f -delete
+	while read -r -d '' x; do
+		x=${x#${WORKDIR}/src}
+		[[ -d ${WORKDIR}/pkg/${KERNEL}_${ARCH}/${x} ||
+			-f ${WORKDIR}/pkg/${KERNEL}_${ARCH}/${x}.a ]] && continue
+		rm -rf "${WORKDIR}"/src/${x}
+	done < <(find "${WORKDIR}"/src/${GO_PN} -mindepth 1 -maxdepth 1 -type d -print0)
+	insinto /usr/lib/go/pkg/${KERNEL}_${ARCH}/${GO_PN%/*}
+	doins -r "${WORKDIR}"/pkg/${KERNEL}_${ARCH}/${GO_PN}
+	insinto /usr/lib/go/src/${GO_PN%/*}
+	doins -r "${WORKDIR}"/src/${GO_PN}
 }
--- a/app-admin/vault/Manifest
+++ b/app-admin/vault/Manifest
@ -0,0 +1,3 @@
+DIST gox-0.3.0.tar.gz 13735 SHA256 29dc6b689f670a5444cc54cd9111549ccb01501901bc9197d0e1325a35157802 SHA512 cbc737a780403d1233af10a85b30676e0fcfbfbe99a740d0eff69bef4fd557c65d102c43b3b0dde0b8b935967be8cb33fab50d2baf481d27fa53285be6b1aef2 WHIRLPOOL f3a10a965c4cfe0707bad2f8307162564b00d2b0279d61311445714f28a17d97a4ee4d5a442a7aaaf25b9f44eff656a8b84485bdb0e5776cc7a1014350cff216
+DIST iochan-b584a329b193e206025682ae6c10cdbe03b0cd77.tar.gz 1110 SHA256 27aa65991036fe736d3c383378e49758097f5a11a20b40f44cc434eac97659f7 SHA512 a4314506416d6ab84c9cd96aeadc8d08c88df8f2a146b1e6a51e5f756c2e2409f39adf274487998d0229a46d81b2d0899717064459966f4dbfa5571cc9e85400 WHIRLPOOL 9fd40b227de5452642696326b0b0a66d95e2ddf738a1b6e7e712e201101bb84cc854161609836cae82515ba95ba1e5efd331ce68abdf79c654a9d7a874f849f3
+DIST vault-0.1.2.tar.gz 1158880 SHA256 b8d56f1ebd11f5d80a6a6728b6c9ac399c7e507e3e9fe8830966be50ba15d1b3 SHA512 49488d4fac62521e485a623a3f5fa384643e84bb9aff616efec2169d84731f9892b5ffa1ae475ce905032f6f8e816a372535bc328daf4ee5caf0344a3cd2e9bc WHIRLPOOL f1d678145fad5b8a988dacb8aabf02394a81b267aeabdd2a2968c0efc9576997e980800fe0f08fb70d2f6052fce5d9d94c6d46ee0b50d97ca68b404a78c2c381
--- a/app-admin/vault/files/localhost.json.example
+++ b/app-admin/vault/files/localhost.json.example
@ -0,0 +1,9 @@
+backend "consul" {
+	address = "127.0.0.1:8500"
+	path = "vault"
+}
+
+listener "tcp" {
+	address = "127.0.0.1:8200"
+	tls_disable = 1
+}
--- a/app-admin/vault/files/vault.confd
+++ b/app-admin/vault/files/vault.confd
@ -0,0 +1,7 @@
+# you can change the init script behavior by setting those parameters
+# - group (default: vault)
+# - pidfile (default: /run/vault/vault.pid)
+# - user (default: vault)
+
+# extra arguments for the consul agent
+command_args="-config=/etc/consul.d"
--- a/app-admin/vault/files/vault.initd
+++ b/app-admin/vault/files/vault.initd
@ -0,0 +1,25 @@
+#!/sbin/openrc-run
+# Copyright 2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/vault/files/vault.initd,v 1.1 2015/05/26 03:17:37 zmedico Exp $
+
+description="vault server"
+group=${group:-${SVCNAME}}
+pidfile=${pidfile:-"/run/${SVCNAME}/${SVCNAME}.pid"}
+user=${user:-${SVCNAME}}
+
+command="/usr/sbin/${SVCNAME}"
+command_args="agent -config-dir=/etc/vault.d ${command_args}"
+command_background="true"
+start_stop_daemon_args="--user ${user} --group ${group} \
+	--stdout /var/log/${SVCNAME}/${SVCNAME}.log \
+	--stderr /var/log/${SVCNAME}/${SVCNAME}.log"
+
+depend() {
+	need net
+	after net
+}
+
+start_pre() {
+	checkpath -d -m 0755 -o "${user}":"${group}" "${pidfile%/*}"
+}
--- a/app-admin/vault/files/vault.service
+++ b/app-admin/vault/files/vault.service
@ -0,0 +1,17 @@
+[Unit]
+Description=vault server
+Requires=network-online.target
+After=network-online.target
+
+[Service]
+User=vault
+Environment=VAULT_SERVER_OPTS="-config=/etc/vault.d"
+ExecStart=/usr/bin/vault server $VAULT_SERVER_OPTS
+CapabilityBoundingSet=CAP_IPC_LOCK
+Capabilities=CAP_IPC_LOCK=eip
+SecureBits=keep-caps
+Restart=on-failure
+SuccessExitStatus=2
+
+[Install]
+WantedBy=default.target
--- a/app-admin/vault/metadata.xml
+++ b/app-admin/vault/metadata.xml
@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer>
+    <email>zmedico@gentoo.org</email>
+  </maintainer>
+</pkgmetadata>
--- a/app-admin/vault/vault-0.1.2.ebuild
+++ b/app-admin/vault/vault-0.1.2.ebuild
@ -0,0 +1,100 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/vault/vault-0.1.2.ebuild,v 1.1 2015/05/26 03:17:37 zmedico Exp $
+
+EAPI=5
+
+inherit fcaps systemd user
+
+KEYWORDS="~amd64"
+DESCRIPTION="A tool for managing secrets"
+HOMEPAGE="https://vaultproject.io/"
+GO_PN="github.com/hashicorp/${PN}"
+LICENSE="MPL-2.0"
+SLOT="0"
+IUSE=""
+
+DEPEND=">=dev-lang/go-1.4
+	dev-go/go-oauth2"
+RDEPEND=""
+
+SRC_URI="https://${GO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+https://github.com/mitchellh/gox/archive/v0.3.0.tar.gz -> gox-0.3.0.tar.gz
+https://github.com/mitchellh/iochan/archive/b584a329b193e206025682ae6c10cdbe03b0cd77.tar.gz -> iochan-b584a329b193e206025682ae6c10cdbe03b0cd77.tar.gz"
+STRIP_MASK="*.a"
+S="${WORKDIR}/src/${GO_PN}"
+
+FILECAPS=(
+	-m 755 'cap_ipc_lock=+ei' usr/bin/${PN}
+)
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_unpack() {
+	local x
+
+	default
+	mkdir -p src/${GO_PN%/*} || die
+	mv ${P} src/${GO_PN} || die
+
+	# Create a writable GOROOT in order to avoid sandbox violations.
+	export GOROOT="${WORKDIR}/goroot"
+	cp -sR "${EPREFIX}"/usr/lib/go "${GOROOT}" || die
+	rm -rf "${GOROOT}/src/${GO_PN}" || die
+
+	export GOPATH=${WORKDIR}:${WORKDIR}/src/github.com/hashicorp/vault/Godeps/_workspace
+
+	while read -r -d '' x; do
+		rm -rf "${GOROOT}/src/${x}" "${GOROOT}/pkg/${KERNEL}_${ARCH}/${x}"{,.a} || die
+	done < <(find "${WORKDIR}/src/github.com/hashicorp/vault/Godeps/_workspace/src" -maxdepth 3 -mindepth 3 -type d -print0)
+
+	mkdir -p "${GOROOT}/src/github.com/mitchellh" || die
+	rm -rf "${GOROOT}/src/github.com/mitchellh/gox" || die
+	mv gox-0.3.0 "${GOROOT}/src/github.com/mitchellh/gox" || die
+	rm -rf "${GOROOT}/src/github.com/mitchellh/iochan" || die
+	mv iochan-* "${GOROOT}/src/github.com/mitchellh/iochan" || die
+}
+
+src_prepare() {
+	# Avoid the need to have a git checkout
+	sed -e 's:^GIT.*::' \
+		-e 's:-ldflags.*:\\:' \
+		-i scripts/build.sh || die
+}
+
+src_compile() {
+	go install -v -x github.com/mitchellh/gox || die
+	PATH=${GOROOT}/bin:${PATH} emake dev
+}
+
+src_install() {
+	local x
+
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+	systemd_dounit "${FILESDIR}/${PN}.service"
+
+	keepdir /etc/${PN}.d
+	insinto /etc/${PN}.d
+	doins "${FILESDIR}/"*.json.example
+
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+
+	dobin bin/${PN}
+	find "${WORKDIR}"/{pkg,src} -name '.git*' -exec rm -rf {} \; 2>/dev/null
+	find "${WORKDIR}"/src/${GO_PN} -mindepth 1 -maxdepth 1 -type f -delete
+	while read -r -d '' x; do
+		x=${x#${WORKDIR}/src}
+		[[ -d ${WORKDIR}/pkg/${KERNEL}_${ARCH}/${x} ||
+			-f ${WORKDIR}/pkg/${KERNEL}_${ARCH}/${x}.a ]] && continue
+		rm -rf "${WORKDIR}"/src/${x}
+	done < <(find "${WORKDIR}"/src/${GO_PN} -mindepth 1 -maxdepth 1 -type d -print0)
+	insinto /usr/lib/go/pkg/${KERNEL}_${ARCH}/${GO_PN%/*}
+	doins -r "${WORKDIR}"/pkg/${KERNEL}_${ARCH}/${GO_PN}
+	insinto /usr/lib/go/src/${GO_PN%/*}
+	doins -r "${WORKDIR}"/src/${GO_PN}
+}
--- a/app-admin/vault/vault-9999.ebuild
+++ b/app-admin/vault/vault-9999.ebuild
@ -0,0 +1,96 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/vault/vault-9999.ebuild,v 1.2 2015/05/26 05:28:24 patrick Exp $
+
+EAPI=5
+
+inherit fcaps git-r3 systemd user
+
+KEYWORDS=""
+DESCRIPTION="A tool for managing secrets"
+HOMEPAGE="https://vaultproject.io/"
+GO_PN="github.com/hashicorp/${PN}"
+EGIT_REPO_URI="git://${GO_PN}.git"
+LICENSE="MPL-2.0"
+SLOT="0"
+IUSE=""
+
+DEPEND=">=dev-lang/go-1.4
+	dev-go/go-oauth2"
+RDEPEND=""
+
+SRC_URI=""
+STRIP_MASK="*.a"
+S="${WORKDIR}/src/${GO_PN}"
+EGIT_CHECKOUT_DIR="${S}"
+
+FILECAPS=(
+	-m 755 'cap_ipc_lock=+ei' usr/bin/${PN}
+)
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_unpack() {
+	local x
+
+	git-r3_src_unpack
+
+	# Create a writable GOROOT in order to avoid sandbox violations.
+	export GOROOT="${WORKDIR}/goroot"
+	cp -sR "${EPREFIX}"/usr/lib/go "${GOROOT}" || die
+	rm -rf "${GOROOT}/src/${GO_PN}" || die
+
+	export GOPATH=${WORKDIR}:${WORKDIR}/src/github.com/hashicorp/vault/Godeps/_workspace
+
+	while read -r -d '' x; do
+		rm -rf "${GOROOT}/src/${x}" "${GOROOT}/pkg/${KERNEL}_${ARCH}/${x}"{,.a} || die
+	done < <(find "${WORKDIR}/src/github.com/hashicorp/vault/Godeps/_workspace/src" -maxdepth 3 -mindepth 3 -type d -print0)
+
+	rm -rf "${WORKDIR}/src/github.com/hashicorp/vault/Godeps/_workspace/src/github.com/awslabs"
+	go get -d -v -x github.com/awslabs/aws-sdk-go || die
+
+	if ! type -P gox >/dev/null; then
+		pushd "${S}" >/dev/null || die
+		go get -d -v -x github.com/mitchellh/gox || die
+	fi
+}
+
+src_compile() {
+	go install -v -x github.com/awslabs/aws-sdk-go || die
+	if ! type -P gox >/dev/null; then
+		go install -v -x github.com/mitchellh/gox || die
+	fi
+	PATH=${WORKDIR}/bin:${GOROOT}/bin:${PATH} emake dev
+}
+
+src_install() {
+	local x
+
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+	systemd_dounit "${FILESDIR}/${PN}.service"
+
+	keepdir /etc/${PN}.d
+	insinto /etc/${PN}.d
+	doins "${FILESDIR}/"*.json.example
+
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+
+	dobin bin/${PN}
+	find "${WORKDIR}"/{pkg,src} -name '.git*' -exec rm -rf {} \; 2>/dev/null
+	find "${WORKDIR}"/src/${GO_PN} -mindepth 1 -maxdepth 1 -type f -delete
+	while read -r -d '' x; do
+		x=${x#${WORKDIR}/src}
+		[[ -d ${WORKDIR}/pkg/${KERNEL}_${ARCH}/${x} ||
+			-f ${WORKDIR}/pkg/${KERNEL}_${ARCH}/${x}.a ]] && continue
+		rm -rf "${WORKDIR}"/src/${x}
+	done < <(find "${WORKDIR}"/src/${GO_PN} -mindepth 1 -maxdepth 1 -type d -print0)
+	insinto /usr/lib/go/pkg/${KERNEL}_${ARCH}/${GO_PN%/*}
+	doins -r "${WORKDIR}"/pkg/${KERNEL}_${ARCH}/${GO_PN}
+	insinto /usr/lib/go/src/${GO_PN%/*}
+	doins -r "${WORKDIR}"/src/${GO_PN}
+}
--- a/app-misc/pax-utils/pax-utils-1.0.3.ebuild
+++ b/app-misc/pax-utils/pax-utils-1.0.3.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/pax-utils/pax-utils-1.0.3.ebuild,v 1.4 2015/05/25 01:41:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/pax-utils/pax-utils-1.0.3.ebuild,v 1.5 2015/05/25 10:47:27 zlogene Exp $

 EAPI="4"

@ -14,7 +14,7 @@ SRC_URI="mirror://gentoo/pax-utils-${PV}.tar.xz

 LICENSE="GPL-2"
 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="caps python"

 RDEPEND="caps? ( sys-libs/libcap )
--- a/app-text/poppler/poppler-0.33.0-r1.ebuild
+++ b/app-text/poppler/poppler-0.33.0-r1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.33.0-r1.ebuild,v 1.1 2015/05/24 18:45:23 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.33.0-r1.ebuild,v 1.2 2015/05/25 11:42:29 dilfridge Exp $

 EAPI=5

@ -20,7 +20,7 @@ DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
 HOMEPAGE="http://poppler.freedesktop.org/"

 LICENSE="GPL-2"
-IUSE="cairo cjk curl cxx debug doc +introspection +jpeg jpeg2k +lcms png qt4 qt5 tiff +utils"
+IUSE="cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms png qt4 qt5 tiff +utils"

 # No test data provided
 RESTRICT="test"
--- a/app-text/poppler/poppler-9999.ebuild
+++ b/app-text/poppler/poppler-9999.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-9999.ebuild,v 1.7 2015/05/24 18:45:23 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-9999.ebuild,v 1.8 2015/05/25 11:42:29 dilfridge Exp $

 EAPI=5

@ -20,7 +20,7 @@ DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
 HOMEPAGE="http://poppler.freedesktop.org/"

 LICENSE="GPL-2"
-IUSE="cairo cjk curl cxx debug doc +introspection +jpeg jpeg2k +lcms png qt4 qt5 tiff +utils"
+IUSE="cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms png qt4 qt5 tiff +utils"

 # No test data provided
 RESTRICT="test"
--- a/dev-db/postgresql/postgresql-9.0.20.ebuild
+++ b/dev-db/postgresql/postgresql-9.0.20.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-9.0.20.ebuild,v 1.2 2015/05/25 04:24:21 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-9.0.20.ebuild,v 1.4 2015/05/25 16:07:17 ago Exp $

 EAPI="5"

@ -13,7 +13,7 @@ PYTHON_COMPAT=( python{2_{6,7},3_{2,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"
+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)"

--- a/dev-db/postgresql/postgresql-9.1.16.ebuild
+++ b/dev-db/postgresql/postgresql-9.1.16.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-9.1.16.ebuild,v 1.2 2015/05/25 04:24:21 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-9.1.16.ebuild,v 1.4 2015/05/25 16:07:17 ago Exp $

 EAPI="5"

@ -13,7 +13,7 @@ PYTHON_COMPAT=( python{2_{6,7},3_{2,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"
+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)"

--- a/dev-db/postgresql/postgresql-9.2.11.ebuild
+++ b/dev-db/postgresql/postgresql-9.2.11.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-9.2.11.ebuild,v 1.2 2015/05/25 04:24:21 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-9.2.11.ebuild,v 1.4 2015/05/25 16:07:17 ago Exp $

 EAPI="5"

@ -9,7 +9,7 @@ PYTHON_COMPAT=( python{2_{6,7},3_{2,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"
+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)"

--- a/dev-db/postgresql/postgresql-9.3.7.ebuild
+++ b/dev-db/postgresql/postgresql-9.3.7.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-9.3.7.ebuild,v 1.2 2015/05/25 04:24:21 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-9.3.7.ebuild,v 1.4 2015/05/25 16:07:17 ago Exp $

 EAPI="5"

@ -9,7 +9,7 @@ PYTHON_COMPAT=( python{2_{6,7},3_{2,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"
+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)"

--- a/dev-db/postgresql/postgresql-9.4.2.ebuild
+++ b/dev-db/postgresql/postgresql-9.4.2.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-9.4.2.ebuild,v 1.2 2015/05/25 04:24:21 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-9.4.2.ebuild,v 1.4 2015/05/25 16:07:17 ago Exp $

 EAPI="5"

@ -9,7 +9,7 @@ PYTHON_COMPAT=( python{2_{6,7},3_{2,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"
+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)"

--- a/dev-java/commons-jxpath/commons-jxpath-1.3-r1.ebuild
+++ b/dev-java/commons-jxpath/commons-jxpath-1.3-r1.ebuild
@ -1,8 +1,8 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-jxpath/commons-jxpath-1.3-r1.ebuild,v 1.1 2015/05/24 21:56:29 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-jxpath/commons-jxpath-1.3-r1.ebuild,v 1.2 2015/05/26 07:52:55 monsieurp Exp $

-EAPI=1
+EAPI=5
 JAVA_PKG_IUSE="doc source test"

 inherit java-pkg-2 java-ant-2
@ -34,9 +34,6 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"

-	# Don't automatically run tests
-	sed 's/depends="compile,test"/depends="compile"/' -i build.xml || die
-
 	mkdir -p "${S}/target/lib"
 	cd "${S}/target/lib"
 	java-pkg_jar-from commons-beanutils-1.7
@ -44,6 +41,11 @@ src_unpack() {
 	java-pkg_jar-from jdom-1.0
 }

+src_prepare() {
+	# Don't automatically run tests
+	sed 's/depends="compile,test"/depends="compile"/' -i build.xml || die
+}
+
 src_test() {
 	# this one needs mockrunner #259027
 	rm src/test/org/apache/commons/jxpath/servlet/JXPathServletContextTest.java || die
--- a/dev-java/jrobin/Manifest
+++ b/dev-java/jrobin/Manifest
@ -1 +1 @@
-DIST jrobin-1.5.14.tar.bz2 2139781 SHA256 0712f748388c60d38ed4aa0800987d5bf46e975fd86d1b3795abfe589509126c SHA512 85eae86ed0bec97fbeb81e41964e72345434df266f24da68c89c81d15e45b38cdd33a9cdaf5bae9a6854203ca9ea2f7f1619a76ee1dea27e74fbc92ad2281dff WHIRLPOOL c2b129ca0a9f069f3a6455677703e256d26ec160f2b69e727ecb9fedc7ca9b7df7da926162c7b2f56b1bd59c52812058bd61c342813f5747e72790b48a066a0f
+DIST jrobin-1.6.0-1.tar.gz 7340700 SHA256 0e00afc9b0fdd45bd7e62b3857fc7bd40f08e5f0cf155e0ba614cdabe58fcf5b SHA512 c5428906bf975f6c31f90185da3f0cbcaaff74d68e35e37b5e425340899fe01290d3d9813f1ecd60bd599512e3d62f635de290db9a9a1bd45292ac9c187b15c7 WHIRLPOOL b83007fb4aea92aaad62842b56b4e3bff98ce6ee509684536176420869228c8a86057f03bcebc2a1a637a9ffd2ba794d05756cc479901fff2765ced352ef5d25
--- a/dev-java/jrobin/jrobin-1.5.14.ebuild
+++ b/dev-java/jrobin/jrobin-1.5.14.ebuild
@ -1,39 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jrobin/jrobin-1.5.14.ebuild,v 1.1 2012/05/07 08:24:39 sera Exp $
-
-EAPI="4"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="JRobin is a 100% pure Java alternative to RRDTool"
-HOMEPAGE="http://www.jrobin.org/"
-SRC_URI="mirror://sourceforge/jrobin/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# Require jdk6. #402485
-RDEPEND="virtual/jre:1.6"
-DEPEND="virtual/jdk:1.6"
-
-java_prepare() {
-	find -name '*.jar' -exec rm -v {} + || die
-}
-
-EANT_BUILD_XML="ant/build.xml"
-EANT_BUILD_TARGET="${PN}"
-
-src_install() {
-	for jar in convertor inspector ${PN}; do
-		java-pkg_newjar lib/${jar}-*.jar ${jar}.jar
-	done
-	java-pkg_dolauncher ${PN} --main org.jrobin.cmd.RrdCommander
-
-	use source && java-pkg_dosrc src/*
-	use doc && java-pkg_dojavadoc doc/javadoc
-}
--- a/dev-java/jrobin/jrobin-1.6.0.ebuild
+++ b/dev-java/jrobin/jrobin-1.6.0.ebuild
@ -0,0 +1,60 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jrobin/jrobin-1.6.0.ebuild,v 1.1 2015/05/25 20:58:14 chewi Exp $
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="JRobin is a 100% pure Java alternative to RRDTool"
+HOMEPAGE="http://www.jrobin.org/"
+SRC_URI="https://github.com/OpenNMS/${PN}/archive/${P}-1.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6
+	test? (	dev-java/asm:4
+		>=dev-java/cglib-3.1:3
+		dev-java/easymock:3.2
+		dev-java/junit:4
+		dev-java/objenesis:0 )"
+
+S="${WORKDIR}/${PN}-${P}-1/src"
+JAVA_SRC_DIR="main/java"
+
+java_prepare() {
+	find "${WORKDIR}" -name "*.jar" -delete || die
+
+	# The tests need the resources in this directory for some reason.
+	mkdir -p test/java/target/classes || die
+	cd test/java/target/classes || die
+	ln -snf ../../../../main/resources/* . || die
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+	jar uf "${PN}.jar" -C main/resources . || die
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	java-pkg_dolauncher rrdtool --main org.jrobin.cmd.RrdCommander
+}
+
+src_test() {
+	cd test/java || die
+
+	local CP=".:${S}/${PN}.jar:$(java-pkg_getjars asm-4,cglib-3,easymock-3.2,junit-4,objenesis)"
+	local TESTS=$(find * -name "*Test.java")
+	TESTS="${TESTS//.java}"
+	TESTS="${TESTS//\//.}"
+
+	ejavac -cp "${CP}" -d . $(find * -name "*.java")
+	ejunit4 -classpath "${CP}" ${TESTS}
+}
--- a/dev-lang/ocaml/Manifest
+++ b/dev-lang/ocaml/Manifest
@ -1,7 +1,5 @@
-DIST ocaml-3.11.2.tar.bz2 2346284 SHA256 86f3387a0d7e7c8be2a3c53af083a5a726e333686208d5ea0dd6bb5ac3f58143 SHA512 69888797bdab8f7baa5e398db08a723388876ed5920b62e9bf29a5214badde1c2024365f88bcbd89d43a0c8d9e4d1bd15486e4b12e8432f1c1bcedd17782faaf WHIRLPOOL d1e6d0851f8f1315f95cd0a470bb61dc1d39ec70f2ec23169ffc9aa74b2d02f5419e3474093319cb47125e7534a0d121751fd1971653e43bdca167f823d4c94a
 DIST ocaml-3.12.1.tar.bz2 2949124 SHA256 edcf563da75e0b91f09765649caa98ab1535e0c7498f0737b5591b7de084958d SHA512 cbb050aabcbe19a4aa070d6cb74f3774cb136692dfd9433ca977f0f9520ad2f583b6cfb1a9cedfedc92e7dc794ac4a869e20aa5a67a4739002feb290435dc7e7 WHIRLPOOL b7bf4844452ab52027e6b785159df6e4defc548d2f3d31eb73dc0dc05214e7c19ed654c8b3ff234a85691599df0be568ba02fafe257856be7f603177584a7ca0
 DIST ocaml-4.01.0.tar.bz2 3691090 SHA256 b1ca708994180236917ae79e17606da5bd334ca6acd6873a550027e1c0ec874a SHA512 b0a4efa89d0e48e5c01922156a73a8ed67c58efa07170710eaef9de1138e1d6fff8a440b2c81860fc63c604f3a4e189b795bb08a5e9d8df60778fcd468985f6e WHIRLPOOL a31cc2c46e19ca1c5ca65ffdee77ef42b7269b1584f81629e29b725b167c7e3d9eb467a3e8171aaba7d2cf1d8aea31d1822c5631fe3e209ce7731c16112a11d3
 DIST ocaml-4.02.1.tar.xz 2031244 SHA256 68c4b01be54c23bc20fc0a8beaa5c7433b8483f8950490129cfe7662e0c6f4dc SHA512 79d257210c0ddfb0367250a688ffb58f143fcc8c159f7d6e149d42b074e811eaf69449b66ad39da399e1bdcb2bab5924d195fc7c5ebc29d44cb637c093b9931d WHIRLPOOL 2c9849f73a705a63c0d0d4682d1ab1225a3150f68bda98805dc2d2b11f100ee7206200b9dc49b07d39d1b737f45671f3662a9bf2c069d6795f26e1f9b9b65ead
-DIST ocaml-patches-1.tar.bz2 3108 SHA256 ad1c252cba7cc50f70d19049fcd78aa359672e436ab9906424548229a04afa49 SHA512 36042cfec68ec06a172f07c7e8ac7904fccd0619a0d5ae2ffc6c87216be7450463fdbeeb9544e5df9d7d93ce9cd52b1502d4b74ee196a911c9f9273bc41d4396 WHIRLPOOL 2f04b3859295973b20bd83e718812f0ab1a993dc143523ebeab7b3d23cfda2bfe0f1eeb2ca1dc1393ae00192337e0cdc9d1472c5681fb719390d337a7d1ddc0e
 DIST ocaml-patches-3.tar.bz2 4101 SHA256 c4ceb604f4480c78d1cf4f848b0903c8d37798d9761f582d8d1643d4e38b8658 SHA512 8be5c44de5a6b0b7c14723e41d92fe807b881b218cc5eee38ea7519c0f971415cb7fe30035303da275089dcb8a61c4f334c4a88e0bdbced3953503794b8308a7 WHIRLPOOL f1920606785702c44dead01b1426145653bc1931acba2d614c6818baddc051e4f74ca0322cae66ade63ba0cd0df5651cfd67f511fca5f12973b67a0c50ebab6d
 DIST ocaml-patches-6.tar.bz2 2197 SHA256 7acfa3d056c2b3f7dfc3b1f96a2557d81802c837c2ba0abc1487de10627e5e07 SHA512 88afa904044192b945b537cbfc3c17308e333ed1d241332212b9500d01c14bb306905b03f2b48ec64dd2f428df1f7179772d742b77b4402da108ba7790239bf6 WHIRLPOOL d2001a8a3e799080c3981be87bcef62635c11cab037d6d92da186643614c6e2a568543f82f3566bfb099c063ad344cab2238edf863a9fb02081f4e20f442d9f8
--- a/dev-lang/ocaml/ocaml-3.11.2.ebuild
+++ b/dev-lang/ocaml/ocaml-3.11.2.ebuild
@ -1,135 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.11.2.ebuild,v 1.9 2014/01/18 13:12:48 gienah Exp $
-
-EAPI="1"
-
-inherit flag-o-matic eutils multilib versionator toolchain-funcs
-
-PATCHLEVEL="1"
-MY_P="${P/_/+}"
-DESCRIPTION="Fast modern type-inferring functional programming language descended from the ML family"
-HOMEPAGE="http://www.ocaml.org/"
-SRC_URI="ftp://ftp.inria.fr/INRIA/Projects/cristal/ocaml/ocaml-$(get_version_component_range 1-2)/${MY_P}.tar.bz2
-	mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
-
-LICENSE="QPL-1.0 LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="emacs gdbm latex ncurses +ocamlopt tk X xemacs"
-
-RDEPEND="tk? ( >=dev-lang/tk-3.3.3 )
-	ncurses? ( sys-libs/ncurses )
-	X? ( x11-libs/libX11 x11-proto/xproto )
-	gdbm? ( sys-libs/gdbm )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PDEPEND="emacs? ( app-emacs/ocaml-mode )
-	xemacs? ( app-xemacs/ocaml )"
-
-S="${WORKDIR}/${MY_P}"
-pkg_setup() {
-	# dev-lang/ocaml creates its own objects but calls gcc for linking, which will
-	# results in relocations if gcc wants to create a PIE executable
-	if gcc-specs-pie ; then
-		append-ldflags -nopie
-		ewarn "Ocaml generates its own native asm, you're using a PIE compiler"
-		ewarn "We have appended -nopie to ocaml build options"
-		ewarn "because linking an executable with pie while the objects are not pic will not work"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
-	# Bug #459512
-	epatch "${FILESDIR}/${PN}-4.01.0-pkg-config-ncurses.patch"
-	# Upstream bug: http://caml.inria.fr/mantis/view.php?id=5237
-	epatch "${FILESDIR}/${PN}-3.11.2-Fix-ocamlopt-w.r.t.-binutils-2.21.patch"
-}
-
-src_compile() {
-	export LC_ALL=C
-	local myconf=""
-
-	# Causes build failures because it builds some programs with -pg,
-	# bug #270920
-	filter-flags -fomit-frame-pointer
-	# Bug #285993
-	filter-mfpmath sse
-
-	# It doesn't compile on alpha without this LDFLAGS
-	use alpha && append-ldflags "-Wl,--no-relax"
-	# Fails to build on arm if >O0 is used
-	use arm && replace-flags "-O?" -O0
-
-	use tk || myconf="${myconf} -no-tk"
-	use ncurses || myconf="${myconf} -no-curses"
-	use X || myconf="${myconf} -no-graph"
-	use gdbm || myconf="${myconf} -no-dbm"
-
-	# ocaml uses a home-brewn configure script, preventing it to use econf.
-	RAW_LDFLAGS="$(raw-ldflags)" ./configure -prefix /usr \
-		--bindir /usr/bin \
-		--libdir /usr/$(get_libdir)/ocaml \
-		--mandir /usr/share/man \
-		-host "${CHOST}" \
-		-cc "$(tc-getCC)" \
-		-as "$(tc-getAS)" \
-		-aspp "$(tc-getCC) -c" \
-		-partialld "$(tc-getLD) -r" \
-		--with-pthread ${myconf} || die "configure failed!"
-
-	emake -j1 world || die "make world failed!"
-
-	# Native code generation can be disabled now
-	if use ocamlopt ; then
-		# bug #279968
-		emake -j1 opt || die "make opt failed!"
-		emake -j1 opt.opt || die "make opt.opt failed!"
-	fi
-}
-
-src_install() {
-	make BINDIR="${D}"/usr/bin \
-		LIBDIR="${D}"/usr/$(get_libdir)/ocaml \
-		MANDIR="${D}"/usr/share/man \
-		install || die "make install failed!"
-
-	# Install the compiler libs
-	dodir /usr/$(get_libdir)/ocaml/compiler-libs
-	insinto /usr/$(get_libdir)/ocaml/compiler-libs
-	doins {utils,typing,parsing}/*.{mli,cmi,cmo}
-	use ocamlopt && doins {utils,typing,parsing}/*.{cmx,o}
-
-	# Symlink the headers to the right place
-	dodir /usr/include
-	dosym /usr/$(get_libdir)/ocaml/caml /usr/include/
-
-	# Remove ${D} from ld.conf, as the buildsystem isn't $(DESTDIR) aware
-	dosed "s:${D}::g" /usr/$(get_libdir)/ocaml/ld.conf
-
-	dodoc Changes INSTALL README Upgrading
-
-	# Create and envd entry for latex input files (this definitely belongs into
-	# CONTENT and not in pkg_postinst.
-	if use latex ; then
-		echo "TEXINPUTS=/usr/$(get_libdir)/ocaml/ocamldoc:" > "${T}"/99ocamldoc
-		doenvd "${T}"/99ocamldoc
-	fi
-
-	# Install ocaml-rebuild.sh script rather than keeping it in $PORTDIR
-	dosbin "${FILESDIR}/ocaml-rebuild.sh"
-}
-
-pkg_postinst() {
-	echo
-	ewarn "OCaml is not binary compatible from version to version, so you"
-	ewarn "need to rebuild all packages depending on it, that are actually"
-	ewarn "installed on your system. To do so, you can run:"
-	ewarn "/usr/sbin/ocaml-rebuild.sh [-h | emerge options]"
-	ewarn "Which will call emerge on all old packages with the given options"
-	echo
-}
--- a/dev-lang/php/php-5.4.41.ebuild
+++ b/dev-lang/php/php-5.4.41.ebuild
@ -1,12 +1,12 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.4.41.ebuild,v 1.4 2015/05/22 12:40:43 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.4.41.ebuild,v 1.5 2015/05/26 05:24:49 jer Exp $

 EAPI=5

 inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool systemd

-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"

 function php_get_uri ()
 {
--- a/dev-lang/php/php-5.5.25-r1.ebuild
+++ b/dev-lang/php/php-5.5.25-r1.ebuild
@ -1,12 +1,12 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.5.25-r1.ebuild,v 1.2 2015/05/25 04:15:43 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.5.25-r1.ebuild,v 1.4 2015/05/26 08:35:27 rich0 Exp $

 EAPI=5

 inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool systemd

-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"

 function php_get_uri ()
 {
--- a/dev-lang/python-exec/Manifest
+++ b/dev-lang/python-exec/Manifest
@ -1 +1,2 @@
 DIST python-exec-2.0.1.tar.bz2 80965 SHA256 3eddcb0d6c682a5c182c62578bb8d6ce1140a009873747e9ba1bf9de72ed7efd SHA512 0396e2617c759a66b16e57b0ca60b57e03f3c8096ae4a7f2e402eafcbee4ffd839bf0c6e4d259c6ba90940f9ba7e3f191125e395080cce3ef82e5f52053d0462 WHIRLPOOL 50c0cac1c7e2b5d2a21125647874c83caeabee293b87ef01926474d492b79b7837754c2d26173282977e9d00024559bb070f8d76bb5227df1776e937cd280c32
+DIST python-exec-2.0.2.tar.bz2 82217 SHA256 c411638fe94953c1e8ff57e7b66f601a817633fbc9cb7d410982778042051bb0 SHA512 96198dda88a73b902d617a32f10ddf2ac981b1871fb5eaf5003d77453df8a0aacf299c39c6e49ebaa620994a30e57ee7a1128fb4ba41aa4f503031fa2addef7f WHIRLPOOL 603b494c7b87f0f3f0cfba35378e1a2e231879a01b730657e09ecf798957fa4dfd54a6d852074c2aa9ae3c15e5d1d3203584b8a120e5dd0dee2117319706a5ce
--- a/dev-lang/python-exec/python-exec-2.0.2.ebuild
+++ b/dev-lang/python-exec/python-exec-2.0.2.ebuild
@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python-exec/python-exec-2.0.2.ebuild,v 1.1 2015/05/26 09:35:01 mgorny Exp $
+
+EAPI=5
+
+# Kids, don't do this at home!
+inherit python-utils-r1
+PYTHON_COMPAT=( "${_PYTHON_ALL_IMPLS[@]}" )
+
+inherit autotools-utils python-r1
+
+DESCRIPTION="Python script wrapper"
+HOMEPAGE="https://bitbucket.org/mgorny/python-exec/"
+SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2"
+
+LICENSE="BSD-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="!<dev-python/python-exec-10000"
+
+src_configure() {
+	local pyimpls i EPYTHON
+	for i in "${PYTHON_COMPAT[@]}"; do
+		python_export "${i}" EPYTHON
+		pyimpls+=" ${EPYTHON}"
+	done
+
+	local myeconfargs=(
+		--with-eprefix="${EPREFIX}"
+		--with-python-impls="${pyimpls}"
+	)
+
+	autotools-utils_src_configure
+}
--- a/dev-lang/tcl/tcl-8.5.17.ebuild
+++ b/dev-lang/tcl/tcl-8.5.17.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.5.17.ebuild,v 1.11 2015/04/14 10:54:09 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.5.17.ebuild,v 1.12 2015/05/26 09:12:43 vapier Exp $

 EAPI=5

@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/tcl/${MY_P}-src.tar.gz"

 LICENSE="tcltk"
 SLOT="0/8.5"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris"
 IUSE="debug threads"

 RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]"
--- a/dev-lang/tk/tk-8.5.17.ebuild
+++ b/dev-lang/tk/tk-8.5.17.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.5.17.ebuild,v 1.11 2015/04/14 10:54:13 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.5.17.ebuild,v 1.12 2015/05/26 09:17:44 vapier Exp $

 EAPI=5

@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/tcl/${MY_P}-src.tar.gz"

 LICENSE="tcltk"
 SLOT="0/8.5"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug threads truetype aqua xscreensaver"

 RDEPEND="
--- a/dev-libs/icu/icu-55.1.ebuild
+++ b/dev-libs/icu/icu-55.1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/icu-55.1.ebuild,v 1.2 2015/05/24 18:22:59 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/icu/icu-55.1.ebuild,v 1.3 2015/05/26 05:28:49 jer Exp $

 EAPI=5

@ -14,7 +14,7 @@ LICENSE="BSD"

 SLOT="0/55"

-KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="debug doc examples static-libs"

 DEPEND="
--- a/dev-libs/libconfig/libconfig-1.5.ebuild
+++ b/dev-libs/libconfig/libconfig-1.5.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libconfig/libconfig-1.5.ebuild,v 1.1 2015/05/21 06:01:08 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libconfig/libconfig-1.5.ebuild,v 1.2 2015/05/26 10:08:29 mgorny Exp $

 EAPI=5

@ -45,11 +45,7 @@ multilib_src_install_all() {
 	prune_libtool_files

 	if use examples; then
-		find examples/ -name "Makefile.*" -delete || die
-		local dir
-		for dir in examples/c examples/c++; do
-			insinto /usr/share/doc/${PF}/${dir}
-			doins ${dir}/*
-		done
+		find examples -name "Makefile.*" -delete || die
+		dodoc -r examples
 	fi
 }
--- a/dev-libs/libgusb/libgusb-0.2.4.ebuild
+++ b/dev-libs/libgusb/libgusb-0.2.4.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgusb/libgusb-0.2.4.ebuild,v 1.4 2015/03/29 10:33:25 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgusb/libgusb-0.2.4.ebuild,v 1.5 2015/05/25 18:15:30 tetromino Exp $

 EAPI=5
 GCONF_DEBUG="no"
@ -19,10 +19,10 @@ KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE="+introspection static-libs vala"
 REQUIRED_USE="vala? ( introspection )"

+# Yes, we really need API from dev-libs/libusb-1.0.19, not virtual/libusb
 RDEPEND="
 	>=dev-libs/glib-2.28:2[${MULTILIB_USEDEP}]
-	virtual/libusb:1[${MULTILIB_USEDEP}]
-	virtual/libgudev:=[${MULTILIB_USEDEP}]
+	>=dev-libs/libusb-1.0.19[udev,${MULTILIB_USEDEP}]
 	introspection? ( >=dev-libs/gobject-introspection-1.29 )
 "
 DEPEND="${RDEPEND}
--- a/dev-libs/xerces-c/Manifest
+++ b/dev-libs/xerces-c/Manifest
@ -1 +1,2 @@
 DIST xerces-c-3.1.1.tar.gz 5051308 SHA256 a42785f71e0b91d5fd273831c87410ce60a73ccfdd207de1b805d26d44968736 SHA512 bf9d139e0d921d59a14813884548380d0f6040cce6759ce45d8af2832720513f2781ea4d88cf73c6d5c5ffe83b17be3ce0cb40cdf536046736fbf9be386e9841 WHIRLPOOL 9c9d6c8f62536b0f2112f8061eb59bd8d4478fc56d32682eb56d1ca85c46d8530c7c9b09dafd8dca718d0a6375198368a3d09e6442ab8508cb8dc12de81fa27d
+DIST xerces-c-3.1.2.tar.gz 6959894 SHA256 743bd0a029bf8de56a587c270d97031e0099fe2b7142cef03e0da16e282655a0 SHA512 89b61c336b270e124f7773534606706787da02437cf0b9d0374481027eb235692990b99e8ead383cb2d6da52dab2ae5f14fafcf30aba748900e1a0c32957fdc8 WHIRLPOOL 768e6f653345ed30de2b3840f437bd22df381e8c341ddfdaedd08ed48d2331937e2431cdbc503c9d1a9180848cbc6a13f0a0fe359b6d8b7e846f0b49e9e2a43b
--- a/dev-libs/xerces-c/xerces-c-3.1.2.ebuild
+++ b/dev-libs/xerces-c/xerces-c-3.1.2.ebuild
@ -0,0 +1,99 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xerces-c/xerces-c-3.1.2.ebuild,v 1.1 2015/05/26 09:15:35 pinkbyte Exp $
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="A validating XML parser written in a portable subset of C++"
+HOMEPAGE="http://xerces.apache.org/xerces-c/"
+SRC_URI="mirror://apache/xerces/c/3/sources/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+
+IUSE="cpu_flags_x86_sse2 curl doc elibc_Darwin elibc_FreeBSD iconv icu static-libs threads"
+
+RDEPEND="icu? ( dev-libs/icu:0= )
+	curl? ( net-misc/curl )
+	virtual/libiconv"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )"
+
+DOCS=( CREDITS KEYS NOTICE README version.incl )
+
+pkg_setup() {
+	export ICUROOT="/usr"
+
+	if use iconv && use icu ; then
+		ewarn "This package can use iconv or icu for loading messages"
+		ewarn "and transcoding, but not both. ICU will precede."
+	fi
+}
+
+src_prepare() {
+	use threads || epatch "${FILESDIR}/3.1.1-disable-thread-tests.patch"
+
+	sed -i \
+		-e 's|$(prefix)/msg|$(DESTDIR)/$(prefix)/share/xerces-c/msg|' \
+		-e 's/@mkdir_p@/@MKDIR_P@/' \
+		src/xercesc/util/MsgLoaders/MsgCatalog/Makefile.in || die
+
+	epatch_user
+}
+
+src_configure() {
+	local mloader="inmemory"
+	use iconv && mloader="iconv"
+	use icu && mloader="icu"
+
+	local transcoder="gnuiconv"
+	use elibc_FreeBSD && transcoder="iconv"
+	use elibc_Darwin && transcoder="macosunicodeconverter"
+	use icu && transcoder="icu"
+	# for interix maybe: transcoder="windows"
+
+	# 'cfurl' is only available on OSX and 'socket' isn't supposed to work.
+	# But the docs aren't clear about it, so we would need some testing...
+	local netaccessor="socket"
+	use elibc_Darwin && netaccessor="cfurl"
+	use curl && netaccessor="curl"
+
+	econf \
+		--disable-pretty-make \
+		$(use_enable static-libs static) \
+		$(use_enable threads) \
+		--enable-msgloader-${mloader} \
+		--enable-netaccessor-${netaccessor} \
+		--enable-transcoder-${transcoder} \
+		$(use_enable cpu_flags_x86_sse2 sse2)
+}
+
+src_compile() {
+	default
+
+	if use doc ; then
+		cd "${S}/doc"
+		doxygen || die "making docs failed"
+	fi
+}
+
+src_install () {
+	default
+	prune_libtool_files
+
+	# To make sure an appropriate NLS msg file is around when using the iconv msgloader
+	# ICU has the messages compiled in.
+	if use iconv && ! use icu ; then
+		doenvd "${FILESDIR}/50xerces-c"
+	fi
+
+	if use doc; then
+		insinto /usr/share/doc/${PF}
+		rm -rf samples/Makefile* samples/runConfigure samples/src/*/Makefile* samples/.libs
+		doins -r samples
+		dohtml -r doc/html/*
+	fi
+}
--- a/dev-python/flask-restful/Manifest
+++ b/dev-python/flask-restful/Manifest
@ -2,3 +2,4 @@ DIST flask-restful-0.2.12.tar.gz 96159 SHA256 fb44cff325a7f9581007c1f01c6d6f78a8
 DIST flask-restful-0.3.0.tar.gz 103123 SHA256 17cb9ef93f6a8329e3bbbf6956fa67e3415efcd142d7da34d5b154409a884078 SHA512 6cb768e591e9a5257eb22406c6857fd24f2cfcccf739c008cc92bda7b03b253726b42fc95fc0e121c4635c7d0a25a816186ba4497fb3b53277d8f0e6aa13f862 WHIRLPOOL 34511a91241a7e421878631ae9d91ffacb8863592e17b7e8c893c084a41f22b7ce96ecc81816a1195e94e34d16723216bc9a222a38fe49473f2254ffb6ddf121
 DIST flask-restful-0.3.1.tar.gz 103801 SHA256 b2171bb730511e2fc54d071a5b8d9f5e852273dcc72a092b0fd937b98956da74 SHA512 264497864297e2621d9a47a08f02bd8632b4030e3d09cb9ac9d04b431fee8cc1e3801220c7fb05fae0e2230e33461e1c7bcefc6b69432f10ac748b9845f1356b WHIRLPOOL 0776e4c2bcd9be0db9cc6664fb21c7433cbb0a8d6c4738890ad041830c9e8e98583a5d9f73ed1c69d5a4cb9457991cf59fc6e177e2541bb157f452f81c8d6359
 DIST flask-restful-0.3.2.tar.gz 106082 SHA256 0b91c5ac2fdfa3cebb25c2110ab24636833e5209eb186a8bd109f563a355ae1f SHA512 e35901f297ed9ec76f4be94c9511a12b7370f00ed959a22fab6804e739a13bf885023f00baf3fad29a59cc873c9d5d0b2e85b7e4657d3203983dc6775d71c89a WHIRLPOOL 7403fafbc37e8080731c7ad71076e986f2a06d30a216257bb10c08c5d230a88a4bde043af13e590be976e8c1953a829fe76827bb5a10db638dddf8b28282f9da
+DIST flask-restful-0.3.3.tar.gz 109947 SHA256 0aeb8f00c96335f90df304a57f36caecd12befccd333a39708f8929f0a528042 SHA512 f8e48048a25b38a09321efc98649970d959d41bf5cc15f5111e1326396ff305b2dbca757a3198a4ed8cf59a6d0144a981178926c1fecc462132888198b4dd8e6 WHIRLPOOL d4db2f013fb92a593731ea19eba6f0daf0f498ebc9fca17f1da8d23b75e243323004e8fe7425813740dc6bcd9c80780a1836a1f37d403a35a94667ecf8fa8a93
--- a/dev-python/flask-restful/flask-restful-0.3.3.ebuild
+++ b/dev-python/flask-restful/flask-restful-0.3.3.ebuild
@ -0,0 +1,51 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/flask-restful/flask-restful-0.3.3.ebuild,v 1.1 2015/05/26 06:46:30 patrick Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="Simple framework for creating REST APIs"
+HOMEPAGE="http://flask-restful.readthedocs.org/ https://github.com/twilio/flask-restful/"
+SRC_URI="https://github.com/twilio/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples paging test"
+
+RDEPEND="
+	>=dev-python/aniso8601-0.82[${PYTHON_USEDEP}]
+	>=dev-python/flask-0.8[${PYTHON_USEDEP}]
+	>=dev-python/six-1.3.0[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	paging? ( >=dev-python/pycrypto-2.6[${PYTHON_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	dev-python/sphinx[${PYTHON_USEDEP}]
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pycrypto[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	nosetests -v || die "Tests fail with ${EPYTHON}"
+}
+
+python_compile_all() {
+	cd docs || die
+	emake man $(usex doc html "")
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	use examples && local EXAMPLES=( examples/. )
+	local DOCS=( AUTHORS.md CHANGES.md CONTRIBUTING.md README.md )
+
+	doman docs/_build/man/*
+	distutils-r1_python_install_all
+}
--- a/dev-python/gst-python/Manifest
+++ b/dev-python/gst-python/Manifest
@ -1,2 +1,3 @@
 DIST gst-python-0.10.22.tar.bz2 632651 SHA256 8f26f519a5bccd770864317e098e5e307fc5ad1201eb96329634b6508b253178 SHA512 bbbd6b661778cca990da0e216294d86da31a6e472049905989a3311459dd1227bf8f2ae3699a3cdbb66a16288569764352f1e1b93e696d3db4b0728bc38e5b12 WHIRLPOOL c6902554bc8f390b5d295d05598ee60fd6b2637d290125d83a48fc40bbd4e6e261a711430259831c96a30fee4c5ec5c89aea444424b117fb5d62c946b0263454
 DIST gst-python-1.2.1.tar.bz2 410887 SHA256 8823e5a9ffc51212df412652da44dc3f2a0e23295da769de2d111c770280efd4 SHA512 ed318d94831d34687224d82b84735984b946c6f33704e6bda56847b633af06212f394b709257007cec5d3a3597b200fbe6b19eade6b76e7855e8668c5ebc270e WHIRLPOOL 959e976c5a481367eb298d24eed4b3bf125d173662ff30cf02506906c88cd369259e0f5cb2bbd31bae31c39934b4a894d2eae13a5e411301f055aef030dcebbb
+DIST gst-python-1.4.0.tar.xz 350316 SHA256 b1e40c29ceb41b03f08d38aca6056054f0341d0706276326dceeec6ac8d53d3e SHA512 b970fd16a3b9d82f343fbf20642d165bff25fb815cfe20cc51db8c04c298a8fbd9b96f41811c2d26982eadf1f9a84495c70fbdad553778c68604f828e4773a94 WHIRLPOOL 248d91fc0aac1314c4f7b40866579601a8024c947a29a90b5b6c3585358984f1a50eb6d56aec26609d37fc9144fdf38d5edd7ad61364481d25b7cebfaeff1a96
--- a/dev-python/gst-python/gst-python-1.4.0.ebuild
+++ b/dev-python/gst-python/gst-python-1.4.0.ebuild
@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/gst-python/gst-python-1.4.0.ebuild,v 1.1 2015/05/25 17:17:37 eva Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit python-r1
+
+DESCRIPTION="A Python Interface to GStreamer"
+HOMEPAGE="http://gstreamer.freedesktop.org/"
+SRC_URI="http://gstreamer.freedesktop.org/src/${PN}/${P}.tar.xz"
+
+LICENSE="LGPL-2"
+SLOT="1.0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="test"
+
+RDEPEND="
+	dev-libs/libxml2
+	>=dev-python/pygobject-3:3[${PYTHON_USEDEP}]
+	>=media-libs/gstreamer-1.4:1.0
+	>=media-libs/gst-plugins-base-1.4:1.0
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+# XXX: unittests are not ported to 1.0 yet.
+
+src_prepare() {
+	prepare_gst() {
+		mkdir -p "${BUILD_DIR}" || die
+	}
+	python_foreach_impl prepare_gst
+}
+
+src_configure() {
+	ECONF_SOURCE="${S}" python_foreach_impl run_in_build_dir econf
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir default
+}
+
+src_install() {
+	python_foreach_impl run_in_build_dir default
+	prune_libtool_files --modules
+	einstalldocs
+}
--- a/dev-python/keepassx/Manifest
+++ b/dev-python/keepassx/Manifest
@ -0,0 +1 @@
+DIST keepassx-0.0.3.tar.gz 15041 SHA256 d8cada98caf2aa77472de67efbec9818e5eb9c4e7a2d39a58ac02e5c2553c5ba SHA512 97ca5b00f8f565595ea78f43a152c752e7ae868ba15d8d3c48f3b75e56d266e28e99d1e61badec646f585bdeca42c49c0d2e19efd46bd79e9838d54293f5e784 WHIRLPOOL 89091f89248f0f4bb525e5dc47ccf228d401524968a76cf6605a790b86983ab9cbe0195dd4b067441975ebd9c58067ed4200f689bc3564427fc07d4620567797
--- a/dev-python/keepassx/keepassx-0.0.3.ebuild
+++ b/dev-python/keepassx/keepassx-0.0.3.ebuild
@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/keepassx/keepassx-0.0.3.ebuild,v 1.1 2015/05/26 09:07:43 jlec Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python API and CLI for KeePassX"
+HOMEPAGE="https://github.com/jamesls/python-keepassx https://pypi.python.org/pypi/keepassx"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	dev-python/pycrypto[${PYTHON_USEDEP}]
+	dev-python/prettytable[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+
+src_test() {
+	py.test keepassx || die
+}
--- a/dev-python/keepassx/metadata.xml
+++ b/dev-python/keepassx/metadata.xml
@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>python</herd>
+  <maintainer>
+    <email>jlec@gentoo.org</email>
+    <name>Justin Lecher</name>
+  </maintainer>
+</pkgmetadata>
--- a/dev-python/m2crypto/Manifest
+++ b/dev-python/m2crypto/Manifest
@ -1,2 +1,3 @@
 DIST M2Crypto-0.21.1.tar.gz 413563 SHA256 25b94498505c2d800ee465db0cc1aff097b1615adc3ac042a1c85ceca264fc0a SHA512 b261eed84b3bda8a664c065241c2007f6443235a0fbcdd856c5a0b1f015e75662724b72a56e94aeb174414fff5c8dd71dfcb4b18f677f576ab7e30811a8adf9b WHIRLPOOL 88f184452a660cff934371d18e0065974dec3cea052cf78ef0bbecf35ed2ef6d69f8a40016f1b3fbac24fa06697b7e4c5e9e1f6afd20d30ff63fa1c22b69e8d0
 DIST M2Crypto-0.22.3.tar.gz 74795 SHA256 6071bfc817d94723e9b458a010d565365104f84aa73f7fe11919871f7562ff72 SHA512 c179d3cf03ced77aed24285ca3f1527d5e05bbfe091a1522bff94a940fd390213fbb9b83d7ccd43ceae49626b427ae8790782cf93ead85be1e063bc4121c62e0 WHIRLPOOL 66a9a6e7c9b195814048a1bcecf6ef71a269bebb9dbda73801c88b3ba27330b555a46d05c53bbd0778f9c1e1bb5f9c6e7e860de443bf16baffc2072ee5996e31
+DIST m2crypto-0.21.1-backports.tar.gz 10385 SHA256 d3f7cefc85b6da2f848b24e033ebab069b759bd27f479ded790090fa1b859919 SHA512 4cf68d92c78d103dc2846c0db6f5253ad5ec270569c51565fa1b9981b9f73cb73a6edcc70a44f4392f2388102b76704c974e82c0f272a9d91ebaf503ea1b6b50 WHIRLPOOL 2eccbe1ba488d6d6425db2c47bef7e318d258fca0dfc702e41a435a90a9173c2cf71767d5ecb057b1a2844d2f047869edbde2241f7c97df2527257065ce40335
--- a/dev-python/m2crypto/files/0.21.1-packaging.patch
+++ b/dev-python/m2crypto/files/0.21.1-packaging.patch
@ -0,0 +1,56 @@
+From 017d82b1f17446f38339589e25e9aba98f87f9f4 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Mon, 25 May 2015 13:09:35 -0400
+Subject: [PATCH] Gentoo-specific packaging fixes
+
+Fix cross-compiles
+EPREFIX support
+Revert custom build and install classes
+---
+ setup.py | 11 ++++-------
+ 1 file changed, 4 insertions(+), 7 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 0967216..bca474a 100644
+--- a/setup.py
+++ b/setup.py
+@@ -66,8 +66,8 @@ class _M2CryptoBuildExt(build_ext.build_ext):
+         opensslIncludeDir = os.path.join(self.openssl, 'include', 'openssl')
+         opensslLibraryDir = os.path.join(self.openssl, 'lib')
+         
+-        self.swig_opts = ['-I%s' % i for i in self.include_dirs + \
+-                          [opensslIncludeDir, includeDir]]
+        eprefix = os.getenv('EPREFIX', '')
+        self.swig_opts = ['-I' + eprefix + '/usr/include']
+         if get_platform() == 'linux-x86_64':
+             self.swig_opts.append('-D__x86_64__')
+         self.swig_opts.append('-outdir')
+@@ -76,8 +76,7 @@ class _M2CryptoBuildExt(build_ext.build_ext):
+         #self.swig_opts.append('-D__i386__') # Uncomment for early OpenSSL 0.9.7 versions, or on Fedora Core if build fails
+         #self.swig_opts.append('-DOPENSSL_NO_EC') # Try uncommenting if you can't build with EC disabled
+         
+-        self.include_dirs += [os.path.join(self.openssl, opensslIncludeDir),
+-                              os.path.join(os.getcwd(), 'SWIG')]        
+        self.include_dirs += [os.path.join(os.getcwd(), 'SWIG')]
+             
+         if sys.platform == 'cygwin':
+             # Cygwin SHOULD work (there's code in distutils), but
+@@ -87,8 +86,6 @@ class _M2CryptoBuildExt(build_ext.build_ext):
+             # Someday distutils will be fixed and this won't be needed.
+             self.library_dirs += [os.path.join(self.openssl, 'bin')]
+                
+-        self.library_dirs += [os.path.join(self.openssl, opensslLibraryDir)]
+-
+ 
+ if sys.version_info < (2,4):
+ 
+@@ -182,5 +179,5 @@ used to provide SSL for Twisted.''',
+ 
+       ext_modules = [m2crypto],
+       test_suite='tests.alltests.suite',
+-      cmdclass = {'build': CustomBuild, 'install': CustomInstall, 'build_ext': _M2CryptoBuildExt}
+      cmdclass = {'build_ext': _M2CryptoBuildExt}
+       )
+-- 
+2.4.1
+
--- a/dev-python/m2crypto/files/0.22.3-Use-swig-generated-python-loader.patch
+++ b/dev-python/m2crypto/files/0.22.3-Use-swig-generated-python-loader.patch
@ -0,0 +1,138 @@
+From 803188070e486030cb1d2e53692b39305c742b17 Mon Sep 17 00:00:00 2001
+From: Joe Julian <jjulian@io.com>
+Date: Tue, 19 May 2015 23:54:08 -0700
+Subject: [PATCH] Use swig generated python loader
+
+---
+ .gitignore           |  6 +++++-
+ M2Crypto/__init__.py |  4 ++--
+ M2Crypto/m2.py       |  4 +---
+ SWIG/_m2crypto.def   |  2 +-
+ SWIG/_m2crypto.i     |  2 +-
+ setup.py             | 25 +++++++++++++++++++++----
+ 6 files changed, 31 insertions(+), 12 deletions(-)
+
+diff --git a/M2Crypto/__init__.py b/M2Crypto/__init__.py
+index 647e057..38dbbd5 100644
+--- a/M2Crypto/__init__.py
+++ b/M2Crypto/__init__.py
+@@ -19,7 +19,7 @@ Copyright 2008-2011 Heikki Toivonen. All rights reserved.
+ version_info = (0, 22)
+ version = '.'.join([str(_v) for _v in version_info])
+ 
+-import __m2crypto
+import m2crypto
+ import m2
+ import ASN1
+ import AuthCookie
+@@ -47,4 +47,4 @@ import m2xmlrpclib
+ import threading
+ import util
+ 
+-__m2crypto.lib_init()
+m2crypto.lib_init()
+diff --git a/M2Crypto/m2.py b/M2Crypto/m2.py
+index e4bb695..516cadb 100644
+--- a/M2Crypto/m2.py
+++ b/M2Crypto/m2.py
+@@ -25,7 +25,5 @@ Portions created by Open Source Applications Foundation (OSAF) are
+ Copyright (C) 2004 OSAF. All Rights Reserved.
+ """
+ 
+-from __m2crypto import *
+from m2crypto import *
+ lib_init()
+-
+-
+diff --git a/SWIG/_m2crypto.def b/SWIG/_m2crypto.def
+index 753db2c..3e9d5bc 100644
+--- a/SWIG/_m2crypto.def
+++ b/SWIG/_m2crypto.def
+@@ -1,2 +1,2 @@
+ EXPORTS
+-init__m2crypto
+init_m2crypto
+diff --git a/SWIG/_m2crypto.i b/SWIG/_m2crypto.i
+index 50be5c3..e491222 100644
+--- a/SWIG/_m2crypto.i
+++ b/SWIG/_m2crypto.i
+@@ -8,7 +8,7 @@
+  *
+  */
+ 
+-%module(threads=1) _m2crypto
+%module(threads=1) m2crypto
+ /* We really don't need threadblock (PyGILState_Ensure() etc.) anywhere.
+    Disable threadallow as well, only enable it for operations likely to
+    block. */
+diff --git a/setup.py b/setup.py
+index bac6f9f..fc89513 100644
+--- a/setup.py
+++ b/setup.py
+@@ -17,9 +17,22 @@ import os, sys, platform
+ from setuptools import setup
+ from setuptools.command import build_ext
+ 
+from distutils.util import get_platform
+ from distutils.core import Extension
+ from distutils.spawn import find_executable
+ 
+from distutils.command.build import build
+from setuptools.command.install import install
+
+class CustomBuild(build):
+    def run(self):
+        self.run_command('build_ext')
+        build.run(self)
+
+class CustomInstall(install):
+    def run(self):
+        self.run_command('build_ext')
+        self.do_egg_install()
+ 
+ class _M2CryptoBuildExt(build_ext.build_ext):
+     '''Specialization of build_ext to enable swig_opts to inherit any
+@@ -70,11 +83,12 @@ class _M2CryptoBuildExt(build_ext.build_ext):
+ 
+         self.add_multiarch_paths()
+ 
+-        opensslIncludeDir = os.path.join(self.openssl, 'include')
+        includeDir = os.path.join(self.openssl, 'include')
+        opensslIncludeDir = os.path.join(self.openssl, 'include', 'openssl')
+         opensslLibraryDir = os.path.join(self.openssl, 'lib')
+ 
+         self.swig_opts = ['-I%s' % i for i in self.include_dirs + \
+-                          [opensslIncludeDir, os.path.join(opensslIncludeDir, "openssl")]]
+                          [opensslIncludeDir, includeDir]]
+         self.swig_opts.append('-includeall')
+         self.swig_opts.append('-modern')
+ 
+@@ -85,6 +99,9 @@ class _M2CryptoBuildExt(build_ext.build_ext):
+             elif platform.architecture()[0] == '32bit':
+                 self.swig_opts.append('-D__i386__')
+ 
+        self.swig_opts.append('-outdir')
+        self.swig_opts.append(os.path.join(os.getcwd(),'M2Crypto'))
+
+         self.include_dirs += [os.path.join(self.openssl, opensslIncludeDir),
+                               os.path.join(os.getcwd(), 'SWIG')]
+ 
+@@ -103,7 +120,7 @@ if sys.platform == 'darwin':
+ else:
+    my_extra_compile_args = []
+ 
+-m2crypto = Extension(name = 'M2Crypto.__m2crypto',
+m2crypto = Extension(name = 'M2Crypto._m2crypto',
+                      sources = ['SWIG/_m2crypto.i'],
+                      extra_compile_args = ['-DTHREADING'] + my_extra_compile_args,
+                      #extra_link_args = ['-Wl,-search_paths_first'], # Uncomment to build Universal Mac binaries
+@@ -145,5 +162,5 @@ interface.''',
+ 
+       ext_modules = [m2crypto],
+       test_suite='tests.alltests.suite',
+-      cmdclass = {'build_ext': _M2CryptoBuildExt}
+      cmdclass = {'build': CustomBuild, 'install': CustomInstall, 'build_ext': _M2CryptoBuildExt}
+       )
+-- 
+2.4.1
+
--- a/dev-python/m2crypto/files/0.22.3-packaging.patch
+++ b/dev-python/m2crypto/files/0.22.3-packaging.patch
@ -0,0 +1,68 @@
+From d307a38515c5d050bbf8555d79aff3e4ce78af78 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Mon, 25 May 2015 12:08:47 -0400
+Subject: [PATCH] Gentoo-specific packaging fixes
+
+Fix cross-compiles
+EPREFIX support
+Revert custom build and install classes
+---
+ setup.py | 20 ++++----------------
+ 1 file changed, 4 insertions(+), 16 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index fc89513..806464f 100644
+--- a/setup.py
+++ b/setup.py
+@@ -81,29 +81,19 @@ class _M2CryptoBuildExt(build_ext.build_ext):
+ 
+         build_ext.build_ext.finalize_options(self)
+ 
+-        self.add_multiarch_paths()
+-
+         includeDir = os.path.join(self.openssl, 'include')
+         opensslIncludeDir = os.path.join(self.openssl, 'include', 'openssl')
+         opensslLibraryDir = os.path.join(self.openssl, 'lib')
+ 
+-        self.swig_opts = ['-I%s' % i for i in self.include_dirs + \
+-                          [opensslIncludeDir, includeDir]]
+        eprefix = os.getenv('EPREFIX', '')
+        self.swig_opts = ['-I' + eprefix + '/usr/include']
+         self.swig_opts.append('-includeall')
+         self.swig_opts.append('-modern')
+ 
+-        # Fedora does hat tricks.
+-        if platform.linux_distribution()[0] in ['Fedora', 'CentOS']:
+-            if platform.architecture()[0] == '64bit':
+-                self.swig_opts.append('-D__x86_64__')
+-            elif platform.architecture()[0] == '32bit':
+-                self.swig_opts.append('-D__i386__')
+-
+         self.swig_opts.append('-outdir')
+         self.swig_opts.append(os.path.join(os.getcwd(),'M2Crypto'))
+ 
+-        self.include_dirs += [os.path.join(self.openssl, opensslIncludeDir),
+-                              os.path.join(os.getcwd(), 'SWIG')]
+        self.include_dirs += [os.path.join(os.getcwd(), 'SWIG')]
+ 
+         if sys.platform == 'cygwin':
+             # Cygwin SHOULD work (there's code in distutils), but
+@@ -113,8 +103,6 @@ class _M2CryptoBuildExt(build_ext.build_ext):
+             # Someday distutils will be fixed and this won't be needed.
+             self.library_dirs += [os.path.join(self.openssl, 'bin')]
+ 
+-        self.library_dirs += [os.path.join(self.openssl, opensslLibraryDir)]
+-
+ if sys.platform == 'darwin':
+    my_extra_compile_args = ["-Wno-deprecated-declarations"]
+ else:
+@@ -162,5 +150,5 @@ interface.''',
+ 
+       ext_modules = [m2crypto],
+       test_suite='tests.alltests.suite',
+-      cmdclass = {'build': CustomBuild, 'install': CustomInstall, 'build_ext': _M2CryptoBuildExt}
+      cmdclass = {'build_ext': _M2CryptoBuildExt}
+       )
+-- 
+2.4.1
+
--- a/dev-python/m2crypto/m2crypto-0.21.1-r3.ebuild
+++ b/dev-python/m2crypto/m2crypto-0.21.1-r3.ebuild
@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/m2crypto/m2crypto-0.21.1-r3.ebuild,v 1.3 2015/05/26 00:35:30 floppym Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+MY_PN="M2Crypto"
+
+DESCRIPTION="M2Crypto: A Python crypto and SSL toolkit"
+HOMEPAGE="http://chandlerproject.org/bin/view/Projects/MeTooCrypto http://pypi.python.org/pypi/M2Crypto"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz
+	http://dev.gentoo.org/~floppym/dist/m2crypto-0.21.1-backports.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc examples"
+
+# swig-3.0.5 results in broken constants, #538920
+RDEPEND=">=dev-libs/openssl-0.9.8:0="
+DEPEND="${RDEPEND}
+	>=dev-lang/swig-1.3.28
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/epydoc[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+# Tests access network, and fail randomly. Bug #431458.
+RESTRICT=test
+
+PATCHES=(
+	"${WORKDIR}"/patch/0.21.1-0001-Fixed-invalid-variable-name.patch
+	"${WORKDIR}"/patch/0.21.1-0002-Fixing-memory-leaks-in-the-SWIG-wrapper.patch
+	"${WORKDIR}"/patch/0.21.1-0003-Use-swig-generated-python-loader.patch
+	"${FILESDIR}"/0.21.1-packaging.patch
+)
+
+python_test() {
+	esetup.py test
+}
--- a/dev-python/m2crypto/m2crypto-0.22.3-r3.ebuild
+++ b/dev-python/m2crypto/m2crypto-0.22.3-r3.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/m2crypto/m2crypto-0.22.3-r3.ebuild,v 1.3 2015/05/15 09:03:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/m2crypto/m2crypto-0.22.3-r3.ebuild,v 1.4 2015/05/25 17:41:50 floppym Exp $

 EAPI=5

@ -12,7 +12,7 @@ inherit distutils-r1
 MY_PN="M2Crypto"

 DESCRIPTION="M2Crypto: A Python crypto and SSL toolkit"
-HOMEPAGE="http://chandlerproject.org/bin/view/Projects/MeTooCrypto http://pypi.python.org/pypi/M2Crypto"
+HOMEPAGE="https://github.com/martinpaljak/M2Crypto http://pypi.python.org/pypi/M2Crypto"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"

 LICENSE="BSD"
--- a/dev-python/m2crypto/m2crypto-0.22.3-r4.ebuild
+++ b/dev-python/m2crypto/m2crypto-0.22.3-r4.ebuild
@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/m2crypto/m2crypto-0.22.3-r4.ebuild,v 1.3 2015/05/26 00:28:19 floppym Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+MY_PN="M2Crypto"
+
+DESCRIPTION="M2Crypto: A Python crypto and SSL toolkit"
+HOMEPAGE="https://github.com/martinpaljak/M2Crypto http://pypi.python.org/pypi/M2Crypto"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE=""
+
+# swig-3.0.5 results in broken constants, #538920
+RDEPEND=">=dev-libs/openssl-0.9.8:0="
+DEPEND="${RDEPEND}
+	>=dev-lang/swig-1.3.28:0
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+# Tests access network, and fail randomly. Bug #431458.
+RESTRICT=test
+
+PATCHES=(
+	"${FILESDIR}"/0.22.3-Use-swig-generated-python-loader.patch
+	"${FILESDIR}"/0.22.3-packaging.patch
+)
+
+python_test() {
+	esetup.py test
+}
--- a/dev-python/prettytable/Manifest
+++ b/dev-python/prettytable/Manifest
@ -1,2 +1,2 @@
-DIST prettytable-0.6.tar.gz 19663 SHA256 6414f9f5ddba04fcca39f09a9852ec3585b92b67e9319ea865671044d3ed2299 SHA512 ebf53f86ebaaa0c9436808530409bf30069b4722d5dac4c891bd6a9953c3ef1afb3d3f0b494bd4b7b474c98c2e0532c73123fb71827d4b3a5bbb497d32d30af4 WHIRLPOOL 1f932621d100ec67f1764e05164658f80d9328e3e3e770d1a46acdee0e7e35c4c71194f2473439e37a5f6c9d59a5e27f625cf3d38731a648a3b5225b2610d3a3
-DIST prettytable-0.7.1.tar.gz 24448 SHA256 686bda277474e5cc3cff02596d72c2d6f171170225af3dedffe78cbf958c6348 SHA512 5389f3c31cb7482f6796c7f369fc9ef79e2029c783e33c0845dd28a1a6394e66395a1d452072ed89aeb2c38705b8f631a20d093b1bd817c3175e32367f552147 WHIRLPOOL daf155240cd35ce87ac333211a234edee0bf2960bf7bf7ad240d566a803f958b9ada977bbd3a51e85006e333565a950c4070e94290ec7e7bc45f8ccbb63328b7
+DIST prettytable-0.7.1.tar.bz2 21499 SHA256 599bc5b4b9602e28294cf795733c889c26dd934aa7e0ee9cff9b905d4fbad188 SHA512 1a7aa604f608483b107401ddca9721ddea673ea1415d2a514948f7399835784e0a9025f0e5236f4109890e5924da345bd111893200730501b496c136465c204f WHIRLPOOL cbde4e7053eb82749a21f1ac7e0a9ab7368f9dfbe64f0e434da085dc30f24931110e87c508c500bb340adec6d928dae53f1652d1601a5718311a9e414a2b789c
+DIST prettytable-0.7.2.tar.bz2 21755 SHA256 853c116513625c738dc3ce1aee148b5b5757a86727e67eff6502c7ca59d43c36 SHA512 f3a3fe6fa29f4ef090ff6cac06549ebd9db8b387e7b25fc64c4e37c8444586f50355c5573f38caabc72360aa68054aa189a67aa37f0bd13b872862ecd9151e71 WHIRLPOOL 1b27332ea8b2c83ec13b981508f429881bacacb87ac4a8c51a42b6071daa6d1278a48f3359547efae2c7f9eb1fe5d6b13e2d4232543722aa3aab1f30f9fccfbe
--- a/dev-python/prettytable/prettytable-0.6-r1.ebuild
+++ b/dev-python/prettytable/prettytable-0.6-r1.ebuild
@ -1,22 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/prettytable/prettytable-0.6-r1.ebuild,v 1.3 2015/04/08 08:05:25 mgorny Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_3} )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python library for easily displaying tabular data in a
-visually appealing ASCII table format."
-HOMEPAGE="https://code.google.com/p/prettytable/"
-SRC_URI="https://prettytable.googlecode.com/files/prettytable-0.6.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools"
-RDEPEND="${DEPEND}"
--- a/dev-python/prettytable/prettytable-0.6.ebuild
+++ b/dev-python/prettytable/prettytable-0.6.ebuild
@ -1,23 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/prettytable/prettytable-0.6.ebuild,v 1.2 2013/03/11 00:17:10 prometheanfire Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="2:2.6 3"
-SUPPORT_PYTHON_ABIS="1"
-
-inherit distutils
-
-DESCRIPTION="A Python library for easily displaying tabular data in a
-visually appealing ASCII table format."
-HOMEPAGE="https://code.google.com/p/prettytable/"
-SRC_URI="https://prettytable.googlecode.com/files/prettytable-0.6.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools"
-RDEPEND="${DEPEND}"
--- a/dev-python/prettytable/prettytable-0.7.1-r1.ebuild
+++ b/dev-python/prettytable/prettytable-0.7.1-r1.ebuild
@ -1,16 +1,16 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/prettytable/prettytable-0.7.1-r1.ebuild,v 1.6 2015/04/08 08:05:25 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/prettytable/prettytable-0.7.1-r1.ebuild,v 1.7 2015/05/26 10:13:44 jlec Exp $

 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} )

 inherit distutils-r1

-DESCRIPTION="A Python library for easily displaying tabular data in a
-visually appealing ASCII table format."
+DESCRIPTION="Easily displaying tabular data in a visually appealing ASCII table format"
 HOMEPAGE="https://code.google.com/p/prettytable/"
-SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz"
+SRC_URI="mirror://pypi/P/PrettyTable/${P}.tar.bz2"

 LICENSE="BSD"
 SLOT="0"
--- a/dev-python/prettytable/prettytable-0.7.2.ebuild
+++ b/dev-python/prettytable/prettytable-0.7.2.ebuild
@ -1,25 +1,25 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/prettytable/prettytable-0.7.1.ebuild,v 1.6 2015/04/08 08:05:25 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/prettytable/prettytable-0.7.2.ebuild,v 1.1 2015/05/26 10:13:44 jlec Exp $

 EAPI=5
-PYTHON_COMPAT=( python2_7 )
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} )

 inherit distutils-r1

-DESCRIPTION="A Python library for easily displaying tabular data in a
-visually appealing ASCII table format."
+DESCRIPTION="Easily displaying tabular data in a visually appealing ASCII table format"
 HOMEPAGE="https://code.google.com/p/prettytable/"
-SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz"
+SRC_URI="mirror://pypi/P/PrettyTable/${P}.tar.bz2"

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"

 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND=""

 python_test() {
-	"${PYTHON}" prettytable_test.py || die
+	"${PYTHON}" prettytable_test.py || die "tests failed under ${EPYTHON}"
 }
--- a/dev-python/pytest/Manifest
+++ b/dev-python/pytest/Manifest
@ -3,3 +3,4 @@ DIST pytest-2.6.1.tar.gz 627761 SHA256 994dabcb3149659d259add2aa7d11bff4d35efb7c
 DIST pytest-2.6.3.tar.gz 634974 SHA256 97f41dd9f318095b431945bede7a6f02c62c0a40a6c7a976a3820ea377a0eecc SHA512 44fe4c7af804530160a1827b837d35be9492eebb6a382391c820568f492ce7ca50837a47e92873b014ee1655d83a8cb270e0c4149e683efedc25135791733c7a WHIRLPOOL d15f2a1148e33dd3d42a9879d0032f6473dd100ca33ac8797531b76a1ce72a7c96dc2fa8902f68abedf4371d0678c30d7856625639b59a5fe4c02303ea5177e4
 DIST pytest-2.6.4.tar.gz 512090 SHA256 550883b98184cef6cbb980d4d90051330aeae41075092f98ef0215719af8ef33 SHA512 b17f79b0f3c0f6051bedb0d7acadc5d569b3b90b2fce2eddda06a21b654f6077f934aaa9617152d6b2f8babb95c37494f18e050841af601f7f37de25c15b32fd WHIRLPOOL f281b8c0b04102dc9f4a52dbff812fb0fcff9daa9941ae7f24d694d87429e669204ad931e0b297afcd890f818679b73ad96a403c21851dccf050ecc81a16502d
 DIST pytest-2.7.0.tar.gz 526640 SHA256 91dc842785417208d57e5e8dc8bb40f57316c45da24a50c53b49cb8d045519d6 SHA512 80c7a804895ac4dad2e4f47de130df9159076c63016fe64eefcea92d5bff339fcbf5c103258ade7e4068566caf1508d2d737f449a934a1e2673533e4ed7412cb WHIRLPOOL a117ad21d90823a7fc0a8155c288d8c2c46e908138b9af1369a57b8887dbffd31c7e71ed37593f520f427e85732b38d94f1ef9e9f2820e552acecf5d6bc42bf9
+DIST pytest-2.7.1.tar.gz 531671 SHA256 530f23c79e1b13850e93f3a59720f1eca75bad01307dc4fd694a6a19619fb9cb SHA512 1bc23bf67a7400b48b718ef3a03591a3b2047d58b633c6eb16ca4732a9198b3fbbce5a2bfc93097322988b65498ee1a7278d7e035e10d91e6b58d1d3b2a61eba WHIRLPOOL d8eb985d967d8e4b48cab2df58b1e7415bb961087e9a53f4336dc830291b0aa5d4679a49429d6cd67510ec19470a397e07a7c505fd5555ee509c1ff508847b9c
--- a/dev-python/pytest/pytest-2.7.1.ebuild
+++ b/dev-python/pytest/pytest-2.7.1.ebuild
@ -0,0 +1,61 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pytest/pytest-2.7.1.ebuild,v 1.1 2015/05/26 07:57:05 patrick Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="py.test: simple powerful testing with Python"
+HOMEPAGE="http://pytest.org/ http://pypi.python.org/pypi/pytest"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc test"
+
+# When bumping, please check setup.py for the proper py version
+PY_VER="1.4.25"
+RDEPEND=">=dev-python/py-${PY_VER}[${PYTHON_USEDEP}]"
+
+#pexpect dep based on https://bitbucket.org/hpk42/pytest/issue/386/tests-fail-with-pexpect-30
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (	dev-python/pexpect[${PYTHON_USEDEP}] )
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	# 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"
+
+	# Prevent un-needed d'loading
+	sed -e "s/'sphinx.ext.intersphinx', //" -i doc/en/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		mkdir doc/en/.build || die
+		emake -C doc/en html
+	fi
+}
+
+python_test() {
+	# test_nose.py not written to suit py3.2 in pypy3
+	if [[ "${EPYTHON}" == pypy3 ]]; then
+		"${PYTHON}" "${BUILD_DIR}"/lib/pytest.py \
+			--ignore=testing/test_nose.py \
+			|| die "tests failed with ${EPYTHON}"
+	else
+		"${PYTHON}" "${BUILD_DIR}"/lib/pytest.py \
+			|| die "tests failed with ${EPYTHON}"
+	fi
+}
+
+python_install_all() {
+	use doc && dohtml -r doc/en/_build/html/
+	distutils-r1_python_install_all
+}
--- a/dev-python/pyx/Manifest
+++ b/dev-python/pyx/Manifest
@ -1,2 +1,3 @@
 DIST PyX-0.12.1.tar.gz 561989 SHA256 e837b26a8b1c27524cf3f3dd6c0d563451249159edaa2e366d87e7143a867e8e SHA512 4941f5aa21aff3743546495fb073c10d2657ff42b2aff401903498638093d0e31e344cce778980f28a7170c6d29eab72ac074277b9d4088376e8692dc71e55c1 WHIRLPOOL a4d4a21e78b72841ca38dea87296d21f0bc8255e428cb0733fbee9d71c3bfb031d8a9f9fff988dbf0e2af7222553918a9aa924769891c50beb607c6ce3fe2fa4
 DIST PyX-0.13.tar.gz 1237082 SHA256 1952962c965000d8e04a00d1b85c600cdef4588cea88c9face2adbedf21d42c6 SHA512 cab0c22f0862ae20cff92504ededf4fcf5820d5773130fb258de1a95d295ca4fe657b85d5ccd52021a4f84403e6db8eebe9f676fa405781738502456123eb05c WHIRLPOOL 0a6159cd5f2683c70b33aac71278ad6f0df3ae54897d0ab31a9b61897be9b4e531cc41c7772a60a152b3b7a39d383ba669be7401c503704f14cbbf3ceca25c41
+DIST PyX-0.14.tar.gz 2475559 SHA256 b0ea832e97156338010767a7edacbf6147a75cdd5ac1b147bd73afd514eed370 SHA512 328b917e406e29f656dff00ff54fc5b82296cdc4b134f45ef380d0b1e7011311e4c149be59f5089064c183e8ade3adca27a2304b3bafd2e735f256e6de8b8b3b WHIRLPOOL 34ee7b2723618a493d15e2509456e1539acfc9d0010a202c14ba353505ef1394c753cfc083b557d0250918e501d9931dc7949ec6f623b00be63d16a5e3db6839
--- a/dev-python/pyx/pyx-0.14.ebuild
+++ b/dev-python/pyx/pyx-0.14.ebuild
@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyx/pyx-0.14.ebuild,v 1.1 2015/05/26 08:14:12 patrick Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python3_{3,4} )
+
+inherit distutils-r1
+
+MY_P="${P/pyx/PyX}"
+
+DESCRIPTION="Python package for the generation of encapsulated PostScript figures"
+HOMEPAGE="http://pyx.sourceforge.net/"
+SRC_URI="mirror://sourceforge/pyx/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc"
+
+RDEPEND="virtual/tex-base
+		dev-texlive/texlive-basic"
+
+DEPEND="${RDEPEND}
+	doc? ( virtual/latex-base
+		dev-python/sphinx[latex,${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	distutils-r1_src_prepare
+	sed -i \
+		-e 's/^build_t1code=.*/build_t1code=1/' \
+		-e 's/^build_pykpathsea=.*/build_pykpathsea=1/' \
+		setup.cfg || die "setup.cfg fix failed"
+}
+
+python_compile_all() {
+	if use doc; then
+		VARTEXFONTS="${T}"/fonts emake -C "${S}"/faq latexpdf
+	fi
+}
+
+python_install_all() {
+	use doc && dodoc faq/_build/latex/pyxfaq.pdf
+	distutils-r1_python_install_all
+}
--- a/dev-python/sphinx_rtd_theme/Manifest
+++ b/dev-python/sphinx_rtd_theme/Manifest
@ -1,2 +1,3 @@
 DIST sphinx_rtd_theme-0.1.6.tar.gz 217067 SHA256 0f29f544f6d037989fa0c7729a9eab7e4d8ea50d6f0ef37363f472756c1edca6 SHA512 f79e8192264ef01675240853e9be8a5bd0c86808f0e918e60c7c6e0c078caeef87c76421db795149214ef4edc1389e7c2001a98436611292ff826e7b9b9d0f15 WHIRLPOOL 110494f3c9bb6e838557fa4bcb1ac8f33e91b30d2da780720e897cfc4f635c0a14f502d5aac50115495bcc591de79eae83a2e359b81b917e524c9459194420f6
 DIST sphinx_rtd_theme-0.1.7.tar.gz 220230 SHA256 9a490c861f6cf96a0050c29a92d5d1e01eda02ae6f50760ad5c96a327cdf14e8 SHA512 390f007ecba0a59ef92e1aab3457e7c09fa7ff45690f9351857d8aa635371c81329b12e7d4052ba9abaabb82a28a911334c4dc601105ee97cb0eb2b1be0ae426 WHIRLPOOL 00150c49a8e1a56aa378cac795b7ed7a681aef59c7a70294b1b3e582fa1d13ce7abc251567219422fa495c610dfda2a40c1255c2c8306af72188294fa1a84ec2
+DIST sphinx_rtd_theme-0.1.8.tar.gz 424804 SHA256 74f633ed3a61da1d1d59c3185483c81a9d7346bf0e7b5f29ad0764a6f159b68a SHA512 2ade6b86f88fa9e8fa3242b4f5fcf665016098a3819e08400fbe216ccb8ab6e1d0786fba20c1ed722525bc5fd088bc70ceb93c0ed4c5a8ac79ab6499a0a98994 WHIRLPOOL 7bfdd8679d4300a9cef03ca5bbff01cc2cfbc241244f26f08c0356aba8da5bcfdd2bba4603cc687ba5bfbc2b3c7dbf69a5169d88c215173d3dd686fed035704b
--- a/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.1.8.ebuild
+++ b/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.1.8.ebuild
@ -0,0 +1,20 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.1.8.ebuild,v 1.1 2015/05/26 06:37:11 patrick Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="ReadTheDocs.org theme for Sphinx"
+HOMEPAGE="https://github.com/snide/sphinx_rtd_theme/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+PDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@ -11,3 +11,4 @@ DIST SQLAlchemy-0.9.8.tar.gz 4080098 SHA256 de3ac04ecab0a7e0af64eee30a71e723ba58
 DIST SQLAlchemy-0.9.9.tar.gz 4213948 SHA256 72a51f6ae99116ea969381f65fe471aafe14c21f6760f259b46f919f21345f91 SHA512 a28c83645ddddc17825f7d76443350ef22b23be72524aeb22665b4f8b92e0bf7dd79f9628841732973a565f5edb64b687f9e49daa1af11b1778b854b66728fa0 WHIRLPOOL e60a8ef79da0547b58a53c5f567e6abeba7408cd4cc398feaa7c61dcad7fa344dd31691fee25d4738bc25bb956ecf2b20cbeb6caf29114066dfbec26c2f07695
 DIST SQLAlchemy-1.0.0.tar.gz 4462558 SHA256 85286929727ff4aaad63785655c3baa413521b4d4955b81aa14d2f2cfb5b84cb SHA512 87c8d01d9b87748b8c374f64fa2978a093c9e130437c627922d9f92e2c9a97182cb596353f4f567a6594fe7229ae69bc681cc58d1d06fdf8dad07c0c29c681b4 WHIRLPOOL 6cda898ed4f5d6bf4d190e2159a565abcab957ed99f7ac5a56302b69e197e09bc8236d653c3fb4f835a6a468c1a8b449a4bb091bfc484b347c547f9fc93089c7
 DIST SQLAlchemy-1.0.3.tar.gz 4492091 SHA256 3c25d5e038b4f49d8492c18608ead181b09b7a38d301faccecc12b80e2c2f6c1 SHA512 4d66b58c8213d67cc0c568045bf15d92dcd1bfc2f7491e16ea04bdc2d1d8ccc08021b18cfd5b9275d9131f5bcf02b2bdba37c4518d88d4d61a69d77ea32d6b46 WHIRLPOOL 41d002987c558191b7837ca3406c79cf5f467dda76a6b1b1edd82c60829319712335f4c85300f8cdbd7b50cae3f06ca2efbf4f5809d684b7a0373a089ee4401b
+DIST SQLAlchemy-1.0.4.tar.gz 4580773 SHA256 9eb568d6381c6a45e3cc5616333deab653a15b3c6f9958419abeb055b400400e SHA512 fb33ba351b8ef10a41d74ecb8489baa6c83a5a3844ce6303926bd23baec35cac40676d74ffe86ad561899c6698b9f197e800ea845d241078e5e1c1e2b84aa712 WHIRLPOOL 013d32d85d12045084729152d39ee26b6d34155bda4bd5f9d8f463f83f02f822b0d3ef7c55f6426224bed59629abe73545e5eda25cfc31e4e7036949cff7085e
--- a/dev-python/sqlalchemy/sqlalchemy-1.0.4.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.0.4.ebuild
@ -0,0 +1,85 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlalchemy/sqlalchemy-1.0.4.ebuild,v 1.1 2015/05/26 02:29:17 patrick Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+PYTHON_REQ_USE="sqlite?"
+
+inherit distutils-r1 flag-o-matic
+
+MY_PN="SQLAlchemy"
+MY_P="${MY_PN}-${PV/_beta/b}"
+
+DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
+HOMEPAGE="http://www.sqlalchemy.org/ http://pypi.python.org/pypi/SQLAlchemy"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc examples +sqlite test"
+REQUIRED_USE="test? ( sqlite )"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+DEPEND="${RDEPEND}
+	test? (	dev-python/pytest[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy)
+	)"
+S="${WORKDIR}/${MY_P}"
+
+python_prepare_all() {
+	# Disable tests hardcoding function call counts specific to Python versions.
+	rm -r test/aaa_profiling || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	if ! python_is_python3; then
+		local CFLAGS=${CFLAGS}
+		append-cflags -fno-strict-aliasing
+	fi
+	distutils-r1_python_compile
+}
+
+python_test() {
+	# Create copies of necessary files in BUILD_DIR.
+	# https://bitbucket.org/zzzeek/sqlalchemy/issue/3144/
+	cp -pR examples sqla_nose.py setup.cfg test "${BUILD_DIR}" || die
+	pushd "${BUILD_DIR}" > /dev/null
+	if [[ "${EPYTHON}" == "python3.2" ]]; then
+		2to3 --no-diffs -w test
+	fi
+	# Recently upstream elected to make the testsuite also pytest capable
+	# "${PYTHON}" sqla_nose.py || die "Testsuite failed under ${EPYTHON}"
+	py.test test || die "Testsuite failed under ${EPYTHON}"
+	popd > /dev/null
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( doc/. )
+
+	use examples && local EXAMPLES=( examples/. )
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		if ! has_version dev-python/mysql-python; then
+		        elog "For MySQL support, install dev-python/mysql-python"
+		fi
+
+		if ! has_version dev-python/pymssql; then
+			elog "For mssql support, install dev-python/pymssql"
+		fi
+
+		if ! has_version dev-python/psycopg:2; then
+			elog "For postgresql support, install dev-python/psycopg:2"
+		fi
+	fi
+
+	elog "mysql backend support can be enabled by installing mysql-python for cpython py2.7 only,"
+	elog "or mysql-connector-python for support of cpythons 2.7 3.3 and 3.4"
+}
--- a/dev-python/twisted-conch/Manifest
+++ b/dev-python/twisted-conch/Manifest
@ -4,3 +4,4 @@ DIST TwistedConch-14.0.0.tar.bz2 219179 SHA256 5d1023bec87d2c1bf4d1e85f62a5fa304
 DIST TwistedConch-14.0.1.tar.bz2 219255 SHA256 41303b4f09ca7dcfc0b7e796f5f18f83d16cfde789f86364328a08217c18564e SHA512 a4800c437b15ca51fd9151b39e59771ba0a18ea2e9e07fcab2b26eabee925a272ab3dbed114197c9b52f1985f1dd23afacc91591c58fe9e64080394865a77a25 WHIRLPOOL d3551c7a4b412955f653eb1b004fbbca358523761b21578d7886756e180e791d90ef8240e4d5917d65a714a87e348c9fff6077c285e348517409babda90dff0f
 DIST TwistedConch-14.0.2.tar.bz2 219235 SHA256 6628807246be9dd2bea04222ebe2356f4a4a1accf38863983219df745052ad58 SHA512 dfceb9050ab5f1c9962e6ddc8568d546aea4f5028ba63a181b12b5880e130cfec1886fae5a74cd7e5bb79cf74cbcdae4fa7a4f5d814bd14f767ec9108fe83c19 WHIRLPOOL 99142269f412d82eb8e074dbab7f7d3925881e3d6c8e5823f2c72eff425625cf280ce82655d9f708ddb5db544cea8f4e0b02af3e0026133abe9343cb7c79ada4
 DIST TwistedConch-15.1.0.tar.bz2 222091 SHA256 51dc4d3ab3f13e64a196046e3d722689f87c586f3ebe42e287c2063fdd48bb4c SHA512 912d9a288fcc6bb3e8babee75325ea7a384e364d227f0629bbb5af8c813cff75dbeb38755d2f0eb5bd5ac243c45c4ed5f1c9e01bf0d693b027adeeef59ebd691 WHIRLPOOL 09717988167eaf7ed4ed48262ea344342125deae845b3dce0781a84122446922864d189943011d0be9ddc0711a2236637cb9d6c28e049f5e7c3a59440a65512b
+DIST TwistedConch-15.2.1.tar.bz2 222736 SHA256 77ad3f89fcad8918067e047831c0716a514ff5f9405d6896abf17fd3de05d634 SHA512 d21879801e3cc925345e6528a84fa031f5cc1c8a2b5aebc5d3540fdd356d9743fe827ab8060db13b462a6d8986ac23307feaf78725950cef462f06b4edb93df7 WHIRLPOOL 072a90c66380467354e32af702a0caef71bbd4de469681240e3e91deb74927e5364835d4065a72224433d716763b5eff503adc5205c28a61a07f7ec51c1fb671
--- a/dev-python/twisted-conch/twisted-conch-15.2.1.ebuild
+++ b/dev-python/twisted-conch/twisted-conch-15.2.1.ebuild
@ -0,0 +1,19 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-conch/twisted-conch-15.2.1.ebuild,v 1.1 2015/05/26 06:13:43 patrick Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit twisted-r1
+
+DESCRIPTION="Twisted SSHv2 implementation"
+
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~x86"
+IUSE=""
+
+DEPEND="
+	=dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]
+	dev-python/pyasn1[${PYTHON_USEDEP}]
+	dev-python/pycrypto[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
--- a/dev-python/twisted-core/Manifest
+++ b/dev-python/twisted-core/Manifest
@ -5,3 +5,4 @@ DIST TwistedCore-14.0.0.tar.bz2 1126188 SHA256 41fde42b917ea91c74e9ad15ae45a8104
 DIST TwistedCore-14.0.1.tar.bz2 1126214 SHA256 4d80bb277bff34266fb03989d89f721ae41edfc755f4c0481813c04a759f16dc SHA512 44ef2e66636da1f7c6497cf1a4bacfdfdffd276e5b0f99b22c70f74a016de6f88a263fc549db3f04e09e86142514955bc79662760148680fb8ec823720a57a41 WHIRLPOOL ccd1acaf7f732d02b4fd45ca8285b8bbbcd3066176280b929a65879b4530f5158db8134296a35ffe565d2a8b72299ecf93329752bf5b409b60313a930cb1d876
 DIST TwistedCore-14.0.2.tar.bz2 1125732 SHA256 3d16cc6f432ecda1cc335b9a99592ee18d7eb8650e95d5f17895ab4e5e3a4ff8 SHA512 a361f5c9205eca3eda9bf222ed1894e1c55ff937e9950c0cfca193310a165486abffee529740c2c3cc0231c4ccba4d324e2ec7ef5d1aaa9516960b01e2e81ed9 WHIRLPOOL be3b1f70e616c48944741395e8c22240ea05d7f9c823b3b58ff9bebbe1d7293d0fb054b4820e19873aa1feb8d2c1e19fb84be1f632466b2c1d951900d1705d0b
 DIST TwistedCore-15.1.0.tar.bz2 1139396 SHA256 c769ecc62d65a33f04f932ec727c367eb557610392e9f7bab37eaf169fb1cebf SHA512 3978429d57b7929bd65103f86d5e150950de48d27382d23a08b97be5c62c218e7cbaa06067ba6c1b926fb372cc290baf5d629af91053cf338e331d996bf8c99a WHIRLPOOL 3baa9a5986e415fee15cbdb33263a9c9ba84a4c7c79a2f744acd28881de2043b56f97137acf5b97d243fe5d6b6885eebaae2b90cced5e81ac4bef5176fd6a1f7
+DIST TwistedCore-15.2.1.tar.bz2 1179442 SHA256 42efb31330e09b5ffdb8caf735fdb925692c6cfdc03ab7ad25104c3dc41154bb SHA512 c5923d71903afac7dec15d130ff3bd247dc1a6cdeb35cc642912a43f1e5640088971ddfc7abe3e18ca1853e59ba6a417d4b465fb422aba1a052bc156d7c6e820 WHIRLPOOL 8abb2522447fd2e9ad0d3d2e3e0cac8e17e07cd80695b95f12fda6af6ccd6576f4b808f322731445667d194c2216669ad3d4d58c0bc5f798449f1d0a35bcc638
--- a/dev-python/twisted-core/twisted-core-15.2.1.ebuild
+++ b/dev-python/twisted-core/twisted-core-15.2.1.ebuild
@ -0,0 +1,119 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-core/twisted-core-15.2.1.ebuild,v 1.1 2015/05/26 06:16:00 patrick Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils flag-o-matic twisted-r1
+
+DESCRIPTION="An asynchronous networking framework written in Python"
+
+KEYWORDS="~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"
+IUSE="crypt gtk serial test"
+
+RDEPEND=">=dev-python/zope-interface-3.6.0[${PYTHON_USEDEP}]
+	crypt? ( >=dev-python/pyopenssl-0.10[${PYTHON_USEDEP}]
+		dev-python/service_identity[${PYTHON_USEDEP}] )
+	gtk? ( dev-python/pygtk:2[${PYTHON_USEDEP}] )
+	serial? ( dev-python/pyserial[${PYTHON_USEDEP}] )"
+DEPEND="test? ( ${RDEPEND} )"
+
+PATCHES=(
+	# Respect TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE variable.
+	"${FILESDIR}/${PN}-9.0.0-respect_TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE.patch"
+)
+
+python_prepare_all() {
+	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
+
+	# Skip broken tests.
+
+	# http://twistedmatrix.com/trac/ticket/5375
+	sed -e "/class ZshIntegrationTestCase/,/^$/d" -i twisted/scripts/test/test_scripts.py \
+		|| die "sed failed"
+
+	# Prevent it from pulling in plugins from already installed twisted packages.
+	rm -f twisted/plugins/__init__.py
+
+	# An empty file doesn't work because the tests check for doc strings in all packages.
+	echo "'''plugins stub'''" > twisted/plugins/__init__.py || die
+
+	# https://twistedmatrix.com/trac/ticket/6920 6921
+	# Just re-exposing them to list a full list of deficits
+#	sed -e 's:test_basicOperation:_&:' -i twisted/scripts/test/test_tap2deb.py || die
+#	sed -e 's:test_inspectCertificate:_&:' -i twisted/test/test_sslverify.py || die
+
+	# Requires twisted-web, twisted-lore and twisted-names, creating a circ. dep and fail even if installed.
+	# test_loreDeprecation and test_exist failures appeared in version 14.0.0.
+	# Possibly due to over taxing of the distutils_install_for_testing function
+	rm -f twisted/python/test/test_release.py || die
+	sed -e 's:test_loreDeprecation:_&:' -i twisted/test/test_twisted.py || die
+	sed -e 's:test_exist:_&:' -i twisted/python/test/test_dist3.py || die
+
+	# Requires connection to the network
+	sed -e 's:test_multiListen:_&:' -i twisted/test/test_udp.py || die
+
+	# Appeared in version 14.0.0; https://twistedmatrix.com/trac/ticket/7422; known failures
+	# Upstream somewhat unreceptive
+	# The last of these invokes a hang or a long delay
+	sed -e 's:test_dataReceivedThrows:_&:' \
+		-e 's:test_resumeProducingThrows:_&:' \
+		-e 's:test_resumeProducingAbortLater:_&:' \
+		-e 's:test_resumeProducingAbort:_&:' \
+		-e 's:test_fullWriteBufferAfterByteExchange:_&:' \
+		-i twisted/internet/test/test_tcp.py || die
+	sed -e 's:test_logPrefix:_&:' -i twisted/internet/test/connectionmixins.py || 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
+}
--- a/dev-python/twisted-lore/Manifest
+++ b/dev-python/twisted-lore/Manifest
@ -4,3 +4,4 @@ DIST TwistedLore-14.0.0.tar.bz2 53923 SHA256 d689acbff7e667eee9cc4e05ef7fa4a7de2
 DIST TwistedLore-14.0.1.tar.bz2 53945 SHA256 5fc9b933b1be160f4bf3702a95177b684e8b927d0e5103f4aa245f04dd4e2e26 SHA512 237011ad1868270512f169560a3b982f156beda7b4e36bf1bbd1d2f62fd11198a0f0b3efb70065e045844fb4641f53b3eee94da6f74a918b9acde741704b8d90 WHIRLPOOL 40f96bdb40d66743e286b3fa9341d1c9aa7b025a3a7e6d9014589e4cbfbc7d4a61d8e670cc669101629b4ca2db3b20149ef6b345b1a3f31144a6ac7d556fe64b
 DIST TwistedLore-14.0.2.tar.bz2 53980 SHA256 dcc3acf5d06b3cd4590c66354cc8dfb0491031686f30c5adb7b8c5b5bc50749b SHA512 f57cd80d61a33a2167967eed998ff8f26fb628c66fc3a16324dd82963e99679f8c036d2b028e554af184acdcdfe81673658bd88fc5acbce4fc9d8bf16e725640 WHIRLPOOL 88730c514c23b6f866c5222b15b7bd4e90ae2fec8e44d61c5fd287c653b848dfe7f0044c9bfefff4ff4c7766cc08659a0439652d68eaecb7465d03dbcc339b8e
 DIST TwistedLore-15.1.0.tar.bz2 54005 SHA256 62e3949683f5ec0cf0ee8160767dff2f5a3cc26c3474bedbafb2e007d5f746b4 SHA512 4a775705083e0fd180df6c2f514f97e79b76e9e6cd8c7ed4c3159ff3a604753dde59f5c780917ff1a136d7db76ed3048606df6c0babc01894746c3e6229f7a67 WHIRLPOOL 97f678887756d6663e22292f63b026fc8611fa017a460d2a11f02f1c60d958433d7bffd99194e93fac40cd2411f4ccbcabe2bef5de88da70440ac4e9e9dad4fe
+DIST TwistedLore-15.2.1.tar.bz2 54070 SHA256 0997d71f84de67fa11662d057ce6e42059fb389fd6bdfb09d8ed6b5df32efe8f SHA512 9d9c45443f702e527f82dd25b7ed73af24b1ff16d266eb0cb6cb5be230939ed2ba07dfcd9d7b02d48823043b64b33df916b58dd1d1280d3f4e4f7c3cec851d7a WHIRLPOOL e15cdf266975438965fdd4d6d0fd6693d3a3b5281601ac31af8b1aaa6cdea5dea21711ea28f6d2b381123134583f427b904a5a946e465267bccb4c69c7739c54
--- a/dev-python/twisted-lore/twisted-lore-15.2.1.ebuild
+++ b/dev-python/twisted-lore/twisted-lore-15.2.1.ebuild
@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-lore/twisted-lore-15.2.1.ebuild,v 1.1 2015/05/26 06:17:14 patrick Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit twisted-r1
+
+DESCRIPTION="Twisted documentation system"
+
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="=dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]
+	=dev-python/twisted-web-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
--- a/dev-python/twisted-mail/Manifest
+++ b/dev-python/twisted-mail/Manifest
@ -4,3 +4,4 @@ DIST TwistedMail-14.0.0.tar.bz2 157816 SHA256 6a4ac184a719cb273cb055869c2c42e4c9
 DIST TwistedMail-14.0.1.tar.bz2 157660 SHA256 42aa76eff85a31d72162cfcea89d157d83e334f90e5c2ee59fc21e8f680c1450 SHA512 ef2071e24dcfabb0422f25ee529aa19cf8cda0d2f3e023a8672c0565511e1f6f899c6c88bb4adb79dd184f1a4d3dd4800332f33929fe5b6b922b1b7e44e39507 WHIRLPOOL 5e888367e5089f58ef0a132db5be315a670ed8b895c48d8248ae63727f398e1a323daaa35a5047ec513ad7be1e1bf05bac606d6a3c7ed01a431745d4fe1b782e
 DIST TwistedMail-14.0.2.tar.bz2 157653 SHA256 15d8d232e842fa7be639797eb132a87b5edf6a3cf08a732c471193b08bf925b3 SHA512 2ca682a838caf96139db6bb71b6ca536e9d8b403157e3293a097451760b3bb5a8e04777228e938dd4552a1ce3cd59ea560cf26a431d18bc77cbc8951be84fd3a WHIRLPOOL 3ce0a46976cb5315e9af87e9f601f4853d51cbd5875838a7928cd24da57b3f93508bff8353748f1b72736af108fc675df37b19bce47c7f1a6a13a802e55bd11a
 DIST TwistedMail-15.1.0.tar.bz2 161265 SHA256 fa83f1afc4c2f53321fc2911b64dc923755c0dd8f8f53cee1bbdecb6bcee6474 SHA512 2b5453e83185fa51222e26abf59a743c8cdc872f556c28135a7d7a717cf438f5a9d3ca6085ad4b35ae64509e49130812c3dba4cbe65aacdb738fc903492a1a15 WHIRLPOOL c762acb540f9a3be46788087c434ea8de42660f4ec5a646777d75b66a016d2ebb2fb4f15befa430e7ed01e2e0c7a65f3a47924eda8a6c6afa76febee4fe5391e
+DIST TwistedMail-15.2.1.tar.bz2 161891 SHA256 fc50bee5b5aa95164f5aaf09d29fff3897abb7902db508fa58a004fdeb20d324 SHA512 d3c29ad842610dde6697e76456125716a8657f9e7938ac6e66fd3c226fc339e04551a2074c8af8627882c2a761414d5f856fe647b3900ed4eae0fbe7fb5bba23 WHIRLPOOL 264dc5e931291b7398022d0f3cae0f1af8dc4675b12950adaaa1613a9aa3596c66ec081751bb929be417e29a80e235ccfad9f63893dca66544fe76c65e38568d
--- a/dev-python/twisted-mail/twisted-mail-15.2.1.ebuild
+++ b/dev-python/twisted-mail/twisted-mail-15.2.1.ebuild
@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-mail/twisted-mail-15.2.1.ebuild,v 1.1 2015/05/26 06:17:58 patrick Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit twisted-r1
+
+DESCRIPTION="A Twisted Mail library, server and client"
+
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND="=dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]
+	=dev-python/twisted-names-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
--- a/dev-python/twisted-names/Manifest
+++ b/dev-python/twisted-names/Manifest
@ -4,3 +4,4 @@ DIST TwistedNames-14.0.0.tar.bz2 88385 SHA256 6adf7fea6048bd2938c6aa8b7dab852dd8
 DIST TwistedNames-14.0.1.tar.bz2 88381 SHA256 477b0185f67bf684a03deae1f6ed394ac203c3dd4bec1d163378280c9c1778b6 SHA512 b896b338262d9ace8d98ece2578489bb1a5cd104edcfecf3222f3de4ff950c385f06c4359f6d9aaf3340a43dee646aff5bd354302e094f6454daecc23a4a8daf WHIRLPOOL 77de0fe2e651cbe70e79a1035e248a78031e39382866c19a797ff3b78589efcb2f81f80142cad8744ce7b7bf05c3c18faaa55f3e424456e07225da537e33e1dd
 DIST TwistedNames-14.0.2.tar.bz2 88321 SHA256 ad6d0b527c88e1b70f97350e0d768b8373c43f5a4b6558be8e2c5d9d4a891d54 SHA512 f9b3a19856cad2b1437adf62ca0f187d14c570b83e9cce92db9f990171ee633b069e0cf9b4b841e51bdc00bde8b64a9bc0d3309df69d31404235996083de728f WHIRLPOOL bd22a4d7da4f3f31d717cfbb7954697e96e2bf507f2edbda81fc32621e90aabc795acc094922af50d1d727c08fc19487d8b79433291ab799372dbb7fc964ad6b
 DIST TwistedNames-15.1.0.tar.bz2 88684 SHA256 998821c69b8f950264985bcb296340023602d81899a8e3345b055fb05e1f9b28 SHA512 c03141bce0eb26de927d537a896b72823b8dbabde946a3dffd68331c6bb63deab4e7260e07540eb980d31a190c7d5b8224b46dc2e908e8b1aa8c6f869acf745a WHIRLPOOL 768b2d70b00bc12004481dc034dbb437d7fcb21940c590cafe02aab08b68181189967e0c19e46fdebdb776b0ecfaa9b5fa127198ec361554a308e2769557ce29
+DIST TwistedNames-15.2.1.tar.bz2 88688 SHA256 9da80426cd1a1a9951af0adcc54635abda63988761b6f6a92c356916184daf68 SHA512 2ca2c4e4e9a49e82246f781f2fd1eb86a85d78236251e085dc88a8b52b7b58964cac4ff2db75a97ea652350f650bc06fcc4d4964747b7e9c5a6631c2ea6aed80 WHIRLPOOL 23e38dea7be7a418b5efa38d9b100411d3cf24b0bbe87aa8048b463eac7cccd372b1423f546428392942841f3d7eb6ad900f03ef206ff685de215f0e91182493
--- a/dev-python/twisted-names/twisted-names-15.2.1.ebuild
+++ b/dev-python/twisted-names/twisted-names-15.2.1.ebuild
@ -0,0 +1,16 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-names/twisted-names-15.2.1.ebuild,v 1.1 2015/05/26 06:18:45 patrick Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit twisted-r1
+
+DESCRIPTION="A Twisted DNS implementation"
+
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND="=dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
--- a/dev-python/twisted-news/Manifest
+++ b/dev-python/twisted-news/Manifest
@ -4,3 +4,4 @@ DIST TwistedNews-14.0.0.tar.bz2 19797 SHA256 1fbb80b64ef8631c48133bad58a7705893a
 DIST TwistedNews-14.0.1.tar.bz2 19829 SHA256 d2dadbe2f845d0cb97c281ef05fff6be762ec862d2227f0d063936de1ff981c2 SHA512 81095ec412fe2cca39e08d1385539de0d5491aefb56d694d525849c45f648a52b685c3ee0d8b0c5f78d02158c5f2a29368285122a865af55ac9cc3a6781f943a WHIRLPOOL 2def3054e79b962949db3318ec9d11235b2fd19d01e0fed1d5dfd3b1dacda78f2bb2fdf4c4a9bc2d7b0e15a3ea4434ac67c7a2315938ca70dbf9ddb123e2161f
 DIST TwistedNews-14.0.2.tar.bz2 19805 SHA256 91c8e1201410264c81fc5771aa425ea5e67fad6a4b1e352df70824f387484092 SHA512 305ab6469cab30b775ed371280581289e59607f210d49e7f514d4f80235d44eb1ebcb19e05598a2b2b47a45cccc8a97db5088c7c78c6ee9d7a8107658cb84e67 WHIRLPOOL d2650a751ec61e2c30043a0577be0c31367d848c1b1a336565ab3855320b06eb150c173dc4d4f80fbebf5088432567dc2e10b750b7732838e2b2dffb39f4968c
 DIST TwistedNews-15.1.0.tar.bz2 19843 SHA256 8212888036f10fbae5932dfdbc593047edf08daabff3ba6fa391a8afe1c93186 SHA512 4a1111d0807d95506ad1a44dfd5f49ff72f7e8162e102a2a9945d5ffcc7f58d12f6df65e085f07e47c0fcee4c341bc0b9cdff918e062b450a2a1a0bf974e57f6 WHIRLPOOL 828ef667619d75e7f1d90902d87a462ab409b8925eece72fa0d7b26f857318d229a3b510a9a2625eb694b4b9b47ffe4822d874edda69350b5964b85847c8324b
+DIST TwistedNews-15.2.1.tar.bz2 19889 SHA256 56d5215e0971431dabedf7b5f9a162ae448c8e6d20b6318e627ab9eaeaf1e089 SHA512 faa3a2b7c6acf2d9f8a63ef79bf36fecc2d48101b701bf679b4837e54f8327e5dda75e207ac2cb03a35671781c9221f62f60885a0459e970f15d660d214e7342 WHIRLPOOL b0b4836fdc661c6daa663b13a589461a2579177867c0878d261dff7d7628c962b08f9b8cc1dcfa74b49035d473115a4b3dec8f289448502547c2edfbad130758
--- a/dev-python/twisted-news/twisted-news-15.2.1.ebuild
+++ b/dev-python/twisted-news/twisted-news-15.2.1.ebuild
@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-news/twisted-news-15.2.1.ebuild,v 1.1 2015/05/26 06:19:31 patrick Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit twisted-r1
+
+DESCRIPTION="Twisted News is an NNTP server and programming library"
+
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="=dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]
+	=dev-python/twisted-mail-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
--- a/dev-python/twisted-pair/Manifest
+++ b/dev-python/twisted-pair/Manifest
@ -4,3 +4,4 @@ DIST TwistedPair-14.0.0.tar.bz2 21665 SHA256 5452ea55fdabefb1f773eb8385b3015db53
 DIST TwistedPair-14.0.1.tar.bz2 21676 SHA256 659fd17029fc73b75feefe06b6adb9850cc1aaa31af36f66c9ec8bab01bdcba3 SHA512 022345da61e0638dd38c32c47af23900514f6345bcfa256ac4c9674363f3c66d3ef34b337dab2275c7cc09dbde46802722fc26955cb4c4560545a8810e9a380c WHIRLPOOL 92f0fe2ee299896ea73a351bf8c3eb38e5c4fbd3771454c61c8df11f8964563db54e2302d7c14fc4a16642f22f20448efca85cf052254ef8fb7ad411dff2324e
 DIST TwistedPair-14.0.2.tar.bz2 21678 SHA256 1c2f40c4fbb089479c9615f9b96c10ed82be196a283e82132413db0a1dbc1ceb SHA512 6339541a7638ad99de9d534e36956cdadaeffc07dd86c2b24847a1e31042f832fdf51565e1528a9eae8e97918b565d8c1bc96807ea4efb04ee855745e93ce818 WHIRLPOOL f60f886d50791c6fee243b5569ca69b3dd8eb59bdb74a18b1d7f02030128001db204298c8acde6402899acaed19773a58d54e3077f8b740889274dbb539ce020
 DIST TwistedPair-15.1.0.tar.bz2 21712 SHA256 b12521b6668efd001c01f1a2703c64f586a4ebbc388b5aca56bb076795c0762c SHA512 3214017dfd4f62e074d486561ed9c7640d4f43f20fd21b3068427d482bfb3b0b723732b547a5467603b667aa62404e957343ead19a00a0b8a2f0221aa8a4691e WHIRLPOOL 8060d0653dd7e510efc32bc3da2ced56ca9066f0667b2167db455dbaca944982d5cfb2e462eb081415e757b3735bbcf2415ddbf35657ba4e024c0759f45c5987
+DIST TwistedPair-15.2.1.tar.bz2 21755 SHA256 50a95ea152272d98048d10b987805d0aadca5ad3cd9b04580c8bde69bf260583 SHA512 e7e9c8d88ca490c5e9f41ade6aede36dc23ea935f7c1658355bf685e21000e4e20ee1a3ccc3ebdba312fe026a8b7b25f2bcf51c3761668c2c3ce86b37ad3c725 WHIRLPOOL fbfcc763d2fb3b93b369426d7cfcb1bb1309b3720f5fb97193a7ffcdffe67c966b1c2e89ef824df106fe84d5f5d35d934449d0c8a5a73de995c03d7da0e14e65
--- a/dev-python/twisted-pair/twisted-pair-15.2.1.ebuild
+++ b/dev-python/twisted-pair/twisted-pair-15.2.1.ebuild
@ -0,0 +1,20 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-pair/twisted-pair-15.2.1.ebuild,v 1.1 2015/05/26 06:20:07 patrick Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit twisted-r1
+
+DESCRIPTION="Twisted low-level networking"
+
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="=dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]
+	dev-python/eunuchs[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+# https://twistedmatrix.com/trac/ticket/7433
+PATCHES=( "${FILESDIR}"/14.0.0-tests.patch )
--- a/dev-python/twisted-runner/Manifest
+++ b/dev-python/twisted-runner/Manifest
@ -4,3 +4,4 @@ DIST TwistedRunner-14.0.0.tar.bz2 13020 SHA256 918c8a0ecfbb6362df8a794260eaea9c7
 DIST TwistedRunner-14.0.1.tar.bz2 13055 SHA256 2d7d9ee60f1e6b67af8daf9c68f65ee210e6f388141731280de6b3bd39818bf7 SHA512 cc897c272f6e95858deae155b096f458d2f61eb3f1ebb3e70a800aee873f26a64d3979f1d9abad73705d60c1411507b9e12c9998ba65f43acd91cf05dd637ba1 WHIRLPOOL b645ec0c6f5a6c8a7f875e47c302995889b4699c37cce1674d13f494c1fbf566661fb79667b49b4f13217e3d96df849aaaebfbbac4a0dc24431e799bfb26f177
 DIST TwistedRunner-14.0.2.tar.bz2 13042 SHA256 54864586896cb1b0a89936cd1451d3bb9c02133228d8cac5200f6b8fc6d2e0c4 SHA512 dd8609913e533ac5ca7e6f2e5d7fad4ffe4208cc03e84d1d10dc75d0ca858120bd7a35ac265a43db9e0b178b15c642219c7aeda2d7489b3e8671e1b6c52f2fa1 WHIRLPOOL 2bafb3ebeb8eaa9cd88b0c4e59ccac78099077e207767c4acdca18c344355cbab3148eca634fe829753b789a1e919fbb047669ff1fc792732d9256c4cb5cde0e
 DIST TwistedRunner-15.1.0.tar.bz2 13088 SHA256 c28ccd6f8105629c99584e7d9c9a04f90191085bf5e548d15aeb3c226a4c9e24 SHA512 335cb42dc3ecc7708ebb69d79fd2eadfa78d7ef804ad4f6d76660234cff0315aeafbe2a1a7a7e48d994f17ac4403fecb5dc6f987a8a67c9960faca2339afd1c9 WHIRLPOOL 9a735454c03187553deae94c1006b5de74cc3b0382ba2f82b4ab3888b86d520795a996d6a28de9c789a3bc59722dd355c1b1f33161bf31eb7ed3d6a5a2627a56
+DIST TwistedRunner-15.2.1.tar.bz2 13041 SHA256 5890b039f3dea6bdacd86a60de6eac299f96a180f35343d40273c7433afb0894 SHA512 9cf94b62cf978f0a11dcba7ee18632d94dbf27bf629f5632f6bdbfa21096a4a8ff5298df9e7e42f03469cf3b89dccc537b983cfb198e35ba01e0ef530baa3867 WHIRLPOOL 020d2b915119b7895479f53b40e55c12e779f937d58633d81a191fc5c0221793f2d51308e5120070ad5acabd4522d33a459a1aa764cb11528acde0ea60049cc8
--- a/dev-python/twisted-runner/twisted-runner-15.2.1.ebuild
+++ b/dev-python/twisted-runner/twisted-runner-15.2.1.ebuild
@ -0,0 +1,16 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-runner/twisted-runner-15.2.1.ebuild,v 1.1 2015/05/26 06:20:50 patrick Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit twisted-r1
+
+DESCRIPTION="Twisted Runner is a process management library and inetd replacement"
+
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="=dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
--- a/dev-python/twisted-web/Manifest
+++ b/dev-python/twisted-web/Manifest
@ -5,3 +5,4 @@ DIST TwistedWeb-14.0.0.tar.bz2 228686 SHA256 02ee70e0fc06c6e35ef808321826bff1d64
 DIST TwistedWeb-14.0.1.tar.bz2 228976 SHA256 1cbbe10bb006d1ce2cb656e2e28d504cba70d399b19ad065956e4f14661e376b SHA512 32132b93e23aa300facbfab1dddc6afba70c8e7f5d78007f401eb2fa6a1c902f21a7a92a33c8ee698e50786b1323aa2f4e4b6fb4577ecb3365060c875e94a7d3 WHIRLPOOL 3bbe4eb926c1e2b34cd9fabf69fb568184fdc2ff4502923fb214b812b1818535a3ec11b823c1f82e9fb8cd0fa2a26ed7d1ec4eeda0cf16bbb49123c5cfcb4fca
 DIST TwistedWeb-14.0.2.tar.bz2 228949 SHA256 363521b4fd0ec1bb057da010318b2b6913a9e9eb2adf8b05efc21bf3bbacdadc SHA512 272e8f1854d18514d13eda808da5fecd5f7e534d66938352f11064ef5961f912bd5981f3664551102b8596560081dc8138e51033924de7c0da03571ffc13ca83 WHIRLPOOL db5680de57f7917b04f43c075b14c2818750bb667835f0beebb63d9d14b2860569512ec308b0b11fa840ae2fb50a2507fdf22b15eb8834dd1af55e526aa25a76
 DIST TwistedWeb-15.1.0.tar.bz2 231028 SHA256 ef55ca0c425f3eed8080003cab080365d7dde038c6554581b4a06aab5a3285ce SHA512 3eccfafa1110b4fa85892fb3c8b0a37514c33c51f1edc6ac41c257dd198fa2f113e82b884dc6af3fa4dc1aefc69e8e6cc3ab1fc19a569c125e608a829c229748 WHIRLPOOL 4783613bfeda1ebd0ead1b4474cff7f3cd6317e7d8752117da99f7f3b340e5ff9d48700a737583a4b6f9d3c6aa7e750d1b45afc4aca32f2792ce802611544d86
+DIST TwistedWeb-15.2.1.tar.bz2 231092 SHA256 fa93a74a264284eb3123bc2481855e83d4901a818b8e4cbb4f7563ca72a12586 SHA512 e2b155deed9b240f92f173e0fb188c1538ef2275cc6564b838dac8a5ac4c460e664791623cd3e3cde996b63f1619eff8d62636c2813e8b81da5054b8eea365e1 WHIRLPOOL 559f56657e5169f477c74e3d8f41b35ad89580ffcee49fca183c9cf9415d89003e9fdaa711e3770848f974f4d4094dac9c4411c05c3aa1582db26bc0ff77a2fa
--- a/dev-python/twisted-web/twisted-web-15.2.1.ebuild
+++ b/dev-python/twisted-web/twisted-web-15.2.1.ebuild
@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-web/twisted-web-15.2.1.ebuild,v 1.1 2015/05/26 06:21:32 patrick Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit twisted-r1
+
+MY_PN="TwistedWeb"
+DESCRIPTION="Twisted web server, programmable in Python"
+
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="soap"
+
+DEPEND="=dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+	soap? ( dev-python/soappy[${PYTHON_USEDEP}] )"
+RDEPEND="${DEPEND}"
+
+python_prepare_all() {
+	if [[ "${EUID}" -eq 0 ]]; then
+		# Disable tests failing with root permissions.
+		sed -e "s/test_forbiddenResource/_&/" -i twisted/web/test/test_static.py
+		sed -e "s/testDownloadPageError3/_&/" -i twisted/web/test/test_webclient.py
+	fi
+
+	distutils-r1_python_prepare_all
+}
+# testsuite has a PYTHONPATH oddity, currently appears to require a system install to effectively import,
+# putting in question as to whether it is a testsuite
--- a/dev-python/twisted-words/Manifest
+++ b/dev-python/twisted-words/Manifest
@ -4,3 +4,4 @@ DIST TwistedWords-14.0.0.tar.bz2 165343 SHA256 d7b7a604d8a35b62d255cac034e0890e2
 DIST TwistedWords-14.0.1.tar.bz2 165413 SHA256 e8f3e0bb91a7a69f743e102385f3347c3fbd05dc6f82fd0850d80976f7bf38a1 SHA512 d4e28be50c6893f5e0cee605d764b5cabed1fa100cb988165d330cebb676364eed74d8a8334a23e9fab667135a147d903f57137af3ff30d82c955504133a19c8 WHIRLPOOL 7d74c8146e8b80f9d6981a0393ffe56ae32374f0a109e8a3b47966f8ab3fedcbe5735cab546a3524908866dba5cd73c5cd942f11d289e1d47fe314af125a0cdb
 DIST TwistedWords-14.0.2.tar.bz2 165406 SHA256 f8810b5917da1a90471c6feb487d4ea058e87ae67862f0131dc331f4ad12f4ef SHA512 e551bfe4f1fa6a278a42b2fa295dbdf6b2d416beacf614819ae5a7ad1efb51b0d78cb5bd1c600c2d7a5cb2c3c2d064c0c2284a9b145633595f5cae67bfbb8d63 WHIRLPOOL dcfdccf5bb090b49102fdfea729477a768483b3e314db4968b872746479c94eed326215eb526cd68c992c1ffb89981cc36a8d071f14066ed012b0b6b8bf470dd
 DIST TwistedWords-15.1.0.tar.bz2 166836 SHA256 94863962e5dc339217c2c6dbeb081d78e8976a20bd588f287a23974bf58c1adc SHA512 1b711fea9aabc0d9f3e73e811cabbde41f1e5bdf4573dbe5fcbedb7da480aabe0ed23e006433ad3c425db39277c58804ef408c5d31d2b3e7c2c5564a9a631857 WHIRLPOOL 81e46ef43cf99e99b02348a89aff52d7b96b03180d09e27c9d76cb0887a3ccbfb54541497277d62c196f3cacab2c4b112cf7733df3f8ea5a5605dbb152d45a80
+DIST TwistedWords-15.2.1.tar.bz2 168483 SHA256 ac316d252cc807e0b35728fe8e61d3613e2b52b4991004f896d6faeab63d8189 SHA512 aca278a69f5c4deceab0e6f1c6461186131e4b9e7558970175cd5a70232eb7096c3c10fd300a9d22612e97dceeba71765118af45eed7a610678f66d9036452e7 WHIRLPOOL d35c2643265ebb3cf9a3f9060b151120476f7f1d8fd2b81618b276d0bcad2e16a1bb7b90589d70d219fee72611db6cfd5f871ef398515e5c20f487d69d6cb849
--- a/dev-python/twisted-words/twisted-words-15.2.1.ebuild
+++ b/dev-python/twisted-words/twisted-words-15.2.1.ebuild
@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-words/twisted-words-15.2.1.ebuild,v 1.1 2015/05/26 06:22:15 patrick Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit twisted-r1
+
+DESCRIPTION="Twisted Words contains Instant Messaging implementations"
+
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~x86"
+IUSE=""
+
+DEPEND="=dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]
+	=dev-python/twisted-web-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
--- a/dev-util/insight/insight-6.8.1-r1.ebuild
+++ b/dev-util/insight/insight-6.8.1-r1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/insight/insight-6.8.1-r1.ebuild,v 1.3 2015/03/25 13:26:47 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/insight/insight-6.8.1-r1.ebuild,v 1.7 2015/05/26 09:29:49 vapier Exp $

 EAPI=4

@ -38,6 +38,9 @@ S="${WORKDIR}/${MY_P}"
 src_prepare() {
 	local location

+	# Messes with internal glibc defines which fails w/newer glibc.
+	rm "${WORKDIR}/patches/0016-insight-6.8.1-sbrk.patch"
+
 	EPATCH_FORCE="yes" \
 	EPATCH_SOURCE="${WORKDIR}/patches" \
 	EPATCH_SUFFIX="patch" \
@ -54,6 +57,10 @@ src_prepare() {
 		popd >/dev/null
 	done

+	# disable regeneration of info pages we never install. #465460
+	sed -i -e '/^SUBDIRS/s:doc::' bfd/Makefile.in || die
+	sed -i -e '/^AC_CONFIG_SUBDIRS/s:doc::' gdb/configure.ac || die
+
 	cd gdb
 	eautoconf

@ -83,7 +90,7 @@ src_configure() {
 		--enable-gdbtk \
 		--enable-sim \
 		--with-expat \
-		--datadir=/usr/share \
+		--datadir="${EPREFIX}/usr/share" \
 		--with-tclinclude="${TCL_SRC_DIR}" \
 		--with-tkinclude="${TK_SRC_DIR}"
 }
@ -92,7 +99,7 @@ src_install() {
 	# the tcl-related subdirs are not parallel safe
 	emake -j1 DESTDIR="${D}" install

-	find "${ED}" -name '*.la' -exec rm -f {} +
+	find "${ED}" -name '*.la' -delete

 	dodoc gdb/gdbtk/{README,TODO}

--- a/eclass/elisp-common.eclass
+++ b/eclass/elisp-common.eclass
@ -1,10 +1,10 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.92 2015/05/24 21:46:16 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/elisp-common.eclass,v 1.93 2015/05/25 12:52:56 ulm Exp $
 #
 # @ECLASS: elisp-common.eclass
 # @MAINTAINER:
-# Gentoo GNU Emacs Project <emacs@gentoo.org>
+# Gentoo GNU Emacs project <emacs@gentoo.org>
 # @AUTHOR:
 # Matthew Kennedy <mkennedy@gentoo.org>
 # Jeremy Maitin-Shepard <jbms@attbi.com>
--- a/eclass/perl-module.eclass
+++ b/eclass/perl-module.eclass
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/perl-module.eclass,v 1.164 2015/03/15 17:23:09 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/perl-module.eclass,v 1.165 2015/05/25 18:18:00 dilfridge Exp $

 # @ECLASS: perl-module.eclass
 # @MAINTAINER:
@ -177,20 +177,6 @@ perl-module_src_configure() {
 	fi
 }

-# @FUNCTION: perl-module_src_prep
-# @USAGE: perl-module_src_prep
-# @DESCRIPTION:
-# Configure the ebuild sources (bis).
-#
-# This function is still around for historical reasons 
-# and will be soon deprecated.
-#
-# Please use the function above instead, perl-module_src_configure().
-perl-module_src_prep() {
-	debug-print-function $FUNCNAME "$@"
-	die "perl-modules.eclass: perl-module_src_prep has been removed. Please use perl-module_src_configure instead."
-}
-
 # @FUNCTION: perl-module_src_compile
 # @USAGE: perl-module_src_compile
 # @DESCRIPTION:
@ -302,26 +288,6 @@ perl-module_src_install() {
 	perl_link_duallife_scripts
 }

-# @FUNCTION: perl-module_pkg_setup
-# @USAGE: perl-module_pkg_setup
-# @DESCRIPTION:
-# This function was to be called during the pkg_setup() phase.
-# Deprecated, to be removed. Where it is called, place a call to perl_set_version instead.
-perl-module_pkg_setup() {
-	debug-print-function $FUNCNAME "$@"
-	die "perl-modules.eclass: perl-module_pkg_setup has been removed. Please use perl_set_version instead."
-}
-
-# @FUNCTION: perl-module_pkg_preinst
-# @USAGE: perl-module_pkg_preinst
-# @DESCRIPTION:
-# This function was to be called during the pkg_preinst() phase.
-# Deprecated, to be removed. Where it is called, place a call to perl_set_version instead.
-perl-module_pkg_preinst() {
-	debug-print-function $FUNCNAME "$@"
-	die "perl-modules.eclass: perl-module_pkg_preinst has been removed. Please use perl_set_version instead."
-}
-
 # @FUNCTION: perl-module_pkg_postinst
 # @USAGE: perl-module_pkg_postinst
 # @DESCRIPTION:
@ -339,16 +305,6 @@ perl-module_pkg_postinst() {
 	perl_link_duallife_scripts
 }

-# @FUNCTION: perl-module_pkg_prerm
-# @USAGE: perl-module_pkg_prerm
-# @DESCRIPTION:
-# This function was to be called during the pkg_prerm() phase.
-# It does not do anything. Deprecated, to be removed.
-perl-module_pkg_prerm() {
-	debug-print-function $FUNCNAME "$@"
-	die "perl-module.eclass: perl-module_pkg_prerm has been removed. Please remove the call."
-}
-
 # @FUNCTION: perl-module_pkg_postrm
 # @USAGE: perl-module_pkg_postrm
 # @DESCRIPTION:
@ -392,17 +348,6 @@ perl_set_version() {
 	VENDOR_ARCH=${installvendorarch}
 }

-# @FUNCTION: perlinfo
-# @USAGE: perlinfo
-# @DESCRIPTION:
-# This function is deprecated.
-# 
-# Please use the function above instead, perl_set_version().
-perlinfo() {
-	debug-print-function $FUNCNAME "$@"
-	die "perl-modules.eclass: perlinfo has been removed. Please use perl_set_version instead."
-}
-
 # @FUNCTION: perl_delete_localpod
 # @USAGE: perl_delete_localpod
 # @DESCRIPTION:
@ -416,17 +361,6 @@ perl_delete_localpod() {
 	find "${D}" -depth -mindepth 1 -type d -empty -delete
 }

-# @FUNCTION: fixlocalpod
-# @USAGE: fixlocalpod
-# @DESCRIPTION:
-# This function is deprecated. 
-#
-# Please use the function above instead, perl_delete_localpod().
-fixlocalpod() {
-	debug-print-function $FUNCNAME "$@"
-	die "perl-modules.eclass: fixlocalpod has been removed. Please use perl_delete_localpod instead."
-}
-
 # @FUNCTION: perl_fix_osx_extra
 # @USAGE: perl_fix_osx_extra
 # @DESCRIPTION:
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.670 2015/05/25 08:41:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.671 2015/05/26 08:32:39 vapier Exp $

 # Maintainer: Toolchain Ninjas <toolchain@gentoo.org>

@ -1576,6 +1576,13 @@ gcc_do_make() {
 				cd "${CTARGET}"/libstdc++-v3
 				emake doxygen-man || ewarn "failed to make docs"
 			fi
+			# Clean bogus manpages.  #113902
+			find -name '*_build_*' -delete
+			# Blow away generated directory references.  Newer versions of gcc
+			# have gotten better at this, but not perfect.  This is easier than
+			# backporting all of the various doxygen patches.  #486754
+			find -name '*_.3' -exec grep -l ' Directory Reference ' {} + | \
+				xargs rm -f
 		else
 			ewarn "Skipping libstdc++ manpage generation since you don't have doxygen installed"
 		fi
@ -1691,8 +1698,6 @@ toolchain_src_install() {
 		if tc_version_is_at_least 3.0 ; then
 			local cxx_mandir=$(find "${WORKDIR}/build/${CTARGET}/libstdc++-v3" -name man)
 			if [[ -d ${cxx_mandir} ]] ; then
-				# clean bogus manpages #113902
-				find "${cxx_mandir}" -name '*_build_*' -exec rm {} \;
 				cp -r "${cxx_mandir}"/man? "${D}/${DATAPATH}"/man/
 			fi
 		fi
--- a/games-strategy/freeorion/freeorion-0.4.5_pre.ebuild
+++ b/games-strategy/freeorion/freeorion-0.4.5_pre.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeorion/freeorion-0.4.5_pre.ebuild,v 1.2 2015/04/08 18:11:44 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeorion/freeorion-0.4.5_pre.ebuild,v 1.3 2015/05/26 07:49:18 tomka Exp $

 EAPI=5

@ -23,6 +23,7 @@ RDEPEND="
 	media-libs/libsdl2
 	>=dev-libs/boost-1.47[python]
 	media-libs/freealut
+	media-libs/glew
 	media-libs/libogg
 	media-libs/libsdl[X,opengl,video]
 	media-libs/libvorbis
--- a/media-fonts/noto/noto-2015.04.ebuild
+++ b/media-fonts/noto/noto-2015.04.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/noto/noto-2015.04.ebuild,v 1.1 2015/05/06 07:57:56 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/noto/noto-2015.04.ebuild,v 1.3 2015/05/25 13:25:17 yngwin Exp $

 EAPI=5
 inherit font
@ -13,7 +13,7 @@ SRC_URI="http://dev.gentoo.org/~yngwin/distfiles/${P}.zip"

 LICENSE="Apache-2.0 OFL-1.1" # Noto Sans CJK is SIL OFL 1.1, others are Apache 2.0 licensed
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~mips ppc ppc64 sparc x86"
 IUSE=""

 DEPEND="app-arch/unzip"
--- a/media-gfx/gimp/gimp-2.8.10-r1.ebuild
+++ b/media-gfx/gimp/gimp-2.8.10-r1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.8.10-r1.ebuild,v 1.17 2015/04/08 17:58:14 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.8.10-r1.ebuild,v 1.18 2015/05/25 23:48:45 tetromino Exp $

 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@ -35,7 +35,7 @@ RDEPEND=">=dev-libs/glib-2.30.2:2
 	dev-libs/libxslt
 	x11-themes/hicolor-icon-theme
 	>=media-libs/babl-0.1.10
-	>=media-libs/gegl-0.2.0
+	>=media-libs/gegl-0.2.0:0
 	aalib? ( media-libs/aalib )
 	alsa? ( media-libs/alsa-lib )
 	aqua? ( x11-libs/gtk-mac-integration )
--- a/media-gfx/gimp/gimp-2.8.10-r2.ebuild
+++ b/media-gfx/gimp/gimp-2.8.10-r2.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.8.10-r2.ebuild,v 1.3 2015/04/08 17:58:14 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.8.10-r2.ebuild,v 1.4 2015/05/25 23:48:45 tetromino Exp $

 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@ -35,7 +35,7 @@ RDEPEND=">=dev-libs/glib-2.30.2:2
 	dev-libs/libxslt
 	x11-themes/hicolor-icon-theme
 	>=media-libs/babl-0.1.10
-	>=media-libs/gegl-0.2.0
+	>=media-libs/gegl-0.2.0:0
 	aalib? ( media-libs/aalib )
 	alsa? ( media-libs/alsa-lib )
 	aqua? ( x11-libs/gtk-mac-integration )
--- a/media-gfx/gimp/gimp-2.8.14.ebuild
+++ b/media-gfx/gimp/gimp-2.8.14.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.8.14.ebuild,v 1.7 2015/04/30 05:04:35 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.8.14.ebuild,v 1.8 2015/05/25 23:48:45 tetromino Exp $

 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@ -35,7 +35,7 @@ RDEPEND=">=dev-libs/glib-2.30.2:2
 	dev-libs/libxslt
 	x11-themes/hicolor-icon-theme
 	>=media-libs/babl-0.1.10
-	>=media-libs/gegl-0.2.0
+	>=media-libs/gegl-0.2.0:0
 	aalib? ( media-libs/aalib )
 	alsa? ( media-libs/alsa-lib )
 	aqua? ( x11-libs/gtk-mac-integration )
--- a/media-gfx/gimp/gimp-9999.ebuild
+++ b/media-gfx/gimp/gimp-9999.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-9999.ebuild,v 1.55 2015/01/29 17:21:06 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-9999.ebuild,v 1.56 2015/05/25 23:48:45 tetromino Exp $

 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@ -40,7 +40,7 @@ RDEPEND=">=dev-libs/glib-2.40.0:2
 	dev-libs/libxslt
 	x11-themes/hicolor-icon-theme
 	>=media-libs/babl-0.1.11
-	>=media-libs/gegl-0.2.1
+	media-libs/gegl:0.3
 	aalib? ( media-libs/aalib )
 	alsa? ( media-libs/alsa-lib )
 	aqua? ( x11-libs/gtk-mac-integration )
--- a/Show more
+++ b/Show more
				`@ -0,0 +1 @@`
				`DIST keepassx-0.0.3.tar.gz 15041 SHA256 d8cada98caf2aa77472de67efbec9818e5eb9c4e7a2d39a58ac02e5c2553c5ba SHA512 97ca5b00f8f565595ea78f43a152c752e7ae868ba15d8d3c48f3b75e56d266e28e99d1e61badec646f585bdeca42c49c0d2e19efd46bd79e9838d54293f5e784 WHIRLPOOL 89091f89248f0f4bb525e5dc47ccf228d401524968a76cf6605a790b86983ab9cbe0195dd4b067441975ebd9c58067ed4200f689bc3564427fc07d4620567797`