Sync with portage [Fri Jun 17 23:07:33 MSK 2016].

8 years ago · 63e299b3ec
parent 809ed87ff2
commit 63e299b3ec
128 changed files with 1210 additions and 1314 deletions
--- a/app-admin/eselect/Manifest
+++ b/app-admin/eselect/Manifest
@ -1,3 +1,2 @@
-DIST eselect-1.3.8.tar.xz 168040 SHA256 d0c50bfe0faaddc54fc184f698ee74a6029a21f5155c4670a2bea3ead954c138 SHA512 159bf3ddb05b1966318eaf62d09e454a024f8be7ead2300392abbcbaa54ef748a1c4db1b2f96162994bcab43071396eb96a0b47268f04cb8557f8804818da18e WHIRLPOOL 9c4da0bde2ae2b53e8949d59b13498f55ef2c849dcc8cac503a7d0dda2511311d94dfc7aa27a97432f13aa0b430fec0ab280594dc165bbb40e573dce8c8a74b0
-DIST eselect-1.4.4.tar.xz 177536 SHA256 120c123eae4a1d03515e94f9efd51af6ff2f09340daf1ada4dc21079df7a937f SHA512 1ed01cf00e3f13aad3e5f844c7086c3dd48398efd76e68cd91cf13b9939f4b48eef8915c5f3926954d158023115ad66ee67c0bc8fc4c9570900a37207674fc8f WHIRLPOOL e56c3ea3e54bdbcfffba3fbbe85b3c824cab796a0bae2680fac962356a2f707783571a9f73e0ea8299098838e593bea77b14edbeaadc372f186c2da2928e9ab5
 DIST eselect-1.4.5.tar.xz 175992 SHA256 15beabb4c2afab4f833ceb2a66859849a5c20b8f8d61366ffe4b556a200d5f12 SHA512 d561b66386ac90335041e8fb88dd85cbe98ea32a98eab309a5fb07de1b9fe10c50dcdd03f93632d4bc938c1729ddb0954fa37482eb7856a87c24f41a7bc29a35 WHIRLPOOL e18839e9ff0ea1af03c6246533e72d39f9f7eb61f28d6cec3ff1a571374f23f7d55751c1f20bfb99c40fb44a81b5754b6c92d62c98f6b1b45dc8bf388b54db40
+DIST eselect-1.4.6.tar.xz 176400 SHA256 17a8dae5c84cd29a120ddac3bb7df82ed68f560743f0289d7f64e8a0ba6903b6 SHA512 7ec648346e3810cd753ef736a4a9996ae88037f1dea68b7485bb48964eeb2ae43a7feff5a3957fb3bef7f2b21e0d4bd70b128fbe63d7be17ec4cf9a480371e94 WHIRLPOOL 8a71017359c49c72dd3c7c87cc438a1c6347c4a414e28c437c06a9078ac26ee905c60d35cbe555dad27137e6b3f0ee30fc904070a59b566b683acf8751081afe
--- a/app-admin/eselect/eselect-1.3.8.ebuild
+++ b/app-admin/eselect/eselect-1.3.8.ebuild
@ -1,60 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit eutils bash-completion-r1
-
-DESCRIPTION="Gentoo's multi-purpose configuration and management tool"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Eselect"
-SRC_URI="https://dev.gentoo.org/~ulm/eselect/${P}.tar.xz"
-
-LICENSE="GPL-2+ || ( GPL-2+ CC-BY-SA-2.5 )"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc emacs vim-syntax"
-
-RDEPEND="sys-apps/sed
-	|| (
-		sys-apps/coreutils
-		sys-freebsd/freebsd-bin
-		app-misc/realpath
-	)"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	doc? ( dev-python/docutils )"
-RDEPEND="${RDEPEND}
-	sys-apps/file
-	sys-libs/ncurses"
-
-PDEPEND="emacs? ( app-emacs/eselect-mode )
-	vim-syntax? ( app-vim/eselect-syntax )"
-
-src_compile() {
-	emake
-	use doc && emake html
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	newbashcomp misc/${PN}.bashcomp ${PN}
-	dodoc AUTHORS ChangeLog NEWS README TODO doc/*.txt
-	use doc && dohtml *.html doc/*
-
-	# needed by news module
-	keepdir /var/lib/gentoo/news
-	if ! use prefix; then
-		fowners root:portage /var/lib/gentoo/news
-		fperms g+w /var/lib/gentoo/news
-	fi
-}
-
-pkg_postinst() {
-	# fowners in src_install doesn't work for the portage group:
-	# merging changes the group back to root
-	if ! use prefix; then
-		chgrp portage "${EROOT}/var/lib/gentoo/news" \
-			&& chmod g+w "${EROOT}/var/lib/gentoo/news"
-	fi
-}
--- a/app-admin/eselect/eselect-1.4.6.ebuild
+++ b/app-admin/eselect/eselect-1.4.6.ebuild
@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

-EAPI=4
+EAPI=5

 inherit eutils bash-completion-r1

@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/eselect/${P}.tar.xz"

 LICENSE="GPL-2+ || ( GPL-2+ CC-BY-SA-3.0 )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc emacs vim-syntax"

 RDEPEND="sys-apps/sed
@ -40,7 +40,10 @@ src_install() {
 	emake DESTDIR="${D}" install
 	newbashcomp misc/${PN}.bashcomp ${PN}
 	dodoc AUTHORS ChangeLog NEWS README TODO doc/*.txt
-	use doc && dohtml *.html doc/*
+	if use doc; then
+		docinto html
+		dodoc *.html doc/*.html doc/*.css
+	fi

 	# needed by news module
 	keepdir /var/lib/gentoo/news
--- a/app-admin/passook/passook-20121001.ebuild
+++ b/app-admin/passook/passook-20121001.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -7,7 +7,7 @@ EAPI=4
 inherit eutils prefix

 DESCRIPTION="Password generator capable of generating pronounceable and/or secure passwords"
-HOMEPAGE="http://mackers.com/misc/scripts/passook/"
+HOMEPAGE="https://github.com/mackers/passook"
 # snapshot of git://github.com/mackers/passook.git
 SRC_URI="mirror://gentoo/${P}.tar.gz"

--- a/app-arch/lrzip/lrzip-0.614.ebuild
+++ b/app-arch/lrzip/lrzip-0.614.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -7,7 +7,7 @@ EAPI=4
 inherit eutils

 DESCRIPTION="Long Range ZIP or Lzma RZIP optimized for compressing large files"
-HOMEPAGE="http://ck.kolivas.org/apps/lrzip/README"
+HOMEPAGE="http://ck.kolivas.org/apps/lrzip/README.md"
 SRC_URI="http://ck.kolivas.org/apps/${PN}/${P}.tar.bz2"

 LICENSE="GPL-2"
--- a/app-arch/lrzip/lrzip-0.616.ebuild
+++ b/app-arch/lrzip/lrzip-0.616.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -7,7 +7,7 @@ EAPI=5
 inherit eutils

 DESCRIPTION="Long Range ZIP or Lzma RZIP optimized for compressing large files"
-HOMEPAGE="http://ck.kolivas.org/apps/lrzip/README"
+HOMEPAGE="http://ck.kolivas.org/apps/lrzip/README.md"
 SRC_URI="http://ck.kolivas.org/apps/${PN}/${P}.tar.bz2"

 LICENSE="GPL-2"
--- a/app-arch/lrzip/lrzip-0.621.ebuild
+++ b/app-arch/lrzip/lrzip-0.621.ebuild
@ -7,7 +7,7 @@ EAPI=5
 inherit eutils

 DESCRIPTION="Long Range ZIP or Lzma RZIP optimized for compressing large files"
-HOMEPAGE="http://ck.kolivas.org/apps/lrzip/README"
+HOMEPAGE="http://ck.kolivas.org/apps/lrzip/README.md"
 SRC_URI="http://ck.kolivas.org/apps/${PN}/${P}.tar.bz2"

 LICENSE="GPL-2"
--- a/app-i18n/fcitx-libpinyin/fcitx-libpinyin-0.3.3.ebuild
+++ b/app-i18n/fcitx-libpinyin/fcitx-libpinyin-0.3.3.ebuild
@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

-EAPI=5
+EAPI="5"
+
 inherit cmake-utils gnome2-utils

 DESCRIPTION="Libpinyin module for Fcitx"
@ -14,15 +15,19 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="dictmanager"

-RDEPEND=">=app-i18n/fcitx-4.2.8
+RDEPEND=">=app-i18n/fcitx-4.2.8[dbus]
 	app-i18n/libpinyin
 	dev-libs/glib:2
-	dictmanager? ( >=app-i18n/fcitx-4.2.8[qt4]
+	sys-apps/dbus
+	virtual/libintl
+	dictmanager? (
+		>=app-i18n/fcitx-4.2.8[qt4]
 		dev-qt/qtcore:4
+		dev-qt/qtdbus:4
 		dev-qt/qtgui:4
-		dev-qt/qtwebkit:4 )"
+		dev-qt/qtwebkit:4
+	)"
 DEPEND="${RDEPEND}
-	virtual/libintl
 	virtual/pkgconfig"

 src_configure() {
--- a/app-i18n/fcitx-rime/fcitx-rime-0.3.1.ebuild
+++ b/app-i18n/fcitx-rime/fcitx-rime-0.3.1.ebuild
@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

-EAPI=5
+EAPI="5"

 inherit cmake-utils

@ -15,11 +15,11 @@ SLOT="0"
 KEYWORDS="amd64 ~ppc ppc64 ~x86"
 IUSE=""

-RDEPEND=">=app-i18n/fcitx-4.2.8.1
+RDEPEND=">=app-i18n/fcitx-4.2.8.1[dbus]
 	>=app-i18n/librime-1.0
-	app-i18n/rime-data
-	x11-libs/libnotify"
-DEPEND="${RDEPEND}"
+	app-i18n/rime-data"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"

 src_prepare() {
 	# dont build data resource here, already provided by app-i18n/rime-data
--- a/app-i18n/fcitx-sunpinyin/fcitx-sunpinyin-0.4.1.ebuild
+++ b/app-i18n/fcitx-sunpinyin/fcitx-sunpinyin-0.4.1.ebuild
@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

-EAPI=5
+EAPI="5"

 inherit cmake-utils gnome2-utils

@ -16,13 +16,10 @@ KEYWORDS="amd64 ~ppc ppc64 ~x86"
 IUSE=""

 RDEPEND=">=app-i18n/fcitx-4.2.8
-	>app-i18n/sunpinyin-2.0.3"
-DEPEND="${RDEPEND}
+	>=app-i18n/sunpinyin-2.0.4_alpha
 	virtual/libintl"
-
-src_prepare() {
-	epatch_user
-}
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"

 pkg_postinst() {
 	gnome2_icon_cache_update
--- a/app-i18n/sunpinyin/metadata.xml
+++ b/app-i18n/sunpinyin/metadata.xml
@ -6,6 +6,6 @@
    <name>Cjk</name>
  </maintainer>
  <upstream>
-    <remote-id type="google-code">sunpinyin</remote-id>
+    <remote-id type="github">sunpinyin/sunpinyin</remote-id>
  </upstream>
 </pkgmetadata>
--- a/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20130108.ebuild
+++ b/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20130108.ebuild
@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit eutils multilib python-any-r1 scons-utils toolchain-funcs

 DESCRIPTION="A Statistical Language Model based Chinese input method library"
-HOMEPAGE="https://sunpinyin.googlecode.com/"
+HOMEPAGE="https://github.com/sunpinyin/sunpinyin"
 SRC_URI="https://dev.gentoo.org/~yngwin/distfiles/${P}.tar.xz"

 LICENSE="LGPL-2.1 CDDL"
--- a/dev-db/postgis/Manifest
+++ b/dev-db/postgis/Manifest
@ -1,5 +1,3 @@
-DIST postgis-2.0.3.tar.gz 5581619 SHA256 7f865a6fdf19afed7d2f3e7178cd504f7254a9e96f2ce6a07d0ea19edc1668a0 SHA512 e49232a0aebd202a053e2f6cb741551e932e49a8c535fadd22fe15c654e3823c2f43a4c78dc0340cddbbc7f9298651dc16e1737be3bfe0779cc4feede032facc WHIRLPOOL 9c7985ab6d50a4a8ffa4e8fa5ea69c7e365aae8d90a3ea70c978149e5a9efe4a29a29d11db5d2a6b5c830dcd5ba458a3263288f32a5af54665f5d1cab3357415
-DIST postgis-2.0.6.tar.gz 5651448 SHA256 438fc9cf8d008c537ed2d6776bc30e726eb1f9a85247df945c2beccc42f33489 SHA512 c838b68b03d08bfd427d8a78c67754697a9409d6333e23e4bf8b63efc4320369258f14a03ba9e21ca4bd967fbfdf99d02720fa370170d4d34c20e31ad47bbf0c WHIRLPOOL 5795385bd146d280c0a8108ccb704417bf206ed80bfa9383c793d1313a3029186d26799438e21b3d6920e92d8859de947e61c1cd55cd0cc275ad800ef128f542
 DIST postgis-2.1.1.tar.gz 6717940 SHA256 f55acf056362e7e78766bec7a403e02a3b6b087a6d18b4222647b6a932d5c945 SHA512 f85c4d1db32802b3acbda3f4c391ca961bf1301c699a00682265c7a984fbc74ee7b9fbfc5580fc04dff0491921eb6dbe4d8bd73dded216794a4b7f90c3ed650f WHIRLPOOL 807d0ce975b72315a72d4c2ecd192c612b00530a7e542b18429fed0c69cf6cb95285554c34be58e3d2a2c513f436289449dfbe82c7430fba87e901a4bea49c2d
 DIST postgis-2.1.8.tar.gz 6811272 SHA256 7c2380b895fe7bda34c2e70deab3fcf4c12b13ab40d7501cdaa6fa36f1a6c662 SHA512 e8aeb739a1ecf95b224a3908d2af3aa38933b56c63713af30d14243653745436165b418a3368601a699b744f6fe61ce645c980319eb159395d68166a3815c5f4 WHIRLPOOL b6675fecbb922379bd50c351abe1553fdbda53543fce56451c688e25a3fa2e9d0813d8f3a349b623b85fcb4016fc4710f6746a224ba7673ec0d2106c7635d3d1
 DIST postgis-2.2.0.tar.gz 10164837 SHA256 66f0f8480d535959b8bb9abb5ee5d602d1001413ca770df120baf3de627f9e91 SHA512 e9954d5c4aa381536ae87c32bb37b166a7ede0f9b9fc96cfb300dc2350b9351f40870429f64e755c3371be692a1956f5f8ea21733b64aab490f42d2232ae5d8f WHIRLPOOL 639c6b278dd6e5c3a11ed1d8de179ee72a4e6e9c54ba1e74e585e9233167a3c2cdca0704c47966cf757db22221ebbc8970a68375894a6179970ab6c0e6c637a2
--- a/dev-db/postgis/metadata.xml
+++ b/dev-db/postgis/metadata.xml
@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-  <email>pgsql-bugs@gentoo.org</email>
-  <name>PostgreSQL and Related Package Development</name>
-  </maintainer>
-  <maintainer type="project">
-  <email>sci-geosciences@gentoo.org</email>
-  <name>Gentoo Geosciences Project</name>
-  </maintainer>
-  <use>
-	<flag name="gtk">Build shp2pgsql-gui a graphical interface to shp2pgsql</flag>
-  </use>
+	<maintainer type="project">
+		<email>pgsql-bugs@gentoo.org</email>
+		<name>PostgreSQL and Related Package Development</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>sci-geosciences@gentoo.org</email>
+		<name>Gentoo Geosciences Project</name>
+	</maintainer>
+	<use>
+		<flag name="gtk">Build shp2pgsql-gui a graphical interface to shp2pgsql</flag>
+	</use>
 </pkgmetadata>
--- a/dev-db/postgis/postgis-2.0.3.ebuild
+++ b/dev-db/postgis/postgis-2.0.3.ebuild
@ -1,265 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit autotools eutils versionator
-
-DESCRIPTION="Geographic Objects for PostgreSQL"
-HOMEPAGE="http://postgis.net"
-SRC_URI="http://download.osgeo.org/postgis/source/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-IUSE="doc gtk"
-
-RDEPEND="
-		|| (
-			dev-db/postgresql:9.2[server]
-			dev-db/postgresql:9.1[server]
-			dev-db/postgresql:9.0[server]
-			dev-db/postgresql:8.4[server]
-		)
-		dev-libs/json-c
-		dev-libs/libxml2:2
-		>=sci-libs/geos-3.3.8
-		>=sci-libs/proj-4.6.0
-		>=sci-libs/gdal-1.9
-		gtk? ( x11-libs/gtk+:2 )
-"
-
-DEPEND="${RDEPEND}
-		doc? (
-				app-text/docbook-xsl-stylesheets
-				app-text/docbook-xml-dtd:4.3
-				dev-libs/libxslt
-				|| (
-					media-gfx/imagemagick[png]
-					media-gfx/graphicsmagick[imagemagick,png]
-				)
-		)
-		virtual/pkgconfig
-"
-
-PGIS="$(get_version_component_range 1-2)"
-
-RESTRICT="test"
-
-# These modules are built using the same *FLAGS that were used to build
-# dev-db/postgresql. The right thing to do is to ignore the current
-# *FLAGS settings.
-QA_FLAGS_IGNORED="usr/lib(64)?/(rt)?postgis-${PGIS}\.so"
-
-# Because developers have been fooled into thinking recursive make is a
-# good thing.
-MAKEOPTS="-j1"
-
-pkg_setup() {
-	export PGSLOT="$(postgresql-config show)"
-
-	if [[ ${PGSLOT//.} < 84 || ${PGSLOT//.} > 92 ]] ; then
-		eerror "You must build ${CATEGORY}/${P} against PostgreSQL 8.4 - 9.2."
-		eerror "Set an appropriate slot with postgresql-config."
-		die 'Select a PostgreSQL slot between 8.4 and 9.2'
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-${PGIS}-ldflags.patch" \
-		"${FILESDIR}/${PN}-${PGIS}-pkgconfig-json.patch"
-
-	local AT_M4DIR="macros"
-	eautoreconf
-}
-
-src_configure() {
-	local myargs=""
-	use gtk && myargs+=" --with-gui"
-	econf ${myargs}
-}
-
-src_compile() {
-	# Occasionally, builds fail because of out of order compilation.
-	# Otherwise, it'd be fine.
-	emake
-	emake -C topology
-
-	if use doc ; then
-		emake comments
-		emake cheatsheets
-		emake -C doc html
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	use doc && emake DESTDIR="${D}" comments-install
-	emake -C topology DESTDIR="${D}" install
-	dobin ./utils/postgis_restore.pl
-
-	dodoc CREDITS TODO loader/README.* doc/*txt
-
-	use doc && dohtml -r doc/html/*
-
-	docinto topology
-	dodoc topology/{TODO,README}
-
-	insinto /etc
-	doins "${FILESDIR}/postgis_dbs"
-}
-
-pkg_postinst() {
-	postgresql-config update
-
-	elog "To finish installing or updating PostGIS edit:"
-	elog "    ${EROOT%/}/etc/postgis_dbs"
-	elog
-	elog "Then, run:"
-	elog "    emerge --config =${CATEGORY}/${PF}"
-}
-
-pkg_config(){
-	source "${EROOT%/}/etc/conf.d/postgresql-${PGSLOT}"
-	source "${EROOT%/}/etc/postgis_dbs"
-	local postgis_path="${EROOT%/}/usr/share/postgresql-${PGSLOT}/contrib/postgis-${PGIS}"
-
-	if [[ -n ${configured} ]] ; then
-		einfon "Password for PostgreSQL user '${pguser}': "
-		read -s PGPASSWORD
-		export PGPASSWORD
-		echo
-	else
-		eerror "You must edit:"
-		eerror "    ${EROOT%/}/etc/postgis_dbs"
-		eerror "Before running 'emerge --config =${CATEGORY}/${PF}'"
-		eerror
-		die "Edit postgis_dbs"
-	fi
-
-	# The server we work with must be the same slot we built against.
-	local server_version
-	server_version=$(psql -U ${pguser} -d postgres -p ${PGPORT} \
-		-Aqwtc 'SELECT version()' 2> /dev/null)
-	if [[ $? = 0 ]] ; then
-		server_version=$(echo ${server_version} | cut -d " " -f 2 | \
-			cut -d "." -f -2 | tr -d .)
-		if [[ $server_version != ${PGSLOT//.} ]] ; then
-			unset PGPASSWORD
-			eerror "Server version must be ${PGSLOT}.x"
-			die "Server version isn't ${PGSLOT}.x"
-		fi
-	else
-		unset PGPASSWORD
-		eerror "Is the server running?"
-		die "Couldn't connect to server."
-	fi
-
-	local retval
-	safe_exit() {
-		unset PGPASSWORD
-		sed -e 's/\(configured\)/#\1/' -i "${EROOT%/}/etc/postgis_dbs"
-		eend $retval
-		eerror "All actions could not be performed."
-		eerror "Read above to see what failed."
-		eerror "Once you fix the issue, you'll need to edit:"
-		eerror "    ${EROOT%/}/etc/postgis_dbs"
-		eerror "As some things may have succeeded."
-		eerror
-		die "All actions could not be performed"
-	}
-
-	local db
-	for db in ${databases[@]} ; do
-		ebegin "Performing CREATE LANGUAGE on ${db}"
-		createlang -U ${pguser} -p ${PGPORT} plpgsql ${db}
-		retval=$?
-		# In this case, only error code 1 is fatal
-		[[ $retval == 1 ]] && safe_exit || eend 0
-
-		ebegin "Enabling PostGIS on ${db}"
-		psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-			-f "${postgis_path}/postgis.sql"
-		retval=$?
-		[[ $retval == 0 ]] && eend 0 || safe_exit
-	done
-
-	for db in ${templates[@]} ; do
-		ebegin "Creating template database '${db}'"
-		createdb -p ${PGPORT} -U ${pguser} -O ${pguser} -T ${from_template} \
-			${db} "PostGIS Template"
-		retval=$?
-		[[ $retval != 0 ]] && safe_exit
-
-		psql -q -U ${pguser} -p ${PGPORT} -c \
-			"UPDATE pg_database \
-			 SET datistemplate = TRUE, datallowconn = TRUE \
-			 WHERE datname = '${db}'"
-		retval=$?
-		[[ $retval != 0 ]] && safe_exit
-
-		createlang -U ${pguser} -p ${PGPORT} plpgsql ${db}
-		retval=$?
-		# In this case, only error code 1 is fatal
-		[[ $retval == 1 ]] && safe_exit
-
-		psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-			-f "${postgis_path}/postgis.sql"
-		retval=$?
-		[[ $retval == 0 ]] && eend 0 || safe_exit
-	done
-
-	for db in ${epsg_databases[@]} ; do
-		ebegin "Adding EPSG to ${db}"
-		psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-			-f "${postgis_path}/spatial_ref_sys.sql"
-		retval=$?
-		[[ $retval == 0 ]] && eend 0 || safe_exit
-	done
-
-	for db in ${comment_databases[@]} ; do
-		ebegin "Adding comments on ${db}"
-		local comment_file
-		for comment_file in "${postgis_path}"/*_comments.sql ; do
-			psql -q -U ${pguser} -p ${PGPORT} -d ${db} -f "${comment_file}"
-			retval=$?
-			[[ $retval == 0 ]] && continue || safe_exit
-		done
-		eend 0
-	done
-
-	for db in ${upgrade_from_1_3[@]} ; do
-		ebegin "Upgrading from PostGIS 1.3 to ${PGIS} on ${db}"
-		psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-			-f "${postgis_path}/postgis_upgrade_13_to_${PGIS//.}.sql"
-		retval=$?
-		[[ $retval == 0 ]] && eend 0 || safe_exit
-	done
-
-	for db in ${upgrade_from_1_4[@]} ; do
-		ebegin "Upgrading from PostGIS 1.4 to ${PGIS} on ${db}"
-		psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-			-f "${postgis_path}/postgis_upgrade_14_to_${PGIS//.}.sql"
-		retval=$?
-		[[ $retval == 0 ]] && eend 0 || safe_exit
-	done
-
-	for db in ${upgrade_from_1_5[@]} ; do
-		ebegin "Minor upgrade for PostGIS ${PGIS} on ${db}"
-		psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-			-f "${postgis_path}/postgis_upgrade_${PGIS//.}_minor.sql"
-		retval=$?
-		[[ $retval == 0 ]] && eend 0 || safe_exit
-	done
-
-	# Clean up and make it so the user has to edit postgis_dbs again that
-	# way this script won't step on any toes due to user error.
-	unset PGPASSWORD
-	sed -e 's/\(configured\)/#\1/' -i "${EROOT%/}/etc/postgis_dbs"
-	einfo "PostgreSQL ${PGSLOT} is now PostGIS enabled."
-	einfo
-	einfo "To enable other databases, change the default slot:"
-	einfo "    postgresql-config set <slot>"
-	einfo "Then, emerge this package again:"
-	einfo "    emerge -av =${CATEGORY}/${PF}"
-}
--- a/dev-db/postgis/postgis-2.0.6.ebuild
+++ b/dev-db/postgis/postgis-2.0.6.ebuild
@ -1,262 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit autotools eutils versionator
-
-DESCRIPTION="Geographic Objects for PostgreSQL"
-HOMEPAGE="http://postgis.net"
-SRC_URI="http://download.osgeo.org/postgis/source/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc gtk"
-
-RDEPEND="
-		|| (
-			dev-db/postgresql:9.2[server]
-			dev-db/postgresql:9.1[server]
-			dev-db/postgresql:9.0[server]
-			dev-db/postgresql:8.4[server]
-		)
-		dev-libs/json-c
-		dev-libs/libxml2:2
-		>=sci-libs/geos-3.3.8
-		>=sci-libs/proj-4.6.0
-		>=sci-libs/gdal-1.9
-		gtk? ( x11-libs/gtk+:2 )
-"
-
-DEPEND="${RDEPEND}
-		doc? (
-				app-text/docbook-xsl-stylesheets
-				app-text/docbook-xml-dtd:4.3
-				dev-libs/libxslt
-				|| (
-					media-gfx/imagemagick[png]
-					media-gfx/graphicsmagick[imagemagick,png]
-				)
-		)
-		virtual/pkgconfig
-"
-
-PGIS="$(get_version_component_range 1-2)"
-
-RESTRICT="test"
-
-# These modules are built using the same *FLAGS that were used to build
-# dev-db/postgresql. The right thing to do is to ignore the current
-# *FLAGS settings.
-QA_FLAGS_IGNORED="usr/lib(64)?/(rt)?postgis-${PGIS}\.so"
-
-# Because developers have been fooled into thinking recursive make is a
-# good thing.
-MAKEOPTS="-j1"
-
-pkg_setup() {
-	export PGSLOT="$(postgresql-config show)"
-
-	if [[ ${PGSLOT//.} < 84 || ${PGSLOT//.} > 92 ]] ; then
-		eerror "You must build ${CATEGORY}/${P} against PostgreSQL 8.4 - 9.2."
-		eerror "Set an appropriate slot with postgresql-config."
-		die 'Select a PostgreSQL slot between 8.4 and 9.2'
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-${PGIS}-ldflags.patch" \
-		"${FILESDIR}/${PN}-${PGIS}-pkgconfig-json.patch"
-
-	local AT_M4DIR="macros"
-	eautoreconf
-}
-
-src_configure() {
-	local myargs=""
-	use gtk && myargs+=" --with-gui"
-	econf ${myargs}
-}
-
-src_compile() {
-	# Occasionally, builds fail because of out of order compilation.
-	# Otherwise, it'd be fine.
-	emake
-	emake -C topology
-
-	if use doc ; then
-		emake comments
-		emake cheatsheets
-		emake -C doc html
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	use doc && emake DESTDIR="${D}" comments-install
-	emake -C topology DESTDIR="${D}" install
-	dobin ./utils/postgis_restore.pl
-
-	dodoc CREDITS TODO loader/README.* doc/*txt
-
-	use doc && dohtml -r doc/html/*
-
-	docinto topology
-	dodoc topology/{TODO,README}
-
-	insinto /etc
-	doins "${FILESDIR}/postgis_dbs"
-
-	use static-libs || find "${ED}" -name '*.a' -delete
-}
-
-pkg_postinst() {
-	postgresql-config update
-
-	elog "To finish installing or updating PostGIS edit:"
-	elog "    ${EROOT%/}/etc/postgis_dbs"
-	elog
-	elog "Then, run:"
-	elog "    emerge --config =${CATEGORY}/${PF}"
-}
-
-pkg_config(){
-	source "${EROOT%/}/etc/conf.d/postgresql-${PGSLOT}"
-	source "${EROOT%/}/etc/postgis_dbs"
-	local postgis_path="${EROOT%/}/usr/share/postgresql-${PGSLOT}/contrib/postgis-${PGIS}"
-
-	if [[ -n ${configured} ]] ; then
-		einfon "Password for PostgreSQL user '${pguser}': "
-		read -s PGPASSWORD
-		export PGPASSWORD
-		echo
-	else
-		eerror "You must edit:"
-		eerror "    ${EROOT%/}/etc/postgis_dbs"
-		eerror "Before running 'emerge --config =${CATEGORY}/${PF}'"
-		eerror
-		die "Edit postgis_dbs"
-	fi
-
-	# The server we work with must be the same slot we built against.
-	local server_match
-	server_match=$(psql -U ${pguser} -d postgres -p ${PGPORT} \
-		-Aqwtc 'SELECT version()' 2> /dev/null | grep -c "PostgreSQL ${PGSLOT}")
-	if [[ $? = 0 ]] ; then
-		if [[ $server_match -ne 1 ]] ; then
-			unset PGPASSWORD
-			eerror "Server version must be ${PGSLOT}.x"
-			die "Server version isn't ${PGSLOT}.x"
-		fi
-	else
-		unset PGPASSWORD
-		eerror "Is the server running?"
-		die "Couldn't connect to server."
-	fi
-
-	local retval
-	safe_exit() {
-		unset PGPASSWORD
-		sed -e 's/\(configured\)/#\1/' -i "${EROOT%/}/etc/postgis_dbs"
-		eend $retval
-		eerror "All actions could not be performed."
-		eerror "Read above to see what failed."
-		eerror "Once you fix the issue, you'll need to edit:"
-		eerror "    ${EROOT%/}/etc/postgis_dbs"
-		eerror "As some things may have succeeded."
-		eerror
-		die "All actions could not be performed"
-	}
-
-	local db
-	for db in ${databases[@]} ; do
-		ebegin "Performing CREATE LANGUAGE on ${db}"
-		createlang -U ${pguser} -p ${PGPORT} plpgsql ${db}
-		retval=$?
-		# In this case, only error code 1 is fatal
-		[[ $retval == 1 ]] && safe_exit || eend 0
-
-		ebegin "Enabling PostGIS on ${db}"
-		psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-			-f "${postgis_path}/postgis.sql"
-		retval=$?
-		[[ $retval == 0 ]] && eend 0 || safe_exit
-	done
-
-	for db in ${templates[@]} ; do
-		ebegin "Creating template database '${db}'"
-		createdb -p ${PGPORT} -U ${pguser} -O ${pguser} -T ${from_template} \
-			${db} "PostGIS Template"
-		retval=$?
-		[[ $retval != 0 ]] && safe_exit
-
-		psql -q -U ${pguser} -p ${PGPORT} -c \
-			"UPDATE pg_database \
-			 SET datistemplate = TRUE, datallowconn = TRUE \
-			 WHERE datname = '${db}'"
-		retval=$?
-		[[ $retval != 0 ]] && safe_exit
-
-		createlang -U ${pguser} -p ${PGPORT} plpgsql ${db}
-		retval=$?
-		# In this case, only error code 1 is fatal
-		[[ $retval == 1 ]] && safe_exit
-
-		psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-			-f "${postgis_path}/postgis.sql"
-		retval=$?
-		[[ $retval == 0 ]] && eend 0 || safe_exit
-	done
-
-	for db in ${epsg_databases[@]} ; do
-		ebegin "Adding EPSG to ${db}"
-		psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-			-f "${postgis_path}/spatial_ref_sys.sql"
-		retval=$?
-		[[ $retval == 0 ]] && eend 0 || safe_exit
-	done
-
-	for db in ${comment_databases[@]} ; do
-		ebegin "Adding comments on ${db}"
-		local comment_file
-		for comment_file in "${postgis_path}"/*_comments.sql ; do
-			psql -q -U ${pguser} -p ${PGPORT} -d ${db} -f "${comment_file}"
-			retval=$?
-			[[ $retval == 0 ]] && continue || safe_exit
-		done
-		eend 0
-	done
-
-	for db in ${upgrade_from_1_3[@]} ; do
-		ebegin "Upgrading from PostGIS 1.3 to ${PGIS} on ${db}"
-		psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-			-f "${postgis_path}/postgis_upgrade_13_to_${PGIS//.}.sql"
-		retval=$?
-		[[ $retval == 0 ]] && eend 0 || safe_exit
-	done
-
-	for db in ${upgrade_from_1_4[@]} ; do
-		ebegin "Upgrading from PostGIS 1.4 to ${PGIS} on ${db}"
-		psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-			-f "${postgis_path}/postgis_upgrade_14_to_${PGIS//.}.sql"
-		retval=$?
-		[[ $retval == 0 ]] && eend 0 || safe_exit
-	done
-
-	for db in ${upgrade_from_1_5[@]} ; do
-		ebegin "Minor upgrade for PostGIS ${PGIS} on ${db}"
-		psql -q -U ${pguser} -p ${PGPORT} -d ${db} \
-			-f "${postgis_path}/postgis_upgrade_${PGIS//.}_minor.sql"
-		retval=$?
-		[[ $retval == 0 ]] && eend 0 || safe_exit
-	done
-
-	# Clean up and make it so the user has to edit postgis_dbs again that
-	# way this script won't step on any toes due to user error.
-	unset PGPASSWORD
-	sed -e 's/\(configured\)/#\1/' -i "${EROOT%/}/etc/postgis_dbs"
-	einfo "PostgreSQL ${PGSLOT} is now PostGIS enabled."
-	einfo
-	einfo "Currently, only one PostgreSQL slot at a time can be PostGIS enabled."
-}
--- a/dev-db/postgis/postgis-2.1.1.ebuild
+++ b/dev-db/postgis/postgis-2.1.1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -31,7 +31,7 @@ RDEPEND="
 		dev-libs/libxml2:2
 		>=sci-libs/geos-3.3.8
 		>=sci-libs/proj-4.6.0
-		>=sci-libs/gdal-1.10.0
+		>=sci-libs/gdal-1.10.0:=
 		gtk? ( x11-libs/gtk+:2 )
 "

--- a/dev-db/postgis/postgis-2.1.8.ebuild
+++ b/dev-db/postgis/postgis-2.1.8.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -31,7 +31,7 @@ RDEPEND="
 		dev-libs/libxml2:2
 		>=sci-libs/geos-3.4.2
 		>=sci-libs/proj-4.6.0
-		>=sci-libs/gdal-1.10.0
+		>=sci-libs/gdal-1.10.0:=
 		gtk? ( x11-libs/gtk+:2 )
 "

--- a/dev-db/postgis/postgis-2.2.0.ebuild
+++ b/dev-db/postgis/postgis-2.2.0.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -31,7 +31,7 @@ RDEPEND="
 		dev-libs/libxml2:2
 		>=sci-libs/geos-3.5.0
 		>=sci-libs/proj-4.6.0
-		>=sci-libs/gdal-1.10.0
+		>=sci-libs/gdal-1.10.0:=
 		gtk? ( x11-libs/gtk+:2 )
 "

--- a/dev-db/postgis/postgis-2.2.1.ebuild
+++ b/dev-db/postgis/postgis-2.2.1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -31,7 +31,7 @@ RDEPEND="
 		dev-libs/libxml2:2
 		>=sci-libs/geos-3.5.0
 		>=sci-libs/proj-4.6.0
-		>=sci-libs/gdal-1.10.0
+		>=sci-libs/gdal-1.10.0:=
 		gtk? ( x11-libs/gtk+:2 )
 "

--- a/dev-db/postgis/postgis-2.2.2.ebuild
+++ b/dev-db/postgis/postgis-2.2.2.ebuild
@ -31,7 +31,7 @@ RDEPEND="
 		dev-libs/libxml2:2
 		>=sci-libs/geos-3.5.0
 		>=sci-libs/proj-4.6.0
-		>=sci-libs/gdal-1.10.0
+		>=sci-libs/gdal-1.10.0:=
 		gtk? ( x11-libs/gtk+:2 )
 "

--- a/dev-db/postgis/postgis-9999.ebuild
+++ b/dev-db/postgis/postgis-9999.ebuild
@ -33,7 +33,7 @@ RDEPEND="
 		dev-libs/libxml2:2
 		>=sci-libs/geos-3.4.2
 		>=sci-libs/proj-4.6.0
-		>=sci-libs/gdal-1.10.0
+		>=sci-libs/gdal-1.10.0:=
 		gtk? ( x11-libs/gtk+:2 )
 "

--- a/dev-haskell/hpc/Manifest
+++ b/dev-haskell/hpc/Manifest
@ -1,4 +0,0 @@
-DIST hpc-0.5.1.1.tar.gz 6486 SHA256 5529224e4d33b26319be71bcac5f81da8fa57545109e40e56f437cc923300ca0 SHA512 91bf76cdc33696e64bc6ab5d4c490264b31c78e3eba9de8301ec5145b74da1a3ac748da446045dc5ff2fe8ca6dece37392effaec92f0b0553ed176bcc42a951e WHIRLPOOL ebadd3fdca05cac0d6baa3efec7617d076f14c32a0a16196e6105a6d862ca1fb389585c342c0efa09b8493edd3ddc60c41d7c3a5b9d9d26663834e12f05ef2e7
-DIST hpc-0.6.0.0.tar.gz 6279 SHA256 7ca62d7474cf7be52fe6bc9cab254a495c5769903cd30e3b50a33cfae8f37443 SHA512 10bf390ca2797f03123a98738c30e8e3caaa4cb0f0201e037e2d65f64a12f1dd9e27f4418d2882a899e957f46f3bc2d31c7b8264bf6dfc2d2c3799ea49b02ca4 WHIRLPOOL 63e8cc74a9d401840c3f7adcfc832552afd7dd38dad3f67793b7a015523005b2291edfc647ae0f12b58bcaf67daa45e5469bf5d4d6685ad1f5c4d4761cfe8729
-DIST hpc-0.6.0.1.tar.gz 6426 SHA256 a224bcf0a6142e97f6214e92a401c19657f9e653325b22acc5d638f8fc24d601 SHA512 f1d2f6a37c24377b4ded6907839b6b6ef43016db65acb5a2386c51d1b452925eb924bc0700c970f9f3e2aa05b79a7a7cd1a2d51c29764611ae8e0002c215c822 WHIRLPOOL a16a216b8c600fbbd326213d1fcef3dc14c000d3e690ddaea0b9d70e74235d8481018d7b7f135d7671a3f7a2ffa8d3f4d834e30fc1d0fa20a536b9c0548395cb
-DIST hpc-0.6.0.2.tar.gz 6584 SHA256 95e6f1e5ccfe9e6415eec9d7bb3eccc2c113cecf2079d1f792646269ab4c0aaf SHA512 85856ec2c4b620d6e6100c38580eace9b89dc89032f409439399dcbccf1a45b6944da1b9451cdac126cda4b4430844a255de2c5500417925c35663aa6f511aea WHIRLPOOL 604c0e46fbd28b0dc52dd759c1e3d4be74f739b025e1a984a897e3a5e3cbb5fb9f3edf58abb081ce89203d4d351e6de04a9ae94a664bd42291a29c581f0eda18
--- a/dev-haskell/hpc/hpc-0.5.1.1.ebuild
+++ b/dev-haskell/hpc/hpc-0.5.1.1.ebuild
@ -1,23 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-
-CABAL_FEATURES="lib profile haddock hscolour hoogle"
-inherit haskell-cabal
-
-DESCRIPTION="Code Coverage Library for Haskell"
-HOMEPAGE="http://hackage.haskell.org/package/hpc"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.1"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
-
-CABAL_CORE_LIB_GHC_PV="7.4.0.20111219 7.4.0.20120126 7.4.1"
--- a/dev-haskell/hpc/hpc-0.6.0.0-r1.ebuild
+++ b/dev-haskell/hpc/hpc-0.6.0.0-r1.ebuild
@ -1,25 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Code Coverage Library for Haskell"
-HOMEPAGE="http://hackage.haskell.org/package/hpc"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.12.1:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.6"
-
-CABAL_CORE_LIB_GHC_PV="7.6.1 7.6.2 7.6.3"
--- a/dev-haskell/hpc/hpc-0.6.0.1.ebuild
+++ b/dev-haskell/hpc/hpc-0.6.0.1.ebuild
@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Code Coverage Library for Haskell"
-HOMEPAGE="http://hackage.haskell.org/package/hpc"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-CABAL_CORE_LIB_GHC_PV="7.8.2 7.8.3 7.8.3.20141119 7.8.4"
-
-src_prepare() {
-	cabal_chdeps \
-		'base       >= 4.4.1 && < 4.8' 'base       >= 4.4.1' \
-		'time       >= 1.2   && < 1.5' 'time       >= 1.2'
-}
--- a/dev-haskell/hpc/hpc-0.6.0.2.ebuild
+++ b/dev-haskell/hpc/hpc-0.6.0.2.ebuild
@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Code Coverage Library for Haskell"
-HOMEPAGE="http://hackage.haskell.org/package/hpc"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-"
-CABAL_CORE_LIB_GHC_PV="PM:7.10.1 PM:7.10.2_rc2 PM:7.10.2 PM:7.10.2-r1 PM:7.10.3_rc1 PM:7.10.3"
--- a/dev-haskell/hpc/metadata.xml
+++ b/dev-haskell/hpc/metadata.xml
@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Code Coverage Library for Haskell
-	</longdescription>
-</pkgmetadata>
--- a/dev-haskell/pool-conduit/Manifest
+++ b/dev-haskell/pool-conduit/Manifest
@ -1 +0,0 @@
-DIST pool-conduit-0.1.2.3.tar.gz 2618 SHA256 db2df6c6c9fba57089a6da3e8ea83a1722fe6e0d26b5d4994fa84a00575dd2d7 SHA512 88e5160511287956158b7df1d023023c56f84d244051dd849dca82429a44e7388e4c150893032d42436482e4433b046efb4250f1702f32a5a8cb71ce3f83ded7 WHIRLPOOL e042a332f53c7654e6948eab39b477f532646c7551d7565d3c90f9afa630cd4b16b3ab330453b55b6e2a1da17131203335438d69d89ba12b6f24523ebc9a01df
--- a/dev-haskell/pool-conduit/metadata.xml
+++ b/dev-haskell/pool-conduit/metadata.xml
@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Allocate resources from a pool, guaranteeing resource handling via the ResourceT transformer.
-	</longdescription>
-</pkgmetadata>
--- a/dev-haskell/pool-conduit/pool-conduit-0.1.2.3.ebuild
+++ b/dev-haskell/pool-conduit/pool-conduit-0.1.2.3.ebuild
@ -1,29 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Resource pool allocations via ResourceT. (deprecated)"
-HOMEPAGE="http://www.yesodweb.com/book/persistent"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/monad-control:=[profile?]
-	>=dev-haskell/resource-pool-0.2.1:=[profile?] <dev-haskell/resource-pool-0.3:=[profile?]
-	>=dev-haskell/resourcet-0.3:=[profile?] <dev-haskell/resourcet-1.2:=[profile?]
-	>=dev-haskell/transformers-0.2.1:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
--- a/dev-haskell/tls-extra/Manifest
+++ b/dev-haskell/tls-extra/Manifest
@ -1 +0,0 @@
-DIST tls-extra-0.6.6.tar.gz 7972 SHA256 dbf782edbb82321b6484105518fe8e2ff6d51992b20a545a5d3bd380ed901a4c SHA512 dec0fcef8ca915d87314206dd34d92f748a2ed8fd944e9a1f6b864082268654f2b628131d2351ea4ae833228e45dcac5798fed3a4a9a4fb7a832f5f37eed3086 WHIRLPOOL 30081982992977ad8f161080d874448fd37e2d9873016b8b513c8842fe4bcd2c1903476bc5a50fdc8b775183f9a8571e58a70547e172cf1fa7fb9abaae4ba6b3
--- a/dev-haskell/tls-extra/metadata.xml
+++ b/dev-haskell/tls-extra/metadata.xml
@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		a set of extra definitions, default values and helpers for tls.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">vincenthz/hs-tls</remote-id>
-	</upstream>
-</pkgmetadata>
--- a/dev-haskell/tls-extra/tls-extra-0.6.6-r1.ebuild
+++ b/dev-haskell/tls-extra/tls-extra-0.6.6-r1.ebuild
@ -1,44 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="TLS extra default values and helpers"
-HOMEPAGE="https://github.com/vincenthz/hs-tls"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND=">=dev-haskell/certificate-1.3.5:=[profile?] <dev-haskell/certificate-1.4.0:=[profile?]
-	>=dev-haskell/cipher-aes-0.2:=[profile?] <dev-haskell/cipher-aes-0.3:=[profile?]
-	dev-haskell/cipher-rc4:=[profile?]
-	>=dev-haskell/crypto-pubkey-0.2.0:=[profile?]
-	dev-haskell/crypto-random:=[profile?]
-	>=dev-haskell/cryptohash-0.6:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/network-2.3:=[profile?]
-	>=dev-haskell/pem-0.1:=[profile?] <dev-haskell/pem-0.3:=[profile?]
-	>=dev-haskell/tls-1.1.0:=[profile?] <dev-haskell/tls-1.2.0:=[profile?]
-	dev-haskell/vector:=[profile?]
-	>=dev-lang/ghc-6.12.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8.0.2
-	test? ( >=dev-haskell/cprng-aes-0.5.0:=[profile?]
-		dev-haskell/hunit:=[profile?]
-		>=dev-haskell/quickcheck-2:2=[profile?] )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag test test)
-}
--- a/dev-haskell/tls-extra/tls-extra-0.6.6.ebuild
+++ b/dev-haskell/tls-extra/tls-extra-0.6.6.ebuild
@ -1,46 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.4.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="TLS extra default values and helpers"
-HOMEPAGE="https://github.com/vincenthz/hs-tls"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-RESTRICT=test # Could not find module `Tests.Ciphers'
-
-RDEPEND=">=dev-haskell/certificate-1.3.5:=[profile?] <dev-haskell/certificate-1.4.0:=[profile?]
-	>=dev-haskell/cipher-aes-0.2:=[profile?] <dev-haskell/cipher-aes-0.3:=[profile?]
-	dev-haskell/cipher-rc4:=[profile?]
-	>=dev-haskell/crypto-pubkey-0.2.0:=[profile?]
-	dev-haskell/crypto-random:=[profile?]
-	>=dev-haskell/cryptohash-0.6:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/network-2.3:=[profile?]
-	>=dev-haskell/pem-0.1:=[profile?] <dev-haskell/pem-0.3:=[profile?]
-	>=dev-haskell/tls-1.1.0:=[profile?] <dev-haskell/tls-1.2.0:=[profile?]
-	dev-haskell/vector:=[profile?]
-	>=dev-lang/ghc-6.12.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8.0.2
-	test? ( >=dev-haskell/cprng-aes-0.5.0:=[profile?]
-		dev-haskell/hunit:=[profile?]
-		>=dev-haskell/quickcheck-2:=[profile?] )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		-f-test
-}
--- a/dev-java/btf/Manifest
+++ b/dev-java/btf/Manifest
@ -0,0 +1 @@
+DIST btf-1.2.tar.gz 66887 SHA256 d7b1b8798edb73f5781dc54952d47a9e9df7a1257cb269cbaff8752b6261c104 SHA512 ba70eea4370f090bf0295c9ac9907869a6bff62dc6ff86a443a887413f0c0fbb5c12924df6166b8ecd2348ee6bad409d954a16fe5a4a4695492f47a486e35acd WHIRLPOOL 3c37a16f3708e8856ae60f04b832213571fc47460ff01a7bfd3dddbeef63fb491e68ab406bb14a405c18b701297594c684a59194eb6c81e3b821a7fb6bce53af
--- a/dev-java/btf/btf-1.2.ebuild
+++ b/dev-java/btf/btf-1.2.ebuild
@ -0,0 +1,38 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Generic interfaces to the classical builder pattern"
+HOMEPAGE="https://github.com/fge/btf/"
+SRC_URI="https://github.com/fge/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( LGPL-3 Apache-2.0 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEP="
+	dev-java/jsr305:0
+"
+
+RDEPEND="
+	${COMMON_DEP}
+	>=virtual/jre-1.7
+"
+
+DEPEND="
+	${COMMON_DEP}
+	>=virtual/jdk-1.7
+"
+
+JAVA_GENTOO_CLASSPATH="jsr305"
+
+src_install() {
+	java-pkg_dojar ${PN}.jar
+	use doc && java-pkg_dojavadoc target/site/apidocs
+	use source && java-pkg_dosrc src/main/java/*
+}
--- a/dev-java/btf/metadata.xml
+++ b/dev-java/btf/metadata.xml
@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription>Generic interfaces to the classical builder pattern and the less classical "freeze/thaw" pattern</longdescription>
+	<upstream>
+		<remote-id type="github">fge/btf</remote-id>
+	</upstream>
+</pkgmetadata>
--- a/dev-libs/libsodium/files/libsodium-1.0.10-cpuflags.patch
+++ b/dev-libs/libsodium/files/libsodium-1.0.10-cpuflags.patch
@ -0,0 +1,40 @@
+--- libsodium-1.0.10/configure.ac
+++ libsodium-1.0.10/configure.ac
+@@ -344,6 +344,10 @@
+     [AC_MSG_RESULT(no)])
+   CFLAGS="$oldcflags"
+ 
+AC_ARG_ENABLE(sse4_1, [AS_HELP_STRING(--disable-sse4_1,Do not use sse4.1 code)],
+  AS_IF([test "x$enableval" = "xyes"], check_sse4_1="yes", check_sse4_1="no"),
+  check_sse4_1="yes")
+AS_IF([test "$check_sse4_1" = "yes"],[
+   oldcflags="$CFLAGS"
+   AX_CHECK_COMPILE_FLAG([-msse4.1], [CFLAGS="$CFLAGS -msse4.1"])
+   AC_MSG_CHECKING(for SSE4.1 instructions set)
+@@ -356,6 +360,7 @@
+      AX_CHECK_COMPILE_FLAG([-msse4.1], [CFLAGS_SSE41="-msse4.1"])],
+     [AC_MSG_RESULT(no)])
+   CFLAGS="$oldcflags"
+  ])
+ 
+   oldcflags="$CFLAGS"
+   AX_CHECK_COMPILE_FLAG([-mavx], [CFLAGS="$CFLAGS -mavx"])
+@@ -393,6 +398,10 @@
+     [AC_MSG_RESULT(no)])
+   CFLAGS="$oldcflags"
+ 
+AC_ARG_ENABLE(aesni, [AS_HELP_STRING(--disable-aesni,Do not use aesni code)],
+  AS_IF([test "x$enableval" = "xyes"], check_aeni="yes", check_aesni="no"),
+  check_aesni="yes")
+AS_IF([test "$check_aesni" = "yes"],[
+   oldcflags="$CFLAGS"
+   AX_CHECK_COMPILE_FLAG([-maes], [CFLAGS="$CFLAGS -maes"])
+   AX_CHECK_COMPILE_FLAG([-mpclmul], [CFLAGS="$CFLAGS -mpclmul"])
+@@ -410,6 +419,7 @@
+      ],
+     [AC_MSG_RESULT(no)])
+   CFLAGS="$oldcflags"
+  ])
+ 
+ ])
+ 
--- a/dev-libs/libsodium/libsodium-1.0.10.ebuild
+++ b/dev-libs/libsodium/libsodium-1.0.10.ebuild
@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

-EAPI=5
+EAPI=6

-inherit eutils
+inherit eutils autotools

 DESCRIPTION="A portable fork of NaCl, a higher-level cryptographic library"
 HOMEPAGE="https://github.com/jedisct1/libsodium"
@ -13,7 +13,14 @@ SRC_URI="http://download.libsodium.org/${PN}/releases/${P}.tar.gz"
 LICENSE="ISC"
 SLOT="0/18"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="+asm minimal static-libs +urandom"
+IUSE="+asm minimal static-libs +urandom cpu_flags_x86_sse4_1 cpu_flags_x86_aes"
+
+PATCHES=( "${FILESDIR}"/${P}-cpuflags.patch )
+
+src_prepare() {
+	default
+	eautoreconf
+}

 src_configure() {
 	local myconf
@ -26,6 +33,8 @@ src_configure() {
 		$(use_enable minimal) \
 		$(use_enable !urandom blocking-random) \
 		$(use_enable static-libs static) \
+		$(use_enable cpu_flags_x86_sse4_1 sse4_1) \
+		$(use_enable cpu_flags_x86_aes aesni) \
 		${myconf}
 }

--- a/dev-python/cython/Manifest
+++ b/dev-python/cython/Manifest
@ -3,3 +3,4 @@ DIST Cython-0.23.2.tar.gz 1627642 SHA256 85a8713db65d9ad3e7e2f01e6ac424d4ae2a403
 DIST Cython-0.23.3.tar.gz 1628634 SHA256 590274ac8dbd1e62cc79d94eb2e2f4ae60cea91a9f8d50b8697d39aba451e82e SHA512 93d02fb7009fe005a91ccf83a3428c449e46c4ff913993e71affdee5a4155d932dcf93238fb85194f44c8b5dd7acd3e3dd83e86b407e4c41e6895abf1f3499ae WHIRLPOOL aa3a289f10608628991b368e9a6bda0821c5f957d1536963e7336ee81e04f554bb7fcce8c2bab429bde1ef7d1490a75770a45caec83d809aaf41f60b36f37924
 DIST Cython-0.23.4.tar.gz 1628326 SHA256 fec42fecee35d6cc02887f1eef4e4952c97402ed2800bfe41bbd9ed1a0730d8e SHA512 67f4d2be22def78318e8d3edc99b944c50291dc812064b0c8829dd453881bb288037087ee8472b161b9624ac13a50ece71a0d7560c9f2f7d94cc6fcad107e749 WHIRLPOOL f92dfc40080bb005bfdf220d8dc65c40b9ffa1e29b7c0c3e5c4e165f653f9b443af70191a3f7498777db07b9353147334d542e5e46109d4452f548d411d979dc
 DIST Cython-0.23.5.tar.gz 1629433 SHA256 0ae5a5451a190e03ee36922c4189ca2c88d1df40a89b4f224bc842d388a0d1b6 SHA512 9052d74bbd0c93757fd916939cc3c39eb1aba6c9692b48887ae577256bec64b39b1fd25b6c751e6c8fe723de4c0ddf9a1a207de39f75b0839500dfcdde69f925 WHIRLPOOL 65456464ee8484de7277b6a657938972d9d81addcfe7751f1de287d6c4429531bbc3fcd0788911cbdc5ef752bfef0d43f930bd6651e124b2a33426c092c34292
+DIST Cython-0.24.tar.gz 1671837 SHA256 6de44d8c482128efc12334641347a9c3e5098d807dd3c69e867fa8f84ec2a3f1 SHA512 9ac22934a4f344b02246538d8317cbecc66236e9c84d782f8121ef2e2c100de2a21cbfb55de3defcab294c71847467870e56fdb5bc38c0db0de7acd560d16e96 WHIRLPOOL 2656fcaa9520ba1de43d8e4e8d9e4d63c30fd62e34746f69c12ac19140faf48a00c98d7f50ce9b065167290d17b25e23c09889c6ab6241c97cd59970e1f09e7d
--- a/dev-python/cython/cython-0.24.ebuild
+++ b/dev-python/cython/cython-0.24.ebuild
@ -0,0 +1,82 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 flag-o-matic toolchain-funcs elisp-common
+
+MY_PN="Cython"
+MY_P="${MY_PN}-${PV/_/}"
+
+DESCRIPTION="A Python to C compiler"
+HOMEPAGE="http://cython.org https://pypi.python.org/pypi/Cython"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+
+IUSE="doc examples emacs test"
+
+RDEPEND="
+	emacs? ( virtual/emacs )
+"
+# On testing, setuptools invokes an error in running the testsuite cited in a number of recent bugs
+# spanning several packages. This bug has been fixed in the recent release of version 9.1
+DEPEND="${RDEPEND}
+	>=dev-python/setuptools-9.1[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/numpy[${PYTHON_USEDEP}] )"
+
+SITEFILE=50cython-gentoo.el
+S="${WORKDIR}/${MY_PN}-${PV%_*}"
+
+python_compile() {
+	if ! python_is_python3; then
+		local CFLAGS="${CFLAGS}"
+		local CXXFLAGS="${CXXFLAGS}"
+		append-flags -fno-strict-aliasing
+	fi
+
+	# Python gets confused when it is in sys.path before build.
+	local PYTHONPATH=
+	export PYTHONPATH
+
+	distutils-r1_python_compile
+}
+
+python_compile_all() {
+	use emacs && elisp-compile Tools/cython-mode.el
+
+	use doc && unset XDG_CONFIG_HOME && emake -C docs html
+}
+
+python_test() {
+	tc-export CC
+	"${PYTHON}" runtests.py -vv --work-dir "${BUILD_DIR}"/tests \
+		|| die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	local DOCS=( CHANGES.rst README.txt ToDo.txt USAGE.txt )
+	use doc && local HTML_DOCS=( docs/build/html/. )
+	use examples && local EXAMPLES=( Demos/. )
+	distutils-r1_python_install_all
+
+	if use emacs; then
+		elisp-install ${PN} Tools/cython-mode.*
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
--- a/dev-python/kafka-python/Manifest
+++ b/dev-python/kafka-python/Manifest
@ -1 +1,3 @@
 DIST kafka-python-1.1.1.tar.gz 213892 SHA256 1da61987111d23918aaebc81e1a5cfc8c72193a5df3caf4ce8826cf08bef89ec SHA512 aa95c5e5ae7790b898cfa40e763eb9c64f17c74ce1322b9a31edfd61fe693ff7cf7048d3f90cac5911c7c4dc8aa7c34ec9d33224bdad5ae5e9591e7fbcc01967 WHIRLPOOL 7706058a061c08bdd383de36dadb4035fb2c4606b0a0440062e0b92ea3965cbd1dbdb88ffc6784096e62d088a733fce66617aef63463485c5a1cfe416a007743
+DIST kafka-python-1.2.0.tar.gz 219060 SHA256 d5b503dbd2a0f3a6224b32998a02793fe3ac39bf45721bd9d4c65d841ba9a6ad SHA512 71141cf71a8da3124f03870b6de0787a1d20451d280b2077b694c87c46a0f78d4f6c2dfd4984859e3b4a54d6ec151ad1f5626fde1af135a5bb711a39f48a855f WHIRLPOOL bb156a89ae50cc040d98f1c50715ed8db61504a54fa8dcd460543686d81c03bb5efbcd972df459a4545bc88157d1381721d4e8c47301a26be5eeed15a9cf61df
+DIST kafka-python-1.2.1.tar.gz 219842 SHA256 ade1f5c016f030eae5bff6eb34052ee9d1dc8d0623cb5c61d23b43abf679393e SHA512 29989a137a05b7d8eccf05ddbb7f9d281b678f1d128e2b9383ccc0b7decfe931b09baaa8e9c2a45403601143f78cb0e3f89cec0c6151ab8e7bf38b732b984b9b WHIRLPOOL 3c6d60f8c1e2d1eff8fa9d46e625fed7f47089db35f8637a998ef5d671f4b070cdd6add39d22671ee2e76a72c7ce51860db1cdf492cd0e30e65c1fba0e72d0a5
--- a/dev-python/kafka-python/kafka-python-1.2.0.ebuild
+++ b/dev-python/kafka-python/kafka-python-1.2.0.ebuild
@ -0,0 +1,30 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Kafka protocol support in Python"
+HOMEPAGE="https://github.com/dpkp/kafka-python/ https://pypi.python.org/pypi/kafka-python/"
+SRC_URI="https://github.com/dpkp/kafka-python/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="snappy test"
+
+RDEPEND="snappy? ( dev-python/snappy[${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/tox[${PYTHON_USEDEP}]
+		dev-python/unittest2[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	esetup.py test || die "tests failed"
+}
--- a/dev-python/kafka-python/kafka-python-1.2.1.ebuild
+++ b/dev-python/kafka-python/kafka-python-1.2.1.ebuild
@ -0,0 +1,30 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Kafka protocol support in Python"
+HOMEPAGE="https://github.com/dpkp/kafka-python/ https://pypi.python.org/pypi/kafka-python/"
+SRC_URI="https://github.com/dpkp/kafka-python/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="snappy test"
+
+RDEPEND="snappy? ( dev-python/snappy[${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/tox[${PYTHON_USEDEP}]
+		dev-python/unittest2[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	esetup.py test || die "tests failed"
+}
--- a/dev-vcs/darcs/darcs-2.12.0.ebuild
+++ b/dev-vcs/darcs/darcs-2.12.0.ebuild
@ -51,8 +51,7 @@ RDEPEND=">=dev-haskell/async-2.0.1.4:=[profile?] <dev-haskell/async-2.2:=[profil
 	>=dev-haskell/zip-archive-0.2.3:=[profile?] <dev-haskell/zip-archive-0.4:=[profile?]
 	>=dev-haskell/zlib-0.5.4.1:=[profile?] <dev-haskell/zlib-0.7.0.0:=[profile?]
 	>=dev-lang/ghc-7.6.2:=
-	|| ( ( >=dev-haskell/transformers-0.3:=[profile?] <dev-haskell/transformers-0.4.0.0:=[profile?] )
-		( >dev-haskell/transformers-0.4.0.0:=[profile?] <dev-haskell/transformers-0.6:=[profile?] ) )
+	>=dev-haskell/transformers-0.3:=[profile?] <dev-haskell/transformers-0.6:=[profile?]
 	curl? ( net-misc/curl )
 	network-uri? ( >=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-2.7:=[profile?]
 			>=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] )
--- a/media-libs/libv4l/Manifest
+++ b/media-libs/libv4l/Manifest
@ -1,2 +1,3 @@
 DIST v4l-utils-1.10.0.tar.bz2 1335798 SHA256 78ead27ee58a701d7c6342303cf4520bdd4a2b88a7813bc99a0b389307e4336b SHA512 1c9d70c7a6c4eddd72951786b76d69b6bed682763a33d1a4ffd393e1589add353124af51fa976e4c362f98e8d5baba9e8fa8d50b27e99cd0363fc5c8e57d7a73 WHIRLPOOL 3f9d8a0a3e4e39aa55e67f1217fcaa50d48a5520818011dced7703ca6f2f14f327756c4e02de0b2491bef456a5486fbdd021cc8188903a5a59cbb56778a4706b
+DIST v4l-utils-1.10.1.tar.bz2 1352235 SHA256 6147ccc29fe7dd3c5c3994d613c4f2a099bac8b44694a96e5cf4d7caca8336c0 SHA512 524bfd4e93e82f2dd55f0baa3e8be5850d4675b46fd0197b6d1287fc0d502c6b5c64bdf461af9630345f2d847d6aa5b6dc483693cee452da0b6729f156a5d98d WHIRLPOOL 5bd3624acf46f5e79f7ee8f114ec9c5d27bfb25adf9a74c1265b4ff08fe55a828a53e6a58f3ed15dc18f3adcd98e07ac5fc21237ede347944f333a6015d964f6
 DIST v4l-utils-1.6.2.tar.bz2 1148309 SHA256 d3d6eb1f0204fb11f3d318bfca35d5f73cc077f88fac7665a47856a16496be7d SHA512 e14442e1b3660d0cb0844f1a5a88f855bc8532df9e72e1b2afd348a7c077ad25657f832d0fd47d3f567bfd399fd82c5a749d075ac9ecb911ea462685e31aa0b2 WHIRLPOOL bd1b825354ca52e62e8c5f83d43bfd2cec63611c65d6b2709a7274fd15ae0fa21345d2b95a073c0b3a33b7c94b304562f1efcf112e1357a58515bd0d6f37f396
--- a/media-libs/libv4l/libv4l-1.10.1.ebuild
+++ b/media-libs/libv4l/libv4l-1.10.1.ebuild
@ -0,0 +1,63 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+
+inherit eutils linux-info multilib-minimal
+
+MY_P="v4l-utils-${PV}"
+
+DESCRIPTION="Separate libraries ebuild from upstream v4l-utils package"
+HOMEPAGE="https://git.linuxtv.org/v4l-utils.git"
+SRC_URI="https://linuxtv.org/downloads/v4l-utils/${MY_P}.tar.bz2"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="jpeg"
+
+# The libraries only link to -ljpeg, therefore multilib depend only for virtual/jpeg.
+RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
+	!media-tv/v4l2-ctl
+	!<media-tv/ivtv-utils-1.4.0-r2"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/os-headers
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	CONFIG_CHECK="~SHMEM"
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	eapply "${FILESDIR}"/${PN}-1.6.2-sysmacros.patch
+	eapply_user
+}
+
+multilib_src_configure() {
+	# Hard disable the flags that apply only to the utils.
+	ECONF_SOURCE=${S} \
+	econf \
+		--disable-static \
+		--disable-qv4l2 \
+		--disable-v4l-utils \
+		--without-libudev \
+		$(use_with jpeg)
+}
+
+multilib_src_compile() {
+	emake -C lib
+}
+
+multilib_src_install() {
+	emake -j1 -C lib DESTDIR="${D}" install
+}
+
+multilib_src_install_all() {
+	dodoc ChangeLog README.lib* TODO
+	prune_libtool_files --all
+}
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@ -1 +1 @@
-Fri, 17 Jun 2016 12:40:49 +0000
+Fri, 17 Jun 2016 19:40:47 +0000
--- a/metadata/glsa/glsa-201606-06.xml
+++ b/metadata/glsa/glsa-201606-06.xml
@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="201606-06">
+  <title>nginx: Multiple vulnerabilities</title>
+  <synopsis>Multiple vulnerabilities have been found in nginx, the worst of
+    which may allow a remote attacker to cause a Denial of Service.
+  </synopsis>
+  <product type="ebuild"></product>
+  <announced>June 17, 2016</announced>
+  <revised>June 17, 2016: 1</revised>
+  <bug>560854</bug>
+  <bug>573046</bug>
+  <bug>584744</bug>
+  <access>remote</access>
+  <affected>
+    <package name="www-servers/nginx" auto="yes" arch="*">
+      <unaffected range="ge">1.10.1</unaffected>
+      <vulnerable range="lt">1.10.1</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>nginx is a robust, small, and high performance HTTP and reverse proxy
+      server.
+    </p>
+  </background>
+  <description>
+    <p>Multiple vulnerabilities have been discovered in nginx. Please review
+      the CVE identifiers referenced below for details.
+    </p>
+  </description>
+  <impact type="normal">
+    <p>A remote attacker could possibly cause a Denial of Service condition via
+      a crafted packet.
+    </p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All nginx users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=www-servers/nginx-1.10.1"
+    </code>
+  </resolution>
+  <references>
+    <uri link="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2013-3587">
+      CVE-2013-3587
+    </uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2016-0742">CVE-2016-0742</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2016-0746">CVE-2016-0746</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2016-0747">CVE-2016-0747</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2016-4450">CVE-2016-4450</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2016-4450">CVE-2016-4450</uri>
+  </references>
+  <metadata tag="requester" timestamp="Tue, 14 Jun 2016 08:44:21 +0000">b-man</metadata>
+  <metadata tag="submitter" timestamp="Fri, 17 Jun 2016 18:26:31 +0000">b-man</metadata>
+</glsa>
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@ -1 +1 @@
-Fri, 17 Jun 2016 12:40:49 +0000
+Fri, 17 Jun 2016 19:40:47 +0000
--- a/metadata/md5-cache/app-admin/eselect-1.3.8
+++ b/metadata/md5-cache/app-admin/eselect-1.3.8
@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst
-DEPEND=sys-apps/sed || ( sys-apps/coreutils sys-freebsd/freebsd-bin app-misc/realpath ) app-arch/xz-utils doc? ( dev-python/docutils )
-DESCRIPTION=Gentoo's multi-purpose configuration and management tool
-EAPI=4
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Eselect
-IUSE=doc emacs vim-syntax
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2+ || ( GPL-2+ CC-BY-SA-2.5 )
-PDEPEND=emacs? ( app-emacs/eselect-mode ) vim-syntax? ( app-vim/eselect-syntax )
-RDEPEND=sys-apps/sed || ( sys-apps/coreutils sys-freebsd/freebsd-bin app-misc/realpath ) sys-apps/file sys-libs/ncurses
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ulm/eselect/eselect-1.3.8.tar.xz
-_eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=0f652b84e060a23f2576a46c4a1ba51f
--- a/metadata/md5-cache/app-admin/eselect-1.4.6
+++ b/metadata/md5-cache/app-admin/eselect-1.4.6
@ -1,14 +1,14 @@
 DEFINED_PHASES=compile install postinst
 DEPEND=sys-apps/sed || ( sys-apps/coreutils sys-freebsd/freebsd-bin app-misc/realpath ) app-arch/xz-utils doc? ( dev-python/docutils )
 DESCRIPTION=Gentoo's multi-purpose configuration and management tool
-EAPI=4
+EAPI=5
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Eselect
 IUSE=doc emacs vim-syntax
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2+ || ( GPL-2+ CC-BY-SA-3.0 )
 PDEPEND=emacs? ( app-emacs/eselect-mode ) vim-syntax? ( app-vim/eselect-syntax )
 RDEPEND=sys-apps/sed || ( sys-apps/coreutils sys-freebsd/freebsd-bin app-misc/realpath ) sys-apps/file sys-libs/ncurses
 SLOT=0
-SRC_URI=https://dev.gentoo.org/~ulm/eselect/eselect-1.4.4.tar.xz
+SRC_URI=https://dev.gentoo.org/~ulm/eselect/eselect-1.4.6.tar.xz
 _eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=120afef333f05fda0c636c439058d2d7
+_md5_=b3b62b403862040ee5e05f2c02cb3e4f
--- a/metadata/md5-cache/app-admin/passook-20121001
+++ b/metadata/md5-cache/app-admin/passook-20121001
@ -1,11 +1,11 @@
 DEFINED_PHASES=install prepare
 DESCRIPTION=Password generator capable of generating pronounceable and/or secure passwords
 EAPI=4
-HOMEPAGE=http://mackers.com/misc/scripts/passook/
+HOMEPAGE=https://github.com/mackers/passook
 KEYWORDS=amd64 hppa ppc ppc64 x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-3+
 RDEPEND=dev-lang/perl sys-apps/miscfiles
 SLOT=0
 SRC_URI=mirror://gentoo/passook-20121001.tar.gz
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	prefix	e7f2b9c6e57342e5d25eac22fce23062	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=79eabf6574c3a617f40cdd15c8d15c4d
+_md5_=027e856b729636ffe342fbe8d484825f
--- a/metadata/md5-cache/app-arch/lrzip-0.614
+++ b/metadata/md5-cache/app-arch/lrzip-0.614
@ -2,11 +2,11 @@ DEFINED_PHASES=configure install prepare
 DEPEND=dev-libs/lzo app-arch/bzip2 sys-libs/zlib x86? ( dev-lang/nasm ) virtual/perl-Pod-Parser
 DESCRIPTION=Long Range ZIP or Lzma RZIP optimized for compressing large files
 EAPI=4
-HOMEPAGE=http://ck.kolivas.org/apps/lrzip/README
+HOMEPAGE=http://ck.kolivas.org/apps/lrzip/README.md
 KEYWORDS=amd64 arm hppa ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=dev-libs/lzo app-arch/bzip2 sys-libs/zlib
 SLOT=0
 SRC_URI=http://ck.kolivas.org/apps/lrzip/lrzip-0.614.tar.bz2
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=859d8ed545f774a54b9ef2ecafb00a64
+_md5_=0a134be64ec9ee025e79ee923d915efc
--- a/metadata/md5-cache/app-arch/lrzip-0.616
+++ b/metadata/md5-cache/app-arch/lrzip-0.616
@ -2,11 +2,11 @@ DEFINED_PHASES=configure install prepare
 DEPEND=dev-libs/lzo app-arch/bzip2 sys-libs/zlib x86? ( dev-lang/nasm ) virtual/perl-Pod-Parser
 DESCRIPTION=Long Range ZIP or Lzma RZIP optimized for compressing large files
 EAPI=5
-HOMEPAGE=http://ck.kolivas.org/apps/lrzip/README
+HOMEPAGE=http://ck.kolivas.org/apps/lrzip/README.md
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=dev-libs/lzo app-arch/bzip2 sys-libs/zlib
 SLOT=0
 SRC_URI=http://ck.kolivas.org/apps/lrzip/lrzip-0.616.tar.bz2
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=554fbe41e87719c81d077407230d8db2
+_md5_=9034ade5e6eb744f6f890f9f3892114c
--- a/metadata/md5-cache/app-arch/lrzip-0.621
+++ b/metadata/md5-cache/app-arch/lrzip-0.621
@ -2,11 +2,11 @@ DEFINED_PHASES=configure install prepare
 DEPEND=dev-libs/lzo app-arch/bzip2 sys-libs/zlib x86? ( dev-lang/nasm ) virtual/perl-Pod-Parser
 DESCRIPTION=Long Range ZIP or Lzma RZIP optimized for compressing large files
 EAPI=5
-HOMEPAGE=http://ck.kolivas.org/apps/lrzip/README
+HOMEPAGE=http://ck.kolivas.org/apps/lrzip/README.md
 KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=dev-libs/lzo app-arch/bzip2 sys-libs/zlib
 SLOT=0
 SRC_URI=http://ck.kolivas.org/apps/lrzip/lrzip-0.621.tar.bz2
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=9f7e8aa9016c910bdb2a1fc09901e479
+_md5_=41551f5b902b56fe310a9afa7f35244f
--- a/metadata/md5-cache/app-i18n/fcitx-libpinyin-0.3.3
+++ b/metadata/md5-cache/app-i18n/fcitx-libpinyin-0.3.3
@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=app-i18n/fcitx-4.2.8 app-i18n/libpinyin dev-libs/glib:2 dictmanager? ( >=app-i18n/fcitx-4.2.8[qt4] dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtwebkit:4 ) virtual/libintl virtual/pkgconfig sys-devel/make >=dev-util/cmake-2.8.12 >=sys-apps/sed-4
+DEPEND=>=app-i18n/fcitx-4.2.8[dbus] app-i18n/libpinyin dev-libs/glib:2 sys-apps/dbus virtual/libintl dictmanager? ( >=app-i18n/fcitx-4.2.8[qt4] dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 dev-qt/qtwebkit:4 ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-2.8.12 >=sys-apps/sed-4
 DESCRIPTION=Libpinyin module for Fcitx
 EAPI=5
 HOMEPAGE=http://fcitx-im.org/
 IUSE=dictmanager
 KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=app-i18n/fcitx-4.2.8 app-i18n/libpinyin dev-libs/glib:2 dictmanager? ( >=app-i18n/fcitx-4.2.8[qt4] dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtwebkit:4 )
+RDEPEND=>=app-i18n/fcitx-4.2.8[dbus] app-i18n/libpinyin dev-libs/glib:2 sys-apps/dbus virtual/libintl dictmanager? ( >=app-i18n/fcitx-4.2.8[qt4] dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 dev-qt/qtwebkit:4 )
 SLOT=0
 SRC_URI=http://download.fcitx-im.org/fcitx-libpinyin/fcitx-libpinyin-0.3.3_dict.tar.xz
 _eclasses_=cmake-utils	ac5bd012586c6cf0d9826400d9de2830	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=3e4e01bcca92b2979f5ddb05bf2cc841
+_md5_=6ba783850a39ca6b96bc14479fd192e2
--- a/metadata/md5-cache/app-i18n/fcitx-rime-0.3.1
+++ b/metadata/md5-cache/app-i18n/fcitx-rime-0.3.1
@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=app-i18n/fcitx-4.2.8.1 >=app-i18n/librime-1.0 app-i18n/rime-data x11-libs/libnotify sys-devel/make >=dev-util/cmake-2.8.12
+DEPEND=>=app-i18n/fcitx-4.2.8.1[dbus] >=app-i18n/librime-1.0 app-i18n/rime-data virtual/pkgconfig sys-devel/make >=dev-util/cmake-2.8.12
 DESCRIPTION=Rime support for Fcitx
 EAPI=5
 HOMEPAGE=http://fcitx-im.org/
 KEYWORDS=amd64 ~ppc ppc64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=app-i18n/fcitx-4.2.8.1 >=app-i18n/librime-1.0 app-i18n/rime-data x11-libs/libnotify
+RDEPEND=>=app-i18n/fcitx-4.2.8.1[dbus] >=app-i18n/librime-1.0 app-i18n/rime-data
 SLOT=0
 SRC_URI=http://download.fcitx-im.org/fcitx-rime/fcitx-rime-0.3.1.tar.xz
 _eclasses_=cmake-utils	ac5bd012586c6cf0d9826400d9de2830	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=6cba11ad53bc8e6725a7b159ac9604dd
+_md5_=5dfd522bef201cd38c1838d1beb151ac
--- a/metadata/md5-cache/app-i18n/fcitx-sunpinyin-0.4.1
+++ b/metadata/md5-cache/app-i18n/fcitx-sunpinyin-0.4.1
@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=app-i18n/fcitx-4.2.8 >app-i18n/sunpinyin-2.0.3 virtual/libintl sys-devel/make >=dev-util/cmake-2.8.12 >=sys-apps/sed-4
+DEPEND=>=app-i18n/fcitx-4.2.8 >=app-i18n/sunpinyin-2.0.4_alpha virtual/libintl virtual/pkgconfig sys-devel/make >=dev-util/cmake-2.8.12 >=sys-apps/sed-4
 DESCRIPTION=Sunpinyin module for fcitx
 EAPI=5
 HOMEPAGE=http://fcitx-im.org/
 KEYWORDS=amd64 ~ppc ppc64 ~x86
 LICENSE=GPL-3
-RDEPEND=>=app-i18n/fcitx-4.2.8 >app-i18n/sunpinyin-2.0.3
+RDEPEND=>=app-i18n/fcitx-4.2.8 >=app-i18n/sunpinyin-2.0.4_alpha virtual/libintl
 SLOT=0
 SRC_URI=http://download.fcitx-im.org/fcitx-sunpinyin/fcitx-sunpinyin-0.4.1.tar.xz
 _eclasses_=cmake-utils	ac5bd012586c6cf0d9826400d9de2830	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=04a3ed9c27d73d44d14f62657d262d25
+_md5_=2a902e36e6b4265bdd1e25f0c33960d0
--- a/metadata/md5-cache/app-i18n/sunpinyin-2.0.4_pre20130108
+++ b/metadata/md5-cache/app-i18n/sunpinyin-2.0.4_pre20130108
@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare setup
 DEPEND=dev-db/sqlite:3 || ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-util/intltool sys-devel/gettext virtual/pkgconfig dev-util/scons
 DESCRIPTION=A Statistical Language Model based Chinese input method library
 EAPI=5
-HOMEPAGE=https://sunpinyin.googlecode.com/
+HOMEPAGE=https://github.com/sunpinyin/sunpinyin
 KEYWORDS=amd64 ~ppc ppc64 ~x86
 LICENSE=LGPL-2.1 CDDL
 PDEPEND=app-i18n/sunpinyin-data
@ -10,4 +10,4 @@ RDEPEND=dev-db/sqlite:3
 SLOT=0/1
 SRC_URI=https://dev.gentoo.org/~yngwin/distfiles/sunpinyin-2.0.4_pre20130108.tar.xz
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	scons-utils	6a35944612b7ecb18a3803359554badc	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=f01765d714897af57911de26f055cf44
+_md5_=fd8d3535201cae248b44576a8464b74f
--- a/metadata/md5-cache/dev-db/postgis-2.0.3
+++ b/metadata/md5-cache/dev-db/postgis-2.0.3
@ -1,14 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst prepare setup
-DEPEND=|| ( dev-db/postgresql:9.2[server] dev-db/postgresql:9.1[server] dev-db/postgresql:9.0[server] dev-db/postgresql:8.4[server] ) dev-libs/json-c dev-libs/libxml2:2 >=sci-libs/geos-3.3.8 >=sci-libs/proj-4.6.0 >=sci-libs/gdal-1.9 gtk? ( x11-libs/gtk+:2 ) doc? ( app-text/docbook-xsl-stylesheets app-text/docbook-xml-dtd:4.3 dev-libs/libxslt || ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[imagemagick,png] ) ) virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Geographic Objects for PostgreSQL
-EAPI=4
-HOMEPAGE=http://postgis.net
-IUSE=doc gtk
-KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=|| ( dev-db/postgresql:9.2[server] dev-db/postgresql:9.1[server] dev-db/postgresql:9.0[server] dev-db/postgresql:8.4[server] ) dev-libs/json-c dev-libs/libxml2:2 >=sci-libs/geos-3.3.8 >=sci-libs/proj-4.6.0 >=sci-libs/gdal-1.9 gtk? ( x11-libs/gtk+:2 )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://download.osgeo.org/postgis/source/postgis-2.0.3.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	792f83d5ec9536cb5ccef375469d8bde	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=3bd4062d35be1f87742e2b8d782f8b04
--- a/metadata/md5-cache/dev-db/postgis-2.0.6
+++ b/metadata/md5-cache/dev-db/postgis-2.0.6
@ -1,14 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst prepare setup
-DEPEND=|| ( dev-db/postgresql:9.2[server] dev-db/postgresql:9.1[server] dev-db/postgresql:9.0[server] dev-db/postgresql:8.4[server] ) dev-libs/json-c dev-libs/libxml2:2 >=sci-libs/geos-3.3.8 >=sci-libs/proj-4.6.0 >=sci-libs/gdal-1.9 gtk? ( x11-libs/gtk+:2 ) doc? ( app-text/docbook-xsl-stylesheets app-text/docbook-xml-dtd:4.3 dev-libs/libxslt || ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[imagemagick,png] ) ) virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Geographic Objects for PostgreSQL
-EAPI=4
-HOMEPAGE=http://postgis.net
-IUSE=doc gtk
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=|| ( dev-db/postgresql:9.2[server] dev-db/postgresql:9.1[server] dev-db/postgresql:9.0[server] dev-db/postgresql:8.4[server] ) dev-libs/json-c dev-libs/libxml2:2 >=sci-libs/geos-3.3.8 >=sci-libs/proj-4.6.0 >=sci-libs/gdal-1.9 gtk? ( x11-libs/gtk+:2 )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://download.osgeo.org/postgis/source/postgis-2.0.6.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	792f83d5ec9536cb5ccef375469d8bde	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=3f09c3dc914b22126d62c3bb3e8eb8be
--- a/metadata/md5-cache/dev-db/postgis-2.1.1
+++ b/metadata/md5-cache/dev-db/postgis-2.1.1
@ -1,15 +1,15 @@
 DEFINED_PHASES=compile config configure install postinst prepare pretend setup
-DEPEND=|| ( dev-db/postgresql:9.4[server] dev-db/postgresql:9.3[server] dev-db/postgresql:9.2[server] dev-db/postgresql:9.1[server] dev-db/postgresql:9.0[server] ) <dev-libs/json-c-0.11 dev-libs/libxml2:2 >=sci-libs/geos-3.3.8 >=sci-libs/proj-4.6.0 >=sci-libs/gdal-1.10.0 gtk? ( x11-libs/gtk+:2 ) doc? ( app-text/docbook-xsl-stylesheets app-text/docbook-xml-dtd:4.5 dev-libs/libxslt || ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[imagemagick,png] ) ) virtual/pkgconfig test? ( dev-util/cunit ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=|| ( dev-db/postgresql:9.4[server] dev-db/postgresql:9.3[server] dev-db/postgresql:9.2[server] dev-db/postgresql:9.1[server] dev-db/postgresql:9.0[server] ) <dev-libs/json-c-0.11 dev-libs/libxml2:2 >=sci-libs/geos-3.3.8 >=sci-libs/proj-4.6.0 >=sci-libs/gdal-1.10.0:= gtk? ( x11-libs/gtk+:2 ) doc? ( app-text/docbook-xsl-stylesheets app-text/docbook-xml-dtd:4.5 dev-libs/libxslt || ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[imagemagick,png] ) ) virtual/pkgconfig test? ( dev-util/cunit ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Geographic Objects for PostgreSQL
 EAPI=5
 HOMEPAGE=http://postgis.net
 IUSE=doc gtk test
 KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
-RDEPEND=|| ( dev-db/postgresql:9.4[server] dev-db/postgresql:9.3[server] dev-db/postgresql:9.2[server] dev-db/postgresql:9.1[server] dev-db/postgresql:9.0[server] ) <dev-libs/json-c-0.11 dev-libs/libxml2:2 >=sci-libs/geos-3.3.8 >=sci-libs/proj-4.6.0 >=sci-libs/gdal-1.10.0 gtk? ( x11-libs/gtk+:2 )
+RDEPEND=|| ( dev-db/postgresql:9.4[server] dev-db/postgresql:9.3[server] dev-db/postgresql:9.2[server] dev-db/postgresql:9.1[server] dev-db/postgresql:9.0[server] ) <dev-libs/json-c-0.11 dev-libs/libxml2:2 >=sci-libs/geos-3.3.8 >=sci-libs/proj-4.6.0 >=sci-libs/gdal-1.10.0:= gtk? ( x11-libs/gtk+:2 )
 REQUIRED_USE=test? ( doc )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://download.osgeo.org/postgis/source/postgis-2.1.1.tar.gz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	792f83d5ec9536cb5ccef375469d8bde	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=0b473cf29670d5b4144fb8d84da06d37
+_md5_=dd52e26898be0589b418db56e2fc19ed
--- a/metadata/md5-cache/dev-db/postgis-2.1.8
+++ b/metadata/md5-cache/dev-db/postgis-2.1.8
@ -1,15 +1,15 @@
 DEFINED_PHASES=compile config configure install postinst prepare setup
-DEPEND=|| ( dev-db/postgresql:9.4[server] dev-db/postgresql:9.3[server] dev-db/postgresql:9.2[server] dev-db/postgresql:9.1[server] dev-db/postgresql:9.0[server] ) dev-libs/json-c dev-libs/libxml2:2 >=sci-libs/geos-3.4.2 >=sci-libs/proj-4.6.0 >=sci-libs/gdal-1.10.0 gtk? ( x11-libs/gtk+:2 ) doc? ( app-text/docbook-xsl-stylesheets app-text/docbook-xml-dtd:4.5 dev-libs/libxslt || ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[imagemagick,png] ) ) virtual/pkgconfig test? ( dev-util/cunit ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=|| ( dev-db/postgresql:9.4[server] dev-db/postgresql:9.3[server] dev-db/postgresql:9.2[server] dev-db/postgresql:9.1[server] dev-db/postgresql:9.0[server] ) dev-libs/json-c dev-libs/libxml2:2 >=sci-libs/geos-3.4.2 >=sci-libs/proj-4.6.0 >=sci-libs/gdal-1.10.0:= gtk? ( x11-libs/gtk+:2 ) doc? ( app-text/docbook-xsl-stylesheets app-text/docbook-xml-dtd:4.5 dev-libs/libxslt || ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[imagemagick,png] ) ) virtual/pkgconfig test? ( dev-util/cunit ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Geographic Objects for PostgreSQL
 EAPI=5
 HOMEPAGE=http://postgis.net
 IUSE=doc gtk static-libs test
 KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
-RDEPEND=|| ( dev-db/postgresql:9.4[server] dev-db/postgresql:9.3[server] dev-db/postgresql:9.2[server] dev-db/postgresql:9.1[server] dev-db/postgresql:9.0[server] ) dev-libs/json-c dev-libs/libxml2:2 >=sci-libs/geos-3.4.2 >=sci-libs/proj-4.6.0 >=sci-libs/gdal-1.10.0 gtk? ( x11-libs/gtk+:2 )
+RDEPEND=|| ( dev-db/postgresql:9.4[server] dev-db/postgresql:9.3[server] dev-db/postgresql:9.2[server] dev-db/postgresql:9.1[server] dev-db/postgresql:9.0[server] ) dev-libs/json-c dev-libs/libxml2:2 >=sci-libs/geos-3.4.2 >=sci-libs/proj-4.6.0 >=sci-libs/gdal-1.10.0:= gtk? ( x11-libs/gtk+:2 )
 REQUIRED_USE=test? ( doc )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://download.osgeo.org/postgis/source/postgis-2.1.8.tar.gz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	792f83d5ec9536cb5ccef375469d8bde	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=d4b7fdc6c888e61bf1a4cb4f9d0159e1
+_md5_=2303dd789ff7640c3c7f3baad4393147
--- a/metadata/md5-cache/dev-db/postgis-2.2.0
+++ b/metadata/md5-cache/dev-db/postgis-2.2.0
@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst prepare pretend setup
-DEPEND=|| ( dev-db/postgresql:9.5[server] dev-db/postgresql:9.4[server] dev-db/postgresql:9.3[server] dev-db/postgresql:9.2[server] dev-db/postgresql:9.1[server] ) dev-libs/json-c dev-libs/libxml2:2 >=sci-libs/geos-3.5.0 >=sci-libs/proj-4.6.0 >=sci-libs/gdal-1.10.0 gtk? ( x11-libs/gtk+:2 ) doc? ( app-text/docbook-xsl-stylesheets app-text/docbook-xml-dtd:4.5 dev-libs/libxslt || ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[imagemagick,png] ) ) virtual/pkgconfig test? ( dev-util/cunit ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=|| ( dev-db/postgresql:9.5[server] dev-db/postgresql:9.4[server] dev-db/postgresql:9.3[server] dev-db/postgresql:9.2[server] dev-db/postgresql:9.1[server] ) dev-libs/json-c dev-libs/libxml2:2 >=sci-libs/geos-3.5.0 >=sci-libs/proj-4.6.0 >=sci-libs/gdal-1.10.0:= gtk? ( x11-libs/gtk+:2 ) doc? ( app-text/docbook-xsl-stylesheets app-text/docbook-xml-dtd:4.5 dev-libs/libxslt || ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[imagemagick,png] ) ) virtual/pkgconfig test? ( dev-util/cunit ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Geographic Objects for PostgreSQL
 EAPI=5
 HOMEPAGE=http://postgis.net
 IUSE=doc gtk static-libs test
 KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
-RDEPEND=|| ( dev-db/postgresql:9.5[server] dev-db/postgresql:9.4[server] dev-db/postgresql:9.3[server] dev-db/postgresql:9.2[server] dev-db/postgresql:9.1[server] ) dev-libs/json-c dev-libs/libxml2:2 >=sci-libs/geos-3.5.0 >=sci-libs/proj-4.6.0 >=sci-libs/gdal-1.10.0 gtk? ( x11-libs/gtk+:2 )
+RDEPEND=|| ( dev-db/postgresql:9.5[server] dev-db/postgresql:9.4[server] dev-db/postgresql:9.3[server] dev-db/postgresql:9.2[server] dev-db/postgresql:9.1[server] ) dev-libs/json-c dev-libs/libxml2:2 >=sci-libs/geos-3.5.0 >=sci-libs/proj-4.6.0 >=sci-libs/gdal-1.10.0:= gtk? ( x11-libs/gtk+:2 )
 REQUIRED_USE=test? ( doc )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://download.osgeo.org/postgis/source/postgis-2.2.0.tar.gz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	792f83d5ec9536cb5ccef375469d8bde	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=70ccd16d8fb8f8bd70b86aeedb4f0862
+_md5_=e3f06d66ffdfd1ff95046497b68f10f4
--- a/metadata/md5-cache/dev-db/postgis-2.2.1
+++ b/metadata/md5-cache/dev-db/postgis-2.2.1
@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst prepare pretend setup
-DEPEND=|| ( dev-db/postgresql:9.5[server] dev-db/postgresql:9.4[server] dev-db/postgresql:9.3[server] dev-db/postgresql:9.2[server] dev-db/postgresql:9.1[server] ) dev-libs/json-c dev-libs/libxml2:2 >=sci-libs/geos-3.5.0 >=sci-libs/proj-4.6.0 >=sci-libs/gdal-1.10.0 gtk? ( x11-libs/gtk+:2 ) doc? ( app-text/docbook-xsl-stylesheets app-text/docbook-xml-dtd:4.5 dev-libs/libxslt || ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[imagemagick,png] ) ) virtual/pkgconfig test? ( dev-util/cunit ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=|| ( dev-db/postgresql:9.5[server] dev-db/postgresql:9.4[server] dev-db/postgresql:9.3[server] dev-db/postgresql:9.2[server] dev-db/postgresql:9.1[server] ) dev-libs/json-c dev-libs/libxml2:2 >=sci-libs/geos-3.5.0 >=sci-libs/proj-4.6.0 >=sci-libs/gdal-1.10.0:= gtk? ( x11-libs/gtk+:2 ) doc? ( app-text/docbook-xsl-stylesheets app-text/docbook-xml-dtd:4.5 dev-libs/libxslt || ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[imagemagick,png] ) ) virtual/pkgconfig test? ( dev-util/cunit ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Geographic Objects for PostgreSQL
 EAPI=5
 HOMEPAGE=http://postgis.net
 IUSE=doc gtk static-libs test
 KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
-RDEPEND=|| ( dev-db/postgresql:9.5[server] dev-db/postgresql:9.4[server] dev-db/postgresql:9.3[server] dev-db/postgresql:9.2[server] dev-db/postgresql:9.1[server] ) dev-libs/json-c dev-libs/libxml2:2 >=sci-libs/geos-3.5.0 >=sci-libs/proj-4.6.0 >=sci-libs/gdal-1.10.0 gtk? ( x11-libs/gtk+:2 )
+RDEPEND=|| ( dev-db/postgresql:9.5[server] dev-db/postgresql:9.4[server] dev-db/postgresql:9.3[server] dev-db/postgresql:9.2[server] dev-db/postgresql:9.1[server] ) dev-libs/json-c dev-libs/libxml2:2 >=sci-libs/geos-3.5.0 >=sci-libs/proj-4.6.0 >=sci-libs/gdal-1.10.0:= gtk? ( x11-libs/gtk+:2 )
 REQUIRED_USE=test? ( doc )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://download.osgeo.org/postgis/source/postgis-2.2.1.tar.gz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	792f83d5ec9536cb5ccef375469d8bde	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=70ccd16d8fb8f8bd70b86aeedb4f0862
+_md5_=e3f06d66ffdfd1ff95046497b68f10f4
--- a/metadata/md5-cache/dev-db/postgis-2.2.2
+++ b/metadata/md5-cache/dev-db/postgis-2.2.2
@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst prepare pretend setup
-DEPEND=|| ( dev-db/postgresql:9.5[server] dev-db/postgresql:9.4[server] dev-db/postgresql:9.3[server] dev-db/postgresql:9.2[server] dev-db/postgresql:9.1[server] ) dev-libs/json-c dev-libs/libxml2:2 >=sci-libs/geos-3.5.0 >=sci-libs/proj-4.6.0 >=sci-libs/gdal-1.10.0 gtk? ( x11-libs/gtk+:2 ) doc? ( app-text/docbook-xsl-stylesheets app-text/docbook-xml-dtd:4.5 dev-libs/libxslt || ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[imagemagick,png] ) ) virtual/pkgconfig test? ( dev-util/cunit ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=|| ( dev-db/postgresql:9.5[server] dev-db/postgresql:9.4[server] dev-db/postgresql:9.3[server] dev-db/postgresql:9.2[server] dev-db/postgresql:9.1[server] ) dev-libs/json-c dev-libs/libxml2:2 >=sci-libs/geos-3.5.0 >=sci-libs/proj-4.6.0 >=sci-libs/gdal-1.10.0:= gtk? ( x11-libs/gtk+:2 ) doc? ( app-text/docbook-xsl-stylesheets app-text/docbook-xml-dtd:4.5 dev-libs/libxslt || ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[imagemagick,png] ) ) virtual/pkgconfig test? ( dev-util/cunit ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Geographic Objects for PostgreSQL
 EAPI=6
 HOMEPAGE=http://postgis.net
 IUSE=doc gtk static-libs test
 KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
-RDEPEND=|| ( dev-db/postgresql:9.5[server] dev-db/postgresql:9.4[server] dev-db/postgresql:9.3[server] dev-db/postgresql:9.2[server] dev-db/postgresql:9.1[server] ) dev-libs/json-c dev-libs/libxml2:2 >=sci-libs/geos-3.5.0 >=sci-libs/proj-4.6.0 >=sci-libs/gdal-1.10.0 gtk? ( x11-libs/gtk+:2 )
+RDEPEND=|| ( dev-db/postgresql:9.5[server] dev-db/postgresql:9.4[server] dev-db/postgresql:9.3[server] dev-db/postgresql:9.2[server] dev-db/postgresql:9.1[server] ) dev-libs/json-c dev-libs/libxml2:2 >=sci-libs/geos-3.5.0 >=sci-libs/proj-4.6.0 >=sci-libs/gdal-1.10.0:= gtk? ( x11-libs/gtk+:2 )
 REQUIRED_USE=test? ( doc )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://download.osgeo.org/postgis/source/postgis-2.2.2.tar.gz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	792f83d5ec9536cb5ccef375469d8bde	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=79eba5be0344910aa968d90b1a2c5bbc
+_md5_=66a297ac8a0c38762083108703d33a6b
--- a/metadata/md5-cache/dev-db/postgis-9999
+++ b/metadata/md5-cache/dev-db/postgis-9999
@ -1,13 +1,13 @@
 DEFINED_PHASES=compile config configure install postinst preinst prepare setup unpack
-DEPEND=|| ( dev-db/postgresql:9.5[server] dev-db/postgresql:9.4[server] dev-db/postgresql:9.3[server] dev-db/postgresql:9.2[server] dev-db/postgresql:9.1[server] dev-db/postgresql:9.0[server] ) dev-libs/json-c dev-libs/libxml2:2 >=sci-libs/geos-3.4.2 >=sci-libs/proj-4.6.0 >=sci-libs/gdal-1.10.0 gtk? ( x11-libs/gtk+:2 ) doc? ( app-text/docbook-xsl-stylesheets app-text/docbook-xml-dtd:4.5 dev-libs/libxslt || ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[imagemagick,png] ) ) virtual/pkgconfig test? ( dev-util/cunit ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 || ( dev-vcs/subversion[http] dev-vcs/subversion[webdav-neon] dev-vcs/subversion[webdav-serf] ) net-misc/rsync
+DEPEND=|| ( dev-db/postgresql:9.5[server] dev-db/postgresql:9.4[server] dev-db/postgresql:9.3[server] dev-db/postgresql:9.2[server] dev-db/postgresql:9.1[server] dev-db/postgresql:9.0[server] ) dev-libs/json-c dev-libs/libxml2:2 >=sci-libs/geos-3.4.2 >=sci-libs/proj-4.6.0 >=sci-libs/gdal-1.10.0:= gtk? ( x11-libs/gtk+:2 ) doc? ( app-text/docbook-xsl-stylesheets app-text/docbook-xml-dtd:4.5 dev-libs/libxslt || ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[imagemagick,png] ) ) virtual/pkgconfig test? ( dev-util/cunit ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 || ( dev-vcs/subversion[http] dev-vcs/subversion[webdav-neon] dev-vcs/subversion[webdav-serf] ) net-misc/rsync
 DESCRIPTION=Geographic Objects for PostgreSQL
 EAPI=6
 HOMEPAGE=http://postgis.net
 IUSE=doc gtk static-libs test
 LICENSE=GPL-2
-RDEPEND=|| ( dev-db/postgresql:9.5[server] dev-db/postgresql:9.4[server] dev-db/postgresql:9.3[server] dev-db/postgresql:9.2[server] dev-db/postgresql:9.1[server] dev-db/postgresql:9.0[server] ) dev-libs/json-c dev-libs/libxml2:2 >=sci-libs/geos-3.4.2 >=sci-libs/proj-4.6.0 >=sci-libs/gdal-1.10.0 gtk? ( x11-libs/gtk+:2 )
+RDEPEND=|| ( dev-db/postgresql:9.5[server] dev-db/postgresql:9.4[server] dev-db/postgresql:9.3[server] dev-db/postgresql:9.2[server] dev-db/postgresql:9.1[server] dev-db/postgresql:9.0[server] ) dev-libs/json-c dev-libs/libxml2:2 >=sci-libs/geos-3.4.2 >=sci-libs/proj-4.6.0 >=sci-libs/gdal-1.10.0:= gtk? ( x11-libs/gtk+:2 )
 REQUIRED_USE=test? ( doc )
 RESTRICT=test
 SLOT=0
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	792f83d5ec9536cb5ccef375469d8bde	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	subversion	4fee0a764150bb4dda27ed4d2c4ed7ce	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=d79659343aa6abe5ec0841f8869043ce
+_md5_=a16b47f68c88d6211d9bb85f49c50dcc
--- a/metadata/md5-cache/dev-haskell/hpc-0.5.1.1
+++ b/metadata/md5-cache/dev-haskell/hpc-0.5.1.1
@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-lang/ghc-6.10.1 >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
-DESCRIPTION=Code Coverage Library for Haskell
-EAPI=3
-HOMEPAGE=http://hackage.haskell.org/package/hpc
-IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-lang/ghc-6.10.1
-SLOT=0
-SRC_URI=mirror://hackage/packages/archive/hpc/0.5.1.1/hpc-0.5.1.1.tar.gz
-_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	ghc-package	0269d47e1819247f102e9f72ae185b52	haskell-cabal	b1a55b9f1cf94a3a9dcce663465ae7a6	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=54e3035b0e1bc1f237dc33cafb66b8e0
--- a/metadata/md5-cache/dev-haskell/hpc-0.6.0.0-r1
+++ b/metadata/md5-cache/dev-haskell/hpc-0.6.0.0-r1
@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-lang/ghc-6.12.1:= >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
-DESCRIPTION=Code Coverage Library for Haskell
-EAPI=5
-HOMEPAGE=http://hackage.haskell.org/package/hpc
-IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-lang/ghc-6.12.1:=
-SLOT=0/0.6.0.0
-SRC_URI=mirror://hackage/packages/archive/hpc/0.6.0.0/hpc-0.6.0.0.tar.gz
-_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	ghc-package	0269d47e1819247f102e9f72ae185b52	haskell-cabal	b1a55b9f1cf94a3a9dcce663465ae7a6	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=f903d1e3919752fec3a4691b91975524
--- a/metadata/md5-cache/dev-haskell/hpc-0.6.0.1
+++ b/metadata/md5-cache/dev-haskell/hpc-0.6.0.1
@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
-DESCRIPTION=Code Coverage Library for Haskell
-EAPI=5
-HOMEPAGE=http://hackage.haskell.org/package/hpc
-IUSE=doc hscolour profile
-KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=>=dev-lang/ghc-7.4.1:=
-SLOT=0/0.6.0.1
-SRC_URI=mirror://hackage/packages/archive/hpc/0.6.0.1/hpc-0.6.0.1.tar.gz
-_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	ghc-package	0269d47e1819247f102e9f72ae185b52	haskell-cabal	b1a55b9f1cf94a3a9dcce663465ae7a6	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=9f3fcb43fb98bdec0729ff76f4940757
--- a/metadata/md5-cache/dev-haskell/hpc-0.6.0.2
+++ b/metadata/md5-cache/dev-haskell/hpc-0.6.0.2
@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
-DESCRIPTION=Code Coverage Library for Haskell
-EAPI=5
-HOMEPAGE=http://hackage.haskell.org/package/hpc
-IUSE=doc hscolour profile
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=>=dev-lang/ghc-7.4.1:=
-SLOT=0/0.6.0.2
-SRC_URI=mirror://hackage/packages/archive/hpc/0.6.0.2/hpc-0.6.0.2.tar.gz
-_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	ghc-package	0269d47e1819247f102e9f72ae185b52	haskell-cabal	b1a55b9f1cf94a3a9dcce663465ae7a6	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=828ca35230fcd5b08e3ab96446b9979f
--- a/metadata/md5-cache/dev-haskell/pool-conduit-0.1.2.3
+++ b/metadata/md5-cache/dev-haskell/pool-conduit-0.1.2.3
@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=dev-haskell/monad-control:=[profile?] >=dev-haskell/resource-pool-0.2.1:=[profile?] <dev-haskell/resource-pool-0.3:=[profile?] >=dev-haskell/resourcet-0.3:=[profile?] <dev-haskell/resourcet-1.2:=[profile?] >=dev-haskell/transformers-0.2.1:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
-DESCRIPTION=Resource pool allocations via ResourceT. (deprecated)
-EAPI=5
-HOMEPAGE=http://www.yesodweb.com/book/persistent
-IUSE=doc hscolour profile
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-haskell/monad-control:=[profile?] >=dev-haskell/resource-pool-0.2.1:=[profile?] <dev-haskell/resource-pool-0.3:=[profile?] >=dev-haskell/resourcet-0.3:=[profile?] <dev-haskell/resourcet-1.2:=[profile?] >=dev-haskell/transformers-0.2.1:=[profile?] >=dev-lang/ghc-6.10.4:=
-SLOT=0/0.1.2.3
-SRC_URI=mirror://hackage/packages/archive/pool-conduit/0.1.2.3/pool-conduit-0.1.2.3.tar.gz
-_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	ghc-package	0269d47e1819247f102e9f72ae185b52	haskell-cabal	b1a55b9f1cf94a3a9dcce663465ae7a6	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=1c7a3bf3a98b86f339c8da9f7e1bff22
--- a/metadata/md5-cache/dev-haskell/tls-extra-0.6.6
+++ b/metadata/md5-cache/dev-haskell/tls-extra-0.6.6
@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/certificate-1.3.5:=[profile?] <dev-haskell/certificate-1.4.0:=[profile?] >=dev-haskell/cipher-aes-0.2:=[profile?] <dev-haskell/cipher-aes-0.3:=[profile?] dev-haskell/cipher-rc4:=[profile?] >=dev-haskell/crypto-pubkey-0.2.0:=[profile?] dev-haskell/crypto-random:=[profile?] >=dev-haskell/cryptohash-0.6:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/network-2.3:=[profile?] >=dev-haskell/pem-0.1:=[profile?] <dev-haskell/pem-0.3:=[profile?] >=dev-haskell/tls-1.1.0:=[profile?] <dev-haskell/tls-1.2.0:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-6.12.1:= >=dev-haskell/cabal-1.8.0.2 test? ( >=dev-haskell/cprng-aes-0.5.0:=[profile?] dev-haskell/hunit:=[profile?] >=dev-haskell/quickcheck-2:=[profile?] ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
-DESCRIPTION=TLS extra default values and helpers
-EAPI=5
-HOMEPAGE=https://github.com/vincenthz/hs-tls
-IUSE=test doc hscolour profile
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=>=dev-haskell/certificate-1.3.5:=[profile?] <dev-haskell/certificate-1.4.0:=[profile?] >=dev-haskell/cipher-aes-0.2:=[profile?] <dev-haskell/cipher-aes-0.3:=[profile?] dev-haskell/cipher-rc4:=[profile?] >=dev-haskell/crypto-pubkey-0.2.0:=[profile?] dev-haskell/crypto-random:=[profile?] >=dev-haskell/cryptohash-0.6:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/network-2.3:=[profile?] >=dev-haskell/pem-0.1:=[profile?] <dev-haskell/pem-0.3:=[profile?] >=dev-haskell/tls-1.1.0:=[profile?] <dev-haskell/tls-1.2.0:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-6.12.1:=
-RESTRICT=test
-SLOT=0/0.6.6
-SRC_URI=mirror://hackage/packages/archive/tls-extra/0.6.6/tls-extra-0.6.6.tar.gz
-_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	ghc-package	0269d47e1819247f102e9f72ae185b52	haskell-cabal	b1a55b9f1cf94a3a9dcce663465ae7a6	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=98dcc15c8e2821006b026a6bc9afee51
--- a/metadata/md5-cache/dev-haskell/tls-extra-0.6.6-r1
+++ b/metadata/md5-cache/dev-haskell/tls-extra-0.6.6-r1
@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/certificate-1.3.5:=[profile?] <dev-haskell/certificate-1.4.0:=[profile?] >=dev-haskell/cipher-aes-0.2:=[profile?] <dev-haskell/cipher-aes-0.3:=[profile?] dev-haskell/cipher-rc4:=[profile?] >=dev-haskell/crypto-pubkey-0.2.0:=[profile?] dev-haskell/crypto-random:=[profile?] >=dev-haskell/cryptohash-0.6:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/network-2.3:=[profile?] >=dev-haskell/pem-0.1:=[profile?] <dev-haskell/pem-0.3:=[profile?] >=dev-haskell/tls-1.1.0:=[profile?] <dev-haskell/tls-1.2.0:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-6.12.1:= >=dev-haskell/cabal-1.8.0.2 test? ( >=dev-haskell/cprng-aes-0.5.0:=[profile?] dev-haskell/hunit:=[profile?] >=dev-haskell/quickcheck-2:2=[profile?] ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
-DESCRIPTION=TLS extra default values and helpers
-EAPI=5
-HOMEPAGE=https://github.com/vincenthz/hs-tls
-IUSE=test doc hscolour profile
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-haskell/certificate-1.3.5:=[profile?] <dev-haskell/certificate-1.4.0:=[profile?] >=dev-haskell/cipher-aes-0.2:=[profile?] <dev-haskell/cipher-aes-0.3:=[profile?] dev-haskell/cipher-rc4:=[profile?] >=dev-haskell/crypto-pubkey-0.2.0:=[profile?] dev-haskell/crypto-random:=[profile?] >=dev-haskell/cryptohash-0.6:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/network-2.3:=[profile?] >=dev-haskell/pem-0.1:=[profile?] <dev-haskell/pem-0.3:=[profile?] >=dev-haskell/tls-1.1.0:=[profile?] <dev-haskell/tls-1.2.0:=[profile?] dev-haskell/vector:=[profile?] >=dev-lang/ghc-6.12.1:=
-SLOT=0/0.6.6
-SRC_URI=mirror://hackage/packages/archive/tls-extra/0.6.6/tls-extra-0.6.6.tar.gz
-_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	ghc-package	0269d47e1819247f102e9f72ae185b52	haskell-cabal	b1a55b9f1cf94a3a9dcce663465ae7a6	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=e6917ed50ae83e408698a55a59f199f8
--- a/metadata/md5-cache/dev-java/btf-1.2
+++ b/metadata/md5-cache/dev-java/btf-1.2
@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install preinst prepare setup
+DEPEND=dev-java/jsr305:0 >=virtual/jdk-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Generic interfaces to the classical builder pattern
+EAPI=5
+HOMEPAGE=https://github.com/fge/btf/
+IUSE=elibc_FreeBSD doc source elibc_FreeBSD
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( LGPL-3 Apache-2.0 )
+RDEPEND=dev-java/jsr305:0 >=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=0
+SRC_URI=https://github.com/fge/btf/archive/1.2.tar.gz -> btf-1.2.tar.gz
+_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	java-pkg-2	b02dc1e46b3648e467b5fbdf7857cf28	java-pkg-simple	bdf24e52707f01512ffea6d3aa05425b	java-utils-2	9a25f292ff66f8c2c00100ac0b15c54f	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=bbaed607c649d204bc190f7059082697
--- a/metadata/md5-cache/dev-libs/libsodium-1.0.10
+++ b/metadata/md5-cache/dev-libs/libsodium-1.0.10
@ -1,11 +1,12 @@
-DEFINED_PHASES=configure install
+DEFINED_PHASES=configure install prepare
+DEPEND=!<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=A portable fork of NaCl, a higher-level cryptographic library
-EAPI=5
+EAPI=6
 HOMEPAGE=https://github.com/jedisct1/libsodium
-IUSE=+asm minimal static-libs +urandom
+IUSE=+asm minimal static-libs +urandom cpu_flags_x86_sse4_1 cpu_flags_x86_aes
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=ISC
 SLOT=0/18
 SRC_URI=http://download.libsodium.org/libsodium/releases/libsodium-1.0.10.tar.gz
-_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=7c37507a340ae5c0c42ae985ece62173
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	792f83d5ec9536cb5ccef375469d8bde	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
+_md5_=d5b2571b7c5711b49a3c50f75bfa1122
--- a/metadata/md5-cache/dev-python/cython-0.24
+++ b/metadata/md5-cache/dev-python/cython-0.24
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=emacs? ( virtual/emacs ) >=dev-python/setuptools-9.1[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) test? ( dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DESCRIPTION=A Python to C compiler
+EAPI=6
+HOMEPAGE=http://cython.org https://pypi.python.org/pypi/Cython
+IUSE=doc examples emacs test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=emacs? ( virtual/emacs ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=mirror://pypi/C/Cython/Cython-0.24.tar.gz
+_eclasses_=distutils-r1	3a17743abcc9335483329f33c87b472d	elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
+_md5_=ab157c05e327bd32d412f08a3cfb38d3
--- a/metadata/md5-cache/dev-python/kafka-python-1.2.0
+++ b/metadata/md5-cache/dev-python/kafka-python-1.2.0
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=snappy? ( dev-python/snappy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/tox[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/unittest2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Kafka protocol support in Python
+EAPI=6
+HOMEPAGE=https://github.com/dpkp/kafka-python/ https://pypi.python.org/pypi/kafka-python/
+IUSE=snappy test python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=snappy? ( dev-python/snappy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/dpkp/kafka-python/archive/1.2.0.tar.gz -> kafka-python-1.2.0.tar.gz
+_eclasses_=distutils-r1	3a17743abcc9335483329f33c87b472d	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
+_md5_=dbf54ee07653346908d6f182d07ec650
--- a/metadata/md5-cache/dev-python/kafka-python-1.2.1
+++ b/metadata/md5-cache/dev-python/kafka-python-1.2.1
@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=snappy? ( dev-python/snappy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/tox[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/unittest2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Kafka protocol support in Python
+EAPI=6
+HOMEPAGE=https://github.com/dpkp/kafka-python/ https://pypi.python.org/pypi/kafka-python/
+IUSE=snappy test python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=snappy? ( dev-python/snappy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/dpkp/kafka-python/archive/1.2.1.tar.gz -> kafka-python-1.2.1.tar.gz
+_eclasses_=distutils-r1	3a17743abcc9335483329f33c87b472d	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
+_md5_=dbf54ee07653346908d6f182d07ec650
--- a/metadata/md5-cache/dev-vcs/darcs-2.12.0
+++ b/metadata/md5-cache/dev-vcs/darcs-2.12.0
@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/async-2.0.1.4:=[profile?] <dev-haskell/async-2.2:=[profile?] >=dev-haskell/attoparsec-0.11:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] >=dev-haskell/base16-bytestring-0.1:=[profile?] <dev-haskell/base16-bytestring-0.2:=[profile?] >=dev-haskell/binary-0.5:=[profile?] <dev-haskell/binary-0.9:=[profile?] >=dev-haskell/cryptohash-0.4:=[profile?] <dev-haskell/cryptohash-0.12:=[profile?] >=dev-haskell/data-ordlist-0.4:=[profile?] <dev-haskell/data-ordlist-0.5:=[profile?] >=dev-haskell/fgl-5.5.0.1:=[profile?] <dev-haskell/fgl-5.6:=[profile?] >=dev-haskell/graphviz-2999.17.0.1:=[profile?] <dev-haskell/graphviz-2999.19:=[profile?] >=dev-haskell/hashable-1.1.2.5:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/haskeline-0.6.3:=[profile?] <dev-haskell/haskeline-0.8:=[profile?] >=dev-haskell/html-1.0.1.2:=[profile?] <dev-haskell/html-1.1:=[profile?] >=dev-haskell/http-4000.2.8:=[profile?] <dev-haskell/http-4000.4:=[profile?] >=dev-haskell/mmap-0.5:=[profile?] <dev-haskell/mmap-0.6:=[profile?] >=dev-haskell/mtl-2.1.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/old-locale-1.0.0.5:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] >=dev-haskell/old-time-1.1:=[profile?] <dev-haskell/old-time-1.2:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/random-1.0.1.1:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-haskell/regex-applicative-0.2:=[profile?] <dev-haskell/regex-applicative-0.4:=[profile?] >=dev-haskell/regex-compat-tdfa-0.95.1:=[profile?] <dev-haskell/regex-compat-tdfa-0.96:=[profile?] >=dev-haskell/sandi-0.2:=[profile?] <dev-haskell/sandi-0.4:=[profile?] >=dev-haskell/tar-0.4:=[profile?] <dev-haskell/tar-0.6:=[profile?] >=dev-haskell/text-1.2.1.3:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-0.6:=[profile?] >=dev-haskell/unix-compat-0.1.2:=[profile?] <dev-haskell/unix-compat-0.5:=[profile?] >=dev-haskell/utf8-string-0.3.6:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-haskell/vector-0.10.0.1:=[profile?] <dev-haskell/vector-0.12:=[profile?] >=dev-haskell/zip-archive-0.2.3:=[profile?] <dev-haskell/zip-archive-0.4:=[profile?] >=dev-haskell/zlib-0.5.4.1:=[profile?] <dev-haskell/zlib-0.7.0.0:=[profile?] >=dev-lang/ghc-7.6.2:= || ( ( >=dev-haskell/transformers-0.3:=[profile?] <dev-haskell/transformers-0.4.0.0:=[profile?] ) ( >dev-haskell/transformers-0.4.0.0:=[profile?] <dev-haskell/transformers-0.6:=[profile?] ) ) curl? ( net-misc/curl ) network-uri? ( >=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-2.7:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] ) !network-uri? ( >=dev-haskell/network-2.4.1.2:=[profile?] <dev-haskell/network-2.6:=[profile?] ) terminfo? ( >=dev-haskell/terminfo-0.3:=[profile?] <dev-haskell/terminfo-0.5:=[profile?] ) >=dev-haskell/cabal-1.16.0 test? ( >=dev-haskell/cmdargs-0.10 <dev-haskell/cmdargs-0.11 >=dev-haskell/findbin-0.0 <dev-haskell/findbin-0.1 >=dev-haskell/hunit-1.2.5.2 <dev-haskell/hunit-1.4 >=dev-haskell/quickcheck-2.6 <dev-haskell/quickcheck-2.9 >=dev-haskell/shelly-1.6.2 <dev-haskell/shelly-1.7 >=dev-haskell/split-0.2.2 <dev-haskell/split-0.3 >=dev-haskell/test-framework-0.4.0 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.2.2 <dev-haskell/test-framework-hunit-0.4 >=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 ) curl? ( virtual/pkgconfig ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+DEPEND=>=dev-haskell/async-2.0.1.4:=[profile?] <dev-haskell/async-2.2:=[profile?] >=dev-haskell/attoparsec-0.11:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] >=dev-haskell/base16-bytestring-0.1:=[profile?] <dev-haskell/base16-bytestring-0.2:=[profile?] >=dev-haskell/binary-0.5:=[profile?] <dev-haskell/binary-0.9:=[profile?] >=dev-haskell/cryptohash-0.4:=[profile?] <dev-haskell/cryptohash-0.12:=[profile?] >=dev-haskell/data-ordlist-0.4:=[profile?] <dev-haskell/data-ordlist-0.5:=[profile?] >=dev-haskell/fgl-5.5.0.1:=[profile?] <dev-haskell/fgl-5.6:=[profile?] >=dev-haskell/graphviz-2999.17.0.1:=[profile?] <dev-haskell/graphviz-2999.19:=[profile?] >=dev-haskell/hashable-1.1.2.5:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/haskeline-0.6.3:=[profile?] <dev-haskell/haskeline-0.8:=[profile?] >=dev-haskell/html-1.0.1.2:=[profile?] <dev-haskell/html-1.1:=[profile?] >=dev-haskell/http-4000.2.8:=[profile?] <dev-haskell/http-4000.4:=[profile?] >=dev-haskell/mmap-0.5:=[profile?] <dev-haskell/mmap-0.6:=[profile?] >=dev-haskell/mtl-2.1.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/old-locale-1.0.0.5:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] >=dev-haskell/old-time-1.1:=[profile?] <dev-haskell/old-time-1.2:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/random-1.0.1.1:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-haskell/regex-applicative-0.2:=[profile?] <dev-haskell/regex-applicative-0.4:=[profile?] >=dev-haskell/regex-compat-tdfa-0.95.1:=[profile?] <dev-haskell/regex-compat-tdfa-0.96:=[profile?] >=dev-haskell/sandi-0.2:=[profile?] <dev-haskell/sandi-0.4:=[profile?] >=dev-haskell/tar-0.4:=[profile?] <dev-haskell/tar-0.6:=[profile?] >=dev-haskell/text-1.2.1.3:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-0.6:=[profile?] >=dev-haskell/unix-compat-0.1.2:=[profile?] <dev-haskell/unix-compat-0.5:=[profile?] >=dev-haskell/utf8-string-0.3.6:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-haskell/vector-0.10.0.1:=[profile?] <dev-haskell/vector-0.12:=[profile?] >=dev-haskell/zip-archive-0.2.3:=[profile?] <dev-haskell/zip-archive-0.4:=[profile?] >=dev-haskell/zlib-0.5.4.1:=[profile?] <dev-haskell/zlib-0.7.0.0:=[profile?] >=dev-lang/ghc-7.6.2:= >=dev-haskell/transformers-0.3:=[profile?] <dev-haskell/transformers-0.6:=[profile?] curl? ( net-misc/curl ) network-uri? ( >=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-2.7:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] ) !network-uri? ( >=dev-haskell/network-2.4.1.2:=[profile?] <dev-haskell/network-2.6:=[profile?] ) terminfo? ( >=dev-haskell/terminfo-0.3:=[profile?] <dev-haskell/terminfo-0.5:=[profile?] ) >=dev-haskell/cabal-1.16.0 test? ( >=dev-haskell/cmdargs-0.10 <dev-haskell/cmdargs-0.11 >=dev-haskell/findbin-0.0 <dev-haskell/findbin-0.1 >=dev-haskell/hunit-1.2.5.2 <dev-haskell/hunit-1.4 >=dev-haskell/quickcheck-2.6 <dev-haskell/quickcheck-2.9 >=dev-haskell/shelly-1.6.2 <dev-haskell/shelly-1.7 >=dev-haskell/split-0.2.2 <dev-haskell/split-0.3 >=dev-haskell/test-framework-0.4.0 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.2.2 <dev-haskell/test-framework-hunit-0.4 >=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 ) curl? ( virtual/pkgconfig ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
 DESCRIPTION=a distributed, interactive, smart revision control system
 EAPI=6
 HOMEPAGE=http://darcs.net/
 IUSE=+curl +network-uri +terminfo +threaded doc hscolour profile test
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=>=dev-haskell/async-2.0.1.4:=[profile?] <dev-haskell/async-2.2:=[profile?] >=dev-haskell/attoparsec-0.11:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] >=dev-haskell/base16-bytestring-0.1:=[profile?] <dev-haskell/base16-bytestring-0.2:=[profile?] >=dev-haskell/binary-0.5:=[profile?] <dev-haskell/binary-0.9:=[profile?] >=dev-haskell/cryptohash-0.4:=[profile?] <dev-haskell/cryptohash-0.12:=[profile?] >=dev-haskell/data-ordlist-0.4:=[profile?] <dev-haskell/data-ordlist-0.5:=[profile?] >=dev-haskell/fgl-5.5.0.1:=[profile?] <dev-haskell/fgl-5.6:=[profile?] >=dev-haskell/graphviz-2999.17.0.1:=[profile?] <dev-haskell/graphviz-2999.19:=[profile?] >=dev-haskell/hashable-1.1.2.5:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/haskeline-0.6.3:=[profile?] <dev-haskell/haskeline-0.8:=[profile?] >=dev-haskell/html-1.0.1.2:=[profile?] <dev-haskell/html-1.1:=[profile?] >=dev-haskell/http-4000.2.8:=[profile?] <dev-haskell/http-4000.4:=[profile?] >=dev-haskell/mmap-0.5:=[profile?] <dev-haskell/mmap-0.6:=[profile?] >=dev-haskell/mtl-2.1.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/old-locale-1.0.0.5:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] >=dev-haskell/old-time-1.1:=[profile?] <dev-haskell/old-time-1.2:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/random-1.0.1.1:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-haskell/regex-applicative-0.2:=[profile?] <dev-haskell/regex-applicative-0.4:=[profile?] >=dev-haskell/regex-compat-tdfa-0.95.1:=[profile?] <dev-haskell/regex-compat-tdfa-0.96:=[profile?] >=dev-haskell/sandi-0.2:=[profile?] <dev-haskell/sandi-0.4:=[profile?] >=dev-haskell/tar-0.4:=[profile?] <dev-haskell/tar-0.6:=[profile?] >=dev-haskell/text-1.2.1.3:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-0.6:=[profile?] >=dev-haskell/unix-compat-0.1.2:=[profile?] <dev-haskell/unix-compat-0.5:=[profile?] >=dev-haskell/utf8-string-0.3.6:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-haskell/vector-0.10.0.1:=[profile?] <dev-haskell/vector-0.12:=[profile?] >=dev-haskell/zip-archive-0.2.3:=[profile?] <dev-haskell/zip-archive-0.4:=[profile?] >=dev-haskell/zlib-0.5.4.1:=[profile?] <dev-haskell/zlib-0.7.0.0:=[profile?] >=dev-lang/ghc-7.6.2:= || ( ( >=dev-haskell/transformers-0.3:=[profile?] <dev-haskell/transformers-0.4.0.0:=[profile?] ) ( >dev-haskell/transformers-0.4.0.0:=[profile?] <dev-haskell/transformers-0.6:=[profile?] ) ) curl? ( net-misc/curl ) network-uri? ( >=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-2.7:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] ) !network-uri? ( >=dev-haskell/network-2.4.1.2:=[profile?] <dev-haskell/network-2.6:=[profile?] ) terminfo? ( >=dev-haskell/terminfo-0.3:=[profile?] <dev-haskell/terminfo-0.5:=[profile?] )
+RDEPEND=>=dev-haskell/async-2.0.1.4:=[profile?] <dev-haskell/async-2.2:=[profile?] >=dev-haskell/attoparsec-0.11:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?] >=dev-haskell/base16-bytestring-0.1:=[profile?] <dev-haskell/base16-bytestring-0.2:=[profile?] >=dev-haskell/binary-0.5:=[profile?] <dev-haskell/binary-0.9:=[profile?] >=dev-haskell/cryptohash-0.4:=[profile?] <dev-haskell/cryptohash-0.12:=[profile?] >=dev-haskell/data-ordlist-0.4:=[profile?] <dev-haskell/data-ordlist-0.5:=[profile?] >=dev-haskell/fgl-5.5.0.1:=[profile?] <dev-haskell/fgl-5.6:=[profile?] >=dev-haskell/graphviz-2999.17.0.1:=[profile?] <dev-haskell/graphviz-2999.19:=[profile?] >=dev-haskell/hashable-1.1.2.5:=[profile?] <dev-haskell/hashable-1.3:=[profile?] >=dev-haskell/haskeline-0.6.3:=[profile?] <dev-haskell/haskeline-0.8:=[profile?] >=dev-haskell/html-1.0.1.2:=[profile?] <dev-haskell/html-1.1:=[profile?] >=dev-haskell/http-4000.2.8:=[profile?] <dev-haskell/http-4000.4:=[profile?] >=dev-haskell/mmap-0.5:=[profile?] <dev-haskell/mmap-0.6:=[profile?] >=dev-haskell/mtl-2.1.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/old-locale-1.0.0.5:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] >=dev-haskell/old-time-1.1:=[profile?] <dev-haskell/old-time-1.2:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/random-1.0.1.1:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-haskell/regex-applicative-0.2:=[profile?] <dev-haskell/regex-applicative-0.4:=[profile?] >=dev-haskell/regex-compat-tdfa-0.95.1:=[profile?] <dev-haskell/regex-compat-tdfa-0.96:=[profile?] >=dev-haskell/sandi-0.2:=[profile?] <dev-haskell/sandi-0.4:=[profile?] >=dev-haskell/tar-0.4:=[profile?] <dev-haskell/tar-0.6:=[profile?] >=dev-haskell/text-1.2.1.3:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/transformers-compat-0.4:=[profile?] <dev-haskell/transformers-compat-0.6:=[profile?] >=dev-haskell/unix-compat-0.1.2:=[profile?] <dev-haskell/unix-compat-0.5:=[profile?] >=dev-haskell/utf8-string-0.3.6:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?] >=dev-haskell/vector-0.10.0.1:=[profile?] <dev-haskell/vector-0.12:=[profile?] >=dev-haskell/zip-archive-0.2.3:=[profile?] <dev-haskell/zip-archive-0.4:=[profile?] >=dev-haskell/zlib-0.5.4.1:=[profile?] <dev-haskell/zlib-0.7.0.0:=[profile?] >=dev-lang/ghc-7.6.2:= >=dev-haskell/transformers-0.3:=[profile?] <dev-haskell/transformers-0.6:=[profile?] curl? ( net-misc/curl ) network-uri? ( >=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-2.7:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] ) !network-uri? ( >=dev-haskell/network-2.4.1.2:=[profile?] <dev-haskell/network-2.6:=[profile?] ) terminfo? ( >=dev-haskell/terminfo-0.3:=[profile?] <dev-haskell/terminfo-0.5:=[profile?] )
 RESTRICT=test
 SLOT=0/2.12.0
 SRC_URI=mirror://hackage/packages/archive/darcs/2.12.0/darcs-2.12.0.tar.gz
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	ghc-package	0269d47e1819247f102e9f72ae185b52	haskell-cabal	b1a55b9f1cf94a3a9dcce663465ae7a6	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=7a3047ca8bcd078f56d35745c3de6902
+_md5_=332efe38965a5b3ba644a2b3cc6e78e9
--- a/metadata/md5-cache/media-libs/libv4l-1.10.1
+++ b/metadata/md5-cache/media-libs/libv4l-1.10.1
@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=jpeg? ( >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !media-tv/v4l2-ctl !<media-tv/ivtv-utils-1.4.0-r2 sys-devel/gettext virtual/os-headers virtual/pkgconfig
+DESCRIPTION=Separate libraries ebuild from upstream v4l-utils package
+EAPI=6
+HOMEPAGE=https://git.linuxtv.org/v4l-utils.git
+IUSE=jpeg abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=LGPL-2.1+
+RDEPEND=jpeg? ( >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !media-tv/v4l2-ctl !<media-tv/ivtv-utils-1.4.0-r2
+SLOT=0/0
+SRC_URI=https://linuxtv.org/downloads/v4l-utils/v4l-utils-1.10.1.tar.bz2
+_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=fc7f8cbcbfc761a98cdf24978a970eb0
--- a/metadata/md5-cache/sci-electronics/gazebo-7.2.0
+++ b/metadata/md5-cache/sci-electronics/gazebo-7.2.0
@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND==dev-libs/protobuf-2*:= virtual/opengl media-libs/openal net-misc/curl dev-libs/tinyxml dev-libs/tinyxml2 dev-libs/libtar dev-cpp/tbb >=dev-games/ogre-1.7.4 sci-libs/libccd libav? ( >=media-video/libav-9:0= ) !libav? ( >=media-video/ffmpeg-2.6:0= ) sci-libs/gts >=sci-physics/bullet-2.82 >=dev-libs/sdformat-4.1:= dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtwebkit:4 dev-qt/qtxmlpatterns:4 dev-libs/boost:=[threads] sci-libs/gdal virtual/libusb:1 dev-libs/libspnav media-libs/freeimage sci-libs/hdf5:= sys-apps/util-linux media-gfx/graphviz >=sci-libs/ignition-math-2.3:2= net-libs/ignition-transport:= dev-qt/qttest:4 app-text/ronn virtual/pkgconfig x11-apps/mesa-progs test? ( dev-libs/libxslt ) sys-devel/make >=dev-util/cmake-2.8.12
+DESCRIPTION=A 3D multiple robot simulator with dynamics
+EAPI=5
+HOMEPAGE=http://gazebosim.org/
+IUSE=cpu_flags_x86_sse2 libav test
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND==dev-libs/protobuf-2*:= virtual/opengl media-libs/openal net-misc/curl dev-libs/tinyxml dev-libs/tinyxml2 dev-libs/libtar dev-cpp/tbb >=dev-games/ogre-1.7.4 sci-libs/libccd libav? ( >=media-video/libav-9:0= ) !libav? ( >=media-video/ffmpeg-2.6:0= ) sci-libs/gts >=sci-physics/bullet-2.82 >=dev-libs/sdformat-4.1:= dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtwebkit:4 dev-qt/qtxmlpatterns:4 dev-libs/boost:=[threads] sci-libs/gdal virtual/libusb:1 dev-libs/libspnav media-libs/freeimage sci-libs/hdf5:= sys-apps/util-linux media-gfx/graphviz >=sci-libs/ignition-math-2.3:2= net-libs/ignition-transport:=
+SLOT=0
+SRC_URI=http://osrf-distributions.s3.amazonaws.com/gazebo/releases/gazebo-7.2.0.tar.bz2
+_eclasses_=cmake-utils	ac5bd012586c6cf0d9826400d9de2830	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	vcs-snapshot	b45be87e7012be0af8424e8a5644da1d	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=b2a83f6756fcd3404d0e2340fcf588c1
--- a/metadata/md5-cache/sci-libs/gdal-2.0.0
+++ b/metadata/md5-cache/sci-libs/gdal-2.0.0
@ -8,7 +8,7 @@ KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-ma
 LICENSE=MIT
 RDEPEND=dev-libs/expat dev-libs/json-c dev-libs/libpcre dev-libs/libxml2 media-libs/tiff:0= sci-libs/libgeotiff sys-libs/zlib[minizip(+)] armadillo? ( sci-libs/armadillo[lapack] ) curl? ( net-misc/curl ) fits? ( sci-libs/cfitsio ) geos? ( >=sci-libs/geos-2.2.1 ) gif? ( media-libs/giflib ) gml? ( >=dev-libs/xerces-c-3 ) hdf5? ( >=sci-libs/hdf5-1.6.4[szip] ) java? ( >=virtual/jre-1.6:* ) jpeg? ( virtual/jpeg:0= ) jpeg2k? ( media-libs/jasper ) mysql? ( virtual/mysql ) netcdf? ( sci-libs/netcdf ) odbc? ( dev-db/unixODBC ) ogdi? ( sci-libs/ogdi ) opencl? ( virtual/opencl ) pdf? ( >=app-text/poppler-0.24.3:= ) perl? ( dev-lang/perl:= ) png? ( media-libs/libpng:0= ) postgres? ( >=dev-db/postgresql-8.4:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) ruby? ( dev-lang/ruby:1.9 ) sqlite? ( dev-db/sqlite:3 ) spatialite? ( dev-db/spatialite ) xls? ( dev-libs/freexl ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=spatialite? ( sqlite ) mdb? ( java )
-SLOT=0
+SLOT=0/2
 SRC_URI=http://download.osgeo.org/gdal/2.0.0/gdal-2.0.0.tar.gz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	distutils-r1	3a17743abcc9335483329f33c87b472d	eutils	792f83d5ec9536cb5ccef375469d8bde	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	9a25f292ff66f8c2c00100ac0b15c54f	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	c584f9e0fe426f3dcc2c46c6f7cb95ce	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	unpacker	45d07319df5f40ee6af58418b0f930be	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=ee467ec58e8eb54f1bba904bf21ef7b2
+_md5_=ec4aebcde289317f3fad9d8b670130d5
--- a/metadata/md5-cache/sci-libs/gdal-2.0.0-r1
+++ b/metadata/md5-cache/sci-libs/gdal-2.0.0-r1
@ -8,7 +8,7 @@ KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-ma
 LICENSE=MIT
 RDEPEND=dev-libs/expat dev-libs/json-c dev-libs/libpcre dev-libs/libxml2 media-libs/tiff:0= sci-libs/libgeotiff sys-libs/zlib[minizip(+)] armadillo? ( sci-libs/armadillo[lapack] ) curl? ( net-misc/curl ) fits? ( sci-libs/cfitsio ) geos? ( >=sci-libs/geos-2.2.1 ) gif? ( media-libs/giflib ) gml? ( >=dev-libs/xerces-c-3 ) hdf5? ( >=sci-libs/hdf5-1.6.4[szip] ) java? ( >=virtual/jre-1.6:* ) jpeg? ( virtual/jpeg:0= ) jpeg2k? ( media-libs/jasper ) mysql? ( virtual/mysql ) netcdf? ( sci-libs/netcdf ) odbc? ( dev-db/unixODBC ) ogdi? ( sci-libs/ogdi ) opencl? ( virtual/opencl ) pdf? ( >=app-text/poppler-0.24.3:= ) perl? ( dev-lang/perl:= ) png? ( media-libs/libpng:0= ) postgres? ( >=dev-db/postgresql-8.4:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) sqlite? ( dev-db/sqlite:3 ) spatialite? ( dev-db/spatialite ) xls? ( dev-libs/freexl ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=spatialite? ( sqlite ) mdb? ( java )
-SLOT=0
+SLOT=0/2
 SRC_URI=http://download.osgeo.org/gdal/2.0.0/gdal-2.0.0.tar.gz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	distutils-r1	3a17743abcc9335483329f33c87b472d	eutils	792f83d5ec9536cb5ccef375469d8bde	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	9a25f292ff66f8c2c00100ac0b15c54f	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	c584f9e0fe426f3dcc2c46c6f7cb95ce	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	unpacker	45d07319df5f40ee6af58418b0f930be	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=70e62c27ca4897bef450fd01fda013cf
+_md5_=62bb6f4cfc93f9b61072aea3b24a562f
--- a/metadata/md5-cache/sci-libs/gdal-2.0.1
+++ b/metadata/md5-cache/sci-libs/gdal-2.0.1
@ -8,7 +8,7 @@ KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-ma
 LICENSE=MIT
 RDEPEND=dev-libs/expat dev-libs/json-c dev-libs/libpcre dev-libs/libxml2 media-libs/tiff:0= sci-libs/libgeotiff sys-libs/zlib[minizip(+)] armadillo? ( sci-libs/armadillo[lapack] ) curl? ( net-misc/curl ) fits? ( sci-libs/cfitsio ) geos? ( >=sci-libs/geos-2.2.1 ) gif? ( media-libs/giflib:= ) gml? ( >=dev-libs/xerces-c-3 ) hdf5? ( >=sci-libs/hdf5-1.6.4[szip] ) java? ( >=virtual/jre-1.6:* ) jpeg? ( virtual/jpeg:0= ) jpeg2k? ( media-libs/jasper ) mysql? ( virtual/mysql ) netcdf? ( sci-libs/netcdf ) odbc? ( dev-db/unixODBC ) ogdi? ( sci-libs/ogdi ) opencl? ( virtual/opencl ) pdf? ( >=app-text/poppler-0.24.3:= ) perl? ( dev-lang/perl:= ) png? ( media-libs/libpng:0= ) postgres? ( >=dev-db/postgresql-8.4:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) sqlite? ( dev-db/sqlite:3 ) spatialite? ( dev-db/spatialite ) xls? ( dev-libs/freexl ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=spatialite? ( sqlite ) mdb? ( java )
-SLOT=0
+SLOT=0/2
 SRC_URI=http://download.osgeo.org/gdal/2.0.1/gdal-2.0.1.tar.gz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	distutils-r1	3a17743abcc9335483329f33c87b472d	eutils	792f83d5ec9536cb5ccef375469d8bde	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	9a25f292ff66f8c2c00100ac0b15c54f	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	c584f9e0fe426f3dcc2c46c6f7cb95ce	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	unpacker	45d07319df5f40ee6af58418b0f930be	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=1abb975a6f205acd3fb7a97d48c6c669
+_md5_=16474d9ac614c3138cbff9da84eaa3b2
--- a/metadata/md5-cache/sci-libs/gdal-2.0.2
+++ b/metadata/md5-cache/sci-libs/gdal-2.0.2
@ -8,7 +8,7 @@ KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-ma
 LICENSE=MIT
 RDEPEND=dev-libs/expat dev-libs/json-c dev-libs/libpcre dev-libs/libxml2 media-libs/tiff:0= sci-libs/libgeotiff sys-libs/zlib[minizip(+)] armadillo? ( sci-libs/armadillo[lapack] ) curl? ( net-misc/curl ) fits? ( sci-libs/cfitsio ) geos? ( >=sci-libs/geos-2.2.1 ) gif? ( media-libs/giflib:= ) gml? ( >=dev-libs/xerces-c-3 ) hdf5? ( >=sci-libs/hdf5-1.6.4[szip] ) java? ( >=virtual/jre-1.6:* ) jpeg? ( virtual/jpeg:0= ) jpeg2k? ( media-libs/jasper ) mysql? ( virtual/mysql ) netcdf? ( sci-libs/netcdf ) odbc? ( dev-db/unixODBC ) ogdi? ( sci-libs/ogdi ) opencl? ( virtual/opencl ) pdf? ( >=app-text/poppler-0.24.3:= ) perl? ( dev-lang/perl:= ) png? ( media-libs/libpng:0= ) postgres? ( >=dev-db/postgresql-8.4:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) sqlite? ( dev-db/sqlite:3 ) spatialite? ( dev-db/spatialite ) xls? ( dev-libs/freexl ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=spatialite? ( sqlite ) mdb? ( java )
-SLOT=0
+SLOT=0/2
 SRC_URI=http://download.osgeo.org/gdal/2.0.2/gdal-2.0.2.tar.gz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	distutils-r1	3a17743abcc9335483329f33c87b472d	eutils	792f83d5ec9536cb5ccef375469d8bde	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	9a25f292ff66f8c2c00100ac0b15c54f	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	c584f9e0fe426f3dcc2c46c6f7cb95ce	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	unpacker	45d07319df5f40ee6af58418b0f930be	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=1abb975a6f205acd3fb7a97d48c6c669
+_md5_=16474d9ac614c3138cbff9da84eaa3b2
--- a/metadata/md5-cache/sci-libs/opencascade-6.9.1
+++ b/metadata/md5-cache/sci-libs/opencascade-6.9.1
@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst preinst prepare pretend setup
+DEPEND=app-eselect/eselect-opencascade dev-lang/tcl:0= dev-lang/tk:0= dev-tcltk/itcl dev-tcltk/itk dev-tcltk/tix media-libs/ftgl virtual/glu virtual/opengl x11-libs/libXmu freeimage? ( media-libs/freeimage ) gl2ps? ( x11-libs/gl2ps ) java? ( >=virtual/jdk-0:= ) tbb? ( dev-cpp/tbb ) vtk? ( =sci-libs/vtk-6.1* ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=Software development platform for CAD/CAE, 3D surface/solid modeling and data exchange
+EAPI=5
+HOMEPAGE=http://www.opencascade.org/
+IUSE=debug doc examples freeimage gl2ps java qt4 +tbb +vtk elibc_FreeBSD java
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Open-CASCADE-LGPL-2.1-Exception-1.0 LGPL-2.1 )
+RDEPEND=app-eselect/eselect-opencascade dev-lang/tcl:0= dev-lang/tk:0= dev-tcltk/itcl dev-tcltk/itk dev-tcltk/tix media-libs/ftgl virtual/glu virtual/opengl x11-libs/libXmu freeimage? ( media-libs/freeimage ) gl2ps? ( x11-libs/gl2ps ) java? ( >=virtual/jdk-0:= ) tbb? ( dev-cpp/tbb ) vtk? ( =sci-libs/vtk-6.1* ) java? ( >=dev-java/java-config-2.2.0-r3 )
+RESTRICT=bindist fetch mirror
+SLOT=6.9.1
+SRC_URI=http://www.opencascade.com/sites/default/files/private/occt/OCC_6.9.1_release/opencascade-6.9.1.tgz
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	check-reqs	aee25bdf4e2f459af86d17f7c41dcdf6	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	9a25f292ff66f8c2c00100ac0b15c54f	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=8db10aba955021c202764d74958ba2a3
--- a/metadata/md5-cache/sys-apps/pcsc-slb-rf72-drv-1.1.0-r2
+++ b/metadata/md5-cache/sys-apps/pcsc-slb-rf72-drv-1.1.0-r2
@ -1,13 +1,12 @@
-DEFINED_PHASES=compile install postrm prepare
+DEFINED_PHASES=compile install postrm
 DEPEND=sys-apps/pcsc-lite dev-libs/openct virtual/pkgconfig
 DESCRIPTION=Schlumberger Reflex 72 Serial Smartcard Reader
-EAPI=2
+EAPI=6
 HOMEPAGE=http://www.linuxnet.com/sourcedrivers.html
 KEYWORDS=~amd64 ~x86
 LICENSE=all-rights-reserved BSD LGPL-2.1+
 RDEPEND=sys-apps/pcsc-lite dev-libs/openct
-RESTRICT=mirror bindist
 SLOT=0
-SRC_URI=http://www.linuxnet.com/drivers/readers/files/slb_rf72-drv-1.1.0.tar.gz
+SRC_URI=mirror://gentoo/slb_rf72-drv-1.1.0.tar.gz
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=27cfae697a827feb5cf4f2acc83ef94a
+_md5_=828afedde37385f76b70e077aabbae40
--- a/metadata/md5-cache/sys-cluster/ceph-10.2.2
+++ b/metadata/md5-cache/sys-cluster/ceph-10.2.2
@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=app-arch/snappy dev-libs/boost:=[threads] dev-libs/libaio dev-python/sphinx[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/leveldb[snappy] nss? ( dev-libs/nss ) libatomic? ( dev-libs/libatomic_ops ) cryptopp? ( dev-libs/crypto++ ) sys-apps/keyutils sys-apps/util-linux dev-libs/libxml2 radosgw? ( dev-libs/fcgi ) ldap? ( net-nds/openldap ) babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse ) xfs? ( sys-fs/xfsprogs ) zfs? ( sys-fs/zfs ) gtk? ( x11-libs/gtk+:2 dev-cpp/gtkmm:2.4 gnome-base/librsvg ) radosgw? ( dev-libs/fcgi dev-libs/expat net-misc/curl ) jemalloc? ( dev-libs/jemalloc ) !jemalloc? ( dev-util/google-perftools ) lttng? ( dev-util/lttng-ust ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/cython[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] app-arch/cpio sys-apps/lsb-release virtual/pkgconfig test? ( sys-fs/btrfs-progs sys-apps/grep[pcre] dev-python/tox[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/virtualenv[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig virtual/pkgconfig
+DEPEND=app-arch/snappy app-arch/lz4:= app-arch/bzip2 dev-libs/boost:=[threads] dev-libs/libaio dev-libs/leveldb[snappy] nss? ( dev-libs/nss ) libatomic? ( dev-libs/libatomic_ops ) cryptopp? ( dev-libs/crypto++ ) sys-apps/keyutils sys-apps/util-linux dev-libs/libxml2 radosgw? ( dev-libs/fcgi ) ldap? ( net-nds/openldap ) babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse ) xfs? ( sys-fs/xfsprogs ) zfs? ( sys-fs/zfs ) gtk? ( x11-libs/gtk+:2 dev-cpp/gtkmm:2.4 gnome-base/librsvg ) radosgw? ( dev-libs/fcgi dev-libs/expat net-misc/curl ) jemalloc? ( dev-libs/jemalloc ) !jemalloc? ( dev-util/google-perftools ) lttng? ( dev-util/lttng-ust ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/cython[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] app-arch/cpio sys-apps/lsb-release virtual/pkgconfig dev-python/sphinx test? ( sys-fs/btrfs-progs sys-apps/grep[pcre] dev-python/tox[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/virtualenv[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig virtual/pkgconfig
 DESCRIPTION=Ceph distributed filesystem
 EAPI=6
 HOMEPAGE=http://ceph.com/
 IUSE=babeltrace cephfs cryptopp debug fuse gtk jemalloc ldap +libaio libatomic lttng +nss +radosgw static-libs tcmalloc test xfs zfs python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
 KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
 LICENSE=LGPL-2.1
-RDEPEND=app-arch/snappy dev-libs/boost:=[threads] dev-libs/libaio dev-python/sphinx[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/leveldb[snappy] nss? ( dev-libs/nss ) libatomic? ( dev-libs/libatomic_ops ) cryptopp? ( dev-libs/crypto++ ) sys-apps/keyutils sys-apps/util-linux dev-libs/libxml2 radosgw? ( dev-libs/fcgi ) ldap? ( net-nds/openldap ) babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse ) xfs? ( sys-fs/xfsprogs ) zfs? ( sys-fs/zfs ) gtk? ( x11-libs/gtk+:2 dev-cpp/gtkmm:2.4 gnome-base/librsvg ) radosgw? ( dev-libs/fcgi dev-libs/expat net-misc/curl ) jemalloc? ( dev-libs/jemalloc ) !jemalloc? ( dev-util/google-perftools ) lttng? ( dev-util/lttng-ust ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] sys-apps/which sys-apps/hdparm sys-block/parted sys-fs/cryptsetup sys-apps/gptfdisk sys-apps/findutils dev-python/flask[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+RDEPEND=app-arch/snappy app-arch/lz4:= app-arch/bzip2 dev-libs/boost:=[threads] dev-libs/libaio dev-libs/leveldb[snappy] nss? ( dev-libs/nss ) libatomic? ( dev-libs/libatomic_ops ) cryptopp? ( dev-libs/crypto++ ) sys-apps/keyutils sys-apps/util-linux dev-libs/libxml2 radosgw? ( dev-libs/fcgi ) ldap? ( net-nds/openldap ) babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse ) xfs? ( sys-fs/xfsprogs ) zfs? ( sys-fs/zfs ) gtk? ( x11-libs/gtk+:2 dev-cpp/gtkmm:2.4 gnome-base/librsvg ) radosgw? ( dev-libs/fcgi dev-libs/expat net-misc/curl ) jemalloc? ( dev-libs/jemalloc ) !jemalloc? ( dev-util/google-perftools ) lttng? ( dev-util/lttng-ust ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] sys-apps/hdparm sys-block/parted sys-fs/cryptsetup sys-apps/gptfdisk dev-python/flask[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=python_targets_python2_7 || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 ) ^^ ( nss cryptopp ) ?? ( jemalloc tcmalloc ) radosgw
 RESTRICT=test? ( userpriv ) test
 SLOT=0
 SRC_URI=http://ceph.com/download/ceph-10.2.2.tar.gz
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	check-reqs	aee25bdf4e2f459af86d17f7c41dcdf6	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	readme.gentoo-r1	03878c06495db70bc36bd717383c09f7	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	udev	73058269b3e70e34e084fa3981282338	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=1e49388696a19465af49893315bf0f59
+_md5_=25528e788ca4514353ecb66e5218e014
--- a/metadata/md5-cache/sys-cluster/ceph-9999
+++ b/metadata/md5-cache/sys-cluster/ceph-9999
@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst prepare pretend setup test unpack
-DEPEND=app-arch/snappy dev-libs/boost:=[threads] dev-libs/fcgi dev-libs/libaio dev-python/sphinx[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/leveldb[snappy] nss? ( dev-libs/nss ) libatomic? ( dev-libs/libatomic_ops ) cryptopp? ( dev-libs/crypto++ ) sys-apps/keyutils sys-apps/util-linux dev-libs/libxml2 ldap? ( net-nds/openldap ) babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse ) xfs? ( sys-fs/xfsprogs ) zfs? ( sys-fs/zfs ) gtk? ( x11-libs/gtk+:2 dev-cpp/gtkmm:2.4 gnome-base/librsvg ) radosgw? ( dev-libs/fcgi dev-libs/expat net-misc/curl ) jemalloc? ( dev-libs/jemalloc ) !jemalloc? ( dev-util/google-perftools ) lttng? ( dev-util/lttng-ust ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/cython[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] app-arch/cpio sys-apps/lsb-release virtual/pkgconfig test? ( sys-fs/btrfs-progs sys-apps/grep[pcre] dev-python/tox[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/virtualenv[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig virtual/pkgconfig >=dev-vcs/git-1.8.2.1
+DEPEND=app-arch/snappy app-arch/lz4:= app-arch/bzip2 dev-libs/boost:=[threads] dev-libs/fcgi dev-libs/libaio dev-libs/leveldb[snappy] nss? ( dev-libs/nss ) libatomic? ( dev-libs/libatomic_ops ) cryptopp? ( dev-libs/crypto++ ) sys-apps/keyutils sys-apps/util-linux dev-libs/libxml2 ldap? ( net-nds/openldap ) babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse ) xfs? ( sys-fs/xfsprogs ) zfs? ( sys-fs/zfs ) gtk? ( x11-libs/gtk+:2 dev-cpp/gtkmm:2.4 gnome-base/librsvg ) radosgw? ( dev-libs/fcgi dev-libs/expat net-misc/curl ) jemalloc? ( dev-libs/jemalloc ) !jemalloc? ( dev-util/google-perftools ) lttng? ( dev-util/lttng-ust ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/cython[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] app-arch/cpio sys-apps/lsb-release virtual/pkgconfig dev-python/sphinx test? ( sys-fs/btrfs-progs sys-apps/grep[pcre] dev-python/tox[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/virtualenv[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig virtual/pkgconfig >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Ceph distributed filesystem
 EAPI=6
 HOMEPAGE=http://ceph.com/
 IUSE=babeltrace cephfs cryptopp debug fuse gtk jemalloc ldap +libaio libatomic lttng +nss +radosgw static-libs tcmalloc test xfs zfs python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
 LICENSE=LGPL-2.1
-RDEPEND=app-arch/snappy dev-libs/boost:=[threads] dev-libs/fcgi dev-libs/libaio dev-python/sphinx[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/leveldb[snappy] nss? ( dev-libs/nss ) libatomic? ( dev-libs/libatomic_ops ) cryptopp? ( dev-libs/crypto++ ) sys-apps/keyutils sys-apps/util-linux dev-libs/libxml2 ldap? ( net-nds/openldap ) babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse ) xfs? ( sys-fs/xfsprogs ) zfs? ( sys-fs/zfs ) gtk? ( x11-libs/gtk+:2 dev-cpp/gtkmm:2.4 gnome-base/librsvg ) radosgw? ( dev-libs/fcgi dev-libs/expat net-misc/curl ) jemalloc? ( dev-libs/jemalloc ) !jemalloc? ( dev-util/google-perftools ) lttng? ( dev-util/lttng-ust ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] sys-apps/which sys-apps/hdparm sys-block/parted sys-fs/cryptsetup sys-apps/gptfdisk sys-apps/findutils dev-python/flask[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+RDEPEND=app-arch/snappy app-arch/lz4:= app-arch/bzip2 dev-libs/boost:=[threads] dev-libs/fcgi dev-libs/libaio dev-libs/leveldb[snappy] nss? ( dev-libs/nss ) libatomic? ( dev-libs/libatomic_ops ) cryptopp? ( dev-libs/crypto++ ) sys-apps/keyutils sys-apps/util-linux dev-libs/libxml2 ldap? ( net-nds/openldap ) babeltrace? ( dev-util/babeltrace ) fuse? ( sys-fs/fuse ) xfs? ( sys-fs/xfsprogs ) zfs? ( sys-fs/zfs ) gtk? ( x11-libs/gtk+:2 dev-cpp/gtkmm:2.4 gnome-base/librsvg ) radosgw? ( dev-libs/fcgi dev-libs/expat net-misc/curl ) jemalloc? ( dev-libs/jemalloc ) !jemalloc? ( dev-util/google-perftools ) lttng? ( dev-util/lttng-ust ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] sys-apps/hdparm sys-block/parted sys-fs/cryptsetup sys-apps/gptfdisk dev-python/flask[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=python_targets_python2_7 || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 ) ^^ ( nss cryptopp ) ?? ( jemalloc tcmalloc ) radosgw
 RESTRICT=test? ( userpriv ) test
 SLOT=0
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	check-reqs	aee25bdf4e2f459af86d17f7c41dcdf6	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	git-r3	00f60a84fc7b499c99edfe99caea9f95	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	readme.gentoo-r1	03878c06495db70bc36bd717383c09f7	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	udev	73058269b3e70e34e084fa3981282338	user	906f3c8eb3a2350a4f1191a89baa3e46	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=599cc6a0d975ee5f27b1f331087e8541
+_md5_=37257ace65eb7762079d65b88e48c46a
--- a/metadata/md5-cache/sys-fs/squashfs-tools-4.3-r2
+++ b/metadata/md5-cache/sys-fs/squashfs-tools-4.3-r2
@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=sys-libs/zlib !xz? ( !lzo? ( sys-libs/zlib ) ) lz4? ( app-arch/lz4 ) lzma? ( app-arch/xz-utils ) lzo? ( dev-libs/lzo ) xattr? ( sys-apps/attr ) xz? ( app-arch/xz-utils )
+DESCRIPTION=Tool for creating compressed filesystem type squashfs
+EAPI=5
+HOMEPAGE=http://squashfs.sourceforge.net
+IUSE=lz4 lzma lzo xattr +xz
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=sys-libs/zlib !xz? ( !lzo? ( sys-libs/zlib ) ) lz4? ( app-arch/lz4 ) lzma? ( app-arch/xz-utils ) lzo? ( dev-libs/lzo ) xattr? ( sys-apps/attr ) xz? ( app-arch/xz-utils )
+SLOT=0
+SRC_URI=mirror://sourceforge/squashfs/squashfs4.3.tar.gz mirror://debian/pool/main/s/squashfs-tools/squashfs-tools_4.3-3.debian.tar.xz
+_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
+_md5_=1154435845def45e815649da334dc2c9
--- a/metadata/md5-cache/x11-libs/xcb-util-xrm-1.0
+++ b/metadata/md5-cache/x11-libs/xcb-util-xrm-1.0
@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=>=x11-libs/libxcb-1.9.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/xcb-util[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] test? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+DESCRIPTION=X C-language Bindings sample implementations
+EAPI=5
+HOMEPAGE=http://xcb.freedesktop.org/
+IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 static-libs doc
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=x11-libs/libxcb-1.9.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/xcb-util[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
+SLOT=0
+SRC_URI=https://github.com/Airblader/xcb-util-xrm/releases/download/v1.0/xcb-util-xrm-1.0.tar.bz2
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	autotools-multilib	77afca16a6cb82823eed6366a10e7f75	autotools-utils	419811142edf3516b0d0cf1a254d93cb	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	d270fa247153df66074f795fa42dba3e	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1	xorg-2	b41f09eee8d441f780b7413dba7e120b
+_md5_=d93f2bb2cbe0714d5aa7ffe9a5231d20
--- a/metadata/md5-cache/x11-wm/i3-9999
+++ b/metadata/md5-cache/x11-wm/i3-9999
@ -1,11 +1,11 @@
 DEFINED_PHASES=compile install postinst prepare unpack
-DEPEND=dev-lang/perl dev-libs/libev dev-libs/libpcre >=dev-libs/yajl-2.0.3 x11-libs/libxcb[xkb] x11-libs/libxkbcommon[X] x11-libs/startup-notification x11-libs/xcb-util x11-libs/xcb-util-cursor x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm pango? ( >=x11-libs/pango-1.30.0[X] >=x11-libs/cairo-1.12.2[X,xcb] ) app-text/asciidoc virtual/pkgconfig dev-vcs/git
+DEPEND=dev-lang/perl dev-libs/libev dev-libs/libpcre >=dev-libs/yajl-2.0.3 x11-libs/libxcb[xkb] x11-libs/libxkbcommon[X] x11-libs/startup-notification x11-libs/xcb-util x11-libs/xcb-util-cursor x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm x11-libs/xcb-util-xrm pango? ( >=x11-libs/pango-1.30.0[X] >=x11-libs/cairo-1.12.2[X,xcb] ) app-text/asciidoc virtual/pkgconfig dev-vcs/git
 DESCRIPTION=An improved dynamic tiling window manager
 EAPI=5
 HOMEPAGE=http://i3wm.org/
 IUSE=+pango
 LICENSE=BSD
-RDEPEND=dev-lang/perl dev-libs/libev dev-libs/libpcre >=dev-libs/yajl-2.0.3 x11-libs/libxcb[xkb] x11-libs/libxkbcommon[X] x11-libs/startup-notification x11-libs/xcb-util x11-libs/xcb-util-cursor x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm pango? ( >=x11-libs/pango-1.30.0[X] >=x11-libs/cairo-1.12.2[X,xcb] ) dev-perl/AnyEvent-I3 dev-perl/JSON-XS
+RDEPEND=dev-lang/perl dev-libs/libev dev-libs/libpcre >=dev-libs/yajl-2.0.3 x11-libs/libxcb[xkb] x11-libs/libxkbcommon[X] x11-libs/startup-notification x11-libs/xcb-util x11-libs/xcb-util-cursor x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm x11-libs/xcb-util-xrm pango? ( >=x11-libs/pango-1.30.0[X] >=x11-libs/cairo-1.12.2[X,xcb] ) dev-perl/AnyEvent-I3 dev-perl/JSON-XS
 SLOT=0
 _eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	git-2	672c3929a162f221a53b4ccb4d25d8a2	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	c9d9187f4caa4026a0ceddd8dfceb3c1
-_md5_=404b7f57cf59d64a5222f6c4cb272b8a
+_md5_=e8f94378cddbe509df178343aed62b20
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@ -1 +1 @@
-Fri, 17 Jun 2016 12:40:49 +0000
+Fri, 17 Jun 2016 19:40:47 +0000
--- a/metadata/projects.xml
+++ b/metadata/projects.xml
@ -2934,6 +2934,11 @@
      <name>Maxim Koltsov</name>
      <role>Member</role>
    </member>
+    <member>
+      <email>mgorny@gentoo.org</email>
+      <name>Michał Górny</name>
+      <role>Member</role>
+    </member>
    <member>
      <email>monsieurp@gentoo.org</email>
      <name>Patrice Clement</name>
@ -3436,27 +3441,6 @@
      <role>Developer</role>
    </member>
  </project>
-  <project>
-    <email>reviewers@gentoo.org</email>
-    <name>Reviewers</name>
-    <url>https://wiki.gentoo.org/wiki/Project:Reviewers</url>
-    <description>Team dedicated to reviewing pull requests and commits</description>
-    <member>
-      <email>jlec@gentoo.org</email>
-      <name>Justin Lecher</name>
-      <role>Member</role>
-    </member>
-    <member is-lead="1">
-      <email>mgorny@gentoo.org</email>
-      <name>Michał Górny</name>
-      <role>Lead</role>
-    </member>
-    <member>
-      <email>monsieurp@gentoo.org</email>
-      <name>Patrice Clement</name>
-      <role>Member</role>
-    </member>
-  </project>
  <project>
    <email>ruby@gentoo.org</email>
    <name>Gentoo Ruby Project</name>
@ -3870,6 +3854,11 @@
      <name>Chí-Thanh Christopher Nguyễn</name>
      <role>Ebuild review</role>
    </member>
+    <member>
+      <email>mgorny@gentoo.org</email>
+      <name>Michał Górny</name>
+      <role>Project pre-removal cleanup</role>
+    </member>
    <member is-lead="1">
      <email>tommy@gentoo.org</email>
      <name>Thomas Sachau</name>
--- a/metadata/timestamp
+++ b/metadata/timestamp
@ -1 +1 @@
-Fri Jun 17 12:39:53 UTC 2016
+Fri Jun 17 19:39:52 UTC 2016
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@ -1 +1 @@
-Fri, 17 Jun 2016 13:00:01 +0000
+Fri, 17 Jun 2016 20:00:01 +0000
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@ -1 +1 @@
-1466167201 Fri 17 Jun 2016 12:40:01 PM UTC
+1466192401 Fri 17 Jun 2016 07:40:01 PM UTC
--- a/Show More
+++ b/Show More
				`@ -1 +0,0 @@`
				`DIST pool-conduit-0.1.2.3.tar.gz 2618 SHA256 db2df6c6c9fba57089a6da3e8ea83a1722fe6e0d26b5d4994fa84a00575dd2d7 SHA512 88e5160511287956158b7df1d023023c56f84d244051dd849dca82429a44e7388e4c150893032d42436482e4433b046efb4250f1702f32a5a8cb71ce3f83ded7 WHIRLPOOL e042a332f53c7654e6948eab39b477f532646c7551d7565d3c90f9afa630cd4b16b3ab330453b55b6e2a1da17131203335438d69d89ba12b6f24523ebc9a01df`
				`@ -1 +0,0 @@`
				`DIST tls-extra-0.6.6.tar.gz 7972 SHA256 dbf782edbb82321b6484105518fe8e2ff6d51992b20a545a5d3bd380ed901a4c SHA512 dec0fcef8ca915d87314206dd34d92f748a2ed8fd944e9a1f6b864082268654f2b628131d2351ea4ae833228e45dcac5798fed3a4a9a4fb7a832f5f37eed3086 WHIRLPOOL 30081982992977ad8f161080d874448fd37e2d9873016b8b513c8842fe4bcd2c1903476bc5a50fdc8b775183f9a8571e58a70547e172cf1fa7fb9abaae4ba6b3`
				`@ -0,0 +1 @@`
				`DIST btf-1.2.tar.gz 66887 SHA256 d7b1b8798edb73f5781dc54952d47a9e9df7a1257cb269cbaff8752b6261c104 SHA512 ba70eea4370f090bf0295c9ac9907869a6bff62dc6ff86a443a887413f0c0fbb5c12924df6166b8ecd2348ee6bad409d954a16fe5a4a4695492f47a486e35acd WHIRLPOOL 3c37a16f3708e8856ae60f04b832213571fc47460ff01a7bfd3dddbeef63fb491e68ab406bb14a405c18b701297594c684a59194eb6c81e3b821a7fb6bce53af`