Merge https://github.com/gentoo/gentoo.git
diff --git a/app-accessibility/SphinxTrain/metadata.xml b/app-accessibility/SphinxTrain/metadata.xml
index acc417d..fa02e63 100644
--- a/app-accessibility/SphinxTrain/metadata.xml
+++ b/app-accessibility/SphinxTrain/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>accessibility</herd>
-	<herd>sound</herd>
+	<maintainer type="project">
+		<email>accessibility@gentoo.org</email>
+		<name>Gentoo Accessibility Project</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<longdescription lang="en">
 	SphinxTrain is CMU Sphinx's training package.
 </longdescription>
diff --git a/app-accessibility/accerciser/Manifest b/app-accessibility/accerciser/Manifest
index eb85a82..5275c03 100644
--- a/app-accessibility/accerciser/Manifest
+++ b/app-accessibility/accerciser/Manifest
@@ -1,2 +1 @@
-DIST accerciser-3.12.0.tar.xz 3212432 SHA256 0d421a59cd294966441fb6591d34f28e4b60340815bdf91c9e8f39c2d826e96b SHA512 d15d301f7579a92e3b3aa65d22fd726d71bee8330b450c7ed232d4a8d7fc312402573073f67a490ab659122ad98651f8a073235770caa9eba8a4b6dc9d68e6d3 WHIRLPOOL 4b753de73afc1c8fda7d71a8b6f8007ebb4627985a6049be887d8e916f4e37c3a5484a481d8e516a1d4cc245e987ed29a2a87c2780b882bced032f5d2d14d5d6
 DIST accerciser-3.14.0.tar.xz 3213916 SHA256 f5a5915d475e9241396414ccd167724c88807e77e69151cf0b40b32bd57d0574 SHA512 bafc30e15fe0121f8abc64239e48834ab06a03fe64fc368a221d167a13079721962441e0343f17934dde57cd012c9132374739297c23c79c567fc36cc60fb07d WHIRLPOOL 4b9679145ad1ad7f8d059dfdfb12d372c1b27780532a7c19cc25b66bbe0a13db5b864548e332b74e0327eebb488622ae471514046737b738c15624969d8df7a8
diff --git a/app-accessibility/accerciser/accerciser-3.12.0-r1.ebuild b/app-accessibility/accerciser/accerciser-3.12.0-r1.ebuild
deleted file mode 100644
index 9d96f0f..0000000
--- a/app-accessibility/accerciser/accerciser-3.12.0-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-PYTHON_COMPAT=( python{3_3,3_4} )
-PYTHON_REQ_USE="xml"
-
-inherit gnome2 python-r1
-
-DESCRIPTION="Interactive Python accessibility explorer"
-HOMEPAGE="https://wiki.gnome.org/Apps/Accerciser"
-
-LICENSE="BSD CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=app-accessibility/at-spi2-core-2.5.2:2
-	>=dev-python/pygobject-2.90.3:3[${PYTHON_USEDEP}]
-	>=x11-libs/gtk+-3.1.13:3[introspection]
-
-	dev-libs/atk[introspection]
-	>=dev-libs/glib-2.28:2
-	dev-libs/gobject-introspection
-	>=dev-python/ipython-0.11[${PYTHON_USEDEP}]
-	>=dev-python/pyatspi-2.1.5[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	x11-libs/gdk-pixbuf[introspection]
-	x11-libs/libwnck:3[introspection]
-	x11-libs/pango[introspection]
-	${PYTHON_DEPS}
-"
-DEPEND="${RDEPEND}
-	app-text/yelp-tools
-	>=dev-util/intltool-0.35
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Leave shebang alone
-	sed 's:@PYTHON@:/usr/bin/python:' -i src/accerciser.in || die
-
-	python_copy_sources
-}
-
-src_configure() {
-	python_foreach_impl run_in_build_dir gnome2_src_configure \
-		ITSTOOL=$(type -P true)
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir gnome2_src_compile
-}
-
-src_install() {
-	installing() {
-		gnome2_src_install
-		python_doscript src/accerciser
-	}
-	python_foreach_impl run_in_build_dir installing
-}
diff --git a/app-accessibility/accerciser/accerciser-3.12.0.ebuild b/app-accessibility/accerciser/accerciser-3.12.0.ebuild
deleted file mode 100644
index 6f8d2fd..0000000
--- a/app-accessibility/accerciser/accerciser-3.12.0.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-PYTHON_COMPAT=( python3_3 )
-PYTHON_REQ_USE="xml"
-
-inherit gnome2 python-r1
-
-DESCRIPTION="Interactive Python accessibility explorer"
-HOMEPAGE="https://live.gnome.org/Accerciser"
-
-LICENSE="BSD CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	>=app-accessibility/at-spi2-core-2.5.2:2
-	>=dev-python/pygobject-2.90.3:3[${PYTHON_USEDEP}]
-	>=x11-libs/gtk+-3.1.13:3[introspection]
-
-	dev-libs/atk[introspection]
-	>=dev-libs/glib-2.28:2
-	dev-libs/gobject-introspection
-	>=dev-python/ipython-0.11[${PYTHON_USEDEP}]
-	>=dev-python/pyatspi-2.1.5[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	x11-libs/gdk-pixbuf[introspection]
-	x11-libs/libwnck:3[introspection]
-	x11-libs/pango[introspection]
-	${PYTHON_DEPS}
-"
-DEPEND="${RDEPEND}
-	app-text/yelp-tools
-	>=dev-util/intltool-0.35
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Leave shebang alone
-	sed 's:@PYTHON@:/usr/bin/python:' -i src/accerciser.in || die
-
-	python_copy_sources
-}
-
-src_configure() {
-	python_foreach_impl run_in_build_dir gnome2_src_configure \
-		ITSTOOL=$(type -P true)
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir gnome2_src_compile
-}
-
-src_install() {
-	installing() {
-		gnome2_src_install
-		python_doscript src/accerciser
-	}
-	python_foreach_impl run_in_build_dir installing
-}
diff --git a/app-accessibility/accerciser/metadata.xml b/app-accessibility/accerciser/metadata.xml
index de03c27..b361a7a 100644
--- a/app-accessibility/accerciser/metadata.xml
+++ b/app-accessibility/accerciser/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>gnome-accessibility</herd>
+  <maintainer type="project">
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
   <longdescription lang="en">
 Accerciser is an interactive Python accessibility explorer for the GNOME desktop. It uses AT-SPI to inspect and control widgets, allowing you to check if an application is providing correct information to assistive technologies and automated test frameworks. Accerciser has a simple plugin framework which you can use to create custom views of accessibility information.
 
diff --git a/app-accessibility/at-spi2-atk/metadata.xml b/app-accessibility/at-spi2-atk/metadata.xml
index 6949624..3998080 100644
--- a/app-accessibility/at-spi2-atk/metadata.xml
+++ b/app-accessibility/at-spi2-atk/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome-accessibility</herd>
+<maintainer type="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-accessibility/at-spi2-core/Manifest b/app-accessibility/at-spi2-core/Manifest
index cd4bae3..25dc0da 100644
--- a/app-accessibility/at-spi2-core/Manifest
+++ b/app-accessibility/at-spi2-core/Manifest
@@ -1,3 +1,2 @@
-DIST at-spi2-core-2.14.1.tar.xz 456272 SHA256 eef9660b14fdf0fb1f30d1be7c72d591fa7cbb87b00ca3a444425712f46ce657 SHA512 263f2353961787b510a22ede6243ebd6f9eba7fe00740b252ba372e78a2b4a20bd6ed1a9f509b2e33342fc5516d1e8b95f886573d51962755e51584771ac86b9 WHIRLPOOL 54d02cd41f1039c3b166c01215d983b768011c99b81831fc3256a4dde66b3a2fbff7b0fafa4958bbce367fee164c5f5c90531de11f57d65a1972af009b5afd62
 DIST at-spi2-core-2.16.0.tar.xz 455264 SHA256 1c0b77fb8ce81abbf1d80c0afee9858b3f9229f673b7881995fe0fc16b1a74d0 SHA512 b61cb6dad15e2a6f6cd4788e6b63fed37d0098a56d1417b43aed2ba111a7dd7fccbe7c393f0be794bcaf900f38decbd3974c36e395548000d429086f8717df57 WHIRLPOOL 556c504ba9aef2e4ad2b63e3b4d0417ce24a49fafd45287cf3d669612c2d23058f3e7b373a69a569d63938a0333b62d5c601e8a0f1f4b78d0252bea4b64ede3e
 DIST at-spi2-core-2.18.3.tar.xz 451408 SHA256 ada26add94155f97d0f601a20cb7a0e3fd3ba1588c3520b7288316494027d629 SHA512 89abc660b49ca690a027709da4e6ed75d84f6c2dae691a0428057da0514f4c7f1f49b946f19c17c6ea402a0f1c9a236921efedb05865756c71beca29a0fbd6f2 WHIRLPOOL eeff01c9859c6e260ac8de5adf3caa69551523c0247659cc657b1885f175120bad7dc69b47b94c9ad78db14fe44011a6caf973a3b053aed64c1cc99dac863ddf
diff --git a/app-accessibility/at-spi2-core/at-spi2-core-2.14.1.ebuild b/app-accessibility/at-spi2-core/at-spi2-core-2.14.1.ebuild
deleted file mode 100644
index e0b983e..0000000
--- a/app-accessibility/at-spi2-core/at-spi2-core-2.14.1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit eutils gnome2 multilib-minimal
-
-DESCRIPTION="D-Bus accessibility specifications and registration daemon"
-HOMEPAGE="https://live.gnome.org/Accessibility"
-
-LICENSE="LGPL-2+"
-SLOT="2"
-IUSE="+X +introspection"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
-
-# x11-libs/libSM is needed until upstream #719808 is solved either
-# making the dep unneeded or fixing their configure
-# Only libX11 is optional right now
-COMMON_DEPEND="
-	>=dev-libs/glib-2.36:2[${MULTILIB_USEDEP}]
-	>=sys-apps/dbus-1[${MULTILIB_USEDEP}]
-	x11-libs/libSM[${MULTILIB_USEDEP}]
-	x11-libs/libXi[${MULTILIB_USEDEP}]
-	x11-libs/libXtst[${MULTILIB_USEDEP}]
-	introspection? ( >=dev-libs/gobject-introspection-0.9.6 )
-	X? ( x11-libs/libX11[${MULTILIB_USEDEP}] )
-"
-RDEPEND="${COMMON_DEPEND}
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-gtklibs-20140508-r3
-		!app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/gtk-doc-am-1.9
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-"
-
-src_prepare() {
-	# disable teamspaces test since that requires Novell.ICEDesktop.Daemon
-	epatch "${FILESDIR}/${PN}-2.0.2-disable-teamspaces-test.patch"
-
-	gnome2_src_prepare
-}
-
-multilib_src_configure() {
-	# xevie is deprecated/broken since xorg-1.6/1.7
-	ECONF_SOURCE=${S} \
-	gnome2_src_configure \
-		--disable-xevie \
-		$(multilib_native_use_enable introspection) \
-		$(use_enable X x11)
-
-	# work-around gtk-doc out-of-source brokedness
-	if multilib_is_native_abi; then
-		ln -s "${S}"/doc/libatspi/html doc/libatspi/html || die
-	fi
-}
-
-multilib_src_compile() { gnome2_src_compile; }
-multilib_src_install() { gnome2_src_install; }
diff --git a/app-accessibility/at-spi2-core/metadata.xml b/app-accessibility/at-spi2-core/metadata.xml
index 6949624..3998080 100644
--- a/app-accessibility/at-spi2-core/metadata.xml
+++ b/app-accessibility/at-spi2-core/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome-accessibility</herd>
+<maintainer type="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-accessibility/brltty/metadata.xml b/app-accessibility/brltty/metadata.xml
index e8e32d5..53e30d6 100644
--- a/app-accessibility/brltty/metadata.xml
+++ b/app-accessibility/brltty/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>accessibility</herd>
+<maintainer type="project">
+  <email>accessibility@gentoo.org</email>
+  <name>Gentoo Accessibility Project</name>
+ </maintainer>
  <use>
   <flag name="api">build brltty's application program interface</flag>
   <flag name="beeper">support the console tone generator</flag>
diff --git a/app-accessibility/caribou/metadata.xml b/app-accessibility/caribou/metadata.xml
index 4d1f359..3a82b0b 100644
--- a/app-accessibility/caribou/metadata.xml
+++ b/app-accessibility/caribou/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer type="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 <longdescription lang="en">
 Caribou is a text entry and UI navigation application being developed as an
 alternative to the Gnome On-screen Keyboard. The overarching goal for Caribou
diff --git a/app-accessibility/edbrowse/edbrowse-3.5.1.ebuild b/app-accessibility/edbrowse/edbrowse-3.5.1.ebuild
index 1c2a80b..853813e 100644
--- a/app-accessibility/edbrowse/edbrowse-3.5.1.ebuild
+++ b/app-accessibility/edbrowse/edbrowse-3.5.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="4"
+EAPI="5"
 inherit eutils
 
 DESCRIPTION="editor, browser, and mail client using the /bin/ed interface"
@@ -11,12 +11,13 @@
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="linguas_fr odbc"
+IUSE="libressl linguas_fr odbc"
 COMMON_DEPEND=">=dev-lang/spidermonkey-24.0:24
 	>=sys-libs/readline-6.0
 	>=net-misc/curl-7.36.0
 	>=dev-libs/libpcre-7.8
-	>=dev-libs/openssl-0.9.8j
+	!libressl? ( dev-libs/openssl:0 )
+	libressl? ( dev-libs/libressl )
 	odbc? ( dev-db/unixODBC )"
 DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
diff --git a/app-accessibility/edbrowse/metadata.xml b/app-accessibility/edbrowse/metadata.xml
index 234d31d..53850bf 100644
--- a/app-accessibility/edbrowse/metadata.xml
+++ b/app-accessibility/edbrowse/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>accessibility</herd>
+<maintainer type="project">
+	<email>accessibility@gentoo.org</email>
+	<name>Gentoo Accessibility Project</name>
+</maintainer>
 <longdescription>
 	edbrowse is a line editor, web browser and email client using the /bin/ed
 	user interface.
diff --git a/app-accessibility/eflite/metadata.xml b/app-accessibility/eflite/metadata.xml
index c4c56fa..9c8a9fd 100644
--- a/app-accessibility/eflite/metadata.xml
+++ b/app-accessibility/eflite/metadata.xml
@@ -1,11 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>accessibility</herd>
-	<herd>sound</herd>
-	<maintainer>
+	<maintainer type="person">
 		<email>williamh@gentoo.org</email>
 	</maintainer>
+	<maintainer type="project">
+		<email>accessibility@gentoo.org</email>
+		<name>Gentoo Accessibility Project</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<use>
 		<flag name="16k_voice">Use a higher-quality voice.</flag>
 	</use>
diff --git a/app-accessibility/emacspeak-ss/metadata.xml b/app-accessibility/emacspeak-ss/metadata.xml
index 5e5b1e5..0e62f35 100644
--- a/app-accessibility/emacspeak-ss/metadata.xml
+++ b/app-accessibility/emacspeak-ss/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>accessibility</herd>
-<maintainer>
+<maintainer type="person">
  <email>williamh@gentoo.org</email>
 </maintainer>
+<maintainer type="project">
+ <email>accessibility@gentoo.org</email>
+ <name>Gentoo Accessibility Project</name>
+</maintainer>
 <longdescription lang="en">
 	Emacspeak speech servers for DoubleTalk PC and AT, 
 	Braille 'n Speak, Type 'n Speak, Braille Lite from Blazie,
diff --git a/app-accessibility/emacspeak/metadata.xml b/app-accessibility/emacspeak/metadata.xml
index e543475..2d3e207 100644
--- a/app-accessibility/emacspeak/metadata.xml
+++ b/app-accessibility/emacspeak/metadata.xml
@@ -1,8 +1,14 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>accessibility</herd>
-	<herd>emacs</herd>
+	<maintainer type="project">
+		<email>accessibility@gentoo.org</email>
+		<name>Gentoo Accessibility Project</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>gnu-emacs@gentoo.org</email>
+		<name>Gentoo GNU Emacs project</name>
+	</maintainer>
 	<longdescription lang="en">Emacspeak is a speech interface that allows visually impaired 
 	users to interact independently and efficiently with the computer.</longdescription>
 	<longdescription lang="ja">Emacspeakで視覚障害者が単独と手際良くでコンピュータを
diff --git a/app-accessibility/epos/metadata.xml b/app-accessibility/epos/metadata.xml
index e85edf9..ff92480 100644
--- a/app-accessibility/epos/metadata.xml
+++ b/app-accessibility/epos/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>accessibility</herd>
+	<maintainer type="project">
+		<email>accessibility@gentoo.org</email>
+		<name>Gentoo Accessibility Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">epos</remote-id>
 	</upstream>
diff --git a/app-accessibility/espeak/metadata.xml b/app-accessibility/espeak/metadata.xml
index c07bb6b..368b975 100644
--- a/app-accessibility/espeak/metadata.xml
+++ b/app-accessibility/espeak/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>accessibility</herd>
-	<maintainer>
+	<maintainer type="person">
 		<email>williamh@gentoo.org</email>
 	</maintainer>
+	<maintainer type="project">
+		<email>accessibility@gentoo.org</email>
+		<name>Gentoo Accessibility Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">espeak</remote-id>
 	</upstream>
diff --git a/app-accessibility/espeakup/metadata.xml b/app-accessibility/espeakup/metadata.xml
index 484f3c3..db1a3ef 100644
--- a/app-accessibility/espeakup/metadata.xml
+++ b/app-accessibility/espeakup/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>accessibility</herd>
-<maintainer>
+<maintainer type="person">
   <email>williamh@gentoo.org</email>
 </maintainer>
+<maintainer type="project">
+  <email>accessibility@gentoo.org</email>
+  <name>Gentoo Accessibility Project</name>
+</maintainer>
 <longdescription>
 Espeakup is a small lightweight connector which makes it possible for
 speakup to use espeak as its synthesizer.
diff --git a/app-accessibility/festival-fi/metadata.xml b/app-accessibility/festival-fi/metadata.xml
index f66d895..f8a4351 100644
--- a/app-accessibility/festival-fi/metadata.xml
+++ b/app-accessibility/festival-fi/metadata.xml
@@ -1,9 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>accessibility</herd>
-	<herd>sound</herd>
-	<maintainer>
+	<maintainer type="person">
 		<email>neurogeek@gentoo.org</email>
 	</maintainer>
+<maintainer type="project">
+		<email>accessibility@gentoo.org</email>
+		<name>Gentoo Accessibility Project</name>
+	</maintainer>
+<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-accessibility/festival-freebsoft-utils/metadata.xml b/app-accessibility/festival-freebsoft-utils/metadata.xml
index f7b66d2..8fb4aba 100644
--- a/app-accessibility/festival-freebsoft-utils/metadata.xml
+++ b/app-accessibility/festival-freebsoft-utils/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>accessibility</herd>
-<maintainer>
+<maintainer type="person">
   <email>williamh@gentoo.org</email>
 </maintainer>
+<maintainer type="project">
+  <email>accessibility@gentoo.org</email>
+  <name>Gentoo Accessibility Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-accessibility/festival-hts/metadata.xml b/app-accessibility/festival-hts/metadata.xml
index be48b59..78e53c2 100644
--- a/app-accessibility/festival-hts/metadata.xml
+++ b/app-accessibility/festival-hts/metadata.xml
@@ -1,9 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
+<maintainer type="person">
 	<email>neurogeek@gentoo.org</email>
 </maintainer>
-<herd>accessibility</herd>
-<herd>sound</herd>
+<maintainer type="project">
+	<email>accessibility@gentoo.org</email>
+	<name>Gentoo Accessibility Project</name>
+</maintainer>
+<maintainer type="project">
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-accessibility/festival-it/metadata.xml b/app-accessibility/festival-it/metadata.xml
index 9776e2a..a9d397c 100644
--- a/app-accessibility/festival-it/metadata.xml
+++ b/app-accessibility/festival-it/metadata.xml
@@ -1,11 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>accessibility</herd>
-	<herd>sound</herd>
-	<maintainer>
+	<maintainer type="person">
 		<email>neurogeek@gentoo.org</email>
 	</maintainer>
+	<maintainer type="project">
+		<email>accessibility@gentoo.org</email>
+		<name>Gentoo Accessibility Project</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<use>
 		<flag name="mbrola">Adds support for mbrola voices</flag>
 	</use>
diff --git a/app-accessibility/festival-ru/metadata.xml b/app-accessibility/festival-ru/metadata.xml
index 95bb8e9..e67034b 100644
--- a/app-accessibility/festival-ru/metadata.xml
+++ b/app-accessibility/festival-ru/metadata.xml
@@ -1,11 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>accessibility</herd>
-	<herd>sound</herd>
-	<maintainer>
+	<maintainer type="person">
 		<email>neurogeek@gentoo.org</email>
 	</maintainer>
+	<maintainer type="project">
+		<email>accessibility@gentoo.org</email>
+		<name>Gentoo Accessibility Project</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">festlang.berlios</remote-id>
 	</upstream>
diff --git a/app-accessibility/festival/metadata.xml b/app-accessibility/festival/metadata.xml
index 0c64cf5..e562565 100644
--- a/app-accessibility/festival/metadata.xml
+++ b/app-accessibility/festival/metadata.xml
@@ -1,10 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
+<maintainer type="person">
 	<email>neurogeek@gentoo.org</email>
 	<name>Jesus Rivero</name>
 </maintainer>
-<herd>accessibility</herd>
-<herd>sound</herd>
+<maintainer type="project">
+	<email>accessibility@gentoo.org</email>
+	<name>Gentoo Accessibility Project</name>
+</maintainer>
+<maintainer type="project">
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-accessibility/flite/metadata.xml b/app-accessibility/flite/metadata.xml
index 523097f..1dacdab 100644
--- a/app-accessibility/flite/metadata.xml
+++ b/app-accessibility/flite/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>accessibility</herd>
-<herd>sound</herd>
+<maintainer type="project">
+	<email>accessibility@gentoo.org</email>
+	<name>Gentoo Accessibility Project</name>
+</maintainer>
+<maintainer type="project">
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-accessibility/freetts/freetts-1.2.1-r2.ebuild b/app-accessibility/freetts/freetts-1.2.1-r2.ebuild
index 0097a1c..a4112c0 100644
--- a/app-accessibility/freetts/freetts-1.2.1-r2.ebuild
+++ b/app-accessibility/freetts/freetts-1.2.1-r2.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$
 
@@ -17,7 +17,7 @@
 
 LICENSE="jsapi? ( sun-bcla-jsapi ) freetts"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ppc64 x86"
 IUSE="doc jsapi mbrola"
 
 src_unpack() {
diff --git a/app-accessibility/freetts/freetts-1.2.2.ebuild b/app-accessibility/freetts/freetts-1.2.2.ebuild
index 37676c2..4f4367c 100644
--- a/app-accessibility/freetts/freetts-1.2.2.ebuild
+++ b/app-accessibility/freetts/freetts-1.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -22,7 +22,7 @@
 
 LICENSE="jsapi? ( sun-bcla-jsapi ) freetts"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 
 IUSE="jsapi mbrola"
 
diff --git a/app-accessibility/freetts/metadata.xml b/app-accessibility/freetts/metadata.xml
index 654f205..c7177e5 100644
--- a/app-accessibility/freetts/metadata.xml
+++ b/app-accessibility/freetts/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>accessibility</herd>
-	<herd>java</herd>
+	<maintainer type="project">
+		<email>accessibility@gentoo.org</email>
+		<name>Gentoo Accessibility Project</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<use>
 		<flag name="jsapi">build Java Speech API (JSAPI)</flag>
 		<flag name="mbrola">Adds support for mbrola voices</flag>
diff --git a/app-accessibility/julius/metadata.xml b/app-accessibility/julius/metadata.xml
index cbed4e8..1631e86 100644
--- a/app-accessibility/julius/metadata.xml
+++ b/app-accessibility/julius/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>accessibility</herd>
+	<maintainer type="project">
+		<email>accessibility@gentoo.org</email>
+		<name>Gentoo Accessibility Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge-jp">julius</remote-id>
 	</upstream>
diff --git a/app-accessibility/mbrola/metadata.xml b/app-accessibility/mbrola/metadata.xml
index 523097f..1dacdab 100644
--- a/app-accessibility/mbrola/metadata.xml
+++ b/app-accessibility/mbrola/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>accessibility</herd>
-<herd>sound</herd>
+<maintainer type="project">
+	<email>accessibility@gentoo.org</email>
+	<name>Gentoo Accessibility Project</name>
+</maintainer>
+<maintainer type="project">
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-accessibility/nfbtrans/metadata.xml b/app-accessibility/nfbtrans/metadata.xml
index 2f0bbe4..8fb4aba 100644
--- a/app-accessibility/nfbtrans/metadata.xml
+++ b/app-accessibility/nfbtrans/metadata.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-
 <pkgmetadata>
-<herd>accessibility</herd>
-<maintainer>
+<maintainer type="person">
   <email>williamh@gentoo.org</email>
 </maintainer>
+<maintainer type="project">
+  <email>accessibility@gentoo.org</email>
+  <name>Gentoo Accessibility Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-accessibility/orca/Manifest b/app-accessibility/orca/Manifest
index 9c7e424..f4d9b0d 100644
--- a/app-accessibility/orca/Manifest
+++ b/app-accessibility/orca/Manifest
@@ -1,3 +1,2 @@
-DIST orca-3.16.2.tar.xz 2078728 SHA256 cd14b28878cc04166ec43c7d9a8e6b0056c66cbfb1e4f934f12f74568937789a SHA512 768628c4630d84929a8a2b12b73771de7b104b1754e9462b1fe63c2bbadca192e56416a1e2a43ad5f5594c91a4fe94941d2deb1e44cccaf253d4f03704f31ee1 WHIRLPOOL eea3f9a1a0b1aebb4ca3a6da1a5cf016b1ea6d042c4e8e1b7275325cd08e77c6a7c6519048651ace34ef10d69c22663e9009dab20502ff3fca7d6c6c9a888c9a
 DIST orca-3.16.3.tar.xz 2124800 SHA256 540deeaa1a973cc7ccc8a463f8fcf51db51f7ccfb130bc2019ac53bf67943dc7 SHA512 c579437d956bee014db61aeb7494a295345e28a147a938a71a8062c30de67fcff3767c5ea8767067ce5f2f5ff84c0aaf2fc250730e4a7036ae100078fd6f058f WHIRLPOOL 839b3c7170f2fd44fa5b97cfd9ed6989dd94721d379d21428a166b8321fb5162a56f758327df0ea632bf320711362b0e03916358d023fba8dffec2a36f62b970
 DIST orca-3.18.2.tar.xz 2213548 SHA256 986244af7a0891b758eb8e772bc61d72483808e7e9c790360f9f389045d7262a SHA512 ec1210cea7a540bd931f7ede45c173829e780a4da4e61245920d15bb11b62d803771e32b791b2d0c307e15a8ef61b619b5e79e9909bf438a94252842a0dd8613 WHIRLPOOL 31475d1eacbf322cdd49d286c3585d97c93de08f92b0533fa58905d4ea089272bc16e8bb748041cc6f27dd54c19996b3d72993c5b148b3c8e6c873f9e452fe98
diff --git a/app-accessibility/orca/metadata.xml b/app-accessibility/orca/metadata.xml
index c42f233..3d2c750 100644
--- a/app-accessibility/orca/metadata.xml
+++ b/app-accessibility/orca/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome-accessibility</herd>
+<maintainer type="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 <use>
 	<flag name="braille">Enable braille support</flag>
 </use>
diff --git a/app-accessibility/orca/orca-3.16.2.ebuild b/app-accessibility/orca/orca-3.16.2.ebuild
deleted file mode 100644
index 792a5dd..0000000
--- a/app-accessibility/orca/orca-3.16.2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python3_{3,4} )
-PYTHON_REQ_USE="threads"
-
-inherit gnome2 python-r1
-
-DESCRIPTION="Extensible screen reader that provides access to the desktop"
-HOMEPAGE="https://wiki.gnome.org/Projects/Orca"
-
-LICENSE="LGPL-2.1+ CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
-
-IUSE="+braille"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# liblouis is not in portage yet
-# it is used to provide contracted braille support
-# XXX: Check deps for correctness
-COMMON_DEPEND="${PYTHON_DEPS}
-	>=app-accessibility/at-spi2-atk-2.10:2
-	>=app-accessibility/at-spi2-core-2.10:2[introspection]
-	>=dev-libs/atk-2.10
-	>=dev-libs/glib-2.28:2
-	>=dev-python/pygobject-3.10:3[${PYTHON_USEDEP}]
-	>=x11-libs/gtk+-3.6.2:3[introspection]
-	braille? (
-		>=app-accessibility/brltty-5.0-r3[python,${PYTHON_USEDEP}]
-		dev-libs/liblouis[python,${PYTHON_USEDEP}] )
-"
-RDEPEND="${COMMON_DEPEND}
-	>=app-accessibility/speech-dispatcher-0.8[python,${PYTHON_USEDEP}]
-	dev-libs/atk[introspection]
-	dev-python/pyatspi[${PYTHON_USEDEP}]
-	dev-python/setproctitle[${PYTHON_USEDEP}]
-	x11-libs/libwnck:3[introspection]
-	x11-libs/pango[introspection]
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.50
-	virtual/pkgconfig
-"
-#	app-text/yelp-tools
-
-src_prepare() {
-	gnome2_src_prepare
-
-	python_copy_sources
-}
-
-src_configure() {
-	python_foreach_impl run_in_build_dir gnome2_src_configure \
-		ITSTOOL="$(type -P true)" \
-		$(use_with braille liblouis)
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir gnome2_src_compile
-}
-
-src_install() {
-	DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README TODO"
-	installing() {
-		gnome2_src_install
-		# Massage shebang to make python_doscript happy
-		sed -e 's:#!'"${PYTHON}:#!/usr/bin/python:" \
-			-i src/orca/orca || die
-		python_doscript src/orca/orca
-	}
-	python_foreach_impl run_in_build_dir installing
-}
diff --git a/app-accessibility/perlbox-voice/metadata.xml b/app-accessibility/perlbox-voice/metadata.xml
index 32f1581..c561012 100644
--- a/app-accessibility/perlbox-voice/metadata.xml
+++ b/app-accessibility/perlbox-voice/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">perlbox</remote-id>
 	</upstream>
diff --git a/app-accessibility/pidgin-festival/metadata.xml b/app-accessibility/pidgin-festival/metadata.xml
index 84a3de5..9b2b7c9 100644
--- a/app-accessibility/pidgin-festival/metadata.xml
+++ b/app-accessibility/pidgin-festival/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-im</herd>
-	<herd>accessibility</herd>
+	<maintainer type="project">
+		<email>accessibility@gentoo.org</email>
+		<name>Gentoo Accessibility Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">pidgin-festival</remote-id>
 	</upstream>
diff --git a/app-accessibility/pocketsphinx/metadata.xml b/app-accessibility/pocketsphinx/metadata.xml
index 831e814..b41f634 100644
--- a/app-accessibility/pocketsphinx/metadata.xml
+++ b/app-accessibility/pocketsphinx/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>accessibility</herd>
+	<maintainer type="project">
+		<email>accessibility@gentoo.org</email>
+		<name>Gentoo Accessibility Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">cmusphinx</remote-id>
 	</upstream>
diff --git a/app-accessibility/powiedz/metadata.xml b/app-accessibility/powiedz/metadata.xml
index 42fd119..2cb7080 100644
--- a/app-accessibility/powiedz/metadata.xml
+++ b/app-accessibility/powiedz/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>accessibility</herd>
-  <herd>sound</herd>
+  <maintainer type="project">
+    <email>accessibility@gentoo.org</email>
+    <name>Gentoo Accessibility Project</name>
+  </maintainer>
+<maintainer type="project">
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-accessibility/simon/Manifest b/app-accessibility/simon/Manifest
index d6f5403..72ab878 100644
--- a/app-accessibility/simon/Manifest
+++ b/app-accessibility/simon/Manifest
@@ -1,2 +1 @@
-DIST simon-0.4.0.tar.bz2 22139378 SHA256 c7ef35cd28ecf294ceae63f4b0c53384bcf89fc2a6e67916dc9d4116decabc12 SHA512 541c22e09bb4234871707cd73e038a5ab0c68a6cb2a28993571c434edff639e4826554f922a4a188b5c2a70ff9a0d627f53af0954431b561adeedccf9c170c85 WHIRLPOOL c2e0cc8632bf089ed14ef53cae02c51166780692222b7f3c7a3583356e9669cbbcd3222507128b35f282b49de2f10a73c42f63e28596c6e8412ff766bb3febfb
 DIST simon-0.4.1.tar.bz2 23856024 SHA256 8d55bc3f607a89e15efd51b844d93daf67d9967ad243f54efae324754859342d SHA512 d7349af3ec2482f18d8407891eeea7beea75630cc85aeade9f4105e3b84e82fde6284338688bbf84824d43c68de102eb34f3c21068cbe8a3307aa0586732b30d WHIRLPOOL 4c512bdfed8676cb5cfb896eacb14c66e3497abebe97a4faeb6804feb8ba36ed9101bc79a6efa573470d4a4d7eb6dfc94e3315dac488554563d35a397a066acb
diff --git a/app-accessibility/simon/files/simon-0.4.0-libdir.patch b/app-accessibility/simon/files/simon-0.4.0-libdir.patch
deleted file mode 100644
index 18e12fc..0000000
--- a/app-accessibility/simon/files/simon-0.4.0-libdir.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Fri Mar 29 22:00:19 UTC 2013
-Subject: build system
-
-make libdir modifiable
-
---- simon-0.4.0/cmake/SimonDirs.cmake
-+++ simon-0.4.0/cmake/SimonDirs.cmake
-@@ -29,6 +29,6 @@
-   #IF(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")
-     #set(SIMON_LIB_INSTALL_DIR lib64)
-   #ELSE(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")
--    set(SIMON_LIB_INSTALL_DIR lib)
-+  set(SIMON_LIB_INSTALL_DIR lib CACHE STRING "libdir")
-   #ENDIF(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")
- ENDIF(WIN32)
diff --git a/app-accessibility/simon/files/simon-0.4.0-linguas.patch b/app-accessibility/simon/files/simon-0.4.0-linguas.patch
deleted file mode 100644
index bf60f16..0000000
--- a/app-accessibility/simon/files/simon-0.4.0-linguas.patch
+++ /dev/null
@@ -1,84 +0,0 @@
---- simon-0.4.0/CMakeLists.txt
-+++ simon-0.4.0/CMakeLists.txt
-@@ -14,6 +14,9 @@
- 
- set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
- 
-+# NLS
-+option(ENABLE_NLS "Enable native language support" 1)
-+
- find_package(KDE4 "4.4" REQUIRED)
- find_package(Qt4 COMPONENTS QtCore QtDbus QtGui QtTest QtXml QtScript QtConcurrent REQUIRED)
- find_package(Qwt6 REQUIRED)
-@@ -143,4 +146,6 @@
- macro_display_feature_log()
- 
- include(MacroOptionalAddSubdirectory)
--macro_optional_add_subdirectory( po )
-+if(ENABLE_NLS)
-+	macro_optional_add_subdirectory( po )
-+endif(ENABLE_NLS)
---- simon-0.4.0/po/CMakeLists.txt
-+++ simon-0.4.0/po/CMakeLists.txt
-@@ -11,24 +11,14 @@
- if (NOT GETTEXT_MSGFMT_EXECUTABLE)
- MESSAGE(FATAL_ERROR "Please install msgmerge binary")
- endif (NOT GETTEXT_MSGFMT_EXECUTABLE)
--add_subdirectory(cs)
--add_subdirectory(de)
--add_subdirectory(da)
--add_subdirectory(fr)
--add_subdirectory(nl)
--add_subdirectory(uk)
--add_subdirectory(pt_BR)
--add_subdirectory(pl)
--add_subdirectory(es)
--add_subdirectory(ro)
--add_subdirectory(ca)
--add_subdirectory(sl)
--add_subdirectory(pt)
--add_subdirectory(hu)
--add_subdirectory(gl)
--add_subdirectory(sv)
--add_subdirectory(el)
--add_subdirectory(fi)
--add_subdirectory(it)
--add_subdirectory(zh_TW)
--add_subdirectory(et)
-+
-+# gettext behavior
-+execute_process(COMMAND sh -c "echo -n \${LINGUAS+x}"
-+	OUTPUT_VARIABLE UNSETLINGUAS)
-+set(langs cs de da fr nl uk pt_BR pl es ro ca sl pt hu gl sv el fi it zh_TW et)
-+
-+foreach(mylang ${langs})
-+	if($ENV{LINGUAS} MATCHES "^.*${mylang}.*$" OR "${UNSETLINGUAS}" STREQUAL "")
-+		add_subdirectory(${mylang})
-+	endif()
-+endforeach()
---- simon-0.4.0/doc/CMakeLists.txt
-+++ simon-0.4.0/doc/CMakeLists.txt
-@@ -1,9 +1,15 @@
-+if(ENABLE_NLS)
-+	# gettext behavior
-+	execute_process(COMMAND sh -c "echo -n \${LINGUAS+x}"
-+	OUTPUT_VARIABLE UNSETLINGUAS)
-+set(langs pt_BR ca nl de it pt sv uk)
-+
-+	foreach(mylang ${langs})
-+		if($ENV{LINGUAS} MATCHES "^.*${mylang}.*$" OR "${UNSETLINGUAS}" STREQUAL "")
-+			add_subdirectory(${mylang})
-+		endif()
-+	endforeach()
-+endif(ENABLE_NLS)
-+
-+# default doc
- add_subdirectory(en_US)
--add_subdirectory(pt_BR)
--add_subdirectory(ca)
--add_subdirectory(nl)
--add_subdirectory(de)
--add_subdirectory(it)
--add_subdirectory(pt)
--add_subdirectory(sv)
--add_subdirectory(uk)
diff --git a/app-accessibility/simon/files/simon-0.4.0-opencv.patch b/app-accessibility/simon/files/simon-0.4.0-opencv.patch
deleted file mode 100644
index bdd4581..0000000
--- a/app-accessibility/simon/files/simon-0.4.0-opencv.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- simon-0.4.0/CMakeLists.txt
-+++ simon-0.4.0/CMakeLists.txt
-@@ -68,7 +68,7 @@
-   "PocketSphinx is a small-footprint continuous speech recognition system"
-   "http://cmusphinx.sourceforge.net/" FALSE "" 
-   "Required to build Pocket Sphinx backend")
--find_package(OpenCV)
-+macro_optional_find_package(OpenCV)
- macro_log_feature(OpenCV_FOUND "OpenCV"
-   "OpenCV (Open Source Computer Vision) is a library of programming functions for real time computer vision" "http://http://opencv.willowgarage.com/"
-   FALSE "" "Required for Simon Vision")
diff --git a/app-accessibility/simon/files/simon-0.4.0-sphinx.patch b/app-accessibility/simon/files/simon-0.4.0-sphinx.patch
deleted file mode 100644
index 0fe8aa2..0000000
--- a/app-accessibility/simon/files/simon-0.4.0-sphinx.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- simon-0.4.0/CMakeLists.txt
-+++ simon-0.4.0/CMakeLists.txt
-@@ -59,11 +59,11 @@
- macro_optional_find_package(QAccessibilityClient)
- macro_log_feature(QAccessibilityClient_FOUND "qaccessibilityclient" "KDE client-side accessibility library" "https://projects.kde.org/projects/playground/accessibility/libkdeaccessibilityclient" FALSE "" "Required to enable ATSPI plugin.")
- 
--find_package(Sphinxbase)
-+macro_optional_find_package(Sphinxbase)
- macro_log_feature(SphinxBase_LIBRARIES "Sphinxbase"
-   "Open source toolkit for speech recognition" "http://cmusphinx.sourceforge.net/"
-   FALSE "" "Required to build Sphinx backend")
--find_package(Pocketsphinx)
-+macro_optional_find_package(Pocketsphinx)
- macro_log_feature(POCKETSPHINX_LIBRARIES "PocketSphinx"
-   "PocketSphinx is a small-footprint continuous speech recognition system"
-   "http://cmusphinx.sourceforge.net/" FALSE "" 
diff --git a/app-accessibility/simon/files/simon-0.4.1-opencv-include.patch b/app-accessibility/simon/files/simon-0.4.1-opencv-include.patch
new file mode 100644
index 0000000..b6a7d33
--- /dev/null
+++ b/app-accessibility/simon/files/simon-0.4.1-opencv-include.patch
@@ -0,0 +1,20 @@
+From: Peter Grasch <me@bedahr.org>
+Date: Sat, 25 Jul 2015 08:45:03 +0000
+Subject: Adding OpenCV include directories to include path
+X-Git-Url: http://quickgit.kde.org/?p=simon.git&a=commitdiff&h=b4e663e5cc36511b15ef20865c723182cd3d88c9
+---
+Adding OpenCV include directories to include path
+---
+
+
+--- a/cmake/FindOpenCV.cmake
++++ b/cmake/FindOpenCV.cmake
+@@ -61,6 +61,7 @@
+ 		
+                 ## Include the standard CMake script
+                 include("${OpenCV_DIR}/OpenCVConfig.cmake")
++                include_directories(${OpenCV_INCLUDE_DIRS})
+                  
+                 ## Search for a specific version
+                 set(CVLIB_SUFFIX "${OpenCV_VERSION_MAJOR}${OpenCV_VERSION_MINOR}${OpenCV_VERSION_PATCH}")
+
diff --git a/app-accessibility/simon/metadata.xml b/app-accessibility/simon/metadata.xml
index 29122be..a2a7c41 100644
--- a/app-accessibility/simon/metadata.xml
+++ b/app-accessibility/simon/metadata.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>accessibility</herd>
+	<maintainer type="project">
+		<email>accessibility@gentoo.org</email>
+		<name>Gentoo Accessibility Project</name>
+	</maintainer>
 	<use>
-		<flag name='kdepim'>Use <pkg>kde-base/kdepimlibs</pkg></flag>
-		<flag name='opencv'>Use <pkg>media-libs/opencv</pkg></flag>
-		<flag name='sphinx'>Build sphinx backend (pulls <pkg>app-accessibility/julius</pkg> if disabled</flag>
+		<flag name="kdepim">Use <pkg>kde-apps/kdepimlibs</pkg></flag>
+		<flag name="opencv">Use <pkg>media-libs/opencv</pkg></flag>
+		<flag name="sphinx">Build sphinx backend (pulls <pkg>app-accessibility/julius</pkg> if disabled</flag>
 	</use>
 </pkgmetadata>
-
diff --git a/app-accessibility/simon/simon-0.4.0.ebuild b/app-accessibility/simon/simon-0.4.0.ebuild
deleted file mode 100644
index 3a9ecad..0000000
--- a/app-accessibility/simon/simon-0.4.0.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# KEEP KDE ECLASSES OUT OF HERE
-
-# TODO: qaccessibilityclient support (not in portage)
-# https://projects.kde.org/projects/playground/accessibility/libkdeaccessibilityclient/repository
-# TODO: julius
-
-EAPI=5
-
-inherit eutils multilib gnome2-utils cmake-utils
-
-DESCRIPTION="Open-source speech recognition program for replacing mouse and keyboard"
-HOMEPAGE="http://simon-listens.org/"
-SRC_URI="mirror://kde/stable/simon/${PV}/src/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="kdepim libsamplerate nls opencv sphinx"
-
-RDEPEND="
-	dev-qt/qtcore:4
-	dev-qt/qtdbus:4
-	dev-qt/qtgui:4
-	dev-qt/qtscript:4
-	dev-qt/qtsql:4
-	kde-base/kdelibs:4
-	media-libs/alsa-lib
-	x11-libs/libX11
-	x11-libs/libXtst
-	x11-libs/qwt:6
-	kdepim? ( kde-base/kdepimlibs:4 )
-	libsamplerate? ( media-libs/libsamplerate )
-	nls? (
-		kde-apps/kde4-l10n
-		virtual/libintl
-	)
-	opencv? ( media-libs/opencv )
-	sphinx? (
-		>=app-accessibility/pocketsphinx-0.8
-		>=app-accessibility/sphinxbase-0.8
-		>=app-accessibility/SphinxTrain-1
-	)
-	!sphinx? ( app-accessibility/julius )"
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-libdir.patch \
-		"${FILESDIR}"/${P}-linguas.patch \
-		"${FILESDIR}"/${P}-opencv.patch \
-		"${FILESDIR}"/${P}-sphinx.patch
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DSIMON_LIB_INSTALL_DIR=/usr/$(get_libdir)
-		-DBackendType=$(usex sphinx "both" "jhtk")
-		$(cmake-utils_use_with sphinx Sphinxbase)
-		$(cmake-utils_use_with sphinx Pocketsphinx)
-		$(cmake-utils_use_with kdepim KdepimLibs)
-		$(cmake-utils_use_with libsamplerate LibSampleRate)
-		$(cmake-utils_use_with opencv OpenCV)
-		$(cmake-utils_use_enable nls NLS)
-	)
-
-	cmake-utils_src_configure
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-
-	elog "optional dependencies:"
-	elog "  kde-apps/jovie (support for Jovie TTS system)"
-	use sphinx && elog "  app-accessibility/julius (alternative backend)"
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/app-accessibility/simon/simon-0.4.1.ebuild b/app-accessibility/simon/simon-0.4.1.ebuild
index b2b9c34..3f44351 100644
--- a/app-accessibility/simon/simon-0.4.1.ebuild
+++ b/app-accessibility/simon/simon-0.4.1.ebuild
@@ -32,7 +32,7 @@
 	x11-libs/libX11
 	x11-libs/libXtst
 	x11-libs/qwt:6
-	kdepim? ( kde-base/kdepimlibs:4 )
+	kdepim? ( kde-apps/kdepimlibs:4 )
 	libsamplerate? ( media-libs/libsamplerate )
 	nls? (
 		kde-apps/kde4-l10n
@@ -51,11 +51,12 @@
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-libdir.patch \
-		"${FILESDIR}"/${P}-linguas.patch \
-		"${FILESDIR}"/${P}-sphinx.patch
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-libdir.patch
+	"${FILESDIR}"/${P}-linguas.patch
+	"${FILESDIR}"/${P}-sphinx.patch
+	"${FILESDIR}"/${P}-opencv-include.patch
+)
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/app-accessibility/sound-icons/metadata.xml b/app-accessibility/sound-icons/metadata.xml
index 04c0d89..4e89c04 100644
--- a/app-accessibility/sound-icons/metadata.xml
+++ b/app-accessibility/sound-icons/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>accessibility</herd>
-<maintainer>
+<maintainer type="person">
   <email>williamh@gentoo.org</email>
 </maintainer>
+<maintainer type="project">
+  <email>accessibility@gentoo.org</email>
+  <name>Gentoo Accessibility Project</name>
+</maintainer>
 <longdescription lang="en">
 This is a collection of sound icons which can be used by speech dispatcher.
 </longdescription>
diff --git a/app-accessibility/speakup/metadata.xml b/app-accessibility/speakup/metadata.xml
index f7b66d2..8fb4aba 100644
--- a/app-accessibility/speakup/metadata.xml
+++ b/app-accessibility/speakup/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>accessibility</herd>
-<maintainer>
+<maintainer type="person">
   <email>williamh@gentoo.org</email>
 </maintainer>
+<maintainer type="project">
+  <email>accessibility@gentoo.org</email>
+  <name>Gentoo Accessibility Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-accessibility/speech-dispatcher/Manifest b/app-accessibility/speech-dispatcher/Manifest
index 68a1f1b..7fffba5 100644
--- a/app-accessibility/speech-dispatcher/Manifest
+++ b/app-accessibility/speech-dispatcher/Manifest
@@ -1 +1,2 @@
 DIST speech-dispatcher-0.8.1.tar.gz 1309969 SHA256 d25727239bbee4ee7881dd5e23e4da64a184b2ff3c8c9830088a671fb23b7757 SHA512 35f1ae547001a45d7945406ae5672829ff9ab6ac3f0cccb9eb3670dd92888a63c7cc4270ee90b5a166e6788afe3b117b5c3ef62c41a9df9f9af94dc4e0948fe8 WHIRLPOOL 945ef7ab1d771dc1e3727f223cfadfd309db03813f11fe995c0f4caf3a6f24bc9abc18e1f2f342b072bcd5fd0d626dae315f1fd0228d4172e051a2aba1255092
+DIST speech-dispatcher-0.8.3.tar.gz 1292321 SHA256 96a293b2ba1e2498f1280c75a9607891a9990947a8d87e9855c2a642c93f1e4f SHA512 48eaa1fb27a14ad6c6a1f214044fbddde85ff07e636355e75f4f3ac1e46cea0cbbbd2cb9ce01ce4b9cb27d5395d840bd38afd2c65ec0fabcc8787483ae7a7b67 WHIRLPOOL 606bee401a98c91aa34f071007cabc3d7ad5f2a5a9425a32d40a8cce75a4b13795b4877a42451be37ea14a68a008fc1e0e063d881c08a78dce41f3a800962fd1
diff --git a/app-accessibility/speech-dispatcher/metadata.xml b/app-accessibility/speech-dispatcher/metadata.xml
index 9c608d4..3b8394d 100644
--- a/app-accessibility/speech-dispatcher/metadata.xml
+++ b/app-accessibility/speech-dispatcher/metadata.xml
@@ -1,11 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>accessibility</herd>
-  <herd>sound</herd>
-  <maintainer>
+  <maintainer type="person">
     <email>williamh@gentoo.org</email>
   </maintainer>
+  <maintainer type="project">
+    <email>accessibility@gentoo.org</email>
+    <name>Gentoo Accessibility Project</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
   <use>
     <flag name="espeak">Adds support for espeak speech engine</flag>
     <flag name="flite">Adds support for flite speech engine</flag>
diff --git a/app-accessibility/speech-dispatcher/speech-dispatcher-0.8.3.ebuild b/app-accessibility/speech-dispatcher/speech-dispatcher-0.8.3.ebuild
new file mode 100644
index 0000000..e7bd9e1
--- /dev/null
+++ b/app-accessibility/speech-dispatcher/speech-dispatcher-0.8.3.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python3_3 python3_4 )
+
+inherit eutils python-r1
+
+DESCRIPTION="Speech synthesis interface"
+HOMEPAGE="http://www.freebsoft.org/speechd"
+SRC_URI="http://www.freebsoft.org/pub/projects/speechd/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="alsa ao +espeak flite nas pulseaudio python static-libs"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+COMMON_DEPEND="python? ( ${PYTHON_DEPS} )
+	>=dev-libs/dotconf-1.3
+	>=dev-libs/glib-2.28:2
+	>=media-libs/libsndfile-1.0.2
+	alsa? ( media-libs/alsa-lib )
+	ao? ( media-libs/libao )
+	espeak? ( app-accessibility/espeak )
+	flite? ( app-accessibility/flite )
+	nas? ( media-libs/nas )
+	pulseaudio? ( media-sound/pulseaudio )"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.40.0
+	virtual/pkgconfig"
+	RDEPEND="${COMMON_DEPEND}
+	dev-python/pyxdg"
+
+src_configure() {
+	local myeconfargs=(
+		--disable-python
+		$(use_enable static-libs static)
+		$(use_with alsa)
+		$(use_with ao libao)
+		$(use_with espeak)
+		$(use_with flite)
+		$(use_with pulseaudio pulse)
+		$(use_with nas)
+	)
+	econf ${myeconfargs[@]}
+}
+
+src_compile() {
+	use python && python_copy_sources
+
+	emake
+
+	if use python; then
+		building() {
+			cd src/api/python || die
+			emake \
+				pyexecdir="$(python_get_sitedir)" \
+				pythondir="$(python_get_sitedir)"
+		}
+		python_foreach_impl run_in_build_dir building
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc ANNOUNCE AUTHORS BUGS ChangeLog FAQ NEWS README*
+
+	prune_libtool_files --all
+
+	if use python; then
+		installation() {
+			cd src/api/python || die
+			emake \
+				DESTDIR="${D}" \
+				pyexecdir="$(python_get_sitedir)" \
+				pythondir="$(python_get_sitedir)" \
+				install
+		}
+		python_foreach_impl run_in_build_dir installation
+		python_replicate_script "${ED}"/usr/bin/spd-conf
+	fi
+}
+
+pkg_postinst() {
+	local editconfig="n"
+	if ! use espeak; then
+		ewarn "You have disabled espeak, which is speech-dispatcher's"
+		ewarn "default speech synthesizer."
+		ewarn
+		editconfig="y"
+	fi
+	if ! use pulseaudio; then
+		ewarn "You have disabled pulseaudio support."
+		ewarn "pulseaudio is speech-dispatcher's default audio subsystem."
+		ewarn
+		editconfig="y"
+	fi
+	if [[ "${editconfig}" == "y" ]]; then
+		ewarn "You must edit ${EROOT}etc/speech-dispatcher/speechd.conf"
+		ewarn "and make sure the settings there match your system."
+		ewarn
+	fi
+	elog "For festival support, you need to"
+	elog "install app-accessibility/festival-freebsoft-utils."
+}
diff --git a/app-accessibility/speech-tools/metadata.xml b/app-accessibility/speech-tools/metadata.xml
index 3378625..78e53c2 100644
--- a/app-accessibility/speech-tools/metadata.xml
+++ b/app-accessibility/speech-tools/metadata.xml
@@ -1,9 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>accessibility</herd>
-<herd>sound</herd>
-<maintainer>
+<maintainer type="person">
 	<email>neurogeek@gentoo.org</email>
 </maintainer>
+<maintainer type="project">
+	<email>accessibility@gentoo.org</email>
+	<name>Gentoo Accessibility Project</name>
+</maintainer>
+<maintainer type="project">
+	<email>sound@gentoo.org</email>
+	<name>Gentoo Sound project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-accessibility/speechd-el/metadata.xml b/app-accessibility/speechd-el/metadata.xml
index dc145bb..298ece6 100644
--- a/app-accessibility/speechd-el/metadata.xml
+++ b/app-accessibility/speechd-el/metadata.xml
@@ -1,12 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>accessibility</herd>
-<herd>emacs</herd>
-<maintainer>
+<maintainer type="person">
 <email>williamh@gentoo.org</email>
 </maintainer>
- <use>
+<maintainer type="project">
+  <email>accessibility@gentoo.org</email>
+  <name>Gentoo Accessibility Project</name>
+</maintainer>
+<maintainer type="project">
+  <email>gnu-emacs@gentoo.org</email>
+  <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<use>
   <flag name="brltty">brltty support</flag>
 </use>
 </pkgmetadata>
diff --git a/app-accessibility/speechd-up/metadata.xml b/app-accessibility/speechd-up/metadata.xml
index 1212c46..8a688c3 100644
--- a/app-accessibility/speechd-up/metadata.xml
+++ b/app-accessibility/speechd-up/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>accessibility</herd>
-<maintainer>
+<maintainer type="person">
 <email>williamh@gentoo.org</email>
 </maintainer>
+<maintainer type="project">
+<email>accessibility@gentoo.org</email>
+<name>Gentoo Accessibility Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-accessibility/sphinx2/metadata.xml b/app-accessibility/sphinx2/metadata.xml
index a5e5fcc..5272aff 100644
--- a/app-accessibility/sphinx2/metadata.xml
+++ b/app-accessibility/sphinx2/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>accessibility</herd>
-	<herd>sound</herd>
+	<maintainer type="project">
+		<email>accessibility@gentoo.org</email>
+		<name>Gentoo Accessibility Project</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">cmusphinx</remote-id>
 	</upstream>
diff --git a/app-accessibility/sphinx3/metadata.xml b/app-accessibility/sphinx3/metadata.xml
index 831e814..b41f634 100644
--- a/app-accessibility/sphinx3/metadata.xml
+++ b/app-accessibility/sphinx3/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>accessibility</herd>
+	<maintainer type="project">
+		<email>accessibility@gentoo.org</email>
+		<name>Gentoo Accessibility Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">cmusphinx</remote-id>
 	</upstream>
diff --git a/app-accessibility/sphinxbase/metadata.xml b/app-accessibility/sphinxbase/metadata.xml
index d72ef0f..c381bea 100644
--- a/app-accessibility/sphinxbase/metadata.xml
+++ b/app-accessibility/sphinxbase/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>accessibility</herd>
+  <maintainer type="project">
+    <email>accessibility@gentoo.org</email>
+    <name>Gentoo Accessibility Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">cmusphinx</remote-id>
   </upstream>
diff --git a/app-accessibility/yasr/metadata.xml b/app-accessibility/yasr/metadata.xml
index 6e084ef..57bad56 100644
--- a/app-accessibility/yasr/metadata.xml
+++ b/app-accessibility/yasr/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>accessibility</herd>
+	<maintainer type="project">
+		<email>accessibility@gentoo.org</email>
+		<name>Gentoo Accessibility Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">yasr</remote-id>
 	</upstream>
diff --git a/app-admin/389-admin-console/metadata.xml b/app-admin/389-admin-console/metadata.xml
index f941fa3..2444066 100644
--- a/app-admin/389-admin-console/metadata.xml
+++ b/app-admin/389-admin-console/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
-<maintainer>
-	<email>maintainer-needed@gentoo.org</email>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
 </maintainer>
 </pkgmetadata>
diff --git a/app-admin/389-console/metadata.xml b/app-admin/389-console/metadata.xml
index 2061856..2444066 100644
--- a/app-admin/389-console/metadata.xml
+++ b/app-admin/389-console/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
-<maintainer>
-        <email>maintainer-needed@gentoo.org</email>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
 </maintainer>
 </pkgmetadata>
diff --git a/app-admin/389-ds-console/metadata.xml b/app-admin/389-ds-console/metadata.xml
index 2061856..2444066 100644
--- a/app-admin/389-ds-console/metadata.xml
+++ b/app-admin/389-ds-console/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
-<maintainer>
-        <email>maintainer-needed@gentoo.org</email>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
 </maintainer>
 </pkgmetadata>
diff --git a/app-admin/abrt/abrt-2.0.12-r2.ebuild b/app-admin/abrt/abrt-2.0.12-r2.ebuild
index b9da8ae..432553a 100644
--- a/app-admin/abrt/abrt-2.0.12-r2.ebuild
+++ b/app-admin/abrt/abrt-2.0.12-r2.ebuild
@@ -10,7 +10,7 @@
 inherit autotools eutils gnome2-utils python-single-r1 systemd user
 
 DESCRIPTION="Automatic bug detection and reporting tool"
-HOMEPAGE="https://fedorahosted.org/abrt/"
+HOMEPAGE="https://github.com/abrt/abrt/wiki/ABRT-Project"
 SRC_URI="https://fedorahosted.org/released/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/app-admin/abrt/metadata.xml b/app-admin/abrt/metadata.xml
index dad9001..996e7ca 100644
--- a/app-admin/abrt/metadata.xml
+++ b/app-admin/abrt/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
+	<maintainer type="project">
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-admin/amazon-ec2-init/metadata.xml b/app-admin/amazon-ec2-init/metadata.xml
index 1470e03..097975e 100644
--- a/app-admin/amazon-ec2-init/metadata.xml
+++ b/app-admin/amazon-ec2-init/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
 </pkgmetadata>
diff --git a/app-admin/analog/metadata.xml b/app-admin/analog/metadata.xml
index f9d50da..097975e 100644
--- a/app-admin/analog/metadata.xml
+++ b/app-admin/analog/metadata.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<description>This package lacks a primary herd or maintainer.</description>
-	</maintainer>
 </pkgmetadata>
diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index bd11ba0..fd6a560 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -1 +1,3 @@
 DIST ansible-1.9.4.tar.gz 937120 SHA256 972c2face49f1577bd0ff7989440bfe2820e66fb10d7579915cc536bccfa6fe3 SHA512 53ef5b3390be620cedc92687c7c9853c42f38547494f9b77056d5ea48ccd8f43d193648a7f4569fcba5afad343a9202b123296ab47c8cd02eecfe455d83b9586 WHIRLPOOL 0b88a27f690ff940eae1969ff163d8f8c26df038d2e9aa76694bdba1448ac9cbe8123795d0787e528c6d22cf66cc01d6b89add8e3e97bbb107a3f1a96860fd8e
+DIST ansible-2.0.0.1.tar.gz 1524249 SHA256 1085c1fae3b59f8e55a64b949489f1ddcd811a0c32d9df8ac18abf44a430f3b5 SHA512 2823252a7922c417d8495709c53db85d33ae925120c3572acafe4e11c4d5ba5b9acdec72414606eb9ef4f66ca15db8fe52e0f14623ceef5165a30eb4e249d136 WHIRLPOOL 0b4ba3a632d40413c61b7bd14315f14b64e459cdebd450230ed75711f97bec04ee8a8cc4c4a79e42dfd62654e0f8ae5ffa0fdea40d3874f199a16e45d60c0937
+DIST ansible-2.0.0.2.tar.gz 1497944 SHA256 27db0b99113fab85b1430c361c7790a0aa7f5c614c9af13362e2adbba07e5828 SHA512 bf034384849d3f065ff77982e2e47a94727fc2982f0dac8d67efda2646dcdbd52ba9cc3ddfcdb9cd8210af0935f6f42946cc8ddc659d62cccd670e5d55c7dfa0 WHIRLPOOL bbf15cbdc50bfe2c33e22a4c9139663c9a622d70f59450953f85c088daa6fed88fbe4f46933c8998abdec20fed44846838a0e5a2ada76710c438f3c9769e15be
diff --git a/app-admin/ansible/ansible-2.0.0.1-r2.ebuild b/app-admin/ansible/ansible-2.0.0.1-r2.ebuild
new file mode 100644
index 0000000..ddf6e66
--- /dev/null
+++ b/app-admin/ansible/ansible-2.0.0.1-r2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 eutils versionator
+
+DESCRIPTION="Model-driven deployment, config management, and command execution framework"
+HOMEPAGE="http://ansible.com/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x64-macos"
+IUSE="keyczar test"
+
+RDEPEND="
+	keyczar? ( dev-python/keyczar[${PYTHON_USEDEP}] )
+	dev-python/paramiko[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
+	dev-python/httplib2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	net-misc/sshpass
+	virtual/ssh
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+		<dev-python/mock-1.1[${PYTHON_USEDEP}]
+		dev-python/passlib[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/unittest2[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)"
+
+# not included in release tarball
+RESTRICT="test"
+
+python_test() {
+	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
+}
+
+python_install_all() {
+	EXAMPLES=( examples )
+	distutils-r1_python_install_all
+
+	doman docs/man/man1/*.1
+}
diff --git a/app-admin/ansible/ansible-2.0.0.2.ebuild b/app-admin/ansible/ansible-2.0.0.2.ebuild
new file mode 100644
index 0000000..ddf6e66
--- /dev/null
+++ b/app-admin/ansible/ansible-2.0.0.2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 eutils versionator
+
+DESCRIPTION="Model-driven deployment, config management, and command execution framework"
+HOMEPAGE="http://ansible.com/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x64-macos"
+IUSE="keyczar test"
+
+RDEPEND="
+	keyczar? ( dev-python/keyczar[${PYTHON_USEDEP}] )
+	dev-python/paramiko[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
+	dev-python/httplib2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	net-misc/sshpass
+	virtual/ssh
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+		<dev-python/mock-1.1[${PYTHON_USEDEP}]
+		dev-python/passlib[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/unittest2[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)"
+
+# not included in release tarball
+RESTRICT="test"
+
+python_test() {
+	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
+}
+
+python_install_all() {
+	EXAMPLES=( examples )
+	distutils-r1_python_install_all
+
+	doman docs/man/man1/*.1
+}
diff --git a/app-admin/ansible/ansible-9999.ebuild b/app-admin/ansible/ansible-9999.ebuild
index 4284a69..656b4c7 100644
--- a/app-admin/ansible/ansible-9999.ebuild
+++ b/app-admin/ansible/ansible-9999.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$
 
@@ -6,26 +6,28 @@
 
 PYTHON_COMPAT=( python2_7 )
 
-inherit distutils-r1 eutils git-r3 readme.gentoo
+inherit distutils-r1 eutils git-r3
 
-DESCRIPTION="Radically simple deployment, model-driven configuration management, and command execution framework"
+DESCRIPTION="Model-driven deployment, config management, and command execution framework"
 HOMEPAGE="http://ansible.com/"
-SRC_URI=""
+# the version here is special because upstream did a 2.0.0 release on accident one time...
 EGIT_REPO_URI="git://github.com/ansible/ansible.git"
 EGIT_BRANCH="devel"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS=""
-IUSE="test"
+IUSE="keyczar test"
 
 RDEPEND="
-	dev-python/httplib2[${PYTHON_USEDEP}]
+	keyczar? ( dev-python/keyczar[${PYTHON_USEDEP}] )
+	dev-python/paramiko[${PYTHON_USEDEP}]
 	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/keyczar[${PYTHON_USEDEP}]
-	>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
+	dev-python/httplib2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
 	net-misc/sshpass
 	virtual/ssh
 "
@@ -33,9 +35,12 @@
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
 		${RDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+		<dev-python/mock-1.1[${PYTHON_USEDEP}]
 		dev-python/passlib[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/unittest2[${PYTHON_USEDEP}]
 		dev-vcs/git
 	)"
 
@@ -55,15 +60,4 @@
 	distutils-r1_python_install_all
 
 	doman docs/man/man1/*.1
-
-	newenvd "${FILESDIR}"/${PN}.env 95ansible
-}
-
-src_install() {
-	distutils-r1_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	optfeature "Alternative ssh transport" dev-python/paramiko
 }
diff --git a/app-admin/ansible/metadata.xml b/app-admin/ansible/metadata.xml
index cc686a3..ca05cd9 100644
--- a/app-admin/ansible/metadata.xml
+++ b/app-admin/ansible/metadata.xml
@@ -1,19 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>pinkbyte@gentoo.org</email>
     <name>Sergey Popov</name>
   </maintainer>
-  <maintainer>
-    <email>jlec@gentoo.org</email>
-    <name>Justin Lecher</name>
+  <maintainer type="person">
+    <email>chainsaw@gentoo.org</email>
+    <name>Tony Vroon</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>prometheanfire@gentoo.org</email>
+    <name>Matthew Thode</name>
   </maintainer>
   <upstream>
     <remote-id type="pypi">ansible</remote-id>
     <remote-id type="github">ansible/ansible</remote-id>
     <bugs-to>https://github.com/ansible/ansible/issues</bugs-to>
   </upstream>
+  <use>
+    <flag name="keyczar">Enable accelerated mode for old ssh clients/servers</flag>
+  </use>
   <longdescription lang="en">
 Radically simple deployment, model-driven configuration management, and 
 command execution framework.
diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest
index 7b119ca..451c580 100644
--- a/app-admin/apache-tools/Manifest
+++ b/app-admin/apache-tools/Manifest
@@ -1,3 +1,3 @@
 DIST httpd-2.2.31.tar.bz2 5610489 SHA256 f32f9d19f535dac63b06cb55dfc023b40dcd28196b785f79f9346779e22f26ac SHA512 5aa47d4b76f692bbd8b309135ff99152df98cf69b505b9daf3f13f7f2a31443eaf4995161adfbc47a133b4d0e091fda2d95fc6b87a956f0ada18d7466ee28e74 WHIRLPOOL a2e3e53c51719cb6f7e641b41788cd89ce7b4d2ea105b403bfa3b3d4479b69c5604228269062f66722594e105e91121d05b1c9f27ca7dc4ecfcf339da8b8375c
 DIST httpd-2.4.16.tar.bz2 5101005 SHA256 ac660b47aaa7887779a6430404dcb40c0b04f90ea69e7bd49a40552e9ff13743 SHA512 039750ff962c08a7261896acc8272e59874d066f7d52721aaf967ddb737fc5716acc47e1effaf7c4d156ba61bc393e0738f64f8e89cc277ba2651e0f61d56628 WHIRLPOOL f67a4449409cd1a50fcdf4d192a3a0c90e6e3483269d19e9f0454557cbfbda7fb3535063e1738de60d6f524e22eac7fc159d2abe5a60952219c1b01ee143ae05
-DIST httpd-2.4.17.tar.bz2 5157721 SHA256 331e035dec81d3db95b048f036f4d7b1a97ec8daa5b377bde42d4ccf1f2eb798 SHA512 d818dbd4b138db592a98fecdf5ae13dfadc19f9553e98bdafbdadd4693ae19bb44c96c8c279e9546978bbce55b9286ce3c4ae69cf701a9812be134a3a517b1f6 WHIRLPOOL f18dd92091e0d7f051f55276dc99656b299f3aaff5375d2fe286e18c33cfeb6887db9c792a426e88655dc0523e66008b2fc534ee1a5ae5b2ae5000bef1509aa8
+DIST httpd-2.4.18.tar.bz2 5181291 SHA256 0644b050de41f5c9f67c825285049b144690421acb709b06fe53eddfa8a9fd4c SHA512 8e342cc447313c07275869381c2d6f2314a96547f0c86ee1c617975d0f7ad8efb47113ab5995c733108ae4dec31ad79847e397ecea859b60414ffe1680617a31 WHIRLPOOL e0ae6b8581e2993e0f873d8928e3b54f1df750f29e82d2f1308376af440308c56e89dfb3ec051cdf164a271580ccac71ebc5b038e23ca65a9221fdfc08b47b41
diff --git a/app-admin/apache-tools/apache-tools-2.4.17.ebuild b/app-admin/apache-tools/apache-tools-2.4.18.ebuild
similarity index 100%
rename from app-admin/apache-tools/apache-tools-2.4.17.ebuild
rename to app-admin/apache-tools/apache-tools-2.4.18.ebuild
diff --git a/app-admin/apache-tools/metadata.xml b/app-admin/apache-tools/metadata.xml
index 0530e46..e9a2f7c 100644
--- a/app-admin/apache-tools/metadata.xml
+++ b/app-admin/apache-tools/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-        <maintainer>
+        <maintainer type="person">
                 <email>polynomial-c@gentoo.org</email>
                 <name>Lars Wendler</name>
         </maintainer>
diff --git a/app-admin/apachetop/metadata.xml b/app-admin/apachetop/metadata.xml
index 48919ac..3d73883 100644
--- a/app-admin/apachetop/metadata.xml
+++ b/app-admin/apachetop/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
+<maintainer type="person">
 	<email>neurogeek@gentoo.org</email>
 	<name>Jesus Rivero</name>
 </maintainer>
diff --git a/app-admin/apg/metadata.xml b/app-admin/apg/metadata.xml
index 9cf9bbc..5abd6e1 100644
--- a/app-admin/apg/metadata.xml
+++ b/app-admin/apg/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
-<maintainer>
+<maintainer type="person">
 	<email>DuPol@gmx.de</email>
 	<name>Dustin Polke</name>
 	<description>Proxy Maintainer. CC him on bugs.</description>
 </maintainer>
+<maintainer type="project">
+	<email>proxy-maint@gentoo.org</email>
+	<name>Proxy Maintainers</name>
+</maintainer>
 <longdescription>Another Password Generator. Generates random, pronouncable passwords with a variety of algorithms</longdescription>
 </pkgmetadata>
diff --git a/app-admin/augeas/metadata.xml b/app-admin/augeas/metadata.xml
index ffb39ba..2b1c8d9 100644
--- a/app-admin/augeas/metadata.xml
+++ b/app-admin/augeas/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 	<email>prometheanfire@gentoo.org</email>
 	</maintainer>
 	<longdescription lang="en">
diff --git a/app-admin/authbind/metadata.xml b/app-admin/authbind/metadata.xml
index 5b2a5c5..5c23291 100644
--- a/app-admin/authbind/metadata.xml
+++ b/app-admin/authbind/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>dev-zero@gentoo.org</email>
 		<name>Tiziano Müller</name>
 	</maintainer>
diff --git a/app-admin/aws-as-tools/metadata.xml b/app-admin/aws-as-tools/metadata.xml
index 1a971ab..8a33e22 100644
--- a/app-admin/aws-as-tools/metadata.xml
+++ b/app-admin/aws-as-tools/metadata.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proxy-maintainers</herd>
-  <maintainer>
+  <maintainer type="person">
     <email>lxnay@gentoo.org</email>
   </maintainer>
-  <maintainer>
+  <maintainer type="person">
     <email>sergey.zhuga@gmail.com</email>
     <name>Sergey Zhuga</name>
     <description>Proxy maintainers. CC him on bugs</description>
   </maintainer>
+<maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-admin/aws-cw-tools/metadata.xml b/app-admin/aws-cw-tools/metadata.xml
index 1a971ab..8a33e22 100644
--- a/app-admin/aws-cw-tools/metadata.xml
+++ b/app-admin/aws-cw-tools/metadata.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proxy-maintainers</herd>
-  <maintainer>
+  <maintainer type="person">
     <email>lxnay@gentoo.org</email>
   </maintainer>
-  <maintainer>
+  <maintainer type="person">
     <email>sergey.zhuga@gmail.com</email>
     <name>Sergey Zhuga</name>
     <description>Proxy maintainers. CC him on bugs</description>
   </maintainer>
+<maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-admin/aws-elb-tools/metadata.xml b/app-admin/aws-elb-tools/metadata.xml
index c964a88..97b78fe 100644
--- a/app-admin/aws-elb-tools/metadata.xml
+++ b/app-admin/aws-elb-tools/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>lxnay@gentoo.org</email>
   </maintainer>
 </pkgmetadata>
diff --git a/app-admin/aws-iam-tools/metadata.xml b/app-admin/aws-iam-tools/metadata.xml
index 1a971ab..8a33e22 100644
--- a/app-admin/aws-iam-tools/metadata.xml
+++ b/app-admin/aws-iam-tools/metadata.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proxy-maintainers</herd>
-  <maintainer>
+  <maintainer type="person">
     <email>lxnay@gentoo.org</email>
   </maintainer>
-  <maintainer>
+  <maintainer type="person">
     <email>sergey.zhuga@gmail.com</email>
     <name>Sergey Zhuga</name>
     <description>Proxy maintainers. CC him on bugs</description>
   </maintainer>
+<maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-admin/aws-rds-tools/metadata.xml b/app-admin/aws-rds-tools/metadata.xml
index 1a971ab..8a33e22 100644
--- a/app-admin/aws-rds-tools/metadata.xml
+++ b/app-admin/aws-rds-tools/metadata.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proxy-maintainers</herd>
-  <maintainer>
+  <maintainer type="person">
     <email>lxnay@gentoo.org</email>
   </maintainer>
-  <maintainer>
+  <maintainer type="person">
     <email>sergey.zhuga@gmail.com</email>
     <name>Sergey Zhuga</name>
     <description>Proxy maintainers. CC him on bugs</description>
   </maintainer>
+<maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-admin/bastille/metadata.xml b/app-admin/bastille/metadata.xml
index c60ce0b..fb9c3ca 100644
--- a/app-admin/bastille/metadata.xml
+++ b/app-admin/bastille/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>hardened</herd>
+	<maintainer type="project">
+		<email>hardened@gentoo.org</email>
+		<name>Gentoo Hardened</name>
+	</maintainer>
 	<longdescription>The Bastille Hardening System attempts to "harden" or "tighten" Unix operating systems.</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">bastille-linux</remote-id>
diff --git a/app-admin/bcfg2/metadata.xml b/app-admin/bcfg2/metadata.xml
index 0f2dd7f..e26e9da 100644
--- a/app-admin/bcfg2/metadata.xml
+++ b/app-admin/bcfg2/metadata.xml
@@ -1,19 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
-<maintainer>
+<maintainer type="person">
   <email>xmw@gentoo.org</email>
   <name>Michael Weber</name>
   <description>Proxy Maintainer</description>
 </maintainer>
-<maintainer>
+<maintainer type="person">
 	<email>mjinks@uchicago.edu</email>
 	<name>Michael Jinks</name>
 </maintainer>
+<maintainer type="project">
+  <email>proxy-maint@gentoo.org</email>
+  <name>Proxy Maintainers</name>
+</maintainer>
 <use>
-  <flag name='cheetah'>Include dev-python/cheetah support</flag>
-  <flag name='genshi'>Include dev-python/genshi support</flag>
-  <flag name='server'>Installs scripts to be used on the server-side of this app</flag>
+  <flag name="cheetah">Include dev-python/cheetah support</flag>
+  <flag name="genshi">Include dev-python/genshi support</flag>
+  <flag name="server">Installs scripts to be used on the server-side of this app</flag>
 </use>
 </pkgmetadata>
diff --git a/app-admin/calamares/metadata.xml b/app-admin/calamares/metadata.xml
index b719686..f280356 100644
--- a/app-admin/calamares/metadata.xml
+++ b/app-admin/calamares/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>johu@gentoo.org</email>
 		<name>Johannes Huber</name>
 	</maintainer>
@@ -18,4 +18,3 @@
 		<remote-id type="github">calamares/calamares</remote-id>
 	</upstream>
 </pkgmetadata>
-
diff --git a/app-admin/cancd/metadata.xml b/app-admin/cancd/metadata.xml
index a732fd8..a4e0d35 100644
--- a/app-admin/cancd/metadata.xml
+++ b/app-admin/cancd/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <maintainer>
+    <maintainer type="person">
         <email>robbat2@gentoo.org</email>
         <name>Robin H. Johnson</name>
     </maintainer>
diff --git a/app-admin/ccze/metadata.xml b/app-admin/ccze/metadata.xml
index 2c85fc4..a51daae 100644
--- a/app-admin/ccze/metadata.xml
+++ b/app-admin/ccze/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
+<maintainer type="person">
   <email>joker@gentoo.org</email>
   <name>Christian Birchinger</name>
   <description>Please take over if you want it</description>
diff --git a/app-admin/cdist/metadata.xml b/app-admin/cdist/metadata.xml
index 688513d..cca0990 100644
--- a/app-admin/cdist/metadata.xml
+++ b/app-admin/cdist/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proxy-maintainers</herd>
-  <maintainer>
+  <maintainer type="person">
     <email>nerve@ipwar.ch</email>
     <name>Daniel Heule</name>
     <description>Maintainer. Assign bugs to him</description>
   </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">cdist</remote-id>
   </upstream>
diff --git a/app-admin/cgmanager/cgmanager-0.39.ebuild b/app-admin/cgmanager/cgmanager-0.39.ebuild
index 1cae026..bac57a0 100644
--- a/app-admin/cgmanager/cgmanager-0.39.ebuild
+++ b/app-admin/cgmanager/cgmanager-0.39.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc64 ~x86"
 IUSE="pam selinux"
 
 RDEPEND="sys-libs/libnih[dbus]
diff --git a/app-admin/cgmanager/metadata.xml b/app-admin/cgmanager/metadata.xml
index 5d74e34..734f29e 100644
--- a/app-admin/cgmanager/metadata.xml
+++ b/app-admin/cgmanager/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-		<maintainer>
+		<maintainer type="person">
 				<email>perfinion@gentoo.org</email>
 				<name>Jason Zaman</name>
 		</maintainer>
-		<maintainer>
+		<maintainer type="person">
 				<email>hwoarang@gentoo.org</email>
 				<name>Markos Chandras</name>
 		</maintainer>
diff --git a/app-admin/checkrestart/metadata.xml b/app-admin/checkrestart/metadata.xml
index 1470e03..9f5eb23 100644
--- a/app-admin/checkrestart/metadata.xml
+++ b/app-admin/checkrestart/metadata.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
+  <maintainer type="person">
+    <email>aidecoe@gentoo.org</email>
+    <name>Amadeusz Żołnowski</name>
   </maintainer>
 </pkgmetadata>
diff --git a/app-admin/checksec/Manifest b/app-admin/checksec/Manifest
new file mode 100644
index 0000000..fd6dfbe
--- /dev/null
+++ b/app-admin/checksec/Manifest
@@ -0,0 +1 @@
+DIST checksec-1.7.2.tar.gz 16717 SHA256 eb17f2162e7f563ba0f97d9cf15f92cf1ba2d360c8293a33d66573d5a48822a8 SHA512 1f1c1867b889266c0d035c3f7b028e61ed2cf3413caa789dfb8589b56834194e3367b3868a80984242dadb7629a9a5a7563376a2f37e3971899e2ecc319ee2f1 WHIRLPOOL 3abf206d666751b2449387848afb320185102ddc0f1685db2aa6f4e974a3349e1c4d9551565459d9070cac5218354af1919c5c70af6f0131b9443fcf24a72d35
diff --git a/app-admin/checksec/checksec-1.7.2.ebuild b/app-admin/checksec/checksec-1.7.2.ebuild
new file mode 100644
index 0000000..97a2ca7
--- /dev/null
+++ b/app-admin/checksec/checksec-1.7.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils
+
+MY_PN=${PN}.sh
+DESCRIPTION="Tool to check properties of executables (e.g. ASLR/PIE, RELRO, PaX, Canaries)"
+HOMEPAGE="https://github.com/slimm609/checksec.sh"
+SRC_URI="https://github.com/slimm609/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+S="${WORKDIR}"/${MY_PN}-${PV}
+
+DOCS=( ChangeLog README.md )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-path.patch
+}
+
+src_install() {
+	default
+	dobin ${PN}
+}
diff --git a/app-admin/checksec/files/checksec-1.7.2-path.patch b/app-admin/checksec/files/checksec-1.7.2-path.patch
new file mode 100644
index 0000000..aa048b0
--- /dev/null
+++ b/app-admin/checksec/files/checksec-1.7.2-path.patch
@@ -0,0 +1,24 @@
+From 2065e51b255b5f9c014a0db35ffe5ce9ea946693 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Wed, 6 Jan 2016 17:28:36 +0100
+Subject: [PATCH] Extend ${PATH} so that sysctl is found
+
+---
+ checksec | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/checksec b/checksec
+index 3660e82..0ac685f 100755
+--- a/checksec
++++ b/checksec
+@@ -59,6 +59,7 @@
+ 
+ #set global lang to C
+ export LC_ALL="C"
++export PATH="${PATH}:/usr/sbin/"  # for sysctl
+ 
+ # global vars
+ debug=false
+-- 
+2.7.0
+
diff --git a/app-admin/checksec/metadata.xml b/app-admin/checksec/metadata.xml
new file mode 100644
index 0000000..5d7a81f
--- /dev/null
+++ b/app-admin/checksec/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>sping@gentoo.org</email>
+		<name>Sebastian Pipping</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">slimm609/checksec.sh</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-admin/chroot_safe/metadata.xml b/app-admin/chroot_safe/metadata.xml
index 4145ddd..ae4d575 100644
--- a/app-admin/chroot_safe/metadata.xml
+++ b/app-admin/chroot_safe/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">chrootsafe</remote-id>
 	</upstream>
diff --git a/app-admin/chrootuid/metadata.xml b/app-admin/chrootuid/metadata.xml
index c9141f7..75fc762 100644
--- a/app-admin/chrootuid/metadata.xml
+++ b/app-admin/chrootuid/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>hattya@gentoo.org</email>
    </maintainer>
 </pkgmetadata>
diff --git a/app-admin/chrpath/metadata.xml b/app-admin/chrpath/metadata.xml
index 66cf774..ec89a07 100644
--- a/app-admin/chrpath/metadata.xml
+++ b/app-admin/chrpath/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>prefix</herd>
-	<maintainer>
+	<maintainer type="person">
 		<email>grobian@gentoo.org</email>
 	</maintainer>
+<maintainer type="project">
+		<email>prefix@gentoo.org</email>
+		<name>Gentoo Prefix</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-admin/clog/metadata.xml b/app-admin/clog/metadata.xml
index d1f1caa..143be88 100644
--- a/app-admin/clog/metadata.xml
+++ b/app-admin/clog/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>alicef@gentoo.org</email>
 		<name>Alice Ferrazzi</name>
 	</maintainer>
diff --git a/app-admin/clsync/metadata.xml b/app-admin/clsync/metadata.xml
index c7f8538..9cbe60e 100644
--- a/app-admin/clsync/metadata.xml
+++ b/app-admin/clsync/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>bircoph@gentoo.org</email>
     <name>Andrew Savchenko</name>
   </maintainer>
diff --git a/app-admin/clustershell/clustershell-1.6-r1.ebuild b/app-admin/clustershell/clustershell-1.6-r1.ebuild
new file mode 100644
index 0000000..4b24802
--- /dev/null
+++ b/app-admin/clustershell/clustershell-1.6-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# TODO: test phase
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="xml"
+inherit distutils-r1
+
+DESCRIPTION="Python framework for efficient cluster administration"
+HOMEPAGE="https://cea-hpc.github.com/clustershell/"
+SRC_URI="https://github.com/cea-hpc/clustershell/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="CeCILL-C"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc libressl"
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0 )
+	libressl? ( dev-libs/libressl )"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+src_install() {
+	distutils-r1_src_install
+
+	if use doc ; then
+		local i
+		for i in $(ls -I man "${S}"/doc) ; do
+			dodoc -r doc/${i}
+		done
+	fi
+
+	doman doc/man/man*/*
+
+	insinto /etc/${PN}
+	doins -r conf/*
+}
+
+pkg_postinst() {
+	einfo
+	einfo "Some default system-wide config files have been installed into"
+	einfo "/etc/${PN}"
+	einfo
+}
diff --git a/app-admin/clustershell/metadata.xml b/app-admin/clustershell/metadata.xml
index 21e59a0..28b857c 100644
--- a/app-admin/clustershell/metadata.xml
+++ b/app-admin/clustershell/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
   <upstream>
     <remote-id type="github">cea-hpc/clustershell</remote-id>
   </upstream>
diff --git a/app-admin/collectd/Manifest b/app-admin/collectd/Manifest
index 3bb23b2..81e7cd7 100644
--- a/app-admin/collectd/Manifest
+++ b/app-admin/collectd/Manifest
@@ -1 +1,2 @@
 DIST collectd-5.4.1.tar.bz2 1521907 SHA256 75452129f271cb0aad28e57f12a49070618bbb7b6a9d64cf869e8766fa2f66e0 SHA512 96289f52d3d1da55c862ae9ee2f57972682d7eab87387e97efa41fb5197599e097abd71aed2fe014e26af37c9ae98471e06dd181c725849976242642ce5c9492 WHIRLPOOL 2ed85b9d6d00c4e7dc6af236b637e282f17c6c0b20c1ba3da9c12ea85c5fdea1add2e29165874c7e9620852e422282d489436a4e245b161902f8926185edec16
+DIST collectd-5.5.0.tar.bz2 1824495 SHA256 847684cf5c10de1dc34145078af3fcf6e0d168ba98c14f1343b1062a4b569e88 SHA512 d2c2840f681c10345e02ad8df0f7c581dcb45bee276589fcd96b3dadd281a79ebb3b9a34a186242ef41285dde7fc505432376138ff4f72c4f60f1b840e640017 WHIRLPOOL 6223ca363984ab3777ca89e2cd5011f059b6ca7f5c66c5e7325d3155ce38ef2829caced3ad27e4d5016c5fdba59bb21b9b47d840ea0c4d164c3674b6ee5062ac
diff --git a/app-admin/collectd/collectd-5.4.1-r2.ebuild b/app-admin/collectd/collectd-5.4.1-r2.ebuild
index 5b6a955..a7fc037 100644
--- a/app-admin/collectd/collectd-5.4.1-r2.ebuild
+++ b/app-admin/collectd/collectd-5.4.1-r2.ebuild
@@ -41,7 +41,7 @@
 	powerdns processes protocols python python routeros rrdcached rrdcached rrdtool
 	sensors serial snmp statsd swap syslog table tail target_notification
 	target_replace target_scale target_set tcpconns teamspeak2 ted thermal threshold
-	tokyotyrant unixsock uptime users uuid varnish vmem vserver wireless
+	tokyotyrant unixsock uptime users uuid varnish vmem wireless
 	write_graphite write_http write_mongodb"
 
 COLLECTD_DISABLED_PLUGINS="${COLLECTD_IMPOSSIBLE_PLUGINS} ${COLLECTD_UNTESTED_PLUGINS}"
@@ -107,9 +107,7 @@
 DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
 	collectd_plugins_java?			( >=virtual/jdk-1.6 )
-	kernel_linux? (
-		collectd_plugins_vserver?	( sys-kernel/vserver-sources )
-	)"
+"
 
 RDEPEND="${COMMON_DEPEND}
 	collectd_plugins_java?			( >=virtual/jre-1.6 )
@@ -240,7 +238,7 @@
 	# should work independent of the operating system.
 
 	local linux_plugins="battery cpu cpufreq disk entropy ethstat interface iptables ipvs irq load
-		memory md netlink nfs numa processes serial swap tcpconns thermal users vmem vserver
+		memory md netlink nfs numa processes serial swap tcpconns thermal users vmem
 		wireless"
 
 	local libstatgrab_plugins="cpu disk interface load memory swap users"
diff --git a/app-admin/collectd/collectd-5.5.0.ebuild b/app-admin/collectd/collectd-5.5.0.ebuild
new file mode 100644
index 0000000..d32eaf8
--- /dev/null
+++ b/app-admin/collectd/collectd-5.5.0.ebuild
@@ -0,0 +1,398 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+GENTOO_DEPEND_ON_PERL="no"
+JAVA_PKG_OPT_USE="collectd_plugins_java"
+# XXX: 5.4.1-r0 stated 2* but it builds fine against 3.4
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools eutils fcaps java-pkg-opt-2 linux-info multilib perl-app python-single-r1 systemd user
+
+DESCRIPTION="Collects system statistics and provides mechanisms to store the values"
+
+HOMEPAGE="http://collectd.org"
+SRC_URI="${HOMEPAGE}/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="contrib debug kernel_linux kernel_FreeBSD kernel_Darwin perl selinux static-libs"
+
+# The plugin lists have to follow here since they extend IUSE
+
+# Plugins that to my knowledge cannot be supported (eg. dependencies not in gentoo)
+COLLECTD_IMPOSSIBLE_PLUGINS="aquaero mic netapp pinba sigrok write_kafka xmms"
+
+# Plugins that still need some work
+COLLECTD_UNTESTED_PLUGINS="amqp apple_sensors genericjmx ipvs lpar modbus tape"
+
+# Plugins that have been (compile) tested and can be enabled via COLLECTD_PLUGINS
+COLLECTD_TESTED_PLUGINS="aggregation apache apcups ascent battery bind ceph
+	cgroups conntrack contextswitch cpu cpufreq csv curl curl_json curl_xml dbi df
+	disk dns drbd email entropy ethstat exec fhcount filecount fscache gmond
+	hddtemp interface ipc ipmi iptables irq java load log_logstash logfile lvm
+	madwifi match_empty_counter match_hashed match_regex match_timediff match_value
+	mbmon md memcachec memcached memory multimeter mysql netlink network nfs nginx
+	notify_desktop notify_email ntpd numa nut olsrd onewire openldap openvpn oracle
+	perl ping postgresql powerdns processes protocols python redis routeros
+	rrdcached rrdtool sensors serial smart snmp statsd swap syslog table tail
+	target_notification target_replace target_scale target_set tcpconns teamspeak2
+	ted thermal threshold tokyotyrant turbostat unixsock uptime users uuid varnish
+	virt vmem wireless write_graphite write_http write_log write_mongodb
+	write_redis write_sensu write_tsdb zfs_arc zookeeper"
+
+COLLECTD_DISABLED_PLUGINS="${COLLECTD_IMPOSSIBLE_PLUGINS} ${COLLECTD_UNTESTED_PLUGINS}"
+
+COLLECTD_ALL_PLUGINS=${COLLECTD_TESTED_PLUGINS}
+
+for plugin in ${COLLECTD_ALL_PLUGINS}; do
+	IUSE="${IUSE} collectd_plugins_${plugin}"
+done
+unset plugin
+
+# Now come the dependencies.
+
+COMMON_DEPEND="
+	dev-libs/libgcrypt:0
+	sys-devel/libtool
+	perl?							( dev-lang/perl:=[ithreads] )
+	collectd_plugins_apache?		( net-misc/curl )
+	collectd_plugins_ascent?		( net-misc/curl dev-libs/libxml2 )
+	collectd_plugins_bind?			( dev-libs/libxml2:= )
+	collectd_plugins_ceph?			( dev-libs/yajl:= )
+	collectd_plugins_curl?			( net-misc/curl )
+	collectd_plugins_curl_json?		( net-misc/curl dev-libs/yajl:= )
+	collectd_plugins_curl_xml?		( net-misc/curl dev-libs/libxml2:= )
+	collectd_plugins_dbi?			( dev-db/libdbi:= )
+	collectd_plugins_dns?			( net-libs/libpcap:= )
+	collectd_plugins_gmond?			( sys-cluster/ganglia )
+	collectd_plugins_ipmi?			( >=sys-libs/openipmi-2.0.16-r1 )
+	collectd_plugins_iptables?		( >=net-firewall/iptables-1.4.13 )
+	collectd_plugins_log_logstash?	( dev-libs/yajl:= )
+	collectd_plugins_lvm?			( sys-fs/lvm2 )
+	collectd_plugins_memcachec?		( dev-libs/libmemcached:= )
+	collectd_plugins_mysql?			( >=virtual/mysql-5.0 )
+	collectd_plugins_netlink?		( net-libs/libmnl:= )
+	collectd_plugins_nginx?			( net-misc/curl )
+	collectd_plugins_notify_desktop?	( x11-libs/libnotify:= )
+	collectd_plugins_notify_email?	( net-libs/libesmtp dev-libs/openssl:0= )
+	collectd_plugins_nut?			( sys-power/nut )
+	collectd_plugins_onewire?		( sys-fs/owfs )
+	collectd_plugins_oracle?		( dev-db/oracle-instantclient-basic )
+	collectd_plugins_openldap?		( net-nds/openldap )
+	collectd_plugins_perl?			( dev-lang/perl:=[ithreads] )
+	collectd_plugins_ping?			( net-libs/liboping:= )
+	collectd_plugins_postgresql?	( dev-db/postgresql:= )
+	collectd_plugins_python?		( ${PYTHON_DEPS} )
+	collectd_plugins_redis?			( dev-libs/hiredis:= )
+	collectd_plugins_routeros?		( net-libs/librouteros:= )
+	collectd_plugins_rrdcached?		( net-analyzer/rrdtool )
+	collectd_plugins_rrdtool?		( net-analyzer/rrdtool )
+	collectd_plugins_sensors?		( sys-apps/lm_sensors )
+	collectd_plugins_smart?			( dev-libs/libatasmart:= )
+	collectd_plugins_snmp?			( net-analyzer/net-snmp )
+	collectd_plugins_tokyotyrant?	( net-misc/tokyotyrant )
+	collectd_plugins_varnish?		( www-servers/varnish )
+	collectd_plugins_virt?			( app-emulation/libvirt dev-libs/libxml2 )
+	collectd_plugins_write_http?	( net-misc/curl )
+	collectd_plugins_write_mongodb?	( dev-libs/mongo-c-driver:= )
+	collectd_plugins_write_redis?	( dev-libs/hiredis:= )
+
+	kernel_FreeBSD? (
+		collectd_plugins_disk?		( sys-libs/libstatgrab:= )
+		collectd_plugins_interface?	( sys-libs/libstatgrab:= )
+		collectd_plugins_load?		( sys-libs/libstatgrab:= )
+		collectd_plugins_memory?	( sys-libs/libstatgrab:= )
+		collectd_plugins_swap?		( sys-libs/libstatgrab:= )
+		collectd_plugins_users?		( sys-libs/libstatgrab:= )
+	)"
+
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	collectd_plugins_java?			( >=virtual/jdk-1.6 )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	collectd_plugins_java?			( >=virtual/jre-1.6 )
+	collectd_plugins_syslog?		( virtual/logger )
+	selinux?						( sec-policy/selinux-collectd )"
+
+REQUIRED_USE="
+	collectd_plugins_python?		( ${PYTHON_REQUIRED_USE} )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.4.1-libocci.patch"
+	"${FILESDIR}/${PN}-5.5.0-lt.patch"
+	"${FILESDIR}/${PN}-4.10.3-werror.patch"
+)
+
+# @FUNCTION: collectd_plugin_kernel_linux
+# @DESCRIPTION:
+# USAGE: <plug-in name> <kernel_options> <severity>
+# kernel_options is a list of kernel configurations options; the check tests whether at least
+#   one of them is enabled. If no, depending on the third argument an elog, ewarn, or eerror message
+#   is emitted.
+collectd_plugin_kernel_linux() {
+	local multi_opt opt
+	if has ${1} ${COLLECTD_ALL_PLUGINS}; then
+		if use collectd_plugins_${1}; then
+			for opt in ${2}; do
+				if linux_chkconfig_present ${opt}; then return 0; fi
+			done
+			multi_opt=${2//\ /\ or\ }
+			case ${3} in
+				(info)
+					elog "The ${1} plug-in can use kernel features that are disabled now; enable ${multi_opt} in your kernel"
+				;;
+				(warn)
+					ewarn "The ${1} plug-in uses kernel features that are disabled now; enable ${multi_opt} in your kernel"
+				;;
+				(error)
+					eerror "The ${1} plug-in needs kernel features that are disabled now; enable ${multi_opt} in your kernel"
+				;;
+				(*)
+					die "function collectd_plugin_kernel_linux called with invalid third argument"
+				;;
+			esac
+		fi
+	fi
+}
+
+collectd_linux_kernel_checks() {
+	linux-info_pkg_setup
+
+	# battery.c:/proc/pmu/battery_%i
+	# battery.c:/proc/acpi/battery
+	collectd_plugin_kernel_linux battery ACPI_BATTERY warn
+
+	# cgroups.c:/sys/fs/cgroup/
+	collectd_plugin_kernel_linux cgroups CONFIG_CGROUPS warn
+
+	# cpufreq.c:/sys/devices/system/cpu/cpu%d/cpufreq/
+	collectd_plugin_kernel_linux cpufreq SYSFS warn
+	collectd_plugin_kernel_linux cpufreq CPU_FREQ_STAT warn
+
+	# nfs.c:/proc/net/rpc/nfs
+	# nfs.c:/proc/net/rpc/nfsd
+	collectd_plugin_kernel_linux nfs NFS_COMMON warn
+
+	# serial.c:/proc/tty/driver/serial
+	# serial.c:/proc/tty/driver/ttyS
+	collectd_plugin_kernel_linux serial SERIAL_CORE warn
+
+	# swap.c:/proc/meminfo
+	collectd_plugin_kernel_linux swap SWAP warn
+
+	# thermal.c:/proc/acpi/thermal_zone
+	# thermal.c:/sys/class/thermal
+	collectd_plugin_kernel_linux thermal "PROC_FS SYSFS" warn
+	collectd_plugin_kernel_linux thermal ACPI_THERMAL warn
+
+	# vmem.c:/proc/vmstat
+	collectd_plugin_kernel_linux vmem VM_EVENT_COUNTERS warn
+
+	# uuid.c:/sys/hypervisor/uuid
+	collectd_plugin_kernel_linux uuid SYSFS info
+
+	# wireless.c:/proc/net/wireless
+	collectd_plugin_kernel_linux wireless "MAC80211 IEEE80211" warn
+}
+
+pkg_setup() {
+	if use kernel_linux; then
+		if linux_config_exists; then
+			einfo "Checking your linux kernel configuration:"
+			collectd_linux_kernel_checks
+		else
+			elog "Cannot find a linux kernel configuration. Continuing anyway."
+		fi
+	fi
+
+	java-pkg-opt-2_pkg_setup
+	use collectd_plugins_python && python-single-r1_pkg_setup
+
+	enewgroup collectd
+	enewuser collectd -1 -1 /var/lib/collectd collectd
+}
+
+src_prepare() {
+	epatch ${PATCHES[@]}
+	epatch_user
+
+	# There's some strange prefix handling in the default config file, resulting in
+	# paths like "/usr/var/..."
+	sed -i -e "s:@prefix@/var:/var:g" src/collectd.conf.in || die
+
+	sed -i -e "s:/etc/collectd/collectd.conf:/etc/collectd.conf:g" contrib/collectd.service || die
+
+	# fix installdirs for perl, bug 444360
+	sed -i -e 's/INSTALL_BASE=$(DESTDIR)$(prefix) //' bindings/Makefile.am || die
+
+	if use collectd_plugins_java; then
+		# Set javac -source and -target flags according to (R)DEPEND.
+		sed -i -e "s/\$(JAVAC)/\0 $(java-pkg_javac-args)/g" bindings/java/Makefile.am || die
+	fi
+
+	rm -r libltdl || die
+
+	eautoreconf
+}
+
+src_configure() {
+	# Now come the lists of os-dependent plugins. Any plugin that is not listed anywhere here
+	# should work independent of the operating system.
+
+	local linux_plugins="barometer battery cpu cpufreq disk drbd entropy
+		ethstat interface iptables ipvs irq ipc load memory md netlink nfs
+		numa processes serial swap tcpconns thermal turbostat users vmem
+		wireless zfs_arc"
+
+	local libstatgrab_plugins="cpu disk interface load memory swap users"
+	local bsd_plugins="cpu tcpconns ${libstatgrab_plugins} zfs_arc"
+
+	local darwin_plugins="apple_sensors battery cpu disk interface memory processes tcpconns"
+
+	local osdependent_plugins="${linux_plugins} ${bsd_plugins} ${darwin_plugins}"
+	local myos_plugins=""
+	if use kernel_linux; then
+		einfo "Enabling Linux plugins."
+		myos_plugins=${linux_plugins}
+	elif use kernel_FreeBSD; then
+		einfo "Enabling FreeBSD plugins."
+		myos_plugins=${bsd_plugins}
+	elif use kernel_Darwin; then
+		einfo "Enabling Darwin plugins."
+		myos_plugins=${darwin_plugins}
+	fi
+
+	# Do we debug?
+	local myconf="$(use_enable debug)"
+
+	local plugin
+
+	# Disable what needs to be disabled.
+	for plugin in ${COLLECTD_DISABLED_PLUGINS}; do
+		myconf+=" --disable-${plugin}"
+	done
+
+	# Set enable/disable for each single plugin.
+	for plugin in ${COLLECTD_ALL_PLUGINS}; do
+		if has ${plugin} ${osdependent_plugins}; then
+			# plugin is os-dependent ...
+			if has ${plugin} ${myos_plugins}; then
+				# ... and available in this os
+				myconf+=" $(use_enable collectd_plugins_${plugin} ${plugin})"
+			else
+				# ... and NOT available in this os
+				if use collectd_plugins_${plugin}; then
+					ewarn "You try to enable the ${plugin} plugin, but it is not available for this"
+					ewarn "kernel. Disabling it automatically."
+				fi
+				myconf+=" --disable-${plugin}"
+			fi
+		elif [[ "${plugin}" = "collectd_plugins_perl" ]]; then
+			if use collectd_plugins_perl && ! use perl; then
+				ewarn "Perl plugin disabled as perl bindings disabled by -perl use flag"
+				myconf+= --disable-perl
+			else
+				myconf+=" $(use_enable collectd_plugins_${plugin} ${plugin})"
+			fi
+		else
+			myconf+=" $(use_enable collectd_plugins_${plugin} ${plugin})"
+		fi
+	done
+
+	# JAVA_HOME is set by eclasses.
+	if use collectd_plugins_java; then
+		myconf+=" --with-java"
+	fi
+
+	# Need libiptc ONLY for iptables. If we try to use it otherwise bug 340109 happens.
+	# lots of libs are only needed for plugins, if they are disabled, also disable the lib
+	use collectd_plugins_iptables || myconf+=" --with-libiptc=no"
+	use collectd_plugins_openldap || myconf+=" --with-libldap=no"
+	use collectd_plugins_redis || use collectd_plugins_write_redis || myconf+=" --with-libhiredis=no"
+	use collectd_plugins_smart || myconf+=" --with-libatasmart=no"
+	use collectd_plugins_virt || myconf+=" --with-libvirt=no"
+
+	if use perl; then
+		myconf+=" --with-perl-bindings=INSTALLDIRS=vendor"
+	else
+		myconf+=" --without-perl-bindings"
+	fi
+
+	# No need for v5upgrade
+	myconf+=" --disable-target_v5upgrade"
+
+	# Finally, run econf.
+	KERNEL_DIR="${KERNEL_DIR}" econf --config-cache --without-included-ltdl $(use_enable static-libs static) --localstatedir=/var ${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	perl_delete_localpod
+
+	find "${D}/usr/" -name "*.la" -exec rm -f {} + || die
+
+	use collectd_plugins_java && java-pkg_regjar "${ED}"/usr/share/${PN}/java/*.jar
+
+	fowners root:collectd /etc/collectd.conf
+	fperms u=rw,g=r,o= /etc/collectd.conf
+
+	dodoc AUTHORS ChangeLog NEWS README TODO
+
+	if use contrib ; then
+		insinto /usr/share/doc/${PF}
+		doins -r contrib
+	fi
+
+	keepdir /var/lib/${PN}
+	fowners collectd:collectd /var/lib/${PN}
+
+	newinitd "${FILESDIR}/${PN}.initd" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+	systemd_dounit "contrib/${PN}.service"
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/logrotate" collectd
+
+	sed -i -e 's:^.*PIDFile     "/var/run/collectd.pid":PIDFile     "/var/run/collectd/collectd.pid":' "${D}"/etc/collectd.conf || die
+	sed -i -e 's:^#	SocketFile "/var/run/collectd-unixsock":#	SocketFile "/var/run/collectd/collectd-unixsock":' "${D}"/etc/collectd.conf || die
+	sed -i -e 's:^.*LoadPlugin perl$:# The new, correct way to load the perl plugin -- \n# <LoadPlugin perl>\n#   Globals true\n# </LoadPlugin>:' "${D}"/etc/collectd.conf || die
+	sed -i -e 's:^.*LoadPlugin python$:# The new, correct way to load the python plugin -- \n# <LoadPlugin python>\n#   Globals true\n# </LoadPlugin>:' "${D}"/etc/collectd.conf || die
+}
+
+collectd_rdeps() {
+	if (use collectd_plugins_${1} && ! has_version "${2}"); then
+		elog "The ${1} plug-in needs ${2} to be installed locally or remotely to work."
+	fi
+}
+
+pkg_postinst() {
+	use collectd_plugins_ping && fcaps cap_net_raw usr/sbin/collectd
+
+	collectd_rdeps apcups sys-power/apcupsd
+	collectd_rdeps hddtemp app-admin/hddtemp
+	collectd_rdeps mbmon sys-apps/xmbmon
+	collectd_rdeps memcached ">=net-misc/memcached-1.2.2-r2"
+	collectd_rdeps ntpd net-misc/ntp
+	collectd_rdeps openvpn ">=net-misc/openvpn-2.0.9"
+	collectd_rdeps write_mongodb "dev-db/mongodb"
+
+	echo
+	elog "collectd is now started as unprivileged user by default."
+	elog "You may want to revisit the configuration."
+	elog
+
+	if use collectd_plugins_email; then
+		ewarn "The email plug-in is deprecated. To submit statistics please use the unixsock plugin."
+	fi
+	if use contrib; then
+		elog "The scripts in /usr/share/doc/${PF}/collection3 for generating graphs need dev-perl/HTML-Parser,"
+		elog "dev-perl/config-general, dev-perl/regexp-common, and net-analyzer/rrdtool[perl] to be installed."
+	fi
+}
diff --git a/app-admin/collectd/files/collectd-5.5.0-lt.patch b/app-admin/collectd/files/collectd-5.5.0-lt.patch
new file mode 100644
index 0000000..b14736b
--- /dev/null
+++ b/app-admin/collectd/files/collectd-5.5.0-lt.patch
@@ -0,0 +1,35 @@
+diff --git Makefile.am Makefile.am
+index 5267123..a7e0d0c 100644
+--- Makefile.am
++++ Makefile.am
+@@ -1,6 +1,4 @@
+-ACLOCAL_AMFLAGS = -I libltdl/m4
+-
+-SUBDIRS = libltdl src bindings .
++SUBDIRS = src bindings .
+
+ INCLUDES = $(LTDLINCL)
+
+--- configure.ac.old	2016-01-04 13:55:39.286846436 +0400
++++ configure.ac	2016-01-04 13:56:07.905362298 +0400
+@@ -2,12 +2,10 @@
+ AC_INIT([collectd],[m4_esyscmd(./version-gen.sh)])
+ AC_CONFIG_SRCDIR(src/)
+ AC_CONFIG_HEADERS(src/config.h)
+-AC_CONFIG_AUX_DIR([libltdl/config])
+ 
+ m4_ifdef([LT_PACKAGE_VERSION],
+ 	# libtool >= 2.2
+ 	[
+-	 LT_CONFIG_LTDL_DIR([libltdl])
+ 	 LT_INIT([dlopen])
+ 	 LTDL_INIT([convenience])
+ 	 AC_DEFINE(LIBTOOL_VERSION, 2, [Define to used libtool version.])
+@@ -19,7 +17,6 @@
+ 	 AC_SUBST(LTDLINCL)
+ 	 AC_SUBST(LIBLTDL)
+ 	 AC_LIBTOOL_DLOPEN
+-	 AC_CONFIG_SUBDIRS(libltdl)
+ 	 AC_DEFINE(LIBTOOL_VERSION, 1, [Define to used libtool version.])
+ 	]
+ )
diff --git a/app-admin/collectd/metadata.xml b/app-admin/collectd/metadata.xml
index 536b2ec..2b9b9b4 100644
--- a/app-admin/collectd/metadata.xml
+++ b/app-admin/collectd/metadata.xml
@@ -1,115 +1,133 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<longdescription>Collectd gathers statistics about the system it is running on and stores this information. Those statistics can then be used to find current performance bottlenecks (i.e. performance analysis) and predict future system load (i.e. capacity planning). Or if you just want pretty graphs of your private server and are fed up with some homegrown solution you're at the right place.</longdescription>
-	<maintainer>
+	<maintainer type="person">
 		<email>bugs@bergstroem.nu</email>
 		<name>Johan Bergström</name>
 		<description>Proxied Maintainer</description>
 	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
-		<flag name='collectd_plugins_aggregation'>Build the aggregation plugin (aggregate multiplte values into a single value)</flag>
-		<flag name='collectd_plugins_apache'>Build the apache input plugin (transferred bytes, handled requests, detailed scoreboard statistics)</flag>
-		<flag name='collectd_plugins_apcups'>Build the apcups input plugin (UPS charge, load, input/output/battery voltage, etc.)</flag>
-		<flag name='collectd_plugins_ascent'>Build the ascent input plugin (statistics about a free server for World of Warcraft)</flag>
-		<flag name='collectd_plugins_battery'>Build the battery input plugin (charge, current and voltage of ACPI and PMU based laptop batteries)</flag>
-		<flag name='collectd_plugins_bind'>Build the bind input plugin (name server and resolver statistics)</flag>
-		<flag name='collectd_plugins_cgroups'>Build the cgroups CPU accounting collection plugin</flag>
-		<flag name='collectd_plugins_conntrack'>Build the conntrack input plugin (number of nf_conntrack entries)</flag>
-		<flag name='collectd_plugins_contextswitch'>Build the contextswitch input plugin (number of context switches done by the operating system)</flag>
-		<flag name='collectd_plugins_cpu'>Build the cpu input plugin (time spent in the system, user, nice, idle, and related states)</flag>
-		<flag name='collectd_plugins_cpufreq'>Build the cpufreq input plugin (CPU frequency, for laptops with speedstep or similar)</flag>
-		<flag name='collectd_plugins_csv'>Build the csv output plugin (write to comma separated values (CSV) files)</flag>
-		<flag name='collectd_plugins_curl'>Build the curl input plugin (parse statistics from websites using regular expressions)</flag>
-		<flag name='collectd_plugins_curl_json'>Build the curl_json input plugin (get json data via curl and parse it)</flag>
-		<flag name='collectd_plugins_curl_xml'>Build the curl_xml input plugin (get xml data via curl and parse it)</flag>
-		<flag name='collectd_plugins_dbi'>Build the dbi input plugin (execute SQL statements on databases and interpret the reply)</flag>
-		<flag name='collectd_plugins_df'>Build the df input plugin (mountpoint usage)</flag>
-		<flag name='collectd_plugins_disk'>Build the disk input plugin (sectors read/written, number of read/write actions, average completion time of IO-operations)</flag>
-		<flag name='collectd_plugins_dns'>Build the dns input plugin (collects statistics of your DNS traffic on port udp/53)</flag>
-		<flag name='collectd_plugins_email'>Build the email input plugin (opens a UNIX domain socket and starts accepting connections on that socket)</flag>
-		<flag name='collectd_plugins_entropy'>Build the entropy input plugin (available entropy on a system)</flag>
-		<flag name='collectd_plugins_ethstat'>Build the ethstat input plugin (performance statistics of Linux ethernet cards)</flag>
-		<flag name='collectd_plugins_exec'>Build the exec input/output plugin (executes scripts / applications and reads values back)</flag>
-		<flag name='collectd_plugins_filecount'>Build the filecount input plugin (countd the number of files in a directory and all its subdirectories)</flag>
-		<flag name='collectd_plugins_fscache'>Build the fscache input plugin (information about the caching infrastructure for network file-systems etc)</flag>
-		<flag name='collectd_plugins_gmond'>Build the gmond input plugin (receive data from gmond, the client daemon of the Ganglia project)</flag>
-		<flag name='collectd_plugins_hddtemp'>Build the hddtemp input plugin (temperature of hard disks)</flag>
-		<flag name='collectd_plugins_interface'>Build the interface input plugin (information about traffic, packets and errors of interfaces)</flag>
-		<flag name='collectd_plugins_ipmi'>Build the ipmi input plugin (read hardware sensors from servers using the Intelligent Platform Management Interface (IPMI))</flag> 
-		<flag name='collectd_plugins_iptables'>Build the iptables input plugin (statistics from a ip_tables based packet filter)</flag> 
-		<flag name='collectd_plugins_irq'>Build the irq input plugin (number of times each interrupt has been handled by the os)</flag> 
-		<flag name='collectd_plugins_java'>Build the java input plugin (embeds a JVM into collectd for writing plugins)</flag> 
-		<flag name='collectd_plugins_libvirt'>Build the libvirt input plugin (statistics about virtualized guests on a system)</flag> 
-		<flag name='collectd_plugins_load'>Build the load input plugin (system load)</flag> 
-		<flag name='collectd_plugins_logfile'>Build the logfile output plugin (writes log messages to a text file)</flag>
-		<flag name='collectd_plugins_lvm'>Build the LVM input plugin</flag>
-		<flag name='collectd_plugins_madwifi'>Build the madwifi input plugin (information about Atheros wireless LAN chipsets)</flag> 
-		<flag name='collectd_plugins_match_empty_counter'>Build the match_empty_counter filter plugin</flag>
-		<flag name='collectd_plugins_match_hashed'>Build the match_hashed filter plugin</flag>
-		<flag name='collectd_plugins_match_regex'>Build the match_regex filter plugin</flag>
-		<flag name='collectd_plugins_match_timediff'>Build the match_timediff filter plugin</flag>
-		<flag name='collectd_plugins_match_value'>Build the match_value filter plugin</flag>
-		<flag name='collectd_plugins_mbmon'>Build the mbmon input plugin (information from mainboard sensors)</flag> 
-		<flag name='collectd_plugins_md'>Build the md input plugin (disk states in Linux md devices)</flag> 
-		<flag name='collectd_plugins_memcachec'>Build the memcachec input plugin (connects to a memcached server)</flag>
-		<flag name='collectd_plugins_memcached'>Build the memcached input plugin (connects to a memcached daemon)</flag> 
-		<flag name='collectd_plugins_memory'>Build the memory input plugin (physical memory utilization)</flag> 
-		<flag name='collectd_plugins_multimeter'>Build the multimeter input plugin (reads a voltage or current from a multimeter connected to a serial bus)</flag> 
-		<flag name='collectd_plugins_mysql'>Build the mysql input plugin (connects to an MySQL-database and issues a SHOW STATUS command)</flag> 
-		<flag name='collectd_plugins_netlink'>Build the netlink input plugin (opens a netlink socket to the Linux kernel for getting statistics)</flag> 
-		<flag name='collectd_plugins_network'>Build the network input/output plugin (communicates with other instances of collectd)</flag> 
-		<flag name='collectd_plugins_nfs'>Build the nfs input plugin (usage of the Network File System)</flag> 
-		<flag name='collectd_plugins_nginx'>Build the nginx input plugin (number of requests handled by the nginx daemon)</flag> 
-		<flag name='collectd_plugins_notify_desktop'>Build the notify_desktop output plugin (uses libnotify to display notifications to the user)</flag>
-		<flag name='collectd_plugins_notify_email'>Build the notify_email output plugin (uses libESMTP to send notifications to a configured email address)</flag>
-		<flag name='collectd_plugins_ntpd'>Build the ntpd input plugin (queries an NTP server)</flag> 
-		<flag name='collectd_plugins_numa'>Build the numa input plugin (statistics of the Linux Non-Uniform Memory Access (NUMA) subsystem)</flag> 
-		<flag name='collectd_plugins_nut'>Build the nut input plugin (collects UPS statistics using the Network UPS Tools)</flag> 
-		<flag name='collectd_plugins_oracle'>Build the oracle input plugin (SQL-queries one or more Oracle database systems)</flag>
-		<flag name='collectd_plugins_olsrd'>Build the olsrd input plugin (reads information about the Optimized Link State Routing daemon)</flag>
-		<flag name='collectd_plugins_onewire'>Build the onewire input plugin (collects temperature information from sensors)</flag> 
-		<flag name='collectd_plugins_openvpn'>Build the openvpn input plugin (reads the status file printed by OpenVPN)</flag> 
-		<flag name='collectd_plugins_perl'>Build the perl language binding plugin (embeds a Perl interpreter into collectd for writing plugins)</flag> 
-		<flag name='collectd_plugins_ping'>Build the ping input plugin (measures network latency)</flag> 
-		<flag name='collectd_plugins_postgresql'>Build the postgresql input plugin (connects to and executes SQL statements on a PostgreSQL database)</flag> 
-		<flag name='collectd_plugins_powerdns'>Build the powerdns input plugin (connects to a local PowerDNS instance)</flag> 
-		<flag name='collectd_plugins_processes'>Build the processes input plugin (statistics about processes)</flag> 
-		<flag name='collectd_plugins_protocols'>Build the protocols input plugin (network protocols)</flag> 
-		<flag name='collectd_plugins_python'>Build the python language binding plugin (embeds a Python interpreter into collectd for writing plugins)</flag> 
-		<flag name='collectd_plugins_rrdcached'>Build the rrdcached input/output plugin (connects to rrdcached and submits updates for RRD files)</flag> 
-		<flag name='collectd_plugins_rrdtool'>Build the rrdtool output plugin (writes values to RRD-files)</flag>
-		<flag name='collectd_plugins_routeros'>Build the routeros input plugin (collect information on devices running RouterOS)</flag>
-		<flag name='collectd_plugins_sensors'>Build the sensors input plugin (uses lm-sensors to read hardware sensors)</flag> 
-		<flag name='collectd_plugins_serial'>Build the serial input plugin (collects the traffic on serial interfaces)</flag> 
-		<flag name='collectd_plugins_snmp'>Build the snmp input plugin (read values from network devices using SNMP)</flag> 
-		<flag name='collectd_plugins_statsd'>Build the statsd input plugin (accepts statsd-type metrics from a UDP socket)</flag>
-		<flag name='collectd_plugins_swap'>Build the swap input plugin (amount of memory currently written to swap)</flag> 
-		<flag name='collectd_plugins_syslog'>Build the syslog output plugin (receives messages from collectd and dispatches them to syslog)</flag>
-		<flag name='collectd_plugins_table'>Build the table input plugin (parses table-like structured plain text)</flag> 
-		<flag name='collectd_plugins_tail'>Build the tail input plugin (follows logfiles as e.g. tail -f)</flag> 
-		<flag name='collectd_plugins_target_notification'>Build the target_notification filter plugin</flag>
-		<flag name='collectd_plugins_target_replace'>Build the target_replace filter plugin</flag>
-		<flag name='collectd_plugins_target_scale'>Build the target_scale filter plugin</flag>
-		<flag name='collectd_plugins_target_set'>Build the target_set filter plugin</flag>
-		<flag name='collectd_plugins_tcpconns'>Build the tcpconns input plugin (number of TCP connections to or from a specified port)</flag> 
-		<flag name='collectd_plugins_teamspeak2'>Build the teamspeak2 input plugin (collects traffic statistics from a teamspeak2 instance)</flag> 
-		<flag name='collectd_plugins_ted'>Build the ted input plugin (connects to The Energy Detective and reads the current power over connected power lines)</flag> 
-		<flag name='collectd_plugins_thermal'>Build the thermal input plugin (ACPI thermal zone information)</flag>
-		<flag name='collectd_plugins_threshold'>Build the threshold plugin (checks values against configured thresholds and creates notifications if values are out of bounds)</flag>
-		<flag name='collectd_plugins_tokyotyrant'>Build the tokyotyrant input plugin (number of records and file size from a running Tokyo Tyrant server)</flag> 
-		<flag name='collectd_plugins_uptime'>Build the uptime input plugin (system uptime)</flag> 
-		<flag name='collectd_plugins_unixsock'>Build the unixsock output plugin (opens a UNIX domain socket and accepts connections)</flag>
-		<flag name='collectd_plugins_users'>Build the users input plugin (number of users currently logged in)</flag> 
-		<flag name='collectd_plugins_uuid'>Build the uuid plugin (tries hard to determine the UUID of the system it is running on)</flag>
-		<flag name='collectd_plugins_varnish'>Build the varnish input plugin</flag> 
-		<flag name='collectd_plugins_vmem'>Build the vmem input plugin (information about the virtual memory subsystem)</flag> 
-		<flag name='collectd_plugins_vserver'>Build the vserver input plugin (virtual servers running on a system)</flag> 
-		<flag name='collectd_plugins_wireless'>Build the wireless input plugin (signal quality, signal power and signal-to-noise ratio for wireless LAN cards)</flag> 
-		<flag name='collectd_plugins_write_graphite'>Build the write_graphite output plugin (sends the values collected by collectd to Carbon, the storage layer of the Graphite time-series database)</flag>
-		<flag name='collectd_plugins_write_http'>Build the write_http output plugin (sends the values collected by collectd to a web-server)</flag>
-		<flag name='collectd_plugins_write_mongodb'>Build the write_mongodb output plugin (sends the values collected by collectd to a MongoDB)</flag>
-		<flag name='contrib'>Install user-contributed files in the doc directory</flag>
+		<flag name="collectd_plugins_aggregation">Build the aggregation plugin (aggregate multiplte values into a single value)</flag>
+		<flag name="collectd_plugins_apache">Build the apache input plugin (transferred bytes, handled requests, detailed scoreboard statistics)</flag>
+		<flag name="collectd_plugins_apcups">Build the apcups input plugin (UPS charge, load, input/output/battery voltage, etc.)</flag>
+		<flag name="collectd_plugins_ascent">Build the ascent input plugin (statistics about a free server for World of Warcraft)</flag>
+		<flag name="collectd_plugins_battery">Build the battery input plugin (charge, current and voltage of ACPI and PMU based laptop batteries)</flag>
+		<flag name="collectd_plugins_bind">Build the bind input plugin (name server and resolver statistics)</flag>
+		<flag name="collectd_plugins_ceph">Build the plugin for <pkg>sys-cluster/ceph</pkg></flag>
+		<flag name="collectd_plugins_cgroups">Build the cgroups CPU accounting collection plugin</flag>
+		<flag name="collectd_plugins_conntrack">Build the conntrack input plugin (number of nf_conntrack entries)</flag>
+		<flag name="collectd_plugins_contextswitch">Build the contextswitch input plugin (number of context switches done by the operating system)</flag>
+		<flag name="collectd_plugins_cpu">Build the cpu input plugin (time spent in the system, user, nice, idle, and related states)</flag>
+		<flag name="collectd_plugins_cpufreq">Build the cpufreq input plugin (CPU frequency, for laptops with speedstep or similar)</flag>
+		<flag name="collectd_plugins_csv">Build the csv output plugin (write to comma separated values (CSV) files)</flag>
+		<flag name="collectd_plugins_curl">Build the curl input plugin (parse statistics from websites using regular expressions)</flag>
+		<flag name="collectd_plugins_curl_json">Build the curl_json input plugin (get json data via curl and parse it)</flag>
+		<flag name="collectd_plugins_curl_xml">Build the curl_xml input plugin (get xml data via curl and parse it)</flag>
+		<flag name="collectd_plugins_dbi">Build the dbi input plugin (execute SQL statements on databases and interpret the reply)</flag>
+		<flag name="collectd_plugins_df">Build the df input plugin (mountpoint usage)</flag>
+		<flag name="collectd_plugins_disk">Build the disk input plugin (sectors read/written, number of read/write actions, average completion time of IO-operations)</flag>
+		<flag name="collectd_plugins_dns">Build the dns input plugin (collects statistics of your DNS traffic on port udp/53)</flag>
+		<flag name="collectd_plugins_drbd">Build the plugin for DRBD statistics</flag>
+		<flag name="collectd_plugins_email">Build the email input plugin (opens a UNIX domain socket and starts accepting connections on that socket)</flag>
+		<flag name="collectd_plugins_entropy">Build the entropy input plugin (available entropy on a system)</flag>
+		<flag name="collectd_plugins_ethstat">Build the ethstat input plugin (performance statistics of Linux ethernet cards)</flag>
+		<flag name="collectd_plugins_exec">Build the exec input/output plugin (executes scripts / applications and reads values back)</flag>
+		<flag name="collectd_plugins_fhcount">Build the plugin for File handles statistics</flag>
+		<flag name="collectd_plugins_filecount">Build the filecount input plugin (countd the number of files in a directory and all its subdirectories)</flag>
+		<flag name="collectd_plugins_fscache">Build the fscache input plugin (information about the caching infrastructure for network file-systems etc)</flag>
+		<flag name="collectd_plugins_gmond">Build the gmond input plugin (receive data from gmond, the client daemon of the Ganglia project)</flag>
+		<flag name="collectd_plugins_hddtemp">Build the hddtemp input plugin (temperature of hard disks)</flag>
+		<flag name="collectd_plugins_interface">Build the interface input plugin (information about traffic, packets and errors of interfaces)</flag>
+		<flag name="collectd_plugins_ipc">Build the plugin for IPC statistics</flag>
+		<flag name="collectd_plugins_ipmi">Build the ipmi input plugin (read hardware sensors from servers using the Intelligent Platform Management Interface (IPMI))</flag>
+		<flag name="collectd_plugins_iptables">Build the iptables input plugin (statistics from a ip_tables based packet filter)</flag>
+		<flag name="collectd_plugins_irq">Build the irq input plugin (number of times each interrupt has been handled by the os)</flag>
+		<flag name="collectd_plugins_java">Build the java input plugin (embeds a JVM into collectd for writing plugins)</flag>
+		<flag name="collectd_plugins_libvirt">Build the libvirt input plugin (statistics about virtualized guests on a system)</flag>
+		<flag name="collectd_plugins_load">Build the load input plugin (system load)</flag>
+		<flag name="collectd_plugins_log_logstash">Build the plugin for Logstash json_event compatible logging</flag>
+		<flag name="collectd_plugins_logfile">Build the logfile output plugin (writes log messages to a text file)</flag>
+		<flag name="collectd_plugins_lvm">Build the LVM input plugin</flag>
+		<flag name="collectd_plugins_madwifi">Build the madwifi input plugin (information about Atheros wireless LAN chipsets)</flag>
+		<flag name="collectd_plugins_match_empty_counter">Build the match_empty_counter filter plugin</flag>
+		<flag name="collectd_plugins_match_hashed">Build the match_hashed filter plugin</flag>
+		<flag name="collectd_plugins_match_regex">Build the match_regex filter plugin</flag>
+		<flag name="collectd_plugins_match_timediff">Build the match_timediff filter plugin</flag>
+		<flag name="collectd_plugins_match_value">Build the match_value filter plugin</flag>
+		<flag name="collectd_plugins_mbmon">Build the mbmon input plugin (information from mainboard sensors)</flag>
+		<flag name="collectd_plugins_md">Build the md input plugin (disk states in Linux md devices)</flag>
+		<flag name="collectd_plugins_memcachec">Build the memcachec input plugin (connects to a memcached server)</flag>
+		<flag name="collectd_plugins_memcached">Build the memcached input plugin (connects to a memcached daemon)</flag>
+		<flag name="collectd_plugins_memory">Build the memory input plugin (physical memory utilization)</flag>
+		<flag name="collectd_plugins_multimeter">Build the multimeter input plugin (reads a voltage or current from a multimeter connected to a serial bus)</flag>
+		<flag name="collectd_plugins_mysql">Build the mysql input plugin (connects to an MySQL-database and issues a SHOW STATUS command)</flag>
+		<flag name="collectd_plugins_netlink">Build the netlink input plugin (opens a netlink socket to the Linux kernel for getting statistics)</flag>
+		<flag name="collectd_plugins_network">Build the network input/output plugin (communicates with other instances of collectd)</flag>
+		<flag name="collectd_plugins_nfs">Build the nfs input plugin (usage of the Network File System)</flag>
+		<flag name="collectd_plugins_nginx">Build the nginx input plugin (number of requests handled by the nginx daemon)</flag>
+		<flag name="collectd_plugins_notify_desktop">Build the notify_desktop output plugin (uses libnotify to display notifications to the user)</flag>
+		<flag name="collectd_plugins_notify_email">Build the notify_email output plugin (uses libESMTP to send notifications to a configured email address)</flag>
+		<flag name="collectd_plugins_ntpd">Build the ntpd input plugin (queries an NTP server)</flag>
+		<flag name="collectd_plugins_numa">Build the numa input plugin (statistics of the Linux Non-Uniform Memory Access (NUMA) subsystem)</flag>
+		<flag name="collectd_plugins_nut">Build the nut input plugin (collects UPS statistics using the Network UPS Tools)</flag>
+		<flag name="collectd_plugins_olsrd">Build the olsrd input plugin (reads information about the Optimized Link State Routing daemon)</flag>
+		<flag name="collectd_plugins_onewire">Build the onewire input plugin (collects temperature information from sensors)</flag>
+		<flag name="collectd_plugins_openldap">Build the plugin for OpenLDAP statistics</flag>
+		<flag name="collectd_plugins_openvpn">Build the openvpn input plugin (reads the status file printed by OpenVPN)</flag>
+		<flag name="collectd_plugins_oracle">Build the oracle input plugin (SQL-queries one or more Oracle database systems)</flag>
+		<flag name="collectd_plugins_perl">Build the perl language binding plugin (embeds a Perl interpreter into collectd for writing plugins)</flag>
+		<flag name="collectd_plugins_ping">Build the ping input plugin (measures network latency)</flag>
+		<flag name="collectd_plugins_postgresql">Build the postgresql input plugin (connects to and executes SQL statements on a PostgreSQL database)</flag>
+		<flag name="collectd_plugins_powerdns">Build the powerdns input plugin (connects to a local PowerDNS instance)</flag>
+		<flag name="collectd_plugins_processes">Build the processes input plugin (statistics about processes)</flag>
+		<flag name="collectd_plugins_protocols">Build the protocols input plugin (network protocols)</flag>
+		<flag name="collectd_plugins_python">Build the python language binding plugin (embeds a Python interpreter into collectd for writing plugins)</flag>
+		<flag name="collectd_plugins_redis">Build the Redis input plugin</flag>
+		<flag name="collectd_plugins_routeros">Build the routeros input plugin (collect information on devices running RouterOS)</flag>
+		<flag name="collectd_plugins_rrdcached">Build the rrdcached input/output plugin (connects to rrdcached and submits updates for RRD files)</flag>
+		<flag name="collectd_plugins_rrdtool">Build the rrdtool output plugin (writes values to RRD-files)</flag>
+		<flag name="collectd_plugins_sensors">Build the sensors input plugin (uses lm-sensors to read hardware sensors)</flag>
+		<flag name="collectd_plugins_serial">Build the serial input plugin (collects the traffic on serial interfaces)</flag>
+		<flag name="collectd_plugins_smart">Build the plugin for SMART statistics</flag>
+		<flag name="collectd_plugins_snmp">Build the snmp input plugin (read values from network devices using SNMP)</flag>
+		<flag name="collectd_plugins_statsd">Build the statsd input plugin (accepts statsd-type metrics from a UDP socket)</flag>
+		<flag name="collectd_plugins_swap">Build the swap input plugin (amount of memory currently written to swap)</flag>
+		<flag name="collectd_plugins_syslog">Build the syslog output plugin (receives messages from collectd and dispatches them to syslog)</flag>
+		<flag name="collectd_plugins_table">Build the table input plugin (parses table-like structured plain text)</flag>
+		<flag name="collectd_plugins_tail">Build the tail input plugin (follows logfiles as e.g. tail -f)</flag>
+		<flag name="collectd_plugins_target_notification">Build the target_notification filter plugin</flag>
+		<flag name="collectd_plugins_target_replace">Build the target_replace filter plugin</flag>
+		<flag name="collectd_plugins_target_scale">Build the target_scale filter plugin</flag>
+		<flag name="collectd_plugins_target_set">Build the target_set filter plugin</flag>
+		<flag name="collectd_plugins_tcpconns">Build the tcpconns input plugin (number of TCP connections to or from a specified port)</flag>
+		<flag name="collectd_plugins_teamspeak2">Build the teamspeak2 input plugin (collects traffic statistics from a teamspeak2 instance)</flag>
+		<flag name="collectd_plugins_ted">Build the ted input plugin (connects to The Energy Detective and reads the current power over connected power lines)</flag>
+		<flag name="collectd_plugins_thermal">Build the thermal input plugin (ACPI thermal zone information)</flag>
+		<flag name="collectd_plugins_threshold">Build the threshold plugin (checks values against configured thresholds and creates notifications if values are out of bounds)</flag>
+		<flag name="collectd_plugins_tokyotyrant">Build the tokyotyrant input plugin (number of records and file size from a running Tokyo Tyrant server)</flag>
+		<flag name="collectd_plugins_turbostat">Build the plugin for Advanced statistic on Intel cpu states</flag>
+		<flag name="collectd_plugins_unixsock">Build the unixsock output plugin (opens a UNIX domain socket and accepts connections)</flag>
+		<flag name="collectd_plugins_uptime">Build the uptime input plugin (system uptime)</flag>
+		<flag name="collectd_plugins_users">Build the users input plugin (number of users currently logged in)</flag>
+		<flag name="collectd_plugins_uuid">Build the uuid plugin (tries hard to determine the UUID of the system it is running on)</flag>
+		<flag name="collectd_plugins_varnish">Build the varnish input plugin</flag>
+		<flag name="collectd_plugins_virt">Build the libvirt input plugin (statistics about virtualized guests on a system)</flag>
+		<flag name="collectd_plugins_vmem">Build the vmem input plugin (information about the virtual memory subsystem)</flag>
+		<flag name="collectd_plugins_wireless">Build the wireless input plugin (signal quality, signal power and signal-to-noise ratio for wireless LAN cards)</flag>
+		<flag name="collectd_plugins_write_graphite">Build the write_graphite output plugin (sends the values collected by collectd to Carbon, the storage layer of the Graphite time-series database)</flag>
+		<flag name="collectd_plugins_write_http">Build the write_http output plugin (sends the values collected by collectd to a web-server)</flag>
+		<flag name="collectd_plugins_write_log">Build the Log output plugin</flag>
+		<flag name="collectd_plugins_write_mongodb">Build the write_mongodb output plugin (sends the values collected by collectd to a MongoDB)</flag>
+		<flag name="collectd_plugins_write_redis">Build the Redis output plugin</flag>
+		<flag name="collectd_plugins_write_sensu">Build the Sensu output plugin</flag>
+		<flag name="collectd_plugins_write_tsdb">Build the TSDB output plugin</flag>
+		<flag name="collectd_plugins_zfs_arc">Build the plugin for ZFS ARC statistics</flag>
+		<flag name="collectd_plugins_zookeeper">Build the plugin for Zookeeper statistics</flag>
+		<flag name="contrib">Install user-contributed files in the doc directory</flag>
 	</use>
 </pkgmetadata>
diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
index e064cbf..a41d7b6 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -1,2 +1,3 @@
 DIST conky-1.10.0.tar.gz 342584 SHA256 f392f3f91fcc37f04ff65d53957512e4d81b7b9b36394acb5ecaefe92623f8eb SHA512 08664c2c736c078848e4864f7a2df5ed536e683da6aa482cf003c675b03c274802cfd27127adb3d99145fe6c4103cc06046b40322383beafc4ca2e7e811b5caf WHIRLPOOL 03f8f80b483c8db09096a10a8d95b20372cbd5fb3e284b9bcd072c4ec1a2a4f76335eb5e8016a3e6793f295c143c71268e65fb5e50fdea0b3e6ce187830a6c46
+DIST conky-1.10.1.tar.gz 343393 SHA256 b4e66a71e8211d02b8dbe8cd4873af209af25326e63afd90c90ba9416c79cf21 SHA512 bcd3efa722fcd1d264157843fac0e9c5e5e0aa881f38b676cb1634efe57c3f07c535f063c0c9eba7bcd5deebf7b8e87099856fc5092cd01955c09b70e155cfd2 WHIRLPOOL 40ab9ecb135e15674a139aef5f98a8e229b38de995b0af7646813a422562b60566ed6125dad376560550e59d9b17f85f755c3f85034c78c6e02f857c966f4d26
 DIST conky-1.9.0.tar.bz2 626555 SHA256 baf1b550f135fbfb53e5e286a33aadc03a667d63bf6c4d52ba7637366295bb6f SHA512 98c9f69fd8bee2062e3eddeb7a394cce932199ffd6c8664006d1222f0453569406613e63637848c77a455f7dae3f16be3079a2cab56ecafea51ec043de23c889 WHIRLPOOL 41bbe95ec838dbda2c2d4a9422d2f2f7d22d0cb99e87c59fbd32c0c7856cc83de36cbeefd982c964ec5229ae0b0342e84525aa5343d8c5cf9525205cea4a274a
diff --git a/app-admin/conky/conky-1.10.1.ebuild b/app-admin/conky/conky-1.10.1.ebuild
new file mode 100644
index 0000000..ddd8ee5
--- /dev/null
+++ b/app-admin/conky/conky-1.10.1.ebuild
@@ -0,0 +1,180 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils cmake-utils linux-info
+
+DESCRIPTION="An advanced, highly configurable system monitor for X"
+HOMEPAGE="https://github.com/brndnmtthws/conky"
+SRC_URI="https://github.com/brndnmtthws/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3 BSD LGPL-2.1 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="apcupsd audacious cmus curl debug eve hddtemp ical iconv imlib iostats
+	ipv6 irc lua-cairo lua-imlib lua-rsvg math moc mpd mysql nano-syntax
+	ncurses nvidia +portmon rss thinkpad truetype vim-syntax weather-metar
+	weather-xoap webserver wifi X xmms2"
+
+DEPEND_COMMON="
+	X? (
+		imlib? ( media-libs/imlib2[X] )
+		lua-cairo? (
+			>=dev-lua/toluapp-1.0.93
+			x11-libs/cairo[X] )
+		lua-imlib? (
+			>=dev-lua/toluapp-1.0.93
+			media-libs/imlib2[X] )
+		lua-rsvg? (
+			>=dev-lua/toluapp-1.0.93
+			gnome-base/librsvg )
+		nvidia? ( media-video/nvidia-settings )
+		truetype? ( x11-libs/libXft >=media-libs/freetype-2 )
+		x11-libs/libX11
+		x11-libs/libXdamage
+		x11-libs/libXfixes
+		x11-libs/libXext
+		audacious? ( >=media-sound/audacious-1.5 dev-libs/glib:2 )
+		xmms2? ( media-sound/xmms2 )
+	)
+	cmus? ( media-sound/cmus )
+	curl? ( net-misc/curl )
+	eve? ( net-misc/curl dev-libs/libxml2 )
+	ical? ( dev-libs/libical )
+	iconv? ( virtual/libiconv )
+	irc? ( net-libs/libircclient )
+	mysql? ( >=virtual/mysql-5.0 )
+	ncurses? ( sys-libs/ncurses:= )
+	rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib:2 )
+	wifi? ( net-wireless/wireless-tools )
+	weather-metar? ( net-misc/curl )
+	weather-xoap? ( dev-libs/libxml2 net-misc/curl )
+	webserver? ( net-libs/libmicrohttpd )
+	>=dev-lang/lua-5.1.4-r8:0
+	"
+RDEPEND="
+	${DEPEND_COMMON}
+	apcupsd? ( sys-power/apcupsd )
+	hddtemp? ( app-admin/hddtemp )
+	moc? ( media-sound/moc )
+	nano-syntax? ( app-editors/nano )
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+	"
+DEPEND="
+	${DEPEND_COMMON}
+	app-text/docbook2X
+	"
+
+CONFIG_CHECK=~IPV6
+
+DOCS=( README TODO ChangeLog NEWS AUTHORS )
+
+pkg_setup() {
+	use ipv6 && linux-info_pkg_setup
+}
+
+src_prepare() {
+	# Allow user patches #478482
+	epatch_user
+}
+
+src_configure() {
+	local mycmakeargs
+
+	if use X; then
+		mycmakeargs=(
+			-DBUILD_X11=ON
+			-DOWN_WINDOW=ON
+			-DBUILD_XDAMAGE=ON
+			-DBUILD_XDBE=ON
+			$(cmake-utils_use_build truetype XFT)
+			$(cmake-utils_use_build imlib IMLIB2)
+			-DBUILD_XSHAPE=ON
+			-DBUILD_ARGB=ON
+			$(cmake-utils_use_build lua-cairo LUA_CAIRO)
+			$(cmake-utils_use_build lua-imlib LUA_IMLIB2)
+			$(cmake-utils_use_build lua-rsvg LUA_RSVG)
+			$(cmake-utils_use_build nvidia)
+			$(cmake-utils_use_build audacious)
+			$(cmake-utils_use_build xmms2)
+		)
+	else
+		mycmakeargs=(
+			-DBUILD_X11=OFF
+			-DBUILD_NVIDIA=OFF
+			-DBUILD_LUA_CAIRO=OFF
+			-DBUILD_LUA_IMLIB2=OFF
+			-DBUILD_LUA_RSVG=OFF
+			-DBUILD_AUDACIOUS=OFF
+			-DBUILD_XMMS2=OFF
+		)
+	fi
+
+	mycmakeargs+=(
+		$(cmake-utils_use_build apcupsd)
+		$(cmake-utils_use_build debug)
+		$(cmake-utils_use_build cmus)
+		$(cmake-utils_use_build curl)
+		$(cmake-utils_use_build eve)
+		$(cmake-utils_use_build hddtemp)
+		$(cmake-utils_use_build iostats)
+		$(cmake-utils_use_build ical)
+		$(cmake-utils_use_build iconv)
+		$(cmake-utils_use_build ipv6)
+		$(cmake-utils_use_build irc)
+		$(cmake-utils_use_build math)
+		$(cmake-utils_use_build moc)
+		$(cmake-utils_use_build mpd)
+		$(cmake-utils_use_build mysql)
+		$(cmake-utils_use_build ncurses)
+		$(cmake-utils_use_build portmon PORT_MONITORS)
+		$(cmake-utils_use_build rss)
+		$(cmake-utils_use_build thinkpad IBM)
+		$(cmake-utils_use_build weather-metar WEATHER_METAR)
+		$(cmake-utils_use_build weather-xoap WEATHER_XOAP)
+		$(cmake-utils_use_build webserver HTTP)
+		$(cmake-utils_use_build wifi WLAN)
+		-DBUILD_BUILTIN_CONFIG=ON
+		-DBUILD_OLD_CONFIG=ON
+		-DBUILD_I18N=ON
+		-DMAINTAINER_MODE=ON
+		-DBUILD_AUDACIOUS_LEGACY=OFF
+		-DBUILD_BMPX=OFF
+		-DDOC_PATH=/usr/share/doc/${PF}
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/ftdetect
+		doins "${S}"/extras/vim/ftdetect/conkyrc.vim
+
+		insinto /usr/share/vim/vimfiles/syntax
+		doins "${S}"/extras/vim/syntax/conkyrc.vim
+	fi
+
+	if use nano-syntax; then
+		insinto /usr/share/nano/
+		doins "${S}"/extras/nano/conky.nanorc
+	fi
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "You can find sample configurations at ${ROOT%/}/usr/share/doc/${PF}."
+		elog "To customize, copy to ${XDG_CONFIG_HOME}/conky/conky.conf"
+		elog "and edit it to your liking."
+		elog
+		elog "There are pretty html docs available at the conky homepage"
+		elog "or in ${ROOT%/}/usr/share/doc/${PF}/html."
+		elog
+		elog "Also see https://wiki.gentoo.org/wiki/Conky/HOWTO"
+		elog
+	fi
+}
diff --git a/app-admin/conky/metadata.xml b/app-admin/conky/metadata.xml
index 8edeb04..501e0a0 100644
--- a/app-admin/conky/metadata.xml
+++ b/app-admin/conky/metadata.xml
@@ -1,7 +1,7 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>billie@gentoo.org</email>
 		<name>Daniel Pielmeier</name>
 	</maintainer>
diff --git a/app-admin/conkyforecast/metadata.xml b/app-admin/conkyforecast/metadata.xml
index 7ad6f3f..d9f08c9 100644
--- a/app-admin/conkyforecast/metadata.xml
+++ b/app-admin/conkyforecast/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>xmw@gentoo.org</email>
 		<name>Michael Weber</name>
 	</maintainer>
diff --git a/app-admin/conserver/conserver-8.1.18-r1.ebuild b/app-admin/conserver/conserver-8.1.18-r1.ebuild
index 5c91885..7e60c04 100644
--- a/app-admin/conserver/conserver-8.1.18-r1.ebuild
+++ b/app-admin/conserver/conserver-8.1.18-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="4"
+EAPI="5"
 
 inherit ssl-cert eutils pam autotools
 
@@ -13,9 +13,12 @@
 LICENSE="BSD GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="kerberos pam ssl tcpd debug"
+IUSE="kerberos libressl pam ssl tcpd debug"
 
-DEPEND="ssl? ( >=dev-libs/openssl-0.9.6g )
+DEPEND="ssl? (
+		!libressl? ( dev-libs/openssl:0 )
+		libressl? ( dev-libs/libressl )
+	)
 	pam? ( virtual/pam )
 	tcpd? ( sys-apps/tcp-wrappers )
 	debug? ( dev-libs/dmalloc )
diff --git a/app-admin/conserver/metadata.xml b/app-admin/conserver/metadata.xml
index c3a63c8..9ccbdbb 100644
--- a/app-admin/conserver/metadata.xml
+++ b/app-admin/conserver/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
-	<maintainer>
+	<maintainer type="person">
 		<email>dan@danweeks.net</email>
 		<name>Dan Weeks</name>
 		<description>Maintainer. Assign bugs to him</description>
 	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription>
 		Conserver is an application that allows multiple users to watch a serial
 		console at the same time. It can log the data, allows users to take
diff --git a/app-admin/consolehm/metadata.xml b/app-admin/consolehm/metadata.xml
index ecedda4..a00f3ae 100644
--- a/app-admin/consolehm/metadata.xml
+++ b/app-admin/consolehm/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>bsd</herd>
+<maintainer type="project">
+	<email>bsd@gentoo.org</email>
+	<name>BSD Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-admin/consul-replicate/Manifest b/app-admin/consul-replicate/Manifest
new file mode 100644
index 0000000..572eb4a
--- /dev/null
+++ b/app-admin/consul-replicate/Manifest
@@ -0,0 +1,12 @@
+DIST consul-0.6.3.tar.gz 2224536 SHA256 5cdc21d6f20f9b703d38e19d3d2ed1c037dcbb236b80bff6a9b9c481ded74435 SHA512 c80b96e18c283f8d2dc7542393e9d788c8247200890b1f2ecdf292b545c01c971f1452f6b37b23b92654409a191fbd4608710b1ca31d6c426ff77b53c4840c4b WHIRLPOOL b021bb7ecc97c2a99e88a8dd17dc1958fe7b2d17848c9e629edb0627d72d5651f96ef625cda4280989463e66c4b48880690b5e4a1180117bc762062be3b0566a
+DIST consul-replicate-0.2.0.tar.gz 24575 SHA256 64028b79994407f8d0d0b858a064d0bb9cbecf1e889f55b74a0f6a2c0cb63f6e SHA512 af1bdc0747524996a1cffe989d05a265c0fbcfac9d4d7c4b4bcf94dbd3db6f7635cb013cf542e1cdad049975a8dfad2bca417dd5566c922b7f86e7fd451ea0a2 WHIRLPOOL efac8709e6efa87b8aca5342d5bfaf752a22bca42a9a38cb9c4bada6855302a02140ef5bb06c27bf178081f7aef570a773c64b67ecec5f1e57c15c5a4d9c86c4
+DIST consul-template-0.8.0.tar.gz 63281 SHA256 ac12bdde35e88184d5e3f2201c2f46e2dd7b301d4f31b51945905d1b2c456064 SHA512 4a738aa70a291df6e7a48e40fd73c70e279bb957d988de1277b1223dfe151867e06de28542fdbd9fd7f816650b150ed53989fc061fc228b930551fcd0b3005fb WHIRLPOOL e8e48972350d9bb617c72ba07b86823359b8e997494671a23d8d897861e9cfcf429d6edb4ce3fc117849a2fbf6a56aee35809b9db6d738460da34671cfc9c4a7
+DIST errwrap-7554cd9344cec97297fa6649b055a8c98c2a1e55.tar.gz 8320 SHA256 e77d6aa78ef6342b21358d689edcd043778c5623af5a9b2690ed8e3fa4ea7db0 SHA512 da45b1696253bebe012f3d0e624a63dd11ad1a613d81cc302f2ea6f096f29a8d81015b9c00363bd2590c4cacc59de52a27e84435a7b4ad6512485cdd87df11c0 WHIRLPOOL 5c6013d852711e001a0eca6a3ad11f64e006be527cfc0b46db21049af97506730b48cfe1b2fac10bcfc66f61dce69023f20b06c83558e80ce337d75a127aa90d
+DIST go-cleanhttp-ce617e79981a8fff618bb643d155133a8f38db96.tar.gz 6595 SHA256 b0a0282baa30df0e77ebd0902c5f0043f9af3460172ff61070927c270fa8139d SHA512 bfdeea0c0aad4160729bb023c9c908ff56c7faa64a820b16e982efede0389365987343b2a227cac95edaa4c9096f2dfcb1fd3f7d55510328dfdb284cfbf7600a WHIRLPOOL 1cd82ed8a82a2cb1de58a9a0177fead214e63908e880b2d57a4434c024a49d05579ea77142aa9d5ecca370adc4539bfb7db1d9d4a2cc27fc41d83a350c4fce39
+DIST go-multierror-d30f09973e19c1dfcd120b2d9c4f168e68d6b5d5.tar.gz 8792 SHA256 734fdf39b7fb299ecf18e65f72ac3f1929bd978618af575e8bcad9e5ca55b494 SHA512 8a3e37ac07bbd571dd8b76bd8c119e5dbc620444e78a6f9fe2c4d28b0171a46704a0b088380ca201a08f7235698f07de4e4881691aef5370739c8bfe2db9e85b WHIRLPOOL 7b501d47880ad570dd79d2da79cc10373b03426f7f89b513f3b3b195682b0b36aeefac675a56070c262ee7e0d31ff9a564a9667924b1da66957ad0f97ab2d46c
+DIST go-syslog-42a2b573b664dbf281bd48c3cc12c086b17a39ba.tar.gz 4397 SHA256 378f5249729661db9d0c65030fbf636f6ec1d60ee926e67abf8c6dd7921d3907 SHA512 42257d0599936bb215f4a9f9189518418f02bc43e4d7417823ea460bfc45c6fd1f9b0bf5a35dd73881b57cd9e892c702b813a68fe6e417e82dd31c6635c1b24e WHIRLPOOL 26cf1464bf0899ae9bad0067481f57a121433c5fe7c93fef92523a157d7906b8c1c4216c2a4fe738222e4afaa85fc0a7b7b29149254125a3e8b2e7064add6cb1
+DIST hcl-578dd9746824a54637686b51a41bad457a56bcef.tar.gz 54677 SHA256 5656a59a398dc22d383d8daf33c410dcc1c21894d0053df5f7263d3a65f85fd9 SHA512 a430b7a4be9147e0fad3d932ecaee5970f049991351654682c679ace971e883615f957255d81da3dc2f732b0bfa26d66eb73ec7811957f05c2f72c2c506c23cd WHIRLPOOL d6dddcfbc53bc68fdf3971829bf8f0662e47a447682b37306424dd91ee2cc3d0280c7c368b3a8ded9f2127b2789b7b68648de9beaf9f9847cedb7324c2605dbf
+DIST logutils-0dc08b1671f34c4250ce212759ebd880f743d883.tar.gz 7717 SHA256 a58c8a6112b9ca2eb193d75996a54699f572411f3146d8ba62377af4a9fb933a SHA512 54e55f95808fb68be532e35076ffb04ff844a7d032530b82bbdd87f809bd1b0585538964cc22c7ae1cc039c5c30a02eca9734734c0c01ad76a14bd5a4c386426 WHIRLPOOL 0086485565e6fae835f54a1bb00a40660650c6018a6e79e05ba15120a59a6552ba60d86bfd63f7bc5cd8b331984fcdbe7162ef24d257bcc18a7fd8e6c028dd80
+DIST mapstructure-281073eb9eb092240d33ef253c404f1cca550309.tar.gz 13977 SHA256 3b2873f0e7e7a37f1b809493717033c1257bf41a9996e336746d83556df68240 SHA512 f495fe99c8ce752830b3d36db445cdc32baac6e266a0862d13e7e80e04f412ae7ee85e13ba794f1cfae3effb226007874c8ee819a4ef568ce2884077dfba4f9c WHIRLPOOL e3cf27de3f414014f9f068f66540daeeb90e10d69196a117a1e3a06c02cd096f5d711657c19c8ffdc26bf6a399a45fb9f78e96e26335f788baf7695785b7b90f
+DIST serf-64d10e9428bd70dbcd831ad087573b66731c014b.tar.gz 579000 SHA256 6c74d90b84c402c684e27a8948ba54074ad368ed121945d21b9c00135cdf7c74 SHA512 eced133c2ba261e4e39d16f2252f555611e90f23f70a746a6f8d60b24e6747e73e619ec74f10a1c0646ec5edfd731cd79f6700d9bc5fb7b100723aac32203a5f WHIRLPOOL eaa15ec8dcdfeeb490cea4e9af24c8507dba09583f5e02919fd71607bfed8c999f872d3c8dd818378f79ade5fd065e1c2e270dda8ff428848c409f7922196478
+DIST structs-a924a2250d1033753512e95dce41dca3fd793ad9.tar.gz 12276 SHA256 f9998ee9ab32a55cfa7a9f93a9439ee56fc146d8aff6601f06bb2048b71c381a SHA512 ae2f0bc1f9e1ddbf1bd32d5e50a2ffbc4841c17d451739aee7cbbe359abac982e98a00caaff2aa433d10aad4dc414ce17e94a1d0893610ff53c52beddb21dd4f WHIRLPOOL cc4063c7463e261a32a84c357c352141a91e4a88874c02acd6f91bc05f478e668b5ad7629a7473009cebe201a789854f295b22d56310d39d632d81d223baec65
diff --git a/app-admin/consul-replicate/consul-replicate-0.2.0.ebuild b/app-admin/consul-replicate/consul-replicate-0.2.0.ebuild
new file mode 100644
index 0000000..ef70f35
--- /dev/null
+++ b/app-admin/consul-replicate/consul-replicate-0.2.0.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit golang-base
+
+KEYWORDS="~amd64"
+DESCRIPTION="Consul cross-DC KV replication daemon"
+EGO_PN="github.com/hashicorp/${PN}/..."
+HOMEPAGE="http://${EGO_PN%/*}"
+LICENSE="MPL-2.0"
+SLOT="0"
+IUSE="test"
+
+DEPEND=">=dev-lang/go-1.4:="
+RDEPEND=""
+
+SRC_URI="https://${EGO_PN%/*}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/hashicorp/consul-template/archive/v0.8.0.tar.gz -> consul-template-0.8.0.tar.gz
+	https://github.com/fatih/structs/archive/a924a2250d1033753512e95dce41dca3fd793ad9.tar.gz -> structs-a924a2250d1033753512e95dce41dca3fd793ad9.tar.gz
+	https://github.com/hashicorp/consul/archive/v0.6.3.tar.gz -> consul-0.6.3.tar.gz
+	https://github.com/hashicorp/errwrap/archive/7554cd9344cec97297fa6649b055a8c98c2a1e55.tar.gz -> errwrap-7554cd9344cec97297fa6649b055a8c98c2a1e55.tar.gz
+	https://github.com/hashicorp/go-cleanhttp/archive/ce617e79981a8fff618bb643d155133a8f38db96.tar.gz -> go-cleanhttp-ce617e79981a8fff618bb643d155133a8f38db96.tar.gz
+	https://github.com/hashicorp/go-multierror/archive/d30f09973e19c1dfcd120b2d9c4f168e68d6b5d5.tar.gz -> go-multierror-d30f09973e19c1dfcd120b2d9c4f168e68d6b5d5.tar.gz
+	https://github.com/hashicorp/go-syslog/archive/42a2b573b664dbf281bd48c3cc12c086b17a39ba.tar.gz -> go-syslog-42a2b573b664dbf281bd48c3cc12c086b17a39ba.tar.gz
+	https://github.com/hashicorp/hcl/archive/578dd9746824a54637686b51a41bad457a56bcef.tar.gz -> hcl-578dd9746824a54637686b51a41bad457a56bcef.tar.gz
+	https://github.com/hashicorp/logutils/archive/0dc08b1671f34c4250ce212759ebd880f743d883.tar.gz -> logutils-0dc08b1671f34c4250ce212759ebd880f743d883.tar.gz
+	https://github.com/hashicorp/serf/archive/64d10e9428bd70dbcd831ad087573b66731c014b.tar.gz -> serf-64d10e9428bd70dbcd831ad087573b66731c014b.tar.gz
+	https://github.com/mitchellh/mapstructure/archive/281073eb9eb092240d33ef253c404f1cca550309.tar.gz -> mapstructure-281073eb9eb092240d33ef253c404f1cca550309.tar.gz"
+
+STRIP_MASK="*.a"
+S="${WORKDIR}/src/${EGO_PN%/*}"
+
+get_archive_go_package() {
+	local archive=${1} uri x
+	for x in ${SRC_URI}; do
+		if [[ ${x} == http* ]]; then
+			uri=${x}
+		elif [[ ${x} == ${archive} ]]; then
+			break
+		fi
+	done
+	uri=${uri#https://}
+	echo ${uri%/archive/*}
+}
+
+unpack_go_packages() {
+	local go_package x
+	# Unpack packages to appropriate locations for GOPATH
+	for x in ${A}; do
+		unpack ${x}
+		go_package=$(get_archive_go_package ${x})
+		mkdir -p src/${go_package%/*}
+		mv ${go_package##*/}-* src/${go_package} || die
+	done
+}
+
+src_unpack() {
+	unpack_go_packages
+	export GOPATH=${WORKDIR}:$(get_golibdir_gopath)
+}
+
+src_prepare() {
+	# Create a writable GOROOT in order to avoid sandbox violations.
+	export GOROOT="${WORKDIR}/goroot"
+	cp -sR "${EPREFIX}"/usr/lib/go "${GOROOT}" || die
+	rm -rf "${GOROOT}"/{src,pkg/$(go env GOOS)_$(go env GOARCH)}/"${EGO_PN%/*}" || die
+
+	# Prune conflicting libraries from GOROOT
+	while read -r -d '' x; do
+		x=${x#${WORKDIR}/src}
+		rm -rf "${GOROOT}/src/${x}" "${GOROOT}/pkg/$(go env GOOS)_$(go env GOARCH)/${x}"{,.a} || die
+	done < <(find "${WORKDIR}/src" -maxdepth 3 -mindepth 3 -type d -print0)
+
+	sed -e 's:TestParseConfig_parseFileError(:_\0:' -i config_test.go || die
+}
+
+src_compile() {
+	go build -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}" || die
+	go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}" || die
+}
+
+src_install() {
+	dobin "${WORKDIR}/bin/${PN}"
+	dodoc CHANGELOG.md README.md
+}
diff --git a/app-admin/consul-replicate/metadata.xml b/app-admin/consul-replicate/metadata.xml
new file mode 100644
index 0000000..3879731
--- /dev/null
+++ b/app-admin/consul-replicate/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>zmedico@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">hashicorp/consul-replicate</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-admin/consul-template/Manifest b/app-admin/consul-template/Manifest
index 0cd0f9c..c8215bc 100644
--- a/app-admin/consul-template/Manifest
+++ b/app-admin/consul-template/Manifest
@@ -1,14 +1,43 @@
+DIST aws-sdk-go-1.0.11.tar.gz 2914311 SHA256 7750f3ed8f616fdfa5c478b1768947909907a5a10dc98e1d70f9fa3fd7da96ba SHA512 ae966170cd906f510246c51ed9738f4ca8e3b4c2b31ed3d92f4f9c272e8a11ca411fe4a24bdbc7099c5b537f42abc784e336e05004421c138de7b8b2a5240d0a WHIRLPOOL 1bae846bde5b3beec5448336378e63b0ebb9da5b5f0b7f37941a5450ec091e250c861847883759e5df1f1e20b02942fc5f77599d6763a60de15d7ceb84fb896f
+DIST consul-0.6.3.tar.gz 2224536 SHA256 5cdc21d6f20f9b703d38e19d3d2ed1c037dcbb236b80bff6a9b9c481ded74435 SHA512 c80b96e18c283f8d2dc7542393e9d788c8247200890b1f2ecdf292b545c01c971f1452f6b37b23b92654409a191fbd4608710b1ca31d6c426ff77b53c4840c4b WHIRLPOOL b021bb7ecc97c2a99e88a8dd17dc1958fe7b2d17848c9e629edb0627d72d5651f96ef625cda4280989463e66c4b48880690b5e4a1180117bc762062be3b0566a
+DIST consul-template-0.12.2.tar.gz 93913 SHA256 9d8ae6ba84caa826400a3eef0e28325518a21c44332eebaaf3878dc5972f3997 SHA512 c085d916d7e7ae933583b6f397c73117a35b2f54e634db9bbe43a3e6f6b9497177729b3b5e25f028766eb6f9f59ff411486390bc2f544806af04f9038729533e WHIRLPOOL af485e0b743eb3d34d52bdbc6dd1edcf17614e07061384f24c5bd1d5d74d5a5bc1c092553fd074269566298847af2052ffd6dbf8b8e9a524438227e7230fe2d8
 DIST consul-template-0.9.0.tar.gz 69085 SHA256 5277cc43b61d531630854d707cd7a51bdd84328d8c30bc330dd2e2aa8898ede8 SHA512 39da6029d818f3ee0b9aba332f0a645c9e381b1115549dcc6945245c4dee53cd3d503e3dc3da4c4394192989798b242994b53e3256755ffe02c4b3c9296139d3 WHIRLPOOL 1ba0d1c2a2a9c8617338901f85916e25460155979dda9604752bc62c289e40d904ad27f2c31ca2491936289519d4f09fe72bbe4c176035880f01c789fdf74db2
 DIST copystructure-6fc66267e9da7d155a9d3bd489e00dad02666dc6.tar.gz 4028 SHA256 4e7271e88e101ac324f799c421b1c8c1477d1f54048d6b6b1ff3930498870272 SHA512 3c804e126f676cb7a6c5af775b7fdf6a3b591b42315707ebb83a66a96f583eac414e01402bc489d9b218b64db7780f57bd5a4bd922aff59dca068b869f825de5 WHIRLPOOL 3be054304612292adef0361bbd2d94d51c4186d4a66bf949d326345da0f7f5c6f5558c0db62fb1ed1144899155f5c63ceeb9243c267b82605b024cf6898f31ba
 DIST errwrap-7554cd9344cec97297fa6649b055a8c98c2a1e55.tar.gz 8320 SHA256 e77d6aa78ef6342b21358d689edcd043778c5623af5a9b2690ed8e3fa4ea7db0 SHA512 da45b1696253bebe012f3d0e624a63dd11ad1a613d81cc302f2ea6f096f29a8d81015b9c00363bd2590c4cacc59de52a27e84435a7b4ad6512485cdd87df11c0 WHIRLPOOL 5c6013d852711e001a0eca6a3ad11f64e006be527cfc0b46db21049af97506730b48cfe1b2fac10bcfc66f61dce69023f20b06c83558e80ce337d75a127aa90d
+DIST etcd-5099bf6f7ab92181158cc2f0f0db1bb6056e9aeb.tar.gz 2171596 SHA256 72f642f10d014dff089b7a0fe66168639d30ed0e1586cec43a88b2bd7311cc11 SHA512 cc1d75d73c46f7c8438ddec8f0cf6829936e4ecb58efcaae958f818bbdd777751b393406e6c89784d9234080766ea67d71e660aa973f409ce4319768e76f4dad WHIRLPOOL 7f645f6ae41769e8bf0e4f35e4ac399df385bd1693f3c49d0f3e2859cfbf58e0cbd6f9be8c7de101e37720514828e56ae996cbf8a89e665a867ae083457bf9e8
+DIST go-cleanhttp-ce617e79981a8fff618bb643d155133a8f38db96.tar.gz 6595 SHA256 b0a0282baa30df0e77ebd0902c5f0043f9af3460172ff61070927c270fa8139d SHA512 bfdeea0c0aad4160729bb023c9c908ff56c7faa64a820b16e982efede0389365987343b2a227cac95edaa4c9096f2dfcb1fd3f7d55510328dfdb284cfbf7600a WHIRLPOOL 1cd82ed8a82a2cb1de58a9a0177fead214e63908e880b2d57a4434c024a49d05579ea77142aa9d5ecca370adc4539bfb7db1d9d4a2cc27fc41d83a350c4fce39
+DIST go-crypto-0_pre20150808.tar.gz 876947 SHA256 9ff25a17515c6c7ff0d13fb076ba7a1df868ce30fca105277b3f0356ce801518 SHA512 86826102ff7242259d79a31e543a03192d6b68a06635b46ebac349111bb8451605df1ad9b249c08d75895c38fb4ebbbfc716d40c8c981485395164e87db5a519 WHIRLPOOL 5e1a0372d0a2f493e68c213ce866237cab316c1bf712f2c58a95c16c6864c48ea795e5a6e1346aad7459f666802170aeb0db8f781423fb1d8e252e5bced2e435
+DIST go-gatedio-8b8de1022221dde1fb52fa25d0caab46e59c8c14.tar.gz 8209 SHA256 d2283d24b1ea8e7b9520c022eb2530150eed03b6e72f698c9371658654777fea SHA512 2b2cf5ee8adf3dc3e106b3882812ecf925e4bfa7a43962eab70e106fdb46d6928414e1da741f713e1001b50a3ccefb7a1814997f6c3a4f5a1956fba7c40abbb4 WHIRLPOOL fddaa5ce23e418c7e099ba089256f591115e4667e86450454be6040502d94faa52160f6f77f1805299ff82e44a04d225165ef4d98a11f342c2ede0ccf35c3dfc
+DIST go-ini-1.8.6.tar.gz 26600 SHA256 66a1328c8dfc21a3b1657177e60681b2b6fa0ab4fce4b6e861c059bff0507511 SHA512 802c4ad56a2ba2f1a543bed8bdd1970557d973d10d3eff7fc69a406af52484943f7d20f91ccfca4cc8364ac438da7b464b05fae30f04b930717cb58f5fc55676 WHIRLPOOL f6a34a8a7bb07b7fc1aaa43ac422eb5e6c1c6b081b065023cc37584ceecd74489001b25af39d70de22e28919bcb410dda7b0fb52cef914889a023db22947208f
+DIST go-jmespath-0.2.2.tar.gz 47588 SHA256 d0a918ec689c3997077960c30d2ab6c1f93e3722684940d19286f85274cf56dd SHA512 93d1b64f6a0c658d832c065ddcd006b1d521a71c154a55a818a20063a9f9777640fa077a29e476c4e31f0b208a3c765a32aacf65d44d65d80702dccb7faed2a6 WHIRLPOOL 3f07a5f76117a9c54fe6a6ab6c94d29dff15176909904ba437a48f743e7b4189238428e1ca0080c572a3105855bf740769d65e6d1bb0014e12d335601bdafb43
+DIST go-metrics-345426c77237ece5dab0e1605c3e4b35c3f54757.tar.gz 13610 SHA256 2efdf7c349cb81ef75fbb812e150aac9a7c6c27417f4e84f655ff77ddb006789 SHA512 2dd120d6da4d8cfcd4546a288534f233f7073281ed3d6e7712c8a92fc11f7b800c0950835037ec936ec89e6fc2dba06088d70bc7faee6f139cc9656c0a81d4b7 WHIRLPOOL ebe0a792cb231f3ff5241f8c2526c7a7927d6d1ab138e92ae0da34ba72e54bbb4769aa14804110e61d7de280ce28a0040ebd17e79ceccec585ad48c9aac91c33
 DIST go-metrics-a54701ebec11868993bc198c3f315353e9de2ed6.tar.gz 11268 SHA256 2f4206d5d50eaab383cdc4f5c57179e285b93649c028a69dd9e2a4a45b69afe3 SHA512 e3da3f7b98edd32da5c3381afc3e92021b92416d7ea9de0423a05c06bc9ff808e28d29ca9f689c0029809a4b1643819954039516d6ab5890bb5512f5fe99fd6d WHIRLPOOL 815f83ae08bb6a37ee1774a718a8c3b4087ee9a95f190b8a77453f0d1ba1ca88a331e8be12b2f63d0c1fdb9472f2ff35786b94eaf1f61f5cb33fe1e6d9e4e460
 DIST go-msgpack-71c2886f5a673a35f909803f38ece5810165097b.tar.gz 49485 SHA256 c32b90e67762a375981b38154cae65222bb1aaa7722727d0225d5f8de773e4c8 SHA512 e4141e664c3237f7ab4c283b110d04e933bfb36a9d57af374ab42fed00a4ad6d8399e3399b206eebe76c5e142746412b2ada6c20b1ec09088f3bb7d82a7b01a9 WHIRLPOOL 1434e72897de4063515a0d3319e96b066406c110e3e36f710970886ba6ec9411f71908d9696a4528ee0fcb88bea54ab9c064faa230761ce38b82bb5506a2c073
+DIST go-msgpack-fa3f63826f7c23912c15263591e65d54d080b458.tar.gz 49488 SHA256 eeffbd458f4996334275f828cfd3549d32a2ba6eda359e5c9be09f091548781f SHA512 7e60a122cca007bf5455d6e15f77c24eaa5739deedc9e0c158282249e84698f873628bffa9eb7d23c1c59bda7632b1968ca770c8e1796e2d50750ac86e80fcb2 WHIRLPOOL 41745e39256ef510d42c4da413609e3bdd0621cc2acccfddabb4c8774e47b73ad46656639bed3fac2335cf1b6a2a245d3b8b4f3831cfafb2c6e7ecb90293475d
+DIST go-multierror-d30f09973e19c1dfcd120b2d9c4f168e68d6b5d5.tar.gz 8792 SHA256 734fdf39b7fb299ecf18e65f72ac3f1929bd978618af575e8bcad9e5ca55b494 SHA512 8a3e37ac07bbd571dd8b76bd8c119e5dbc620444e78a6f9fe2c4d28b0171a46704a0b088380ca201a08f7235698f07de4e4881691aef5370739c8bfe2db9e85b WHIRLPOOL 7b501d47880ad570dd79d2da79cc10373b03426f7f89b513f3b3b195682b0b36aeefac675a56070c262ee7e0d31ff9a564a9667924b1da66957ad0f97ab2d46c
 DIST go-multierror-fcdddc395df1ddf4247c69bd436e84cfa0733f7e.tar.gz 8058 SHA256 af90f9be029c091eb011ff25d270772fdb51edf3c6396cf99f224c4e7ad724c3 SHA512 f5cb12407f9bc986867a274c623037edab04f8e2b664c7d4db3bb7e32f970dd073a3d233d18549a5f01b5e88abff0eb0c1fcf79b6696a531c208e6fe8137080e WHIRLPOOL c997792a5c1b3029b32d0fad3a55a281b5ced2bef306367a1fd49df75cab831b93a3752e76f8a18ce5d08e155f66b3826aa5d9878fb9655821cef7a69b71de31
+DIST go-net-0_pre20150804.tar.gz 539435 SHA256 77fb87becd3ddb68ff06acd3a1bf1246b390e7489b3e25a9ee9314f7457ccf60 SHA512 02a9734f8335909a15280e925b11ff03b96fbedd6e48fa5c3f869ab1a8b3062971d634f7043f92cee685c618222b147fdee915f1d5d83bd82cdde171970287e3 WHIRLPOOL a63befad593737449f393d7f4490b1680d8cba808f6163b9723b0d1d228480cdcbf9e2fb091ffc96f9121aabde1e24b06f3ddcb7b30e4bffa6e39dece5a8b3e0
 DIST go-radix-0bab926c3433cfd6490c6d3c504a7b471362390c.tar.gz 5446 SHA256 f4e628adceee06d7717dce0bf566d5ebd8c009599807f2436b3cda259011b331 SHA512 350904076752e2fda17e9c2891a50b037d2ca165924880d6d5e466b8ed76685d79ff00bbbfbe9a665668e0ebde23c87129d3c1c4bf27ffe0c034df160db9d08f WHIRLPOOL 8571b9e818904a56ea16c35883725013d2009dc294acfdf4f28920a03baff36ffcd3d4d6d8be0ecfc78eefbfeef57e4b2ca224f2ce37d665caae724389346f88
+DIST go-radix-4239b77079c7b5d1243b7b4736304ce8ddb6f0f2.tar.gz 5484 SHA256 4b5ac4fe94fb221c849b0e9694301eba2dc91ac1a6b79cee48da038cb1a3d2aa SHA512 e76b6eb6e23f3f1872486e1ad0cfe9e4dcd676a1bee62cfb2e2de28ead2defb8997adadfc48781d910b327fc777c4b38acca1e983a0fb14dd73142f4edb97337 WHIRLPOOL 391097c2c1f7e2a170b41d752595480454d036e9c35dd4ff08678d103a5bd2baddedb3a4a7ce89ca938408fa234be3a63bc74461c09bbfea212d016efa7c3028
+DIST go-reap-2d85522212dcf5a84c6b357094f5c44710441912.tar.gz 8469 SHA256 919b889e2fa550e97b6b2254983cb4e826772ebf5237a787c65217caa244efa0 SHA512 aec1ab90bf1a461e0031f4e3015585129be095896bc40c4188f01d3295b95565f544271ee51d284936d504097831bfee979ba9002bf2749805e565ae6991b066 WHIRLPOOL cda564739e7f49621eb1fb26eecd1b2bc22df673206ffe1877b78eaf08b587fcab80976cfc1452349111d519cae1e46e07fc8f00578355f67741b0dec1c37a18
+DIST go-sql-driver-mysql-1.2.tar.gz 45364 SHA256 3b59eeb0a61146877a0e48eb894d1bf3965b691ae7ee370a9ee84d24417c7dcb SHA512 3e85325a962e8567ad0340b8ac816927df8d794a1f4066599f094de8b362aba411f5f4a1bf406285757680631ee8ec000ffd392e8d5ebe85c82dd10611096df4 WHIRLPOOL 901075f39347928023a144af98b827d573eb9a241fd3f7d47fade4301e1b98cd4ab40355b039cd30c5ac79182f68bcea92b691fc7129d88ba375c9844ee51911
+DIST go-sys-0_pre20150729.tar.gz 529002 SHA256 9f9e4a2bca96d9f9708770607e21395c3f4f873f9b6266cae1ba1da526729528 SHA512 f80afa938977f3945ab3f08462eaf5d8db430013240a11b1f8a43911948fd2a8a390192ea9ebf79434b348b2ca520267a0441b922110e70603fff4849e57c487 WHIRLPOOL 0b269666650f285521c9fd3486959957ad9279544baac7ab5caa21158fb10ed4de2b2e7c080ffca9aa352c8e5685f2035612d40a04c8f6c5f7093daf1a020029
 DIST go-syslog-42a2b573b664dbf281bd48c3cc12c086b17a39ba.tar.gz 4397 SHA256 378f5249729661db9d0c65030fbf636f6ec1d60ee926e67abf8c6dd7921d3907 SHA512 42257d0599936bb215f4a9f9189518418f02bc43e4d7417823ea460bfc45c6fd1f9b0bf5a35dd73881b57cd9e892c702b813a68fe6e417e82dd31c6635c1b24e WHIRLPOOL 26cf1464bf0899ae9bad0067481f57a121433c5fe7c93fef92523a157d7906b8c1c4216c2a4fe738222e4afaa85fc0a7b7b29149254125a3e8b2e7064add6cb1
+DIST go-uuid-36289988d83ca270bc07c234c36f364b0dd9c9a7.tar.gz 6491 SHA256 3faf76788a69f6558882170746003bbd430ef617a0f433e93b6ab6d457ad4270 SHA512 f9d7807a27d17d4e7d0b53f43d7e3561492fb0669fd4f1e610f4e39309c8759e3e5d8e061feabae5c60e1a87f9ed989309bd9a796c5811012ee347631c3fbd73 WHIRLPOOL 2b18286b50186c10f2f7cf5ce53354878c6bb3ea77e0c91cde7fadba4df82bb90460847f82775a515ac9de6fb7819e758cbaeb3ada061f29710a17c3e596de98
+DIST go-yaml-v2-f7716cbe52baa25d2e9b0d0da546fcf909fc16b4.tar.gz 63079 SHA256 d2044d0801b9f1da380f5a957404ca95454057a213c46182e2db08dc10cf287b SHA512 52129998e308c0a6033a0da6872759cf30cce3220af4ccd821fcb071f9165ee4f126f080726bbeac2bcacb20c2710dc66f936f8763c19ba5e182b8592700e6c0 WHIRLPOOL b34e0da03adaa61b37432300ec1d03953e220c4a3dd1d8af89ccccad752ba01286d71427e4354e6672d4ac5bde4cfab74e99de66414f02fe555f5c246decf244
+DIST go-zookeeper-218e9c81c0dd8b3b18172b2bbfad92cc7d6db55f.tar.gz 29301 SHA256 f90c7f318c92b9ad6fee417af842d9b9fc5b6635121e3f8035e236272ad41f28 SHA512 0fda62feaa668b43bdc7866270780b30069d7dace5c25c69d27d5df17bc3331885c9a7d3575b822c4da712e8a4af0465c6370cd3e89f6c39e73d70aed346d599 WHIRLPOOL f02c8c9edbf464111bc3302e23c986a73f7bc6684fb0e37136822cb910fc92136e0e2ca65420bcf98dce02245b42951acce17b0a062c4a0eb01df5b2b103e61f
 DIST go-zookeeper-d0e0d8e11f318e000a8cc434616d69e329edc374.tar.gz 24950 SHA256 773f4428d6eb2bcc53726fc2af7f495d30fd6d962ed182b7ec2edc8f8ad55ef3 SHA512 c1ac076b2abf9106c185c29158fdf8b3a74ea41458f336b5ebc2f5f13168ec6f06be14cbc3df61c1307a0fa4381d2f4f7cd8b569411152ae748c7fe12896bd24 WHIRLPOOL 94bb9b02d4c7e8eafa0fce1d6d9b79a6cf8007d9774a42267cb92673a89d9c30e60a7eb4d2cd464fbdc5e2e644649d3a980a3c92d6badfbf092f99a99306729e
+DIST golang-lru-5c7531c003d8bf158b0fe5063649a2f41a822146.tar.gz 12310 SHA256 9eb4e0d57ee38d379a1940a6970e7e4b8073e14dcfdbd83a5bdfadfd73635a2e SHA512 1fd87ae7707d1b01955896b55075237939d00eb58510a4af9e07f752222171cbdf294a98309cacee947629b577bd8c3e69c635212a56d96d2b6edf82e7720820 WHIRLPOOL 6d7ff2e77000654efcad5dd287e87800c671f20a23423951dd7c4b05e38b12df778d021ca601b19e2ab25ad966d9730796ebfdc6fc49e39059f68d6f9a31cc2f
 DIST golang-lru-995efda3e073b6946b175ed93901d729ad47466a.tar.gz 7872 SHA256 cac6e889020e8b31e46d50b98e0af9acbb44bf352ad0ca9d30db79b6235849e2 SHA512 29eee70cbdc9c712d1cece1f911f3a74ebfd44318b91dcd1932f0bff031286f0a80db93772dd04be350c0cca3cc77c0676659ef0f85229f31a1140e23c1fc3f5 WHIRLPOOL c4711d30caf5c2d880aeec7330bc06011dc4e741e305f6dcac8d983734b3706cb5967b06755f7684370ca61a91f356a97c9866ffda0e275e26bb11d3a74d0145
 DIST hcl-513e04c400ee2e81e97f5e011c08fb42c6f69b84.tar.gz 28692 SHA256 109ec067ff8ff7f30538e0d2ba1384c1fe25694c99d56972003b1c669d19d0b2 SHA512 90f568373d20cccbb56ada29257bd2ea808bbacb668fd1b82e71abf8f5e2592b4a58dc5d3f1174a2b38c660316cd0227eb333e747aae7a846e94168ebe9d2297 WHIRLPOOL cf5685f25d3c3b69d330e30ad089e2cbc9c6636b0f2ac4933638d6bcad06aa5a50f92d5228a1f1ddabd5e0f8187bc5b16f38f4a3bd86bbbf161a5409d5102ec0
+DIST hcl-578dd9746824a54637686b51a41bad457a56bcef.tar.gz 54677 SHA256 5656a59a398dc22d383d8daf33c410dcc1c21894d0053df5f7263d3a65f85fd9 SHA512 a430b7a4be9147e0fad3d932ecaee5970f049991351654682c679ace971e883615f957255d81da3dc2f732b0bfa26d66eb73ec7811957f05c2f72c2c506c23cd WHIRLPOOL d6dddcfbc53bc68fdf3971829bf8f0662e47a447682b37306424dd91ee2cc3d0280c7c368b3a8ded9f2127b2789b7b68648de9beaf9f9847cedb7324c2605dbf
+DIST logutils-0dc08b1671f34c4250ce212759ebd880f743d883.tar.gz 7717 SHA256 a58c8a6112b9ca2eb193d75996a54699f572411f3146d8ba62377af4a9fb933a SHA512 54e55f95808fb68be532e35076ffb04ff844a7d032530b82bbdd87f809bd1b0585538964cc22c7ae1cc039c5c30a02eca9734734c0c01ad76a14bd5a4c386426 WHIRLPOOL 0086485565e6fae835f54a1bb00a40660650c6018a6e79e05ba15120a59a6552ba60d86bfd63f7bc5cd8b331984fcdbe7162ef24d257bcc18a7fd8e6c028dd80
 DIST logutils-367a65d59043b4f846d179341d138f01f988c186.tar.gz 7704 SHA256 9b2173d9277574adbc45400101cb0b65534a5cd3defe62eeb3bff652eeb3e34c SHA512 9a4444fbae3bd1c0b2391981edf2f8155ebdd90a14a367f718bc7bcdced68b37b563ae38141fc3cb35409ff70820bd32b5a44cb218630418bce37f78181ef109 WHIRLPOOL 4973a7ef035807c9ef1135cface87cce4707910e6c33cece87dc8200df5e3d3c351d129ce20214e2cbf6bf58a7b040e9d1c5e12f5414cf37e45890a6a8ec439c
+DIST mapstructure-281073eb9eb092240d33ef253c404f1cca550309.tar.gz 13977 SHA256 3b2873f0e7e7a37f1b809493717033c1257bf41a9996e336746d83556df68240 SHA512 f495fe99c8ce752830b3d36db445cdc32baac6e266a0862d13e7e80e04f412ae7ee85e13ba794f1cfae3effb226007874c8ee819a4ef568ce2884077dfba4f9c WHIRLPOOL e3cf27de3f414014f9f068f66540daeeb90e10d69196a117a1e3a06c02cd096f5d711657c19c8ffdc26bf6a399a45fb9f78e96e26335f788baf7695785b7b90f
 DIST mapstructure-442e588f213303bec7936deba67901f8fc8f18b1.tar.gz 12220 SHA256 b4fa5d3b888734f849c5d6784fc1c5749e4ece168fda65c604676fca39c085d2 SHA512 de79f2579a086cccc047b280ae7e2b5dc5f8a95d504ead9d7f0cbaf01e70d37cb4eea8e7ab9aec446a7c2f1771152add3e2e488c18963d63ca3dac43ed2a33b7 WHIRLPOOL ecf8bd2bc9e50bb9e5ad3b6ebb04f5fdc10cf0e515f25d1381bbd1591c074887706b7c25f03a749ff212555fc537534056dab58eaece9357de9045ba2edd9a51
 DIST reflectwalk-242be0c275dedfba00a616563e6db75ab8f279ec.tar.gz 4290 SHA256 70ccfe92748dcc9e23460f6cedaeb4dd3f4807cc76241298b954beb71448cce6 SHA512 50ceea50f26307903138d5a0e0c395863ae662993a58d2053fce79ca49b0a17f9ba863adcdf4053cd9eb6592c91de02671be486ec4693449439b2b634be55fc1 WHIRLPOOL 4f88fd9ea461838acbf1344be39e9ecc1494ac8ae060917e27f16a6e5b19833b41be23dd8c0638c22933991b802f2f6dfc72e0bb772828bb43b020a08f22f1b1
+DIST reflectwalk-eecf4c70c626c7cfbb95c90195bc34d386c74ac6.tar.gz 4270 SHA256 04326a06d49f75738857f07eea4e04ec5f72ef62232f24c0d5785464baba42bf SHA512 a8112877ca2743887d39e2d2a6074932455a4ee4d9a24301495018f504922079b50f43c65601eb459d0142faf2828551cf316123092d18581c6d0c92b05209ca WHIRLPOOL 22cfcdefb8d51e9ced65589e13e16b5fbed01cc0b5d6c9f1e38c88c1b9f3b656796503068f593d85c570dad3c41939ac4142aaf6a916a4b2c2a6015034e3d164
+DIST serf-64d10e9428bd70dbcd831ad087573b66731c014b.tar.gz 579000 SHA256 6c74d90b84c402c684e27a8948ba54074ad368ed121945d21b9c00135cdf7c74 SHA512 eced133c2ba261e4e39d16f2252f555611e90f23f70a746a6f8d60b24e6747e73e619ec74f10a1c0646ec5edfd731cd79f6700d9bc5fb7b100723aac32203a5f WHIRLPOOL eaa15ec8dcdfeeb490cea4e9af24c8507dba09583f5e02919fd71607bfed8c999f872d3c8dd818378f79ade5fd065e1c2e270dda8ff428848c409f7922196478
+DIST structs-a924a2250d1033753512e95dce41dca3fd793ad9.tar.gz 12276 SHA256 f9998ee9ab32a55cfa7a9f93a9439ee56fc146d8aff6601f06bb2048b71c381a SHA512 ae2f0bc1f9e1ddbf1bd32d5e50a2ffbc4841c17d451739aee7cbbe359abac982e98a00caaff2aa433d10aad4dc414ce17e94a1d0893610ff53c52beddb21dd4f WHIRLPOOL cc4063c7463e261a32a84c357c352141a91e4a88874c02acd6f91bc05f478e668b5ad7629a7473009cebe201a789854f295b22d56310d39d632d81d223baec65
+DIST uuid-2951e8b9707a040acdb49145ed9f36a088f3532e.tar.gz 6165 SHA256 4e1a23490fec052724bbf267133f7b0aee3ffe30837886721192cc3c8ca1349b SHA512 db60e435d0c2ab9a0a6f3417e264cfe3fbb4754a8606f1cfc24712c2b0161bf7282fc6ab7f0f9268194c0fc075a34291ee5ac45e286b6d24b3920706dd4f9faf WHIRLPOOL cb1f1ce863a287daf1e357a86490e8cd8cf2c440acfb6d20c9604b7927ac48b0e8c23965739cf411c3496bf1dba9ca870bc39b5858398939521d13a050b66573
+DIST vault-145041757cee09193b0d132b816f72bc1e846107.tar.gz 3129266 SHA256 9edac0b55e590346fd6e822b4bd798f0c0f917da6bfc28e1e10dd57c2df11403 SHA512 ac8af7de2fb25e8d31f1caad18060eba5f80f12d04f6e128a315126ed6e98c24971e567beb0a3b96934af6983ae6bdd9fa2e6650e87a416199922bcd80fc534e WHIRLPOOL 821aa1c883d8b7f1c6e310781895f782beefa5bf92f1602d538aa2f69fba73e8d1e176aa1f04697a37e4040b72a4d5cc995b81d847e6c4317e0bfcc2c65f6a1b
diff --git a/app-admin/consul-template/consul-template-0.12.2.ebuild b/app-admin/consul-template/consul-template-0.12.2.ebuild
new file mode 100644
index 0000000..6e7190d
--- /dev/null
+++ b/app-admin/consul-template/consul-template-0.12.2.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit golang-base systemd user
+
+KEYWORDS="~amd64"
+DESCRIPTION="Generic template rendering and notifications with Consul"
+EGO_PN="github.com/hashicorp/${PN}/..."
+HOMEPAGE="http://${EGO_PN%/*}"
+LICENSE="MPL-2.0"
+SLOT="0"
+IUSE="test"
+
+DEPEND=">=dev-lang/go-1.4:="
+RDEPEND=""
+
+SRC_URI="https://${EGO_PN%/*}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/fatih/structs/archive/a924a2250d1033753512e95dce41dca3fd793ad9.tar.gz -> structs-a924a2250d1033753512e95dce41dca3fd793ad9.tar.gz
+	https://github.com/go-yaml/yaml/archive/f7716cbe52baa25d2e9b0d0da546fcf909fc16b4.tar.gz -> go-yaml-v2-f7716cbe52baa25d2e9b0d0da546fcf909fc16b4.tar.gz
+	https://github.com/golang/sys/archive/58da1121af381632b48b2843aeb16299f2e1dc50.tar.gz -> go-sys-0_pre20150729.tar.gz
+	https://github.com/hashicorp/consul/archive/v0.6.3.tar.gz -> consul-0.6.3.tar.gz
+	https://github.com/hashicorp/go-cleanhttp/archive/ce617e79981a8fff618bb643d155133a8f38db96.tar.gz -> go-cleanhttp-ce617e79981a8fff618bb643d155133a8f38db96.tar.gz
+	https://github.com/hashicorp/errwrap/archive/7554cd9344cec97297fa6649b055a8c98c2a1e55.tar.gz -> errwrap-7554cd9344cec97297fa6649b055a8c98c2a1e55.tar.gz
+	https://github.com/hashicorp/go-multierror/archive/d30f09973e19c1dfcd120b2d9c4f168e68d6b5d5.tar.gz -> go-multierror-d30f09973e19c1dfcd120b2d9c4f168e68d6b5d5.tar.gz
+	https://github.com/hashicorp/go-reap/archive/2d85522212dcf5a84c6b357094f5c44710441912.tar.gz -> go-reap-2d85522212dcf5a84c6b357094f5c44710441912.tar.gz
+	https://github.com/hashicorp/go-syslog/archive/42a2b573b664dbf281bd48c3cc12c086b17a39ba.tar.gz -> go-syslog-42a2b573b664dbf281bd48c3cc12c086b17a39ba.tar.gz
+	https://github.com/hashicorp/hcl/archive/578dd9746824a54637686b51a41bad457a56bcef.tar.gz -> hcl-578dd9746824a54637686b51a41bad457a56bcef.tar.gz
+	https://github.com/hashicorp/logutils/archive/0dc08b1671f34c4250ce212759ebd880f743d883.tar.gz -> logutils-0dc08b1671f34c4250ce212759ebd880f743d883.tar.gz
+	https://github.com/hashicorp/serf/archive/64d10e9428bd70dbcd831ad087573b66731c014b.tar.gz -> serf-64d10e9428bd70dbcd831ad087573b66731c014b.tar.gz
+	https://github.com/hashicorp/vault/archive/145041757cee09193b0d132b816f72bc1e846107.tar.gz -> vault-145041757cee09193b0d132b816f72bc1e846107.tar.gz
+	https://github.com/mitchellh/mapstructure/archive/281073eb9eb092240d33ef253c404f1cca550309.tar.gz -> mapstructure-281073eb9eb092240d33ef253c404f1cca550309.tar.gz
+	test? (
+		https://github.com/armon/go-metrics/archive/345426c77237ece5dab0e1605c3e4b35c3f54757.tar.gz -> go-metrics-345426c77237ece5dab0e1605c3e4b35c3f54757.tar.gz
+		https://github.com/armon/go-radix/archive/4239b77079c7b5d1243b7b4736304ce8ddb6f0f2.tar.gz -> go-radix-4239b77079c7b5d1243b7b4736304ce8ddb6f0f2.tar.gz
+		https://github.com/aws/aws-sdk-go/archive/v1.0.11.tar.gz -> aws-sdk-go-1.0.11.tar.gz
+		https://github.com/coreos/etcd/archive/5099bf6f7ab92181158cc2f0f0db1bb6056e9aeb.tar.gz -> etcd-5099bf6f7ab92181158cc2f0f0db1bb6056e9aeb.tar.gz
+		https://github.com/go-ini/ini/archive/v1.8.6.tar.gz -> go-ini-1.8.6.tar.gz
+		https://github.com/go-sql-driver/mysql/archive/v1.2.tar.gz -> go-sql-driver-mysql-1.2.tar.gz
+		https://github.com/golang/crypto/archive/83f1503f771a82af8a31f358eb825e9efb5dae6c.tar.gz -> go-crypto-0_pre20150808.tar.gz
+		https://github.com/golang/net/archive/1bc0720082d79ce7ffc6ef6e523d00d46b0dee45.tar.gz -> go-net-0_pre20150804.tar.gz
+		https://github.com/hashicorp/consul/archive/v0.6.3.tar.gz -> consul-0.6.3.tar.gz
+		https://github.com/hashicorp/go-gatedio/archive/8b8de1022221dde1fb52fa25d0caab46e59c8c14.tar.gz -> go-gatedio-8b8de1022221dde1fb52fa25d0caab46e59c8c14.tar.gz
+		https://github.com/hashicorp/go-msgpack/archive/fa3f63826f7c23912c15263591e65d54d080b458.tar.gz -> go-msgpack-fa3f63826f7c23912c15263591e65d54d080b458.tar.gz
+		https://github.com/hashicorp/go-uuid/archive/36289988d83ca270bc07c234c36f364b0dd9c9a7.tar.gz -> go-uuid-36289988d83ca270bc07c234c36f364b0dd9c9a7.tar.gz
+		https://github.com/hashicorp/golang-lru/archive/5c7531c003d8bf158b0fe5063649a2f41a822146.tar.gz -> golang-lru-5c7531c003d8bf158b0fe5063649a2f41a822146.tar.gz
+		https://github.com/hashicorp/uuid/archive/2951e8b9707a040acdb49145ed9f36a088f3532e.tar.gz -> uuid-2951e8b9707a040acdb49145ed9f36a088f3532e.tar.gz
+		https://github.com/jmespath/go-jmespath/archive/0.2.2.tar.gz -> go-jmespath-0.2.2.tar.gz
+		https://github.com/mitchellh/copystructure/archive/6fc66267e9da7d155a9d3bd489e00dad02666dc6.tar.gz -> copystructure-6fc66267e9da7d155a9d3bd489e00dad02666dc6.tar.gz
+		https://github.com/mitchellh/reflectwalk/archive/eecf4c70c626c7cfbb95c90195bc34d386c74ac6.tar.gz -> reflectwalk-eecf4c70c626c7cfbb95c90195bc34d386c74ac6.tar.gz
+		https://github.com/samuel/go-zookeeper/archive/218e9c81c0dd8b3b18172b2bbfad92cc7d6db55f.tar.gz -> go-zookeeper-218e9c81c0dd8b3b18172b2bbfad92cc7d6db55f.tar.gz
+	)"
+
+STRIP_MASK="*.a"
+S="${WORKDIR}/src/${EGO_PN%/*}"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+get_archive_go_package() {
+	local archive=${1} uri x
+	case ${archive} in
+		go-crypto-*) echo "crypto-* golang.org/x/crypto"; return;;
+		go-net-*) echo "net-* golang.org/x/net"; return;;
+		go-sys-*) echo "sys-* golang.org/x/sys"; return;;
+		go-yaml-v2-*) echo "yaml-* gopkg.in/yaml.v2"; return;;
+	esac
+	for x in ${SRC_URI}; do
+		if [[ ${x} == http* ]]; then
+			uri=${x}
+		elif [[ ${x} == ${archive} ]]; then
+			break
+		fi
+	done
+	uri=${uri#https://}
+	uri=${uri%/archive/*}
+	echo "${uri##*/}-* ${uri}"
+}
+
+unpack_go_packages() {
+	local go_package pattern x
+	# Unpack packages to appropriate locations for GOPATH
+	for x in ${A}; do
+		unpack ${x}
+		go_package=$(get_archive_go_package ${x})
+		pattern=${go_package%% *}
+		go_package=${go_package##* }
+		mkdir -p src/${go_package%/*}
+		mv ${pattern} src/${go_package} || die
+	done
+}
+
+src_unpack() {
+	unpack_go_packages
+	export GOPATH=${WORKDIR}:$(get_golibdir_gopath)
+}
+
+src_prepare() {
+	# Avoid the need to have a git checkout
+	sed -e 's:^GIT.*::' \
+		-e 's:-ldflags.*:\\:' \
+		-i scripts/build.sh || die
+
+	# Create a writable GOROOT in order to avoid sandbox violations.
+	export GOROOT="${WORKDIR}/goroot"
+	cp -sR "${EPREFIX}"/usr/lib/go "${GOROOT}" || die
+	rm -rf "${GOROOT}"/{src,pkg/$(go env GOOS)_$(go env GOARCH)}/"${EGO_PN%/*}" || die
+
+	# Prune conflicting libraries from GOROOT
+	while read -r -d '' x; do
+		x=${x#${WORKDIR}/src}
+		rm -rf "${GOROOT}/src/${x}" "${GOROOT}/pkg/$(go env GOOS)_$(go env GOARCH)/${x}"{,.a} || die
+	done < <(find "${WORKDIR}/src" -maxdepth 3 -mindepth 3 -type d -print0)
+
+	# Disable tests that fail under network-sandbox
+	sed -e 's:TestRun_onceFlag(:_\0:' -i cli_test.go || die
+	sed -e 's:TestRunner_quiescence(:_\0:' -i runner_test.go || die
+}
+
+src_compile() {
+	go build -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}" || die
+	go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}" || die
+}
+
+src_install() {
+	dobin "${WORKDIR}/bin/${PN}"
+	dodoc README.md
+
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+	systemd_dounit "${FILESDIR}/${PN}.service"
+
+	keepdir /etc/${PN}.d
+	insinto /etc/${PN}.d
+	doins "${FILESDIR}/"*.json.example
+}
diff --git a/app-admin/consul-template/consul-template-0.9.0.ebuild b/app-admin/consul-template/consul-template-0.9.0.ebuild
deleted file mode 100644
index 80a3de8..0000000
--- a/app-admin/consul-template/consul-template-0.9.0.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit golang-base systemd user
-
-KEYWORDS="~amd64"
-DESCRIPTION="Generic template rendering and notifications with Consul"
-GO_PN="github.com/hashicorp/${PN}"
-HOMEPAGE="http://${GO_PN}"
-LICENSE="MPL-2.0"
-SLOT="0"
-IUSE="test"
-
-DEPEND=">=dev-lang/go-1.4
-	test? ( dev-go/go-tools )
-	app-admin/consul
-	app-admin/vault"
-RDEPEND=""
-
-SRC_URI="https://${GO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-https://github.com/hashicorp/go-multierror/archive/fcdddc395df1ddf4247c69bd436e84cfa0733f7e.tar.gz -> go-multierror-fcdddc395df1ddf4247c69bd436e84cfa0733f7e.tar.gz
-https://github.com/armon/go-radix/archive/0bab926c3433cfd6490c6d3c504a7b471362390c.tar.gz -> go-radix-0bab926c3433cfd6490c6d3c504a7b471362390c.tar.gz
-https://github.com/hashicorp/errwrap/archive/7554cd9344cec97297fa6649b055a8c98c2a1e55.tar.gz -> errwrap-7554cd9344cec97297fa6649b055a8c98c2a1e55.tar.gz
-https://github.com/armon/go-metrics/archive/a54701ebec11868993bc198c3f315353e9de2ed6.tar.gz -> go-metrics-a54701ebec11868993bc198c3f315353e9de2ed6.tar.gz
-https://github.com/hashicorp/go-msgpack/archive/71c2886f5a673a35f909803f38ece5810165097b.tar.gz -> go-msgpack-71c2886f5a673a35f909803f38ece5810165097b.tar.gz
-https://github.com/hashicorp/go-syslog/archive/42a2b573b664dbf281bd48c3cc12c086b17a39ba.tar.gz -> go-syslog-42a2b573b664dbf281bd48c3cc12c086b17a39ba.tar.gz
-https://github.com/hashicorp/golang-lru/archive/995efda3e073b6946b175ed93901d729ad47466a.tar.gz -> golang-lru-995efda3e073b6946b175ed93901d729ad47466a.tar.gz
-https://github.com/hashicorp/hcl/archive/513e04c400ee2e81e97f5e011c08fb42c6f69b84.tar.gz -> hcl-513e04c400ee2e81e97f5e011c08fb42c6f69b84.tar.gz
-https://github.com/hashicorp/logutils/archive/367a65d59043b4f846d179341d138f01f988c186.tar.gz -> logutils-367a65d59043b4f846d179341d138f01f988c186.tar.gz
-https://github.com/mitchellh/copystructure/archive/6fc66267e9da7d155a9d3bd489e00dad02666dc6.tar.gz -> copystructure-6fc66267e9da7d155a9d3bd489e00dad02666dc6.tar.gz
-https://github.com/mitchellh/mapstructure/archive/442e588f213303bec7936deba67901f8fc8f18b1.tar.gz -> mapstructure-442e588f213303bec7936deba67901f8fc8f18b1.tar.gz
-https://github.com/mitchellh/reflectwalk/archive/242be0c275dedfba00a616563e6db75ab8f279ec.tar.gz -> reflectwalk-242be0c275dedfba00a616563e6db75ab8f279ec.tar.gz
-https://github.com/samuel/go-zookeeper/archive/d0e0d8e11f318e000a8cc434616d69e329edc374.tar.gz -> go-zookeeper-d0e0d8e11f318e000a8cc434616d69e329edc374.tar.gz"
-STRIP_MASK="*.a"
-S="${WORKDIR}/src/${GO_PN}"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-get_archive_go_package() {
-	local archive=${1} uri x
-	for x in ${SRC_URI}; do
-		if [[ ${x} == http* ]]; then
-			uri=${x}
-		elif [[ ${x} == ${archive} ]]; then
-			break
-		fi
-	done
-	uri=${uri#https://}
-	echo ${uri%/archive/*}
-}
-
-unpack_go_packages() {
-	local go_package x
-	# Unpack packages to appropriate locations for GOPATH
-	for x in ${A}; do
-		unpack ${x}
-		go_package=$(get_archive_go_package ${x})
-		mkdir -p src/${go_package%/*}
-		mv ${go_package##*/}-* src/${go_package} || die
-	done
-}
-
-src_unpack() {
-	unpack_go_packages
-	export GOPATH=${WORKDIR}:$(get_golibdir_gopath)
-}
-
-src_prepare() {
-	sed -e 's|build: deps|build:|'  -e 's|test: deps|test:|' \
-		-i Makefile || die
-
-	# Disable tests that fail under network-sandbox
-	sed -e 's:TestRun_onceFlag(:_\0:' -i cli_test.go || die
-	sed -e 's:TestRunner_quiescence(:_\0:' -i runner_test.go || die
-}
-
-src_compile() {
-	emake build
-}
-
-src_install() {
-	local x
-
-	dobin bin/${PN}
-	dodoc README.md
-
-	keepdir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-	systemd_dounit "${FILESDIR}/${PN}.service"
-
-	keepdir /etc/${PN}.d
-	insinto /etc/${PN}.d
-	doins "${FILESDIR}/"*.json.example
-}
diff --git a/app-admin/consul-template/metadata.xml b/app-admin/consul-template/metadata.xml
index a12ecb2..7efeb6a 100644
--- a/app-admin/consul-template/metadata.xml
+++ b/app-admin/consul-template/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>zmedico@gentoo.org</email>
   </maintainer>
   <upstream>
diff --git a/app-admin/consul/Manifest b/app-admin/consul/Manifest
index b4da8af..1178ce3 100644
--- a/app-admin/consul/Manifest
+++ b/app-admin/consul/Manifest
@@ -1,27 +1,62 @@
 DIST bolt-2c04100eb9793f2b8541d243494e2909d2112325.tar.gz 69587 SHA256 c0cdbaa6ec724c73799003ba166a4c9f1c6f1cc1b9760f98ef2d2a2a431577da SHA512 98a34fc045a6646df61d69f156164172e4446159fd790a1875c489583935b644dca4b14de097c0d1331cf46aa5221c77b8d1273a1f74121ac954dc04ef849f86 WHIRLPOOL 0380733bfc41010bc1ba14fb8be1b464a5dcd33cdc784aebc47298ee352d2b1b628ed1ee91d7f35c4346458d6ead87408db0bbe869126c46dd70faf5605d4ae1
+DIST bolt-ee4a0888a9abe7eefe5a0992ca4cb06864839873.tar.gz 78144 SHA256 165a79b80801b667b9ae09becc6085ebc79a68de32403b31018010c89216d2bc SHA512 a1f1254a00c6ad05d9097e900f1918a1d05e0a945c2438e715f6d386fc0dad82b3302764afd7bfb2a43030e79c6a0271284c866caffdda216961c10e16b63e2a WHIRLPOOL 9917359c05160a4852e55d6e556b511ba374d6c16b2c78a7d9e3ad5566f7ef68dd08176993e9fac2dc7f69612dd7da12a96e0a73b5e1e19fa102b540f594b800
+DIST circbuf-bbbad097214e2918d8543d5201d12bfd7bca254d.tar.gz 2884 SHA256 eec8f654b3b3e5c57a2f44ac58edb823600753f26bf41e63d8164add4dee4943 SHA512 a97ff3d2df6961bd0a365872d844c8d1af2835c03aa832a2cf52b65b134c70044acf6629268e98df13c0c566cf0145e6080be9283b2e0dd1b18274e4636ca55a WHIRLPOOL 74b635808317e6da2dc0135e1a65bda705d4496ab298eaf1c70d8995c02c027044608ef1dfcfc71fb3f945c03bf67877d2b6489bdeb2b4c12324fee5c7a14ed7
 DIST circbuf-f092b4f207b6e5cce0569056fba9e1a2735cb6cf.tar.gz 2748 SHA256 b67d2ffc0a725b6844895680d52ba4a63757987637c8dabbb2c3e4d836512d52 SHA512 0e1db19e79cd0f584adcb0ec0d6f04cad1e855abf0872a5bcf4ac5fedace55374a50e2c5c2086f26d20c63ff46d9f370119959d6ff20ead32bb4888df16e6948 WHIRLPOOL a375ffa2214e527c47815b82579bee7a270bb652582605a83c1a0d13087b2ef2f09cc6ee16f7e735fa61846c106203f3db51822d38eac18345f26f9e942a1ca2
 DIST cli-6cc8bc522243675a2882b81662b0b0d2e04b99c9.tar.gz 12690 SHA256 87d7f733c0f2e778fa72951c55a7fe65ea8694f2a1f621c368ecffb111098b05 SHA512 942f8a30a4570f04932ad263bb6760ec8d940d46058c65e56ffc81b1b5cc2d205afd61908260ce7d8dee44db879c861aafc0112335493b0b5018fa7b3b91fb62 WHIRLPOOL 5ea03493adee35661ed7bd30e857b171160a1a71d10c65aa8eee6e439ddf7d9c7f5ae9c1b9e3c0d70cf2a82d513b3b5570fcb089912822a50cc123fe4bc3ad68
+DIST cli-cb6853d606ea4a12a15ac83cc43503df99fd28fb.tar.gz 15706 SHA256 d3b85664d5a7c3e37f88c7b2437491eb04614ff1ab54fd77c4c8de5aa853a638 SHA512 4a27bb1f00098aee99edb94a986e0e1af504d9d77039e61d711d348d0f36df81345c0ff7c5f8ff85f453f8ed02e2862d7e856ac5ea6a3c9510bfc80b4c770d55 WHIRLPOOL b4401d7efaa992a0587da6d7a34e7359d58759d264e59d0a7ff809146cb3580e2840e2212ced9f5771efe908a379f6c13cd2d6b0274f5ffd493ca0131f698e10
 DIST columnize-44cb4788b2ec3c3d158dd3d1b50aba7d66f4b59a.tar.gz 3680 SHA256 504519c9befbac3045a00a7a70e82cc437622294ece6ac19b85ffd4aa915369f SHA512 1117d4a7efc1f029aef27ad711073fe4f8cff4ddf42021f917ad44cdf246153a39ca9a911892b783128563d09594aec5ffc4f8ee1d44218dd8ead1635ab4a040 WHIRLPOOL bb0417093ff993358cbacfade5df8c416e911ef352ebd760152dbce37b9e3c7c2d0064decc3efee7fe61672b13372b077cc19c579f186128175d2b05fc32d0c4
+DIST columnize-983d3a5fab1bf04d1b412465d2d9f8430e2e917e.tar.gz 3811 SHA256 1a087a5abbdea9adde033622079930af7a7b171693bef481c2291746ceb333f8 SHA512 0c746f39fe3f5b9ab0c62c188fe92183c23908fce2952d4ada366cedf204dc58883d717666d71fc1b37f5ed00411da39cfbd4d37ce5cf10012cdecc5704149b1 WHIRLPOOL d325bf6486d7e18da71eacd73d0dbac083a6179048aaa5120beb22372ace0d43fc04f80765c635c291924279adf4463ea42c4f61a2a59428cd88d5ecfb9dd5bc
 DIST consul-0.5.2.tar.gz 1821228 SHA256 acaa3b7a7c874d247175faaa9178bb1e93eabb2d810dc842c79ccf272b4518b6 SHA512 77e76cd090f668a963202aa68fcf5c676edeb30078de1f35ff9af6681c34dd4171eb0da24fedcd376cbe5fa0fa87f7a3453dda4075bfc55a8ba949d4c407ef04 WHIRLPOOL 746cef01f7733838de0774fcde4ef1b8f7c686ed90593218e623a3fc68bd6d590ecda427c8b94d1b412f1e83ebf76b4a357ecb89c39695ebdd890fc9f7976eb1
+DIST consul-0.6.3.tar.gz 2224536 SHA256 5cdc21d6f20f9b703d38e19d3d2ed1c037dcbb236b80bff6a9b9c481ded74435 SHA512 c80b96e18c283f8d2dc7542393e9d788c8247200890b1f2ecdf292b545c01c971f1452f6b37b23b92654409a191fbd4608710b1ca31d6c426ff77b53c4840c4b WHIRLPOOL b021bb7ecc97c2a99e88a8dd17dc1958fe7b2d17848c9e629edb0627d72d5651f96ef625cda4280989463e66c4b48880690b5e4a1180117bc762062be3b0566a
 DIST consul-migrate-0.1.0.tar.gz 12844 SHA256 f9c2699cf5686065b69c3c0af58f140c65c6c0963e699b35b6e03e06fa7f996b SHA512 8884112f8529dbd48afccc21e89b5e0c401a056d7ca2f223803648c6cfe12a6582a2f91ee548672c10c57bad11028a01297ad039c0be39243180deb165d262df WHIRLPOOL bb977a8823360c8159d356aca9273665b41f02b390984e91c005ef8a57e57d9d77143c575fe0b38933522a8ff03743f9b49bc5583c58c1b37bcb04f8f3ec08b9
+DIST datadog-go-bc97e0770ad4edae1c9dc14beb40b79b2dde32f8.tar.gz 6727 SHA256 5ba22c0a7091b3c2512161aaf34cd0dffc18f887538ece9d691cbef528645b3a SHA512 ff9808f2cc5e040a1144673e49fc9405c7e98e3322b090d231e41f4c1b3bdaf48c920a543a155138e3fc6a5fc852b05d936ec2a04ce9b6f8cb2f4476e0793161 WHIRLPOOL e484a13a7c96d88fbbeffa11c1e27781bbaa922558dc4ec0305c56544bf93e83e0c96130437ce4cac603466df6686f140f229d7f81c0474b09b26a8320c1d66f
+DIST dns-85b661b2a6fc95a5a83e66d7730c4bc0b6e9c99e.tar.gz 158741 SHA256 5d8ef0bd31fb2ee6522d6f0e868ae88f4c294d3d05d66f226ae2b15aade6034a SHA512 3438986bc4c411cea38ee8a88af8e1a89479336939610777154f9f86f716c8362c042ee9247439c178daeba1aae4ef69111a3b63afa1b3bd9ed3e7c31eaaed9f WHIRLPOOL 48c81a8690acbfdcdca5d5e22ac16db4dbdd037fb18ebed7ed02916e080ee31d068f197f6ea05e89a7ee981867183f5d9879a6b294c8986daf6011e7bb3f0baa
 DIST dns-bb1103f648f811d2018d4bedcb2d4b2bce34a0f1.tar.gz 117777 SHA256 4b539f47f2ccf7fffd35490b4840fa4503506223bdb25ce957797b5a373d2743 SHA512 e7c5c5c321147e973d09e516054ef233e59a1326a094f2f07c6ecf4392f50bd0493a9f197789982d4de6ca373e713214ad6166fb513b2beebaa0d94ab5b01aea WHIRLPOOL fdaab64471665f6d5dc9e06599ec9e9de6dac225d5117ca7c008ce385a7b31a707c8fa0ecd13e03e83f9dafd500b3fd8180392e386319dfce53cb37d50b830fc
+DIST errwrap-7554cd9344cec97297fa6649b055a8c98c2a1e55.tar.gz 8320 SHA256 e77d6aa78ef6342b21358d689edcd043778c5623af5a9b2690ed8e3fa4ea7db0 SHA512 da45b1696253bebe012f3d0e624a63dd11ad1a613d81cc302f2ea6f096f29a8d81015b9c00363bd2590c4cacc59de52a27e84435a7b4ad6512485cdd87df11c0 WHIRLPOOL 5c6013d852711e001a0eca6a3ad11f64e006be527cfc0b46db21049af97506730b48cfe1b2fac10bcfc66f61dce69023f20b06c83558e80ce337d75a127aa90d
+DIST go-bindata-a0ff2567cfb70903282db057e799fd826784d41d.tar.gz 17860 SHA256 65cf65ac422fb8072abfaabec86c20a74e448a93b489e896a36642e7049f5d32 SHA512 ed1d2fd1c5a833b6efdc731eb43f72fc072a701c447a926ad6c1f9be3c0f1ed92c689639d02a288230a49d53795f41092deab132389871a5b9f79abdc525fc43 WHIRLPOOL 34250f7fdd0d1cea862cbcd5d8580588908585b5aef84366258b58fd45914e9d3234af0b781eaa1c74bad2ac3d06d1cd5cc57d817180b3191e6a0c2e91e894f3
+DIST go-bindata-assetfs-57eb5e1fc594ad4b0b1dbea7b286d299e0cb43c2.tar.gz 3674 SHA256 4c1a7338c3d85ab4a65d5d9eacd840d36c053542b9f1a86cb7ae0b15296eda94 SHA512 6b08baabfd4df91f2594cf65581a00f50891df97a7959825510c24dbffa8e75cd7bb0e1235fb3fd0789f5c336f1ad63b35d8a8e1e27c8eb88c42cb101dc3b6bd WHIRLPOOL c2543784213f384815a75c92a6395c5b18aa09932ee01837a09618587ba9fe27eb9db603d65e9a8788de00ffc0320595cfcb7d5e15814c9048b55b22160d00bd
 DIST go-checkpoint-88326f6851319068e7b34981032128c0b1a6524d.tar.gz 9830 SHA256 ea62599bfbe3ec9b616a8b75a14013ccfc288b8b0ccdcac4dac93c82503d41ae SHA512 94c90964fdd343afc4a4054c1e10e71eff04e0e410e72f6f19056471d41258ec1d976b8f0d9d61284832872fbd39a157fb64908a4195d183823b7f21638b0ffb WHIRLPOOL 694685c0fe9141be69bf889a710c357a011342772ac0a1bc7b39a2a43ce4824e1ed98dd8be77dc62216948c1f113e8570bd8781146ac16de154f69451e461308
+DIST go-checkpoint-e4b2dc34c0f698ee04750bf2035d8b9384233e1b.tar.gz 9966 SHA256 db9082332473fdc385c04e5c8e4fe06ebe513558accc3edae9d9cc28f3a858eb SHA512 b8fdc11b1f531c0b75236a5d638bd11ead597b7ac3d0f2dda6b7ec0450b5f92b046b40290201e80c476846fc0f78589891f5b037c50ccf6a2d07df0e2ab7ca92 WHIRLPOOL 20a3d4914e326baa6b9d111a37073e07e8336ebbde892205e770e22a7d24e92f2fb0318c00a3fb57b4db53b6e28d93a13675335ffdbc7c0d9056026deef47a62
+DIST go-cleanhttp-ce617e79981a8fff618bb643d155133a8f38db96.tar.gz 6595 SHA256 b0a0282baa30df0e77ebd0902c5f0043f9af3460172ff61070927c270fa8139d SHA512 bfdeea0c0aad4160729bb023c9c908ff56c7faa64a820b16e982efede0389365987343b2a227cac95edaa4c9096f2dfcb1fd3f7d55510328dfdb284cfbf7600a WHIRLPOOL 1cd82ed8a82a2cb1de58a9a0177fead214e63908e880b2d57a4434c024a49d05579ea77142aa9d5ecca370adc4539bfb7db1d9d4a2cc27fc41d83a350c4fce39
+DIST go-dockerclient-296e36969d9d7606c4a6cbcd38eced50a39a0fd1.tar.gz 716365 SHA256 e1f5c43b80f72f1a9947332ad66364b35d8d2ec482df098e92af8c301f56e0aa SHA512 3192ffb293c76a89f202855e46168ea32f25916aa00c439d9aded68b44e0f2476b0416f66d0cd59092667515b64e059e2e0bb57e092e9ed66ee3c31541363a14 WHIRLPOOL 46503d46d5cd843858378df9646c9866301d540dd670c5ee831f52bcc2f8770753e1355791f79f588d0689f17c3842d7b776f5b36ab3821c80a6f89d75cba5ce
+DIST go-immutable-radix-12e90058b2897552deea141eff51bb7a07a09e63.tar.gz 12576 SHA256 6b268bb9aec15f263b5211b8b65f919e0af469563f50130ede34a32b04c39004 SHA512 ee4ce16d289fc5f41051d1da8faeb9d61d4fee81cc2e71edd041ebd72db870147795c95ebb915a9ee0c9b075c3142f9244b3a14f7b549934c3b36bb8df58123c WHIRLPOOL f587182c4fb98198de3f53612733fb9089465ff5c52293562ab5f3d5564fb0582ee5ce5915f30561fc6a39cf4bcae8e76357eff851657b552fb2dbfc7df7077a
+DIST go-isatty-56b76bdf51f7708750eac80fa38b952bb9f32639.tar.gz 1955 SHA256 a6f1ac857812224bd8a33e338b9baefcce2b1ca1777e8f359dff0a7bffb4bb3a SHA512 451ee7d6a42f967b2dd57a70f58690f3bbb21f0d6c18522772d3d9ca270ff9bbdd38d7e54e5404d303a615dcdca3c96fd9dd27075ac6d9efd88611b82f4c3662 WHIRLPOOL 39b094ea2f5a9fc808d160166973dd4e5a465408cb72c65d9450d1bf71f756eed7bbb5f98272482b177c2d2c2c2b7f4fc7e40ee75b51bc3d7a999cf550f1b9a9
+DIST go-memdb-31949d523ade8a236956c6f1761e9dcf902d1638.tar.gz 17359 SHA256 4a463839b906a230c3b128b16f67adc88e99900b63018d9bb508c4b95a1eed67 SHA512 abf2434b6f6b4b392635a9d1538bf7395e987be5d8c6fc6d0399257dc40700e766bdfa885ba72f6f942c6c7ebbf47dffdef66df3f47058bf493259fd2bf1141c WHIRLPOOL 1361ef58e09ea376c630847809ef6a5e614780530510d066be1ba9360a6a37c8c8eed831966f5ba4a97f5d93c063d71f56d10186eaa2242a22ea98d9e86092df
+DIST go-metrics-345426c77237ece5dab0e1605c3e4b35c3f54757.tar.gz 13610 SHA256 2efdf7c349cb81ef75fbb812e150aac9a7c6c27417f4e84f655ff77ddb006789 SHA512 2dd120d6da4d8cfcd4546a288534f233f7073281ed3d6e7712c8a92fc11f7b800c0950835037ec936ec89e6fc2dba06088d70bc7faee6f139cc9656c0a81d4b7 WHIRLPOOL ebe0a792cb231f3ff5241f8c2526c7a7927d6d1ab138e92ae0da34ba72e54bbb4769aa14804110e61d7de280ce28a0040ebd17e79ceccec585ad48c9aac91c33
 DIST go-metrics-a54701ebec11868993bc198c3f315353e9de2ed6.tar.gz 11268 SHA256 2f4206d5d50eaab383cdc4f5c57179e285b93649c028a69dd9e2a4a45b69afe3 SHA512 e3da3f7b98edd32da5c3381afc3e92021b92416d7ea9de0423a05c06bc9ff808e28d29ca9f689c0029809a4b1643819954039516d6ab5890bb5512f5fe99fd6d WHIRLPOOL 815f83ae08bb6a37ee1774a718a8c3b4087ee9a95f190b8a77453f0d1ba1ca88a331e8be12b2f63d0c1fdb9472f2ff35786b94eaf1f61f5cb33fe1e6d9e4e460
 DIST go-msgpack-71c2886f5a673a35f909803f38ece5810165097b.tar.gz 49485 SHA256 c32b90e67762a375981b38154cae65222bb1aaa7722727d0225d5f8de773e4c8 SHA512 e4141e664c3237f7ab4c283b110d04e933bfb36a9d57af374ab42fed00a4ad6d8399e3399b206eebe76c5e142746412b2ada6c20b1ec09088f3bb7d82a7b01a9 WHIRLPOOL 1434e72897de4063515a0d3319e96b066406c110e3e36f710970886ba6ec9411f71908d9696a4528ee0fcb88bea54ab9c064faa230761ce38b82bb5506a2c073
+DIST go-msgpack-fa3f63826f7c23912c15263591e65d54d080b458.tar.gz 49488 SHA256 eeffbd458f4996334275f828cfd3549d32a2ba6eda359e5c9be09f091548781f SHA512 7e60a122cca007bf5455d6e15f77c24eaa5739deedc9e0c158282249e84698f873628bffa9eb7d23c1c59bda7632b1968ca770c8e1796e2d50750ac86e80fcb2 WHIRLPOOL 41745e39256ef510d42c4da413609e3bdd0621cc2acccfddabb4c8774e47b73ad46656639bed3fac2335cf1b6a2a245d3b8b4f3831cfafb2c6e7ecb90293475d
+DIST go-multierror-d30f09973e19c1dfcd120b2d9c4f168e68d6b5d5.tar.gz 8792 SHA256 734fdf39b7fb299ecf18e65f72ac3f1929bd978618af575e8bcad9e5ca55b494 SHA512 8a3e37ac07bbd571dd8b76bd8c119e5dbc620444e78a6f9fe2c4d28b0171a46704a0b088380ca201a08f7235698f07de4e4881691aef5370739c8bfe2db9e85b WHIRLPOOL 7b501d47880ad570dd79d2da79cc10373b03426f7f89b513f3b3b195682b0b36aeefac675a56070c262ee7e0d31ff9a564a9667924b1da66957ad0f97ab2d46c
 DIST go-multierror-fcdddc395df1ddf4247c69bd436e84cfa0733f7e.tar.gz 8058 SHA256 af90f9be029c091eb011ff25d270772fdb51edf3c6396cf99f224c4e7ad724c3 SHA512 f5cb12407f9bc986867a274c623037edab04f8e2b664c7d4db3bb7e32f970dd073a3d233d18549a5f01b5e88abff0eb0c1fcf79b6696a531c208e6fe8137080e WHIRLPOOL c997792a5c1b3029b32d0fad3a55a281b5ced2bef306367a1fd49df75cab831b93a3752e76f8a18ce5d08e155f66b3826aa5d9878fb9655821cef7a69b71de31
 DIST go-radix-0bab926c3433cfd6490c6d3c504a7b471362390c.tar.gz 5446 SHA256 f4e628adceee06d7717dce0bf566d5ebd8c009599807f2436b3cda259011b331 SHA512 350904076752e2fda17e9c2891a50b037d2ca165924880d6d5e466b8ed76685d79ff00bbbfbe9a665668e0ebde23c87129d3c1c4bf27ffe0c034df160db9d08f WHIRLPOOL 8571b9e818904a56ea16c35883725013d2009dc294acfdf4f28920a03baff36ffcd3d4d6d8be0ecfc78eefbfeef57e4b2ca224f2ce37d665caae724389346f88
+DIST go-radix-4239b77079c7b5d1243b7b4736304ce8ddb6f0f2.tar.gz 5484 SHA256 4b5ac4fe94fb221c849b0e9694301eba2dc91ac1a6b79cee48da038cb1a3d2aa SHA512 e76b6eb6e23f3f1872486e1ad0cfe9e4dcd676a1bee62cfb2e2de28ead2defb8997adadfc48781d910b327fc777c4b38acca1e983a0fb14dd73142f4edb97337 WHIRLPOOL 391097c2c1f7e2a170b41d752595480454d036e9c35dd4ff08678d103a5bd2baddedb3a4a7ce89ca938408fa234be3a63bc74461c09bbfea212d016efa7c3028
+DIST go-reap-2d85522212dcf5a84c6b357094f5c44710441912.tar.gz 8469 SHA256 919b889e2fa550e97b6b2254983cb4e826772ebf5237a787c65217caa244efa0 SHA512 aec1ab90bf1a461e0031f4e3015585129be095896bc40c4188f01d3295b95565f544271ee51d284936d504097831bfee979ba9002bf2749805e565ae6991b066 WHIRLPOOL cda564739e7f49621eb1fb26eecd1b2bc22df673206ffe1877b78eaf08b587fcab80976cfc1452349111d519cae1e46e07fc8f00578355f67741b0dec1c37a18
 DIST go-syslog-42a2b573b664dbf281bd48c3cc12c086b17a39ba.tar.gz 4397 SHA256 378f5249729661db9d0c65030fbf636f6ec1d60ee926e67abf8c6dd7921d3907 SHA512 42257d0599936bb215f4a9f9189518418f02bc43e4d7417823ea460bfc45c6fd1f9b0bf5a35dd73881b57cd9e892c702b813a68fe6e417e82dd31c6635c1b24e WHIRLPOOL 26cf1464bf0899ae9bad0067481f57a121433c5fe7c93fef92523a157d7906b8c1c4216c2a4fe738222e4afaa85fc0a7b7b29149254125a3e8b2e7064add6cb1
+DIST golang-lru-5c7531c003d8bf158b0fe5063649a2f41a822146.tar.gz 12310 SHA256 9eb4e0d57ee38d379a1940a6970e7e4b8073e14dcfdbd83a5bdfadfd73635a2e SHA512 1fd87ae7707d1b01955896b55075237939d00eb58510a4af9e07f752222171cbdf294a98309cacee947629b577bd8c3e69c635212a56d96d2b6edf82e7720820 WHIRLPOOL 6d7ff2e77000654efcad5dd287e87800c671f20a23423951dd7c4b05e38b12df778d021ca601b19e2ab25ad966d9730796ebfdc6fc49e39059f68d6f9a31cc2f
 DIST golang-lru-995efda3e073b6946b175ed93901d729ad47466a.tar.gz 7872 SHA256 cac6e889020e8b31e46d50b98e0af9acbb44bf352ad0ca9d30db79b6235849e2 SHA512 29eee70cbdc9c712d1cece1f911f3a74ebfd44318b91dcd1932f0bff031286f0a80db93772dd04be350c0cca3cc77c0676659ef0f85229f31a1140e23c1fc3f5 WHIRLPOOL c4711d30caf5c2d880aeec7330bc06011dc4e741e305f6dcac8d983734b3706cb5967b06755f7684370ca61a91f356a97c9866ffda0e275e26bb11d3a74d0145
 DIST gomdb-151f2e08ef45cb0e57d694b2562f351955dff572.tar.gz 100298 SHA256 de5119016d4e12885c474f4f1e682c80984b464a0ae2809f28699aeba1badc68 SHA512 f8f0268b49a091166302440ee34e40ff89a4c6adacfcd2daa62161a04f8ebe2a5e66074c125afa40147eba7493ce5fd5fb75e33b3955ef9f0f836ecc409603a3 WHIRLPOOL bdc42de4d1b8fecd2a9770745d8b80ebaf3afc3471e672e4dd512f8e60272d9cfd7d6991ecafd424f20036b55b894e5befde81281b0a01fefc274df57044050e
+DIST gox-39862d88e853ecc97f45e91c1cdcb1b312c51eaa.tar.gz 15118 SHA256 c884282ebb143a037975418d0c3a73843d5147f73af6723d19b6177d369f4fcc SHA512 7c8934def51b370824a357716aeaf85dd0728a3007e60a31a0ef7cbb4e1ebb68d5ea58f883dac12985bf97a1bfd725108161912e2332f4f160a80e016cab85d1 WHIRLPOOL 4097b31a867d5cf39ea52d3729c38ddd009c660e87d026a067f6e255bdb2d15b81a9d1b11c6e45916b9e9ac672e7c2217d34d0f93c651c86b3c954e9177de5c7
 DIST hcl-513e04c400ee2e81e97f5e011c08fb42c6f69b84.tar.gz 28692 SHA256 109ec067ff8ff7f30538e0d2ba1384c1fe25694c99d56972003b1c669d19d0b2 SHA512 90f568373d20cccbb56ada29257bd2ea808bbacb668fd1b82e71abf8f5e2592b4a58dc5d3f1174a2b38c660316cd0227eb333e747aae7a846e94168ebe9d2297 WHIRLPOOL cf5685f25d3c3b69d330e30ad089e2cbc9c6636b0f2ac4933638d6bcad06aa5a50f92d5228a1f1ddabd5e0f8187bc5b16f38f4a3bd86bbbf161a5409d5102ec0
+DIST hcl-578dd9746824a54637686b51a41bad457a56bcef.tar.gz 54677 SHA256 5656a59a398dc22d383d8daf33c410dcc1c21894d0053df5f7263d3a65f85fd9 SHA512 a430b7a4be9147e0fad3d932ecaee5970f049991351654682c679ace971e883615f957255d81da3dc2f732b0bfa26d66eb73ec7811957f05c2f72c2c506c23cd WHIRLPOOL d6dddcfbc53bc68fdf3971829bf8f0662e47a447682b37306424dd91ee2cc3d0280c7c368b3a8ded9f2127b2789b7b68648de9beaf9f9847cedb7324c2605dbf
+DIST iochan-87b45ffd0e9581375c491fef3d32130bb15c5bd7.tar.gz 1785 SHA256 71c117246bb1d4d78ad5c3bc5d301942bcebaae5b1e35da1ad7851ceac71a675 SHA512 2efc0e3cbca496240e3e24550fd0d2aab742eb9b227230ff1ed4ee47344b994642b028bd4644cd45cd697f5f5ef6a729aad65537b10c6555bd52d9ca4b9c717c WHIRLPOOL 15dfd50bfc992a7b6a1b5d672d5bf9bfcb71a357eae371eac773e7fe9ad4ec8d4d0578e0dc6b12bb14689d1497129616b0eb300bbcb483a6865ac315bced562a
+DIST logutils-0dc08b1671f34c4250ce212759ebd880f743d883.tar.gz 7717 SHA256 a58c8a6112b9ca2eb193d75996a54699f572411f3146d8ba62377af4a9fb933a SHA512 54e55f95808fb68be532e35076ffb04ff844a7d032530b82bbdd87f809bd1b0585538964cc22c7ae1cc039c5c30a02eca9734734c0c01ad76a14bd5a4c386426 WHIRLPOOL 0086485565e6fae835f54a1bb00a40660650c6018a6e79e05ba15120a59a6552ba60d86bfd63f7bc5cd8b331984fcdbe7162ef24d257bcc18a7fd8e6c028dd80
 DIST logutils-367a65d59043b4f846d179341d138f01f988c186.tar.gz 7704 SHA256 9b2173d9277574adbc45400101cb0b65534a5cd3defe62eeb3bff652eeb3e34c SHA512 9a4444fbae3bd1c0b2391981edf2f8155ebdd90a14a367f718bc7bcdced68b37b563ae38141fc3cb35409ff70820bd32b5a44cb218630418bce37f78181ef109 WHIRLPOOL 4973a7ef035807c9ef1135cface87cce4707910e6c33cece87dc8200df5e3d3c351d129ce20214e2cbf6bf58a7b040e9d1c5e12f5414cf37e45890a6a8ec439c
+DIST mapstructure-281073eb9eb092240d33ef253c404f1cca550309.tar.gz 13977 SHA256 3b2873f0e7e7a37f1b809493717033c1257bf41a9996e336746d83556df68240 SHA512 f495fe99c8ce752830b3d36db445cdc32baac6e266a0862d13e7e80e04f412ae7ee85e13ba794f1cfae3effb226007874c8ee819a4ef568ce2884077dfba4f9c WHIRLPOOL e3cf27de3f414014f9f068f66540daeeb90e10d69196a117a1e3a06c02cd096f5d711657c19c8ffdc26bf6a399a45fb9f78e96e26335f788baf7695785b7b90f
 DIST mapstructure-442e588f213303bec7936deba67901f8fc8f18b1.tar.gz 12220 SHA256 b4fa5d3b888734f849c5d6784fc1c5749e4ece168fda65c604676fca39c085d2 SHA512 de79f2579a086cccc047b280ae7e2b5dc5f8a95d504ead9d7f0cbaf01e70d37cb4eea8e7ab9aec446a7c2f1771152add3e2e488c18963d63ca3dac43ed2a33b7 WHIRLPOOL ecf8bd2bc9e50bb9e5ad3b6ebb04f5fdc10cf0e515f25d1381bbd1591c074887706b7c25f03a749ff212555fc537534056dab58eaece9357de9045ba2edd9a51
 DIST memberlist-6025015f2dc659ca2c735112d37e753bda6e329d.tar.gz 51853 SHA256 7b808ff100db2e484e6cf338d32ed55512f4c371c5cbba498aeca632f21c830f SHA512 fb70a58c6914919e68210bd2486051e64bdbb03475dc02734b7c03ed51e7537ca19162264bffafb83eccf7ebd24ae7d6f9b400f23be0aeae9d80210addd91de2 WHIRLPOOL 981208444af8343157837c6cd3cb2ae886b1078d27c40f9cbff2a7acd52c682b1e29b9743bef7a709aafa35c3a5f9c1345578c27fb89f7330128e53ba435415a
+DIST memberlist-9888dc523910e5d22c5be4f6e34520943df21809.tar.gz 56833 SHA256 fb61ee9881d9d5a7bb0f8a50f86374e6360b7a4d75b6724999a6924cbc45ed34 SHA512 8941f0b138590b7d2b2e75c02e6c063b7146eb2a65b75ec48c341745ed60d6451b563f49db8bf4f693936b528c0e3f6c8d88b4b6e25d6ac4721aec36306b88db WHIRLPOOL 826a64eb649c5dd11e00f99ef0d711cd3b4cfbf03c16c9158a23ac95d55904e9a6a133b69b7f224a282a3142cd3f5971a7731a48833ca0baa9c651c8b4d95a18
 DIST muxado-f693c7e88ba316d1a0ae3e205e22a01aa3ec2848.tar.gz 25816 SHA256 237354d5acf550d05d20841e0ec6e88cea29ece70fdf8fc73a2d59884ea6be01 SHA512 2ce026db7d0dbe3704e5855970126658c33f45c28ab7c0ad60ab5dcd3c107ea9a3a2617efa59d89148c0dbbfa5dd2c30358e6b5855d9525772685e2c676b3e8e WHIRLPOOL 1a992c5ba09b9bce80dac43d5df2d0d6c72402e7b63cd56a168db5ceecbc6a7c5fad4b51f6e725c21d4e619dbc052270cacfcaf2d0d58dab7accf69eda49a6f4
+DIST net-rpc-msgpackrpc-a14192a58a694c123d8fe5481d4a4727d6ae82f3.tar.gz 2946 SHA256 c233ef14bdc51ed68800c06d71eaa394ad84341e3bf0cf0abfcb063486396816 SHA512 d9876a3c3ea3141240ec69c19703cb258cc6e5ba213f04d0bdf60a8741c8301204d94cc82fa037896eb2f8034f54b8471ede290cb3fb2b7033edaf2fef8000a9 WHIRLPOOL 428bf8a727de251419cf219fa26587c781ac9c59e2ccd033c7b6960e5363edeaf936d49c199d4e3103e6ab153eb17f029432d8d7031a07f8cfeb28df6b60ddbd
 DIST net-rpc-msgpackrpc-d377902b7aba83dd3895837b902f6cf3f71edcb2.tar.gz 2805 SHA256 0eb8244654cf9e461ce6338cdb7c6ab28dc118d425497e5f6045808e24932a0f SHA512 635c48bbbdce634fee720038a77a2c80f19a3b1e44cef1566b6eda6623bd00d1bf7cc89eb621517d620917c26f0ee80a23006edd903f8f03cf9d18e64b16ecfe WHIRLPOOL 7874f34649b22630d11f03655a35943b03375575cf5140e2d0de2194bab17b95489afa572fa19137a8001558d4139eae0e84b61b6604aa4d08a771af9f619467
+DIST raft-057b893fd996696719e98b6c44649ea14968c811.tar.gz 60617 SHA256 0a97044468f5a7b0640296c0bf25c9b66c2f78a6df9fdd8bf8ea5d624549ea93 SHA512 cc98717d405e3ee2479d44d79a98228faba3ca3ff41064490dde7555ca35bc65d3a8765778298fd0372b6a8afd0b00e5a557b8ad736709a0534c3fc85f61f3d7 WHIRLPOOL 74fd868a541d356284482c4af37b8affd61bf9588ec8c8f631cdb65d5c019cb5e4c78472b2fe111b137bf3aaf414c49c994e03a08522342047cd140df20986c6
 DIST raft-a8065f298505708bf60f518c09178149f3c06f21.tar.gz 56934 SHA256 a952ce8348085be36a1accbb7555e8c5a1a1c2292066d1966f17994ec90276ef SHA512 66aae260f4aa2b0a64669ff7abf4975fc933a7b873454c63a5eea807d5028360ba9f0396f3f9ac78136d96003af23b50ab4b922bad2b4f821db4faf057ce35ff WHIRLPOOL dd9f36d0213228717c428db9132f67a9efbdd882da1f320cb7893cd40ce569dd981c8aa4542f1d43f2bdc8ceb5b891197d45cbfa7bf055a3a69a4a98471bd0b5
 DIST raft-boltdb-d1e82c1ec3f15ee991f7cc7ffd5b67ff6f5bbaee.tar.gz 8881 SHA256 490ced07cc72baede9b997dcf92499fa0d4298926fbc51ee632bde3d3ea0979e SHA512 4f98cf8cf375561f255822cbd21b6926d3bd12ff2a1d9307b59ce5e12628034f197f6efc85d9cc9cf951eac7402b36954c2ea686bb033075ec840106614f2039 WHIRLPOOL 337d399c6b73893bb72d77a77e6b2c7b5ee914d191b719dec13f72975c0a4ece1ee6a902d32197bbf0f0300bdc3ce8efda082363a1e79a7d3f2d8aec6eb2d436
 DIST raft-mdb-4ec3694ffbc74d34f7532e70ef2e9c3546a0c0b0.tar.gz 9811 SHA256 9873fa73d17174e0e7175216848a2a7c58a9c66701459ed4d4866ab063ef58c1 SHA512 a592adb161dc9c8e40b17606ec0366e61c7ab76d7fb9f074d01abfb1ba1b1f7629582ce103e39989c269d1d49506b4ac24b7a265161aad2c855b60df7e02169b WHIRLPOOL 65f3f2ec309e0d7c0ab6246853fc584a4abb64cf6a09657dad047d4be89509177aabdd149360aa506281187068a1ee0dc465dd717be3479315a3e602794f7a1b
+DIST raft-mdb-55f29473b9e604b3678b93a8433a6cf089e70f76.tar.gz 9812 SHA256 c656165f8eafebd8a1c988007ffc6dc1da47b948fa74e103c2d486025558cd44 SHA512 5cebfe48dbd6eaaa90ac43b369ee8dd5125a2edeb3e838158ed279e73acdd3b9e3e436d3b8af7ee58cabfa32bc5c6de4ef904fe3686e2f88559b8c868370b2a2 WHIRLPOOL 01d01923b977a8bce9658ff081001e4c490fc8d90bc322177facc3169739fb24ee27a9267cdcc693707573b647d9ccce8c70a7193ad5a2862e098cfb6553e551
+DIST scada-client-84989fd23ad4cc0e7ad44d6a871fd793eb9beb0a.tar.gz 15815 SHA256 52b78dae0c5078e69cdee10f20618f341d2973263ee389d880af4b2b95683873 SHA512 703e1f575193aec6d3592c6df0c0eef40d75cc9634697812abe55dd1e7c4c5a1af156a708e5227a0c9853e26b22a185e5365f142939eaad890488ffe564279cd WHIRLPOOL b36655ab49d57e1a6b655ba16ad514d9ec705466caf0c2c1ceb555876e99aa44ab47c8c4a37e65a81cc9db00d481ee8e902a36343f06abe6367c59d0aea08bb1
 DIST scada-client-c26580cfe35393f6f4bf1b9ba55e6afe33176bae.tar.gz 15805 SHA256 74d7195f4d7b213cb82278ed34c16808a79923be9009aab7e8f1267d5a6675f7 SHA512 dab4b8b2bd6e57727e89e22eec89f0b381cf492797364e8891f2308e381290f4d7359edc5833b47e260e27cce77d7fed32672889c45f24397ad6ae06bb027642 WHIRLPOOL c04510ca20ff25ef4521d2e71b0f27abfdf484bfe24680ee9b92502e93dc1d8bce9e468ce5202f175a7cbc20d787e74618392a1f8f3d8858db303dec46e2d424
 DIST serf-558a6876882b2c5c61df29fd3990fb1765fd71d3.tar.gz 572608 SHA256 ccc9f543adb1c41e0541fd6f0d302e4a7b4e2b1695de695466d5c9e572971edf SHA512 7c6c1c8ae40952311a3a722d0f10b9e236bac1f291e4cd2014ccde495e3ab4b8f0922e619ac90e8bd38ed6b20db6238d66e786ef0f25cab2540663004672334e WHIRLPOOL 9623ab60e0547781f7de058ba96fa6d8bc447b898500054578bdfc3d9dcae531e701e604d3d3cd323143a67f8c6af5b6fb5b1aba37368deccdd43e268f0d8144
+DIST serf-64d10e9428bd70dbcd831ad087573b66731c014b.tar.gz 579000 SHA256 6c74d90b84c402c684e27a8948ba54074ad368ed121945d21b9c00135cdf7c74 SHA512 eced133c2ba261e4e39d16f2252f555611e90f23f70a746a6f8d60b24e6747e73e619ec74f10a1c0646ec5edfd731cd79f6700d9bc5fb7b100723aac32203a5f WHIRLPOOL eaa15ec8dcdfeeb490cea4e9af24c8507dba09583f5e02919fd71607bfed8c999f872d3c8dd818378f79ade5fd065e1c2e270dda8ff428848c409f7922196478
+DIST speakeasy-36e9cfdd690967f4f690c6edcc9ffacd006014a0.tar.gz 6906 SHA256 bee6fff18fc5af06302cb0d1c2754bba4873698fbbd2d265bb65ed2fcbd221f4 SHA512 c1079fa3a1c485792b3cbb738a4589c11ecd01d89104c33d77c6ce2e865a20d6191f9752f5d93537d05551cf1a67351c64e11dbe36e29d5426b6d29e42516147 WHIRLPOOL c10b39c7764a08f5c7d212e839163c4758a2c38ac4085bfca8dbf55006212c029cfdaad9d8fe2a3c80b095db8733c51359055743b79579a8bfb8d6e397fef5e5
 DIST yamux-b2e55852ddaf823a85c67f798080eb7d08acd71d.tar.gz 19249 SHA256 e4ca04b27f2899bd04033d4bb8cf2c5d0eac6e916c87851ded9cfa57d1f70b5f SHA512 9e889a25c20e1de7ffc59d785fba574152689303c41055ee0cb046fa18346df23ce875e1dce6607e3a0a7211b336c6033b66073ae811b7a08aa121bf147dcf1d WHIRLPOOL 3fb8dd868ba126f6044685a848260451ebe611332ecda152145243b150b995fcaa7c36a8205bcc97af00975c2b44901fb1731a8e6a78f40bc2a22a76b3bc7951
+DIST yamux-df949784da9ed028ee76df44652e42d37a09d7e4.tar.gz 21619 SHA256 7149ade3006a4458a190b73876f41ec03023c04a48d1068b75726a91102fc9f0 SHA512 bca9909319d5610b6d12ae8bb78afec97bb9b61119e10a22011699b3197d1ad3bf75cb143a9fd87a3eda69014439a8350d1c6993664c8d6e00e34796ce40d117 WHIRLPOOL 57cc271f221107b4fe9776fd5fe00a3a0c9c098cd032c3db3f471c7104c325adce2ed02f8fd27d6744d08dbc44ee0c986e330559727b5e369174607b03951ded
diff --git a/app-admin/consul/consul-0.5.2-r1.ebuild b/app-admin/consul/consul-0.5.2-r1.ebuild
index a55ecdf..e95e2e7 100644
--- a/app-admin/consul/consul-0.5.2-r1.ebuild
+++ b/app-admin/consul/consul-0.5.2-r1.ebuild
@@ -1,21 +1,53 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 
-inherit golang-base systemd user
+inherit git-r3 golang-base systemd user
 
-KEYWORDS="~amd64"
+GO_PN="github.com/hashicorp/consul"
+
 DESCRIPTION="A tool for service discovery, monitoring and configuration"
 HOMEPAGE="http://www.consul.io"
-GO_PN="github.com/hashicorp/consul"
-LICENSE="MPL-2.0"
+SRC_URI="
+	https://github.com/hashicorp/consul/archive/v0.5.2.tar.gz -> ${P}.tar.gz
+	https://github.com/armon/circbuf/archive/f092b4f207b6e5cce0569056fba9e1a2735cb6cf.tar.gz -> circbuf-f092b4f207b6e5cce0569056fba9e1a2735cb6cf.tar.gz
+	https://github.com/armon/go-metrics/archive/a54701ebec11868993bc198c3f315353e9de2ed6.tar.gz -> go-metrics-a54701ebec11868993bc198c3f315353e9de2ed6.tar.gz
+	https://github.com/armon/go-radix/archive/0bab926c3433cfd6490c6d3c504a7b471362390c.tar.gz -> go-radix-0bab926c3433cfd6490c6d3c504a7b471362390c.tar.gz
+	https://github.com/armon/gomdb/archive/151f2e08ef45cb0e57d694b2562f351955dff572.tar.gz -> gomdb-151f2e08ef45cb0e57d694b2562f351955dff572.tar.gz
+	https://github.com/boltdb/bolt/archive/2c04100eb9793f2b8541d243494e2909d2112325.tar.gz -> bolt-2c04100eb9793f2b8541d243494e2909d2112325.tar.gz
+	https://github.com/hashicorp/consul-migrate/archive/v0.1.0.tar.gz -> consul-migrate-0.1.0.tar.gz
+	https://github.com/hashicorp/go-checkpoint/archive/88326f6851319068e7b34981032128c0b1a6524d.tar.gz -> go-checkpoint-88326f6851319068e7b34981032128c0b1a6524d.tar.gz
+	https://github.com/hashicorp/go-msgpack/archive/71c2886f5a673a35f909803f38ece5810165097b.tar.gz -> go-msgpack-71c2886f5a673a35f909803f38ece5810165097b.tar.gz
+	https://github.com/hashicorp/go-multierror/archive/fcdddc395df1ddf4247c69bd436e84cfa0733f7e.tar.gz -> go-multierror-fcdddc395df1ddf4247c69bd436e84cfa0733f7e.tar.gz
+	https://github.com/hashicorp/go-syslog/archive/42a2b573b664dbf281bd48c3cc12c086b17a39ba.tar.gz -> go-syslog-42a2b573b664dbf281bd48c3cc12c086b17a39ba.tar.gz
+	https://github.com/hashicorp/golang-lru/archive/995efda3e073b6946b175ed93901d729ad47466a.tar.gz -> golang-lru-995efda3e073b6946b175ed93901d729ad47466a.tar.gz
+	https://github.com/hashicorp/hcl/archive/513e04c400ee2e81e97f5e011c08fb42c6f69b84.tar.gz -> hcl-513e04c400ee2e81e97f5e011c08fb42c6f69b84.tar.gz
+	https://github.com/hashicorp/logutils/archive/367a65d59043b4f846d179341d138f01f988c186.tar.gz -> logutils-367a65d59043b4f846d179341d138f01f988c186.tar.gz
+	https://github.com/hashicorp/memberlist/archive/6025015f2dc659ca2c735112d37e753bda6e329d.tar.gz -> memberlist-6025015f2dc659ca2c735112d37e753bda6e329d.tar.gz
+	https://github.com/hashicorp/net-rpc-msgpackrpc/archive/d377902b7aba83dd3895837b902f6cf3f71edcb2.tar.gz -> net-rpc-msgpackrpc-d377902b7aba83dd3895837b902f6cf3f71edcb2.tar.gz
+	https://github.com/hashicorp/raft/archive/a8065f298505708bf60f518c09178149f3c06f21.tar.gz -> raft-a8065f298505708bf60f518c09178149f3c06f21.tar.gz
+	https://github.com/hashicorp/raft-boltdb/archive/d1e82c1ec3f15ee991f7cc7ffd5b67ff6f5bbaee.tar.gz -> raft-boltdb-d1e82c1ec3f15ee991f7cc7ffd5b67ff6f5bbaee.tar.gz
+	https://github.com/hashicorp/raft-mdb/archive/4ec3694ffbc74d34f7532e70ef2e9c3546a0c0b0.tar.gz -> raft-mdb-4ec3694ffbc74d34f7532e70ef2e9c3546a0c0b0.tar.gz
+	https://github.com/hashicorp/scada-client/archive/c26580cfe35393f6f4bf1b9ba55e6afe33176bae.tar.gz -> scada-client-c26580cfe35393f6f4bf1b9ba55e6afe33176bae.tar.gz
+	https://github.com/hashicorp/serf/archive/558a6876882b2c5c61df29fd3990fb1765fd71d3.tar.gz -> serf-558a6876882b2c5c61df29fd3990fb1765fd71d3.tar.gz
+	https://github.com/hashicorp/yamux/archive/b2e55852ddaf823a85c67f798080eb7d08acd71d.tar.gz -> yamux-b2e55852ddaf823a85c67f798080eb7d08acd71d.tar.gz
+	https://github.com/inconshreveable/muxado/archive/f693c7e88ba316d1a0ae3e205e22a01aa3ec2848.tar.gz -> muxado-f693c7e88ba316d1a0ae3e205e22a01aa3ec2848.tar.gz
+	https://github.com/miekg/dns/archive/bb1103f648f811d2018d4bedcb2d4b2bce34a0f1.tar.gz -> dns-bb1103f648f811d2018d4bedcb2d4b2bce34a0f1.tar.gz
+	https://github.com/mitchellh/cli/archive/6cc8bc522243675a2882b81662b0b0d2e04b99c9.tar.gz -> cli-6cc8bc522243675a2882b81662b0b0d2e04b99c9.tar.gz
+	https://github.com/mitchellh/mapstructure/archive/442e588f213303bec7936deba67901f8fc8f18b1.tar.gz -> mapstructure-442e588f213303bec7936deba67901f8fc8f18b1.tar.gz
+	https://github.com/ryanuber/columnize/archive/44cb4788b2ec3c3d158dd3d1b50aba7d66f4b59a.tar.gz -> columnize-44cb4788b2ec3c3d158dd3d1b50aba7d66f4b59a.tar.gz"
+
 SLOT="0"
+LICENSE="MPL-2.0"
+KEYWORDS="~amd64"
 IUSE="test web"
+
 RESTRICT="test"
 
-DEPEND=">=dev-lang/go-1.4:=
+DEPEND="
+	>=dev-lang/go-1.4:=
 	dev-go/go-crypto:=
 	test? ( dev-go/go-tools )
 	web? (
@@ -24,35 +56,8 @@
 	)"
 RDEPEND=""
 
-SRC_URI="https://github.com/hashicorp/consul/archive/v0.5.2.tar.gz -> ${P}.tar.gz
-https://github.com/armon/circbuf/archive/f092b4f207b6e5cce0569056fba9e1a2735cb6cf.tar.gz -> circbuf-f092b4f207b6e5cce0569056fba9e1a2735cb6cf.tar.gz
-https://github.com/armon/go-metrics/archive/a54701ebec11868993bc198c3f315353e9de2ed6.tar.gz -> go-metrics-a54701ebec11868993bc198c3f315353e9de2ed6.tar.gz
-https://github.com/armon/go-radix/archive/0bab926c3433cfd6490c6d3c504a7b471362390c.tar.gz -> go-radix-0bab926c3433cfd6490c6d3c504a7b471362390c.tar.gz
-https://github.com/armon/gomdb/archive/151f2e08ef45cb0e57d694b2562f351955dff572.tar.gz -> gomdb-151f2e08ef45cb0e57d694b2562f351955dff572.tar.gz
-https://github.com/boltdb/bolt/archive/2c04100eb9793f2b8541d243494e2909d2112325.tar.gz -> bolt-2c04100eb9793f2b8541d243494e2909d2112325.tar.gz
-https://github.com/hashicorp/consul-migrate/archive/v0.1.0.tar.gz -> consul-migrate-0.1.0.tar.gz
-https://github.com/hashicorp/go-checkpoint/archive/88326f6851319068e7b34981032128c0b1a6524d.tar.gz -> go-checkpoint-88326f6851319068e7b34981032128c0b1a6524d.tar.gz
-https://github.com/hashicorp/go-msgpack/archive/71c2886f5a673a35f909803f38ece5810165097b.tar.gz -> go-msgpack-71c2886f5a673a35f909803f38ece5810165097b.tar.gz
-https://github.com/hashicorp/go-multierror/archive/fcdddc395df1ddf4247c69bd436e84cfa0733f7e.tar.gz -> go-multierror-fcdddc395df1ddf4247c69bd436e84cfa0733f7e.tar.gz
-https://github.com/hashicorp/go-syslog/archive/42a2b573b664dbf281bd48c3cc12c086b17a39ba.tar.gz -> go-syslog-42a2b573b664dbf281bd48c3cc12c086b17a39ba.tar.gz
-https://github.com/hashicorp/golang-lru/archive/995efda3e073b6946b175ed93901d729ad47466a.tar.gz -> golang-lru-995efda3e073b6946b175ed93901d729ad47466a.tar.gz
-https://github.com/hashicorp/hcl/archive/513e04c400ee2e81e97f5e011c08fb42c6f69b84.tar.gz -> hcl-513e04c400ee2e81e97f5e011c08fb42c6f69b84.tar.gz
-https://github.com/hashicorp/logutils/archive/367a65d59043b4f846d179341d138f01f988c186.tar.gz -> logutils-367a65d59043b4f846d179341d138f01f988c186.tar.gz
-https://github.com/hashicorp/memberlist/archive/6025015f2dc659ca2c735112d37e753bda6e329d.tar.gz -> memberlist-6025015f2dc659ca2c735112d37e753bda6e329d.tar.gz
-https://github.com/hashicorp/net-rpc-msgpackrpc/archive/d377902b7aba83dd3895837b902f6cf3f71edcb2.tar.gz -> net-rpc-msgpackrpc-d377902b7aba83dd3895837b902f6cf3f71edcb2.tar.gz
-https://github.com/hashicorp/raft/archive/a8065f298505708bf60f518c09178149f3c06f21.tar.gz -> raft-a8065f298505708bf60f518c09178149f3c06f21.tar.gz
-https://github.com/hashicorp/raft-boltdb/archive/d1e82c1ec3f15ee991f7cc7ffd5b67ff6f5bbaee.tar.gz -> raft-boltdb-d1e82c1ec3f15ee991f7cc7ffd5b67ff6f5bbaee.tar.gz
-https://github.com/hashicorp/raft-mdb/archive/4ec3694ffbc74d34f7532e70ef2e9c3546a0c0b0.tar.gz -> raft-mdb-4ec3694ffbc74d34f7532e70ef2e9c3546a0c0b0.tar.gz
-https://github.com/hashicorp/scada-client/archive/c26580cfe35393f6f4bf1b9ba55e6afe33176bae.tar.gz -> scada-client-c26580cfe35393f6f4bf1b9ba55e6afe33176bae.tar.gz
-https://github.com/hashicorp/serf/archive/558a6876882b2c5c61df29fd3990fb1765fd71d3.tar.gz -> serf-558a6876882b2c5c61df29fd3990fb1765fd71d3.tar.gz
-https://github.com/hashicorp/yamux/archive/b2e55852ddaf823a85c67f798080eb7d08acd71d.tar.gz -> yamux-b2e55852ddaf823a85c67f798080eb7d08acd71d.tar.gz
-https://github.com/inconshreveable/muxado/archive/f693c7e88ba316d1a0ae3e205e22a01aa3ec2848.tar.gz -> muxado-f693c7e88ba316d1a0ae3e205e22a01aa3ec2848.tar.gz
-https://github.com/miekg/dns/archive/bb1103f648f811d2018d4bedcb2d4b2bce34a0f1.tar.gz -> dns-bb1103f648f811d2018d4bedcb2d4b2bce34a0f1.tar.gz
-https://github.com/mitchellh/cli/archive/6cc8bc522243675a2882b81662b0b0d2e04b99c9.tar.gz -> cli-6cc8bc522243675a2882b81662b0b0d2e04b99c9.tar.gz
-https://github.com/mitchellh/mapstructure/archive/442e588f213303bec7936deba67901f8fc8f18b1.tar.gz -> mapstructure-442e588f213303bec7936deba67901f8fc8f18b1.tar.gz
-https://github.com/ryanuber/columnize/archive/44cb4788b2ec3c3d158dd3d1b50aba7d66f4b59a.tar.gz -> columnize-44cb4788b2ec3c3d158dd3d1b50aba7d66f4b59a.tar.gz"
-
 STRIP_MASK="*.a"
+
 S="${WORKDIR}/src/${GO_PN}"
 
 pkg_setup() {
@@ -80,13 +85,14 @@
 		unpack ${x}
 		if [[ ${x} == *.tar.gz ]]; then
 			go_package=$(get_archive_go_package ${x})
-			mkdir -p src/${go_package%/*}
+			mkdir -p src/${go_package%/*} || die
 			mv ${go_package##*/}-* src/${go_package} || die
 		fi
 	done
 }
 
 src_unpack() {
+	local path
 	unpack_go_packages
 	# Create a writable GOROOT in order to avoid sandbox violations
 	# or other interference from installed instances.
@@ -94,7 +100,7 @@
 	cp -sR "${EPREFIX}"/usr/lib/go "${GOROOT}" || die
 	while read -r path; do
 		rm -rf "${GOROOT}/src/${path#${WORKDIR}/src}" \
-		"${GOROOT}/pkg/linux_${ARCH}/${path#${WORKDIR}/src}" || die
+		"${GOROOT}/pkg/$(go env GOOS)_$(go env GOARCH)/${path#${WORKDIR}/src}" || die
 	done < <(find "${WORKDIR}"/src -maxdepth 3 -mindepth 3 -type d)
 }
 
@@ -124,11 +130,12 @@
 	local x
 
 	dobin bin/*
-	rm -rf bin
+	rm -rf bin || die
 
 	keepdir /etc/consul.d
 	insinto /etc/consul.d
 	doins "${FILESDIR}/"*.json.example
+	rm "${ED}etc/consul.d/ui.json.example" || die
 
 	for x in /var/{lib,log}/${PN}; do
 		keepdir "${x}"
@@ -144,17 +151,19 @@
 	newconfd "${FILESDIR}/consul.confd" "${PN}"
 	systemd_dounit "${FILESDIR}/consul.service"
 
-	find "${WORKDIR}"/{pkg,src} -name '.git*' -exec rm -rf {} \; 2>/dev/null
-	find "${WORKDIR}"/src/${GO_PN} -mindepth 1 -maxdepth 1 -type f -delete
+	egit_clean "${WORKDIR}"/{pkg,src}
+
+	find "${WORKDIR}"/src/${GO_PN} -mindepth 1 -maxdepth 1 -type f -delete || die
+
 	while read -r -d '' x; do
 		x=${x#${WORKDIR}/src}
-		[[ -d ${WORKDIR}/pkg/${KERNEL}_${ARCH}/${x} ||
-			-f ${WORKDIR}/pkg/${KERNEL}_${ARCH}/${x}.a ]] && continue
+		[[ -d ${WORKDIR}/pkg/$(go env GOOS)_$(go env GOARCH)/${x} ||
+			-f ${WORKDIR}/pkg/$(go env GOOS)_$(go env GOARCH)/${x}.a ]] && continue
 		rm -rf "${WORKDIR}"/src/${x}
 	done < <(find "${WORKDIR}"/src/${GO_PN} -mindepth 1 -maxdepth 1 -type d -print0)
 	insopts -m0644 -p # preserve timestamps for bug 551486
-	insinto /usr/lib/go/pkg/${KERNEL}_${ARCH}/${GO_PN%/*}
-	doins -r "${WORKDIR}"/pkg/${KERNEL}_${ARCH}/${GO_PN}
+	insinto /usr/lib/go/pkg/$(go env GOOS)_$(go env GOARCH)/${GO_PN%/*}
+	doins -r "${WORKDIR}"/pkg/$(go env GOOS)_$(go env GOARCH)/${GO_PN}
 	insinto /usr/lib/go/src/${GO_PN%/*}
 	doins -r "${WORKDIR}"/src/${GO_PN}
 }
diff --git a/app-admin/consul/consul-0.5.2.ebuild b/app-admin/consul/consul-0.5.2.ebuild
deleted file mode 100644
index 8389045..0000000
--- a/app-admin/consul/consul-0.5.2.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit golang-base systemd user
-
-KEYWORDS="~amd64"
-DESCRIPTION="A tool for service discovery, monitoring and configuration"
-HOMEPAGE="http://www.consul.io"
-GO_PN="github.com/hashicorp/consul"
-LICENSE="MPL-2.0"
-SLOT="0"
-IUSE="test web"
-RESTRICT="test"
-
-DEPEND=">=dev-lang/go-1.4
-	dev-go/go-crypto
-	test? ( dev-go/go-tools )
-	web? (
-		dev-ruby/sass
-		dev-ruby/uglifier
-	)"
-RDEPEND=""
-
-SRC_URI="https://github.com/hashicorp/consul/archive/v0.5.2.tar.gz -> ${P}.tar.gz
-https://github.com/armon/circbuf/archive/f092b4f207b6e5cce0569056fba9e1a2735cb6cf.tar.gz -> circbuf-f092b4f207b6e5cce0569056fba9e1a2735cb6cf.tar.gz
-https://github.com/armon/go-metrics/archive/a54701ebec11868993bc198c3f315353e9de2ed6.tar.gz -> go-metrics-a54701ebec11868993bc198c3f315353e9de2ed6.tar.gz
-https://github.com/armon/go-radix/archive/0bab926c3433cfd6490c6d3c504a7b471362390c.tar.gz -> go-radix-0bab926c3433cfd6490c6d3c504a7b471362390c.tar.gz
-https://github.com/armon/gomdb/archive/151f2e08ef45cb0e57d694b2562f351955dff572.tar.gz -> gomdb-151f2e08ef45cb0e57d694b2562f351955dff572.tar.gz
-https://github.com/boltdb/bolt/archive/2c04100eb9793f2b8541d243494e2909d2112325.tar.gz -> bolt-2c04100eb9793f2b8541d243494e2909d2112325.tar.gz
-https://github.com/hashicorp/consul-migrate/archive/v0.1.0.tar.gz -> consul-migrate-0.1.0.tar.gz
-https://github.com/hashicorp/go-checkpoint/archive/88326f6851319068e7b34981032128c0b1a6524d.tar.gz -> go-checkpoint-88326f6851319068e7b34981032128c0b1a6524d.tar.gz
-https://github.com/hashicorp/go-msgpack/archive/71c2886f5a673a35f909803f38ece5810165097b.tar.gz -> go-msgpack-71c2886f5a673a35f909803f38ece5810165097b.tar.gz
-https://github.com/hashicorp/go-multierror/archive/fcdddc395df1ddf4247c69bd436e84cfa0733f7e.tar.gz -> go-multierror-fcdddc395df1ddf4247c69bd436e84cfa0733f7e.tar.gz
-https://github.com/hashicorp/go-syslog/archive/42a2b573b664dbf281bd48c3cc12c086b17a39ba.tar.gz -> go-syslog-42a2b573b664dbf281bd48c3cc12c086b17a39ba.tar.gz
-https://github.com/hashicorp/golang-lru/archive/995efda3e073b6946b175ed93901d729ad47466a.tar.gz -> golang-lru-995efda3e073b6946b175ed93901d729ad47466a.tar.gz
-https://github.com/hashicorp/hcl/archive/513e04c400ee2e81e97f5e011c08fb42c6f69b84.tar.gz -> hcl-513e04c400ee2e81e97f5e011c08fb42c6f69b84.tar.gz
-https://github.com/hashicorp/logutils/archive/367a65d59043b4f846d179341d138f01f988c186.tar.gz -> logutils-367a65d59043b4f846d179341d138f01f988c186.tar.gz
-https://github.com/hashicorp/memberlist/archive/6025015f2dc659ca2c735112d37e753bda6e329d.tar.gz -> memberlist-6025015f2dc659ca2c735112d37e753bda6e329d.tar.gz
-https://github.com/hashicorp/net-rpc-msgpackrpc/archive/d377902b7aba83dd3895837b902f6cf3f71edcb2.tar.gz -> net-rpc-msgpackrpc-d377902b7aba83dd3895837b902f6cf3f71edcb2.tar.gz
-https://github.com/hashicorp/raft/archive/a8065f298505708bf60f518c09178149f3c06f21.tar.gz -> raft-a8065f298505708bf60f518c09178149f3c06f21.tar.gz
-https://github.com/hashicorp/raft-boltdb/archive/d1e82c1ec3f15ee991f7cc7ffd5b67ff6f5bbaee.tar.gz -> raft-boltdb-d1e82c1ec3f15ee991f7cc7ffd5b67ff6f5bbaee.tar.gz
-https://github.com/hashicorp/raft-mdb/archive/4ec3694ffbc74d34f7532e70ef2e9c3546a0c0b0.tar.gz -> raft-mdb-4ec3694ffbc74d34f7532e70ef2e9c3546a0c0b0.tar.gz
-https://github.com/hashicorp/scada-client/archive/c26580cfe35393f6f4bf1b9ba55e6afe33176bae.tar.gz -> scada-client-c26580cfe35393f6f4bf1b9ba55e6afe33176bae.tar.gz
-https://github.com/hashicorp/serf/archive/558a6876882b2c5c61df29fd3990fb1765fd71d3.tar.gz -> serf-558a6876882b2c5c61df29fd3990fb1765fd71d3.tar.gz
-https://github.com/hashicorp/yamux/archive/b2e55852ddaf823a85c67f798080eb7d08acd71d.tar.gz -> yamux-b2e55852ddaf823a85c67f798080eb7d08acd71d.tar.gz
-https://github.com/inconshreveable/muxado/archive/f693c7e88ba316d1a0ae3e205e22a01aa3ec2848.tar.gz -> muxado-f693c7e88ba316d1a0ae3e205e22a01aa3ec2848.tar.gz
-https://github.com/miekg/dns/archive/bb1103f648f811d2018d4bedcb2d4b2bce34a0f1.tar.gz -> dns-bb1103f648f811d2018d4bedcb2d4b2bce34a0f1.tar.gz
-https://github.com/mitchellh/cli/archive/6cc8bc522243675a2882b81662b0b0d2e04b99c9.tar.gz -> cli-6cc8bc522243675a2882b81662b0b0d2e04b99c9.tar.gz
-https://github.com/mitchellh/mapstructure/archive/442e588f213303bec7936deba67901f8fc8f18b1.tar.gz -> mapstructure-442e588f213303bec7936deba67901f8fc8f18b1.tar.gz
-https://github.com/ryanuber/columnize/archive/44cb4788b2ec3c3d158dd3d1b50aba7d66f4b59a.tar.gz -> columnize-44cb4788b2ec3c3d158dd3d1b50aba7d66f4b59a.tar.gz"
-
-STRIP_MASK="*.a"
-S="${WORKDIR}/src/${GO_PN}"
-
-pkg_setup() {
-	enewgroup consul
-	enewuser consul -1 -1 /var/lib/${PN} consul
-}
-
-get_archive_go_package() {
-	local archive=${1} uri x
-	for x in ${SRC_URI}; do
-		if [[ ${x} == http* ]]; then
-			uri=${x}
-		elif [[ ${x} == ${archive} ]]; then
-			break
-		fi
-	done
-	uri=${uri#https://}
-	echo ${uri%/archive/*}
-}
-
-unpack_go_packages() {
-	local go_package x
-	# Unpack packages to appropriate locations for GOPATH
-	for x in ${A}; do
-		unpack ${x}
-		if [[ ${x} == *.tar.gz ]]; then
-			go_package=$(get_archive_go_package ${x})
-			mkdir -p src/${go_package%/*}
-			mv ${go_package##*/}-* src/${go_package} || die
-		fi
-	done
-}
-
-src_unpack() {
-	unpack_go_packages
-	# Create a writable GOROOT in order to avoid sandbox violations
-	# or other interference from installed instances.
-	export GOPATH="${WORKDIR}:$(get_golibdir_gopath)" GOROOT="${WORKDIR}/goroot"
-	cp -sR "${EPREFIX}"/usr/lib/go "${GOROOT}" || die
-	while read -r path; do
-		rm -rf "${GOROOT}/src/${path#${WORKDIR}/src}" \
-		"${GOROOT}/pkg/linux_${ARCH}/${path#${WORKDIR}/src}" || die
-	done < <(find "${WORKDIR}"/src -maxdepth 3 -mindepth 3 -type d)
-}
-
-src_prepare() {
-	# Avoid the need to have a git checkout
-	sed -e 's:^GIT.*::' \
-		-e 's:-X main.GitCommit.*:" \\:' \
-		-i scripts/build.sh || die
-
-	# Disable tests that fail under network-sandbox
-	sed -e 's:TestServer_StartStop:_TestServer_StartStop:' \
-		-i consul/server_test.go || die
-	sed -e 's:TestRetryJoin(:_TestRetryJoin(:' \
-		-i command/agent/command_test.go || die
-}
-
-src_compile() {
-	emake
-
-	if use web; then
-		pushd ui >/dev/null || die
-		emake dist
-	fi
-}
-
-src_install() {
-	local x
-
-	dobin bin/*
-	rm -rf bin
-
-	keepdir /etc/consul.d
-	insinto /etc/consul.d
-	doins "${FILESDIR}/"*.json.example
-
-	for x in /var/{lib,log}/${PN}; do
-		keepdir "${x}"
-		fowners consul:consul "${x}"
-	done
-
-	if use web; then
-		insinto /var/lib/${PN}/ui
-		doins -r ui/dist/*
-	fi
-
-	newinitd "${FILESDIR}/consul.initd" "${PN}"
-	newconfd "${FILESDIR}/consul.confd" "${PN}"
-	systemd_dounit "${FILESDIR}/consul.service"
-
-	find "${WORKDIR}"/{pkg,src} -name '.git*' -exec rm -rf {} \; 2>/dev/null
-	find "${WORKDIR}"/src/${GO_PN} -mindepth 1 -maxdepth 1 -type f -delete
-	while read -r -d '' x; do
-		x=${x#${WORKDIR}/src}
-		[[ -d ${WORKDIR}/pkg/${KERNEL}_${ARCH}/${x} ||
-			-f ${WORKDIR}/pkg/${KERNEL}_${ARCH}/${x}.a ]] && continue
-		rm -rf "${WORKDIR}"/src/${x}
-	done < <(find "${WORKDIR}"/src/${GO_PN} -mindepth 1 -maxdepth 1 -type d -print0)
-	insopts -m0644 -p # preserve timestamps for bug 551486
-	insinto /usr/lib/go/pkg/${KERNEL}_${ARCH}/${GO_PN%/*}
-	doins -r "${WORKDIR}"/pkg/${KERNEL}_${ARCH}/${GO_PN}
-	insinto /usr/lib/go/src/${GO_PN%/*}
-	doins -r "${WORKDIR}"/src/${GO_PN}
-}
diff --git a/app-admin/consul/consul-0.6.3.ebuild b/app-admin/consul/consul-0.6.3.ebuild
new file mode 100644
index 0000000..a2ff9c6
--- /dev/null
+++ b/app-admin/consul/consul-0.6.3.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit git-r3 golang-base systemd user
+
+GO_PN="github.com/hashicorp/consul"
+
+DESCRIPTION="A tool for service discovery, monitoring and configuration"
+HOMEPAGE="http://www.consul.io"
+SRC_URI="
+	https://github.com/hashicorp/consul/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/armon/circbuf/archive/bbbad097214e2918d8543d5201d12bfd7bca254d.tar.gz -> circbuf-bbbad097214e2918d8543d5201d12bfd7bca254d.tar.gz
+	https://github.com/armon/go-metrics/archive/345426c77237ece5dab0e1605c3e4b35c3f54757.tar.gz -> go-metrics-345426c77237ece5dab0e1605c3e4b35c3f54757.tar.gz
+	https://github.com/armon/go-radix/archive/4239b77079c7b5d1243b7b4736304ce8ddb6f0f2.tar.gz -> go-radix-4239b77079c7b5d1243b7b4736304ce8ddb6f0f2.tar.gz
+	https://github.com/armon/gomdb/archive/151f2e08ef45cb0e57d694b2562f351955dff572.tar.gz -> gomdb-151f2e08ef45cb0e57d694b2562f351955dff572.tar.gz
+	https://github.com/boltdb/bolt/archive/ee4a0888a9abe7eefe5a0992ca4cb06864839873.tar.gz -> bolt-ee4a0888a9abe7eefe5a0992ca4cb06864839873.tar.gz
+	https://github.com/bgentry/speakeasy/archive/36e9cfdd690967f4f690c6edcc9ffacd006014a0.tar.gz -> speakeasy-36e9cfdd690967f4f690c6edcc9ffacd006014a0.tar.gz
+	https://github.com/DataDog/datadog-go/archive/bc97e0770ad4edae1c9dc14beb40b79b2dde32f8.tar.gz -> datadog-go-bc97e0770ad4edae1c9dc14beb40b79b2dde32f8.tar.gz
+	https://github.com/fsouza/go-dockerclient/archive/296e36969d9d7606c4a6cbcd38eced50a39a0fd1.tar.gz -> go-dockerclient-296e36969d9d7606c4a6cbcd38eced50a39a0fd1.tar.gz
+	https://github.com/elazarl/go-bindata-assetfs/archive/57eb5e1fc594ad4b0b1dbea7b286d299e0cb43c2.tar.gz -> go-bindata-assetfs-57eb5e1fc594ad4b0b1dbea7b286d299e0cb43c2.tar.gz
+	https://github.com/hashicorp/consul-migrate/archive/v0.1.0.tar.gz -> consul-migrate-0.1.0.tar.gz
+	https://github.com/hashicorp/errwrap/archive/7554cd9344cec97297fa6649b055a8c98c2a1e55.tar.gz -> errwrap-7554cd9344cec97297fa6649b055a8c98c2a1e55.tar.gz
+	https://github.com/hashicorp/go-checkpoint/archive/e4b2dc34c0f698ee04750bf2035d8b9384233e1b.tar.gz -> go-checkpoint-e4b2dc34c0f698ee04750bf2035d8b9384233e1b.tar.gz
+	https://github.com/hashicorp/go-cleanhttp/archive/ce617e79981a8fff618bb643d155133a8f38db96.tar.gz -> go-cleanhttp-ce617e79981a8fff618bb643d155133a8f38db96.tar.gz
+	https://github.com/hashicorp/go-immutable-radix/archive/12e90058b2897552deea141eff51bb7a07a09e63.tar.gz -> go-immutable-radix-12e90058b2897552deea141eff51bb7a07a09e63.tar.gz
+	https://github.com/hashicorp/go-memdb/archive/31949d523ade8a236956c6f1761e9dcf902d1638.tar.gz -> go-memdb-31949d523ade8a236956c6f1761e9dcf902d1638.tar.gz
+	https://github.com/hashicorp/go-msgpack/archive/fa3f63826f7c23912c15263591e65d54d080b458.tar.gz -> go-msgpack-fa3f63826f7c23912c15263591e65d54d080b458.tar.gz
+	https://github.com/hashicorp/go-multierror/archive/d30f09973e19c1dfcd120b2d9c4f168e68d6b5d5.tar.gz -> go-multierror-d30f09973e19c1dfcd120b2d9c4f168e68d6b5d5.tar.gz
+	https://github.com/hashicorp/go-syslog/archive/42a2b573b664dbf281bd48c3cc12c086b17a39ba.tar.gz -> go-syslog-42a2b573b664dbf281bd48c3cc12c086b17a39ba.tar.gz
+	https://github.com/hashicorp/go-reap/archive/2d85522212dcf5a84c6b357094f5c44710441912.tar.gz -> go-reap-2d85522212dcf5a84c6b357094f5c44710441912.tar.gz
+	https://github.com/hashicorp/golang-lru/archive/5c7531c003d8bf158b0fe5063649a2f41a822146.tar.gz -> golang-lru-5c7531c003d8bf158b0fe5063649a2f41a822146.tar.gz
+	https://github.com/hashicorp/hcl/archive/578dd9746824a54637686b51a41bad457a56bcef.tar.gz -> hcl-578dd9746824a54637686b51a41bad457a56bcef.tar.gz
+	https://github.com/hashicorp/logutils/archive/0dc08b1671f34c4250ce212759ebd880f743d883.tar.gz -> logutils-0dc08b1671f34c4250ce212759ebd880f743d883.tar.gz
+	https://github.com/hashicorp/memberlist/archive/9888dc523910e5d22c5be4f6e34520943df21809.tar.gz -> memberlist-9888dc523910e5d22c5be4f6e34520943df21809.tar.gz
+	https://github.com/hashicorp/net-rpc-msgpackrpc/archive/a14192a58a694c123d8fe5481d4a4727d6ae82f3.tar.gz -> net-rpc-msgpackrpc-a14192a58a694c123d8fe5481d4a4727d6ae82f3.tar.gz
+	https://github.com/hashicorp/raft/archive/057b893fd996696719e98b6c44649ea14968c811.tar.gz -> raft-057b893fd996696719e98b6c44649ea14968c811.tar.gz
+	https://github.com/hashicorp/raft-boltdb/archive/d1e82c1ec3f15ee991f7cc7ffd5b67ff6f5bbaee.tar.gz -> raft-boltdb-d1e82c1ec3f15ee991f7cc7ffd5b67ff6f5bbaee.tar.gz
+	https://github.com/hashicorp/raft-mdb/archive/55f29473b9e604b3678b93a8433a6cf089e70f76.tar.gz -> raft-mdb-55f29473b9e604b3678b93a8433a6cf089e70f76.tar.gz
+	https://github.com/hashicorp/scada-client/archive/84989fd23ad4cc0e7ad44d6a871fd793eb9beb0a.tar.gz -> scada-client-84989fd23ad4cc0e7ad44d6a871fd793eb9beb0a.tar.gz
+	https://github.com/hashicorp/serf/archive/64d10e9428bd70dbcd831ad087573b66731c014b.tar.gz -> serf-64d10e9428bd70dbcd831ad087573b66731c014b.tar.gz
+	https://github.com/hashicorp/yamux/archive/df949784da9ed028ee76df44652e42d37a09d7e4.tar.gz -> yamux-df949784da9ed028ee76df44652e42d37a09d7e4.tar.gz
+	https://github.com/inconshreveable/muxado/archive/f693c7e88ba316d1a0ae3e205e22a01aa3ec2848.tar.gz -> muxado-f693c7e88ba316d1a0ae3e205e22a01aa3ec2848.tar.gz
+	https://github.com/jteeuwen/go-bindata/archive/a0ff2567cfb70903282db057e799fd826784d41d.tar.gz -> go-bindata-a0ff2567cfb70903282db057e799fd826784d41d.tar.gz
+	https://github.com/mattn/go-isatty/archive/56b76bdf51f7708750eac80fa38b952bb9f32639.tar.gz -> go-isatty-56b76bdf51f7708750eac80fa38b952bb9f32639.tar.gz
+	https://github.com/miekg/dns/archive/85b661b2a6fc95a5a83e66d7730c4bc0b6e9c99e.tar.gz -> dns-85b661b2a6fc95a5a83e66d7730c4bc0b6e9c99e.tar.gz
+	https://github.com/mitchellh/cli/archive/cb6853d606ea4a12a15ac83cc43503df99fd28fb.tar.gz -> cli-cb6853d606ea4a12a15ac83cc43503df99fd28fb.tar.gz
+	https://github.com/mitchellh/gox/archive/39862d88e853ecc97f45e91c1cdcb1b312c51eaa.tar.gz -> gox-39862d88e853ecc97f45e91c1cdcb1b312c51eaa.tar.gz
+	https://github.com/mitchellh/iochan/archive/87b45ffd0e9581375c491fef3d32130bb15c5bd7.tar.gz -> iochan-87b45ffd0e9581375c491fef3d32130bb15c5bd7.tar.gz
+	https://github.com/mitchellh/mapstructure/archive/281073eb9eb092240d33ef253c404f1cca550309.tar.gz -> mapstructure-281073eb9eb092240d33ef253c404f1cca550309.tar.gz
+	https://github.com/ryanuber/columnize/archive/983d3a5fab1bf04d1b412465d2d9f8430e2e917e.tar.gz -> columnize-983d3a5fab1bf04d1b412465d2d9f8430e2e917e.tar.gz"
+
+SLOT="0"
+LICENSE="MPL-2.0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RESTRICT="test"
+
+DEPEND="
+	>=dev-lang/go-1.4:=
+	dev-go/go-crypto:=
+	>=dev-go/go-tools-0_pre20160121"
+RDEPEND=""
+
+STRIP_MASK="*.a"
+
+S="${WORKDIR}/src/${GO_PN}"
+
+pkg_setup() {
+	enewgroup consul
+	enewuser consul -1 -1 /var/lib/${PN} consul
+}
+
+get_archive_go_package() {
+	local archive=${1} uri x
+	for x in ${SRC_URI}; do
+		if [[ ${x} == http* ]]; then
+			uri=${x}
+		elif [[ ${x} == ${archive} ]]; then
+			break
+		fi
+	done
+	uri=${uri#https://}
+	echo ${uri%/archive/*}
+}
+
+unpack_go_packages() {
+	local go_package x
+	# Unpack packages to appropriate locations for GOPATH
+	for x in ${A}; do
+		unpack ${x}
+		if [[ ${x} == *.tar.gz ]]; then
+			go_package=$(get_archive_go_package ${x})
+			mkdir -p src/${go_package%/*}
+			mv ${go_package##*/}-* src/${go_package} || die
+		fi
+	done
+}
+
+src_unpack() {
+	unpack_go_packages
+	# Create a writable GOROOT in order to avoid sandbox violations
+	# or other interference from installed instances.
+	export GOPATH="${WORKDIR}:$(get_golibdir_gopath)" GOROOT="${WORKDIR}/goroot"
+	cp -sR "${EPREFIX}"/usr/lib/go "${GOROOT}" || die
+	while read -r path; do
+		rm -rf "${GOROOT}/src/${path#${WORKDIR}/src}" \
+		"${GOROOT}/pkg/$(go env GOOS)_$(go env GOARCH)/${path#${WORKDIR}/src}" || die
+	done < <(find "${WORKDIR}"/src -maxdepth 3 -mindepth 3 -type d)
+}
+
+src_prepare() {
+	# Avoid the need to have a git checkout
+	sed -e 's:^GIT.*::' \
+		-e 's:-X main.GitCommit.*:" \\:' \
+		-i scripts/build.sh || die
+
+	# go install golang.org/x/tools/cmd/stringer: mkdir /usr/lib/go-gentoo/bin/: permission denied
+	sed -e 's:golang.org/x/tools/cmd/stringer::' -i Makefile || die
+
+	# Disable tests that fail under network-sandbox
+	sed -e 's:TestServer_StartStop:_TestServer_StartStop:' \
+		-i consul/server_test.go || die
+	sed -e 's:TestRetryJoin(:_TestRetryJoin(:' \
+		-i command/agent/command_test.go || die
+}
+
+src_compile() {
+	PATH=${PATH}:${WORKDIR}/bin XC_ARCH=$(go env GOARCH) XC_OS=$(go env GOOS) emake
+}
+
+src_install() {
+	local x
+
+	dobin bin/*
+	rm -rf bin || die
+
+	keepdir /etc/consul.d
+	insinto /etc/consul.d
+	doins "${FILESDIR}/"*.json.example
+	rm "${ED}etc/consul.d/ui-dir.json.example" || die
+
+	for x in /var/{lib,log}/${PN}; do
+		keepdir "${x}"
+		fowners consul:consul "${x}"
+	done
+
+	newinitd "${FILESDIR}/consul.initd" "${PN}"
+	newconfd "${FILESDIR}/consul.confd" "${PN}"
+	systemd_dounit "${FILESDIR}/consul.service"
+
+	egit_clean "${WORKDIR}"/{pkg,src}
+
+	find "${WORKDIR}"/src/${GO_PN} -mindepth 1 -maxdepth 1 -type f -delete || die
+
+	while read -r -d '' x; do
+		x=${x#${WORKDIR}/src}
+		[[ -d ${WORKDIR}/pkg/$(go env GOOS)_$(go env GOARCH)/${x} ||
+			-f ${WORKDIR}/pkg/$(go env GOOS)_$(go env GOARCH)/${x}.a ]] && continue
+		rm -rf "${WORKDIR}"/src/${x}
+	done < <(find "${WORKDIR}"/src/${GO_PN} -mindepth 1 -maxdepth 1 -type d -print0)
+	insopts -m0644 -p # preserve timestamps for bug 551486
+	insinto /usr/lib/go/pkg/$(go env GOOS)_$(go env GOARCH)/${GO_PN%/*}
+	doins -r "${WORKDIR}"/pkg/$(go env GOOS)_$(go env GOARCH)/${GO_PN}
+	insinto /usr/lib/go/src/${GO_PN%/*}
+	doins -r "${WORKDIR}"/src/${GO_PN}
+}
diff --git a/app-admin/consul/consul-9999.ebuild b/app-admin/consul/consul-9999.ebuild
index 3c38c20..deebbb4 100644
--- a/app-admin/consul/consul-9999.ebuild
+++ b/app-admin/consul/consul-9999.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$
 
@@ -6,17 +6,22 @@
 
 inherit git-r3 golang-base systemd user
 
-KEYWORDS=""
+GO_PN="github.com/hashicorp/consul"
+
 DESCRIPTION="A tool for service discovery, monitoring and configuration"
 HOMEPAGE="http://www.consul.io"
-GO_PN="github.com/hashicorp/consul"
+SRC_URI=""
 EGIT_REPO_URI="git://${GO_PN}.git"
-LICENSE="MPL-2.0"
+
 SLOT="0"
+LICENSE="MPL-2.0"
+KEYWORDS=""
 IUSE="test web"
+
 RESTRICT="test"
 
-DEPEND=">=dev-lang/go-1.4:=
+DEPEND="
+	>=dev-lang/go-1.4:=
 	dev-go/go-crypto:=
 	test? ( dev-go/go-tools )
 	web? (
@@ -24,10 +29,11 @@
 		dev-ruby/uglifier
 	)"
 RDEPEND=""
-SRC_URI=""
 
 STRIP_MASK="*.a"
+
 S="${WORKDIR}/src/${GO_PN}"
+
 EGIT_CHECKOUT_DIR="${S}"
 
 pkg_setup() {
@@ -47,7 +53,7 @@
 	# Use latest versions of some packages, in case of incompatible
 	# API changes
 	rm -rf "${GOROOT}/src/${GO_PN%/*}" \
-		"${GOROOT}/pkg/linux_${ARCH}/${GO_PN%/*}" || die
+		"${GOROOT}/pkg/$(go env GOOS)_$(go env GOARCH)/${GO_PN%/*}" || die
 
 	# Fetch dependencies
 	emake deps
@@ -55,7 +61,7 @@
 	# Avoid interference from installed instances
 	while read -r path; do
 		rm -rf "${GOROOT}/src/${path#${WORKDIR}/src}" \
-		"${GOROOT}/pkg/linux_${ARCH}/${path#${WORKDIR}/src}" || die
+		"${GOROOT}/pkg/$(go env GOOS)_$(go env GOARCH)/${path#${WORKDIR}/src}" || die
 	done < <(find "${WORKDIR}"/src -maxdepth 3 -mindepth 3 -type d)
 }
 
@@ -80,7 +86,7 @@
 	local x
 
 	dobin bin/*
-	rm -rf bin
+	rm -rf bin || die
 
 	keepdir /etc/consul.d
 	insinto /etc/consul.d
@@ -100,17 +106,19 @@
 	newconfd "${FILESDIR}/consul.confd" "${PN}"
 	systemd_dounit "${FILESDIR}/consul.service"
 
-	find "${WORKDIR}"/{pkg,src} -name '.git*' -exec rm -rf {} \; 2>/dev/null
-	find "${WORKDIR}"/src/${GO_PN} -mindepth 1 -maxdepth 1 -type f -delete
+	egit_clean "${WORKDIR}"/{pkg,src}
+
+	find "${WORKDIR}"/src/${GO_PN} -mindepth 1 -maxdepth 1 -type f -delete || die
+
 	while read -r -d '' x; do
 		x=${x#${WORKDIR}/src}
-		[[ -d ${WORKDIR}/pkg/${KERNEL}_${ARCH}/${x} ||
-			-f ${WORKDIR}/pkg/${KERNEL}_${ARCH}/${x}.a ]] && continue
+		[[ -d ${WORKDIR}/pkg/$(go env GOOS)_$(go env GOARCH)/${x} ||
+			-f ${WORKDIR}/pkg/$(go env GOOS)_$(go env GOARCH)/${x}.a ]] && continue
 		rm -rf "${WORKDIR}"/src/${x}
 	done < <(find "${WORKDIR}"/src/${GO_PN} -mindepth 1 -maxdepth 1 -type d -print0)
 	insopts -m0644 -p # preserve timestamps for bug 551486
-	insinto /usr/lib/go/pkg/${KERNEL}_${ARCH}/${GO_PN%/*}
-	doins -r "${WORKDIR}"/pkg/${KERNEL}_${ARCH}/${GO_PN}
+	insinto /usr/lib/go/pkg/$(go env GOOS)_$(go env GOARCH)/${GO_PN%/*}
+	doins -r "${WORKDIR}"/pkg/$(go env GOOS)_$(go env GOARCH)/${GO_PN}
 	insinto /usr/lib/go/src/${GO_PN%/*}
 	doins -r "${WORKDIR}"/src/${GO_PN}
 }
diff --git a/app-admin/consul/files/ui.json.example b/app-admin/consul/files/ui.json.example
new file mode 100644
index 0000000..f8ce72f
--- /dev/null
+++ b/app-admin/consul/files/ui.json.example
@@ -0,0 +1,3 @@
+{
+  "ui": true
+}
diff --git a/app-admin/consul/metadata.xml b/app-admin/consul/metadata.xml
index a5f3be1..bdfa681 100644
--- a/app-admin/consul/metadata.xml
+++ b/app-admin/consul/metadata.xml
@@ -1,10 +1,10 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>zmedico@gentoo.org</email>
   </maintainer>
-  <maintainer>
+  <maintainer type="person">
     <email>ultrabug@gentoo.org</email>
   </maintainer>
   <use>
diff --git a/app-admin/cpulimit/metadata.xml b/app-admin/cpulimit/metadata.xml
index 39e3556..5d14155 100644
--- a/app-admin/cpulimit/metadata.xml
+++ b/app-admin/cpulimit/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>nullishzero@gentoo.org</email>
 		<name>Pavel Kazakov</name>
 	</maintainer>
diff --git a/app-admin/cronolog/metadata.xml b/app-admin/cronolog/metadata.xml
index 6752c3c..564b071 100644
--- a/app-admin/cronolog/metadata.xml
+++ b/app-admin/cronolog/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription lang="en">
 		Cronolog is a simple filter program that reads log file entries from
 		standard input and writes each entry to the output file specified by a
@@ -13,4 +10,3 @@
 		as Apache, to split the access log into daily or monthly logs.
 	</longdescription>
 </pkgmetadata>
-
diff --git a/app-admin/denyhosts/metadata.xml b/app-admin/denyhosts/metadata.xml
index fc42542..81f91d1 100644
--- a/app-admin/denyhosts/metadata.xml
+++ b/app-admin/denyhosts/metadata.xml
@@ -1,7 +1,7 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>ottxor@gentoo.org</email>
     <name>Christoph Junghans</name>
   </maintainer>
diff --git a/app-admin/diamond/metadata.xml b/app-admin/diamond/metadata.xml
index 395cb3e..835af29 100644
--- a/app-admin/diamond/metadata.xml
+++ b/app-admin/diamond/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>grobian@gentoo.org</email>
     <name>Fabian Groffen</name>
   </maintainer>
diff --git a/app-admin/dio/metadata.xml b/app-admin/dio/metadata.xml
index 67cb715..19a392a 100644
--- a/app-admin/dio/metadata.xml
+++ b/app-admin/dio/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proxy-maintainers</herd>
-  <maintainer>
+  <maintainer type="person">
     <email>donaldbmcintosh@yahoo.co.uk</email>
     <name>Donald McIntosh</name>
   </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">donaldmcintosh/dio</remote-id>
   </upstream>
diff --git a/app-admin/diradm/metadata.xml b/app-admin/diradm/metadata.xml
index 278b560..c8b2751 100644
--- a/app-admin/diradm/metadata.xml
+++ b/app-admin/diradm/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <maintainer>
+    <maintainer type="person">
         <email>robbat2@gentoo.org</email>
         <name>Robin H. Johnson</name>
     </maintainer>
 	<use>
-		<flag name='automount'>Support for automount data in LDAP</flag>
-		<flag name='irixpasswd'>Support for storing separate IRIX passwords</flag>
+		<flag name="automount">Support for automount data in LDAP</flag>
+		<flag name="irixpasswd">Support for storing separate IRIX passwords</flag>
 	</use>
 </pkgmetadata>
diff --git a/app-admin/drush/Manifest b/app-admin/drush/Manifest
index 77ff48b..54d8e31 100644
--- a/app-admin/drush/Manifest
+++ b/app-admin/drush/Manifest
@@ -1,2 +1,2 @@
 DIST drush-6.5.0.tar.gz 509643 SHA256 0e6bfb8a4bd75846dbca25f6d3e3130a706546f6a62edadce2eb00099750e2a7 SHA512 4afd348c025b9303386131687205af4219a77e6c822518b079a3f0475cbd7ed03647797d613300c7a281e2354f0d855435222fe1afe13447153cdbd6a4393add WHIRLPOOL 1f2a1a725e1c0f89cac90a1338e1541e587c7834560fd23d1a44341696be320e65cf93508d4841f02ca9b30ac62f3fed7de772e00f4eaeea64f287cf19682fcc
-DIST drush-6.6.0.tar.gz 511330 SHA256 67f7a1f08238c8c3f61d4e93f8c7c83508f392086c9931865fd1022981e8f698 SHA512 d7d361628406dd0f0fc5b07e7a318abd04ca7ac63da9d3fa705b0a64b531394f6e45e944dbd1c2e7eaec6643a92792b9b8558aea6ebb5311ce7acd32aa438a21 WHIRLPOOL ff0f2b1f20cc7a5767513be78b6f7ce1d09fb8929089ac918c4982e57f7c5c4f174c5dfd75235dafde57e65b90717844d4d9dfa199871e5c65bc4deda19b6b8c
+DIST drush-6.7.0.tar.gz 511581 SHA256 f3ba2a6847f83b1b8a61207b1a514617612a75261e7b39ffc2606b6958f79e8c SHA512 203870190dd8987ad3da71f7625476c1f94bc75513447a740fd8c16268fb9705bcbc3b2bffc49a44045998e3fa49fd5ee9d4c0634a1fb39605ba8e10b7373fa5 WHIRLPOOL 87eb20be4b6bb8280dd1e91c422bdfc7a2181d6eabd37a212ce7b95ef863cd7c526531d98eca09d032f8e8cf3201d746dd615dfcb858dfadfaef41869dc22500
diff --git a/app-admin/drush/drush-6.6.0.ebuild b/app-admin/drush/drush-6.7.0.ebuild
similarity index 100%
rename from app-admin/drush/drush-6.6.0.ebuild
rename to app-admin/drush/drush-6.7.0.ebuild
diff --git a/app-admin/drush/metadata.xml b/app-admin/drush/metadata.xml
index 4cf1bb2..6981e4b 100644
--- a/app-admin/drush/metadata.xml
+++ b/app-admin/drush/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>mjo@gentoo.org</email>
-    <name>Michael Orlitzky</name>
-  </maintainer>
   <longdescription lang="en">
     Drush is a command line shell and scripting interface for Drupal,
     a veritable Swiss Army knife designed to make life easier for
diff --git a/app-admin/durep/metadata.xml b/app-admin/durep/metadata.xml
index 06fca6f..ef9e210 100644
--- a/app-admin/durep/metadata.xml
+++ b/app-admin/durep/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription>A perl script designed for monitoring disk usage. Similar to du</longdescription>
 </pkgmetadata>
diff --git a/app-admin/ec2-ami-tools/metadata.xml b/app-admin/ec2-ami-tools/metadata.xml
index daccbac..278bcb6 100644
--- a/app-admin/ec2-ami-tools/metadata.xml
+++ b/app-admin/ec2-ami-tools/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
   <longdescription>
     These command-line tools serve as the client interface to the Amazon EC2 web service.
   </longdescription>
diff --git a/app-admin/ec2-api-tools/metadata.xml b/app-admin/ec2-api-tools/metadata.xml
index daccbac..278bcb6 100644
--- a/app-admin/ec2-api-tools/metadata.xml
+++ b/app-admin/ec2-api-tools/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
   <longdescription>
     These command-line tools serve as the client interface to the Amazon EC2 web service.
   </longdescription>
diff --git a/app-admin/eclean-kernel/metadata.xml b/app-admin/eclean-kernel/metadata.xml
index a19f158..8cfdc75 100644
--- a/app-admin/eclean-kernel/metadata.xml
+++ b/app-admin/eclean-kernel/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>mgorny@gentoo.org</email>
     <name>Michał Górny</name>
   </maintainer>
diff --git a/app-admin/elektra/metadata.xml b/app-admin/elektra/metadata.xml
index c3fe5e3..1c07cb8 100644
--- a/app-admin/elektra/metadata.xml
+++ b/app-admin/elektra/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
+<maintainer type="person">
 <email>xmw@gentoo.org</email>
 <name>Michael Weber</name>
 </maintainer>
@@ -15,4 +15,3 @@
 	<flag name="yajl">Enable yajl support</flag>
 </use>
 </pkgmetadata>
-
diff --git a/app-admin/emacs-updater/metadata.xml b/app-admin/emacs-updater/metadata.xml
index bc306fe..c438baf 100644
--- a/app-admin/emacs-updater/metadata.xml
+++ b/app-admin/emacs-updater/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>emacs</herd>
+<maintainer type="project">
+  <email>gnu-emacs@gentoo.org</email>
+  <name>Gentoo GNU Emacs project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-admin/entr/Manifest b/app-admin/entr/Manifest
index 14d0172..772bc1b 100644
--- a/app-admin/entr/Manifest
+++ b/app-admin/entr/Manifest
@@ -1 +1,2 @@
 DIST entr-3.3.tar.gz 22159 SHA256 701cb7b0a72b6c9ba794ad7cc15b6ebcc2e0c978bb6906c8ae407567a044461f SHA512 aa45bef57fb12d5ddaaebd8de03df33b69a833e4b729ad9fb0844af1c8b7031fc37ca1c81170b20967aa7dbf8854849a7b1f46da6d1d13a49d4d33502269bbca WHIRLPOOL 97f256bb37f0e517365ef7f3353d08b7c702a8182051c985c13efee3613d43eeda9da8a2911407a733c5f51e66e0fd5204a07b13f11c49ab7449ddb7d69b4334
+DIST entr-3.4.tar.gz 22443 SHA256 ce7d000fd6f2b711df905e9a6d8a2a0f50026ebaf34afeb9132d52617b6e010a SHA512 c765b50fa131a3d89ef99856ece5a223a43f6bd8fb3df37b51ae1b27e9f22b05a7ca4dcce1752a255a2dd4634d8fb55fc499bb837c5005dc3bf095b7910d47d0 WHIRLPOOL 0617b5a39d735ddbc3fae9802b741874d78b50f84749ea775cfa11c673e6651bdf6eeb5cb0e4ab6e9c145408c3bb24800591d16335aa4022dcc8c07445d73536
diff --git a/app-admin/entr/entr-3.4.ebuild b/app-admin/entr/entr-3.4.ebuild
new file mode 100644
index 0000000..6cafdf9
--- /dev/null
+++ b/app-admin/entr/entr-3.4.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Run arbitrary commands when files change"
+HOMEPAGE="http://entrproject.org/"
+SRC_URI="http://entrproject.org/code/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+
+src_unpack() {
+	unpack "${P}.tar.gz"
+	mv eradman-* "${P}"
+}
+
+src_configure() {
+	sh configure || die
+	sed -i -e 's#\(^PREFIX \).*#\1\?= /usr#' Makefile.bsd || die
+}
+
+src_test() {
+	emake test
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+}
diff --git a/app-admin/entr/metadata.xml b/app-admin/entr/metadata.xml
index 0a5d54b..630f676 100644
--- a/app-admin/entr/metadata.xml
+++ b/app-admin/entr/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>shell-tools</herd>
-	<maintainer>
+	<maintainer type="person">
 		<email>monsieurp@gentoo.org</email>
 		<name>Patrice Clement</name>
 	</maintainer>
+<maintainer type="project">
+		<email>shell-tools@gentoo.org</email>
+		<name>Gentoo Shell Tools Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-admin/equo/metadata.xml b/app-admin/equo/metadata.xml
index 187f7a7..15f07e4 100644
--- a/app-admin/equo/metadata.xml
+++ b/app-admin/equo/metadata.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>lxnay@gentoo.org</email>
 		<name>Fabio Erculiani</name>
 	</maintainer>
 	<use>
 	</use>
 </pkgmetadata>
-
diff --git a/app-admin/eselect/metadata.xml b/app-admin/eselect/metadata.xml
index dc5dc4f..1935b31 100644
--- a/app-admin/eselect/metadata.xml
+++ b/app-admin/eselect/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>eselect</herd>
+<maintainer type="project">
+	<email>eselect@gentoo.org</email>
+	<name>eselect configuration and management tool</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-admin/evtxtools/metadata.xml b/app-admin/evtxtools/metadata.xml
index 3d4b619..9a6e0b8 100644
--- a/app-admin/evtxtools/metadata.xml
+++ b/app-admin/evtxtools/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	 <maintainer>
+	 <maintainer type="person">
 		<email>zlogene@gentoo.org</email>
 		<name>Mikle Kolyada</name>
 	</maintainer> 
diff --git a/app-admin/fam/metadata.xml b/app-admin/fam/metadata.xml
index 52363bf..f8bd6f3 100644
--- a/app-admin/fam/metadata.xml
+++ b/app-admin/fam/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>jer@gentoo.org</email>
 		<name>Jeroen Roovers</name>
 	</maintainer>
diff --git a/app-admin/fetchlog/metadata.xml b/app-admin/fetchlog/metadata.xml
index a12c82d..957ba21 100644
--- a/app-admin/fetchlog/metadata.xml
+++ b/app-admin/fetchlog/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
   <upstream>
     <remote-id type="sourceforge">fetchlog</remote-id>
   </upstream>
diff --git a/app-admin/fifo-cronolog/metadata.xml b/app-admin/fifo-cronolog/metadata.xml
index 36a3c38..479c97a 100644
--- a/app-admin/fifo-cronolog/metadata.xml
+++ b/app-admin/fifo-cronolog/metadata.xml
@@ -5,13 +5,10 @@
 		fifo-cronolog is based on app-admin/cronolog, but uses a FIFO for input
 		instead of stdin. This package is used for the Gentoo infrastructure.
 	</longdescription>
-	<maintainer>
+	<maintainer type="person">
 		<email>idl0r@gentoo.org</email>
 	</maintainer>
-	<maintainer>
+	<maintainer type="person">
 		<email>robbat2@gentoo.org</email>
 	</maintainer>
-	<maintainer>
-		<email>infra-bugs@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>
diff --git a/app-admin/filebeat-bin/Manifest b/app-admin/filebeat-bin/Manifest
new file mode 100644
index 0000000..a5766cc
--- /dev/null
+++ b/app-admin/filebeat-bin/Manifest
@@ -0,0 +1,2 @@
+DIST filebeat-1.0.1-i686.tar.gz 3073413 SHA256 a9ccf9a4f1d3e2c840ad153ae4594a4cabccaa53c178c3ad585590e10994d7b8 SHA512 164835cb4dd98b6e897e004fdc0c099022be8e83ced89a0dbbbec119f32eaaf9f6ed5eaec41d3c86d5722df662577d83b9623b057ac7913038b04ee344ae5a85 WHIRLPOOL 9983b74569ff303cdfcff8968a0a93dab34e1f9c3d184f89e88e066106cd94a687e07a94e3ba6ac6019d786cad50a07ec8052043a5bdd3cbc095eaae64c50c0f
+DIST filebeat-1.0.1-x86_64.tar.gz 3265179 SHA256 662bceca18eabf9c81681b790776398a78fdf36604b5d0edc8abedd28980de52 SHA512 5ec0a0371790a425fac67ddb164fc4b347eb79468f85b8a64d78491a478aacfc2d3eaad62f654847c7381d4dc3686075e428ecc2271f415aa1cc83b5c84e72b7 WHIRLPOOL 58c86a41cdd2543d8de82e0572af27adac7d44d09c7866c984616c7dcb296087eaa25f6c7de234f27ed25698bad9d18a444bfd89166c5a415457a2f473fa6263
diff --git a/app-admin/filebeat-bin/filebeat-bin-1.0.1.ebuild b/app-admin/filebeat-bin/filebeat-bin-1.0.1.ebuild
new file mode 100644
index 0000000..96d830c
--- /dev/null
+++ b/app-admin/filebeat-bin/filebeat-bin-1.0.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_PN=${PN/-bin/}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Lightweight log shipper for Logstash and Elasticsearch"
+HOMEPAGE="https://www.elastic.co/products/beats"
+SRC_URI="amd64? ( https://download.elastic.co/beats/${MY_PN}/${MY_P}-x86_64.tar.gz )
+	x86? ( https://download.elastic.co/beats/${MY_PN}/${MY_P}-i686.tar.gz )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+src_unpack() {
+	if use amd64; then
+		S="${WORKDIR}/${MY_P}-x86_64"
+	elif use x86; then
+		S="${WORKDIR}/${MY_P}-i686"
+	fi
+
+	default
+}
+
+src_install() {
+	keepdir /etc/${MY_PN}
+	keepdir /var/lib/${MY_PN}
+
+	fperms 0750 /var/lib/${MY_PN}
+
+	newconfd "${FILESDIR}/${MY_PN}.confd" ${MY_PN}
+	newinitd "${FILESDIR}/${MY_PN}.initd" ${MY_PN}
+
+	insinto /etc/${MY_PN}
+	newins ${MY_PN}.yml ${MY_PN}.yml.example
+
+	dobin ${MY_PN}
+}
+
+pkg_postinst() {
+	if [[ ! -e /etc/${MY_PN}/${MY_PN}.yml ]]; then
+		elog "Before starting filebeat, you need to create a configuration file at:"
+		elog "/etc/${MY_PN}/${MY_PN}.yml"
+	fi
+}
diff --git a/app-admin/filebeat-bin/files/filebeat.confd b/app-admin/filebeat-bin/files/filebeat.confd
new file mode 100644
index 0000000..188f447
--- /dev/null
+++ b/app-admin/filebeat-bin/files/filebeat.confd
@@ -0,0 +1,5 @@
+#FILEBEAT_USER=""
+#FILEBEAT_GROUP=""
+#FILEBEAT_CONFIG=""
+#FILEBEAT_STATEDIR=""
+#FILEBEAT_OPTS=""
diff --git a/app-admin/filebeat-bin/files/filebeat.initd b/app-admin/filebeat-bin/files/filebeat.initd
new file mode 100644
index 0000000..6de6d27
--- /dev/null
+++ b/app-admin/filebeat-bin/files/filebeat.initd
@@ -0,0 +1,47 @@
+#!/sbin/openrc-run
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+FILEBEAT_USER="${FILEBEAT_USER:-root}"
+FILEBEAT_GROUP="${FILEBEAT_GROUP:-root}"
+FILEBEAT_CONFIG="${FILEBEAT_CONFIG:-/etc/filebeat/filebeat.yml}"
+FILEBEAT_STATEDIR="${FILEBEAT_STATEDIR:-/var/lib/filebeat}"
+FILEBEAT_OPTS="${FILEBEAT_OPTS:-}"
+
+command="/usr/bin/filebeat"
+command_args="-c ${FILEBEAT_CONFIG} ${FILEBEAT_OPTS}"
+extra_commands="checkconfig"
+command_background="true"
+start_stop_daemon_args="--user ${FILEBEAT_USER}:${FILEBEAT_GROUP} \
+	--chdir ${FILEBEAT_STATEDIR}"
+pidfile="/run/filebeat/filebeat.pid"
+
+depend() {
+	use net
+	after elasticsearch
+}
+
+checkconfig() {
+	if [ ! -e ${FILEBEAT_CONFIG} ]; then
+		eend "Please create a configuration file at ${FILEBEAT_CONFIG}"
+		return 1
+	fi
+	
+	ebegin "Checking your configuration"
+	${command} ${command_args} -configtest
+	eend $? "Configuration error. Please fix your configuration files."
+}
+
+start_pre() {
+	checkconfig || return 1
+
+	checkpath -d -o "${FILEBEAT_USER}":"${FILEBEAT_GROUP}" -m750 "$(dirname "${pidfile}")"
+	checkpath -d -o "${FILEBEAT_USER}":"${FILEBEAT_GROUP}" -m750 "${FILEBEAT_STATEDIR}"
+}
+
+stop() {
+	ebegin "Stopping filebeat"
+	start-stop-daemon --stop \
+		--pidfile=${pidfile} \
+		--retry=TERM/5/KILL/5
+}
diff --git a/app-admin/filebeat-bin/metadata.xml b/app-admin/filebeat-bin/metadata.xml
new file mode 100644
index 0000000..2d4f800
--- /dev/null
+++ b/app-admin/filebeat-bin/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>hydrapolic@gmail.com</email>
+		<name>Tomas Mozes</name>
+		<description>Proxy maintainer</description>
+	</maintainer>
+<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-admin/filewatcher/metadata.xml b/app-admin/filewatcher/metadata.xml
index bd3257d..5eac973 100644
--- a/app-admin/filewatcher/metadata.xml
+++ b/app-admin/filewatcher/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<name>Default assignee for orphaned packages</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">filewatcher</remote-id>
 	</upstream>
diff --git a/app-admin/fleet/metadata.xml b/app-admin/fleet/metadata.xml
index 6e88cbd..67da141 100644
--- a/app-admin/fleet/metadata.xml
+++ b/app-admin/fleet/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>alunduil@gentoo.org</email>
     <name>Alex Brandt</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="person">
     <email>mail@stefanjunker.de</email>
     <name>Stefan Junker</name>
   </maintainer>
diff --git a/app-admin/fsvs/files/fsvs-1.2.5-as-needed.patch b/app-admin/fsvs/files/fsvs-1.2.5-as-needed.patch
index 6f83311..f06070f 100644
--- a/app-admin/fsvs/files/fsvs-1.2.5-as-needed.patch
+++ b/app-admin/fsvs/files/fsvs-1.2.5-as-needed.patch
@@ -2,8 +2,8 @@
 Verbose build
 Fixes underlinking(bug #463684) - patch went upstream
 
---- src/Makefile.in.orig	2011-11-11 22:19:12.000000000 +0400
-+++ src/Makefile.in	2013-08-19 13:30:16.186082295 +0400
+--- fsvs-1.2.5/src/Makefile.in.orig	2011-11-11 22:19:12.000000000 +0400
++++ fsvs-1.2.5/src/Makefile.in	2013-08-19 13:30:16.186082295 +0400
 @@ -18,7 +18,7 @@
  CFLAGS	:= @CFLAGS@ @NEED_FNESTED_FUNCTIONS@
  CFLAGS	+= -Wall -funsigned-char -Os -DFSVS_VERSION='"$(VERSION)"'
diff --git a/app-admin/fsvs/fsvs-1.2.5-r2.ebuild b/app-admin/fsvs/fsvs-1.2.5-r2.ebuild
new file mode 100644
index 0000000..feef5d4
--- /dev/null
+++ b/app-admin/fsvs/fsvs-1.2.5-r2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Backup/restore for subversion backends"
+HOMEPAGE="http://fsvs.tigris.org/"
+SRC_URI="http://download.fsvs-software.org/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-vcs/subversion
+	dev-libs/libpcre
+	sys-libs/gdbm
+	dev-libs/apr-util
+	dev-util/ctags"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-as-needed.patch"
+)
+
+src_prepare() {
+	# fix #570596 by restoring pre-GCC5 inline semantics
+	append-cflags -std=gnu89
+	default
+}
+
+src_compile() {
+	# respect compiler
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	dobin src/fsvs
+	dodir /etc/fsvs
+	keepdir /var/spool/fsvs
+	doman doc/*5 doc/*1
+	dodoc doc/{FAQ,IGNORING,PERFORMANCE,USAGE}
+}
+
+pkg_postinst() {
+	elog "Remember, this system works best when you're connecting to a remote"
+	elog "svn server."
+	elog
+	elog "Go to the base path for versioning:"
+	elog "    cd /"
+	elog "Tell fsvs which URL it should use:"
+	elog "    fsvs url svn+ssh://username@machine/path/to/repos"
+	elog "Define ignore patterns - all virtual filesystems (/proc, /sys, etc.),"
+	elog "and (assuming that you're in / currently) the temporary files in /tmp:"
+	elog "    fsvs ignore DEVICE:0 ./tmp/*"
+	elog "And you're ready to play!"
+	elog "Check your data in:"
+	elog "    fsvs commit -m \"First import\""
+}
diff --git a/app-admin/fsvs/metadata.xml b/app-admin/fsvs/metadata.xml
index ff62877..097975e 100644
--- a/app-admin/fsvs/metadata.xml
+++ b/app-admin/fsvs/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>
diff --git a/app-admin/gam-server/metadata.xml b/app-admin/gam-server/metadata.xml
index 9879e83..f3cab85 100644
--- a/app-admin/gam-server/metadata.xml
+++ b/app-admin/gam-server/metadata.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>freedesktop</herd>
-  <maintainer>
+  <maintainer type="project">
     <email>freedesktop-bugs@gentoo.org</email>
   </maintainer>
 </pkgmetadata>
diff --git a/app-admin/gamin/metadata.xml b/app-admin/gamin/metadata.xml
index 8c86806..fb76b94 100644
--- a/app-admin/gamin/metadata.xml
+++ b/app-admin/gamin/metadata.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>freedesktop</herd>
-<maintainer>
+<maintainer type="project">
 <email>freedesktop-bugs@gentoo.org</email>
 </maintainer>
 </pkgmetadata>
diff --git a/app-admin/genromfs/metadata.xml b/app-admin/genromfs/metadata.xml
index eedb2fb..cf2f038 100644
--- a/app-admin/genromfs/metadata.xml
+++ b/app-admin/genromfs/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription>A readonly filesystem designed to be small and very space
 	efficent</longdescription>
 	<upstream>
diff --git a/app-admin/gentoo-rsync-mirror/metadata.xml b/app-admin/gentoo-rsync-mirror/metadata.xml
index 2a2586c..771a092 100644
--- a/app-admin/gentoo-rsync-mirror/metadata.xml
+++ b/app-admin/gentoo-rsync-mirror/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
-<maintainer>
+<maintainer type="person">
 	<email>rgkmg25@gmail.com</email>
 	<name>Robert Kowalski</name>
 </maintainer>
+<maintainer type="project">
+	<email>proxy-maint@gentoo.org</email>
+	<name>Proxy Maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-admin/geolizer/metadata.xml b/app-admin/geolizer/metadata.xml
index 6632069..2b9b44f 100644
--- a/app-admin/geolizer/metadata.xml
+++ b/app-admin/geolizer/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>web-apps</herd>
+	<maintainer type="project">
+		<email>web-apps@gentoo.org</email>
+		<name>Gentoo Webapps</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-admin/gkrellm/metadata.xml b/app-admin/gkrellm/metadata.xml
index 8a2f86d..d91e30b 100644
--- a/app-admin/gkrellm/metadata.xml
+++ b/app-admin/gkrellm/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>desktop-dock</herd>
   <use>
     <flag name="hddtemp">Enable monitoring harddrive temperatures via
 			<pkg>app-admin/hddtemp</pkg></flag>
diff --git a/app-admin/glance/Manifest b/app-admin/glance/Manifest
index e9b277f..ef1d037 100644
--- a/app-admin/glance/Manifest
+++ b/app-admin/glance/Manifest
@@ -1,3 +1 @@
-DIST glance-11.0.0.tar.gz 1565001 SHA256 35abd3af08b97a56556fdd1a68c61fcfa99ead6354f746f8f7cdc4517e90084e SHA512 33ceab2c7f52f5ce92b2bb33732697a85e4bdf552ca9d08bb7b21430ef942b545614de9b834bdd455b0544474217675731b77cded7218c56ef44274c29a97f47 WHIRLPOOL a256b0525f8a42e588a1d7cce4a6add919b9bd31752560dc7664814178fb4b3c952bfd7ec5d0d40932dc39c380c866561f9cb5ed1383482d4320f5417179c028
-DIST glance-2015.1.1.tar.gz 1102359 SHA256 5c5714264c4ad9c3d178b983899b54f69f138505ddd77e13141dc5f3d1598ebe SHA512 d9233b78174ec0f84b317abf7d26153a7e3ead25b4ebc31acbe5d0806b6877da5875de52ee0742dcbdd5fd3d23cb0240208f6fd57fa59cc403ad228ac85f2a0f WHIRLPOOL 69a4cd27b4ac57a47523ceb4b899bbbb3569e7af2bb8f3e64373d98b7c72450bd587c6da96d33903dcbf44e02f89ea563d116d9d2dc90d4a0f472eca89963a87
-DIST glance-2015.1.2.tar.gz 1108933 SHA256 e46bc6648a74a643cef3825dcd44c7e275ed3385b96cab83ef50c4c514932541 SHA512 0f8b8dbc3c507a47ad0873f35ec2212903d7e419b61c0298f77661f89a9718e3604786d52976860c78841fe0a94ad8fc1fe99514183d2b29ed414efe448e590a WHIRLPOOL df8ba6586b2f71c5d7ecb252b80e6c6de6f08df1029576fc8b2fb2a68633f5ce76de1334949af955e85c39e9f1df25b2f8763837ef8efa228b29559dc34be863
+DIST glance-11.0.1.tar.gz 1571617 SHA256 357d8cc17b23aefce8c53c9230a26db504d8039baf7e07d8ab9448ce2ceaccf3 SHA512 d43e79700179bbef39d82f8baa378c377f391e7bbd9022ec9e399379fb026be36b06b7ad7b89e39cb0b2a876111b451ad1acf3ad27cead5b58ce02106867bfa6 WHIRLPOOL bbd70deae3ac5b3d549fcca20e666d1ee3f240d59556712783ff4bb8fe780c0c06ff1344476a7a036aa5e99afcdc3a369a7bf322227717f17c42cc02e5f3b477
diff --git a/app-admin/glance/glance-11.0.0.ebuild b/app-admin/glance/glance-11.0.0.ebuild
deleted file mode 100644
index b1cab13..0000000
--- a/app-admin/glance/glance-11.0.0.ebuild
+++ /dev/null
@@ -1,211 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_4 )
-
-inherit distutils-r1 user
-
-DESCRIPTION="Services for discovering, registering, and retrieving VM images"
-HOMEPAGE="https://launchpad.net/glance"
-SRC_URI="https://launchpad.net/${PN}/liberty/${PV}/+download/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc mysql postgres +sqlite +swift test"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-CDEPEND=">=dev-python/pbr-1.6.0[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		${RDEPEND}
-		>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-		<=dev-python/Babel-2.0[${PYTHON_USEDEP}]
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		<=dev-python/coverage-4.0[${PYTHON_USEDEP}]
-		~dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
-		>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
-		<=dev-python/mox3-0.10.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
-		<=dev-python/mock-1.3.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-		>=dev-python/requests-2.5.2[${PYTHON_USEDEP}]
-		<=dev-python/requests-2.7.0[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		<=dev-python/testrepository-0.0.20[${PYTHON_USEDEP}]
-		>=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
-		<=dev-python/testresources-0.2.7-r9999[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		<=dev-python/testscenarios-0.5[${PYTHON_USEDEP}]
-		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
-		<=dev-python/testtools-1.8.0[${PYTHON_USEDEP}]
-		>=dev-python/psutil-1.1.1[${PYTHON_USEDEP}]
-		<dev-python/psutil-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-		<=dev-python/oslotest-1.11.0[${PYTHON_USEDEP}]
-		>=dev-python/pymysql-0.6.2[${PYTHON_USEDEP}]
-		<=dev-python/pymysql-0.6.7[${PYTHON_USEDEP}]
-		>=dev-python/psycopg-2.5[${PYTHON_USEDEP}]
-		<=dev-python/psycopg-2.6.1[${PYTHON_USEDEP}]
-		>=dev-python/pysendfile-2.0.0[${PYTHON_USEDEP}]
-		<=dev-python/pysendfile-2.0.1[${PYTHON_USEDEP}]
-		<=dev-python/qpid-python-0.26[$(python_gen_usedep 'python2_7')]
-		>=dev-python/pyxattr-0.5.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		<=dev-python/oslo-sphinx-3.2.0[${PYTHON_USEDEP}]
-	)"
-
-#note to self, wsgiref is a python builtin, no need to package it
-#>=dev-python/wsgiref-0.1.2[${PYTHON_USEDEP}]
-
-RDEPEND="
-	${CDEPEND}
-	sqlite? (
-		>=dev-python/sqlalchemy-0.9.9[sqlite,${PYTHON_USEDEP}]
-		<dev-python/sqlalchemy-1.1.0[sqlite,${PYTHON_USEDEP}]
-	)
-	mysql? (
-		dev-python/mysql-python
-		>=dev-python/sqlalchemy-0.9.9[${PYTHON_USEDEP}]
-		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
-	)
-	postgres? (
-		dev-python/psycopg:2[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-0.9.9[${PYTHON_USEDEP}]
-		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
-	)
-	~dev-python/anyjson-0.3.3[${PYTHON_USEDEP}]
-	~dev-python/eventlet-0.17.4[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
-	<=dev-python/pastedeploy-1.5.2[${PYTHON_USEDEP}]
-	>=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
-	!~dev-python/routes-2.0[${PYTHON_USEDEP}]
-	!~dev-python/routes-2.1[$(python_gen_usedep 'python2_7')]
-	<=dev-python/routes-2.2[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
-	<=dev-python/webob-1.4.1[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-migrate-0.9.6[${PYTHON_USEDEP}]
-	<=dev-python/sqlalchemy-migrate-0.10.0[${PYTHON_USEDEP}]
-	>=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
-	<=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
-	>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
-	<=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	<=dev-python/iso8601-0.1.10[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-2.3.0[${PYTHON_USEDEP}]
-	<=dev-python/oslo-config-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-2.3.0[${PYTHON_USEDEP}]
-	<=dev-python/oslo-concurrency-2.6.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
-	<=dev-python/oslo-context-0.6.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-service-0.7.0[${PYTHON_USEDEP}]
-	<=dev-python/oslo-service-0.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
-	<=dev-python/oslo-utils-2.5.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.5.0[${PYTHON_USEDEP}]
-	<=dev-python/stevedore-1.8.0[${PYTHON_USEDEP}]
-	>=dev-python/futurist-0.1.2[${PYTHON_USEDEP}]
-	<=dev-python/futurist-0.5.0[${PYTHON_USEDEP}]
-	>=dev-python/taskflow-1.16.0[${PYTHON_USEDEP}]
-	<=dev-python/taskflow-1.21.0[${PYTHON_USEDEP}]
-	>=dev-python/keystonemiddleware-2.0.0[${PYTHON_USEDEP}]
-	<=dev-python/keystonemiddleware-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/WSME-0.7[${PYTHON_USEDEP}]
-	<=dev-python/WSME-0.8.0[${PYTHON_USEDEP}]
-	<=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/jsonschema-2.5.0[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-1.6.0[${PYTHON_USEDEP}]
-	<=dev-python/python-keystoneclient-1.7.2-r9999[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
-	<=dev-python/pyopenssl-0.15.1[${PYTHON_USEDEP}]
-	~dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-2.4.1[${PYTHON_USEDEP}]
-	<=dev-python/oslo-db-2.6.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	<=dev-python/oslo-i18n-2.6.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-1.8.0[${PYTHON_USEDEP}]
-	<=dev-python/oslo-log-1.11.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-1.16.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-messaging-1.17.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-messaging-1.17.1[${PYTHON_USEDEP}]
-	<=dev-python/oslo-messaging-2.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-2.8.0[${PYTHON_USEDEP}]
-	<=dev-python/oslo-middleware-2.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-policy-0.5.0[${PYTHON_USEDEP}]
-	<=dev-python/oslo-policy-0.11.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
-	<=dev-python/oslo-serialization-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
-	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
-	<=dev-python/retrying-1.3.3[${PYTHON_USEDEP}]
-	~dev-python/osprofiler-0.3.0[${PYTHON_USEDEP}]
-	>=dev-python/glance_store-0.7.1[${PYTHON_USEDEP}]
-	!~dev-python/glance_store-0.9.0[${PYTHON_USEDEP}]
-	<=dev-python/glance_store-0.9.1[${PYTHON_USEDEP}]
-	>=dev-python/semantic_version-2.3.1[${PYTHON_USEDEP}]
-	<=dev-python/semantic_version-2.4.2[${PYTHON_USEDEP}]
-	>=dev-python/castellan-0.2.0[${PYTHON_USEDEP}]
-	<=dev-python/castellan-0.2.1[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.0[${PYTHON_USEDEP}]
-	<=dev-python/cryptography-1.1-r9999[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
-)
-
-pkg_setup() {
-	enewgroup glance
-	enewuser glance -1 -1 /var/lib/glance glance
-}
-
-python_prepare_all() {
-	sed -i '/xattr/d' test-requirements.txt || die
-	sed -i '/pysendfile/d' test-requirements.txt || die
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && "${PYTHON}" setup.py build_sphinx
-}
-
-python_test() {
-	# https://bugs.launchpad.net/glance/+bug/1251105
-	# https://bugs.launchpad.net/glance/+bug/1242501
-	testr init
-	testr run --parallel || die "failed testsuite under python2.7"
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	for svc in api registry scrubber; do
-		newinitd "${FILESDIR}/glance.initd" glance-${svc}
-	done
-
-	diropts -m 0750 -o glance -g glance
-	dodir /var/log/glance /var/lib/glance/images /var/lib/glance/scrubber
-	keepdir /etc/glance
-	keepdir /var/log/glance
-	keepdir /var/lib/glance/images
-	keepdir /var/lib/glance/scrubber
-
-	insinto /etc/glance
-	insopts -m 0640 -o glance -g glance
-	doins etc/*.ini
-	doins etc/*.conf
-	doins etc/*.sample
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/app-admin/glance/glance-11.0.1.ebuild b/app-admin/glance/glance-11.0.1.ebuild
new file mode 100644
index 0000000..af70b6c
--- /dev/null
+++ b/app-admin/glance/glance-11.0.1.ebuild
@@ -0,0 +1,228 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 user
+
+DESCRIPTION="Services for discovering, registering, and retrieving VM images"
+HOMEPAGE="https://launchpad.net/glance"
+SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc mysql postgres +sqlite +swift test"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+CDEPEND=">=dev-python/pbr-1.6.0[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		${RDEPEND}
+		>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+		<=dev-python/Babel-2.1.1[${PYTHON_USEDEP}]
+		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+		<=dev-python/coverage-4.0.3[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
+		<=dev-python/fixtures-1.4.0-r9999[${PYTHON_USEDEP}]
+		>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
+		<=dev-python/mox3-0.12.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
+		<=dev-python/mock-1.3.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+		>=dev-python/requests-2.5.2[${PYTHON_USEDEP}]
+		!~dev-python/requests-2.8.0[${PYTHON_USEDEP}]
+		<=dev-python/requests-2.8.1[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		<=dev-python/testrepository-0.0.20[${PYTHON_USEDEP}]
+		>=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
+		<=dev-python/testresources-1.0.0-r9999[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		<=dev-python/testscenarios-0.5[${PYTHON_USEDEP}]
+		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+		<=dev-python/testtools-1.8.1[${PYTHON_USEDEP}]
+		>=dev-python/psutil-1.1.1[${PYTHON_USEDEP}]
+		<dev-python/psutil-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		<=dev-python/oslotest-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/pymysql-0.6.2[${PYTHON_USEDEP}]
+		<=dev-python/pymysql-0.6.7[${PYTHON_USEDEP}]
+		>=dev-python/psycopg-2.5[${PYTHON_USEDEP}]
+		<=dev-python/psycopg-2.6.1[${PYTHON_USEDEP}]
+		>=dev-python/pysendfile-2.0.0[${PYTHON_USEDEP}]
+		<=dev-python/pysendfile-2.0.1[${PYTHON_USEDEP}]
+		<=dev-python/qpid-python-0.32[$(python_gen_usedep 'python2_7')]
+		>=dev-python/pyxattr-0.5.0[${PYTHON_USEDEP}]
+		>=dev-python/python-swiftclient-2.2.0[${PYTHON_USEDEP}]
+		<=dev-python/python-swiftclient-2.7.0[${PYTHON_USEDEP}]
+		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+		<=dev-python/oslo-sphinx-4.1.0[${PYTHON_USEDEP}]
+		>=dev-python/reno-0.1.1[${PYTHON_USEDEP}]
+	)"
+
+#note to self, wsgiref is a python builtin, no need to package it
+#>=dev-python/wsgiref-0.1.2[${PYTHON_USEDEP}]
+
+RDEPEND="
+	${CDEPEND}
+	sqlite? (
+		>=dev-python/sqlalchemy-0.9.9[sqlite,${PYTHON_USEDEP}]
+		<dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
+	)
+	mysql? (
+		dev-python/mysql-python
+		>=dev-python/sqlalchemy-0.9.9[${PYTHON_USEDEP}]
+		<dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+	)
+	postgres? (
+		dev-python/psycopg:2[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-0.9.9[${PYTHON_USEDEP}]
+		<dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+	)
+	~dev-python/anyjson-0.3.3[${PYTHON_USEDEP}]
+	~dev-python/eventlet-0.17.4[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
+	<=dev-python/pastedeploy-1.5.2[${PYTHON_USEDEP}]
+	>=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
+	!~dev-python/routes-2.0[${PYTHON_USEDEP}]
+	!~dev-python/routes-2.1[$(python_gen_usedep 'python2_7')]
+	<=dev-python/routes-2.2[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
+	<=dev-python/webob-1.5.1[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-migrate-0.9.6[${PYTHON_USEDEP}]
+	<=dev-python/sqlalchemy-migrate-0.10.0[${PYTHON_USEDEP}]
+	>=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
+	<=dev-python/httplib2-0.9.2[${PYTHON_USEDEP}]
+	>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
+	<=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
+	<=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-2.3.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-config-3.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-2.3.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-concurrency-3.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-context-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-service-0.7.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-service-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-utils-2.6.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-utils-3.2.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.5.0[${PYTHON_USEDEP}]
+	<=dev-python/stevedore-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/futurist-0.1.2[${PYTHON_USEDEP}]
+	<=dev-python/futurist-0.8.0[${PYTHON_USEDEP}]
+	>=dev-python/taskflow-1.16.0[${PYTHON_USEDEP}]
+	<=dev-python/taskflow-1.25.0[${PYTHON_USEDEP}]
+	>=dev-python/keystonemiddleware-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/keystonemiddleware-2.4.0[${PYTHON_USEDEP}]
+	<=dev-python/keystonemiddleware-4.0.0[${PYTHON_USEDEP}]
+	>=dev-python/WSME-0.7[${PYTHON_USEDEP}]
+	<=dev-python/WSME-0.8.0[${PYTHON_USEDEP}]
+	<=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/jsonschema-2.5.0[${PYTHON_USEDEP}]
+	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-1.6.0[${PYTHON_USEDEP}]
+	!~dev-python/python-keystoneclient-1.8.0[${PYTHON_USEDEP}]
+	<=dev-python/python-keystoneclient-2.0.0-r9999[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
+	<=dev-python/pyopenssl-0.15.1-r9999[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	<=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-2.4.1[${PYTHON_USEDEP}]
+	<=dev-python/oslo-db-4.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-i18n-3.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-1.8.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-log-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-1.16.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-messaging-1.17.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-messaging-1.17.1[${PYTHON_USEDEP}]
+	!~dev-python/oslo-messaging-2.6.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-messaging-2.6.1[${PYTHON_USEDEP}]
+	!~dev-python/oslo-messaging-2.7.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-messaging-2.8.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-messaging-2.8.1[${PYTHON_USEDEP}]
+	!~dev-python/oslo-messaging-2.9.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-messaging-3.1.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-messaging-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-middleware-2.8.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-middleware-3.3.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-policy-0.5.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-policy-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-serialization-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
+	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
+	<=dev-python/retrying-1.3.3[${PYTHON_USEDEP}]
+	>=dev-python/osprofiler-0.3.0[${PYTHON_USEDEP}]
+	<=dev-python/osprofiler-0.3.1[${PYTHON_USEDEP}]
+	>=dev-python/glance_store-0.7.1[${PYTHON_USEDEP}]
+	!~dev-python/glance_store-0.9.0[${PYTHON_USEDEP}]
+	<=dev-python/glance_store-0.9.1[${PYTHON_USEDEP}]
+	>=dev-python/semantic_version-2.3.1[${PYTHON_USEDEP}]
+	<=dev-python/semantic_version-2.4.2[${PYTHON_USEDEP}]
+	>=dev-python/castellan-0.2.0[${PYTHON_USEDEP}]
+	<=dev-python/castellan-0.3.1[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-1.0[${PYTHON_USEDEP}]
+	<=dev-python/cryptography-1.1.2-r9999[${PYTHON_USEDEP}]
+"
+
+PATCHES=(
+)
+
+pkg_setup() {
+	enewgroup glance
+	enewuser glance -1 -1 /var/lib/glance glance
+}
+
+python_prepare_all() {
+	sed -i '/xattr/d' test-requirements.txt || die
+	sed -i '/pysendfile/d' test-requirements.txt || die
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && "${PYTHON}" setup.py build_sphinx
+}
+
+python_test() {
+	# https://bugs.launchpad.net/glance/+bug/1251105
+	# https://bugs.launchpad.net/glance/+bug/1242501
+	testr init
+	testr run --parallel || die "failed testsuite under python2.7"
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	for svc in api registry scrubber; do
+		newinitd "${FILESDIR}/glance.initd" glance-${svc}
+	done
+
+	diropts -m 0750 -o glance -g glance
+	dodir /var/log/glance /var/lib/glance/images /var/lib/glance/scrubber
+	keepdir /etc/glance
+	keepdir /var/log/glance
+	keepdir /var/lib/glance/images
+	keepdir /var/lib/glance/scrubber
+
+	insinto /etc/glance
+	insopts -m 0640 -o glance -g glance
+	doins etc/*.ini
+	doins etc/*.conf
+	doins etc/*.sample
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/app-admin/glance/glance-2015.1.1-r3.ebuild b/app-admin/glance/glance-2015.1.1-r3.ebuild
deleted file mode 100644
index fe52e6c..0000000
--- a/app-admin/glance/glance-2015.1.1-r3.ebuild
+++ /dev/null
@@ -1,190 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 user
-
-DESCRIPTION="Services for discovering, registering, and retrieving VM images"
-HOMEPAGE="https://launchpad.net/glance"
-SRC_URI="https://launchpad.net/${PN}/kilo/${PV}/+download/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc mysql postgres +sqlite +swift test"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-DEPEND="
-		dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.8.0[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-		test? (
-			${RDEPEND}
-			>=dev-python/hacking-0.10.0[${PYTHON_USEDEP}]
-			<dev-python/hacking-0.11[${PYTHON_USEDEP}]
-			>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-			>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-			>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-			<dev-python/fixtures-1.3.0[${PYTHON_USEDEP}]
-			>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-			<dev-python/mock-1.1.0[${PYTHON_USEDEP}]
-			>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-			!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-			<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-			>=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
-			!~dev-python/requests-2.4.0[${PYTHON_USEDEP}]
-			>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-			>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
-			!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
-			>=dev-python/psutil-1.1.1[${PYTHON_USEDEP}]
-			<dev-python/psutil-2.0.0[${PYTHON_USEDEP}]
-			>=dev-python/oslotest-1.5.1[${PYTHON_USEDEP}]
-			<dev-python/oslotest-1.6.0[${PYTHON_USEDEP}]
-			dev-python/mysql-python[${PYTHON_USEDEP}]
-			dev-python/psycopg[${PYTHON_USEDEP}]
-			~dev-python/pysendfile-2.0.1[${PYTHON_USEDEP}]
-			dev-python/qpid-python[${PYTHON_USEDEP}]
-			>=dev-python/pyxattr-0.5.0[${PYTHON_USEDEP}]
-			>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-			<dev-python/oslo-sphinx-2.6.0[${PYTHON_USEDEP}]
-			>=dev-python/elasticsearch-py-1.3.0[${PYTHON_USEDEP}]
-		)"
-
-#note to self, wsgiref is a python builtin, no need to package it
-#>=dev-python/wsgiref-0.1.2[${PYTHON_USEDEP}]
-
-RDEPEND="
-	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
-	sqlite? (
-		>=dev-python/sqlalchemy-0.9.7[sqlite,${PYTHON_USEDEP}]
-		<=dev-python/sqlalchemy-0.9.99[sqlite,${PYTHON_USEDEP}]
-	)
-	mysql? (
-		dev-python/mysql-python
-		>=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
-		<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
-	)
-	postgres? (
-		dev-python/psycopg:2
-		>=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
-		<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
-	)
-	>=dev-python/anyjson-0.3.3[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.16.1[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.17.0[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
-	!~dev-python/routes-2.0[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-migrate-0.9.5[${PYTHON_USEDEP}]
-	>=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
-	>=dev-python/kombu-2.5.0[${PYTHON_USEDEP}]
-	>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	dev-python/ordereddict[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-1.9.3[${PYTHON_USEDEP}]
-	<dev-python/oslo-config-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-1.8.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-concurrency-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-context-0.3.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-1.4.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-utils-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.3.0[${PYTHON_USEDEP}]
-	<dev-python/stevedore-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/taskflow-0.7.1[${PYTHON_USEDEP}]
-	<dev-python/taskflow-0.8.0[${PYTHON_USEDEP}]
-	>=dev-python/keystonemiddleware-1.5.0[${PYTHON_USEDEP}]
-	<dev-python/keystonemiddleware-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/WSME-0.6[${PYTHON_USEDEP}]
-	<dev-python/WSME-0.7[${PYTHON_USEDEP}]
-	dev-python/posix_ipc[${PYTHON_USEDEP}]
-	swift? (
-		>=dev-python/python-swiftclient-2.2.0[${PYTHON_USEDEP}]
-		<dev-python/python-swiftclient-2.5.0[${PYTHON_USEDEP}]
-	)
-	>=dev-python/oslo-vmware-0.11.1[${PYTHON_USEDEP}]
-	<dev-python/oslo-vmware-0.12.0[${PYTHON_USEDEP}]
-	dev-python/paste[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-1.2.0[${PYTHON_USEDEP}]
-	<dev-python/python-keystoneclient-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.11[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-1.7.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-db-1.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-i18n-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-1.0.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-log-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-1.8.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-messaging-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-policy-0.3.1[${PYTHON_USEDEP}]
-	<dev-python/oslo-policy-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-serialization-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
-	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/osprofiler-0.3.0[${PYTHON_USEDEP}]
-	>=dev-python/glance_store-0.3.0[${PYTHON_USEDEP}]
-	<dev-python/glance_store-0.5.0[${PYTHON_USEDEP}]
-	>=dev-python/semantic_version-2.3.1[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
-	"${FILESDIR}/cve-2015-5163-stable-kilo.patch"
-	"${FILESDIR}/cve-2015-5251-stable-kilo.patch"
-	"${FILESDIR}/CVE-2015-5286_2015.1.1.patch"
-)
-
-pkg_setup() {
-	enewgroup glance
-	enewuser glance -1 -1 /var/lib/glance glance
-}
-
-python_prepare_all() {
-	sed -i '/xattr/d' test-requirements.txt || die
-	sed -i '/pysendfile/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && "${PYTHON}" setup.py build_sphinx
-}
-
-python_test() {
-	# https://bugs.launchpad.net/glance/+bug/1251105
-	# https://bugs.launchpad.net/glance/+bug/1242501
-	testr init
-	testr run --parallel || die "failed testsuite under python2.7"
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	for svc in api registry scrubber; do
-		newinitd "${FILESDIR}/glance.initd" glance-${svc}
-	done
-
-	diropts -m 0750 -o glance -g glance
-	dodir /var/log/glance /var/lib/glance/images /var/lib/glance/scrubber
-	keepdir /etc/glance
-	keepdir /var/log/glance
-	keepdir /var/lib/glance/images
-	keepdir /var/lib/glance/scrubber
-
-	insinto /etc/glance
-	insopts -m 0640 -o glance -g glance
-	doins etc/*.ini
-	doins etc/*.conf
-	doins etc/*.sample
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/app-admin/glance/glance-2015.1.2.ebuild b/app-admin/glance/glance-2015.1.2.ebuild
deleted file mode 100644
index 7d91039..0000000
--- a/app-admin/glance/glance-2015.1.2.ebuild
+++ /dev/null
@@ -1,191 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 user
-
-DESCRIPTION="Services for discovering, registering, and retrieving VM images"
-HOMEPAGE="https://launchpad.net/glance"
-SRC_URI="https://launchpad.net/${PN}/kilo/${PV}/+download/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc mysql postgres +sqlite +swift test"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-DEPEND="
-		dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.8.0[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-		test? (
-			${RDEPEND}
-			>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-			>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-			>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-			<dev-python/fixtures-1.3.0[${PYTHON_USEDEP}]
-			>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
-			<dev-python/mox3-0.8.0[${PYTHON_USEDEP}]
-			>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-			<dev-python/mock-1.1.0[${PYTHON_USEDEP}]
-			>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-			!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-			<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-			>=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
-			!~dev-python/requests-2.4.0[${PYTHON_USEDEP}]
-			>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-			>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
-			!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
-			>=dev-python/psutil-1.1.1[${PYTHON_USEDEP}]
-			<dev-python/psutil-2.0.0[${PYTHON_USEDEP}]
-			>=dev-python/oslotest-1.5.1[${PYTHON_USEDEP}]
-			<dev-python/oslotest-1.6.0[${PYTHON_USEDEP}]
-			dev-python/mysql-python[${PYTHON_USEDEP}]
-			dev-python/psycopg[${PYTHON_USEDEP}]
-			~dev-python/pysendfile-2.0.1[${PYTHON_USEDEP}]
-			dev-python/qpid-python[${PYTHON_USEDEP}]
-			>=dev-python/pyxattr-0.5.0[${PYTHON_USEDEP}]
-			>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-			<dev-python/oslo-sphinx-2.6.0[${PYTHON_USEDEP}]
-			>=dev-python/elasticsearch-py-1.3.0[${PYTHON_USEDEP}]
-		)"
-
-#note to self, wsgiref is a python builtin, no need to package it
-#>=dev-python/wsgiref-0.1.2[${PYTHON_USEDEP}]
-
-RDEPEND="
-	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
-	sqlite? (
-		>=dev-python/sqlalchemy-0.9.7[sqlite,${PYTHON_USEDEP}]
-		<=dev-python/sqlalchemy-0.9.99[sqlite,${PYTHON_USEDEP}]
-	)
-	mysql? (
-		dev-python/mysql-python
-		>=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
-		<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
-	)
-	postgres? (
-		dev-python/psycopg:2
-		>=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
-		<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
-	)
-	>=dev-python/anyjson-0.3.3[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.16.1[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.17.0[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
-	!~dev-python/routes-2.0[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-migrate-0.9.5[${PYTHON_USEDEP}]
-	!~dev-python/sqlalchemy-migrate-0.9.8[${PYTHON_USEDEP}]
-	<dev-python/sqlalchemy-migrate-0.10.0[${PYTHON_USEDEP}]
-	>=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
-	>=dev-python/kombu-2.5.0[${PYTHON_USEDEP}]
-	>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-	dev-python/ordereddict[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-1.9.3[${PYTHON_USEDEP}]
-	<dev-python/oslo-config-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-1.8.2[${PYTHON_USEDEP}]
-	<dev-python/oslo-concurrency-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-context-0.3.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-1.4.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-utils-1.4.1[${PYTHON_USEDEP}]
-	<dev-python/oslo-utils-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.3.0[${PYTHON_USEDEP}]
-	<dev-python/stevedore-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/taskflow-0.7.1[${PYTHON_USEDEP}]
-	<dev-python/taskflow-0.8.0[${PYTHON_USEDEP}]
-	>=dev-python/keystonemiddleware-1.5.0[${PYTHON_USEDEP}]
-	<dev-python/keystonemiddleware-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/WSME-0.6[${PYTHON_USEDEP}]
-	<dev-python/WSME-0.7[${PYTHON_USEDEP}]
-	dev-python/posix_ipc[${PYTHON_USEDEP}]
-	swift? (
-		>=dev-python/python-swiftclient-2.2.0[${PYTHON_USEDEP}]
-		<dev-python/python-swiftclient-2.5.0[${PYTHON_USEDEP}]
-	)
-	>=dev-python/oslo-vmware-0.11.1[${PYTHON_USEDEP}]
-	<dev-python/oslo-vmware-0.12.0[${PYTHON_USEDEP}]
-	dev-python/paste[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-1.2.0[${PYTHON_USEDEP}]
-	<dev-python/python-keystoneclient-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.11[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-1.7.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-db-1.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-i18n-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-1.0.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-log-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-1.8.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-messaging-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-policy-0.3.1[${PYTHON_USEDEP}]
-	<dev-python/oslo-policy-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-serialization-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
-	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/osprofiler-0.3.0[${PYTHON_USEDEP}]
-	>=dev-python/glance_store-0.3.0[${PYTHON_USEDEP}]
-	<dev-python/glance_store-0.5.0[${PYTHON_USEDEP}]
-	>=dev-python/semantic_version-2.3.1[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
-)
-
-pkg_setup() {
-	enewgroup glance
-	enewuser glance -1 -1 /var/lib/glance glance
-}
-
-python_prepare_all() {
-	sed -i '/xattr/d' test-requirements.txt || die
-	sed -i '/pysendfile/d' test-requirements.txt || die
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && "${PYTHON}" setup.py build_sphinx
-}
-
-python_test() {
-	# https://bugs.launchpad.net/glance/+bug/1251105
-	# https://bugs.launchpad.net/glance/+bug/1242501
-	testr init
-	testr run --parallel || die "failed testsuite under python2.7"
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	for svc in api registry scrubber; do
-		newinitd "${FILESDIR}/glance.initd" glance-${svc}
-	done
-
-	diropts -m 0750 -o glance -g glance
-	dodir /var/log/glance /var/lib/glance/images /var/lib/glance/scrubber
-	keepdir /etc/glance
-	keepdir /var/log/glance
-	keepdir /var/lib/glance/images
-	keepdir /var/lib/glance/scrubber
-
-	insinto /etc/glance
-	insopts -m 0640 -o glance -g glance
-	doins etc/*.ini
-	doins etc/*.conf
-	doins etc/*.sample
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/app-admin/glance/glance-2015.2.9999.ebuild b/app-admin/glance/glance-2015.2.9999.ebuild
index d44d287..8acd4f9 100644
--- a/app-admin/glance/glance-2015.2.9999.ebuild
+++ b/app-admin/glance/glance-2015.2.9999.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 python3_4 )
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1 git-r3 user
 
@@ -27,7 +27,7 @@
 		>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
 		<=dev-python/Babel-2.1.1[${PYTHON_USEDEP}]
 		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		<=dev-python/coverage-4.0.2[${PYTHON_USEDEP}]
+		<=dev-python/coverage-4.0.3[${PYTHON_USEDEP}]
 		>=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
 		<=dev-python/fixtures-1.4.0-r9999[${PYTHON_USEDEP}]
 		>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
@@ -38,11 +38,12 @@
 		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
 		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
 		>=dev-python/requests-2.5.2[${PYTHON_USEDEP}]
+		!~dev-python/requests-2.8.0[${PYTHON_USEDEP}]
 		<=dev-python/requests-2.8.1[${PYTHON_USEDEP}]
 		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
 		<=dev-python/testrepository-0.0.20[${PYTHON_USEDEP}]
 		>=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
-		<=dev-python/testresources-0.2.7-r9999[${PYTHON_USEDEP}]
+		<=dev-python/testresources-1.0.0-r9999[${PYTHON_USEDEP}]
 		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
 		<=dev-python/testscenarios-0.5[${PYTHON_USEDEP}]
 		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
@@ -50,7 +51,7 @@
 		>=dev-python/psutil-1.1.1[${PYTHON_USEDEP}]
 		<dev-python/psutil-2.0.0[${PYTHON_USEDEP}]
 		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-		<=dev-python/oslotest-1.12.0[${PYTHON_USEDEP}]
+		<=dev-python/oslotest-2.0.0[${PYTHON_USEDEP}]
 		>=dev-python/pymysql-0.6.2[${PYTHON_USEDEP}]
 		<=dev-python/pymysql-0.6.7[${PYTHON_USEDEP}]
 		>=dev-python/psycopg-2.5[${PYTHON_USEDEP}]
@@ -59,8 +60,11 @@
 		<=dev-python/pysendfile-2.0.1[${PYTHON_USEDEP}]
 		<=dev-python/qpid-python-0.32[$(python_gen_usedep 'python2_7')]
 		>=dev-python/pyxattr-0.5.0[${PYTHON_USEDEP}]
+		>=dev-python/python-swiftclient-2.2.0[${PYTHON_USEDEP}]
+		<=dev-python/python-swiftclient-2.7.0[${PYTHON_USEDEP}]
 		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		<=dev-python/oslo-sphinx-3.2.0[${PYTHON_USEDEP}]
+		<=dev-python/oslo-sphinx-4.1.0[${PYTHON_USEDEP}]
+		>=dev-python/reno-0.1.1[${PYTHON_USEDEP}]
 	)"
 
 #note to self, wsgiref is a python builtin, no need to package it
@@ -70,17 +74,17 @@
 	${CDEPEND}
 	sqlite? (
 		>=dev-python/sqlalchemy-0.9.9[sqlite,${PYTHON_USEDEP}]
-		<dev-python/sqlalchemy-1.1.0[sqlite,${PYTHON_USEDEP}]
+		<dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
 	)
 	mysql? (
 		dev-python/mysql-python
 		>=dev-python/sqlalchemy-0.9.9[${PYTHON_USEDEP}]
-		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+		<dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
 	)
 	postgres? (
 		dev-python/psycopg:2[${PYTHON_USEDEP}]
 		>=dev-python/sqlalchemy-0.9.9[${PYTHON_USEDEP}]
-		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+		<dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
 	)
 	~dev-python/anyjson-0.3.3[${PYTHON_USEDEP}]
 	~dev-python/eventlet-0.17.4[${PYTHON_USEDEP}]
@@ -101,23 +105,25 @@
 	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
 	<=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
 	>=dev-python/oslo-config-2.3.0[${PYTHON_USEDEP}]
-	<=dev-python/oslo-config-2.4.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-config-3.1.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-concurrency-2.3.0[${PYTHON_USEDEP}]
-	<=dev-python/oslo-concurrency-2.8.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-concurrency-3.1.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
-	<=dev-python/oslo-context-0.8.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-context-1.0.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-service-0.7.0[${PYTHON_USEDEP}]
-	<=dev-python/oslo-service-0.12.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-service-1.1.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
-	<=dev-python/oslo-utils-2.7.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-utils-2.6.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-utils-3.2.0[${PYTHON_USEDEP}]
 	>=dev-python/stevedore-1.5.0[${PYTHON_USEDEP}]
-	<=dev-python/stevedore-1.9.0[${PYTHON_USEDEP}]
+	<=dev-python/stevedore-1.10.0[${PYTHON_USEDEP}]
 	>=dev-python/futurist-0.1.2[${PYTHON_USEDEP}]
 	<=dev-python/futurist-0.8.0[${PYTHON_USEDEP}]
 	>=dev-python/taskflow-1.16.0[${PYTHON_USEDEP}]
-	<=dev-python/taskflow-1.23.0[${PYTHON_USEDEP}]
+	<=dev-python/taskflow-1.25.0[${PYTHON_USEDEP}]
 	>=dev-python/keystonemiddleware-2.0.0[${PYTHON_USEDEP}]
-	<=dev-python/keystonemiddleware-3.0.0[${PYTHON_USEDEP}]
+	!~dev-python/keystonemiddleware-2.4.0[${PYTHON_USEDEP}]
+	<=dev-python/keystonemiddleware-4.0.0[${PYTHON_USEDEP}]
 	>=dev-python/WSME-0.7[${PYTHON_USEDEP}]
 	<=dev-python/WSME-0.8.0[${PYTHON_USEDEP}]
 	<=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
@@ -125,27 +131,35 @@
 	!~dev-python/jsonschema-2.5.0[${PYTHON_USEDEP}]
 	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
 	>=dev-python/python-keystoneclient-1.6.0[${PYTHON_USEDEP}]
-	<=dev-python/python-keystoneclient-1.8.1-r9999[${PYTHON_USEDEP}]
+	!~dev-python/python-keystoneclient-1.8.0[${PYTHON_USEDEP}]
+	<=dev-python/python-keystoneclient-2.0.0-r9999[${PYTHON_USEDEP}]
 	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
-	<=dev-python/pyopenssl-0.15.1[${PYTHON_USEDEP}]
+	<=dev-python/pyopenssl-0.15.1-r9999[${PYTHON_USEDEP}]
 	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
 	<=dev-python/six-1.10.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-db-2.4.1[${PYTHON_USEDEP}]
-	<=dev-python/oslo-db-3.1.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-db-4.1.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	<=dev-python/oslo-i18n-2.7.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-i18n-3.1.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-log-1.8.0[${PYTHON_USEDEP}]
-	<=dev-python/oslo-log-1.13.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-log-2.1.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-messaging-1.16.0[${PYTHON_USEDEP}]
 	!~dev-python/oslo-messaging-1.17.0[${PYTHON_USEDEP}]
 	!~dev-python/oslo-messaging-1.17.1[${PYTHON_USEDEP}]
-	<=dev-python/oslo-messaging-2.8.1[${PYTHON_USEDEP}]
+	!~dev-python/oslo-messaging-2.6.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-messaging-2.6.1[${PYTHON_USEDEP}]
+	!~dev-python/oslo-messaging-2.7.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-messaging-2.8.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-messaging-2.8.1[${PYTHON_USEDEP}]
+	!~dev-python/oslo-messaging-2.9.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-messaging-3.1.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-messaging-3.0.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-middleware-2.8.0[${PYTHON_USEDEP}]
-	<=dev-python/oslo-middleware-2.10.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-middleware-3.3.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-policy-0.5.0[${PYTHON_USEDEP}]
-	<=dev-python/oslo-policy-0.12.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-policy-1.1.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
-	<=dev-python/oslo-serialization-1.11.0[${PYTHON_USEDEP}]
+	<=dev-python/oslo-serialization-2.1.0[${PYTHON_USEDEP}]
 	>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
 	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
 	<=dev-python/retrying-1.3.3[${PYTHON_USEDEP}]
@@ -157,9 +171,9 @@
 	>=dev-python/semantic_version-2.3.1[${PYTHON_USEDEP}]
 	<=dev-python/semantic_version-2.4.2[${PYTHON_USEDEP}]
 	>=dev-python/castellan-0.2.0[${PYTHON_USEDEP}]
-	<=dev-python/castellan-0.2.1[${PYTHON_USEDEP}]
+	<=dev-python/castellan-0.3.1[${PYTHON_USEDEP}]
 	>=dev-python/cryptography-1.0[${PYTHON_USEDEP}]
-	<=dev-python/cryptography-1.1-r9999[${PYTHON_USEDEP}]
+	<=dev-python/cryptography-1.1.2-r9999[${PYTHON_USEDEP}]
 "
 
 PATCHES=(
diff --git a/app-admin/glance/metadata.xml b/app-admin/glance/metadata.xml
index 0dc3e10..080766e 100644
--- a/app-admin/glance/metadata.xml
+++ b/app-admin/glance/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>openstack</herd>
-  <maintainer>
+  <maintainer type="person">
     <email>prometheanfire@gentoo.org</email>
     <name>Matthew Thode</name>
   </maintainer>
+  <maintainer type="project">
+    <email>openstack@gentoo.org</email>
+    <name>Openstack</name>
+  </maintainer>
   <longdescription lang="en">
     Provides services for discovering, registering, and retrieving virtual 
     machine images. Glance has a RESTful API that allows querying of VM image 
diff --git a/app-admin/gnome-system-log/metadata.xml b/app-admin/gnome-system-log/metadata.xml
index da6fd63..3998080 100644
--- a/app-admin/gnome-system-log/metadata.xml
+++ b/app-admin/gnome-system-log/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer type="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-admin/grubconfig/metadata.xml b/app-admin/grubconfig/metadata.xml
index 96a2d58..56c1244 100644
--- a/app-admin/grubconfig/metadata.xml
+++ b/app-admin/grubconfig/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer type="project">
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-admin/gtkdiskfree/metadata.xml b/app-admin/gtkdiskfree/metadata.xml
index 66824a4..8ef6ae7 100644
--- a/app-admin/gtkdiskfree/metadata.xml
+++ b/app-admin/gtkdiskfree/metadata.xml
@@ -1,15 +1,18 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
-	<maintainer>
+	<maintainer type="person">
 		<email>BM-2cTVBXjxdVtEQCycBQjMxszLsgTNVujvM5@bitmessage.ch</email>
 		<name>Samuel Bauer</name>
 	</maintainer>
-	<maintainer>
+	<maintainer type="person">
 		<email>xmw@gentoo.org</email>
 		<name>Michael Weber</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription>
 gtkdiskfree is a gtk extension to the cli tool df, does the same and more
 	</longdescription>
diff --git a/app-admin/hardening-check/metadata.xml b/app-admin/hardening-check/metadata.xml
index 2c97c58..a2db75c 100644
--- a/app-admin/hardening-check/metadata.xml
+++ b/app-admin/hardening-check/metadata.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>ago@gentoo.org</email>
 		<name>Agostino Sarubbo</name>
 	</maintainer>
-	<maintainer>
+	<maintainer type="person">
 		<email>kees@outflux.net</email>
 		<name>Kees Cook</name>
 		<description>Upstream - please CC on bugs that concerns upstream</description>
 	</maintainer>
 </pkgmetadata>
-
diff --git a/app-admin/hardinfo/metadata.xml b/app-admin/hardinfo/metadata.xml
index 91f4e72..097975e 100644
--- a/app-admin/hardinfo/metadata.xml
+++ b/app-admin/hardinfo/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>
diff --git a/app-admin/haskell-updater/Manifest b/app-admin/haskell-updater/Manifest
index 0b99cad..17e41fe 100644
--- a/app-admin/haskell-updater/Manifest
+++ b/app-admin/haskell-updater/Manifest
@@ -1,6 +1,2 @@
-DIST haskell-updater-1.2.1.tar.gz 23932 SHA256 f43e7de3b4dca950d6c9cbcb10507f314813bb4c59bd912f9e7772fdb60c0a2b SHA512 20939e4afb3870b0220c1a814b0f9f9ec0bea1fc2e59891323bdbea41adf8e84bdff15014746d0ab0983ce2a34becf7b5f078a38edf63748c23fe08dcadbcf66 WHIRLPOOL 78b1bfcf4d208c26f163938a2e0ea2810f238cbca07664692175ef7388f4a9c81d49803b2a27c1405c46bc75fcb13430caa00b877a118d28295d1af4d74a0f52
-DIST haskell-updater-1.2.3.tar.gz 24126 SHA256 ceeb713a817fddc0e6e7423f8e15c59f217ec28a79c300433942dc0b88555ad7 SHA512 7913d122e90efc431de9b9c494484a820209f436a72bbfa9288c87dd6fa142c39eb0a90efadf6a1e7e90e7e8b889a5f31eba867dee7eaeca17aaef0fe06abcc2 WHIRLPOOL 9b2f9a7e283956d9bdabcf33fca0bb0c2380a8dee9b8e8fc6b5139665e63845fdf7be3d1a172d128e41444d23a1573d09071911a26edc577fd88e67f29730c16
-DIST haskell-updater-1.2.6.tar.gz 24857 SHA256 74fa71b530e3c88f944d3f4013a4c41c95af5e42ac0ec2ac25716578e1965a9e SHA512 1be777b40fcad2cfdfe461c8bce8ffed0449dbd6bfb665881da1cf763699626d9183a5affbdaba0e8243cf4ce956caab1d54a9c4637d10d1642e8da3764bcedf WHIRLPOOL 0af59cbd5a937cbf7261fd02e6a39bf6006e484532883381fdb6818fe993bb3ae0fd0993b9d32620341872f7e02d9e40e5816f4c97928508128f72dbfc6cc38e
-DIST haskell-updater-1.2.7.tar.gz 25065 SHA256 eb00acc19070a3c1ad4d92f9c3ec22ceec8e2a758deb5d05e4a0d64ccef9d271 SHA512 d8f73967fd22182d62c57cf71af18dd123ac6439a5436ba5639f5c9ce2df72e2f3d1382d3f23219ec89848175426df68cf67474d5b7db8194f0c868f9e504f1a WHIRLPOOL a0b118cd8376dd57ef7929cc212c88eedf45909f68d9cbda89da8e97907f7937e6eb90d88516dfa2540d75145b8d88a85dfda65c61e01e77c531030e1253a8c4
-DIST haskell-updater-1.2.8.tar.gz 25192 SHA256 fddc7dcad9bb65fc8b6caef393a6657028dae54b4cf4c37a08ef8da047207776 SHA512 6bfd101c5f6de3b4ddf4a4f485a2a60df218c11778fa8ae9b7245972a666f05aa17c3c093e922233d7f3243a87e3401ff7902d5b8ad7dc43018ac5627458de8d WHIRLPOOL 840284831300581fa2809cd9f1394891ae4381fd1e67c26dfb2938d0be0daf639313ac3b97b1521ed070623ff97ba327cfcc3f2eb02c39dbb74a56e25d83c0e0
+DIST haskell-updater-1.2.10.tar.gz 26586 SHA256 e9712ccaa38bb2ca4242272eee72c72e5b2d0943d7d35c846fccdd89a5428e7d SHA512 c0a72ae77362e5ed4ea0e244449175454119b1284756adeb43534bf58b661f3cabb88e08bd5903d415a9f95a6de309753dedf974ddd853b300fd215250e0ad7c WHIRLPOOL 930975884f1f2b3ae47902cf3e4e88894ee7d4227dbf8bbd06e4f893d00bd715eae5ffd5c78375edf9d43f853da0fcac856492520de350ca1d044ee9da6a1dca
 DIST haskell-updater-1.2.9.tar.gz 26675 SHA256 eafc441bad4f15d60c8686c189d6dd49ea9e87bdddf09a24cef2a3eca9eca859 SHA512 d19b6154d5ef4da176638c237082586688e2ac73a41c075fc3e51979b86b9e48ca5a9bfe6c870d468d66d95c1464456feed8afc388aea282aa7aad5a35f5e0da WHIRLPOOL e28c55e9bd2d9033b42fb42e2db6ff2911a2fb50a5d1ad276d6344ca29b4b05abf73d746604ced6766b983d8a7e6e688534be28ba61f0c62f8aca20d9a46c669
diff --git a/app-admin/haskell-updater/haskell-updater-1.2.1.ebuild b/app-admin/haskell-updater/haskell-updater-1.2.1.ebuild
deleted file mode 100644
index 77b17dc..0000000
--- a/app-admin/haskell-updater/haskell-updater-1.2.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-CABAL_FEATURES="bin nocabaldep"
-inherit eutils haskell-cabal
-
-DESCRIPTION="Rebuild Haskell dependencies in Gentoo"
-HOMEPAGE="http://haskell.org/haskellwiki/Gentoo#haskell-updater"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=dev-lang/ghc-6.12.1"
-
-# Need a lower version for portage to get --keep-going
-RDEPEND="|| ( >=sys-apps/portage-2.1.6
-			  sys-apps/pkgcore
-			  sys-apps/paludis )"
-
-src_prepare() {
-	if use prefix; then
-		sed -i -e "s,/var/db/pkg,${EPREFIX}&,g" \
-			"${S}/Distribution/Gentoo/Packages.hs" || die
-
-		sed -i -e 's,"/","'"${EPREFIX}"'/",g' \
-			"${S}/Distribution/Gentoo/GHC.hs" || die
-	fi
-
-	# for ghc snapshots (usually come with unstable Cabal API)
-	cabal_chdeps \
-		'Cabal >= 1.8 && < 1.19' 'Cabal >= 1.8 && < 1.21' \
-		'process    < 1.2' 'process    < 1.3'
-}
-
-src_configure() {
-	cabal_src_configure \
-		--bindir="${EPREFIX}/usr/sbin" \
-		--constraint="Cabal == $(cabal-version)"
-}
-
-src_install() {
-	cabal_src_install
-
-	dodoc TODO
-}
diff --git a/app-admin/haskell-updater/haskell-updater-1.2.10.ebuild b/app-admin/haskell-updater/haskell-updater-1.2.10.ebuild
new file mode 100644
index 0000000..0affb06
--- /dev/null
+++ b/app-admin/haskell-updater/haskell-updater-1.2.10.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+CABAL_FEATURES="bin nocabaldep"
+inherit eutils haskell-cabal
+
+DESCRIPTION="Rebuild Haskell dependencies in Gentoo"
+HOMEPAGE="http://haskell.org/haskellwiki/Gentoo#haskell-updater"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=dev-lang/ghc-6.12.1"
+
+# Need a lower version for portage to get --keep-going
+RDEPEND="|| ( >=sys-apps/portage-2.1.6
+		sys-apps/pkgcore
+		sys-apps/paludis )"
+
+src_prepare() {
+	if use prefix; then
+		sed -i -e "s,/var/db/pkg,${EPREFIX}&,g" \
+			"${S}/Distribution/Gentoo/Packages.hs" || die
+
+		sed -i -e 's,"/","'"${EPREFIX}"'/",g' \
+			"${S}/Distribution/Gentoo/GHC.hs" || die
+	fi
+}
+
+src_configure() {
+	cabal_src_configure \
+		--bindir="${EPREFIX}/usr/sbin" \
+		--constraint="Cabal == $(cabal-version)"
+}
+
+src_install() {
+	cabal_src_install
+
+	dodoc TODO
+}
diff --git a/app-admin/haskell-updater/haskell-updater-1.2.3.ebuild b/app-admin/haskell-updater/haskell-updater-1.2.3.ebuild
deleted file mode 100644
index 15b7da1..0000000
--- a/app-admin/haskell-updater/haskell-updater-1.2.3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-CABAL_FEATURES="bin nocabaldep"
-inherit eutils haskell-cabal
-
-DESCRIPTION="Rebuild Haskell dependencies in Gentoo"
-HOMEPAGE="http://haskell.org/haskellwiki/Gentoo#haskell-updater"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=dev-lang/ghc-6.12.1"
-
-# Need a lower version for portage to get --keep-going
-RDEPEND="|| ( >=sys-apps/portage-2.1.6
-		sys-apps/pkgcore
-		sys-apps/paludis )"
-
-src_prepare() {
-	if use prefix; then
-		sed -i -e "s,/var/db/pkg,${EPREFIX}&,g" \
-			"${S}/Distribution/Gentoo/Packages.hs" || die
-
-		sed -i -e 's,"/","'"${EPREFIX}"'/",g' \
-			"${S}/Distribution/Gentoo/GHC.hs" || die
-	fi
-}
-
-src_configure() {
-	cabal_src_configure \
-		--bindir="${EPREFIX}/usr/sbin" \
-		--constraint="Cabal == $(cabal-version)"
-}
-
-src_install() {
-	cabal_src_install
-
-	dodoc TODO
-}
diff --git a/app-admin/haskell-updater/haskell-updater-1.2.6.ebuild b/app-admin/haskell-updater/haskell-updater-1.2.6.ebuild
deleted file mode 100644
index c329438..0000000
--- a/app-admin/haskell-updater/haskell-updater-1.2.6.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-CABAL_FEATURES="bin nocabaldep"
-inherit eutils haskell-cabal
-
-DESCRIPTION="Rebuild Haskell dependencies in Gentoo"
-HOMEPAGE="http://haskell.org/haskellwiki/Gentoo#haskell-updater"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=dev-lang/ghc-6.12.1"
-
-# Need a lower version for portage to get --keep-going
-RDEPEND="|| ( >=sys-apps/portage-2.1.6
-		sys-apps/pkgcore
-		sys-apps/paludis )"
-
-src_prepare() {
-	if use prefix; then
-		sed -i -e "s,/var/db/pkg,${EPREFIX}&,g" \
-			"${S}/Distribution/Gentoo/Packages.hs" || die
-
-		sed -i -e 's,"/","'"${EPREFIX}"'/",g' \
-			"${S}/Distribution/Gentoo/GHC.hs" || die
-	fi
-}
-
-src_configure() {
-	cabal_src_configure \
-		--bindir="${EPREFIX}/usr/sbin" \
-		--constraint="Cabal == $(cabal-version)"
-}
-
-src_install() {
-	cabal_src_install
-
-	dodoc TODO
-}
diff --git a/app-admin/haskell-updater/haskell-updater-1.2.7.ebuild b/app-admin/haskell-updater/haskell-updater-1.2.7.ebuild
deleted file mode 100644
index c329438..0000000
--- a/app-admin/haskell-updater/haskell-updater-1.2.7.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-CABAL_FEATURES="bin nocabaldep"
-inherit eutils haskell-cabal
-
-DESCRIPTION="Rebuild Haskell dependencies in Gentoo"
-HOMEPAGE="http://haskell.org/haskellwiki/Gentoo#haskell-updater"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=dev-lang/ghc-6.12.1"
-
-# Need a lower version for portage to get --keep-going
-RDEPEND="|| ( >=sys-apps/portage-2.1.6
-		sys-apps/pkgcore
-		sys-apps/paludis )"
-
-src_prepare() {
-	if use prefix; then
-		sed -i -e "s,/var/db/pkg,${EPREFIX}&,g" \
-			"${S}/Distribution/Gentoo/Packages.hs" || die
-
-		sed -i -e 's,"/","'"${EPREFIX}"'/",g' \
-			"${S}/Distribution/Gentoo/GHC.hs" || die
-	fi
-}
-
-src_configure() {
-	cabal_src_configure \
-		--bindir="${EPREFIX}/usr/sbin" \
-		--constraint="Cabal == $(cabal-version)"
-}
-
-src_install() {
-	cabal_src_install
-
-	dodoc TODO
-}
diff --git a/app-admin/haskell-updater/haskell-updater-1.2.8.ebuild b/app-admin/haskell-updater/haskell-updater-1.2.8.ebuild
deleted file mode 100644
index c329438..0000000
--- a/app-admin/haskell-updater/haskell-updater-1.2.8.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-CABAL_FEATURES="bin nocabaldep"
-inherit eutils haskell-cabal
-
-DESCRIPTION="Rebuild Haskell dependencies in Gentoo"
-HOMEPAGE="http://haskell.org/haskellwiki/Gentoo#haskell-updater"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=dev-lang/ghc-6.12.1"
-
-# Need a lower version for portage to get --keep-going
-RDEPEND="|| ( >=sys-apps/portage-2.1.6
-		sys-apps/pkgcore
-		sys-apps/paludis )"
-
-src_prepare() {
-	if use prefix; then
-		sed -i -e "s,/var/db/pkg,${EPREFIX}&,g" \
-			"${S}/Distribution/Gentoo/Packages.hs" || die
-
-		sed -i -e 's,"/","'"${EPREFIX}"'/",g' \
-			"${S}/Distribution/Gentoo/GHC.hs" || die
-	fi
-}
-
-src_configure() {
-	cabal_src_configure \
-		--bindir="${EPREFIX}/usr/sbin" \
-		--constraint="Cabal == $(cabal-version)"
-}
-
-src_install() {
-	cabal_src_install
-
-	dodoc TODO
-}
diff --git a/app-admin/haskell-updater/metadata.xml b/app-admin/haskell-updater/metadata.xml
index ddb2b45..b787881 100644
--- a/app-admin/haskell-updater/metadata.xml
+++ b/app-admin/haskell-updater/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>haskell</herd>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-admin/hddtemp/files/hddgentoo.db b/app-admin/hddtemp/files/hddgentoo.db
index 5034215..079816a 100644
--- a/app-admin/hddtemp/files/hddgentoo.db
+++ b/app-admin/hddtemp/files/hddgentoo.db
@@ -234,3 +234,4 @@
 "WDC WD7500BFCX-68N6GN0"					194 C "Western Digital Red 750GB SATA"
 "Hitachi HTS547575A9E384"					190 C "Hitachi Travelstar 5K750 750GB SATA2 5400RPM 8MB"
 "WDC WD30PURX-64P6ZY0"						194 C "Western Digital Purple 3TB 64MB Cache"
+"WDC WD10EZEX-00BN5A0"						194 C "Western Digital Blue 1TB SATA3 7200RPM 64MB"
diff --git a/app-admin/hddtemp/metadata.xml b/app-admin/hddtemp/metadata.xml
index a6041c5..c518306 100644
--- a/app-admin/hddtemp/metadata.xml
+++ b/app-admin/hddtemp/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
+<maintainer type="person">
 	<email>aidecoe@gentoo.org</email>
 </maintainer>
 <use>
-	<flag name='network-cron'>
+	<flag name="network-cron">
 		Monthly cronjob to update hddtemp.db.
 	</flag>
 </use>
diff --git a/app-admin/hwreport/metadata.xml b/app-admin/hwreport/metadata.xml
index 2811ade..07b22b0 100644
--- a/app-admin/hwreport/metadata.xml
+++ b/app-admin/hwreport/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
+<maintainer type="person">
     <email>fauli@gentoo.org</email>
     <name>Christian Faulhammer</name>
 </maintainer>
diff --git a/app-admin/ide-smart/metadata.xml b/app-admin/ide-smart/metadata.xml
index 59e2b8f..097975e 100644
--- a/app-admin/ide-smart/metadata.xml
+++ b/app-admin/ide-smart/metadata.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<name>Default assignee for orphaned packages</name>
-	</maintainer>
 </pkgmetadata>
diff --git a/app-admin/integrit/metadata.xml b/app-admin/integrit/metadata.xml
index f22d125..6e354d6 100644
--- a/app-admin/integrit/metadata.xml
+++ b/app-admin/integrit/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>forensics</herd>
+	<maintainer type="project">
+		<email>forensics@gentoo.org</email>
+		<name>Gentoo Forensics Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">integrit</remote-id>
 	</upstream>
diff --git a/app-admin/jinit/metadata.xml b/app-admin/jinit/metadata.xml
index ff62877..097975e 100644
--- a/app-admin/jinit/metadata.xml
+++ b/app-admin/jinit/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>
diff --git a/app-admin/kedpm/metadata.xml b/app-admin/kedpm/metadata.xml
index a4448f8..99fbdc4 100644
--- a/app-admin/kedpm/metadata.xml
+++ b/app-admin/kedpm/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
   <longdescription>key storing program</longdescription>
   <upstream>
     <remote-id type="sourceforge">kedpm</remote-id>
diff --git a/app-admin/keepass/Manifest b/app-admin/keepass/Manifest
index 2d47051..d0bad8c 100644
--- a/app-admin/keepass/Manifest
+++ b/app-admin/keepass/Manifest
@@ -1,3 +1,2 @@
-DIST KeePass-2.28-Source.zip 3532385 SHA256 2bd3291308fbb592ee8da21c42457320f81d00eda189c9ee39f03a12783ff91b SHA512 3fc1813076f4a205a6d970d3b9d1abfdfb8ea03099523dc8f7d775f5a4210002323bd8cbeba216acecf84032aa8504e752063880b87190935cb45d646badd672 WHIRLPOOL 954c677a10dad6bdf470dd29e777896806d1f5137711dea3e9ac7c2fd9ddc98042c9911fd10cf3c0f7838f3eebe40676564b4efcb43e3d2eb8b8d2bb0866fd07
-DIST KeePass-2.29-Source.zip 4762221 SHA256 b5582eb96611726a70b523c156c89dfb83ae80ce051a4f57bb0b7a6fbf023a14 SHA512 3a682be8f54fdaad7d299620f5f4821753f27716204f3aceac6e0e078a885dd427e0498ad78f5cdf29946d4821bd29c9f1b6f808d143afa225ffdf975d242047 WHIRLPOOL 3a00ad16a7b0c62df142edc1577c8fb04834a799708e744a808e1fefad4cf55ceb52cb0a68f0143eb68600e3c5bb99371a765fa8c5e5c16f8d0ccdd78f5f403b
 DIST KeePass-2.30-Source.zip 4767753 SHA256 4a3c3c217bc05b13bf903612b89a09b67ed1df68fdecd83324f2ef372313e9e4 SHA512 05404f273f6a7df33887b036aa0dba335124a7b2ae30b61957f8dc9c959cdd3342fdfa22a7d59ba5e9180f039fed5ecbac0a3154eb9d342a5a3a8a057d763182 WHIRLPOOL 4ddec9e592724b60724a2deaaf959dacc91f77d1ae97dd07af940f8efd882a008b4424ba68a4fcbd9ebe8d75c2b8a9a644ff7144ed593cfb3f0e361c0364a780
+DIST KeePass-2.31-Source.zip 4714301 SHA256 555b1a30f374f7077bf15906b09ab36b40fd3fc5753673a3c0ee3f30f0ed7881 SHA512 e2e81e7d60bc58a18ea3b9a82741bdd6e5be88bcfcf447ae587f6177a8ff97e7c82c02fb0695142f8321c7b5f92aa982254629928dd0c12393d659380f46026d WHIRLPOOL b8b572bd7db7ce9bc67ae0a241c71cd30595753d06bfed85efafece2b3cce4893c5cc213ee44cabd81c6ff12fc2fc98234d845ed94d0068d8111d116ccc39333
diff --git a/app-admin/keepass/keepass-2.28.ebuild b/app-admin/keepass/keepass-2.28.ebuild
deleted file mode 100644
index a7f6372..0000000
--- a/app-admin/keepass/keepass-2.28.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils fdo-mime gnome2-utils mono-env multilib
-
-MY_PN="KeePass"
-DESCRIPTION="A free, open source, light-weight and easy-to-use password manager"
-HOMEPAGE="http://keepass.info/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-${PV}-Source.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="aot"
-
-COMMON_DEPEND=">=dev-lang/mono-2.10.5"
-RDEPEND="${COMMON_DEPEND}
-	dev-dotnet/libgdiplus[cairo]"
-DEPEND="${COMMON_DEPEND}
-	app-arch/unzip"
-
-S=${WORKDIR}
-
-src_prepare() {
-	# Remove Windows-specific things
-	pushd Build > /dev/null || die
-	. PrepMonoDev.sh || die
-	popd > /dev/null || die
-
-	# KeePass looks for some XSL files in the same folder as the executable,
-	# we prefer to have it in /usr/share/KeePass
-	epatch "${FILESDIR}/${PN}-2.20-xsl-path-detection.patch"
-}
-
-src_compile() {
-	# Build with Release target
-	xbuild /target:KeePass /property:Configuration=Release || die
-
-	# Run Ahead Of Time compiler on the binary
-	if use aot; then
-		cp Ext/KeePass.exe.config Build/KeePass/Release/
-		mono --aot -O=all Build/KeePass/Release/KeePass.exe || die
-	fi
-}
-
-src_install() {
-	# Wrapper script to launch mono
-	make_wrapper ${PN} "mono /usr/$(get_libdir)/${PN}/KeePass.exe"
-
-	# Some XSL files
-	insinto /usr/share/${PN}/XSL
-	doins Ext/XSL/*
-
-	insinto /usr/$(get_libdir)/${PN}/
-	exeinto /usr/$(get_libdir)/${PN}/
-	doins Ext/KeePass.exe.config
-	# Default configuration, simply says to use user-specific configuration
-	doins Ext/KeePass.config.xml
-
-	# The actual executable
-	doexe Build/KeePass/Release/KeePass.exe
-
-	# Copy the AOT compilation result
-	if use aot; then
-		doexe Build/KeePass/Release/KeePass.exe.so
-	fi
-
-	# Prepare the icons
-	newicon -s 256 Ext/Icons/Finals/plockb.png "${PN}.png"
-	newicon -s 256 -t gnome -c mimetypes Ext/Icons/Finals/plockb.png "application-x-${PN}2.png"
-
-	# Create a desktop entry and associate it with the KeePass mime type
-	make_desktop_entry ${PN} ${MY_PN} ${PN} "System;Security" "MimeType=application/x-keepass2;"
-
-	# MIME descriptor for .kdbx files
-	insinto /usr/share/mime/packages/
-	doins "${FILESDIR}/${PN}.xml"
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	fdo-mime_mime_database_update
-	fdo-mime_desktop_database_update
-
-	if ! has_version x11-misc/xdotool ; then
-		elog "Optional dependencies:"
-		elog "	x11-misc/xdotool (enables autotype)"
-	fi
-
-	elog "Some systems may experience issues with copy and paste operations."
-	elog "If you encounter this, please install x11-misc/xsel."
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	fdo-mime_mime_database_update
-	fdo-mime_desktop_database_update
-}
diff --git a/app-admin/keepass/keepass-2.29.ebuild b/app-admin/keepass/keepass-2.29.ebuild
deleted file mode 100644
index 55cdd13..0000000
--- a/app-admin/keepass/keepass-2.29.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils fdo-mime gnome2-utils mono-env multilib
-
-MY_PN="KeePass"
-DESCRIPTION="A free, open source, light-weight and easy-to-use password manager"
-HOMEPAGE="http://keepass.info/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-${PV}-Source.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="aot"
-
-COMMON_DEPEND=">=dev-lang/mono-2.10.5"
-RDEPEND="${COMMON_DEPEND}
-	dev-dotnet/libgdiplus[cairo]"
-DEPEND="${COMMON_DEPEND}
-	app-arch/unzip"
-
-S=${WORKDIR}
-
-src_prepare() {
-	# Remove Windows-specific things
-	pushd Build > /dev/null || die
-	. PrepMonoDev.sh || die
-	popd > /dev/null || die
-
-	# KeePass looks for some XSL files in the same folder as the executable,
-	# we prefer to have it in /usr/share/KeePass
-	epatch "${FILESDIR}/${PN}-2.20-xsl-path-detection.patch"
-}
-
-src_compile() {
-	# Build with Release target
-	xbuild /target:KeePass /property:Configuration=Release || die
-
-	# Run Ahead Of Time compiler on the binary
-	if use aot; then
-		cp Ext/KeePass.exe.config Build/KeePass/Release/
-		mono --aot -O=all Build/KeePass/Release/KeePass.exe || die
-	fi
-}
-
-src_install() {
-	# Wrapper script to launch mono
-	make_wrapper ${PN} "mono /usr/$(get_libdir)/${PN}/KeePass.exe"
-
-	# Some XSL files
-	insinto /usr/share/${PN}/XSL
-	doins Ext/XSL/*
-
-	insinto /usr/$(get_libdir)/${PN}/
-	exeinto /usr/$(get_libdir)/${PN}/
-	doins Ext/KeePass.exe.config
-	# Default configuration, simply says to use user-specific configuration
-	doins Ext/KeePass.config.xml
-
-	# The actual executable
-	doexe Build/KeePass/Release/KeePass.exe
-
-	# Copy the AOT compilation result
-	if use aot; then
-		doexe Build/KeePass/Release/KeePass.exe.so
-	fi
-
-	# Prepare the icons
-	newicon -s 256 Ext/Icons/Finals/plockb.png "${PN}.png"
-	newicon -s 256 -t gnome -c mimetypes Ext/Icons/Finals/plockb.png "application-x-${PN}2.png"
-
-	# Create a desktop entry and associate it with the KeePass mime type
-	make_desktop_entry ${PN} ${MY_PN} ${PN} "System;Security" "MimeType=application/x-keepass2;"
-
-	# MIME descriptor for .kdbx files
-	insinto /usr/share/mime/packages/
-	doins "${FILESDIR}/${PN}.xml"
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	fdo-mime_mime_database_update
-	fdo-mime_desktop_database_update
-
-	if ! has_version x11-misc/xdotool ; then
-		elog "Optional dependencies:"
-		elog "	x11-misc/xdotool (enables autotype)"
-	fi
-
-	elog "Some systems may experience issues with copy and paste operations."
-	elog "If you encounter this, please install x11-misc/xsel."
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	fdo-mime_mime_database_update
-	fdo-mime_desktop_database_update
-}
diff --git a/app-admin/keepass/keepass-2.30.ebuild b/app-admin/keepass/keepass-2.30.ebuild
index ec72e70..b880fe1 100644
--- a/app-admin/keepass/keepass-2.30.ebuild
+++ b/app-admin/keepass/keepass-2.30.ebuild
@@ -13,7 +13,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="aot"
 
 COMMON_DEPEND=">=dev-lang/mono-2.10.5"
diff --git a/app-admin/keepass/keepass-2.31.ebuild b/app-admin/keepass/keepass-2.31.ebuild
new file mode 100644
index 0000000..cac738e
--- /dev/null
+++ b/app-admin/keepass/keepass-2.31.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils fdo-mime gnome2-utils mono-env multilib
+
+MY_PN="KeePass"
+DESCRIPTION="A free, open source, light-weight and easy-to-use password manager"
+HOMEPAGE="http://keepass.info/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-${PV}-Source.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="aot"
+
+COMMON_DEPEND=">=dev-lang/mono-2.10.5"
+RDEPEND="${COMMON_DEPEND}
+	dev-dotnet/libgdiplus[cairo]"
+DEPEND="${COMMON_DEPEND}
+	app-arch/unzip"
+
+S=${WORKDIR}
+
+src_prepare() {
+	# Remove Windows-specific things
+	pushd Build > /dev/null || die
+	. PrepMonoDev.sh || die
+	popd > /dev/null || die
+
+	# KeePass looks for some XSL files in the same folder as the executable,
+	# we prefer to have it in /usr/share/KeePass
+	epatch "${FILESDIR}/${PN}-2.20-xsl-path-detection.patch"
+	# bug # 558094
+	if has_version ">=dev-lang/mono-4" ; then
+		sed -i -e 's! ToolsVersion="3.5"!!g' Translation/TrlUtil/TrlUtil.csproj || die
+		sed -i -e 's/Format Version 10.00/Format Version 11.00/' KeePass.sln || die
+	fi
+}
+
+src_compile() {
+	# Build with Release target
+	xbuild /target:KeePass /property:Configuration=Release || die
+
+	# Run Ahead Of Time compiler on the binary
+	if use aot; then
+		cp Ext/KeePass.exe.config Build/KeePass/Release/
+		mono --aot -O=all Build/KeePass/Release/KeePass.exe || die
+	fi
+}
+
+src_install() {
+	# Wrapper script to launch mono
+	make_wrapper ${PN} "mono /usr/$(get_libdir)/${PN}/KeePass.exe"
+
+	# Some XSL files
+	insinto /usr/share/${PN}/XSL
+	doins Ext/XSL/*
+
+	insinto /usr/$(get_libdir)/${PN}/
+	exeinto /usr/$(get_libdir)/${PN}/
+	doins Ext/KeePass.exe.config
+	# Default configuration, simply says to use user-specific configuration
+	doins Ext/KeePass.config.xml
+
+	# The actual executable
+	doexe Build/KeePass/Release/KeePass.exe
+
+	# Copy the AOT compilation result
+	if use aot; then
+		doexe Build/KeePass/Release/KeePass.exe.so
+	fi
+
+	# Prepare the icons
+	newicon -s 256 Ext/Icons_04_CB/Finals/plockb.png "${PN}.png"
+	newicon -s 256 -t gnome -c mimetypes Ext/Icons_04_CB/Finals/plockb.png "application-x-${PN}2.png"
+
+	# Create a desktop entry and associate it with the KeePass mime type
+	make_desktop_entry ${PN} ${MY_PN} ${PN} "System;Security" "MimeType=application/x-keepass2;"
+
+	# MIME descriptor for .kdbx files
+	insinto /usr/share/mime/packages/
+	doins "${FILESDIR}/${PN}.xml"
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	fdo-mime_mime_database_update
+	fdo-mime_desktop_database_update
+
+	if ! has_version x11-misc/xdotool ; then
+		elog "Optional dependencies:"
+		elog "	x11-misc/xdotool (enables autotype)"
+	fi
+
+	elog "Some systems may experience issues with copy and paste operations."
+	elog "If you encounter this, please install x11-misc/xsel."
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	fdo-mime_mime_database_update
+	fdo-mime_desktop_database_update
+}
diff --git a/app-admin/keepass/metadata.xml b/app-admin/keepass/metadata.xml
index b9e748b..b324779 100644
--- a/app-admin/keepass/metadata.xml
+++ b/app-admin/keepass/metadata.xml
@@ -1,15 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>ale@clearmind.me</email>
 		<description>Maintainer. Assign bugs to him.</description>
 	</maintainer>
-	<maintainer>
+	<maintainer type="person">
 		<email>kensington@gentoo.org</email>
 		<description>Proxy maintainer. CC him on bugs.</description>
 	</maintainer>
-	<herd>proxy-maintainers</herd>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="aot">Generate native code at build time, rather than runtime.</flag>
 	</use>
diff --git a/app-admin/keepassx/Manifest b/app-admin/keepassx/Manifest
index af1ab37..9fb887e 100644
--- a/app-admin/keepassx/Manifest
+++ b/app-admin/keepassx/Manifest
@@ -1,3 +1,5 @@
 DIST keepassx-0.4.3.tar.gz 1368766 SHA256 cd901a0611ce57e62cf6df7eeeb1b690b5232302bdad8626994eb54adcfa1e85 SHA512 8ce1bc252694e11a8b0da94bb00a4e5ca2837fe099f2f992aa9a93bacc4d94f33970cec687bd73a7a7762e86220a0541fe85a6708a2d4ad1bb3aef5f19935ccc WHIRLPOOL e2f54832eeb8eb3c7b7874e2deb97843a9ef1a92f027ec540fd197cf850d313be5d8959595e122b24a286973747d3b71bd33537de601b31ba3d45a16a095747b
-DIST keepassx-2.0_alpha6.tar.gz 1366929 SHA256 592f9995b13c4f84724fb24a0078162246397eedccd467daaf0fd3608151f2b0 SHA512 76cf2e9617217b4f38ecd0027a88768c5a06c51e796f32e4939ba3a4506583ce6793c107293ee87c0ff1d18eaf6030096cab4da644cf0bef35ff09d5a46cd5ca WHIRLPOOL 37283e66bb285656ff2992552ce6e745603f27685a8a2e87fec42e391b484b2bf1697da011ec0ef86ff1ba5053abd803f38ad8ba77f0d295d901bd5ecf38d1e3
-DIST keepassx-2.0_beta2.tar.gz 1479599 SHA256 5828261226c441856bd12e2f4f73af1a5fc3b1981b2cff40fbc2403e344f4e52 SHA512 e63431a55536fccc8dd4e441863081f533cac6608ce393ad4d641fc57fce815232aff1fdf777374464b3ad6bedb16392d578ff39bf9230d4cb0cd62b11869a5f WHIRLPOOL 69e1de023b5090640747b332642559ea0d0fdbe04bffdf4805475f29eb100c2e8d2744c3b9222c3c63a938e33e470ad9b5a6812d09c249eb09af7006728c7866
+DIST keepassx-0.4.4.tar.gz 1371560 SHA256 3e27068ca85e68705347f0921c6b3c9248d7c5a84c79c0483daf22d141c0adc4 SHA512 2fc93d77f5576a0cce6514b39ee9b319efaa72b475762438eed5601c5e3edb7693a5fbb9c1e741be1e5d3a08849bc54b0cff90fe3a86cf240129febc0cc703d8 WHIRLPOOL 41c987607c8b233292eac5c5d654974caa1ae2a0d277468081ad4a6e9fcd248314239162ba23dc414f0854a5f6ba09e1c1f9d3aa078756438650a0e9151e81d2
+DIST keepassx-2.0.1.tar.gz 1530861 SHA256 b3779fd90353f12d8d72e89b1c901db35096358032626bbf062f433798c97e82 SHA512 ad10ce3877c0c06a9b1050ea3fb33ce205e2a289a8f8afb28be906a93c26c7da9fdd2b5ae9f5db260525c939013e20fa1b0092bc3c5081cc8b22a44946d633b8 WHIRLPOOL e413244baa9449de4a26ff8c54af168c01a5aec5082793076e1f60b3607182a302011141b7db52bdf571d295a10f81656d71857a634460fef91690fd14df0f70
+DIST keepassx-2.0.2.tar.gz 1532353 SHA256 204bdcf49c72078cd6f02b4f29b062923cca9e7b2d3551f2bf352763daa236b8 SHA512 3f661d3b5807c5acafc65310ecd8bd4d0bcd51a0c919e219bba616cb3f54434f8f81ba533ab5ccec00d454838355ff048f4ffbc308442fad4f973d1766b95072 WHIRLPOOL 0d793bb3ce4ba015ea9cabc1625c61bdf0cc7fabfe5be67fe09ea180a5fb3654ef850531bff7e09bdc47107d69bf06f5e94fa308dbb0b8d5f9468b3c02349810
+DIST keepassx-2.0.tar.gz 1524638 SHA256 0eb40fac3a44d8283dfc1ee28cc6de5c660b22ab975472de82c2b04675c822e6 SHA512 6c8b8ee6a22cab5da5f262b281ed914e9cce99607312124b068a3386d9da560a3584acea4ce1be6700e40087febcc269273ab67ea472b99e6d3f75048d164788 WHIRLPOOL d325c491687b70e256f9312548451250dadfdda0c659b9b16a6fd8e0d39bdf5ced905e11646730619cf217e3afe3ad885428bf4cff3204dcf68bdd33510cb467
diff --git a/app-admin/keepassx/keepassx-0.4.4.ebuild b/app-admin/keepassx/keepassx-0.4.4.ebuild
new file mode 100644
index 0000000..d838ba4
--- /dev/null
+++ b/app-admin/keepassx/keepassx-0.4.4.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit qt4-r2
+
+DESCRIPTION="Qt password manager compatible with its Win32 and Pocket PC versions"
+HOMEPAGE="http://www.keepassx.org/"
+SRC_URI="https://www.keepassx.org/releases/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug pch"
+
+DEPEND="dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	dev-qt/qtxmlpatterns:4
+	>=x11-libs/libXtst-1.1.0"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.4.3-gcc47.patch )
+
+src_configure() {
+	local conf_pch
+	use pch && conf_pch="PRECOMPILED=1" || conf_pch="PRECOMPILED=0"
+
+	eqmake4 ${PN}.pro -recursive \
+		PREFIX="${ED}/usr" \
+		"${conf_pch}"
+}
+
+src_compile() {
+	# workaround compile failure due to distcc, bug #214327
+	PATH=${PATH/\/usr\/lib\/distcc\/bin:}
+	emake
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc changelog
+}
diff --git a/app-admin/keepassx/keepassx-2.0.1.ebuild b/app-admin/keepassx/keepassx-2.0.1.ebuild
new file mode 100644
index 0000000..9475680
--- /dev/null
+++ b/app-admin/keepassx/keepassx-2.0.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit cmake-utils vcs-snapshot
+
+DESCRIPTION="Qt password manager compatible with its Win32 and Pocket PC versions"
+HOMEPAGE="http://www.keepassx.org/"
+SRC_URI="https://www.keepassx.org/releases/${PV}/${P}.tar.gz"
+
+LICENSE="|| ( GPL-2 GPL-3 ) BSD GPL-2 LGPL-2.1 LGPL-3+ CC0-1.0 public-domain || ( LGPL-2.1 GPL-3 )"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+DEPEND="
+	dev-libs/libgcrypt:0=
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	dev-qt/qttest:4
+	sys-libs/zlib
+	x11-libs/libX11
+	x11-libs/libXtst
+"
+RDEPEND="${DEPEND}"
+
+DOCS=(CHANGELOG)
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_TESTS="$(usex test)"
+	)
+	cmake-utils_src_configure
+}
diff --git a/app-admin/keepassx/keepassx-2.0.2.ebuild b/app-admin/keepassx/keepassx-2.0.2.ebuild
new file mode 100644
index 0000000..9475680
--- /dev/null
+++ b/app-admin/keepassx/keepassx-2.0.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit cmake-utils vcs-snapshot
+
+DESCRIPTION="Qt password manager compatible with its Win32 and Pocket PC versions"
+HOMEPAGE="http://www.keepassx.org/"
+SRC_URI="https://www.keepassx.org/releases/${PV}/${P}.tar.gz"
+
+LICENSE="|| ( GPL-2 GPL-3 ) BSD GPL-2 LGPL-2.1 LGPL-3+ CC0-1.0 public-domain || ( LGPL-2.1 GPL-3 )"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+DEPEND="
+	dev-libs/libgcrypt:0=
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	dev-qt/qttest:4
+	sys-libs/zlib
+	x11-libs/libX11
+	x11-libs/libXtst
+"
+RDEPEND="${DEPEND}"
+
+DOCS=(CHANGELOG)
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_TESTS="$(usex test)"
+	)
+	cmake-utils_src_configure
+}
diff --git a/app-admin/keepassx/keepassx-2.0_beta2.ebuild b/app-admin/keepassx/keepassx-2.0.ebuild
similarity index 100%
rename from app-admin/keepassx/keepassx-2.0_beta2.ebuild
rename to app-admin/keepassx/keepassx-2.0.ebuild
diff --git a/app-admin/keepassx/keepassx-2.0_alpha6.ebuild b/app-admin/keepassx/keepassx-2.0_alpha6.ebuild
deleted file mode 100644
index 79aaa66..0000000
--- a/app-admin/keepassx/keepassx-2.0_alpha6.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils vcs-snapshot
-
-DESCRIPTION="Qt password manager compatible with its Win32 and Pocket PC versions"
-HOMEPAGE="http://www.keepassx.org/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( GPL-2 GPL-3 ) BSD GPL-2 LGPL-2.1 LGPL-3+ CC0-1.0 public-domain || ( LGPL-2.1 GPL-3 )"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-DEPEND="
-	dev-libs/libgcrypt:0=
-	dev-qt/qtcore:4
-	dev-qt/qtdbus:4
-	dev-qt/qtgui:4
-	dev-qt/qttest:4
-	sys-libs/zlib
-	x11-libs/libX11
-	x11-libs/libXtst
-"
-RDEPEND="${DEPEND}"
-
-DOCS=(CHANGELOG)
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_with test TESTS)
-	)
-	cmake-utils_src_configure
-}
diff --git a/app-admin/keepassx/metadata.xml b/app-admin/keepassx/metadata.xml
index 9fe4915..b261f53 100644
--- a/app-admin/keepassx/metadata.xml
+++ b/app-admin/keepassx/metadata.xml
@@ -1,7 +1,7 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>tgurr@gentoo.org</email>
     <name>Timo Gurr</name>
   </maintainer>
diff --git a/app-admin/killproc/files/killproc-2.13-argz.patch b/app-admin/killproc/files/killproc-2.13-argz.patch
new file mode 100644
index 0000000..6ea0cc5
--- /dev/null
+++ b/app-admin/killproc/files/killproc-2.13-argz.patch
@@ -0,0 +1,10 @@
+--- a/startproc.c
++++ b/startproc.c
+@@ -25,7 +25,6 @@
+ #include <sys/time.h>
+ #include <sys/resource.h>
+ #include <sys/ioctl.h>
+-#include <argz.h>
+ #include <grp.h>
+ 
+ #define USAGE		"Usage:\n"\
diff --git a/app-admin/killproc/killproc-2.13-r1.ebuild b/app-admin/killproc/killproc-2.13-r1.ebuild
index 92094e4..9a7dab5 100644
--- a/app-admin/killproc/killproc-2.13-r1.ebuild
+++ b/app-admin/killproc/killproc-2.13-r1.ebuild
@@ -14,7 +14,10 @@
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
 
 src_prepare() {
-	epatch "${FILESDIR}/${P}-makefile.patch"
+	epatch \
+		"${FILESDIR}/${P}-makefile.patch" \
+		"${FILESDIR}/${P}-argz.patch"
+
 	tc-export CC
 	export COPTS=${CFLAGS}
 }
diff --git a/app-admin/killproc/metadata.xml b/app-admin/killproc/metadata.xml
index 347ef10..1f15fbb 100644
--- a/app-admin/killproc/metadata.xml
+++ b/app-admin/killproc/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>                         
+<maintainer type="person">                         
   <email>jer@gentoo.org</email>
 </maintainer>
 </pkgmetadata>
diff --git a/app-admin/kpcli/metadata.xml b/app-admin/kpcli/metadata.xml
index 434138d..ad8e967 100644
--- a/app-admin/kpcli/metadata.xml
+++ b/app-admin/kpcli/metadata.xml
@@ -1,7 +1,10 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>perl</herd>
+  <maintainer type="project">
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">kpcli</remote-id>
   </upstream>
diff --git a/app-admin/lastpass-cli/Manifest b/app-admin/lastpass-cli/Manifest
index 0cc1134..067c3f9 100644
--- a/app-admin/lastpass-cli/Manifest
+++ b/app-admin/lastpass-cli/Manifest
@@ -1 +1,6 @@
 DIST lastpass-cli-0.6.0.tar.gz 65047 SHA256 e48f210b34a030e8b8cef3e1d05957aabe757ea4cd31bf03c46b70ddc830733c SHA512 ceaa660e6a7d3b27b09ce6d1d522af216e2c8357859d87034f7f887b53631bf5214b02400f8cb91d0c0020fcfb7889dd0fd8731b1af76a63f94666de2ac4dcd4 WHIRLPOOL 4554d8576e71a0b4c7d69556614a33f3e34d85aec4dd6aa50973ba8eb212864fc45bf3a7cb4e2847cb60a00546e46652cf5baf7f34872ada23431e78078cc6ed
+DIST lastpass-cli-0.6.1.tar.gz 65996 SHA256 6ae596a59439d39794e31004d877ad6884d0f820bc0cc0a94c87bd2800ddbe9b SHA512 6bfb4d8d5c85a32179d6d577270a91d9731834f79b0ecbd9c8e3f66a403be876de073eb0418cd94ef04f545c3a8aca6fa503e892a13827f7c28f31d15e161dbc WHIRLPOOL a972d245087c2e72c029e06111b082b41f769b18b30ec6fc64176bba22c394d71aaa7cf66d32f31f7b4d4475056c547eae36d8f43f4f6add4aa71d46fb9178b7
+DIST lastpass-cli-0.7.1.tar.gz 68232 SHA256 e9e2d1dbbb6be0b0d9ce8d6c24026fc537cadc824528c96ac562737a90152f5c SHA512 c6be9b4cf30165835dd4e8716992d43246c91c4e9177226285b5a5214fd5927774155cc75b9aad66c69ec8b10ca0b0e00485a429e2bd064dd406fc55f275a295 WHIRLPOOL b88d4de9fdb120463a8454c098c12a1e2a366429904dec82d271b4ef287bdce192efef5de297733c3a38be21f3241ff402c8448a96daa195b986c671456b0b1d
+DIST lastpass-cli-0.7.2.tar.gz 69134 SHA256 e66390ed4037a0b3efef402ca742cc16fc0ac165308188fbd90c25e50ddff00f SHA512 00383ecd38d25ded26004114e1ff7ed21e4d1ee88a4e9b61ad538532f7f609c556d732e4c046faf35d4151cf203e7ea143042722709a3f30e19e81dff869a5c6 WHIRLPOOL 7935f896ac344d322b4fd44421a7b5a34e56200f3e9cc5077bd54ce3ef88e9c4fe242f28a1f6abecf52bbb14e8bbf7c22a859fcf1f95d3faa78138674aaea145
+DIST lastpass-cli-0.8.0.tar.gz 79167 SHA256 c5c6076a9a80de275f7fc57275d303cc0c4eb21ff06f705659047abc09a8595b SHA512 2bbaffbe31ed95bda77cec82d5f702f92a311798590d9d41f63f920e50f79b2b7a9ab9b6fb05f4e0650ea4ba75d3e845b817a4f4206f316bc2cdba0de85f9999 WHIRLPOOL 9f7da593457555e50a0450cb0cb4d9d9a8e9b940566158eaf95b21b0865d8f14d19211c9e9fcf9794784695ffc1df66712ed569b3f1cabb472260a0b5c7b1106
+DIST lastpass-cli-0.8.1.tar.gz 79981 SHA256 ba845a827501f3c49514e977c8de25e5950d3ea482d7a3c31090148310a83056 SHA512 bc58500165e26dc87b592a7d975fa5b6e6698ca7b68fdd8205d21cfd13f72860cbbf5cd36b162fe928c12eb6c8ab86b42e369b8abc719bd36df5a8d8ea5f1689 WHIRLPOOL 3a332725106a43dc5738ad4b066a5b4c2fd3764e3543257931ba267068d202cb4bafbbdb4b72a336032e66161fba98f3d0c1d9b0f8a194a413fed0bc28a6f692
diff --git a/app-admin/lastpass-cli/lastpass-cli-0.6.0.ebuild b/app-admin/lastpass-cli/lastpass-cli-0.6.0.ebuild
index e112950..0e59c06 100644
--- a/app-admin/lastpass-cli/lastpass-cli-0.6.0.ebuild
+++ b/app-admin/lastpass-cli/lastpass-cli-0.6.0.ebuild
@@ -11,11 +11,12 @@
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~x86"
-IUSE="X +pinentry"
+IUSE="libressl X +pinentry"
 
 RDEPEND="
 	X? ( || ( x11-misc/xclip x11-misc/xsel ) )
-	dev-libs/openssl:0
+	!libressl? ( dev-libs/openssl:0 )
+	libressl? ( dev-libs/libressl )
 	net-misc/curl
 	dev-libs/libxml2
 	pinentry? ( app-crypt/pinentry )
diff --git a/app-admin/lastpass-cli/lastpass-cli-0.6.1.ebuild b/app-admin/lastpass-cli/lastpass-cli-0.6.1.ebuild
new file mode 100644
index 0000000..40deeb9
--- /dev/null
+++ b/app-admin/lastpass-cli/lastpass-cli-0.6.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit toolchain-funcs
+
+DESCRIPTION="Interfaces with LastPass.com from the command line."
+SRC_URI="https://github.com/lastpass/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/lastpass/lastpass-cli"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl X +pinentry"
+
+RDEPEND="
+	X? ( || ( x11-misc/xclip x11-misc/xsel ) )
+	!libressl? ( dev-libs/openssl:0 )
+	libressl? ( dev-libs/libressl )
+	net-misc/curl
+	dev-libs/libxml2
+	pinentry? ( app-crypt/pinentry )
+"
+DEPEND="${RDEPEND} app-text/asciidoc"
+
+src_prepare() {
+	sed -i 's/install -s/install/' Makefile || die "Could not remove stripping"
+	tc-export CC
+}
+
+src_compile() {
+	emake PREFIX="${EPREFIX}/usr"
+	emake PREFIX="${EPREFIX}/usr" doc-man
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install-doc
+}
diff --git a/app-admin/lastpass-cli/lastpass-cli-0.7.1.ebuild b/app-admin/lastpass-cli/lastpass-cli-0.7.1.ebuild
new file mode 100644
index 0000000..ca58fd1
--- /dev/null
+++ b/app-admin/lastpass-cli/lastpass-cli-0.7.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Interfaces with LastPass.com from the command line."
+SRC_URI="https://github.com/lastpass/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/lastpass/lastpass-cli"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl X +pinentry"
+
+RDEPEND="
+	X? ( || ( x11-misc/xclip x11-misc/xsel ) )
+	!libressl? ( dev-libs/openssl:0 )
+	libressl? ( dev-libs/libressl )
+	net-misc/curl
+	dev-libs/libxml2
+	pinentry? ( app-crypt/pinentry )
+"
+DEPEND="${RDEPEND} app-text/asciidoc"
+
+src_compile() {
+	emake PREFIX="${EPREFIX}/usr"
+	emake PREFIX="${EPREFIX}/usr" doc-man
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install-doc
+}
diff --git a/app-admin/lastpass-cli/lastpass-cli-0.7.2.ebuild b/app-admin/lastpass-cli/lastpass-cli-0.7.2.ebuild
new file mode 100644
index 0000000..1c207b0
--- /dev/null
+++ b/app-admin/lastpass-cli/lastpass-cli-0.7.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit toolchain-funcs
+
+DESCRIPTION="Interfaces with LastPass.com from the command line."
+SRC_URI="https://github.com/lastpass/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/lastpass/lastpass-cli"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl X +pinentry"
+
+RDEPEND="
+	X? ( || ( x11-misc/xclip x11-misc/xsel ) )
+	!libressl? ( dev-libs/openssl:0 )
+	libressl? ( dev-libs/libressl )
+	net-misc/curl
+	dev-libs/libxml2
+	pinentry? ( app-crypt/pinentry )
+"
+DEPEND="${RDEPEND} app-text/asciidoc"
+
+src_prepare() {
+	tc-export CC
+}
+
+src_compile() {
+	emake PREFIX="${EPREFIX}/usr"
+	emake PREFIX="${EPREFIX}/usr" doc-man
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install-doc
+}
diff --git a/app-admin/lastpass-cli/lastpass-cli-0.8.0-r1.ebuild b/app-admin/lastpass-cli/lastpass-cli-0.8.0-r1.ebuild
new file mode 100644
index 0000000..8bb6a25
--- /dev/null
+++ b/app-admin/lastpass-cli/lastpass-cli-0.8.0-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit toolchain-funcs
+
+DESCRIPTION="Interfaces with LastPass.com from the command line."
+HOMEPAGE="https://github.com/lastpass/lastpass-cli"
+SRC_URI="https://github.com/lastpass/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl X +pinentry"
+
+RDEPEND="
+	X? ( || ( x11-misc/xclip x11-misc/xsel ) )
+	!libressl? ( dev-libs/openssl:0 )
+	libressl? ( dev-libs/libressl )
+	net-misc/curl
+	dev-libs/libxml2
+	pinentry? ( app-crypt/pinentry )
+"
+DEPEND="${RDEPEND} app-text/asciidoc"
+
+src_prepare() {
+	tc-export CC
+}
+
+src_compile() {
+	emake PREFIX="${EPREFIX}/usr"
+	emake PREFIX="${EPREFIX}/usr" doc-man
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install-doc
+}
diff --git a/app-admin/lastpass-cli/lastpass-cli-0.8.1.ebuild b/app-admin/lastpass-cli/lastpass-cli-0.8.1.ebuild
new file mode 100644
index 0000000..8bb6a25
--- /dev/null
+++ b/app-admin/lastpass-cli/lastpass-cli-0.8.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit toolchain-funcs
+
+DESCRIPTION="Interfaces with LastPass.com from the command line."
+HOMEPAGE="https://github.com/lastpass/lastpass-cli"
+SRC_URI="https://github.com/lastpass/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl X +pinentry"
+
+RDEPEND="
+	X? ( || ( x11-misc/xclip x11-misc/xsel ) )
+	!libressl? ( dev-libs/openssl:0 )
+	libressl? ( dev-libs/libressl )
+	net-misc/curl
+	dev-libs/libxml2
+	pinentry? ( app-crypt/pinentry )
+"
+DEPEND="${RDEPEND} app-text/asciidoc"
+
+src_prepare() {
+	tc-export CC
+}
+
+src_compile() {
+	emake PREFIX="${EPREFIX}/usr"
+	emake PREFIX="${EPREFIX}/usr" doc-man
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install-doc
+}
diff --git a/app-admin/lastpass-cli/metadata.xml b/app-admin/lastpass-cli/metadata.xml
index 5530621..64a89e2 100644
--- a/app-admin/lastpass-cli/metadata.xml
+++ b/app-admin/lastpass-cli/metadata.xml
@@ -1,19 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>jdhore@gentoo.org</email>
-    <name>Jeff Horelick</name>
-  </maintainer>
-  <use>
-    <flag name="X">
+	<maintainer type="person">
+		<email>gokturk@binghamton.edu</email>
+		<name>Gokturk 'gokturk' Yuksek</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<use>
+		<flag name="X">
 			Use <pkg>x11-misc/xclip</pkg> or <pkg>x11-misc/xsel</pkg> to copy passwords to the clipboard.
 		</flag>
-    <flag name="pinentry">
-		   Use <pkg>app-crypt/pinentry</pkg> to prompt for passwords.
+		<flag name="pinentry">
+			Use <pkg>app-crypt/pinentry</pkg> to prompt for passwords.
 		</flag>
-  </use>
-  <upstream>
-    <remote-id type="github">lastpass/lastpass-cli</remote-id>
-  </upstream>
+	</use>
+	<upstream>
+		<remote-id type="github">lastpass/lastpass-cli</remote-id>
+		<bugs-to>https://github.com/lastpass/lastpass-cli/issues</bugs-to>
+	</upstream>
 </pkgmetadata>
diff --git a/app-admin/lastpass/Manifest b/app-admin/lastpass/Manifest
index b2067e9..6b2dbc1 100644
--- a/app-admin/lastpass/Manifest
+++ b/app-admin/lastpass/Manifest
@@ -1,3 +1,3 @@
-DIST lp_linux.xpi 3965257 SHA256 1d98b3649f51e5f08a16379a73791b7e85fa5fab35b3a6190860c900788c5dbc SHA512 e39a6ada0e75dcb3bf943bce9b573bf8d22be7c07baf86f3651cbaaa5abcec7c31dd43341369b1fe562aff572befd1f15114ba030e6b9fb317bd476798d7b5e5 WHIRLPOOL 85f7eebc2f155d4beb7a1f69ef9d1e58508c76ac2807536d7a07885f395f342b218587199c9b57a77f9e54e75e1dfaf311341c16a59830c114283e542aa18767
-DIST lpchrome_linux.crx 4722909 SHA256 511fd7968bb45ab1425ca9584873f4dbf0812b63c64a4e604796cb0a76849f3f SHA512 01935a34a0be63b96556009cb50364df83599aeab6cad10d7e4b49af5a5acfeecf61171aa36f932901a42e2e0b58141e649d17525a259343fe9b2f287d413dc0 WHIRLPOOL 230f2c820d2cf8d3a937866c5c3dde8b7f05e37547180a4e666bc0bac592671f5c1d7bb84498d5bd930053e47ec80d75207dcaba1b71f307d1ea011d80e9e5f9
-DIST lplinux.tar.bz2 1523508 SHA256 535fe4ce97a55f3baf9311962a7a4812ea7a32c8a545ee1e533c0794c665abf1 SHA512 4433701df5a6c04bb914f3b342c458a28ff7cd232936f77dfec6ddd959060be1e8bf067b88e05d1c1ac69f63f1660c49c262f85515d6cf97188ea365f7bf309b WHIRLPOOL 818f00fc43944b8eb1c0f4816e82fa06be69845d1d6a3eb8de453db1647e9bfdce0ff0812ea9c0fec64c904dce1cc1fa4c514a79ead2c5e98aeb7416a8a2fb41
+DIST lp_linux-3.2.16.xpi 6328266 SHA256 e06364ce631f436246cfca19ff24a2483bc459a5e31178f2c6acd57c1f408f81 SHA512 343d0763f25c31fb7dbde2c9aa19d797431ee9f7bb1f8ae220fd4cac2cc8f439813d92ecb432047f5889967eca7bd4197a7f2725fc52669d022c9f44b7d4945e WHIRLPOOL 5b64cdf371b9ff9ac46030393b22fd92c4fa6493947f47d91a2f44c7019ffcfe1344447456398c2991aee5cbc45bf95b39d90a6a423f6a2e284ac88d2d75d2f8
+DIST lpchrome_linux-3.2.16.crx 5310273 SHA256 58ec7c7dfa735c5d052b0ca253f85654fd381952533a4a2b125d3abb88e77d39 SHA512 a7d3198ace665bcbbe0a7bdc9dcb4dc165aaa39214df798fe28930d3cc340976a476b8afc4f19af1acc6cbbe61feff8dfa5cc6c2b4c6d4a04b0377752ce1ca54 WHIRLPOOL 9b281945cd8603516e11a9a2f4869622d6783a56670253cdcc4a51a7ddae84a1a5297956d491b4e17e449a01acf6e8a4e3cc0a8b494f973078e617fe041ed615
+DIST lplinux-3.2.16.tar.bz2 1621919 SHA256 c06fd97e74298c5e7d698b2c8cffce7d79f0c45126daeb27bca91d3403fd893c SHA512 ed77f3ca979d84021e27088a5d1d7e0b102f6ce15f675a7b99810e88760844182b8597670bbe45c9436b42889597c8c421d1acb6abe24085bbd2623b7984d37d WHIRLPOOL 192d332348db9ad68a5e63441e17c0ef954de058376f110dcd05dfe261d54f1c9a179a9c647dc9d5090ffefe8af68a9dbe446dea7a1fb46b1f6c2e458752417d
diff --git a/app-admin/lastpass/lastpass-3.1.61.ebuild b/app-admin/lastpass/lastpass-3.1.61.ebuild
deleted file mode 100644
index cae55ad..0000000
--- a/app-admin/lastpass/lastpass-3.1.61.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils
-
-DESCRIPTION="Online password manager and form filler that makes web browsing easier and more secure"
-HOMEPAGE="https://lastpass.com/misc_download2.php"
-# sadly, upstream has no versioned distfiles
-MAINDISTFILE=lplinux.tar.bz2
-SRC_URI="
-	https://lastpass.com/${MAINDISTFILE}
-	https://lastpass.com/lpchrome_linux.crx
-	firefox? ( https://lastpass.com/lp_linux.xpi )"
-
-LICENSE="LastPass"
-SLOT="0"
-KEYWORDS="-* ~x86 ~amd64"
-IUSE="+chromium +firefox +chrome"
-RESTRICT="strip mirror" # We can't mirror it, but we can fetch it
-
-DEPEND=""
-RDEPEND="
-	chrome? ( || (
-		www-client/google-chrome
-		www-client/google-chrome-beta
-		www-client/google-chrome-unstable
-	) )
-	chromium? ( >=www-client/chromium-32.0.1700.102 )
-	firefox? ( www-client/firefox )"
-REQUIRED_USE="|| ( firefox chromium chrome )"
-
-LASTPASS_EXEDIR=/opt/lastpass/
-
-QA_PREBUILT="
-	${LASTPASS_EXEDIR}nplastpass*
-	/usr/lib*/nsbrowser/plugins/libnplastpass*.so
-	/usr/lib*/firefox/browser/extensions/support@lastpass.com/platform/Linux_x86_64-gcc3/components/lpxpcom_x86_64.so
-	/usr/lib*/firefox/browser/extensions/support@lastpass.com/platform/Linux_x86-gcc3/components/lpxpcom.so
-"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	unpack ${MAINDISTFILE}
-	mkdir -p "${S}"/crx || die
-	# bug #524864: strip Chrome CRX header
-	# otherwise the unzip warning can be fatal in some cases
-	dd bs=306 skip=1 if="${DISTDIR}"/lpchrome_linux.crx of="${T}"/lpchrome_linux.zip 2>/dev/null || die
-	unzip -qq -o "${T}"/lpchrome_linux.zip -d "${S}"/crx || die
-}
-
-src_install() {
-	# This is based on the upstream installer script that's in the tarball
-	bin=nplastpass
-	use amd64 && bin="${bin}64"
-	exeinto ${LASTPASS_EXEDIR}
-	doexe "${S}"/$bin
-
-	# despite the name, this piece seems used by both firefox+chrome
-	exeinto /usr/$(get_libdir)/nsbrowser/plugins
-	doexe "${S}"/crx/lib${bin}.so
-
-	cat >"${T}"/lastpass_policy.json <<-EOF
-	{
-		"ExtensionInstallSources": [
-			"https://lastpass.com/*",
-			"https://*.lastpass.com/*",
-			"https://*.cloudfront.net/lastpass/*"
-		]
-	}
-	EOF
-	cat >"${T}"/com.lastpass.nplastpass.json <<-EOF
-	{
-		"name": "com.lastpass.nplastpass",
-		"description": "LastPass",
-		"path": "${LASTPASS_EXEDIR}/$bin",
-		"type": "stdio",
-		"allowed_origins": [
-			"chrome-extension://hdokiejnpimakedhajhdlcegeplioahd/",
-			"chrome-extension://debgaelkhoipmbjnhpoblmbacnmmgbeg/",
-			"chrome-extension://hnjalnkldgigidggphhmacmimbdlafdo/"
-		]
-	}
-	EOF
-
-	if use chromium; then
-		insinto /etc/chromium/policies/managed
-		doins "${T}"/lastpass_policy.json
-		insinto /etc/opt/chrome/native-messaging-hosts/
-		doins "${T}"/com.lastpass.nplastpass.json
-	fi
-	if use chrome; then
-		insinto /etc/opt/chrome/policies/managed/
-		doins "${T}"/lastpass_policy.json
-		insinto /etc/chromium/native-messaging-hosts
-		doins "${T}"/com.lastpass.nplastpass.json
-	fi
-
-	if use firefox; then
-		d="$D/usr/$(get_libdir)/firefox/browser/extensions/support@lastpass.com"
-		mkdir -p $d || die
-		unzip -qq -o "${DISTDIR}/lp_linux.xpi" -d "$d" || die
-	fi
-
-}
-
-pkg_postinst() {
-	einfo "Visit https://lastpass.com/dl/inline/?full=1 to finish installing for Chrome/Chromium/Firefox"
-}
diff --git a/app-admin/lastpass/lastpass-3.2.16.ebuild b/app-admin/lastpass/lastpass-3.2.16.ebuild
new file mode 100644
index 0000000..98e3245
--- /dev/null
+++ b/app-admin/lastpass/lastpass-3.2.16.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="Online password manager and form filler that makes web browsing easier and more secure"
+HOMEPAGE="https://lastpass.com/misc_download2.php"
+# sadly, upstream has no versioned distfiles
+DIST_MAIN=lplinux-${PV}.tar.bz2
+DIST_CRX=lpchrome_linux-${PV}.crx # Use by both firefox+chrome/chromimum code
+DIST_XPI=lp_linux-${PV}.xpi
+SRC_URI="
+	https://lastpass.com/lplinux.tar.bz2 -> ${DIST_MAIN}
+	https://lastpass.com/lpchrome_linux.crx -> ${DIST_CRX}
+	firefox? ( https://lastpass.com/lp_linux.xpi -> ${DIST_XPI} )"
+
+LICENSE="LastPass"
+SLOT="0"
+KEYWORDS="-* ~x86 ~amd64"
+IUSE="+chromium +firefox +chrome"
+RESTRICT="strip mirror" # We can't mirror it, but we can fetch it
+
+DEPEND="app-arch/unzip"
+RDEPEND="
+	chrome? ( || (
+		www-client/google-chrome
+		www-client/google-chrome-beta
+		www-client/google-chrome-unstable
+	) )
+	chromium? ( >=www-client/chromium-32.0.1700.102 )
+	firefox? ( www-client/firefox )"
+REQUIRED_USE="|| ( firefox chromium chrome )"
+
+LASTPASS_EXEDIR=/opt/lastpass/
+
+QA_PREBUILT="
+	${LASTPASS_EXEDIR}nplastpass*
+	/usr/lib*/nsbrowser/plugins/libnplastpass*.so
+	/usr/lib*/firefox/browser/extensions/support@lastpass.com/platform/Linux_x86_64-gcc3/components/lpxpcom_x86_64.so
+	/usr/lib*/firefox/browser/extensions/support@lastpass.com/platform/Linux_x86-gcc3/components/lpxpcom.so
+"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	unpack ${DIST_MAIN}
+	mkdir -p "${S}"/crx || die
+	# bug #524864: strip Chrome CRX header
+	# otherwise the unzip warning can be fatal in some cases
+	dd bs=306 skip=1 if="${DISTDIR}"/${DIST_CRX} of="${T}"/lpchrome_linux.zip 2>/dev/null || die
+	unzip -qq -o "${T}"/lpchrome_linux.zip -d "${S}"/crx || die
+}
+
+src_install() {
+	# This is based on the upstream installer script that's in the tarball
+	bin=nplastpass
+	use amd64 && bin="${bin}64"
+	exeinto ${LASTPASS_EXEDIR}
+	doexe "${S}"/$bin
+
+	# despite the name, this piece seems used by both firefox+chrome
+	exeinto /usr/$(get_libdir)/nsbrowser/plugins
+	doexe "${S}"/crx/lib${bin}.so
+
+	cat >"${T}"/lastpass_policy.json <<-EOF || die
+	{
+		"ExtensionInstallSources": [
+			"https://lastpass.com/*",
+			"https://*.lastpass.com/*",
+			"https://*.cloudfront.net/lastpass/*"
+		]
+	}
+	EOF
+	cat >"${T}"/com.lastpass.nplastpass.json <<-EOF || die
+	{
+		"name": "com.lastpass.nplastpass",
+		"description": "LastPass",
+		"path": "${LASTPASS_EXEDIR}/$bin",
+		"type": "stdio",
+		"allowed_origins": [
+			"chrome-extension://hdokiejnpimakedhajhdlcegeplioahd/",
+			"chrome-extension://debgaelkhoipmbjnhpoblmbacnmmgbeg/",
+			"chrome-extension://hnjalnkldgigidggphhmacmimbdlafdo/"
+		]
+	}
+	EOF
+
+	for d in \
+		$(usex chromium /etc/chromium '') \
+		$(usex chrome /etc/opt/chrome '') \
+		; do
+		insinto ${d}/policies/managed
+		doins "${T}"/lastpass_policy.json
+		insinto ${d}/native-messaging-hosts
+		doins "${T}"/com.lastpass.nplastpass.json
+	done
+
+	if use firefox; then
+		d="$D/usr/$(get_libdir)/firefox/browser/extensions/support@lastpass.com"
+		mkdir -p $d || die
+		unzip -qq -o "${DISTDIR}/${DIST_XPI}" -d "$d" || die
+	fi
+}
+
+pkg_postinst() {
+	einfo "Visit https://lastpass.com/dl/inline/?full=1 to finish installing for Chrome/Chromium/Firefox"
+}
diff --git a/app-admin/lastpass/metadata.xml b/app-admin/lastpass/metadata.xml
index 556c09b..9f1201e 100644
--- a/app-admin/lastpass/metadata.xml
+++ b/app-admin/lastpass/metadata.xml
@@ -1,12 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>robbat2@gentoo.org</email>
     <name>Robin H. Johnson</name>
   </maintainer>
+  <maintainer type="person">
+    <email>gokturk@binghamton.edu</email>
+    <name>Gokturk Yuksek</name>
+    <description>Proxied maintainer; set to assignee in all bugs</description>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <longdescription lang="en">
-	</longdescription>
+    Lastpass is an online password manager, password generator, form
+    filler and secure notes service.
+  </longdescription>
   <use>
     <flag name="firefox">Support for <pkg>www-client/firefox</pkg></flag>
     <flag name="chromium">Support for <pkg>www-client/chromium</pkg></flag>
diff --git a/app-admin/lib_users/metadata.xml b/app-admin/lib_users/metadata.xml
index 45bc5df..4283a28 100644
--- a/app-admin/lib_users/metadata.xml
+++ b/app-admin/lib_users/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>jer@gentoo.org</email>
     <name>Jeroen Roovers</name>
   </maintainer>
-  <maintainer>
+  <maintainer type="person">
     <email>klausman@gentoo.org</email>
     <name>Tobias Klausman</name>
   </maintainer>
diff --git a/app-admin/lnav/metadata.xml b/app-admin/lnav/metadata.xml
index e0f9d32..a78cad4 100644
--- a/app-admin/lnav/metadata.xml
+++ b/app-admin/lnav/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>radhermit@gentoo.org</email>
     <name>Tim Harder</name>
   </maintainer>
diff --git a/app-admin/localepurge/metadata.xml b/app-admin/localepurge/metadata.xml
index 2d52d39..3358aba 100644
--- a/app-admin/localepurge/metadata.xml
+++ b/app-admin/localepurge/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
-<maintainer>
+<maintainer type="person">
   <email>wimmuskee@gmail.com</email>
   <name>Wim Muskee</name>
 </maintainer>
+<maintainer type="project">
+  <email>proxy-maint@gentoo.org</email>
+  <name>Proxy Maintainers</name>
+</maintainer>
 <longdescription>
 Just a simple tool to erase all uneeded locale and man files usually generated for USE="nls"
 </longdescription>
diff --git a/app-admin/logcheck/metadata.xml b/app-admin/logcheck/metadata.xml
index d047926..cc8cd37 100644
--- a/app-admin/logcheck/metadata.xml
+++ b/app-admin/logcheck/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>phajdan.jr@gentoo.org</email>
 		<name>Pawel Hajdan jr</name>
 	</maintainer>
diff --git a/app-admin/logmon/metadata.xml b/app-admin/logmon/metadata.xml
index 53a0cae..9d1727e 100644
--- a/app-admin/logmon/metadata.xml
+++ b/app-admin/logmon/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>pinkbyte@gentoo.org</email>
 		<name>Sergey Popov</name>
 	</maintainer>
diff --git a/app-admin/logrotate/Manifest b/app-admin/logrotate/Manifest
index 25d4efc..eae536b 100644
--- a/app-admin/logrotate/Manifest
+++ b/app-admin/logrotate/Manifest
@@ -1,2 +1,3 @@
+DIST 3.9.2.tar.gz 80711 SHA256 2de00c65e23fa9d7909cae6594e550b9abe9a7eb1553669ddeaca92d30f97009 SHA512 62c84a98ec3373562a5c0ab0abd68e33620787cbbafbcf442cb5c7bdc1a41a7f673ee5dabc5f905ad4dd3fffebcbee0dab2ea8698f20de04cc13950212aaab33 WHIRLPOOL b77338f2cc88e6bd03310cea40c26cd4d890238455b4d9507f64a3f8de1006bf98e0d3b783f6536da963f3d695ab604ab3f9bb0e6aa1ae9575005a665b497ec1
 DIST logrotate-3.8.9.tar.gz 77408 SHA256 700ed7ce9072a1cca324779a74797dfaefdae37ac50a817134b947c4ded1dfa7 SHA512 342533f321a1d77c0ca389fd0a393377ba73f10654aae163cbd35f8d5df25673f1aa6e44d0af42be5419d152a7dae11024d9005076bce0a3b3dad1f0e12b9c0d WHIRLPOOL 005621b5dc7f6954e505876eece76e3adf03b9b89b724e5c28b845c8af3ebb8e978d20e3a82c8a503c32bfd8758517625207e23518d6d08068e237c22fe7212d
 DIST logrotate-3.9.1.tar.gz 79061 SHA256 022769e3288c80981559a8421703c88e8438b447235e36dd3c8e97cd94c52545 SHA512 e6da7c7f067befaf2441e9c6ce77e53cf5ddb4f56cc3304c3e50873b6f20c68520f4a0e50ec466cbebcbed20bfd77bf6dfc489975a8131e9573fb19856c0fe28 WHIRLPOOL 9b3558bb03c6c95f8f386ea75ca09bfda802ae4c45b9ef8408692e3aa7a2ee57447cf15ce04d0289946b9cae2266acb5509d8151d15ac6ea0ad9113aeb32dc17
diff --git a/app-admin/logrotate/files/logrotate-3.9.2-Werror.patch b/app-admin/logrotate/files/logrotate-3.9.2-Werror.patch
new file mode 100644
index 0000000..659a66c
--- /dev/null
+++ b/app-admin/logrotate/files/logrotate-3.9.2-Werror.patch
@@ -0,0 +1,12 @@
+diff -Nuar a/Makefile.am b/Makefile.am
+--- a/Makefile.am	2016-01-20 10:47:36.000000000 +0100
++++ b/Makefile.am	2016-01-25 20:04:28.270050499 +0100
+@@ -1,7 +1,7 @@
+ MAN = logrotate.8
+ MAN5 = logrotate.conf.5
+ 
+-AM_CFLAGS = -Wall -Werror
++AM_CFLAGS = -Wall
+ sbin_PROGRAMS = logrotate
+ logrotate_SOURCES = logrotate.c log.c config.c basenames.c
+ 
diff --git a/app-admin/logrotate/files/logrotate-3.9.2-atomic-create.patch b/app-admin/logrotate/files/logrotate-3.9.2-atomic-create.patch
new file mode 100644
index 0000000..3914e65
--- /dev/null
+++ b/app-admin/logrotate/files/logrotate-3.9.2-atomic-create.patch
@@ -0,0 +1,42 @@
+diff -Nuar a/logrotate.c b/logrotate.c
+--- a/logrotate.c	2016-01-25 19:55:46.740039999 +0100
++++ b/logrotate.c	2016-01-25 20:03:15.290049030 +0100
+@@ -367,15 +367,18 @@
+ int createOutputFile(char *fileName, int flags, struct stat *sb, acl_type acl, int force_mode)
+ {
+     int fd;
+-	struct stat sb_create;
+-	int acl_set = 0;
+-
+-	fd = open(fileName, (flags | O_EXCL | O_NOFOLLOW),
+-		(S_IRUSR | S_IWUSR) & sb->st_mode);
++    int acl_set = 0;
++    struct stat sb_create;
++    char template[PATH_MAX + 1];
++    mode_t umask_value;
++    snprintf(template, PATH_MAX, "%s/logrotate_temp.XXXXXX", ourDirName(fileName));
++    umask_value = umask(0000);
++    fd = mkostemp(template, (flags | O_EXCL | O_NOFOLLOW));
++    umask(umask_value);
+ 
+     if (fd < 0) {
+-	message(MESS_ERROR, "error creating output file %s: %s\n",
+-		fileName, strerror(errno));
++       message(MESS_ERROR, "error creating unique temp file: %s\n",
++       strerror(errno));
+ 	return -1;
+     }
+     if (fchmod(fd, (S_IRUSR | S_IWUSR) & sb->st_mode)) {
+@@ -425,6 +428,12 @@
+ 		return -1;
+ 		}
+ 	}
++    if (rename(template, fileName)) {
++        message(MESS_ERROR, "error renaming temp file to %s: %s\n",
++        fileName, strerror(errno));
++        close(fd);
++        return -1;
++    }
+ 
+     return fd;
+ }
diff --git a/app-admin/logrotate/files/logrotate-3.9.2-fbsd.patch b/app-admin/logrotate/files/logrotate-3.9.2-fbsd.patch
new file mode 100644
index 0000000..5f60596
--- /dev/null
+++ b/app-admin/logrotate/files/logrotate-3.9.2-fbsd.patch
@@ -0,0 +1,57 @@
+diff -Nuar a/config.c b/config.c
+--- a/config.c	2016-01-25 19:50:48.840034001 +0100
++++ b/config.c	2016-01-25 19:54:37.170038598 +0100
+@@ -1,6 +1,6 @@
+ #include "queue.h"
+ /* Alloca is defined in stdlib.h in NetBSD */
+-#ifndef __NetBSD__
++#if !defined(__NetBSD__) && !defined(__FreeBSD__)
+ #include <alloca.h>
+ #endif
+ #include <limits.h>
+@@ -24,6 +24,10 @@
+ #include <fnmatch.h>
+ #include <sys/mman.h>
+ 
++#if !defined(PATH_MAX) && defined(__FreeBSD__)
++#include <sys/param.h>
++#endif
++
+ #include "basenames.h"
+ #include "log.h"
+ #include "logrotate.h"
+diff -Nuar a/logrotate.c b/logrotate.c
+--- a/logrotate.c	2016-01-20 10:47:36.000000000 +0100
++++ b/logrotate.c	2016-01-25 19:55:46.740039999 +0100
+@@ -1,6 +1,6 @@
+ #include "queue.h"
+ /* alloca() is defined in stdlib.h in NetBSD */
+-#ifndef __NetBSD__
++#if !defined(__NetBSD__) && !defined(__FreeBSD__)
+ #include <alloca.h>
+ #endif
+ #include <limits.h>
+@@ -26,6 +26,10 @@
+ #include <limits.h>
+ #endif
+ 
++#if !defined(PATH_MAX) && defined(__FreeBSD__)
++#include <sys/param.h>
++#endif
++
+ #include "basenames.h"
+ #include "log.h"
+ #include "logrotate.h"
+diff -Nuar a/Makefile b/Makefile
+--- a/Makefile	2016-01-20 10:47:36.000000000 +0100
++++ b/Makefile	2016-01-25 19:56:43.380041139 +0100
+@@ -22,7 +22,9 @@
+ 
+ ifeq ($(WITH_ACL),yes)
+ CFLAGS += -DWITH_ACL
++ifneq ($(OS_NAME),FreeBSD)
+ LOADLIBES += -lacl
++endif
+ # See pretest
+ TEST_ACL=1
+ else
diff --git a/app-admin/logrotate/files/logrotate-3.9.2-ignore-hidden.patch b/app-admin/logrotate/files/logrotate-3.9.2-ignore-hidden.patch
new file mode 100644
index 0000000..df1ed8d
--- /dev/null
+++ b/app-admin/logrotate/files/logrotate-3.9.2-ignore-hidden.patch
@@ -0,0 +1,15 @@
+diff -Nuar a/config.c b/config.c
+--- a/config.c	2016-01-20 10:47:36.000000000 +0100
++++ b/config.c	2016-01-25 19:50:48.840034001 +0100
+@@ -359,7 +359,10 @@
+ 	char *pattern;
+ 
+ 	/* Check if fname is '.' or '..'; if so, return false */
+-	if (fname[0] == '.' && (!fname[1] || (fname[1] == '.' && !fname[2])))
++   /* Don't include 'hidden' files either; this breaks Gentoo
++      portage config file management http://bugs.gentoo.org/87683 */
++   if (fname[0] == '.')
++
+ 		return 0;
+ 
+ 	/* Check if fname is ending in a taboo-extension; if so, return false */
diff --git a/app-admin/logrotate/files/logrotate-3.9.2-lfs.patch b/app-admin/logrotate/files/logrotate-3.9.2-lfs.patch
new file mode 100644
index 0000000..66ea73f
--- /dev/null
+++ b/app-admin/logrotate/files/logrotate-3.9.2-lfs.patch
@@ -0,0 +1,12 @@
+diff -Nuar a/configure.ac b/configure.ac
+--- a/configure.ac	2016-01-20 10:47:36.000000000 +0100
++++ b/configure.ac	2016-01-25 20:05:49.310052130 +0100
+@@ -10,6 +10,8 @@
+ AC_STRUCT_ST_BLKSIZE
+ AC_STRUCT_ST_BLOCKS
+ 
++AC_SYS_LARGEFILE
++
+ AC_CHECK_LIB([popt],[poptParseArgvString],,
+   AC_MSG_ERROR([libpopt required but not found]))
+ 
diff --git a/app-admin/logrotate/files/logrotate-3.9.2-noasprintf.patch b/app-admin/logrotate/files/logrotate-3.9.2-noasprintf.patch
new file mode 100644
index 0000000..f9e0769
--- /dev/null
+++ b/app-admin/logrotate/files/logrotate-3.9.2-noasprintf.patch
@@ -0,0 +1,55 @@
+diff -Nuar a/config.c b/config.c
+--- a/config.c	2016-01-25 19:54:37.170038598 +0100
++++ b/config.c	2016-01-25 19:58:56.040043810 +0100
+@@ -49,39 +49,6 @@
+ #include "asprintf.c"
+ #endif
+
+-#if !defined(asprintf) && !defined(_FORTIFY_SOURCE)
+-#include <stdarg.h>
+-
+-int asprintf(char **string_ptr, const char *format, ...)
+-{
+-	va_list arg;
+-	char *str;
+-	int size;
+-	int rv;
+-
+-	va_start(arg, format);
+-	size = vsnprintf(NULL, 0, format, arg);
+-	size++;
+-	va_start(arg, format);
+-	str = malloc(size);
+-	if (str == NULL) {
+-		va_end(arg);
+-		/*
+-		 * Strictly speaking, GNU asprintf doesn't do this,
+-		 * but the caller isn't checking the return value.
+-		 */
+-		fprintf(stderr, "failed to allocate memory\\n");
+-		exit(1);
+-	}
+-	rv = vsnprintf(str, size, format, arg);
+-	va_end(arg);
+-
+-	*string_ptr = str;
+-	return (rv);
+-}
+-
+-#endif
+-
+ #if !defined(strndup)
+ char *strndup(const char *s, size_t n)
+ {
+diff -Nuar a/logrotate.h b/logrotate.h
+--- a/logrotate.h	2016-01-20 10:47:36.000000000 +0100
++++ b/logrotate.h	2016-01-25 19:59:39.760044690 +0100
+@@ -80,8 +80,5 @@
+ extern int debug;
+ 
+ int readAllConfigPaths(const char **paths);
+-#if !defined(asprintf) && !defined(_FORTIFY_SOURCE)
+-int asprintf(char **string_ptr, const char *format, ...);
+-#endif
+ 
+ #endif
diff --git a/app-admin/logrotate/logrotate-3.9.1-r1.ebuild b/app-admin/logrotate/logrotate-3.9.1-r1.ebuild
index 44e6437..34fca02 100644
--- a/app-admin/logrotate/logrotate-3.9.1-r1.ebuild
+++ b/app-admin/logrotate/logrotate-3.9.1-r1.ebuild
@@ -12,7 +12,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="acl +cron selinux"
 
 CDEPEND="
diff --git a/app-admin/logrotate/logrotate-3.9.2.ebuild b/app-admin/logrotate/logrotate-3.9.2.ebuild
new file mode 100644
index 0000000..25550cc
--- /dev/null
+++ b/app-admin/logrotate/logrotate-3.9.2.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools eutils toolchain-funcs flag-o-matic
+
+DESCRIPTION="Rotates, compresses, and mails system logs"
+HOMEPAGE="https://fedorahosted.org/logrotate/"
+SRC_URI="https://github.com/logrotate/logrotate/archive/${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="acl +cron selinux"
+
+CDEPEND="
+	>=dev-libs/popt-1.5
+	selinux? (
+		sys-libs/libselinux
+	)
+	acl? ( virtual/acl )"
+
+DEPEND="${CDEPEND}
+	>=sys-apps/sed-4"
+
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-logrotate )
+	cron? ( virtual/cron )"
+
+install_cron_file() {
+	exeinto /etc/cron.daily
+	newexe "${S}"/examples/logrotate.cron "${PN}"
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-ignore-hidden.patch \
+		"${FILESDIR}"/${P}-fbsd.patch \
+		"${FILESDIR}"/${P}-noasprintf.patch \
+		"${FILESDIR}"/${P}-atomic-create.patch \
+		"${FILESDIR}"/${P}-Werror.patch \
+		"${FILESDIR}"/${P}-lfs.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_with acl) $(use_with selinux)
+}
+
+src_compile() {
+	emake ${myconf} RPM_OPT_FLAGS="${CFLAGS}"
+}
+
+src_test() {
+	emake test
+}
+
+src_install() {
+	insinto /usr
+	dosbin logrotate
+	doman logrotate.8
+	dodoc CHANGES examples/logrotate*
+
+	insinto /etc
+	doins "${FILESDIR}"/logrotate.conf
+
+	use cron && install_cron_file
+
+	keepdir /etc/logrotate.d
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog "If you wish to have logrotate e-mail you updates, please"
+		elog "emerge virtual/mailx and configure logrotate in"
+		elog "/etc/logrotate.conf appropriately"
+		elog
+		elog "Additionally, /etc/logrotate.conf may need to be modified"
+		elog "for your particular needs.  See man logrotate for details."
+	fi
+}
diff --git a/app-admin/logrotate/metadata.xml b/app-admin/logrotate/metadata.xml
index f92e835..e8db975 100644
--- a/app-admin/logrotate/metadata.xml
+++ b/app-admin/logrotate/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>nimiux@gentoo.org</email>
 		<name>Chema Alonso</name>
 	</maintainer>
diff --git a/app-admin/logsentry/metadata.xml b/app-admin/logsentry/metadata.xml
index d635429..2a61753 100644
--- a/app-admin/logsentry/metadata.xml
+++ b/app-admin/logsentry/metadata.xml
@@ -1,10 +1,6 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<name>Default assignee for orphaned packages</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">sentrytools</remote-id>
 	</upstream>
diff --git a/app-admin/logstalgia/metadata.xml b/app-admin/logstalgia/metadata.xml
index 38b9e1f..788aa1a 100644
--- a/app-admin/logstalgia/metadata.xml
+++ b/app-admin/logstalgia/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>pinkbyte@gentoo.org</email>
     <name>Sergey Popov</name>
   </maintainer>
diff --git a/app-admin/logstash-bin/Manifest b/app-admin/logstash-bin/Manifest
index 6e4440e..69219d7 100644
--- a/app-admin/logstash-bin/Manifest
+++ b/app-admin/logstash-bin/Manifest
@@ -1,3 +1,4 @@
-DIST logstash-1.4.5.tar.gz 73896488 SHA256 ddb6fd2d26e87b13d87fa1495492a7346d45267df46eed29503df08d3e5d8a13 SHA512 b71b818dfb681459cc7cdd39d241b46c8bc905b4f26af377058feb78c9b9f3528059d136605685f24e7af1f2c190fa93557b0876765d78fc1f7cce32640a2593 WHIRLPOOL 7fa1189120fbfac487471261ae1a10e55986bee924df8356169d88ee37ef578607323316156ecbaa64e7e4f9fe9c1a70f475529f61f9977ac9287a484d2321cb
-DIST logstash-1.5.4.tar.gz 91956015 SHA256 f03075ee534ce6e7667679447f56543ce05cebbdb7b65a9396a5e538bf3e9fa8 SHA512 b20a8de5e22f82e6ddc03bae16d6ca01ab1fbff695a7fd0148feee9f8903c3805c45f296bceada6688fbcc86b8e318daaebcb6d67c2a6cd8d0cc3bdd8a3bf757 WHIRLPOOL 470e0a29b928690187ef17297393e702fc015c6a476e75b28d1abddc4082e0da0bd27f0fca5c2f81a207aeb0303e78ff6761126e08a800b3eb989710486f717c
-DIST logstash-1.5.5.tar.gz 89853616 SHA256 511c604ef096e6486cfbde83468cabad8f132401d32ae8f269c9144c959dd66e SHA512 badd0f78f3f48abc0d55c390e031b43a399301421b00f40d0a291629c49b58feb13ac292b567f334699194f4d035aec3d296ab4b95a375a1bda249d7a100f9a5 WHIRLPOOL 0f7bf4b26acabfba7e217b260a243e3c8455fbc876567b2c74372857db66cf4afd9c3a9033c82afa1ea4e0f635dbe33de8d1771fa7d470963584792651b70cc0
+DIST logstash-1.5.6.tar.gz 89916973 SHA256 812a809597c7ce00c869e5bb4f87870101fe6a43a2c2a6586f5cc4d1a4986092 SHA512 be28d9488d6c9bb7c993f922357edeea0229f0e92ad218da02376fb855ed211c076d099ce658d28e217462531b2ac9aeec0faf9a26ae254d118fa62f168496fb WHIRLPOOL 01d5467ecb099a78a9fe2e43c47fca1c0aa8c452d41863085d96188ee7cd719240809e1143905ebdb9f717d7eab8dbfaadbed49b260854090bee6d22240c688f
+DIST logstash-2.1.0.tar.gz 73512846 SHA256 1f132e0fc9fc46ebe836951bb44c5cd1a5f8e3f653bb44bded55300cc6c892dc SHA512 218355af77957a050bff262c1f0f9b516a9c8223a22a768d1c1a3c222c4d9e3ac67871608e6f34787a1926ac2ad2374ca0280a8a122a93b4e846c780c517984a WHIRLPOOL c22840cfadbc63490ee8e0a9ed101dcd9f3c06eca4d7b3359ae84073da6d9bb5712af1599357ff875b67eb55ad5d3e6e39634266e7e57024b4f97c23667e3b4a
+DIST logstash-2.1.1.tar.gz 73842493 SHA256 2ea975e16a02b416a5bd9eed5ab280224820f278d54f6e0ec4cccf0d8f5ca610 SHA512 5ef39ee5d6b5335bffc67450fbfd984aa513b2f4c8e7bf56cd3dacc876be7095195a40e2c7d17cc2f85c4d6b1b7ef5f0ae8953e4fc9642002d1dc17e36dcaed6 WHIRLPOOL e4737e1c1a12dea2bd11154dceb4754a5150f06a50cc9ed71c30f9749e6dea9c7484af82d341336527b3b85438f3c965c83eec8757f3fc19880fd60f5b1b1425
+DIST logstash-all-plugins-2.1.0.tar.gz 126053307 SHA256 090cca8b1d7584ed7f3a60abd4e5f4329cf36f41481de80982fee709e2febf58 SHA512 31232bdac13b8d342ac5d688c2fe0f60e6eede71e70c97d0a1e08527e1283ef348666f87d86f37e0c3208f56dc08595af18c924642fa94911f6fd19a39dab7f0 WHIRLPOOL 532676042bee4c120fdaf60c3d6cc528d6f9960d0c770bebfba773dd422663532c3f7de7b28baa085d3faaacd830a74e1f73f5020a5a9b7d48998dbdf931c117
diff --git a/app-admin/logstash-bin/files/agent.conf.sample-r2 b/app-admin/logstash-bin/files/agent.conf.sample-r2
new file mode 100644
index 0000000..96781bd
--- /dev/null
+++ b/app-admin/logstash-bin/files/agent.conf.sample-r2
@@ -0,0 +1,20 @@
+input {
+    stdin {
+        type => "stdin"
+    }
+
+    file {
+        type => "syslog"
+        path => [ "/var/log/*.log", "/var/log/debug", "/var/log/messages", "/var/log/syslog" ]
+    }
+}
+
+output {
+    stdout {
+        codec => rubydebug
+    }
+  
+    elasticsearch {
+        hosts => localhost
+    }
+}
diff --git a/app-admin/logstash-bin/files/logstash.confd b/app-admin/logstash-bin/files/logstash.confd
deleted file mode 100644
index 29f4d1c..0000000
--- a/app-admin/logstash-bin/files/logstash.confd
+++ /dev/null
@@ -1,2 +0,0 @@
-#LOGSTASH_USER=""
-#LOGSTASH_GROUP=""
diff --git a/app-admin/logstash-bin/files/logstash.confd-r2 b/app-admin/logstash-bin/files/logstash.confd-r2
new file mode 100644
index 0000000..cb68395
--- /dev/null
+++ b/app-admin/logstash-bin/files/logstash.confd-r2
@@ -0,0 +1,9 @@
+#LS_USER="root"
+#LS_GROUP="root"
+#LS_CONFDIR="/etc/logstash/conf.d"
+#LS_LOGFILE="/var/log/logstash/logstash.log"
+#LS_PIDFILE="/run/logstash/logstash.pid"
+#LS_HEAP_SIZE="500m"
+#LS_NICE=19
+#LS_OPEN_FILES=16384
+#LS_OPTS=""
diff --git a/app-admin/logstash-bin/files/logstash.initd b/app-admin/logstash-bin/files/logstash.initd
deleted file mode 100644
index 08b063f..0000000
--- a/app-admin/logstash-bin/files/logstash.initd
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-LOGSTASH_USER=${LOGSTASH_USER:-root}
-LOGSTASH_GROUP=${LOGSTASH_GROUP:-root}
-LOGFILE="/var/log/logstash/logstash.log"
-
-command="/opt/logstash/bin/logstash"
-command_args="agent --config /etc/logstash/conf.d/*.conf --log ${LOGFILE}"
-extra_commands="checkconfig"
-command_background="true"
-start_stop_daemon_args="--user=\"${LOGSTASH_USER}\""
-pidfile="/run/logstash/logstash.pid"
-
-depend() {
-	use net
-	after elasticsearch
-}
-
-checkconfig() {
-	ebegin "Checking your configuration"
-	${command} ${command_args} --configtest
-	eend $? "Configuration error. Please fix your configuration files."
-}
-
-start_pre() {
-	checkconfig || return 1
-
-	checkpath -d -o "${LOGSTASH_USER}":"${LOGSTASH_GROUP}" -m750 "$(dirname "${pidfile}")"
-	checkpath -d -o "${LOGSTASH_USER}":"${LOGSTASH_GROUP}" -m750 "$(dirname "${LOGFILE}")"
-	checkpath -f -o "${LOGSTASH_USER}":"${LOGSTASH_GROUP}" -m640 "${LOGFILE}"
-}
diff --git a/app-admin/logstash-bin/files/logstash.initd-r2 b/app-admin/logstash-bin/files/logstash.initd-r2
new file mode 100644
index 0000000..e4abf59
--- /dev/null
+++ b/app-admin/logstash-bin/files/logstash.initd-r2
@@ -0,0 +1,49 @@
+#!/sbin/openrc-run
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+LS_USER="${LS_USER:-root}"
+LS_GROUP="${LS_GROUP:-root}"
+LS_CONFDIR="${LS_CONFDIR:-/etc/logstash/conf.d}"
+LS_LOGFILE="${LS_LOGFILE:-/var/log/logstash/logstash.log}"
+LS_PIDFILE="${LS_PIDFILE:-/run/logstash/logstash.pid}"
+LS_NICE="${LS_NICE:-19}"
+LS_OPEN_FILES="${LS_OPEN_FILES:-16384}"
+LS_HEAP_SIZE="${LS_HEAP_SIZE:-500m}"
+
+command="/opt/logstash/bin/logstash"
+command_args="agent --config ${LS_CONFDIR}/*.conf --log ${LS_LOGFILE} ${LS_OPTS}"
+extra_commands="checkconfig"
+command_background="true"
+start_stop_daemon_args="--nicelevel ${LS_NICE} \
+	--user ${LS_USER}:${LS_GROUP} \
+	--env LS_HEAP_SIZE=${LS_HEAP_SIZE}"
+pidfile="${LS_PIDFILE}"
+
+depend() {
+	use net
+	after elasticsearch
+}
+
+checkconfig() {
+	ebegin "Checking your configuration"
+	${command} ${command_args} --configtest
+	eend $? "Configuration error. Please fix your configuration files."
+}
+
+start_pre() {
+	checkconfig || return 1
+
+	checkpath -d -o "${LS_USER}":"${LS_GROUP}" -m750 "$(dirname "${LS_PIDFILE}")"
+	checkpath -d -o "${LS_USER}":"${LS_GROUP}" -m750 "$(dirname "${LS_LOGFILE}")"
+	checkpath -f -o "${LS_USER}":"${LS_GROUP}" -m640 "${LS_LOGFILE}"
+
+	rc_ulimit="-n ${LS_OPEN_FILES}"
+}
+
+stop() {
+	ebegin "Stopping logstash"
+	start-stop-daemon --stop \
+		--pidfile="${LS_PIDFILE}" \
+		--retry=TERM/5/KILL/5
+}
diff --git a/app-admin/logstash-bin/logstash-bin-1.4.5.ebuild b/app-admin/logstash-bin/logstash-bin-1.4.5.ebuild
deleted file mode 100644
index 027faae..0000000
--- a/app-admin/logstash-bin/logstash-bin-1.4.5.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MY_PN="${PN/-bin}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Tool for managing events and logs"
-HOMEPAGE="https://www.elastic.co/products/logstash"
-SRC_URI="https://download.elastic.co/${MY_PN}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND=""
-RDEPEND="|| ( virtual/jre:1.8 virtual/jre:1.7 )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins}
-	keepdir "/var/log/${MY_PN}"
-
-	insinto "/etc/${MY_PN}/conf.d"
-	doins "${FILESDIR}/agent.conf.sample"
-
-	insinto "/opt/${MY_PN}"
-	doins -r .
-	fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}"
-
-	insinto /etc/logrotate.d
-	doins "${FILESDIR}/${MY_PN}.logrotate"
-
-	newconfd "${FILESDIR}/${MY_PN}.confd" "${MY_PN}"
-	newinitd "${FILESDIR}/${MY_PN}.initd" "${MY_PN}"
-}
-
-pkg_postinst() {
-	einfo "Getting started with logstash:"
-	einfo "  https://www.elastic.co/guide/en/logstash/current/getting-started-with-logstash.html"
-	einfo ""
-	einfo "Packages that might be interesting:"
-	einfo "  app-misc/elasticsearch"
-	einfo "  dev-python/elasticsearch-curator"
-	einfo "  www-apps/kibana-bin"
-}
diff --git a/app-admin/logstash-bin/logstash-bin-1.5.4.ebuild b/app-admin/logstash-bin/logstash-bin-1.5.4.ebuild
deleted file mode 100644
index 18df7a3..0000000
--- a/app-admin/logstash-bin/logstash-bin-1.5.4.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MY_PN="${PN/-bin}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Tool for managing events and logs"
-HOMEPAGE="https://www.elastic.co/products/logstash"
-SRC_URI="https://download.elastic.co/${MY_PN}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RESTRICT="strip"
-QA_PREBUILT="opt/logstash/vendor/jruby/lib/jni/*/libjffi*.so"
-
-DEPEND=""
-RDEPEND="|| ( virtual/jre:1.8 virtual/jre:1.7 )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins}
-	keepdir "/var/log/${MY_PN}"
-
-	insinto "/etc/${MY_PN}/conf.d"
-	doins "${FILESDIR}/agent.conf.sample"
-
-	insinto "/opt/${MY_PN}"
-	doins -r .
-	fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}" "/opt/${MY_PN}/vendor/jruby/bin/jruby"
-
-	insinto /etc/logrotate.d
-	doins "${FILESDIR}/${MY_PN}.logrotate"
-
-	newconfd "${FILESDIR}/${MY_PN}.confd" "${MY_PN}"
-	newinitd "${FILESDIR}/${MY_PN}.initd" "${MY_PN}"
-}
-
-pkg_postinst() {
-	einfo "Getting started with logstash:"
-	einfo "  https://www.elastic.co/guide/en/logstash/current/getting-started-with-logstash.html"
-	einfo ""
-	einfo "Packages that might be interesting:"
-	einfo "  app-misc/elasticsearch"
-	einfo "  dev-python/elasticsearch-curator"
-	einfo "  www-apps/kibana-bin"
-}
diff --git a/app-admin/logstash-bin/logstash-bin-1.5.5.ebuild b/app-admin/logstash-bin/logstash-bin-1.5.5.ebuild
deleted file mode 100644
index a7e0cac..0000000
--- a/app-admin/logstash-bin/logstash-bin-1.5.5.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MY_PN="${PN/-bin}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Tool for managing events and logs"
-HOMEPAGE="https://www.elastic.co/products/logstash"
-SRC_URI="https://download.elastic.co/${MY_PN}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RESTRICT="strip"
-QA_PREBUILT="opt/logstash/vendor/jruby/lib/jni/*/libjffi*.so"
-
-DEPEND=""
-RDEPEND="|| ( virtual/jre:1.8 virtual/jre:1.7 )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins}
-	keepdir "/var/log/${MY_PN}"
-
-	insinto "/etc/${MY_PN}/conf.d"
-	doins "${FILESDIR}/agent.conf.sample"
-
-	insinto "/opt/${MY_PN}"
-	doins -r .
-	fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}" "/opt/${MY_PN}/vendor/jruby/bin/jruby"
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${MY_PN}.logrotate" "${MY_PN}"
-
-	newconfd "${FILESDIR}/${MY_PN}.confd-r1" "${MY_PN}"
-	newinitd "${FILESDIR}/${MY_PN}.initd-r1" "${MY_PN}"
-}
-
-pkg_postinst() {
-	einfo "Getting started with logstash:"
-	einfo "  https://www.elastic.co/guide/en/logstash/current/getting-started-with-logstash.html"
-	einfo ""
-	einfo "Packages that might be interesting:"
-	einfo "  app-misc/elasticsearch"
-	einfo "  dev-python/elasticsearch-curator"
-	einfo "  www-apps/kibana-bin"
-}
diff --git a/app-admin/logstash-bin/logstash-bin-1.5.6.ebuild b/app-admin/logstash-bin/logstash-bin-1.5.6.ebuild
new file mode 100644
index 0000000..8e718ea
--- /dev/null
+++ b/app-admin/logstash-bin/logstash-bin-1.5.6.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_PN="${PN/-bin}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Tool for managing events and logs"
+HOMEPAGE="https://www.elastic.co/products/logstash"
+SRC_URI="https://download.elastic.co/${MY_PN}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RESTRICT="strip"
+QA_PREBUILT="opt/logstash/vendor/jruby/lib/jni/*/libjffi*.so"
+
+DEPEND=""
+RDEPEND="|| ( virtual/jre:1.8 virtual/jre:1.7 )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins}
+	keepdir "/var/log/${MY_PN}"
+
+	insinto "/etc/${MY_PN}/conf.d"
+	doins "${FILESDIR}/agent.conf.sample"
+
+	insinto "/opt/${MY_PN}"
+	doins -r .
+	fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}" "/opt/${MY_PN}/vendor/jruby/bin/jruby"
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${MY_PN}.logrotate" ${MY_PN}
+
+	newconfd "${FILESDIR}/${MY_PN}.confd-r1" ${MY_PN}
+	newinitd "${FILESDIR}/${MY_PN}.initd-r1" ${MY_PN}
+}
+
+pkg_postinst() {
+	einfo "Getting started with logstash:"
+	einfo "  https://www.elastic.co/guide/en/logstash/current/getting-started-with-logstash.html"
+	einfo ""
+	einfo "Packages that might be interesting:"
+	einfo "  app-misc/elasticsearch"
+	einfo "  dev-python/elasticsearch-curator"
+	einfo "  www-apps/kibana-bin"
+}
diff --git a/app-admin/logstash-bin/logstash-bin-2.1.0.ebuild b/app-admin/logstash-bin/logstash-bin-2.1.0.ebuild
new file mode 100644
index 0000000..f165b2a
--- /dev/null
+++ b/app-admin/logstash-bin/logstash-bin-2.1.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_PN="${PN/-bin}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Tool for managing events and logs"
+HOMEPAGE="https://www.elastic.co/products/logstash"
+SRC_URI="standard? ( https://download.elastic.co/${MY_PN}/${MY_PN}/${MY_P}.tar.gz )
+	all-plugins? ( https://download.elastic.co/${MY_PN}/${MY_PN}/${MY_PN}-all-plugins-${PV}.tar.gz )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+standard all-plugins"
+
+RESTRICT="strip"
+QA_PREBUILT="opt/logstash/vendor/jruby/lib/jni/*/libjffi*.so"
+
+DEPEND=""
+RDEPEND="|| ( virtual/jre:1.8 virtual/jre:1.7 )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	if use standard && use all-plugins; then
+		die "Both standard and all-plugins USE selected, please pick just one."
+	fi
+}
+
+src_install() {
+	keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins}
+	keepdir "/var/log/${MY_PN}"
+
+	insinto "/etc/${MY_PN}/conf.d"
+	newins "${FILESDIR}/agent.conf.sample-r2" agent.conf.sample
+
+	insinto "/opt/${MY_PN}"
+	doins -r .
+	fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}" "/opt/${MY_PN}/vendor/jruby/bin/jruby"
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${MY_PN}.logrotate" ${MY_PN}
+
+	newconfd "${FILESDIR}/${MY_PN}.confd-r2" ${MY_PN}
+	newinitd "${FILESDIR}/${MY_PN}.initd-r2" ${MY_PN}
+}
+
+pkg_postinst() {
+	einfo "Getting started with logstash:"
+	einfo "  https://www.elastic.co/guide/en/logstash/current/getting-started-with-logstash.html"
+	einfo ""
+	einfo "Packages that might be interesting:"
+	einfo "  app-misc/elasticsearch"
+	einfo "  dev-python/elasticsearch-curator"
+	einfo "  www-apps/kibana-bin"
+}
diff --git a/app-admin/logstash-bin/logstash-bin-2.1.1.ebuild b/app-admin/logstash-bin/logstash-bin-2.1.1.ebuild
new file mode 100644
index 0000000..f7b2060
--- /dev/null
+++ b/app-admin/logstash-bin/logstash-bin-2.1.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_PN="${PN/-bin}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Tool for managing events and logs"
+HOMEPAGE="https://www.elastic.co/products/logstash"
+SRC_URI="https://download.elastic.co/${MY_PN}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RESTRICT="strip"
+QA_PREBUILT="opt/logstash/vendor/jruby/lib/jni/*/libjffi*.so"
+
+DEPEND=""
+RDEPEND="|| ( virtual/jre:1.8 virtual/jre:1.7 )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins}
+	keepdir "/var/log/${MY_PN}"
+
+	insinto "/etc/${MY_PN}/conf.d"
+	newins "${FILESDIR}/agent.conf.sample-r2" agent.conf.sample
+
+	insinto "/opt/${MY_PN}"
+	doins -r .
+	fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}" "/opt/${MY_PN}/vendor/jruby/bin/jruby"
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${MY_PN}.logrotate" ${MY_PN}
+
+	newconfd "${FILESDIR}/${MY_PN}.confd-r2" ${MY_PN}
+	newinitd "${FILESDIR}/${MY_PN}.initd-r2" ${MY_PN}
+}
+
+pkg_postinst() {
+	einfo "Getting started with logstash:"
+	einfo "  https://www.elastic.co/guide/en/logstash/current/getting-started-with-logstash.html"
+	einfo ""
+	einfo "Packages that might be interesting:"
+	einfo "  app-misc/elasticsearch"
+	einfo "  dev-python/elasticsearch-curator"
+	einfo "  www-apps/kibana-bin"
+}
diff --git a/app-admin/logstash-bin/metadata.xml b/app-admin/logstash-bin/metadata.xml
index df4f520..f65dbed 100644
--- a/app-admin/logstash-bin/metadata.xml
+++ b/app-admin/logstash-bin/metadata.xml
@@ -1,14 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
-	<maintainer>
-		<email>idella4@gentoo.org</email>
-		<name>Ian Delaney</name>
-        </maintainer>
-        <maintainer>
-                <email>hydrapolic@gmail.com</email>
-                <name>Tomas Mozes</name>
-                <description>Proxy maintainer</description>
-        </maintainer>
+	<maintainer type="person">
+		<email>hydrapolic@gmail.com</email>
+		<name>Tomas Mozes</name>
+		<description>Proxy maintainer</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<use>
+		<flag name="standard">standard distribution package</flag>
+		<flag name="all-plugins">contains the standard distribution package plus all plugins</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">elastic/logstash</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-admin/logstash-forwarder/metadata.xml b/app-admin/logstash-forwarder/metadata.xml
index 8686ab8..0110cb9 100644
--- a/app-admin/logstash-forwarder/metadata.xml
+++ b/app-admin/logstash-forwarder/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>aidecoe@gentoo.org</email>
     <name>Amadeusz Żołnowski</name>
   </maintainer>
diff --git a/app-admin/logsurfer+/metadata.xml b/app-admin/logsurfer+/metadata.xml
index 2e90b80..097975e 100644
--- a/app-admin/logsurfer+/metadata.xml
+++ b/app-admin/logsurfer+/metadata.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>
-
diff --git a/app-admin/longrun/metadata.xml b/app-admin/longrun/metadata.xml
index caa1059..01147b1 100644
--- a/app-admin/longrun/metadata.xml
+++ b/app-admin/longrun/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription>
 Longrun is a user space utility program for controlling the Longrun
 thermal and power save functionalities found in the processors made
diff --git a/app-admin/lsat/metadata.xml b/app-admin/lsat/metadata.xml
index 8bd21ed..340856e 100644
--- a/app-admin/lsat/metadata.xml
+++ b/app-admin/lsat/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<longdescription lang="en">
@@ -8,10 +8,6 @@
 		expanded to work with Linux distributions other than Red Hat, and checks
 		for kernel versions.
 	</longdescription>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<name>Default assignee for orphaned packages</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">usat</remote-id>
 	</upstream>
diff --git a/app-admin/lsyncd/metadata.xml b/app-admin/lsyncd/metadata.xml
index 8716f56..0fba30b 100644
--- a/app-admin/lsyncd/metadata.xml
+++ b/app-admin/lsyncd/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="google-code">lsyncd</remote-id>
 		<remote-id type="github">axkibe/lsyncd</remote-id>
diff --git a/app-admin/makepasswd/metadata.xml b/app-admin/makepasswd/metadata.xml
index 1884a0f..48fe1ac 100644
--- a/app-admin/makepasswd/metadata.xml
+++ b/app-admin/makepasswd/metadata.xml
@@ -4,7 +4,7 @@
 	<longdescription lang="en">
 		A random password generator, for all your secure password needs.
 	</longdescription>
-	<maintainer>
+	<maintainer type="person">
 		<email>xmw@gentoo.org</email>
 		<name>Michael Weber</name>
 	</maintainer>
diff --git a/app-admin/mate-system-tools/Manifest b/app-admin/mate-system-tools/Manifest
index 72ce641..b31f0ac 100644
--- a/app-admin/mate-system-tools/Manifest
+++ b/app-admin/mate-system-tools/Manifest
@@ -1,2 +1 @@
-DIST mate-system-tools-1.8.0.tar.xz 4338404 SHA256 7cfeec1d0a5c237fa8b67121bf1bfcc26665c54ce040d30d75c542799840dbfd SHA512 deec649a1ea4c37b3bdbf93fe4cdf331685e2c76e0fbf67303ac678bfec733a1fcac01bd578cb93a67df939bc1452a4cc4154b1505edcd6e87a1dbcc328c6c8d WHIRLPOOL 9d0660a2ea2f6ff6aa456af74db21da471e14c4e1215ba49aeb4c0ffa29752a9079ace2e22430ff7058d79a84997e264150d6b797496cc87be24720302f5629e
 DIST mate-system-tools-1.8.1.tar.xz 4348304 SHA256 c5f1faee761deb679f7a37607cc7166ea81b7d16a7fbc05951b32f119bcb944e SHA512 a2cda52ebab386ebbf6c01288741f59914c8fe8a672a1220b0a8cc44afb51058e8545f385f4d5dab650bc36c3c18ad9519580ce255b4c607131c2c5dd3ce15ce WHIRLPOOL ba486ffcc9dd25aa10858e3b09a046eadbe99a11d4e98c872dd14b91002e9e62a17d88744707ef8fac80b44e27d6402b4532d77d30f6ce0f905335d0e9eee7d2
diff --git a/app-admin/mate-system-tools/files/mate-system-tools-1.6.0-Update-POTFILES-skip.patch b/app-admin/mate-system-tools/files/mate-system-tools-1.6.0-Update-POTFILES-skip.patch
deleted file mode 100644
index ee89cf5..0000000
--- a/app-admin/mate-system-tools/files/mate-system-tools-1.6.0-Update-POTFILES-skip.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 0dc126ba76d32a66c73daa5c2a93980efbc1264e Mon Sep 17 00:00:00 2001
-From: Stefano Karapetsas <stefano@karapetsas.com>
-Date: Sat, 25 Jan 2014 12:29:44 +0100
-Subject: [PATCH] Update POTFILES.skip
-
----
- po/POTFILES.skip | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/po/POTFILES.skip b/po/POTFILES.skip
-index a6a3e9f..d54118d 100644
---- a/po/POTFILES.skip
-+++ b/po/POTFILES.skip
-@@ -6,11 +6,11 @@ interfaces/services.glade
- interfaces/shares.glade
- interfaces/time.glade
- interfaces/users.glade
--src/network/network.desktop.in
--src/services/services.desktop.in
--src/shares/shares.desktop.in
--src/time/time.desktop.in
--src/users/users.desktop.in
-+src/network/mate-network.desktop.in
-+src/services/mate-services.desktop.in
-+src/shares/mate-shares.desktop.in
-+src/time/mate-time.desktop.in
-+src/users/mate-users.desktop.in
- interfaces/disks.glade.in
- src/disks/callbacks.c
- src/disks/disks-cdrom-disc.c
--- 
-1.8.5.5
diff --git a/app-admin/mate-system-tools/mate-system-tools-1.8.0.ebuild b/app-admin/mate-system-tools/mate-system-tools-1.8.0.ebuild
deleted file mode 100644
index 2fcb75e..0000000
--- a/app-admin/mate-system-tools/mate-system-tools-1.8.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 versionator
-
-MATE_BRANCH="$(get_version_component_range 1-2)"
-
-SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${P}.tar.xz"
-DESCRIPTION="Tools aimed to make easy the administration of UNIX systems"
-HOMEPAGE="http://mate-desktop.org"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="caja nfs policykit samba"
-
-RDEPEND="app-text/rarian:0
-	>=app-admin/system-tools-backends-2.10.1:0
-	dev-libs/atk:0
-	dev-libs/dbus-glib:0
-	>=dev-libs/glib-2.25.3:2
-	>=dev-libs/liboobs-1.1:0
-	>=sys-apps/dbus-0.32:0
-	net-wireless/wireless-tools:0
-	sys-libs/cracklib:0
-	x11-libs/gdk-pixbuf:2
-	x11-libs/pango:0
-	>=x11-libs/gtk+-2.19.7:2
-	virtual/libintl:0
-	caja? ( >=mate-base/caja-1.8:0 )
-	nfs? ( net-fs/nfs-utils:0 )
-	policykit? (
-		>=mate-extra/mate-polkit-1.8:0
-		>=sys-auth/polkit-0.92:0
-	)
-	samba? ( >=net-fs/samba-3:0 )"
-
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	>=app-text/scrollkeeper-dtd-1:1.0
-	app-text/yelp-tools:0
-	sys-devel/gettext:*
-	virtual/pkgconfig:*
-	>=dev-util/intltool-0.35.0:*"
-
-src_configure() {
-	local myconf
-	if ! use nfs && ! use samba; then
-		myconf="--disable-shares"
-	fi
-
-	gnome2_src_configure \
-		${myconf} \
-		--disable-static \
-		$(use_enable policykit polkit-gtk-mate) \
-		$(use_enable caja)
-}
-
-DOCS="AUTHORS BUGS ChangeLog HACKING NEWS README TODO"
diff --git a/app-admin/mate-system-tools/metadata.xml b/app-admin/mate-system-tools/metadata.xml
index a405404..e03e999 100644
--- a/app-admin/mate-system-tools/metadata.xml
+++ b/app-admin/mate-system-tools/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>mate</herd>
+    <maintainer type="project">
+        <email>mate@gentoo.org</email>
+        <name>Gentoo MATE Desktop</name>
+    </maintainer>
     <longdescription>
 		Formerly known as the Ximian Setup Tools, the GST are a fully
 		integrated set of tools aimed to make easy the job that means the
diff --git a/app-admin/matter/metadata.xml b/app-admin/matter/metadata.xml
index f5967f8..20079f7 100644
--- a/app-admin/matter/metadata.xml
+++ b/app-admin/matter/metadata.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>lxnay@gentoo.org</email>
 		<name>Fabio Erculiani</name>
 	</maintainer>
 	<use>
-		<flag name='entropy'>Add Entropy support</flag>
+		<flag name="entropy">Add Entropy support</flag>
 	</use>
 </pkgmetadata>
-
diff --git a/app-admin/mcelog/metadata.xml b/app-admin/mcelog/metadata.xml
index df75688..f3f4947 100644
--- a/app-admin/mcelog/metadata.xml
+++ b/app-admin/mcelog/metadata.xml
@@ -1,17 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
-	<maintainer>
+	<maintainer type="person">
 		<email>hasufell@gentoo.org</email>
 		<name>Julian Ospald</name>
 		<description>Maintainer, assign bugs to him</description>
 	</maintainer>
-	<maintainer>
+	<maintainer type="person">
 		<email>bkohler@gmail.com</email>
 		<name>Ben Kohler</name>
 		<description>Proxy maintainer. CC him on bugs</description>
 	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription lang="en">
 		Starting with version 2.6.4, the Linux kernel for x86-64 no longer
 		decodes and logs recoverable Machine Check Exception events to the
diff --git a/app-admin/mcollective/metadata.xml b/app-admin/mcollective/metadata.xml
index c35f424..e16aaa5 100644
--- a/app-admin/mcollective/metadata.xml
+++ b/app-admin/mcollective/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>prometheanfire@gentoo.org</email>
 	</maintainer>
 	<use>
diff --git a/app-admin/metalog/metadata.xml b/app-admin/metalog/metadata.xml
index c0a75cd..e6a099e 100644
--- a/app-admin/metalog/metadata.xml
+++ b/app-admin/metalog/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>base-system</herd>
-	<maintainer>
+	<maintainer type="person">
 		<email>vapier@gentoo.org</email>
 	</maintainer>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">metalog</remote-id>
 	</upstream>
diff --git a/app-admin/mktwpol/metadata.xml b/app-admin/mktwpol/metadata.xml
index 3bb5601..5261d9f 100644
--- a/app-admin/mktwpol/metadata.xml
+++ b/app-admin/mktwpol/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>nimiux@gentoo.org</email>
 		<name>Chema Alonso</name>
 	</maintainer>
diff --git a/app-admin/mms-agent/metadata.xml b/app-admin/mms-agent/metadata.xml
index 480394a..7ad88a8 100644
--- a/app-admin/mms-agent/metadata.xml
+++ b/app-admin/mms-agent/metadata.xml
@@ -1,16 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
-	<maintainer>
+	<maintainer type="person">
 		<email>ultrabug@gentoo.org</email>
 		<name>Alexys Jacob</name>
 	</maintainer>
-	<maintainer>
+	<maintainer type="person">
 		<email>bugs@bergstroem.nu</email>
 		<name>Johan Bergström</name>
 		<description>Proxy Maintainer. CC on bugs</description>
 	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription lang="en">
 	MongoDB MMS agents collection.
 	</longdescription>
@@ -18,4 +21,3 @@
 		<flag name="monitoring">Install the monitoring agent</flag>
 	</use>
 </pkgmetadata>
-
diff --git a/app-admin/mongo-tools/Manifest b/app-admin/mongo-tools/Manifest
index 2e009da..0aed106 100644
--- a/app-admin/mongo-tools/Manifest
+++ b/app-admin/mongo-tools/Manifest
@@ -1,3 +1,3 @@
-DIST mongo-tools-3.0.5.tar.gz 2160877 SHA256 a0a46dabe493d32bda8dec4ca2e4b06c150b405d8184769d50936eb9bc6d126e SHA512 6434708f60c3edc08f439ecd1ae06f634a1897449f1244d9dc3c3024d6146329cfdadaff14a50ba7f35a4bee2bb302b00141d9f388d99a50c4391218c5e9d3e3 WHIRLPOOL d66563c12021bc84a951c7bd125827f958808e577c391252d815a89916fdb86187269d75f9d36a33828132d98040d328cc090ff4fdbc764e3bab15f5fcdb623c
-DIST mongo-tools-3.0.6.tar.gz 2161424 SHA256 ed4ebb42efe99f1eeac5ed128f4ae9b10e172396ad06eaae61d3a30c301c2a12 SHA512 ad9e635a6be911116e4a5ddaa4f509c6418036bf9fa4e1ea3940ce3bcc1a5479b403d26d2865b9938a66ed5b38ec4830b307baa7552cc4cf46cc0353dea8853f WHIRLPOOL 29e5364825795c5661ca595e294115d2a06ea43f0b0039bd56d31fd50c1325709a053ebbfc23d54954c4783229be218a6b426ffc6f301149fd946927aad62283
-DIST mongo-tools-3.0.7.tar.gz 2183495 SHA256 3136b8df6e7c81b5cf6609b3cd6113d69ea6c067d5bfd25b2e0dbabef9173ca0 SHA512 ff410f25a42e76f55716e6e478564aaeefd3999cf0e9db718969877709974d099c479690e81d6f639c27b0a4d9b59d193c43f1c31dc027b594f1fef33129cb5a WHIRLPOOL 3e3ac13de56c7abd5fd80dcfe5f94090aa78d240598ed0c879365b275bfab5da07aaf8c5b94ad27e3a6f7c0d24d6a68bbb5e54612b4fa2928efbf880c5c40dfc
+DIST mongo-tools-3.0.8.tar.gz 2185550 SHA256 b9860339ed59ed57bb29b26c820578c690baa2aaec98fe743561cc95023815f1 SHA512 95ea8377aef747f66ce827300cbc38bfa5b660ad25e4d66cf0dc9899cfe81ff2a67e9383a22c08158fed2d622a6f4d3b315e1234fb6118f246ef17f9cffa129a WHIRLPOOL 00298e54c8fd17a51a3293101defee94219c46929862695e08b2c21a66e59290b341f07c89add38dacfa8295c3fe83ce61cd3911e7489ddd75c2a65721910cce
+DIST mongo-tools-3.0.9.tar.gz 2185557 SHA256 41705fe815d189d6985ac6abad0b7467186488600cc3031732a25fea5c69a09f SHA512 d4b8d89242a0ab5b678eec7f9a75ad8cf199769046a399741960c605c7d0dc34d5f5e30d956ff4d51b01bc93b1841e132dc2daf6dade9b32d035f2c2f261e520 WHIRLPOOL ce8911d89d9874f1fbc18b63546b641866e94a7160edd705aece48f05b63a67dfc111cd44940a0956bc1d1e42431b33ea69d5f24eb216e99fcb080b55281ec89
+DIST mongo-tools-3.2.1.tar.gz 2226762 SHA256 e2a0527b8987ae954fc9ca071987b4c58ff53aa2bc0a4d8b03337f4d8aff1d89 SHA512 52e7402c232915e8bc481598a5f3a311ef7f4058448735ed14e142da180baf19aac95e641dbe58d0c71e114f35889d1cfa6a321114e4cf21edf7c525bf548249 WHIRLPOOL d0e30417f478c8f0aa7936638c0bec87f01dc278946dcde3187dbb060631126eaee2f0cdc535212cd2ad350f0c281d7398d66cb6416b7a0906d6c8e5d3cc5e19
diff --git a/app-admin/mongo-tools/metadata.xml b/app-admin/mongo-tools/metadata.xml
index 0f961a2..7a37500 100644
--- a/app-admin/mongo-tools/metadata.xml
+++ b/app-admin/mongo-tools/metadata.xml
@@ -1,16 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
-	<maintainer>
+	<maintainer type="person">
 		<email>ultrabug@gentoo.org</email>
 		<name>Alexys Jacob</name>
 	</maintainer>
-	<maintainer>
+	<maintainer type="person">
 		<email>bugs@bergstroem.nu</email>
 		<name>Johan Bergström</name>
 		<description>Proxy Maintainer. CC on bugs</description>
 	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription lang="en">
 	MongoDB operation tools such as mongodump, mongoexport, mongorestore, bsondump...
 	</longdescription>
diff --git a/app-admin/mongo-tools/mongo-tools-3.0.6.ebuild b/app-admin/mongo-tools/mongo-tools-3.0.6.ebuild
deleted file mode 100644
index 658782f..0000000
--- a/app-admin/mongo-tools/mongo-tools-3.0.6.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils
-
-MY_PV=${PV/_rc/-rc}
-MY_P=${PN}-r${MY_PV}
-
-DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
-HOMEPAGE="http://www.mongodb.org"
-SRC_URI="https://github.com/mongodb/mongo-tools/archive/r${MY_PV}.tar.gz -> mongo-tools-${MY_PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="sasl ssl"
-
-# Maintainer note:
-# openssl DEPEND constraint, see:
-# https://github.com/mongodb/mongo-tools/issues/11
-
-RDEPEND="!<dev-db/mongodb-3.0.0"
-DEPEND="${RDEPEND}
-	dev-lang/go:=
-	sasl? ( dev-libs/cyrus-sasl )
-	ssl? ( dev-libs/openssl )"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-3.0.0-build.patch"
-}
-
-src_compile() {
-	local myconf
-
-	if use sasl; then
-	  myconf="${myconf} sasl"
-	fi
-
-	if use ssl; then
-	  myconf="${myconf} ssl"
-	fi
-
-	./build.sh ${myconf}
-}
-
-src_install() {
-	dobin bin/*
-}
diff --git a/app-admin/mongo-tools/mongo-tools-3.0.7.ebuild b/app-admin/mongo-tools/mongo-tools-3.0.7.ebuild
deleted file mode 100644
index 658782f..0000000
--- a/app-admin/mongo-tools/mongo-tools-3.0.7.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils
-
-MY_PV=${PV/_rc/-rc}
-MY_P=${PN}-r${MY_PV}
-
-DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
-HOMEPAGE="http://www.mongodb.org"
-SRC_URI="https://github.com/mongodb/mongo-tools/archive/r${MY_PV}.tar.gz -> mongo-tools-${MY_PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="sasl ssl"
-
-# Maintainer note:
-# openssl DEPEND constraint, see:
-# https://github.com/mongodb/mongo-tools/issues/11
-
-RDEPEND="!<dev-db/mongodb-3.0.0"
-DEPEND="${RDEPEND}
-	dev-lang/go:=
-	sasl? ( dev-libs/cyrus-sasl )
-	ssl? ( dev-libs/openssl )"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-3.0.0-build.patch"
-}
-
-src_compile() {
-	local myconf
-
-	if use sasl; then
-	  myconf="${myconf} sasl"
-	fi
-
-	if use ssl; then
-	  myconf="${myconf} ssl"
-	fi
-
-	./build.sh ${myconf}
-}
-
-src_install() {
-	dobin bin/*
-}
diff --git a/app-admin/mongo-tools/mongo-tools-3.0.5.ebuild b/app-admin/mongo-tools/mongo-tools-3.0.8.ebuild
similarity index 100%
rename from app-admin/mongo-tools/mongo-tools-3.0.5.ebuild
rename to app-admin/mongo-tools/mongo-tools-3.0.8.ebuild
diff --git a/app-admin/mongo-tools/mongo-tools-3.0.9.ebuild b/app-admin/mongo-tools/mongo-tools-3.0.9.ebuild
new file mode 100644
index 0000000..0a92d4b
--- /dev/null
+++ b/app-admin/mongo-tools/mongo-tools-3.0.9.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+MY_PV=${PV/_rc/-rc}
+MY_P=${PN}-r${MY_PV}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="http://www.mongodb.org"
+SRC_URI="https://github.com/mongodb/mongo-tools/archive/r${MY_PV}.tar.gz -> mongo-tools-${MY_PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="sasl ssl"
+
+# Maintainer note:
+# openssl DEPEND constraint, see:
+# https://github.com/mongodb/mongo-tools/issues/11
+
+RDEPEND="!<dev-db/mongodb-3.0.0"
+DEPEND="${RDEPEND}
+	dev-lang/go:=
+	sasl? ( dev-libs/cyrus-sasl )
+	ssl? ( dev-libs/openssl )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-3.0.0-build.patch"
+}
+
+src_compile() {
+	local myconf
+
+	if use sasl; then
+	  myconf="${myconf} sasl"
+	fi
+
+	if use ssl; then
+	  myconf="${myconf} ssl"
+	fi
+
+	./build.sh ${myconf}
+}
+
+src_install() {
+	dobin bin/*
+}
diff --git a/app-admin/mongo-tools/mongo-tools-3.2.1.ebuild b/app-admin/mongo-tools/mongo-tools-3.2.1.ebuild
new file mode 100644
index 0000000..0a92d4b
--- /dev/null
+++ b/app-admin/mongo-tools/mongo-tools-3.2.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+MY_PV=${PV/_rc/-rc}
+MY_P=${PN}-r${MY_PV}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="http://www.mongodb.org"
+SRC_URI="https://github.com/mongodb/mongo-tools/archive/r${MY_PV}.tar.gz -> mongo-tools-${MY_PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="sasl ssl"
+
+# Maintainer note:
+# openssl DEPEND constraint, see:
+# https://github.com/mongodb/mongo-tools/issues/11
+
+RDEPEND="!<dev-db/mongodb-3.0.0"
+DEPEND="${RDEPEND}
+	dev-lang/go:=
+	sasl? ( dev-libs/cyrus-sasl )
+	ssl? ( dev-libs/openssl )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-3.0.0-build.patch"
+}
+
+src_compile() {
+	local myconf
+
+	if use sasl; then
+	  myconf="${myconf} sasl"
+	fi
+
+	if use ssl; then
+	  myconf="${myconf} ssl"
+	fi
+
+	./build.sh ${myconf}
+}
+
+src_install() {
+	dobin bin/*
+}
diff --git a/app-admin/monit/metadata.xml b/app-admin/monit/metadata.xml
index 8c3b267..582e37e 100644
--- a/app-admin/monit/metadata.xml
+++ b/app-admin/monit/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
                 <email>patrick@gentoo.org</email>
                 <name>Patrick Lauer</name>
 	</maintainer>
diff --git a/app-admin/monit/monit-5.15-r1.ebuild b/app-admin/monit/monit-5.15-r1.ebuild
new file mode 100644
index 0000000..cd3f4d3
--- /dev/null
+++ b/app-admin/monit/monit-5.15-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+inherit pam systemd
+
+DESCRIPTION="a utility for monitoring and managing daemons or similar programs running on a Unix system"
+HOMEPAGE="http://mmonit.com/monit/"
+SRC_URI="http://mmonit.com/monit/dist/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux"
+IUSE="libressl pam ssl"
+
+RDEPEND="
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl )
+	)"
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	sys-devel/bison
+	pam? ( virtual/pam )"
+
+src_prepare() {
+	sed -i -e '/^INSTALL_PROG/s/-s//' Makefile.in || die "sed failed in Makefile.in"
+}
+
+src_configure() {
+	econf $(use_with ssl) $(use_with pam)
+}
+
+src_install() {
+	default
+
+	dodoc README*
+	dohtml -r doc/*
+
+	insinto /etc; insopts -m600; doins monitrc
+	newinitd "${FILESDIR}"/monit.initd-5.0-r1 monit
+	systemd_dounit "${FILESDIR}"/${PN}.service
+
+	use pam && newpamd "${FILESDIR}"/${PN}.pamd ${PN}
+}
+
+pkg_postinst() {
+	elog "Sample configurations are available at:"
+	elog "http://mmonit.com/monit/documentation/"
+}
diff --git a/app-admin/monit/monit-5.15.ebuild b/app-admin/monit/monit-5.15.ebuild
index 70f94ad..c3245a4 100644
--- a/app-admin/monit/monit-5.15.ebuild
+++ b/app-admin/monit/monit-5.15.ebuild
@@ -11,7 +11,7 @@
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux"
 IUSE="pam ssl"
 
 RDEPEND="ssl? ( dev-libs/openssl:0= )"
diff --git a/app-admin/multilog-watch/metadata.xml b/app-admin/multilog-watch/metadata.xml
index 474ccaa..0a03f5d 100644
--- a/app-admin/multilog-watch/metadata.xml
+++ b/app-admin/multilog-watch/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>maintainer-needed@gentoo.org</email>
-</maintainer>
 <longdescription lang="en">This program reads logs written by multilog (part of the
 daemontools package by Dan Bernstein), discards any lines matching regular
 expressions in its configuration file, and mails the rest to a configured e-mail
diff --git a/app-admin/newsyslog/metadata.xml b/app-admin/newsyslog/metadata.xml
index 59e2b8f..097975e 100644
--- a/app-admin/newsyslog/metadata.xml
+++ b/app-admin/newsyslog/metadata.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<name>Default assignee for orphaned packages</name>
-	</maintainer>
 </pkgmetadata>
diff --git a/app-admin/ngxtop/metadata.xml b/app-admin/ngxtop/metadata.xml
index 6d59659..4205745 100644
--- a/app-admin/ngxtop/metadata.xml
+++ b/app-admin/ngxtop/metadata.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>jlec@gentoo.org</email>
+  <maintainer type="person">
+	  <email>mrueg@gentoo.org</email>
+	  <name>Manuel Rüger</name>
   </maintainer>
   <upstream>
     <remote-id type="github">lebinh/ngxtop</remote-id>
diff --git a/app-admin/openrc-settingsd/metadata.xml b/app-admin/openrc-settingsd/metadata.xml
index cb6c800..fae0fa8 100644
--- a/app-admin/openrc-settingsd/metadata.xml
+++ b/app-admin/openrc-settingsd/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
+<maintainer type="person">
 	<email>tetromino@gentoo.org</email>
 	<name>Alexandre Rostovtsev</name>
 </maintainer>
-<herd>gnome</herd>
+<maintainer type="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 <use>
 	<flag name="systemd">Use the versions of dbus and polkit files provided by
 		<pkg>sys-apps/systemd</pkg></flag>
diff --git a/app-admin/packagekit-base/Manifest b/app-admin/packagekit-base/Manifest
index d5a10a1..66a8d6f 100644
--- a/app-admin/packagekit-base/Manifest
+++ b/app-admin/packagekit-base/Manifest
@@ -1,2 +1,2 @@
-DIST PackageKit-0.7.4.tar.xz 1493656 SHA256 4112c86d67afbbb9be5d3a706c63c537babbbe1f96e398ae306f5e5e02563a98 SHA512 a2cee60f499ec6c5359f3dc2eddda02cfb9c287f80a6b38aa1d9d87558ce5938ade87ab34f6cb1f9640749a0f19625b44c89f72dea5fbb0cbd5f34aec8dbb9f6 WHIRLPOOL 2827cb038c86164ae58021fafe9f2bbf21e69b5c63c4ef5e0f613806f5725f910af3d5aa51646fd258da9c91b81b086cf9560f66bf042e1cb6d1c25128f984b3
 DIST PackageKit-0.8.15.tar.xz 1506084 SHA256 76aa44994d63b403b1f1154406539951502f5ab92624a8a7dedbeb5437ed0af5 SHA512 d6a1a4582212b02350b8a5ab8413346b0b33a49d329d3c5c4314e3db0c7c40b891d64d275c3acd8eafc45a59462b537cd031919027db2176502861271ce34a02 WHIRLPOOL bcc75e8a05b5616fbec1a2772af53ae51cf8c44a9feda4ca9cff4567f274aed62d3cf01751ab89834f423b77a74dcc1445c32390c323a46bb4340cde568760ce
+DIST PackageKit-1.0.11.tar.xz 1427404 SHA256 bbd27bbc77795394f25ab009fe1b3420e365541c99248b18bbaa2fa7f029eaf7 SHA512 9529037685f76e883a71ae502eabd83c3e1e8905f76cfe5e938760677f0224f8758bca59e139588aa06589bcca7a20f13dea0fe419022cb950c7a4c631237bce WHIRLPOOL 8d9bebf55acdff2096bb750bc1f3028cdbbb8e0fd09926de69c7e3dcbd7fe56a2908709be01633dd5a61df80afab05b28d8f424b1bbb79454f503cd03301e56a
diff --git a/app-admin/packagekit-base/metadata.xml b/app-admin/packagekit-base/metadata.xml
index a63ea63..097d408 100644
--- a/app-admin/packagekit-base/metadata.xml
+++ b/app-admin/packagekit-base/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>lxnay@gentoo.org</email>
 		<name>Fabio Erculiani</name>
 	</maintainer>
@@ -11,12 +11,5 @@
 		<flag name="entropy">
 			Enable Entropy backend
 		</flag>
-		<flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg>
-			Enable introspection
-		</flag>
-		<flag name="pm-utils">
-			Add pm-utils (suspend/resume) functionalities
-		</flag>
 	</use>
 </pkgmetadata>
-
diff --git a/app-admin/packagekit-base/packagekit-base-0.7.4.ebuild b/app-admin/packagekit-base/packagekit-base-0.7.4.ebuild
deleted file mode 100644
index 405764e..0000000
--- a/app-admin/packagekit-base/packagekit-base-0.7.4.ebuild
+++ /dev/null
@@ -1,185 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-
-# 0.7.x is untested with Python 3.x
-PYTHON_DEPEND="2"
-
-inherit eutils multilib python nsplugins bash-completion-r1
-
-MY_PN="PackageKit"
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Manage packages in a secure way using a cross-distro and cross-architecture API"
-HOMEPAGE="http://www.packagekit.org/"
-SRC_URI="http://www.packagekit.org/releases/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
-IUSE="connman cron doc +introspection networkmanager nsplugin pm-utils +policykit entropy static-libs test udev"
-
-CDEPEND="connman? ( net-misc/connman )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.9 )
-	networkmanager? ( >=net-misc/networkmanager-0.6.4 )
-	nsplugin? (
-		>=dev-libs/nspr-4.8
-		x11-libs/cairo
-		>=x11-libs/gtk+-2.14.0:2
-		x11-libs/pango
-	)
-	policykit? ( >=sys-auth/polkit-0.98 )
-	udev? ( virtual/libgudev )
-	dev-db/sqlite:3
-	>=dev-libs/dbus-glib-0.74
-	>=dev-libs/glib-2.26.1:2
-	>=sys-apps/dbus-1.3.0"
-DEPEND="${CDEPEND}
-	doc? ( dev-util/gtk-doc )
-	nsplugin? ( <net-misc/npapi-sdk-0.27.1 )
-	dev-libs/libxslt
-	>=dev-util/intltool-0.35.0
-	virtual/pkgconfig
-	sys-devel/gettext"
-
-RDEPEND="${CDEPEND}
-	entropy? ( >=sys-apps/entropy-1.0_rc27 )
-	pm-utils? ( sys-power/pm-utils )
-	>=app-portage/layman-1.2.3
-	>=sys-apps/portage-2.1.9
-	sys-auth/consolekit"
-
-APP_LINGUAS="as bg bn ca cs da de el en_GB es fi fr gu he hi hu it ja kn ko ml mr
-ms nb nl or pa pl pt pt_BR ro ru sk sr sr@latin sv ta te th tr uk zh_CN zh_TW"
-for X in ${APP_LINGUAS}; do
-	IUSE=" ${IUSE} linguas_${X}"
-done
-
-S="${WORKDIR}/${MY_P}"
-RESTRICT="test" # tests are failing atm
-
-# NOTES:
-# do not use a specific user, useless and not more secure according to upstream
-# doc is in the tarball and always installed
-# mono doesn't install anything (RDEPEND dev-dotnet/gtk-sharp-gapi:2
-#	(R)DEPEND dev-dotnet/glib-sharp:2 dev-lang/mono), upstream bug 23247
-# >=npapi-sdk-0.27.1 has slightly changed API, once it is unmasked in tree
-# drop the npapi-api-change patch below and relax the dependency constraints
-
-# UPSTREAM:
-# documentation/website with --enable-doc-install
-# failing tests
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.7.x-npapi-sdk.patch #383141
-	epatch "${FILESDIR}"/${PN}-0.7.x-npapi-api-change.patch #416711
-	# http://pkgs.fedoraproject.org/gitweb/?p=PackageKit.git;a=commit;h=0b378668288db34890b82c7be007fc76c7fcd956
-	sed -i -e '/polkit-backend-1/d' configure || die #423431
-}
-
-src_configure() {
-	local myconf=""
-
-	if use policykit; then
-		myconf+=" --with-security-framework=polkit"
-	else
-		myconf+=" --with-security-framework=dummy"
-	fi
-
-	if [[ -z "${LINGUAS}" ]]; then
-		myconf+=" --disable-nls"
-	else
-		myconf+=" --enable-nls"
-	fi
-
-	# localstatedir: for gentoo it's /var/lib but for $PN it's /var
-	# dep-tracking,option-check,libtool-lock,strict,local: obvious reasons
-	# command,debuginfo,gstreamer,service-packs: not supported by backend
-
-	# NOTE: default backend is autodetected at runtime, also
-	if use entropy; then
-		myconf+=" --with-default-backend=entropy"
-	else
-		myconf+=" --with-default-backend=portage"
-	fi
-	econf \
-		${myconf} \
-		--enable-introspection=$(use introspection && echo -n "yes" || echo -n "no") \
-		--localstatedir=/var \
-		--disable-dependency-tracking \
-		--enable-option-checking \
-		--enable-libtool-lock \
-		--disable-strict \
-		--disable-local \
-		$(use_enable doc gtk-doc) \
-		--enable-command-not-found \
-		--disable-debuginfo-install \
-		--disable-gstreamer-plugin \
-		--disable-service-packs \
-		--enable-man-pages \
-		--enable-portage \
-		$(use_enable entropy) \
-		$(use_enable cron) \
-		--disable-gtk-module \
-		$(use_enable introspection) \
-		$(use_enable networkmanager) \
-		$(use_enable nsplugin browser-plugin) \
-		$(use_enable connman) \
-		$(use_enable pm-utils) \
-		--disable-qt \
-		$(use_enable static-libs static) \
-		$(use_enable test tests) \
-		$(use_enable udev device-rebind)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc AUTHORS MAINTAINERS NEWS README TODO || die "dodoc failed"
-	dodoc ChangeLog || die "dodoc failed"
-
-	if use nsplugin; then
-		dodir "/usr/$(get_libdir)/${PLUGINS_DIR}"
-		mv "${D}"/usr/$(get_libdir)/mozilla/plugins/* \
-			"${D}/usr/$(get_libdir)/${PLUGINS_DIR}/"
-	fi
-
-	if ! use static-libs; then
-		find "${D}" -name *.la | xargs rm || die "removing .la files failed"
-	fi
-
-	# Remove precompiled python modules, we handle byte compiling
-	rm -f "${D}/$(python_get_sitedir)"/${PN}*.py[co]
-
-	newbashcomp "${S}/contrib/pk-completion.bash" ${PN}
-	# Remove bashcomp file installed by build-system
-	rm -f "${D}/bash_completion.d/pk-completion.bash"
-
-	# Remove unwanted PackageKit website stuff
-	rm -rf "${D}/usr/share/PackageKit/website"
-
-}
-
-pkg_postinst() {
-	python_mod_optimize ${PN/-base}
-
-	if ! use policykit; then
-		ewarn "You are not using policykit, the daemon can't be considered as secure."
-		ewarn "All users will be able to do anything through ${MY_PN}."
-		ewarn "Please, consider rebuilding ${MY_PN} with policykit USE flag."
-		ewarn "THIS IS A SECURITY ISSUE."
-		echo
-	fi
-}
-
-pkg_prerm() {
-	einfo "Removing downloaded files with ${MY_PN}..."
-	[[ -d "${ROOT}"/var/cache/${MY_PN}/downloads/ ]] && \
-		rm -rf /var/cache/PackageKit/downloads/*
-}
-
-pkg_postrm() {
-	python_mod_cleanup ${PN/-base}
-}
diff --git a/app-admin/packagekit-base/packagekit-base-1.0.11.ebuild b/app-admin/packagekit-base/packagekit-base-1.0.11.ebuild
new file mode 100644
index 0000000..ff02f78
--- /dev/null
+++ b/app-admin/packagekit-base/packagekit-base-1.0.11.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+# PackageKit supports 3.2+, but entropy and portage backends are untested
+# Future note: use --enable-python3
+PYTHON_COMPAT=( python2_7 )
+VALA_USE_DEPEND="vapigen"
+
+inherit bash-completion-r1 multilib nsplugins python-single-r1 systemd vala
+
+MY_PN="PackageKit"
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Manage packages in a secure way using a cross-distro and cross-architecture API"
+HOMEPAGE="http://www.packagekit.org/"
+SRC_URI="http://www.freedesktop.org/software/${MY_PN}/releases/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0/18"
+KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
+IUSE="connman cron command-not-found +introspection networkmanager nsplugin entropy systemd test vala"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	vala? ( introspection )
+"
+
+# While not strictly needed, consolekit is the alternative to systemd-login
+# to get current session's user.
+CDEPEND="
+	>=app-shells/bash-completion-2
+	dev-db/sqlite:3
+	>=dev-libs/dbus-glib-0.74
+	>=dev-libs/glib-2.32.0:2[${PYTHON_USEDEP}]
+	>=sys-auth/polkit-0.98
+	>=sys-apps/dbus-1.3.0
+	${PYTHON_DEPS}
+	connman? ( net-misc/connman )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.9[${PYTHON_USEDEP}] )
+	networkmanager? ( >=net-misc/networkmanager-0.6.4 )
+	nsplugin? (
+		>=dev-libs/nspr-4.8
+		x11-libs/cairo
+		>=x11-libs/gtk+-2.14.0:2
+		x11-libs/pango
+	)
+	systemd? ( >=sys-apps/systemd-204 )
+"
+DEPEND="${CDEPEND}
+	dev-libs/libxslt[${PYTHON_USEDEP}]
+	>=dev-util/gtk-doc-am-1.11
+	>=dev-util/intltool-0.35.0
+	sys-devel/gettext
+	virtual/pkgconfig
+	nsplugin? ( >=net-misc/npapi-sdk-0.27 )
+	vala? ( $(vala_depend) )
+"
+RDEPEND="${CDEPEND}
+	>=app-portage/layman-2[${PYTHON_USEDEP}]
+	>=sys-apps/portage-2.2[${PYTHON_USEDEP}]
+	entropy? ( >=sys-apps/entropy-234[${PYTHON_USEDEP}] )
+	!systemd? ( sys-auth/consolekit )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+RESTRICT="test"
+
+src_prepare() {
+	use vala && vala_src_prepare
+}
+
+src_configure() {
+	econf \
+		--disable-gstreamer-plugin \
+		--disable-gtk-doc \
+		--disable-gtk-module \
+		--disable-schemas-compile \
+		--disable-static \
+		--enable-bash-completion \
+		--enable-man-pages \
+		--enable-nls \
+		--enable-portage \
+		--localstatedir=/var \
+		$(use_enable command-not-found) \
+		$(use_enable connman) \
+		$(use_enable cron) \
+		$(use_enable entropy) \
+		$(use_enable introspection) \
+		$(use_enable networkmanager) \
+		$(use_enable nsplugin browser-plugin) \
+		$(use_enable systemd) \
+		$(use_enable test daemon-tests) \
+		$(use_enable vala) \
+		$(systemd_with_unitdir)
+		#$(use_enable test local)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	prune_libtool_files --all
+
+	dodoc AUTHORS ChangeLog MAINTAINERS NEWS README
+
+	if use nsplugin; then
+		dodir "/usr/$(get_libdir)/${PLUGINS_DIR}"
+		mv "${D}/usr/$(get_libdir)/mozilla/plugins"/* \
+			"${D}/usr/$(get_libdir)/${PLUGINS_DIR}/" || die
+	fi
+}
diff --git a/app-admin/packagekit-gtk/Manifest b/app-admin/packagekit-gtk/Manifest
index d5a10a1..66a8d6f 100644
--- a/app-admin/packagekit-gtk/Manifest
+++ b/app-admin/packagekit-gtk/Manifest
@@ -1,2 +1,2 @@
-DIST PackageKit-0.7.4.tar.xz 1493656 SHA256 4112c86d67afbbb9be5d3a706c63c537babbbe1f96e398ae306f5e5e02563a98 SHA512 a2cee60f499ec6c5359f3dc2eddda02cfb9c287f80a6b38aa1d9d87558ce5938ade87ab34f6cb1f9640749a0f19625b44c89f72dea5fbb0cbd5f34aec8dbb9f6 WHIRLPOOL 2827cb038c86164ae58021fafe9f2bbf21e69b5c63c4ef5e0f613806f5725f910af3d5aa51646fd258da9c91b81b086cf9560f66bf042e1cb6d1c25128f984b3
 DIST PackageKit-0.8.15.tar.xz 1506084 SHA256 76aa44994d63b403b1f1154406539951502f5ab92624a8a7dedbeb5437ed0af5 SHA512 d6a1a4582212b02350b8a5ab8413346b0b33a49d329d3c5c4314e3db0c7c40b891d64d275c3acd8eafc45a59462b537cd031919027db2176502861271ce34a02 WHIRLPOOL bcc75e8a05b5616fbec1a2772af53ae51cf8c44a9feda4ca9cff4567f274aed62d3cf01751ab89834f423b77a74dcc1445c32390c323a46bb4340cde568760ce
+DIST PackageKit-1.0.11.tar.xz 1427404 SHA256 bbd27bbc77795394f25ab009fe1b3420e365541c99248b18bbaa2fa7f029eaf7 SHA512 9529037685f76e883a71ae502eabd83c3e1e8905f76cfe5e938760677f0224f8758bca59e139588aa06589bcca7a20f13dea0fe419022cb950c7a4c631237bce WHIRLPOOL 8d9bebf55acdff2096bb750bc1f3028cdbbb8e0fd09926de69c7e3dcbd7fe56a2908709be01633dd5a61df80afab05b28d8f424b1bbb79454f503cd03301e56a
diff --git a/app-admin/packagekit-gtk/metadata.xml b/app-admin/packagekit-gtk/metadata.xml
index 187f7a7..15f07e4 100644
--- a/app-admin/packagekit-gtk/metadata.xml
+++ b/app-admin/packagekit-gtk/metadata.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>lxnay@gentoo.org</email>
 		<name>Fabio Erculiani</name>
 	</maintainer>
 	<use>
 	</use>
 </pkgmetadata>
-
diff --git a/app-admin/packagekit-gtk/packagekit-gtk-0.7.4.ebuild b/app-admin/packagekit-gtk/packagekit-gtk-0.7.4.ebuild
deleted file mode 100644
index b72fee3..0000000
--- a/app-admin/packagekit-gtk/packagekit-gtk-0.7.4.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-
-inherit eutils base
-
-MY_PN="PackageKit"
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Gtk3 PackageKit backend library"
-HOMEPAGE="http://www.packagekit.org/"
-SRC_URI="http://www.packagekit.org/releases/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-RDEPEND="dev-libs/dbus-glib
-	media-libs/fontconfig
-	>=x11-libs/gtk+-3.0:3
-	x11-libs/pango
-	~app-admin/packagekit-base-${PV}"
-DEPEND="${RDEPEND} virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	# http://pkgs.fedoraproject.org/gitweb/?p=PackageKit.git;a=commit;h=0b378668288db34890b82c7be007fc76c7fcd956
-	sed -i -e '/polkit-backend-1/d' configure || die #423431
-	econf \
-		--localstatedir=/var \
-		--enable-introspection=yes \
-		--disable-dependency-tracking \
-		--enable-option-checking \
-		--enable-libtool-lock \
-		--disable-strict \
-		--disable-local \
-		--disable-gtk-doc \
-		--disable-command-not-found \
-		--disable-debuginfo-install \
-		--disable-gstreamer-plugin \
-		--disable-service-packs \
-		--disable-man-pages \
-		--disable-cron \
-		--enable-gtk-module \
-		--disable-networkmanager \
-		--disable-browser-plugin \
-		--disable-pm-utils \
-		--disable-device-rebind \
-		--disable-tests \
-		--disable-qt
-}
-
-src_compile() {
-	cd "${S}"/contrib/gtk-module || die
-	emake || die "emake install failed"
-}
-
-src_install() {
-	cd "${S}"/contrib/gtk-module || die
-	emake DESTDIR="${D}" install || die "emake install failed"
-}
diff --git a/app-admin/packagekit-gtk/packagekit-gtk-1.0.11.ebuild b/app-admin/packagekit-gtk/packagekit-gtk-1.0.11.ebuild
new file mode 100644
index 0000000..693d6d3
--- /dev/null
+++ b/app-admin/packagekit-gtk/packagekit-gtk-1.0.11.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils
+
+MY_PN="PackageKit"
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Gtk3 PackageKit backend library"
+HOMEPAGE="http://www.packagekit.org/"
+SRC_URI="http://www.packagekit.org/releases/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/glib-2.32:2
+	media-libs/fontconfig
+	>=x11-libs/gtk+-2:2
+	>=x11-libs/gtk+-3:3
+	x11-libs/pango
+	~app-admin/packagekit-base-${PV}[introspection]
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	econf \
+		--disable-bash-completion \
+		--disable-browser-plugin \
+		--disable-command-not-found \
+		--disable-cron \
+		--disable-gstreamer-plugin \
+		--disable-gtk-doc \
+		--disable-local \
+		--disable-man-pages \
+		--disable-networkmanager \
+		--disable-static \
+		--disable-systemd \
+		--disable-vala \
+		--enable-dummy \
+		--enable-gtk-module \
+		--enable-introspection=yes \
+		--localstatedir=/var
+}
+
+src_compile() {
+	emake -C contrib/gtk-module
+}
+
+src_install() {
+	emake -C contrib/gtk-module DESTDIR="${D}" install
+	prune_libtool_files --all
+}
diff --git a/app-admin/packagekit-qt4/Manifest b/app-admin/packagekit-qt4/Manifest
index 9165b85..2873587 100644
--- a/app-admin/packagekit-qt4/Manifest
+++ b/app-admin/packagekit-qt4/Manifest
@@ -1,2 +1,2 @@
-DIST PackageKit-0.7.4.tar.xz 1493656 SHA256 4112c86d67afbbb9be5d3a706c63c537babbbe1f96e398ae306f5e5e02563a98 SHA512 a2cee60f499ec6c5359f3dc2eddda02cfb9c287f80a6b38aa1d9d87558ce5938ade87ab34f6cb1f9640749a0f19625b44c89f72dea5fbb0cbd5f34aec8dbb9f6 WHIRLPOOL 2827cb038c86164ae58021fafe9f2bbf21e69b5c63c4ef5e0f613806f5725f910af3d5aa51646fd258da9c91b81b086cf9560f66bf042e1cb6d1c25128f984b3
 DIST PackageKit-Qt-0.8.8.tar.xz 41416 SHA256 e234d4b1f8451821930f463621a86c9708eebfd1db65019883d38a60d13c870c SHA512 a81b85588f531ca58d355094a78c3f07aa804350fdd49f98fbae02076ebb1d4736c0a3d33822805a9e1b5ee5bf62e85141994b841c5e9218b7d03715b45dde11 WHIRLPOOL 319b2226fcf1a7de58df016b2cd401779601ad1842f0d35c9341f56d380397d9dc92a7cd8c8291fb0c4487f7821f4c860130b6275523a240bc3e8996d425f973
+DIST PackageKit-Qt-0.9.5.tar.xz 43312 SHA256 f4fb60b82d845d887de57ef44481301f966291912116e416d981156faf3620f0 SHA512 3dbe52d6e0f8ba17c9ef04acdb5e2c29d5630fbb60b3522e57895b2d409497a15a543ba87efd876111726b1785c6ed74ff663b5379ba053ccab492d0e3bc08e2 WHIRLPOOL 7ec050b0086496c84506af0282e577a1a08eb8cf1628e9b9d4f41e6924c7965188ed564f83ce14493df72e555ee30c3c77e9bd11df791434292bbc12d53e2b61
diff --git a/app-admin/packagekit-qt4/metadata.xml b/app-admin/packagekit-qt4/metadata.xml
index 187f7a7..15f07e4 100644
--- a/app-admin/packagekit-qt4/metadata.xml
+++ b/app-admin/packagekit-qt4/metadata.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>lxnay@gentoo.org</email>
 		<name>Fabio Erculiani</name>
 	</maintainer>
 	<use>
 	</use>
 </pkgmetadata>
-
diff --git a/app-admin/packagekit-qt4/packagekit-qt4-0.7.4.ebuild b/app-admin/packagekit-qt4/packagekit-qt4-0.7.4.ebuild
deleted file mode 100644
index 19b3e36..0000000
--- a/app-admin/packagekit-qt4/packagekit-qt4-0.7.4.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-
-inherit eutils base
-
-MY_PN="PackageKit"
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Qt4 PackageKit backend library"
-HOMEPAGE="http://www.packagekit.org/"
-SRC_URI="http://www.packagekit.org/releases/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-RDEPEND=">=dev-qt/qtcore-4.4.0:4
-	>=dev-qt/qtdbus-4.4.0:4
-	>=dev-qt/qtsql-4.4.0:4
-	~app-admin/packagekit-base-${PV}"
-DEPEND="${RDEPEND}
-	dev-libs/libxslt
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	# http://pkgs.fedoraproject.org/gitweb/?p=PackageKit.git;a=commit;h=0b378668288db34890b82c7be007fc76c7fcd956
-	sed -i -e '/polkit-backend-1/d' configure || die #423431
-	econf \
-		--enable-introspection=no \
-		--localstatedir=/var \
-		--disable-dependency-tracking \
-		--enable-option-checking \
-		--enable-libtool-lock \
-		--disable-strict \
-		--disable-local \
-		--disable-gtk-doc \
-		--disable-command-not-found \
-		--disable-debuginfo-install \
-		--disable-gstreamer-plugin \
-		--disable-service-packs \
-		--disable-man-pages \
-		--disable-cron \
-		--disable-gtk-module \
-		--disable-networkmanager \
-		--disable-browser-plugin \
-		--disable-pm-utils \
-		--disable-device-rebind \
-		--disable-tests \
-		--enable-qt
-}
-
-src_compile() {
-	local qtdir=packagekit-qt2
-	cd "${S}"/lib/${qtdir} || die
-	emake || die "emake install failed"
-}
-
-src_install() {
-	local qtdir=packagekit-qt2
-	cd "${S}"/lib/${qtdir} || die
-	emake DESTDIR="${D}" install || die "emake install failed"
-}
diff --git a/app-admin/packagekit-qt4/packagekit-qt4-0.9.5.ebuild b/app-admin/packagekit-qt4/packagekit-qt4-0.9.5.ebuild
new file mode 100644
index 0000000..aee6956
--- /dev/null
+++ b/app-admin/packagekit-qt4/packagekit-qt4-0.9.5.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit cmake-utils
+
+MY_PN="PackageKit-Qt"
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Qt4 PackageKit backend library"
+HOMEPAGE="http://www.packagekit.org/"
+SRC_URI="http://www.freedesktop.org/software/PackageKit/releases/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-qt/qtcore-4.4.0:4
+	>=dev-qt/qtdbus-4.4.0:4
+	>=dev-qt/qtsql-4.4.0:4
+	>=app-admin/packagekit-base-0.9
+"
+DEPEND="${RDEPEND}
+	dev-libs/libxslt
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/app-admin/packagekit/metadata.xml b/app-admin/packagekit/metadata.xml
index 187f7a7..15f07e4 100644
--- a/app-admin/packagekit/metadata.xml
+++ b/app-admin/packagekit/metadata.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>lxnay@gentoo.org</email>
 		<name>Fabio Erculiani</name>
 	</maintainer>
 	<use>
 	</use>
 </pkgmetadata>
-
diff --git a/app-admin/packagekit/packagekit-0.7.4.ebuild b/app-admin/packagekit/packagekit-0.7.4.ebuild
deleted file mode 100644
index 3f45d23..0000000
--- a/app-admin/packagekit/packagekit-0.7.4.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-
-MY_PN="PackageKit"
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="PackageKit Package Manager interface (meta package)"
-HOMEPAGE="http://www.packagekit.org/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="gtk qt4"
-
-RDEPEND="gtk? ( ~app-admin/packagekit-gtk-${PV} )
-	qt4? ( ~app-admin/packagekit-qt4-${PV} )"
-
-DEPEND="${RDEPEND}"
diff --git a/app-admin/packagekit/packagekit-1.0.11.ebuild b/app-admin/packagekit/packagekit-1.0.11.ebuild
new file mode 100644
index 0000000..f8c5af7
--- /dev/null
+++ b/app-admin/packagekit/packagekit-1.0.11.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+DESCRIPTION="PackageKit Package Manager interface (meta package)"
+HOMEPAGE="http://www.packagekit.org/"
+SRC_URI=""
+
+LICENSE="metapackage"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="gtk qt4"
+
+RDEPEND="gtk? ( ~app-admin/packagekit-gtk-${PV} )
+	qt4? ( >=app-admin/packagekit-qt4-0.9 )"
+
+DEPEND="${RDEPEND}"
diff --git a/app-admin/pass/metadata.xml b/app-admin/pass/metadata.xml
index 0b30c4c..97bcbb1 100644
--- a/app-admin/pass/metadata.xml
+++ b/app-admin/pass/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>zx2c4@gentoo.org</email>
 		<name>Jason A. Donenfeld</name>
 	</maintainer>
diff --git a/app-admin/passook/metadata.xml b/app-admin/passook/metadata.xml
index 4dbf560..4b62a71 100644
--- a/app-admin/passook/metadata.xml
+++ b/app-admin/passook/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>maintainer-needed@gentoo.org</email>
-</maintainer>
 <longdescription>Passook is a perl script that generates passwords. You can
 	customize the security of the password generated.</longdescription>
 </pkgmetadata>
diff --git a/app-admin/paxtest/metadata.xml b/app-admin/paxtest/metadata.xml
index 04475d3..a6679d4 100644
--- a/app-admin/paxtest/metadata.xml
+++ b/app-admin/paxtest/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>hardened</herd>
-	<maintainer>
+	<maintainer type="person">
 		<email>blueness@gentoo.org</email>
 		<description>Primary Maintainer</description>
 	</maintainer>
+	<maintainer type="project">
+		<email>hardened@gentoo.org</email>
+		<name>Gentoo Hardened</name>
+	</maintainer>
 	<longdescription>Test suite for the PaX kernel patch
 		PaX is a Linux kernel patch which adds much stricter control on how memory
 		is being used by applications. A normal Linux kernel leaves the control to the
diff --git a/app-admin/perl-cleaner/metadata.xml b/app-admin/perl-cleaner/metadata.xml
index 1c73b29..1dca59d 100644
--- a/app-admin/perl-cleaner/metadata.xml
+++ b/app-admin/perl-cleaner/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>perl</herd>
-	<maintainer>
+	<maintainer type="person">
 		<email>fuzzyray@gentoo.org</email>
 	</maintainer>
+<maintainer type="project">
+		<email>perl@gentoo.org</email>
+		<name>Gentoo Perl Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-admin/petrovich/metadata.xml b/app-admin/petrovich/metadata.xml
index a62bf05..2bba2bc 100644
--- a/app-admin/petrovich/metadata.xml
+++ b/app-admin/petrovich/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<description>This package lacks a primary herd or maintainer.</description>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">petrovich</remote-id>
 	</upstream>
diff --git a/app-admin/phpsyslogng/metadata.xml b/app-admin/phpsyslogng/metadata.xml
index afbbc87..24ea077 100644
--- a/app-admin/phpsyslogng/metadata.xml
+++ b/app-admin/phpsyslogng/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
-	<maintainer>
+	<maintainer type="person">
 		<email>matthias@dsx.at</email>
 		<name>Matthias Schöffmann</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="google-code">php-syslog-ng</remote-id>
 	</upstream>
diff --git a/app-admin/pprocm/metadata.xml b/app-admin/pprocm/metadata.xml
index 91f4e72..097975e 100644
--- a/app-admin/pprocm/metadata.xml
+++ b/app-admin/pprocm/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>
diff --git a/app-admin/procinfo-ng/metadata.xml b/app-admin/procinfo-ng/metadata.xml
index 7f43c01..91691a0 100644
--- a/app-admin/procinfo-ng/metadata.xml
+++ b/app-admin/procinfo-ng/metadata.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>jlec@gentoo.org</email>
+  <maintainer type="project">
+    <email>shell-tools@gentoo.org</email>
+    <name>Gentoo Shell Tools Project</name>
   </maintainer>
   <upstream>
     <remote-id type="sourceforge">procinfo-ng</remote-id>
diff --git a/app-admin/procinfo/metadata.xml b/app-admin/procinfo/metadata.xml
index 91f4e72..097975e 100644
--- a/app-admin/procinfo/metadata.xml
+++ b/app-admin/procinfo/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>
diff --git a/app-admin/psmon/metadata.xml b/app-admin/psmon/metadata.xml
index 81ada3d..1595855 100644
--- a/app-admin/psmon/metadata.xml
+++ b/app-admin/psmon/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<name>Default assignee for orphaned packages</name>
-	</maintainer>
 	<longdescription lang="en">
 		A perl script that monitors processes to make sure they are running as
 		the user has intended. Will respawn dead processes and/or kill illegal
diff --git a/app-admin/puppet-agent/Manifest b/app-admin/puppet-agent/Manifest
index 8107900..26de7c3 100644
--- a/app-admin/puppet-agent/Manifest
+++ b/app-admin/puppet-agent/Manifest
@@ -1,12 +1,4 @@
-DIST puppet-agent_1.2.2-1wheezy_amd64.deb 14860604 SHA256 5910ff850e8814092b50dc70a68d8c5497d5fe3d960bfef9cd13f8dc689dc665 SHA512 ad11b0ba820186f4b315ac156e8bf78348acd69d11e4c03cb12314fc73e4e3fbfef0814664e7fd04f692e8db42f9e137194e267354b2fc4ec8dda424af9f5d98 WHIRLPOOL 25c42e9f7871ccf61eb55b83327813e6090ee359c42e1e473ef09155db69adebfe412fd61a5752b4b634e5ad8aa7bd45d4a86f7e5ba29c1bdb74033b91f45c3f
-DIST puppet-agent_1.2.2-1wheezy_i386.deb 14816930 SHA256 092b8bfe1e1156322d0ab68d411487c80146bd778916409b1c907791f41a49c8 SHA512 50879ce4eebcd451dafb33cb7a12c36ee9bcaedfc29ffa0d60552efa5aa4cd66d0007061d28a80d31615c67442f8526863185e6753418772d8275e58454d6886 WHIRLPOOL 7abb0b6f52f5dd07a5ccb56b1c795c05f8c4efd18665d2ca209400e51419e4ae335e630a845c031a47df09d96ce20fbc92d7cafa082deb3872306daf74838612
-DIST puppet-agent_1.2.4-1wheezy_amd64.deb 15187770 SHA256 a711255c7b5aab5f1a653fcbe461db0934645b1da876f24595d531c7ad8c81d4 SHA512 dc7656a7f79f1f2e5144bf625b87548ed1b78290ae03c969abb850f0b1c346536c37c2b204ac0e6add830c1fd692ca4f946ea01bba50bb9794c094069f237d73 WHIRLPOOL 3809a0f9c5db1c73c6edcc344e6fdc7fb5acf340e36225611c72088175fe64ea26c3770ba126a61ed91fa275cf898828d9d192872a216a52b8345f25de1df7e6
-DIST puppet-agent_1.2.4-1wheezy_i386.deb 15122670 SHA256 33e9b16ea215089e7a89288faebd4767163e05d7c4a9d5c51ca71b041496c204 SHA512 944f6388d317fab9a2714a6cdc57e713a973d3c1df259b3358be3a0d737878df9f1d66186af8aea0cc768e55650f1dd1d3ef8682b942728fba45e7c0bca20867 WHIRLPOOL bd5710845a9c8f27fb566ead63e45649fb3854200df0259c76b9478d93792b453a9d5cf4fdc20112991d4d091c82143b7504b51be65815b2dcb67796f275303d
-DIST puppet-agent_1.2.5-1wheezy_amd64.deb 15187830 SHA256 4d557e45571df033a9e1babf406f9b8a4c387fe6dec7d3645f5e7ad5d7625f0d SHA512 25557aa4d5fa3d2ba0aa226c835d6779d075f0ef7c054cfda9826b1fedd08c90f5143630206b1bd51550f193aecdf4eef6395437f24e5fdfe10d3ed10fb4b75f WHIRLPOOL d6ef920932a708d1a143245f84380384b3a22320c0bb21e60be9807e29af1d3da6dbfef2f498fcb90fe4584618ae338546103c71eb305b743d326e9c20704f1f
-DIST puppet-agent_1.2.5-1wheezy_i386.deb 15122650 SHA256 f34a6e9c70b5276806dacf64fb2b41fd927e6875071d044f9901c5a8d9dacd1d SHA512 0989501ca3f011601bb301126ad58084571ee67eb961fbf1f5cf002eb9155bf4f8e838452ac62b45472f00c0a7538cb5c72c3e43c651675a7940d8ab9a1a309c WHIRLPOOL f9698e3154254d9931fdbccd9a75edccae8ab799f8add0e32995453d62a0d070001ad858449c5b816c1b1a448beb8b99b180558feea3b36fc84c0e730e2d5b7e
-DIST puppet-agent_1.2.6-1wheezy_amd64.deb 15187698 SHA256 3448a92d6761bc1c284b17508bf541b0a8c40394b03e7608826e4f2a900e40cc SHA512 b5e6e43f22728cd7d9f4d103aa4de8fa1eccb3159abc31a921fa8f387dd0436a8d0f915b38be8ce233e39448b94f30be90e18da4e2861d6aeda9ef8a312474d2 WHIRLPOOL eca0f32e11b29050e53d93d02a68e874cc5f0f90d823aa7ea5241599872ef39d65f45103542fac84083b40ec47cf09435f27c4fb91b5a5c9a4dee84aa50a2c41
-DIST puppet-agent_1.2.6-1wheezy_i386.deb 15122826 SHA256 271d62f7f6634b49632308d95c75519620335d176d3ee694a3cee42bb445d658 SHA512 3eae7b5a112baf1123c6d942e0b60ee07d76b02a8313a7122884b66f08077fbe430447857e5862182de7cf64ef90f931a49936d6967134937ccff84dd419ae4c WHIRLPOOL bce7ce95c3f6c21ca658d7ba25b3cb7b04c20e5af5499e3f4efb1df997dedd01e0982c67da332fcd8da901f06ce8683219baa6c7e02a7a4eed5ce20547bcfa35
-DIST puppet-agent_1.2.7-1wheezy_amd64.deb 15280016 SHA256 c250bcdeb22296ef3b0097da507b32f1503abbff332c68df10291dcb975243ed SHA512 f2e8d37415d9b6c260c8b4fdee44cc1b85ab784b57c944b856082cc9a65b3de32985527a65aac49ae3c3eea54736bf3c26e11af91c09fd6bfb3b065e98ca99d0 WHIRLPOOL e6b62d968dd0a10031b42afd052c2a280e5d50caae5d51f493a3f432cb4f74ff783db8c4cb77fd2bb6defb4fd1743ce220bf9143fa7c1c02a1b8dffe01a474b2
-DIST puppet-agent_1.2.7-1wheezy_i386.deb 15214412 SHA256 c2b9f51cfe3d3e43b3cdfb7a1c6c92abaeaf2c4ab26e9ceac5aba2b58cf1480e SHA512 6950e09c49da35c0cf463364b4ec468ba011f15d3caf9c59c58ef01a0cfd859cb5c97a3271d9a11c958a71c4c77ba45a8dab205124b92a80354da519dc1a2f3c WHIRLPOOL 12ce6f5ba23f00d1320d7cd40734485ac69bdddda8a9711e18f3549c12919592ca27394963578c5850400864e2b524e7034833e8b2985b15f06bb66f06df1b75
-DIST puppet-agent_1.3.0-1wheezy_amd64.deb 18018964 SHA256 dd107d96f674100e399f1e1a773b22ed2dd77081f3580d7df729f0d02885326f SHA512 20b5a2e516e98db30450b54f0ae042b4c6d5ccf4f44bc3403381bc663c73a7349b393fefaafabfbe334a49afbfcabc8eeae727e4eca54ef7eaa81463a7f05ed2 WHIRLPOOL df75fda9fa2ddc46fea419a65dc0de7eccd9ded41534c96f9be6688b07287fb3f6343ae908fcede47f857d37af1513e74ae5b25302150b1b186f0dc698d85860
-DIST puppet-agent_1.3.0-1wheezy_i386.deb 17960480 SHA256 eda86599bd647e1367874636aedb9e2812540043b6bf3f0f614efb00b7f727b8 SHA512 d2a3555c9298c9a14ea9342e787f4971a0e6fbe0ea37a2ca8a6f8ee4863fb8eb21dd5cb45c493ad0bffdc85e239baa6aaec95c778fb697e6ec5fe65ba592ea84 WHIRLPOOL f77446c30aaf56e529ecec2dfbd00d438407ed58bfa460f147cc59c403eeafa4fbb62697d84696173501c349156d0b0c0a0166760dc2bdf1f133371bc9ee1d98
+DIST puppet-agent_1.3.2-1wheezy_amd64.deb 18316012 SHA256 9d36e5d2902e8ffa9cb19a51c0df26bfe9e15fa28daaff8fc7724185df460ae6 SHA512 d63a52a9e5cf6a0cb1438715ed3f1c8edddaf4c21335aac80771b283c577151519bfbf73028c3d6af702d03372220964b052c4b45190f838a0a7e5ade247923a WHIRLPOOL 789b9316dc0edf701da9ef73c6034501b261e71db86c29db2d4f737719a3d37a53ef71f5eb43d8b7c5d2ff465d44ab59f4f744a39ed20b6a7600624e5ef4b993
+DIST puppet-agent_1.3.2-1wheezy_i386.deb 18248404 SHA256 7e6570f592a712c342c192643cacfb74ca103efea26191cb8b8baa0f359b0fca SHA512 66a092cd7579af5aff89e3c45897c2f3d036fc2fb6e35be3492bdfb273d33c356e4d5ff53362d303eead6b3c53aeef9e82da1371b3555c94f67f11a65f0f5b6d WHIRLPOOL 8cf9f5ddad6815511f2c09d76e66d456aa15c68af0485dfda86a081fa3f6ecbdeeaf4815838c2f6113a65890532164bbba1fb12fb9607c5d1fa8c95d4df14217
+DIST puppet-agent_1.3.4-1wheezy_amd64.deb 20088688 SHA256 d98026bc27d680c6d674889ddf76aab3da0f9122be3aaccfd4794c5193bf58af SHA512 1a11a7df1545c405f0cbcf6fa2b12a12d6f2091068706cc2be614b2aac4c2d1b8f92f8d6bb9721b5c9b7a30f27d087b585c4d9e41e9c966f526977bff1e39a91 WHIRLPOOL 619a00bdd175ad518a00c04410a09ed9502d768878f64810d434ef45bd41b2f0d695ea9fddb01a27b31989a90e47554b6a7577842f2762872601425b6801809f
+DIST puppet-agent_1.3.4-1wheezy_i386.deb 19864590 SHA256 7eaf2264fc0ce048fd1fc604f384df8d601e8571e9f92fb1432bc2be73a24874 SHA512 2640a6b0daaa2a9c913a9411a7eb56914bb127610d2bf56100f9029dc94727f3c42df7c858924b22fc5ad03a9151d98a136c0c6d369501f3e38a9c179333d2ff WHIRLPOOL 88dbebd7c5217d7efc85c877bc1977c574e17ca544a59424b805cebcad637ed5762ebe37c13d82dc01cebcd1ef1259383143adff7a748c82241124b2007d5513
diff --git a/app-admin/puppet-agent/metadata.xml b/app-admin/puppet-agent/metadata.xml
index e0523b4..aef6ae7 100644
--- a/app-admin/puppet-agent/metadata.xml
+++ b/app-admin/puppet-agent/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
diff --git a/app-admin/puppet-agent/puppet-agent-1.2.2-r1.ebuild b/app-admin/puppet-agent/puppet-agent-1.2.2-r1.ebuild
deleted file mode 100644
index f9888cf..0000000
--- a/app-admin/puppet-agent/puppet-agent-1.2.2-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils systemd unpacker
-
-DESCRIPTION="general puppet client utils along with mcollective hiera and facter"
-HOMEPAGE="https://puppetlabs.com/"
-SRC_BASE="http://apt.puppetlabs.com/pool/wheezy/PC1/${PN:0:1}/${PN}/${PN}_${PV}-1wheezy"
-SRC_URI="
-		amd64? ( ${SRC_BASE}_amd64.deb )
-		x86?   ( ${SRC_BASE}_i386.deb )
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="puppetdb"
-RESTRICT="strip"
-
-CDEPEND="!app-admin/puppet
-		!app-admin/mcollective
-		!dev-ruby/hiera
-		!dev-ruby/facter"
-
-DEPEND="
-		${DEPEND}
-		${CDEPEND}"
-RDEPEND="${CDEPEND}
-		puppetdb? ( >=dev-ruby/puppetdb-termini-3.0.1-r2 )"
-
-S=${WORKDIR}
-
-src_install() {
-	# conf.d
-	doconfd etc/default/puppet
-	doconfd etc/default/mcollective
-	# logrotate.d
-	insinto /etc/logrotate.d
-	doins etc/logrotate.d/mcollective
-	# puppet itself
-	insinto /etc/puppetlabs
-	doins -r etc/puppetlabs/*
-	# logdir for systemd
-	dodir var/log/puppetlabs/puppet/
-	fperms 0750 var/log/puppetlabs/puppet/
-	# the rest
-	insinto /opt
-	doins -r opt/*
-	fperms 0750 /opt/puppetlabs/puppet/cache
-	# init
-	newinitd "${FILESDIR}/puppet.initd" puppet
-	newinitd "${FILESDIR}/mcollective.initd" mcollective
-	systemd_dounit "${FILESDIR}/puppet.service"
-	systemd_dounit "${FILESDIR}/mcollective.service"
-	systemd_newtmpfilesd "${FILESDIR}/puppet-agent.conf.tmpfilesd" puppet-agent.conf
-	# symlinks
-	chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/"
-	dosym /opt/puppetlabs/bin/facter /usr/bin/facter
-	dosym /opt/puppetlabs/bin/hiera /usr/bin/hiera
-	dosym /opt/puppetlabs/bin/mco /usr/bin/mco
-	dosym /opt/puppetlabs/bin/puppet /usr/bin/puppet
-	dosym /opt/puppetlabs/puppet/bin/mcollectived /usr/sbin/mcollectived
-}
diff --git a/app-admin/puppet-agent/puppet-agent-1.2.2-r2.ebuild b/app-admin/puppet-agent/puppet-agent-1.2.2-r2.ebuild
deleted file mode 100644
index 2af998e..0000000
--- a/app-admin/puppet-agent/puppet-agent-1.2.2-r2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils systemd unpacker
-
-DESCRIPTION="general puppet client utils along with mcollective hiera and facter"
-HOMEPAGE="https://puppetlabs.com/"
-SRC_BASE="http://apt.puppetlabs.com/pool/wheezy/PC1/${PN:0:1}/${PN}/${PN}_${PV}-1wheezy"
-SRC_URI="
-	amd64? ( ${SRC_BASE}_amd64.deb )
-	x86?   ( ${SRC_BASE}_i386.deb )
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="puppetdb selinux"
-RESTRICT="strip"
-
-CDEPEND="!app-admin/augeas
-	!app-admin/mcollective
-	!app-admin/puppet
-	!dev-ruby/hiera
-	!dev-ruby/facter
-	!app-emulation/virt-what"
-
-DEPEND="
-	${CDEPEND}"
-RDEPEND="${CDEPEND}
-	sys-apps/dmidecode
-	selinux? (
-		sys-libs/libselinux[ruby]
-		sec-policy/selinux-puppet
-	)
-	puppetdb? ( >=dev-ruby/puppetdb-termini-3.0.1-r2 )"
-
-S=${WORKDIR}
-
-src_install() {
-	# conf.d
-	doconfd etc/default/puppet
-	doconfd etc/default/mcollective
-	# logrotate.d
-	insinto /etc/logrotate.d
-	doins etc/logrotate.d/mcollective
-	# puppet itself
-	insinto /etc/puppetlabs
-	doins -r etc/puppetlabs/*
-	# logdir for systemd
-	dodir var/log/puppetlabs/puppet/
-	fperms 0750 var/log/puppetlabs/puppet/
-	# the rest
-	insinto /opt
-	doins -r opt/*
-	fperms 0750 /opt/puppetlabs/puppet/cache
-	# init
-	newinitd "${FILESDIR}/puppet.initd" puppet
-	newinitd "${FILESDIR}/mcollective.initd" mcollective
-	systemd_dounit "${FILESDIR}/puppet.service"
-	systemd_dounit "${FILESDIR}/mcollective.service"
-	systemd_newtmpfilesd "${FILESDIR}/puppet-agent.conf.tmpfilesd" puppet-agent.conf
-	# symlinks
-	chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/"
-	chmod 0755 "${D}//opt/puppetlabs/puppet/lib/virt-what/virt-what-cpuid-helper"
-	dosym /opt/puppetlabs/bin/facter /usr/bin/facter
-	dosym /opt/puppetlabs/bin/hiera /usr/bin/hiera
-	dosym /opt/puppetlabs/bin/mco /usr/bin/mco
-	dosym /opt/puppetlabs/bin/puppet /usr/bin/puppet
-	dosym /opt/puppetlabs/puppet/bin/mcollectived /usr/sbin/mcollectived
-	dosym /opt/puppetlabs/puppet/bin/virt-what /usr/bin/virt-what
-	dosym /opt/puppetlabs/puppet/bin/augparse /usr/bin/augparse
-	dosym /opt/puppetlabs/puppet/bin/augtool /usr/bin/augtool
-	dosym /opt/puppetlabs/puppet/bin/extlookup2hiera /usr/bin/extlookup2hiera
-}
diff --git a/app-admin/puppet-agent/puppet-agent-1.2.4.ebuild b/app-admin/puppet-agent/puppet-agent-1.2.4.ebuild
deleted file mode 100644
index d0c66a5..0000000
--- a/app-admin/puppet-agent/puppet-agent-1.2.4.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils systemd unpacker
-
-DESCRIPTION="general puppet client utils along with mcollective hiera and facter"
-HOMEPAGE="https://puppetlabs.com/"
-SRC_BASE="http://apt.puppetlabs.com/pool/wheezy/PC1/${PN:0:1}/${PN}/${PN}_${PV}-1wheezy"
-SRC_URI="
-	amd64? ( ${SRC_BASE}_amd64.deb )
-	x86?   ( ${SRC_BASE}_i386.deb )
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="puppetdb selinux"
-RESTRICT="strip"
-
-CDEPEND="!app-admin/augeas
-	!app-admin/mcollective
-	!app-admin/puppet
-	!dev-ruby/hiera
-	!dev-ruby/facter
-	!app-emulation/virt-what"
-
-DEPEND="
-	${CDEPEND}"
-RDEPEND="${CDEPEND}
-	sys-apps/dmidecode
-	selinux? (
-		sys-libs/libselinux[ruby]
-		sec-policy/selinux-puppet
-	)
-	puppetdb? ( >=dev-ruby/puppetdb-termini-3.0.1-r2 )"
-
-S=${WORKDIR}
-
-src_install() {
-	# conf.d
-	doconfd etc/default/puppet
-	doconfd etc/default/mcollective
-	# logrotate.d
-	insinto /etc/logrotate.d
-	doins etc/logrotate.d/mcollective
-	# puppet itself
-	insinto /etc/puppetlabs
-	doins -r etc/puppetlabs/*
-	# logdir for systemd
-	dodir var/log/puppetlabs/puppet/
-	fperms 0750 var/log/puppetlabs/puppet/
-	# the rest
-	insinto /opt
-	dodir opt/puppetlabs/puppet/cache
-	doins -r opt/*
-	fperms 0750 /opt/puppetlabs/puppet/cache
-	# init
-	newinitd "${FILESDIR}/puppet.initd" puppet
-	newinitd "${FILESDIR}/mcollective.initd" mcollective
-	systemd_dounit "${FILESDIR}/puppet.service"
-	systemd_dounit "${FILESDIR}/mcollective.service"
-	systemd_newtmpfilesd "${FILESDIR}/puppet-agent.conf.tmpfilesd" puppet-agent.conf
-	# symlinks
-	chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/"
-	chmod 0755 "${D}//opt/puppetlabs/puppet/lib/virt-what/virt-what-cpuid-helper"
-	dosym /opt/puppetlabs/bin/facter /usr/bin/facter
-	dosym /opt/puppetlabs/bin/hiera /usr/bin/hiera
-	dosym /opt/puppetlabs/bin/mco /usr/bin/mco
-	dosym /opt/puppetlabs/bin/puppet /usr/bin/puppet
-	dosym /opt/puppetlabs/puppet/bin/mcollectived /usr/sbin/mcollectived
-	dosym /opt/puppetlabs/puppet/bin/virt-what /usr/bin/virt-what
-	dosym /opt/puppetlabs/puppet/bin/augparse /usr/bin/augparse
-	dosym /opt/puppetlabs/puppet/bin/augtool /usr/bin/augtool
-	dosym /opt/puppetlabs/puppet/bin/extlookup2hiera /usr/bin/extlookup2hiera
-}
diff --git a/app-admin/puppet-agent/puppet-agent-1.2.5.ebuild b/app-admin/puppet-agent/puppet-agent-1.2.5.ebuild
deleted file mode 100644
index d0c66a5..0000000
--- a/app-admin/puppet-agent/puppet-agent-1.2.5.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils systemd unpacker
-
-DESCRIPTION="general puppet client utils along with mcollective hiera and facter"
-HOMEPAGE="https://puppetlabs.com/"
-SRC_BASE="http://apt.puppetlabs.com/pool/wheezy/PC1/${PN:0:1}/${PN}/${PN}_${PV}-1wheezy"
-SRC_URI="
-	amd64? ( ${SRC_BASE}_amd64.deb )
-	x86?   ( ${SRC_BASE}_i386.deb )
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="puppetdb selinux"
-RESTRICT="strip"
-
-CDEPEND="!app-admin/augeas
-	!app-admin/mcollective
-	!app-admin/puppet
-	!dev-ruby/hiera
-	!dev-ruby/facter
-	!app-emulation/virt-what"
-
-DEPEND="
-	${CDEPEND}"
-RDEPEND="${CDEPEND}
-	sys-apps/dmidecode
-	selinux? (
-		sys-libs/libselinux[ruby]
-		sec-policy/selinux-puppet
-	)
-	puppetdb? ( >=dev-ruby/puppetdb-termini-3.0.1-r2 )"
-
-S=${WORKDIR}
-
-src_install() {
-	# conf.d
-	doconfd etc/default/puppet
-	doconfd etc/default/mcollective
-	# logrotate.d
-	insinto /etc/logrotate.d
-	doins etc/logrotate.d/mcollective
-	# puppet itself
-	insinto /etc/puppetlabs
-	doins -r etc/puppetlabs/*
-	# logdir for systemd
-	dodir var/log/puppetlabs/puppet/
-	fperms 0750 var/log/puppetlabs/puppet/
-	# the rest
-	insinto /opt
-	dodir opt/puppetlabs/puppet/cache
-	doins -r opt/*
-	fperms 0750 /opt/puppetlabs/puppet/cache
-	# init
-	newinitd "${FILESDIR}/puppet.initd" puppet
-	newinitd "${FILESDIR}/mcollective.initd" mcollective
-	systemd_dounit "${FILESDIR}/puppet.service"
-	systemd_dounit "${FILESDIR}/mcollective.service"
-	systemd_newtmpfilesd "${FILESDIR}/puppet-agent.conf.tmpfilesd" puppet-agent.conf
-	# symlinks
-	chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/"
-	chmod 0755 "${D}//opt/puppetlabs/puppet/lib/virt-what/virt-what-cpuid-helper"
-	dosym /opt/puppetlabs/bin/facter /usr/bin/facter
-	dosym /opt/puppetlabs/bin/hiera /usr/bin/hiera
-	dosym /opt/puppetlabs/bin/mco /usr/bin/mco
-	dosym /opt/puppetlabs/bin/puppet /usr/bin/puppet
-	dosym /opt/puppetlabs/puppet/bin/mcollectived /usr/sbin/mcollectived
-	dosym /opt/puppetlabs/puppet/bin/virt-what /usr/bin/virt-what
-	dosym /opt/puppetlabs/puppet/bin/augparse /usr/bin/augparse
-	dosym /opt/puppetlabs/puppet/bin/augtool /usr/bin/augtool
-	dosym /opt/puppetlabs/puppet/bin/extlookup2hiera /usr/bin/extlookup2hiera
-}
diff --git a/app-admin/puppet-agent/puppet-agent-1.2.6.ebuild b/app-admin/puppet-agent/puppet-agent-1.2.6.ebuild
deleted file mode 100644
index 7de77c5..0000000
--- a/app-admin/puppet-agent/puppet-agent-1.2.6.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils systemd unpacker
-
-DESCRIPTION="general puppet client utils along with mcollective hiera and facter"
-HOMEPAGE="https://puppetlabs.com/"
-SRC_BASE="http://apt.puppetlabs.com/pool/wheezy/PC1/${PN:0:1}/${PN}/${PN}_${PV}-1wheezy"
-SRC_URI="
-	amd64? ( ${SRC_BASE}_amd64.deb )
-	x86?   ( ${SRC_BASE}_i386.deb )
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="puppetdb selinux"
-RESTRICT="strip"
-
-CDEPEND="!app-admin/augeas
-	!app-admin/mcollective
-	!app-admin/puppet
-	!dev-ruby/hiera
-	!dev-ruby/facter
-	!app-emulation/virt-what"
-
-DEPEND="
-	${CDEPEND}"
-RDEPEND="${CDEPEND}
-	sys-apps/dmidecode
-	selinux? (
-		sys-libs/libselinux[ruby]
-		sec-policy/selinux-puppet
-	)
-	puppetdb? ( >=dev-ruby/puppetdb-termini-3.1.0 )"
-
-S=${WORKDIR}
-
-src_install() {
-	# conf.d
-	doconfd etc/default/puppet
-	doconfd etc/default/mcollective
-	# logrotate.d
-	insinto /etc/logrotate.d
-	doins etc/logrotate.d/mcollective
-	# puppet itself
-	insinto /etc/puppetlabs
-	doins -r etc/puppetlabs/*
-	# logdir for systemd
-	dodir var/log/puppetlabs/puppet/
-	fperms 0750 var/log/puppetlabs/puppet/
-	# the rest
-	insinto /opt
-	dodir opt/puppetlabs/puppet/cache
-	doins -r opt/*
-	fperms 0750 /opt/puppetlabs/puppet/cache
-	# init
-	newinitd "${FILESDIR}/puppet.initd" puppet
-	newinitd "${FILESDIR}/mcollective.initd" mcollective
-	systemd_dounit "${FILESDIR}/puppet.service"
-	systemd_dounit "${FILESDIR}/mcollective.service"
-	systemd_newtmpfilesd "${FILESDIR}/puppet-agent.conf.tmpfilesd" puppet-agent.conf
-	# symlinks
-	chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/"
-	chmod 0755 "${D}//opt/puppetlabs/puppet/lib/virt-what/virt-what-cpuid-helper"
-	dosym /opt/puppetlabs/bin/facter /usr/bin/facter
-	dosym /opt/puppetlabs/bin/hiera /usr/bin/hiera
-	dosym /opt/puppetlabs/bin/mco /usr/bin/mco
-	dosym /opt/puppetlabs/bin/puppet /usr/bin/puppet
-	dosym /opt/puppetlabs/puppet/bin/mcollectived /usr/sbin/mcollectived
-	dosym /opt/puppetlabs/puppet/bin/virt-what /usr/bin/virt-what
-	dosym /opt/puppetlabs/puppet/bin/augparse /usr/bin/augparse
-	dosym /opt/puppetlabs/puppet/bin/augtool /usr/bin/augtool
-	dosym /opt/puppetlabs/puppet/bin/extlookup2hiera /usr/bin/extlookup2hiera
-}
diff --git a/app-admin/puppet-agent/puppet-agent-1.2.7-r1.ebuild b/app-admin/puppet-agent/puppet-agent-1.2.7-r1.ebuild
deleted file mode 100644
index c46e0fc..0000000
--- a/app-admin/puppet-agent/puppet-agent-1.2.7-r1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils systemd unpacker user
-
-DESCRIPTION="general puppet client utils along with mcollective hiera and facter"
-HOMEPAGE="https://puppetlabs.com/"
-SRC_BASE="http://apt.puppetlabs.com/pool/wheezy/PC1/${PN:0:1}/${PN}/${PN}_${PV}-1wheezy"
-SRC_URI="
-	amd64? ( ${SRC_BASE}_amd64.deb )
-	x86?   ( ${SRC_BASE}_i386.deb )
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="puppetdb selinux"
-RESTRICT="strip"
-
-CDEPEND="!app-admin/augeas
-	!app-admin/mcollective
-	!app-admin/puppet
-	!dev-ruby/hiera
-	!dev-ruby/facter
-	!app-emulation/virt-what"
-
-DEPEND="
-	${CDEPEND}"
-RDEPEND="${CDEPEND}
-	sys-apps/dmidecode
-	selinux? (
-		sys-libs/libselinux[ruby]
-		sec-policy/selinux-puppet
-	)
-	puppetdb? ( >=dev-ruby/puppetdb-termini-3.1.0 )"
-
-S=${WORKDIR}
-
-QA_PREBUILT="
-	/opt/puppetlabs/puppet
-	/opt/puppetlabs/puppet/lib/ruby/vendor_ruby/2.1.0/x86_64-linux/*
-	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/mathn/*
-	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/io/*
-	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/dl/*
-	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/racc/*
-	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/enc/*
-	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/json/ext/*
-	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/rbconfig/*
-	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/digest/*
-	/opt/puppetlabs/puppet/lib/engines/*
-	/opt/puppetlabs/puppet/lib/virt-what/*
-	/opt/puppetlabs/puppet/bin/*"
-
-pkg_setup() {
-	enewgroup puppet
-	enewuser puppet -1 -1 /var/run/puppet puppet
-}
-
-src_install() {
-	# conf.d
-	doconfd etc/default/puppet
-	doconfd etc/default/mcollective
-	# logrotate.d
-	insinto /etc/logrotate.d
-	doins etc/logrotate.d/mcollective
-	# puppet itself
-	insinto /etc/puppetlabs
-	doins -r etc/puppetlabs/*
-	# logdir for systemd
-	dodir var/log/puppetlabs/puppet/
-	fperms 0750 var/log/puppetlabs/puppet/
-	# the rest
-	insinto /opt
-	dodir opt/puppetlabs/puppet/cache
-	doins -r opt/*
-	fperms 0750 /opt/puppetlabs/puppet/cache
-	# init
-	newinitd "${FILESDIR}/puppet.initd" puppet
-	newinitd "${FILESDIR}/mcollective.initd" mcollective
-	systemd_dounit "${FILESDIR}/puppet.service"
-	systemd_dounit "${FILESDIR}/mcollective.service"
-	systemd_newtmpfilesd "${FILESDIR}/puppet-agent.conf.tmpfilesd" puppet-agent.conf
-	# symlinks
-	chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/"
-	chmod 0755 "${D}//opt/puppetlabs/puppet/lib/virt-what/virt-what-cpuid-helper"
-	dosym /opt/puppetlabs/bin/facter /usr/bin/facter
-	dosym /opt/puppetlabs/bin/hiera /usr/bin/hiera
-	dosym /opt/puppetlabs/bin/mco /usr/bin/mco
-	dosym /opt/puppetlabs/bin/puppet /usr/bin/puppet
-	dosym /opt/puppetlabs/puppet/bin/mcollectived /usr/sbin/mcollectived
-	dosym /opt/puppetlabs/puppet/bin/virt-what /usr/bin/virt-what
-	dosym /opt/puppetlabs/puppet/bin/augparse /usr/bin/augparse
-	dosym /opt/puppetlabs/puppet/bin/augtool /usr/bin/augtool
-	dosym /opt/puppetlabs/puppet/bin/extlookup2hiera /usr/bin/extlookup2hiera
-}
diff --git a/app-admin/puppet-agent/puppet-agent-1.3.0.ebuild b/app-admin/puppet-agent/puppet-agent-1.3.0.ebuild
deleted file mode 100644
index 696bcc7..0000000
--- a/app-admin/puppet-agent/puppet-agent-1.3.0.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils systemd unpacker user
-
-DESCRIPTION="general puppet client utils along with mcollective hiera and facter"
-HOMEPAGE="https://puppetlabs.com/"
-SRC_BASE="http://apt.puppetlabs.com/pool/wheezy/PC1/${PN:0:1}/${PN}/${PN}_${PV}-1wheezy"
-SRC_URI="
-	amd64? ( ${SRC_BASE}_amd64.deb )
-	x86?   ( ${SRC_BASE}_i386.deb )
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="puppetdb selinux"
-RESTRICT="strip"
-
-CDEPEND="!app-admin/augeas
-	!app-admin/mcollective
-	!app-admin/puppet
-	!dev-ruby/hiera
-	!dev-ruby/facter
-	!app-emulation/virt-what"
-
-DEPEND="
-	${CDEPEND}"
-RDEPEND="${CDEPEND}
-	sys-apps/dmidecode
-	selinux? (
-		sys-libs/libselinux[ruby]
-		sec-policy/selinux-puppet
-	)
-	puppetdb? ( >=dev-ruby/puppetdb-termini-3.1.0 )"
-
-S=${WORKDIR}
-
-QA_PREBUILT="
-	/opt/puppetlabs/puppet
-	/opt/puppetlabs/puppet/lib/ruby/vendor_ruby/2.1.0/x86_64-linux/*
-	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/mathn/*
-	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/io/*
-	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/dl/*
-	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/racc/*
-	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/enc/*
-	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/json/ext/*
-	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/rbconfig/*
-	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/digest/*
-	/opt/puppetlabs/puppet/lib/engines/*
-	/opt/puppetlabs/puppet/lib/virt-what/*
-	/opt/puppetlabs/puppet/bin/*"
-
-pkg_setup() {
-	enewgroup puppet
-	enewuser puppet -1 -1 /var/run/puppet puppet
-}
-
-src_install() {
-	# conf.d
-	doconfd etc/default/puppet
-	doconfd etc/default/mcollective
-	# logrotate.d
-	insinto /etc/logrotate.d
-	doins etc/logrotate.d/mcollective
-	# puppet itself
-	insinto /etc/puppetlabs
-	doins -r etc/puppetlabs/*
-	# logdir for systemd
-	dodir var/log/puppetlabs/puppet/
-	fperms 0750 var/log/puppetlabs/puppet/
-	# the rest
-	insinto /opt
-	dodir opt/puppetlabs/puppet/cache
-	doins -r opt/*
-	fperms 0750 /opt/puppetlabs/puppet/cache
-	# init
-	newinitd "${FILESDIR}/puppet.initd" puppet
-	newinitd "${FILESDIR}/mcollective.initd" mcollective
-	systemd_dounit "${FILESDIR}/puppet.service"
-	systemd_dounit "${FILESDIR}/mcollective.service"
-	systemd_newtmpfilesd "${FILESDIR}/puppet-agent.conf.tmpfilesd" puppet-agent.conf
-	# symlinks
-	chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/"
-	chmod 0755 "${D}//opt/puppetlabs/puppet/lib/virt-what/virt-what-cpuid-helper"
-	dosym /opt/puppetlabs/bin/facter /usr/bin/facter
-	dosym /opt/puppetlabs/bin/hiera /usr/bin/hiera
-	dosym /opt/puppetlabs/bin/mco /usr/bin/mco
-	dosym /opt/puppetlabs/bin/puppet /usr/bin/puppet
-	dosym /opt/puppetlabs/puppet/bin/mcollectived /usr/sbin/mcollectived
-	dosym /opt/puppetlabs/puppet/bin/virt-what /usr/bin/virt-what
-	dosym /opt/puppetlabs/puppet/bin/augparse /usr/bin/augparse
-	dosym /opt/puppetlabs/puppet/bin/augtool /usr/bin/augtool
-	dosym /opt/puppetlabs/puppet/bin/extlookup2hiera /usr/bin/extlookup2hiera
-}
diff --git a/app-admin/puppet-agent/puppet-agent-1.3.2.ebuild b/app-admin/puppet-agent/puppet-agent-1.3.2.ebuild
new file mode 100644
index 0000000..2fb3b34
--- /dev/null
+++ b/app-admin/puppet-agent/puppet-agent-1.3.2.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils systemd unpacker user
+
+DESCRIPTION="general puppet client utils along with mcollective hiera and facter"
+HOMEPAGE="https://puppetlabs.com/"
+SRC_BASE="http://apt.puppetlabs.com/pool/wheezy/PC1/${PN:0:1}/${PN}/${PN}_${PV}-1wheezy"
+SRC_URI="
+	amd64? ( ${SRC_BASE}_amd64.deb )
+	x86?   ( ${SRC_BASE}_i386.deb )
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="puppetdb selinux"
+RESTRICT="strip"
+
+CDEPEND="!app-admin/augeas
+	!app-admin/mcollective
+	!app-admin/puppet
+	!dev-ruby/hiera
+	!dev-ruby/facter
+	!app-emulation/virt-what"
+
+DEPEND="
+	${CDEPEND}"
+RDEPEND="${CDEPEND}
+	sys-apps/dmidecode
+	selinux? (
+		sys-libs/libselinux[ruby]
+		sec-policy/selinux-puppet
+	)
+	puppetdb? ( >=dev-ruby/puppetdb-termini-3.1.0 )"
+
+S=${WORKDIR}
+
+QA_PREBUILT="
+	/opt/puppetlabs/puppet
+	/opt/puppetlabs/puppet/lib/ruby/vendor_ruby/2.1.0/x86_64-linux/*
+	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/mathn/*
+	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/io/*
+	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/dl/*
+	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/racc/*
+	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/enc/*
+	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/json/ext/*
+	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/rbconfig/*
+	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/digest/*
+	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/*
+	/opt/puppetlabs/puppet/lib/engines/*
+	/opt/puppetlabs/puppet/lib/virt-what/*
+	/opt/puppetlabs/puppet/lib/*
+	/opt/puppetlabs/puppet/bin/*"
+
+pkg_setup() {
+	enewgroup puppet
+	enewuser puppet -1 -1 /var/run/puppet puppet
+}
+
+src_install() {
+	# conf.d
+	doconfd etc/default/puppet
+	doconfd etc/default/mcollective
+	# logrotate.d
+	insinto /etc/logrotate.d
+	doins etc/logrotate.d/mcollective
+	# puppet itself
+	insinto /etc/puppetlabs
+	doins -r etc/puppetlabs/*
+	# logdir for systemd
+	dodir var/log/puppetlabs/puppet/
+	fperms 0750 var/log/puppetlabs/puppet/
+	# the rest
+	insinto /opt
+	dodir opt/puppetlabs/puppet/cache
+	doins -r opt/*
+	fperms 0750 /opt/puppetlabs/puppet/cache
+	# init
+	newinitd "${FILESDIR}/puppet.initd" puppet
+	newinitd "${FILESDIR}/mcollective.initd" mcollective
+	systemd_dounit "${FILESDIR}/puppet.service"
+	systemd_dounit "${FILESDIR}/mcollective.service"
+	systemd_newtmpfilesd "${FILESDIR}/puppet-agent.conf.tmpfilesd" puppet-agent.conf
+	# symlinks
+	chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/"
+	chmod 0755 "${D}//opt/puppetlabs/puppet/lib/virt-what/virt-what-cpuid-helper"
+	dosym /opt/puppetlabs/bin/facter /usr/bin/facter
+	dosym /opt/puppetlabs/bin/hiera /usr/bin/hiera
+	dosym /opt/puppetlabs/bin/mco /usr/bin/mco
+	dosym /opt/puppetlabs/bin/puppet /usr/bin/puppet
+	dosym /opt/puppetlabs/puppet/bin/mcollectived /usr/sbin/mcollectived
+	dosym /opt/puppetlabs/puppet/bin/virt-what /usr/bin/virt-what
+	dosym /opt/puppetlabs/puppet/bin/augparse /usr/bin/augparse
+	dosym /opt/puppetlabs/puppet/bin/augtool /usr/bin/augtool
+	dosym /opt/puppetlabs/puppet/bin/extlookup2hiera /usr/bin/extlookup2hiera
+}
diff --git a/app-admin/puppet-agent/puppet-agent-1.3.4.ebuild b/app-admin/puppet-agent/puppet-agent-1.3.4.ebuild
new file mode 100644
index 0000000..a757b0a
--- /dev/null
+++ b/app-admin/puppet-agent/puppet-agent-1.3.4.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils systemd unpacker user
+
+DESCRIPTION="general puppet client utils along with mcollective hiera and facter"
+HOMEPAGE="https://puppetlabs.com/"
+SRC_BASE="http://apt.puppetlabs.com/pool/wheezy/PC1/${PN:0:1}/${PN}/${PN}_${PV}-1wheezy"
+SRC_URI="
+	amd64? ( ${SRC_BASE}_amd64.deb )
+	x86?   ( ${SRC_BASE}_i386.deb )
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="puppetdb selinux"
+RESTRICT="strip"
+
+CDEPEND="!app-admin/augeas
+	!app-admin/mcollective
+	!app-admin/puppet
+	!dev-ruby/hiera
+	!dev-ruby/facter
+	!app-emulation/virt-what"
+
+DEPEND="
+	${CDEPEND}"
+RDEPEND="${CDEPEND}
+	sys-apps/dmidecode
+	selinux? (
+		sys-libs/libselinux[ruby]
+		sec-policy/selinux-puppet
+	)
+	puppetdb? ( >=dev-ruby/puppetdb-termini-3.1.0 )"
+
+S=${WORKDIR}
+
+QA_PREBUILT="
+	/opt/puppetlabs/puppet
+	/opt/puppetlabs/puppet/lib/ruby/vendor_ruby/2.1.0/x86_64-linux/*
+	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/mathn/*
+	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/io/*
+	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/dl/*
+	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/racc/*
+	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/enc/*
+	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/json/ext/*
+	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/rbconfig/*
+	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/digest/*
+	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/*
+	/opt/puppetlabs/puppet/lib/engines/*
+	/opt/puppetlabs/puppet/lib/virt-what/*
+	/opt/puppetlabs/puppet/lib/*
+	/opt/puppetlabs/puppet/bin/*"
+
+pkg_setup() {
+	enewgroup puppet
+	enewuser puppet -1 -1 /var/run/puppet puppet
+}
+
+src_install() {
+	# conf.d
+	doconfd etc/default/puppet
+	doconfd etc/default/mcollective
+	# logrotate.d
+	insinto /etc/logrotate.d
+	doins etc/logrotate.d/mcollective
+	# puppet itself
+	insinto /etc/puppetlabs
+	doins -r etc/puppetlabs/*
+	# logdir for systemd
+	dodir var/log/puppetlabs/puppet/
+	fperms 0750 var/log/puppetlabs/puppet/
+	# the rest
+	insinto /opt
+	dodir opt/puppetlabs/puppet/cache
+	doins -r opt/*
+	fperms 0750 /opt/puppetlabs/puppet/cache
+	# init
+	newinitd "${FILESDIR}/puppet.initd" puppet
+	newinitd "${FILESDIR}/mcollective.initd" mcollective
+	systemd_dounit "${FILESDIR}/puppet.service"
+	systemd_dounit "${FILESDIR}/mcollective.service"
+	systemd_newtmpfilesd "${FILESDIR}/puppet-agent.conf.tmpfilesd" puppet-agent.conf
+	# symlinks
+	chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/"
+	chmod 0755 "${D}//opt/puppetlabs/puppet/lib/virt-what/virt-what-cpuid-helper"
+	dosym /opt/puppetlabs/bin/facter /usr/bin/facter
+	dosym /opt/puppetlabs/bin/hiera /usr/bin/hiera
+	dosym /opt/puppetlabs/bin/mco /usr/bin/mco
+	dosym /opt/puppetlabs/bin/puppet /usr/bin/puppet
+	dosym /opt/puppetlabs/puppet/bin/mcollectived /usr/sbin/mcollectived
+	dosym /opt/puppetlabs/puppet/bin/virt-what /usr/bin/virt-what
+	dosym /opt/puppetlabs/puppet/bin/augparse /usr/bin/augparse
+	dosym /opt/puppetlabs/puppet/bin/augtool /usr/bin/augtool
+	dosym /opt/puppetlabs/puppet/bin/extlookup2hiera /usr/bin/extlookup2hiera
+}
diff --git a/app-admin/puppet-lint/metadata.xml b/app-admin/puppet-lint/metadata.xml
index e2e74b8..2fe1abe 100644
--- a/app-admin/puppet-lint/metadata.xml
+++ b/app-admin/puppet-lint/metadata.xml
@@ -2,9 +2,14 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <!--
 $Id$
--->
-<pkgmetadata>
-<herd>sysadmin</herd>
-<herd>ruby</herd>
+--><pkgmetadata>
+<maintainer type="project">
+	<email>sysadmin@gentoo.org</email>
+	<name>Gentoo Sysadmin Project</name>
+</maintainer>
+<maintainer type="project">
+	<email>ruby@gentoo.org</email>
+	<name>Gentoo Ruby Project</name>
+</maintainer>
 <longdescription>Tim Sharpe's Puppet Linter. Enforces puppetlabs style.</longdescription>
 </pkgmetadata>
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index f0e6f45..80bbf9a 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -4,6 +4,7 @@
 DIST puppet-3.8.2.tar.gz 2637591 SHA256 5a89c623f22fc96a2919801ff874b10f8f1a66e95c09976c73b257b8bbc39986 SHA512 b209a7b009e1d9510753a7484e620c3fb34a83058e8dbc2d9de2c33aca97e813fa85046d9b4de2fad9cb8fb7db257d46c221dd6eb9c0f86e1343cce6e1a9ca5a WHIRLPOOL 55bc7ece7ee918fab29e0f116f8ebc58322b42c07285a8965f2acae9dcff9c13e90cfc9c3c2537f9d21c663062015482fd48e24a1505fc7445fb6b949bc805bc
 DIST puppet-3.8.3.tar.gz 2638669 SHA256 bbdf5e32428fe005ea7279e9396bfcdf2c9b112763595fbfed48fb599108df7f SHA512 8f955c68556a835de738cf5f34cefd916392145853cd59108af26cb5c23b28740cdd078ac33b3171280ac691884c073c53d230641c88484561ac463bca094da6 WHIRLPOOL 2ff3181a3ea11d4b25d8499c3984f22e530e94ccc5a87e668b758a55f3c9091ca3d344afc62fb0f08b1835d5668b2f90e26ddf2560111fb52c0292b511301cd2
 DIST puppet-3.8.4.tar.gz 2639537 SHA256 19e83ebbbf0933a9df6696255d7ff4d65e3daba1ed8dacf87f16a87ae40a7ad7 SHA512 bcd4251f56292529973c1694d4c1b0673e01cc6525c3fda8415e3b69b03861f0c1c168911b47c1372eeecd54c5eb2efc67ae23fd9ca0329b821b6f1b1e4e641a WHIRLPOOL 8088df2bcfa2f2ed5be8f0769c45d70d5b8496c59f84217299d0df9b143f7551c2fb3a86edc467dfdaca6574a57e7fe4a8b89e9a376e991385650f6ce4dc9f21
+DIST puppet-3.8.5.tar.gz 2640987 SHA256 ecba7c70e32c3da6682f9c4706c01cc588a5614759a864446e9fbd2449c6305c SHA512 9c17508032ab4306c0ec1d2e79e1c3548a1da6c875c61155e597642cc901d0639eb99543084a6f88c5826b5faa5af83eaf936672e80a32bf27cf45f545e7d859 WHIRLPOOL 46a227365316c913f16a3b02bc13fd3b47ace497c406a14309d480c49881665d0ca9a0d86fae8a3761d6beb159b222dfdd033e0c1cdb2aaeadd62741c232a50f
 DIST puppet-4.0.0.tar.gz 2498445 SHA256 c02a5cceb68d6c26228c242a312d68cf054233842e914e9d3aec32b38034e013 SHA512 c8ec0771105e83498f7558e1dfa8679d94cb2d526589041319f35cce214a4c8602ebf8541a15fa64ce542168d101042153815887fb8350bce0c4371c490f396f WHIRLPOOL af53d8b14b7110e6648873e9822de37a8bb17b7f635800d9a9fb1fff7df22000cd13604b45913ddddbae58b7af198c80e84c001cc8b6d1643db9ead4ece42bb7
 DIST puppet-4.1.0.tar.gz 2532579 SHA256 a168ac45a7b25932dfc78bd5da3efe41363e239c7361dd5c4f91615dc17bb275 SHA512 85ba32fb3a7e9f3413f201263943411fbb6b57a4aa13461954b32c1095b06d04f26288a216c5624290cf89d09183bc86bb5f57769fe2ccadc44bf57cd601f5d3 WHIRLPOOL 5288b3204a5c5b96da4eabdee19c1156e71b3a76662d8d28fc8e43988e76ca52618d423c207c1a25d5d92638c559db76ee3c8ce336286d3a5e875c1dc538f8b8
 DIST puppet-4.2.1.tar.gz 2546267 SHA256 519842dfa03ff78c94e77fb28867aef12933691b9e2ce41788f80c5c2865fe7e SHA512 d4ce3f6cd0fbca4270a9121671c27985c9aaa5360a1a317afcc8f79cd81d285e1661cc77d50dda47abd8e50309762d5931545ea4d675b9fb6c32b612e570fd3d WHIRLPOOL 492294158f7f5eb78b93098c759c97ca53a09fc7b24a8350dfd76220a1d578f78375ba3bd9d618b97299931001af83cc5475c4f6ad9bbb1c3d9744fa07585bfd
diff --git a/app-admin/puppet/metadata.xml b/app-admin/puppet/metadata.xml
index 93a305e..b6c9d23 100644
--- a/app-admin/puppet/metadata.xml
+++ b/app-admin/puppet/metadata.xml
@@ -1,11 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 	<email>prometheanfire@gentoo.org</email>
 	</maintainer>
-	<herd>sysadmin</herd>
-	<herd>ruby</herd>
+	<maintainer type="project">
+		<email>sysadmin@gentoo.org</email>
+		<name>Gentoo Sysadmin Project</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
 	<longdescription lang="en">
 		Centralised configuration management for networks
 		Puppet lets you centrally manage every important aspect of your system
@@ -21,9 +27,9 @@
 	</longdescription>
 	<use>
 <!--		<flag name='puppetdb'>Enable puppetdb support</flag> -->
-		<flag name='augeas'>Enable augeas support</flag>
-		<flag name='diff'>Enable diff support</flag>
-		<flag name='rrdtool'>Enable rrdtool support</flag>
-		<flag name='shadow'>Enable shadow support</flag>
+		<flag name="augeas">Enable augeas support</flag>
+		<flag name="diff">Enable diff support</flag>
+		<flag name="rrdtool">Enable rrdtool support</flag>
+		<flag name="shadow">Enable shadow support</flag>
 	</use>
 </pkgmetadata>
diff --git a/app-admin/puppet/puppet-3.7.4-r2.ebuild b/app-admin/puppet/puppet-3.7.4-r2.ebuild
deleted file mode 100644
index c841755..0000000
--- a/app-admin/puppet/puppet-3.7.4-r2.ebuild
+++ /dev/null
@@ -1,191 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-inherit elisp-common xemacs-elisp-common eutils user ruby-fakegem versionator
-
-DESCRIPTION="A system automation and configuration management software"
-HOMEPAGE="http://puppetlabs.com/"
-SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
-
-LICENSE="Apache-2.0 GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
-IUSE="augeas diff doc emacs ldap minimal rrdtool selinux shadow sqlite vim-syntax xemacs"
-
-ruby_add_rdepend "
-	dev-ruby/hiera
-	>=dev-ruby/rgen-0.6.5 =dev-ruby/rgen-0.6*
-	>=dev-ruby/facter-1.6.2 <dev-ruby/facter-3
-	dev-ruby/json
-	augeas? ( dev-ruby/ruby-augeas )
-	diff? ( dev-ruby/diff-lcs )
-	doc? ( dev-ruby/rdoc )
-	ldap? ( dev-ruby/ruby-ldap )
-	shadow? ( dev-ruby/ruby-shadow )
-	sqlite? ( dev-ruby/sqlite3 )
-	virtual/ruby-ssl"
-
-ruby_add_bdepend "test? ( dev-ruby/mocha:0.10 )"
-
-DEPEND="${DEPEND}
-	ruby_targets_ruby19? ( dev-lang/ruby:1.9[yaml] )
-	emacs? ( virtual/emacs )
-	xemacs? ( app-editors/xemacs )"
-RDEPEND="${RDEPEND}
-	ruby_targets_ruby19? ( dev-lang/ruby:1.9[yaml] )
-	rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
-	selinux? (
-		sys-libs/libselinux[ruby]
-		sec-policy/selinux-puppet
-	)
-	vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
-	>=app-portage/eix-0.18.0"
-
-SITEFILE="50${PN}-mode-gentoo.el"
-
-pkg_setup() {
-	enewgroup puppet
-	enewuser puppet -1 -1 /var/lib/puppet puppet
-}
-
-all_ruby_prepare() {
-	# Avoid spec that require unpackaged json-schema.
-	rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
-
-	# Avoid Rails specs to avoid this dependency and because they
-	# currently fail against Rails 4.1.
-	find spec -type f -name '*rails*' -o -name '*active_record*' | xargs rm || die
-	rm -r spec/unit/rails || die
-	rm spec/unit/parser/collector_spec.rb || die
-
-	# Avoid specs that can only run in the puppet.git repository. This
-	# should be narrowed down to the specific specs.
-	rm spec/integration/parser/compiler_spec.rb spec/integration/parser/future_compiler_spec.rb || die
-
-	# Avoid failing spec that need further investigation.
-	rm spec/unit/module_tool/metadata_spec.rb || die
-}
-
-all_ruby_compile() {
-	if use emacs ; then
-		elisp-compile ext/emacs/puppet-mode.el
-	fi
-
-	if use xemacs ; then
-		# Create a separate version for xemacs to be able to install
-		# emacs and xemacs in parallel.
-		mkdir ext/xemacs
-		cp ext/emacs/* ext/xemacs/
-		xemacs-elisp-compile ext/xemacs/puppet-mode.el
-	fi
-}
-
-each_ruby_install() {
-	each_fakegem_install
-	#${RUBY} install.rb --destdir="${D}" install || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	#systemd stuffs
-	insinto /usr/lib/systemd/system
-	doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
-	insinto /usr/lib/tmpfiles.d
-	newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
-
-	newinitd "${FILESDIR}"/puppet.init-r1 puppet
-
-	# Initial configuration files
-	insinto /etc/puppet
-
-	# Location of log and data files
-	keepdir /var/log/puppet
-	fowners -R puppet:puppet /var/log/puppet
-
-	if use minimal ; then
-		rm "${ED}/etc/puppet/auth.conf"
-	else
-		insinto /usr/lib/systemd/system
-		doins "${WORKDIR}/all/${P}/ext/systemd/puppetmaster.service"
-		newinitd "${FILESDIR}"/puppetmaster.init-r1 puppetmaster
-		newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster
-
-		insinto /etc/puppet
-
-		keepdir /etc/puppet/manifests
-		keepdir /etc/puppet/modules
-
-		keepdir /var/lib/puppet/ssl
-		keepdir /var/lib/puppet/facts
-		keepdir /var/lib/puppet/files
-		fowners -R puppet:puppet /var/lib/puppet
-		fperms 0750 /var/lib/puppet
-	fi
-	fperms 0750 /etc/puppet
-	fowners :puppet /etc/puppet
-
-	if use emacs ; then
-		elisp-install ${PN} ext/emacs/puppet-mode.el*
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-	if use xemacs ; then
-		xemacs-elisp-install ${PN} ext/xemacs/puppet-mode.el*
-		xemacs-elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-	if use ldap ; then
-		insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
-	fi
-
-	# ext and examples files
-	for f in $(find ext examples -type f) ; do
-		docinto "$(dirname ${f})"; dodoc "${f}"
-	done
-}
-
-pkg_postinst() {
-	elog
-	elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
-	elog "cause puppet to hang while installing packages."
-	elog
-	elog "Portage Puppet module with Gentoo-specific resources:"
-	elog "http://forge.puppetlabs.com/gentoo/portage"
-	elog
-
-	if [ \
-		-f "${EPREFIX}/etc/puppet/puppetd.conf" -o \
-		-f "${EPREFIX}/etc/puppet/puppetmaster.conf" -o \
-		-f "${EPREFIX}/etc/puppet/puppetca.conf" \
-	] ; then
-		elog
-		elog "Please remove deprecated config files."
-		elog "	/etc/puppet/puppetca.conf"
-		elog "	/etc/puppet/puppetd.conf"
-		elog "	/etc/puppet/puppetmasterd.conf"
-		elog
-	fi
-
-	if [ "$(get_major_version $REPLACING_VERSIONS)" = "2" ]; then
-		elog
-		elog "If you're upgrading from 2.x then we strongly suggest you to read:"
-		elog "http://docs.puppetlabs.com/guides/upgrading.html"
-		elog
-	fi
-
-	use emacs && elisp-site-regen
-	use xemacs && xemacs-elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-	use xemacs && xemacs-elisp-site-regen
-}
diff --git a/app-admin/puppet/puppet-3.7.4-r3.ebuild b/app-admin/puppet/puppet-3.7.4-r3.ebuild
new file mode 100644
index 0000000..fbc3b74
--- /dev/null
+++ b/app-admin/puppet/puppet-3.7.4-r3.ebuild
@@ -0,0 +1,191 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+USE_RUBY="ruby19 ruby20 ruby21"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec"
+
+inherit elisp-common xemacs-elisp-common eutils user ruby-fakegem versionator
+
+DESCRIPTION="A system automation and configuration management software"
+HOMEPAGE="http://puppetlabs.com/"
+SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
+
+LICENSE="Apache-2.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
+IUSE="augeas diff doc emacs ldap minimal rrdtool selinux shadow sqlite vim-syntax xemacs"
+
+ruby_add_rdepend "
+	dev-ruby/hiera
+	>=dev-ruby/rgen-0.6.5
+	>=dev-ruby/facter-1.6.2 <dev-ruby/facter-3
+	dev-ruby/json
+	augeas? ( dev-ruby/ruby-augeas )
+	diff? ( dev-ruby/diff-lcs )
+	doc? ( dev-ruby/rdoc )
+	ldap? ( dev-ruby/ruby-ldap )
+	shadow? ( dev-ruby/ruby-shadow )
+	sqlite? ( dev-ruby/sqlite3 )
+	virtual/ruby-ssl"
+
+ruby_add_bdepend "test? ( dev-ruby/mocha:0.10 )"
+
+DEPEND="${DEPEND}
+	ruby_targets_ruby19? ( dev-lang/ruby:1.9[yaml] )
+	emacs? ( virtual/emacs )
+	xemacs? ( app-editors/xemacs )"
+RDEPEND="${RDEPEND}
+	ruby_targets_ruby19? ( dev-lang/ruby:1.9[yaml] )
+	rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
+	selinux? (
+		sys-libs/libselinux[ruby]
+		sec-policy/selinux-puppet
+	)
+	vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
+	>=app-portage/eix-0.18.0"
+
+SITEFILE="50${PN}-mode-gentoo.el"
+
+pkg_setup() {
+	enewgroup puppet
+	enewuser puppet -1 -1 /var/lib/puppet puppet
+}
+
+all_ruby_prepare() {
+	# Avoid spec that require unpackaged json-schema.
+	rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
+
+	# Avoid Rails specs to avoid this dependency and because they
+	# currently fail against Rails 4.1.
+	find spec -type f -name '*rails*' -o -name '*active_record*' | xargs rm || die
+	rm -r spec/unit/rails || die
+	rm spec/unit/parser/collector_spec.rb || die
+
+	# Avoid specs that can only run in the puppet.git repository. This
+	# should be narrowed down to the specific specs.
+	rm spec/integration/parser/compiler_spec.rb spec/integration/parser/future_compiler_spec.rb || die
+
+	# Avoid failing spec that need further investigation.
+	rm spec/unit/module_tool/metadata_spec.rb || die
+}
+
+all_ruby_compile() {
+	if use emacs ; then
+		elisp-compile ext/emacs/puppet-mode.el
+	fi
+
+	if use xemacs ; then
+		# Create a separate version for xemacs to be able to install
+		# emacs and xemacs in parallel.
+		mkdir ext/xemacs
+		cp ext/emacs/* ext/xemacs/
+		xemacs-elisp-compile ext/xemacs/puppet-mode.el
+	fi
+}
+
+each_ruby_install() {
+	each_fakegem_install
+	#${RUBY} install.rb --destdir="${D}" install || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	#systemd stuffs
+	insinto /usr/lib/systemd/system
+	doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
+	insinto /usr/lib/tmpfiles.d
+	newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
+
+	newinitd "${FILESDIR}"/puppet.init-r1 puppet
+
+	# Initial configuration files
+	insinto /etc/puppet
+
+	# Location of log and data files
+	keepdir /var/log/puppet
+	fowners -R puppet:puppet /var/log/puppet
+
+	if use minimal ; then
+		rm "${ED}/etc/puppet/auth.conf"
+	else
+		insinto /usr/lib/systemd/system
+		doins "${WORKDIR}/all/${P}/ext/systemd/puppetmaster.service"
+		newinitd "${FILESDIR}"/puppetmaster.init-r1 puppetmaster
+		newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster
+
+		insinto /etc/puppet
+
+		keepdir /etc/puppet/manifests
+		keepdir /etc/puppet/modules
+
+		keepdir /var/lib/puppet/ssl
+		keepdir /var/lib/puppet/facts
+		keepdir /var/lib/puppet/files
+		fowners -R puppet:puppet /var/lib/puppet
+		fperms 0750 /var/lib/puppet
+	fi
+	fperms 0750 /etc/puppet
+	fowners :puppet /etc/puppet
+
+	if use emacs ; then
+		elisp-install ${PN} ext/emacs/puppet-mode.el*
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+
+	if use xemacs ; then
+		xemacs-elisp-install ${PN} ext/xemacs/puppet-mode.el*
+		xemacs-elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+
+	if use ldap ; then
+		insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
+	fi
+
+	# ext and examples files
+	for f in $(find ext examples -type f) ; do
+		docinto "$(dirname ${f})"; dodoc "${f}"
+	done
+}
+
+pkg_postinst() {
+	elog
+	elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
+	elog "cause puppet to hang while installing packages."
+	elog
+	elog "Portage Puppet module with Gentoo-specific resources:"
+	elog "http://forge.puppetlabs.com/gentoo/portage"
+	elog
+
+	if [ \
+		-f "${EPREFIX}/etc/puppet/puppetd.conf" -o \
+		-f "${EPREFIX}/etc/puppet/puppetmaster.conf" -o \
+		-f "${EPREFIX}/etc/puppet/puppetca.conf" \
+	] ; then
+		elog
+		elog "Please remove deprecated config files."
+		elog "	/etc/puppet/puppetca.conf"
+		elog "	/etc/puppet/puppetd.conf"
+		elog "	/etc/puppet/puppetmasterd.conf"
+		elog
+	fi
+
+	if [ "$(get_major_version $REPLACING_VERSIONS)" = "2" ]; then
+		elog
+		elog "If you're upgrading from 2.x then we strongly suggest you to read:"
+		elog "http://docs.puppetlabs.com/guides/upgrading.html"
+		elog
+	fi
+
+	use emacs && elisp-site-regen
+	use xemacs && xemacs-elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+	use xemacs && xemacs-elisp-site-regen
+}
diff --git a/app-admin/puppet/puppet-3.8.5.ebuild b/app-admin/puppet/puppet-3.8.5.ebuild
new file mode 100644
index 0000000..104bf83
--- /dev/null
+++ b/app-admin/puppet/puppet-3.8.5.ebuild
@@ -0,0 +1,189 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+USE_RUBY="ruby20 ruby21"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec"
+
+inherit elisp-common xemacs-elisp-common eutils user ruby-fakegem versionator
+
+DESCRIPTION="A system automation and configuration management software"
+HOMEPAGE="http://puppetlabs.com/"
+SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
+
+LICENSE="Apache-2.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
+IUSE="augeas diff doc emacs ldap minimal rrdtool selinux shadow sqlite vim-syntax xemacs"
+
+ruby_add_rdepend "
+	dev-ruby/hiera
+	>=dev-ruby/rgen-0.7.0
+	>=dev-ruby/facter-1.6.2 <dev-ruby/facter-3
+	dev-ruby/json
+	augeas? ( dev-ruby/ruby-augeas )
+	diff? ( dev-ruby/diff-lcs )
+	doc? ( dev-ruby/rdoc )
+	ldap? ( dev-ruby/ruby-ldap )
+	shadow? ( dev-ruby/ruby-shadow )
+	sqlite? ( dev-ruby/sqlite3 )
+	virtual/ruby-ssl"
+
+ruby_add_bdepend "test? ( dev-ruby/mocha )"
+
+DEPEND="${DEPEND}
+	emacs? ( virtual/emacs )
+	xemacs? ( app-editors/xemacs )"
+RDEPEND="${RDEPEND}
+	rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
+	selinux? (
+		sys-libs/libselinux[ruby]
+		sec-policy/selinux-puppet
+	)
+	vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
+	>=app-portage/eix-0.18.0"
+
+SITEFILE="50${PN}-mode-gentoo.el"
+
+pkg_setup() {
+	enewgroup puppet
+	enewuser puppet -1 -1 /var/lib/puppet puppet
+}
+
+all_ruby_prepare() {
+	# Avoid spec that require unpackaged json-schema.
+	rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
+
+	# Avoid Rails specs to avoid this dependency and because they
+	# currently fail against Rails 4.1.
+	find spec -type f -name '*rails*' -o -name '*active_record*' | xargs rm || die
+	rm -r spec/unit/rails || die
+	rm spec/unit/parser/collector_spec.rb || die
+
+	# Avoid specs that can only run in the puppet.git repository. This
+	# should be narrowed down to the specific specs.
+	rm spec/integration/parser/compiler_spec.rb spec/integration/parser/future_compiler_spec.rb || die
+
+	# Avoid failing spec that need further investigation.
+	rm spec/unit/module_tool/metadata_spec.rb || die
+}
+
+all_ruby_compile() {
+	if use emacs ; then
+		elisp-compile ext/emacs/puppet-mode.el
+	fi
+
+	if use xemacs ; then
+		# Create a separate version for xemacs to be able to install
+		# emacs and xemacs in parallel.
+		mkdir ext/xemacs
+		cp ext/emacs/* ext/xemacs/
+		xemacs-elisp-compile ext/xemacs/puppet-mode.el
+	fi
+}
+
+each_ruby_install() {
+	each_fakegem_install
+	#${RUBY} install.rb --destdir="${D}" install || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	#systemd stuffs
+	insinto /usr/lib/systemd/system
+	doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
+	insinto /usr/lib/tmpfiles.d
+	newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
+
+	newinitd