Merge remote-tracking branch 'github/pr/503'.

author: Patrice Clement <monsieurp@gentoo.org> 2015-12-21 22:25:21 +0000
committer: Patrice Clement <monsieurp@gentoo.org> 2015-12-21 22:26:29 +0000
commit: 46790bbc48a6eb09204fda13c861bfb26d72adb3 (patch)
tree: fbf5ae04c0162a7074cbe49fca019ba709ccfeaa
parent: dev-java/jebl: Stable for amd64. Retroactively mark stable for the remaining ... (diff)
parent: app-text/asciidoc-9999: fix a typo (diff)
download: gentoo-46790bbc48a6eb09204fda13c861bfb26d72adb3.tar.gz
gentoo-46790bbc48a6eb09204fda13c861bfb26d72adb3.tar.bz2
gentoo-46790bbc48a6eb09204fda13c861bfb26d72adb3.zip
535 files changed, 7450 insertions, 4272 deletions
diff --git a/app-admin/mongo-tools/Manifest b/app-admin/mongo-tools/Manifest
index 2e009da8c786..bff25728bde6 100644
--- a/app-admin/mongo-tools/Manifest
+++ b/app-admin/mongo-tools/Manifest
@@ -1,3 +1,4 @@
 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
diff --git a/app-admin/mongo-tools/mongo-tools-3.0.8.ebuild b/app-admin/mongo-tools/mongo-tools-3.0.8.ebuild
new file mode 100644
index 000000000000..658782fe250e
--- /dev/null
+++ b/app-admin/mongo-tools/mongo-tools-3.0.8.ebuild
@@ -0,0 +1,53 @@
+# 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/rsyslog/rsyslog-8.13.0.ebuild b/app-admin/rsyslog/rsyslog-8.13.0.ebuild
index 34085ef1ba00..fb4227249207 100644
--- a/app-admin/rsyslog/rsyslog-8.13.0.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.13.0.ebuild
@@ -31,7 +31,7 @@ else
 		http://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
 		doc? ( http://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz )
 	"
-	KEYWORDS="~amd64 ~arm ~hppa ~x86"
+	KEYWORDS="~amd64 ~arm hppa ~x86"
 
 	PATCHES+=( "${FILESDIR}"/${BRANCH}/50-${PN}-8.12.0-fix-re_extract.patch )
 	PATCHES+=( "${FILESDIR}"/${BRANCH}/50-${PN}-8.13.0-lookup-table-reload-bugfix.patch )
diff --git a/app-admin/setools/metadata.xml b/app-admin/setools/metadata.xml
index 12d653b53586..7fb3c36d576f 100644
--- a/app-admin/setools/metadata.xml
+++ b/app-admin/setools/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>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>SELinux policy analysis tools.</longdescription>
 	<upstream>
 		<remote-id type="github">TresysTechnology/setools</remote-id>
diff --git a/app-backup/snapper/Manifest b/app-backup/snapper/Manifest
index 54e158ee7a55..b81b7b1acf74 100644
--- a/app-backup/snapper/Manifest
+++ b/app-backup/snapper/Manifest
@@ -1,4 +1 @@
-DIST snapper-0.2.3.tar.bz2 451916 SHA256 6c78fc57ac018f7536a03971927f2b17f1f048f87e26689609028f51500c9c6a SHA512 a8b847e3bc0759a717f4256ed3c9e7ed675f040a56e80ea7ca2d7f12906198ecd141638f00acce02195b094a9db7fbdd5cb233012e3ba8be7a3502cba1bbd968 WHIRLPOOL cb4a0cd1f4c01ccbf213395f9b8c0eff325f5453fa0e05e37b4b525e6c0b276b3767194a06b2ea50b877883a6061f86817d773775842e161f3298e45573f6789
-DIST snapper-0.2.4.tar.bz2 458409 SHA256 8fc70b8e7a39dc3249ce9141e2c5f0623bb80f8e4150a543d8ed04d2ad27f399 SHA512 e986ebb482a7e30e4e97edc2882653a041c49c9291310469860fd9a0e93c46747ec31723f771a710a6fcce2f4863fdf672c623453ae27b4fb7cd911b8d4b35ed WHIRLPOOL 1627664909ea3a5959c6ff6a66c1dcbacbe835bce2f1f20cc4c380e8613545e8a0e3f7569c32f774a5534636b8321af71d78c21368e8b7a2104e05d241f5d8cd
-DIST snapper-0.2.6.tar.bz2 473015 SHA256 3390650be0e4709595d28df287a0e5902fb570e9fcb5ba992f435326bc53b75e SHA512 d49eef086d84f02106691872db6369b10cb55a6afe6f2cfb6c790330321397d66dc1aa0229d31d9e3c7b1efb6bd6c0fd9242dbb69a44fe3433233717df98a334 WHIRLPOOL 84a24153651dd9bd47e4f25012d87527b35b5dfd3b3a1da86fe0bdecbca032f5fe3c58ab1197a759058301b029961a2b5965dfb245a80cd50621af971d49a722
 DIST snapper-0.2.8.tar.bz2 475053 SHA256 a44608648ed21a1346f8ae9345044901c39ad01abb501806a22c9d4a771eadc5 SHA512 ce1529062943c34b9de2eafb62c6e28b39bda6f4afc23ec5df5ddd42f213cbaf0d77d94d11d982285114ceecd27bd48206436119af84b2769ed4792aab01c75d WHIRLPOOL 3463cf8beb7adb1f3869645b20928dc21fc9cb72f8ed5275688e0b53c97b8103d0536e3246f12fcdc90c1889d221d13ce131b1920c7298232212c003ea9abb6d
diff --git a/app-backup/snapper/snapper-0.2.3-r1.ebuild b/app-backup/snapper/snapper-0.2.3-r1.ebuild
deleted file mode 100644
index 9bf8211fe549..000000000000
--- a/app-backup/snapper/snapper-0.2.3-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="Command-line program for btrfs and ext4 snapshot management"
-HOMEPAGE="http://snapper.io/"
-SRC_URI="ftp://ftp.suse.com/pub/projects/snapper/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+btrfs ext4 lvm pam xattr"
-
-RDEPEND="dev-libs/boost[threads]
-	dev-libs/libxml2
-	dev-libs/icu:=
-	sys-apps/acl
-	sys-apps/dbus
-	sys-apps/util-linux
-	sys-libs/zlib
-	virtual/libintl
-	btrfs? ( <sys-fs/btrfs-progs-3.16 )
-	ext4? ( sys-fs/e2fsprogs )
-	lvm? ( sys-fs/lvm2 )
-	pam? ( sys-libs/pam )
-	xattr? ( sys-apps/attr )"
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS README )
-
-src_prepare() {
-	epatch "${FILESDIR}"/cron-confd.patch
-}
-
-src_configure() {
-	local myeconfargs=(
-		--with-conf="/etc/conf.d"
-		--docdir="/usr/share/doc/${PF}"
-		--disable-zypp
-		$(use_enable btrfs)
-		$(use_enable ext4)
-		$(use_enable lvm)
-		$(use_enable pam)
-		$(use_enable xattr xattrs)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	# Existing configuration file required to function
-	newconfd data/sysconfig.snapper snapper
-	prune_libtool_files
-}
-
-pkg_postinst() {
-	elog "In order to use Snapper, you need to set up"
-	elog "at least one config first. To do this, run:"
-	elog "snapper create-config <subvolume>"
-	elog "For more information, see man (8) snapper or"
-	elog "http://snapper.io/documentation.html"
-}
diff --git a/app-backup/snapper/snapper-0.2.4.ebuild b/app-backup/snapper/snapper-0.2.4.ebuild
deleted file mode 100644
index 958c013cc206..000000000000
--- a/app-backup/snapper/snapper-0.2.4.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="Command-line program for btrfs and ext4 snapshot management"
-HOMEPAGE="http://snapper.io/"
-SRC_URI="ftp://ftp.suse.com/pub/projects/snapper/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+btrfs ext4 lvm pam xattr"
-
-RDEPEND="dev-libs/boost[threads]
-	dev-libs/libxml2
-	dev-libs/icu:=
-	sys-apps/acl
-	sys-apps/dbus
-	sys-apps/util-linux
-	sys-libs/zlib
-	virtual/libintl
-	btrfs? ( >=sys-fs/btrfs-progs-3.17.1 )
-	ext4? ( sys-fs/e2fsprogs )
-	lvm? ( sys-fs/lvm2 )
-	pam? ( sys-libs/pam )
-	xattr? ( sys-apps/attr )"
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS README )
-
-src_prepare() {
-	epatch "${FILESDIR}"/cron-confd.patch
-}
-
-src_configure() {
-	local myeconfargs=(
-		--with-conf="/etc/conf.d"
-		--docdir="/usr/share/doc/${PF}"
-		--disable-zypp
-		$(use_enable btrfs)
-		$(use_enable ext4)
-		$(use_enable lvm)
-		$(use_enable pam)
-		$(use_enable xattr xattrs)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	# Existing configuration file required to function
-	newconfd data/sysconfig.snapper snapper
-	prune_libtool_files
-}
-
-pkg_postinst() {
-	elog "In order to use Snapper, you need to set up"
-	elog "at least one config first. To do this, run:"
-	elog "snapper create-config <subvolume>"
-	elog "For more information, see man (8) snapper or"
-	elog "http://snapper.io/documentation.html"
-}
diff --git a/app-backup/snapper/snapper-0.2.6.ebuild b/app-backup/snapper/snapper-0.2.6.ebuild
deleted file mode 100644
index 607ac4a58746..000000000000
--- a/app-backup/snapper/snapper-0.2.6.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="Command-line program for btrfs and ext4 snapshot management"
-HOMEPAGE="http://snapper.io/"
-SRC_URI="ftp://ftp.suse.com/pub/projects/snapper/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+btrfs ext4 lvm pam xattr"
-
-RDEPEND="dev-libs/boost[threads]
-	dev-libs/libxml2
-	dev-libs/icu:=
-	sys-apps/acl
-	sys-apps/dbus
-	sys-apps/util-linux
-	sys-libs/zlib
-	virtual/libintl
-	btrfs? ( >=sys-fs/btrfs-progs-3.17.1 )
-	ext4? ( sys-fs/e2fsprogs )
-	lvm? ( sys-fs/lvm2 )
-	pam? ( sys-libs/pam )
-	xattr? ( sys-apps/attr )"
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS README )
-
-src_prepare() {
-	epatch "${FILESDIR}"/cron-confd.patch
-}
-
-src_configure() {
-	local myeconfargs=(
-		--with-conf="/etc/conf.d"
-		--docdir="/usr/share/doc/${PF}"
-		--disable-zypp
-		$(use_enable btrfs)
-		$(use_enable ext4)
-		$(use_enable lvm)
-		$(use_enable pam)
-		$(use_enable xattr xattrs)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	# Existing configuration file required to function
-	newconfd data/sysconfig.snapper snapper
-	prune_libtool_files
-}
-
-pkg_postinst() {
-	elog "In order to use Snapper, you need to set up"
-	elog "at least one config first. To do this, run:"
-	elog "snapper create-config <subvolume>"
-	elog "For more information, see man (8) snapper or"
-	elog "http://snapper.io/documentation.html"
-}
diff --git a/app-benchmarks/iozone/Manifest b/app-benchmarks/iozone/Manifest
index a3d21fadcc5a..3fc47605469a 100644
--- a/app-benchmarks/iozone/Manifest
+++ b/app-benchmarks/iozone/Manifest
@@ -1,2 +1,3 @@
 DIST iozone3_397.tar 1679360 SHA256 213d8dcc6f70ca93a903b5fbb92cf758fd25617db4c65d188d29594f12b30d30 SHA512 e154b56735c922173e7cf23344fa0a478982d202b3b831fd605481f69a77295281be121aa57a0164dc12edf5975f231339f6516da5c40906586d48ebacec7c23 WHIRLPOOL 3c041e9c0b094b0e995341d11ef1da746faa0c0dcf615905d16cead7dd9ab84d5d6d301a70358d3a64ceac80a1331054ad31ca6771dd68e5135e7a92f7662d9c
 DIST iozone3_408.tar 1822720 SHA256 2112f8a125df8c627760ee2d6d2bd68617ca18e5a312da74175747f225b3fdf5 SHA512 ebc808468c741fff8d7909abd7eb41303c2a68c21ed7754e12bb6f859a88a9f9d040e0cdde42cb320958fbd453ba6014ba46fb7cfb200155f55a6fa7803f5d44 WHIRLPOOL 670a725e68f64f4029a5168839007af35d874b027e770e2cb1b20487a34be2f283b1a4371784b6108beab75952b55684600d146157ec0421e5540def654d9935
+DIST iozone3_430.tar 1832960 SHA256 e8388238326dc29359e5cb9f790d193f1e1bdadfbf260e010c50fa682387faed SHA512 f513c1a34bcdfadca0d01a942d55c7494e5646cf17384140df42643259456d41e40a54453ab3b9a1f1ebdeb456a9b4b1f836f979927cac57391b9a20ecdbcb55 WHIRLPOOL bf8074ddfdf63879a84176d5cde3fb00f2fa5f84d7adfce777b8ffa53fa33c97bff7ad37aec45e8271b9cbf723e57fbb0704720ee6d06193deee96ca841b9203
diff --git a/app-benchmarks/iozone/iozone-3.430.ebuild b/app-benchmarks/iozone/iozone-3.430.ebuild
new file mode 100644
index 000000000000..d77822182850
--- /dev/null
+++ b/app-benchmarks/iozone/iozone-3.430.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# TODO
+#        ->   linux-arm            (32bit)   <-
+#        ->   linux-AMD64          (64bit)   <-
+#        ->   linux-ia64           (64bit)   <-
+#        ->   linux-powerpc        (32bit)   <-
+#        ->   linux-powerpc64      (64bit)   <-
+#        ->   linux-S390           (32bit)   <-
+#        ->   linux-S390X          (64bit)   <-
+#
+#        ->   freebsd              (32bit)   <-
+#        ->   macosx               (32bit)   <-
+#        ->   netbsd               (32bit)   <-
+#        ->   openbsd              (32bit)   <-
+#        ->   openbsd-threads      (32bit)   <-
+#
+# ~ia64 ~s390 alpha(?) x86-fbsd
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Filesystem benchmarking program"
+HOMEPAGE="http://www.iozone.org/"
+SRC_URI="http://www.iozone.org/src/current/${PN}${PV/./_}.tar"
+
+LICENSE="freedist"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+S=${WORKDIR}/${PN}${PV/./_}
+
+src_compile() {
+	cd src/current
+
+	# Options FIX
+	sed -i -e "s:CC	=.*:CC	=$(tc-getCC):g" \
+		-e "s:-O3:${CFLAGS}:g" makefile
+
+	case ${ARCH} in
+		x86|alpha)	PLATFORM="linux";;
+		arm)		PLATFORM="linux-arm";;
+		ppc)		PLATFORM="linux-powerpc";;
+		ppc64)		PLATFORM="linux-powerpc64";;
+		amd64)		PLATFORM="linux-AMD64";;
+		ia64)		PLATFORM="linux-ia64";;
+		s390)		PLATFORM="linux-S390";;
+		x86-fbsd)	PLATFORM="freebsd";;
+		*)			PLATFORM="linux-${ARCH}";;
+	esac
+
+	emake ${PLATFORM} || die "Compile failed"
+}
+
+src_install() {
+	dosbin src/current/iozone
+	dosbin src/current/fileop
+	dodoc docs/I*
+	dodoc docs/Run_rules.doc
+	dodoc src/current/Changes.txt
+	doman docs/iozone.1
+
+	insinto /usr/share/doc/${PF}
+	cd src/current
+	doins Generate_Graphs Gnuplot.txt gengnuplot.sh gnu3d.dem
+}
+
+src_test() {
+	cd "${T}"
+	"${S}"/src/current/iozone testfile || die "self test failed"
+}
diff --git a/app-benchmarks/siege/Manifest b/app-benchmarks/siege/Manifest
index 4a85980ae65e..3a0cd29d3ed0 100644
--- a/app-benchmarks/siege/Manifest
+++ b/app-benchmarks/siege/Manifest
@@ -1,2 +1,3 @@
 DIST siege-3.0.6.tar.gz 496002 SHA256 78b79964e3d6772e532c6008a084700f830a02a00ca80b44f3e71380b4908c5b SHA512 621f3f60f2aac70fb051f48819f5673d60f31fc4fc69e4c65d4ae0a285d02112686f1e9b40241d48afc378446a2b296a7dc4bbc6d8ae38e390d380506f4d448b WHIRLPOOL 0c94eb828681b2ab67cab13bbaf802f25804e976f4f1eac6cb3cb45160ee6dd2f73d726c39f9ab6be6e4243ac4c6c79d76f406eba72d3fe4a929fb24838b1de0
 DIST siege-3.1.0.tar.gz 502444 SHA256 f6a104cb2a3ac6c0efb2699649e8c4f8da2b548147bbbb7af2483089e4940e7f SHA512 b5c0ed75795096dd6c78856747acd1cb778f54ece4ee7b735e676edc898677dd0d23fa544ae249fa6ed9e7780a118936372c271ff24b73f2a54402a94cc0a67a WHIRLPOOL 9a79b0a58fc54c7005406319494acc14fa80c2b98c7c519a39fea92dcded3d330351fa2da7830ff8d52de91744a8646d62b89f8330cf184e7539c86f60065aa0
+DIST siege-3.1.3.tar.gz 527862 SHA256 4d3932ea23cbf6d1d22df7c7ee6e7a6bc9f591b604ab582393eeb62f393f5a33 SHA512 880b6d8bbe6b8210147ebb26fd724f4c242076740284977471165fbca514b56c49812ace42dcbe23c57be8fd10a2503b129deec10b79991451a9ae83f30a742b WHIRLPOOL 48e9bb9cd6c66005d17fc8bde1de62d18148114aca48700f26fd3b4710d6dd912dd2e022bbacb3b9adc636fb7003c2a6f561340794aef8142f33fcfe29baa8d9
diff --git a/app-benchmarks/siege/siege-3.1.3.ebuild b/app-benchmarks/siege/siege-3.1.3.ebuild
new file mode 100644
index 000000000000..f8d6138e1c46
--- /dev/null
+++ b/app-benchmarks/siege/siege-3.1.3.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+#WANT_AUTOMAKE=1.9
+
+inherit eutils bash-completion-r1 libtool autotools
+
+DESCRIPTION="A HTTP regression testing and benchmarking utility"
+HOMEPAGE="https://www.joedog.org/siege-home/"
+SRC_URI="http://download.joedog.org/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~hppa ~mips ~ppc ~x86 ~x64-macos"
+SLOT="0"
+IUSE="ssl"
+
+RDEPEND="ssl? ( >=dev-libs/openssl-0.9.6d:= )"
+DEPEND="${RDEPEND}
+	sys-devel/libtool"
+
+src_prepare() {
+	# bundled macros break recent libtool
+	sed -i -e 's/AC_PROG_SHELL//' configure.ac || die
+	rm *.m4 || die "failed to remove bundled macros"
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+	use ssl && myconf="--with-ssl=${EPREFIX}/usr" || myconf="--without-ssl"
+	econf ${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	dodoc AUTHORS ChangeLog INSTALL README* KNOWNBUGS \
+		doc/siegerc doc/urls.txt
+
+	newbashcomp "${FILESDIR}"/${PN}.bash-completion ${PN}
+}
+
+pkg_postinst() {
+	echo
+	elog "An example ~/.siegerc file has been installed in"
+	elog "${EPREFIX}/usr/share/doc/${PF}/"
+}
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index fecd59c21521..3f611c43b374 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -1,7 +1,9 @@
 DIST emacs-18.59-linux22x-elf-glibc21.diff.gz 15671 SHA256 fb810d893938883d50a3a8d7c43fbeb1604d5454f760b8f1f700326c8ee659dd SHA512 c6c6ea33850dadf08d68fff56fc6aacc80ad1aa36661260715d50b95438942d56e6244094427d50356cfe716f26559feb885254c436399bff7be639637d605b6 WHIRLPOOL cafaa0fb0d06058cac8e445a7a1b5cba145d23186477a9c681efdab8ca0f18a9675dec3a93851fd7138890701f83fab83300c28a548c8fc22478a0cfff95d5da
 DIST emacs-18.59-patches-8.tar.bz2 19667 SHA256 637542bf5ee07d4abac11b76e742598a60787f3869dbf377eed99ae005fbc59d SHA512 a6564bc16724bfdb22f77b0e21b6064ca5e0e1bc91f3223c1037c26f8a048f28ac7a5da6817dc940a5f00f1f39bbfcda2277645409cd7e143a55fabdc3d3fe5d WHIRLPOOL 6b81f978aef2b429262e79ab1d995cca9237dc9c9d98144d2dc3de07bc2cdcec8547adbaf5ad41d9cce3239554918c04c7b9ff783b7931582a3a7398eb2b66f1
+DIST emacs-18.59-patches-9.tar.xz 21380 SHA256 69411c57b20850e8aab1e20614437f9a836c2ddf47c46a833d0262c138fa3270 SHA512 595a4a7a4052c3b3325e4d4952eed24c98d3dd62b7ce89bd149f046552e2dd67ec3e720b7559fbc086b06a667c992bccc60201ef53b263dbd0fc96cbcdceee38 WHIRLPOOL 23f803d940c35fe9519fe7169e6bca7012c2d2db2246dec121fba37e8dbf39f411a9e579a9cbd4193562da72b9ac226286ad687877ccadd7cb78ea7eb615ab3f
 DIST emacs-18.59.tar.gz 2962652 SHA256 1e27e33f91984a91e9b4c1f21433f931aba03670960ecc147bb6d7b0de0f051e SHA512 03ce565e346e89b7aacb1852f4783e8907f394de7da0c543b475cb038eb89b87f980d0f7ca1841b1d2108b20f211e95113c7214e4a33e5767a1827ff43173f33 WHIRLPOOL 5e98e71518f665e2a8278afe54e0ace6d7fdd9df23ff0a3354ffc1d5cc25cd21b0dd4d82766fcb436d4f24e9291c933295e956e1ffea43cfeedf915175763be6
 DIST emacs-23.4-patches-17.tar.xz 16164 SHA256 bc9d4a36239f2749e218d903b67102e211a3a62ef162f5ab2801865dab77b752 SHA512 ceccd559b4f53328d75016b64d246ecf6fca7edebd080ce3bbba5f4d000bec38be5da91f3195c972ede0710da14b3be0545891321259b0a0b2963981c8fd62de WHIRLPOOL 4b70ce4d876e92a006e3dc0a31301f604aa8fa53a198515d1cbb3517a94933b1d7a11636494c1bd28ad1049a5a233d4ec13213e74e1eaff1cf96bb1fd095c345
+DIST emacs-23.4-patches-18.tar.xz 16512 SHA256 8c783691d61b888ca79d5d7a8319806a3125b656b3406a8834166cd53ba94813 SHA512 ec1092ca9a767035517fdb280fa31684466cf03ce19b3bcaf80ea816ad417fe8bf918787c49f2719bbf535a59594132ef2044c38a810717e8b5119a76d3dc0d2 WHIRLPOOL aac96413b3a76acbf3e9a771d909be42f913a72688e5c11c31534439a242e364d220ef66d23b73cf8ed4693f4a9ed2f5642c155e66b4b49e6ea1c2a16944aaa4
 DIST emacs-23.4.tar.bz2 38646508 SHA256 26576f9e664397c729f78f5ffcd092969251988461896fe8793062346ee988b9 SHA512 def7a95ecaefae24d8102b96b1d575a23def1b11a8f0bb17b68f7913bd118e2ea4449a8feee76c1bd649f099b70419f0d494ddd9bb32b26f92720cda842b0296 WHIRLPOOL 2384c3f63ff153c3975e373334d6021d46b23ad3cab448ed2e1180501236453a61d13bf1dfbb2e6075bb141dd8511d85f77e37c763b39769f98de48eacc56f3b
 DIST emacs-24.4-patches-5.tar.xz 6000 SHA256 967dac364282a51933f90c56f368bc3f2741efe0b7ff42d3151bb4824b70fa04 SHA512 0a337ad5b7601f5e453645d1fba99717328c6bc7a5505bcb4bd8e853179cf61be43eb6f3b9370edf0f44aa6485d4847c14554c1592ccc7da87b10dabaaa9d421 WHIRLPOOL 149f3a431d055963c544d9fa6c6447a16aa093840f6bf4086f50506979356a12407af16291c46ee62a92b3ee41767452046f45a7163214be33ab7bdbcd6059dc
 DIST emacs-24.4.tar.xz 39733124 SHA256 47e391170db4ca0a3c724530c7050655f6d573a711956b4cd84693c194a9d4fd SHA512 f51f88a4736a3f153ef01f3ad710571e967cd3d0c0112b066169a4040725d370ec29b14a4ca8fa3e3f4c657c726ba8e64c3ac4e390b8e911ea47a3afb5ac755c WHIRLPOOL eae38c2382731fecf0ccf8f717f8c96cc130d01a893ff560caecde903294eb843660492761ea8cce9920b79bfc55e821921924e27c040f25355110f56cd2255b
diff --git a/app-editors/emacs/emacs-18.59-r11.ebuild b/app-editors/emacs/emacs-18.59-r11.ebuild
new file mode 100644
index 000000000000..e78983d9dcc9
--- /dev/null
+++ b/app-editors/emacs/emacs-18.59-r11.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit toolchain-funcs flag-o-matic multilib
+
+DESCRIPTION="The extensible self-documenting text editor"
+HOMEPAGE="https://www.gnu.org/software/emacs/"
+SRC_URI="ftp://ftp.gnu.org/old-gnu/emacs/${P}.tar.gz
+	ftp://ftp.splode.com/pub/users/friedman/emacs/${P}-linux22x-elf-glibc21.diff.gz
+	https://dev.gentoo.org/~ulm/emacs/${P}-patches-9.tar.xz"
+
+LICENSE="GPL-1+ GPL-2+ BSD" #HPND
+SLOT="18"
+KEYWORDS="~amd64 ~x86"
+IUSE="abi_x86_x32"
+
+RDEPEND=">=app-eselect/eselect-emacs-1.16
+	sys-libs/ncurses:0
+	amd64? (
+		abi_x86_x32? ( >=sys-libs/ncurses-5.9-r3:0[abi_x86_x32(-)?] )
+		!abi_x86_x32? ( >=sys-libs/ncurses-5.9-r3:0[abi_x86_32(-)] )
+	)"
+#	X? ( x11-libs/libX11[-xcb] )
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES="../${P}-linux22x-elf-glibc21.diff ../patch"
+
+src_configure() {
+	# autoconf? What's autoconf? We are living in 1992. ;-)
+	local arch
+	case ${ARCH} in
+		amd64)
+			if use abi_x86_x32; then
+				arch=x86-x32
+				multilib_toolchain_setup x32
+			else
+				arch=intel386
+				multilib_toolchain_setup x86
+			fi
+			;;
+		x86) arch=intel386 ;;
+		*) die "Architecture ${ARCH} not yet supported" ;;
+	esac
+	local cmd="s/\"s-.*\.h\"/\"s-linux.h\"/;s/\"m-.*\.h\"/\"m-${arch}.h\"/"
+	#use X && cmd="${cmd};s/.*\(#define HAVE_X_WINDOWS\).*/\1/"
+	sed -e "${cmd}" src/config.h-dist >src/config.h || die
+
+	cat <<-END >src/paths.h
+		#define PATH_LOADSEARCH "/usr/share/emacs/${PV}/lisp"
+		#define PATH_EXEC "/usr/share/emacs/${PV}/etc"
+		#define PATH_LOCK "/var/lib/emacs/lock/"
+		#define PATH_SUPERLOCK "/var/lib/emacs/lock/!!!SuperLock!!!"
+	END
+
+	sed -i -e "s:/usr/lib/\([^ ]*\).o:/usr/$(get_libdir)/\1.o:g" \
+		-e "s:-lncurses:$("$(tc-getPKG_CONFIG)" --libs ncurses):" \
+		src/s-linux.h || die
+
+	# -O3 and -finline-functions cause segmentation faults at run time.
+	filter-flags -finline-functions
+	replace-flags -O[3-9] -O2
+	strip-flags
+	# Quieten GCC 5. Feel free to submit a patch adding all those prototypes.
+	append-flags -Wno-implicit
+}
+
+src_compile() {
+	# Do not use the sandbox, or the dumped Emacs will be twice as large
+	export SANDBOX_ON=0
+	emake --jobs=1 \
+		CC="$(tc-getCC)" CFLAGS="${CFLAGS} -Demacs" \
+		LD="$(tc-getCC) -nostdlib" LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	local basedir="/usr/share/emacs/${PV}" i
+
+	dodir ${basedir}
+	dodir /usr/share/man/man1
+	emake --jobs=1 \
+		LIBDIR="${D}"${basedir} \
+		BINDIR="${D}"/usr/bin \
+		MANDIR="${D}"/usr/share/man/man1 \
+		install
+
+	rmdir "${D}"${basedir}/lock || die
+	find "${D}"${basedir} -type f \( -name "*.c" -o -name ChangeLog \
+		-o -name COPYING ! -path "*/etc/COPYING" \) -exec rm "{}" + || die
+	fperms -R go-w ${basedir}
+
+	# remove duplicate DOC file
+	rm "${D}"${basedir}/etc/DOC || die
+
+	# move executables to the correct place
+	mv "${D}"/usr/bin/emacs{,-${SLOT}} || die
+	for i in etags ctags emacsclient; do
+		mv "${D}"/usr/bin/${i}{,-emacs-${SLOT}} || die
+		rm "${D}"${basedir}/etc/${i} || die
+	done
+
+	dodir /usr/libexec/emacs/${PV}
+	for i in wakeup digest-doc sorted-doc movemail cvtmail fakemail \
+		yow env server
+	do
+		mv "${D}"${basedir}/etc/${i} "${D}"/usr/libexec/emacs/${PV}/${i} || die
+		dosym ../../../../libexec/emacs/${PV}/${i} ${basedir}/etc/${i}
+	done
+	for i in test-distrib make-docfile; do
+		rm "${D}"${basedir}/etc/${i} || die
+	done
+
+	# move man page
+	mv "${D}"/usr/share/man/man1/emacs{,-${SLOT}}.1 || die
+
+	# move Info files
+	dodir /usr/share/info
+	mv "${D}"${basedir}/info "${D}"/usr/share/info/emacs-${SLOT} || die
+	dosym ../../info/emacs-${SLOT} "${basedir}"/info
+	docompress -x /usr/share/info
+
+	# move Info dir to avoid collisions with the dir file generated by portage
+	mv "${D}"/usr/share/info/emacs-${SLOT}/dir{,.orig} || die
+	touch "${D}"/usr/share/info/emacs-${SLOT}/.keepinfodir
+
+	dodir /var/lib/emacs
+	diropts -m0777
+	keepdir /var/lib/emacs/lock
+
+	dodoc README PROBLEMS
+}
+
+pkg_preinst() {
+	# move Info dir file to correct name
+	if [[ -d "${D}"/usr/share/info ]]; then
+		mv "${D}"/usr/share/info/emacs-${SLOT}/dir{.orig,} || die
+	fi
+}
+
+pkg_postinst() {
+	eselect emacs update ifunset
+}
+
+pkg_postrm() {
+	eselect emacs update ifunset
+}
diff --git a/app-editors/emacs/emacs-23.4-r14.ebuild b/app-editors/emacs/emacs-23.4-r14.ebuild
new file mode 100644
index 000000000000..edb1f0d7de33
--- /dev/null
+++ b/app-editors/emacs/emacs-23.4-r14.ebuild
@@ -0,0 +1,349 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+WANT_AUTOMAKE="none"
+
+inherit autotools elisp-common flag-o-matic multilib readme.gentoo-r1
+
+DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
+HOMEPAGE="https://www.gnu.org/software/emacs/"
+SRC_URI="mirror://gnu/emacs/${P}.tar.bz2
+	https://dev.gentoo.org/~ulm/emacs/${P}-patches-18.tar.xz"
+
+LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
+SLOT="23"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="alsa aqua athena dbus games gconf gif gpm gtk gzip-el hesiod jpeg kerberos livecd m17n-lib motif pax_kernel png sound source svg tiff toolkit-scroll-bars X Xaw3d xft +xpm"
+REQUIRED_USE="?? ( aqua X )"
+
+RDEPEND="sys-libs/ncurses:0
+	>=app-eselect/eselect-emacs-1.16
+	>=app-emacs/emacs-common-gentoo-1.5[games?,X?]
+	net-libs/liblockfile
+	hesiod? ( net-dns/hesiod )
+	kerberos? ( virtual/krb5 )
+	alsa? ( media-libs/alsa-lib )
+	gpm? ( sys-libs/gpm )
+	dbus? ( sys-apps/dbus )
+	X? (
+		x11-libs/libXmu
+		x11-libs/libXt
+		x11-misc/xbitmaps
+		gconf? ( >=gnome-base/gconf-2.26.2 )
+		gif? ( media-libs/giflib )
+		jpeg? ( virtual/jpeg:0= )
+		png? ( >=media-libs/libpng-1.4:0= )
+		svg? ( >=gnome-base/librsvg-2.0 )
+		tiff? ( media-libs/tiff:0 )
+		xpm? ( x11-libs/libXpm )
+		xft? (
+			media-libs/fontconfig
+			media-libs/freetype
+			x11-libs/libXft
+			m17n-lib? (
+				>=dev-libs/libotf-0.9.4
+				>=dev-libs/m17n-lib-1.5.1
+			)
+		)
+		gtk? ( x11-libs/gtk+:2 )
+		!gtk? (
+			motif? ( >=x11-libs/motif-2.3:0 )
+			!motif? (
+				Xaw3d? ( x11-libs/libXaw3d )
+				!Xaw3d? ( athena? ( x11-libs/libXaw ) )
+			)
+		)
+	)"
+
+DEPEND="${RDEPEND}
+	alsa? ( virtual/pkgconfig )
+	dbus? ( virtual/pkgconfig )
+	X? ( virtual/pkgconfig )
+	gzip-el? ( app-arch/gzip )
+	pax_kernel? (
+		sys-apps/attr
+		sys-apps/paxctl
+	)"
+
+RDEPEND="${RDEPEND}
+	!<app-editors/emacs-vcs-${PV}"
+
+EMACS_SUFFIX="${PN/emacs/emacs-${SLOT}}"
+SITEFILE="20${PN}-${SLOT}-gentoo.el"
+# FULL_VERSION keeps the full version number, which is needed in
+# order to determine some path information correctly for copy/move
+# operations later on
+FULL_VERSION="${PV%%_*}"
+S="${WORKDIR}/emacs-${FULL_VERSION}"
+
+src_prepare() {
+	eapply ../patch
+	eapply_user
+
+	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \
+		|| die "unable to sed ctags.1"
+
+	if ! use alsa; then
+		# ALSA is detected even if not requested by its USE flag.
+		# Suppress it by supplying pkg-config with a wrong library name.
+		sed -i -e "/ALSA_MODULES=/s/alsa/DiSaBlEaLsA/" configure.in \
+			|| die "unable to sed configure.in"
+	fi
+	if ! use gzip-el; then
+		# Emacs' build system automatically detects the gzip binary and
+		# compresses el files. We don't want that so confuse it with a
+		# wrong binary name
+		sed -i -e "s/ gzip/ PrEvEnTcOmPrEsSiOn/" configure.in \
+			|| die "unable to sed configure.in"
+	fi
+
+	mv configure.in configure.ac || die
+	eautoreconf
+}
+
+src_configure() {
+	strip-flags
+	filter-flags -fstrict-aliasing -pie
+	append-flags $(test-flags -fno-strict-aliasing)
+
+	if use sh; then
+		replace-flags "-O[1-9]" -O0		#262359
+	elif use ia64; then
+		replace-flags "-O[2-9]" -O1		#325373
+	else
+		replace-flags "-O[3-9]" -O2
+	fi
+
+	local myconf
+
+	if use alsa && ! use sound; then
+		einfo "Although sound USE flag is disabled you chose to have alsa,"
+		einfo "so sound is switched on anyway."
+		myconf+=" --with-sound"
+	else
+		myconf+=" $(use_with sound)"
+	fi
+
+	if use X; then
+		myconf+=" --with-x --without-ns"
+		myconf+=" $(use_with gconf)"
+		myconf+=" $(use_with toolkit-scroll-bars)"
+		myconf+=" $(use_with gif)"
+		myconf+=" $(use_with jpeg)"
+		myconf+=" $(use_with png)"
+		myconf+=" $(use_with svg rsvg)"
+		myconf+=" $(use_with tiff)"
+		myconf+=" $(use_with xpm)"
+
+		if use xft; then
+			myconf+=" --with-xft"
+			myconf+=" $(use_with m17n-lib libotf)"
+			myconf+=" $(use_with m17n-lib m17n-flt)"
+		else
+			myconf+=" --without-xft"
+			myconf+=" --without-libotf --without-m17n-flt"
+			use m17n-lib && ewarn \
+				"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
+		fi
+
+		# GTK+ is the default toolkit if USE=gtk is chosen with other
+		# possibilities. Emacs upstream thinks this should be standard
+		# policy on all distributions
+		local f
+		if use gtk; then
+			einfo "Configuring to build with GIMP Toolkit (GTK+)"
+			myconf+=" --with-x-toolkit=gtk"
+			for f in motif Xaw3d athena; do
+				use ${f} && ewarn \
+					"USE flag \"${f}\" has no effect if \"gtk\" is set."
+			done
+		elif use motif; then
+			einfo "Configuring to build with Motif toolkit"
+			myconf+=" --with-x-toolkit=motif"
+			for f in Xaw3d athena; do
+				use ${f} && ewarn \
+					"USE flag \"${f}\" has no effect if \"motif\" is set."
+			done
+		elif use athena || use Xaw3d; then
+			einfo "Configuring to build with Athena/Lucid toolkit"
+			myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
+		else
+			einfo "Configuring to build with no toolkit"
+			myconf+=" --with-x-toolkit=no"
+		fi
+	elif use aqua; then
+		einfo "Configuring to build with Nextstep (Cocoa) support"
+		myconf+=" --with-ns --disable-ns-self-contained"
+		myconf+=" --without-x"
+	else
+		myconf+=" --without-x --without-ns"
+	fi
+
+	# Save version information in the Emacs binary. It will be available
+	# in variable "system-configuration-options".
+	myconf+=" GENTOO_PACKAGE=${CATEGORY}/${PF}"
+
+	# According to configure, this option is only used for GNU/Linux
+	# (x86_64 and s390). For Gentoo Prefix we have to explicitly spell
+	# out the location because $(get_libdir) does not necessarily return
+	# something that matches the host OS's libdir naming (e.g. RHEL).
+	local crtdir=$($(tc-getCC) -print-file-name=crt1.o)
+	crtdir=${crtdir%/*}
+
+	econf \
+		--program-suffix="-${EMACS_SUFFIX}" \
+		--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
+		--localstatedir="${EPREFIX}"/var \
+		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
+		--with-crt-dir="${crtdir}" \
+		--with-gameuser=":gamestat" \
+		$(use_with hesiod) \
+		$(use_with kerberos) $(use_with kerberos kerberos5) \
+		$(use_with gpm) \
+		$(use_with dbus) \
+		${myconf}
+}
+
+src_compile() {
+	export SANDBOX_ON=0			# for the unbelievers, see Bug #131505
+	emake CC="$(tc-getCC)" \
+		AR="$(tc-getAR) cq" \
+		RANLIB="$(tc-getRANLIB)"
+}
+
+src_install () {
+	emake DESTDIR="${D}" install
+
+	rm "${ED}"/usr/bin/emacs-${FULL_VERSION}-${EMACS_SUFFIX} \
+		|| die "removing duplicate emacs executable failed"
+	mv "${ED}"/usr/bin/emacs-${EMACS_SUFFIX} "${ED}"/usr/bin/${EMACS_SUFFIX} \
+		|| die "moving emacs executable failed"
+
+	# move man pages to the correct place
+	local m
+	mv "${ED}"/usr/share/man/man1/{emacs,${EMACS_SUFFIX}}.1 \
+		|| die "moving emacs man page failed"
+	for m in b2m ctags ebrowse emacsclient etags grep-changelog rcs-checkin; do
+		mv "${ED}"/usr/share/man/man1/${m}{,-${EMACS_SUFFIX}}.1 \
+			|| die "moving ${m} man page failed"
+	done
+
+	# move info dir to avoid collisions with the dir file generated by portage
+	mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \
+		|| die "moving info dir failed"
+	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
+	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
+
+	# avoid collision between slots, see bug #169033 e.g.
+	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
+	rm -rf "${ED}"/usr/share/{applications,icons}
+	rm -rf "${ED}"/var
+
+	# remove unused <version>/site-lisp dir
+	rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
+
+	# remove COPYING file (except for etc/COPYING used by describe-copying)
+	rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING
+
+	local cdir
+	if use source; then
+		cdir="/usr/share/emacs/${FULL_VERSION}/src"
+		insinto "${cdir}"
+		# This is not meant to install all the source -- just the
+		# C source you might find via find-function
+		doins src/*.{c,h,m}
+		doins -r src/{m,s}
+		rm "${ED}"/usr/share/emacs/${FULL_VERSION}/src/Makefile.c
+		rm "${ED}"/usr/share/emacs/${FULL_VERSION}/src/{m,s}/README
+	elif has installsources ${FEATURES}; then
+		cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
+	fi
+
+	sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF
+	X
+	;;; ${PN}-${SLOT} site-lisp configuration
+	X
+	(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
+	Y  (setq find-function-C-source-directory
+	Y	"${EPREFIX}${cdir}")
+	X  (let ((path (getenv "INFOPATH"))
+	X	(dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
+	X	(re "\\\\\`${EPREFIX}/usr/share/info\\\\>"))
+	X    (and path
+	X	 ;; move Emacs Info dir before anything else in /usr/share/info
+	X	 (let* ((p (cons nil (split-string path ":" t))) (q p))
+	X	   (while (and (cdr q) (not (string-match re (cadr q))))
+	X	     (setq q (cdr q)))
+	X	   (setcdr q (cons dir (delete dir (cdr q))))
+	X	   (setq Info-directory-list (prune-directory-list (cdr p)))))))
+	EOF
+	elisp-site-file-install "${T}/${SITEFILE}" || die
+
+	dodoc README BUGS
+
+	if use aqua; then
+		dodir /Applications/Gentoo
+		rm -rf "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app
+		mv nextstep/Emacs.app \
+			"${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app || die
+	fi
+
+	DOC_CONTENTS="You can set the version to be started by /usr/bin/emacs
+		through the Emacs eselect module, which also redirects man and info
+		pages. Therefore, several Emacs versions can be installed at the
+		same time. \"man emacs.eselect\" for details.
+		\\n\\nIf you upgrade from a previous major version of Emacs, then
+		it is strongly recommended that you use app-admin/emacs-updater
+		to rebuild all byte-compiled elisp files of the installed Emacs
+		packages."
+	use X && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
+		Installing media-fonts/font-adobe-{75,100}dpi on the X server's
+		machine would satisfy basic Emacs requirements under X11.
+		See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
+		for how to enable anti-aliased fonts."
+	use aqua && DOC_CONTENTS+="\\n\\nEmacs${EMACS_SUFFIX#emacs}.app is in
+		\"${EPREFIX}/Applications/Gentoo\". You may want to copy or symlink
+		it into /Applications by yourself."
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	# move Info dir file to correct name
+	local infodir=/usr/share/info/${EMACS_SUFFIX} f
+	if [[ -f ${ED}${infodir}/dir.orig ]]; then
+		mv "${ED}"${infodir}/dir{.orig,} || die "moving info dir failed"
+	elif [[ -d "${ED}"${infodir} ]]; then
+		# this should not happen in EAPI 4
+		ewarn "Regenerating Info directory index in ${infodir} ..."
+		rm -f "${ED}"${infodir}/dir{,.*}
+		for f in "${ED}"${infodir}/*; do
+			if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then
+				install-info --info-dir="${ED}"${infodir} "${f}" \
+					|| die "install-info failed"
+			fi
+		done
+	fi
+}
+
+pkg_postinst() {
+	elisp-site-regen
+	readme.gentoo_print_elog
+
+	if use livecd; then
+		# force an update of the emacs symlink for the livecd/dvd,
+		# because some microemacs packages set it with USE=livecd
+		eselect emacs update
+	elif [[ $(readlink "${EROOT}"/usr/bin/emacs) = ${EMACS_SUFFIX} ]]; then
+		# refresh symlinks in case any installed files have changed
+		eselect emacs set ${EMACS_SUFFIX}
+	else
+		eselect emacs update ifunset
+	fi
+}
+
+pkg_postrm() {
+	elisp-site-regen
+	eselect emacs update ifunset
+}
diff --git a/app-editors/hexedit/hexedit-1.2.13.ebuild b/app-editors/hexedit/hexedit-1.2.13.ebuild
index f7363a85fa12..b0d203c7faf7 100644
--- a/app-editors/hexedit/hexedit-1.2.13.ebuild
+++ b/app-editors/hexedit/hexedit-1.2.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -13,7 +13,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ~mips ppc ppc64 s390 sh sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
-DEPEND="sys-libs/ncurses"
+DEPEND="sys-libs/ncurses:="
 RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/${PN}
diff --git a/app-editors/jedit/jedit-5.2.0.ebuild b/app-editors/jedit/jedit-5.2.0.ebuild
index 51f2d61b5064..71368479a74c 100644
--- a/app-editors/jedit/jedit-5.2.0.ebuild
+++ b/app-editors/jedit/jedit-5.2.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.jedit.org"
 SRC_URI="mirror://sourceforge/${PN}/${PN}${PV}source.tar.bz2"
 
 LICENSE="BSD GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 SLOT="0"
 IUSE=""
 
diff --git a/app-editors/nano/nano-2.4.3.ebuild b/app-editors/nano/nano-2.4.3.ebuild
index f7a601b1c5eb..1b00bee948f5 100644
--- a/app-editors/nano/nano-2.4.3.ebuild
+++ b/app-editors/nano/nano-2.4.3.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_P=${PN}-${PV/_}
 	SRC_URI="http://www.nano-editor.org/dist/v${PV:0:3}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="GNU GPL'd Pico clone with more functionality"
diff --git a/app-emulation/cloud-init/cloud-init-0.7.6-r1.ebuild b/app-emulation/cloud-init/cloud-init-0.7.6-r1.ebuild
index ce3973583b4c..8bcd8326b2ab 100644
--- a/app-emulation/cloud-init/cloud-init-0.7.6-r1.ebuild
+++ b/app-emulation/cloud-init/cloud-init-0.7.6-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="test"
 
 CDEPEND="
diff --git a/app-emulation/virtualbox-additions/Manifest b/app-emulation/virtualbox-additions/Manifest
index 685e5fe987bd..2bd568b30894 100644
--- a/app-emulation/virtualbox-additions/Manifest
+++ b/app-emulation/virtualbox-additions/Manifest
@@ -2,4 +2,4 @@ DIST VBoxGuestAdditions_4.3.28.iso 58241024 SHA256 9f52e186d6c9407b2676d4b2ed1cd
 DIST VBoxGuestAdditions_4.3.32.iso 58349568 SHA256 187f49b567dea056d9de255c155f8eaa3449dffe08ccf22ae8ab1dda708f78fe SHA512 3938ade4fd030f2471b34b11296af3874c3936659c635a9d7e222697f2dc72c65fc4f73f42800def8a8bcc518951bb9a3504156811af18e00722a6f61c03b6a4 WHIRLPOOL 8e5f25709ea1b74f94f303f29ef7d1601f29681515981b2f16fddd4af4c9bec842101bfab7626112777284c3f243f8e4a66a23d09a23af353e4f1e0645043618
 DIST VBoxGuestAdditions_4.3.34.iso 58361856 SHA256 a6f20f5b8ec11ae127ae48bcb19c20de488d38dbf807a8608a6468da7353a9a8 SHA512 b243558b510548518e1ed863bc4a5d8c849573f7664ce6c398766a10fe9cb5aa0f34e8ff4f9ac948e06929033800e8e2fa3583fcb92ecd44fb0cd755521be236 WHIRLPOOL 29019b8e14a9a28622b7c07c7049153aab7b846aa58713e7537d66addebe5a6627dcedbcd36944bc1a2ebe382f2f3acc3f793e2c2cee9bab9805f931e88b870e
 DIST VBoxGuestAdditions_5.0.10.iso 59002880 SHA256 8f7ffee3fac75793e48d1859b65a95879b3ed5bc1c3164c967e85d69244c594b SHA512 95080cc991f99d11aea771088b980faa42c9f0d33ee31afc53de758d49cb62db0275bd5907ff2bf29382194e6227e965986ccdbec7bf50e254e178689e291b65 WHIRLPOOL 24a2c79f3868d14da387c4f282af848411d0a78a8c4431b72f64474cc05ca2bb24aef923e3e1d9e0f1ae17cc342aa821c2ad782d8af233f3c09c4b26afb4c7f9
-DIST VBoxGuestAdditions_5.0.8.iso 58992640 SHA256 a6ab45a043e460c87f145ec626c1cc2a1ae74222f15aa725004cdc84bf48e9f3 SHA512 8a808b964b916930748cdde96cbf0b3657506758155336b5d7a294cde28129cff50ec5e88fdd5e0c3bad8a5df99e8244c08677811aa4e3982f4255273d66820a WHIRLPOOL a2fe1cb6c334f44a4dd962a0479b1a2956ebd9a9d5aee9c6a3a2203c22a1f764aa1829f1a813d14f60cfdebef27ddb59c554a0db50b18641df2da6a1d67d20c5
+DIST VBoxGuestAdditions_5.0.12.iso 58990592 SHA256 61a19c9ec4b449cbc6bb41b636b03a16bf5a47ffa4943423d262863017e8bc9b SHA512 9232752f1d71fde887755e917b9e146d53fabe3cc2736e96216a04b1a3faf692d00da47458f7c700587d424b5817debb56c375c068e3e5baa925b7f6732d0ab4 WHIRLPOOL a87eb9877c0a4d7c432d32c3d4ec408d1167d152a09feaf037bc37dc8c31be0287af93e2c6eb73d01cdda859430f7517e1a1a2aabaf92301aabb9d5a81ff8955
diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-5.0.8.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-5.0.12.ebuild
index e46434cb5133..e46434cb5133 100644
--- a/app-emulation/virtualbox-additions/virtualbox-additions-5.0.8.ebuild
+++ b/app-emulation/virtualbox-additions/virtualbox-additions-5.0.12.ebuild
diff --git a/app-emulation/virtualbox-bin/Manifest b/app-emulation/virtualbox-bin/Manifest
index 4df303773bb0..1401d577ff66 100644
--- a/app-emulation/virtualbox-bin/Manifest
+++ b/app-emulation/virtualbox-bin/Manifest
@@ -2,7 +2,7 @@ DIST Oracle_VM_VirtualBox_Extension_Pack-4.3.28-100309.tar.gz 15961939 SHA256 72
 DIST Oracle_VM_VirtualBox_Extension_Pack-4.3.32-103443.tar.gz 15994576 SHA256 3f041c019985c35974bf034a9f7d941149fcc3e23a6200b47579140405af5f88 SHA512 212c21f6fc0af093e2d409827348d776377164b9c78b6c01dc710d4a63f53fa7ef52a66491d81b96dc64af4747d79ca0d0df55b052cf6b1c8ceb239c32dc1c75 WHIRLPOOL d67b55c409c6e06080010a25a4a64e660dcd0efaadffe2311166bed06c3f494a5f20cff131a42e07e82aba3cab7f53dea101fb3e5fabeecc2bdb0dd4a167c0ce
 DIST Oracle_VM_VirtualBox_Extension_Pack-4.3.34-104062.tar.gz 15994268 SHA256 b9c03b6db79de16f70134884c18cb4854a8c24cb36f90e3a9d2b93eb09fb6b37 SHA512 39b06eb26fcc01dc70de0a9d099a8919c53f72d9a74133d803bb5d10ea06cd390a6dd3853a024b311695c57805d6e2b664ec667fa0d882142f4a33fdfb01b642 WHIRLPOOL 1a3e98def84beeb73a8cc531bc1bfb98cdb3a3c02373aff910c89b023c85d22eb46d349a2c6ca19f37032113bad2dbc7f61b0960f7af3b2ca4d4c63a301a27f7
 DIST Oracle_VM_VirtualBox_Extension_Pack-5.0.10-104061.tar.gz 16918255 SHA256 c846fa26fec8587e57180c85c408cad377c48ad26830b0dc839ebf9025e3d29c SHA512 ae6bab29c14b1ace849ebf5715360fc0921950c62345e18709347f44c07f88727bf1785d53437e39d67f8c56d92cef1f6e3d03c3f7d6dd76c6d4d9ee7f1f1d5b WHIRLPOOL 822c3c9b20f9171b3e9d1896c2ff648ead049d63e45b8353da5d37e7f874433878fedcfb2f10ae5f50e4860466560a37b6102e8ffb3e9625106ce5188f491726
-DIST Oracle_VM_VirtualBox_Extension_Pack-5.0.8-103449.tar.gz 16880584 SHA256 febd2c99909cb932a98c2b9f73ce8eb03fc183c8c8f2fc874985cf3d598f6b94 SHA512 6a29aa1c52b460bded6e342cc66bb28d93f7f4c71eb108854dd2ba6934ae399e6ee7bd8acd29dda934f2933eb05b2e3878568fee76e5eb55ae43a695123568df WHIRLPOOL d6865e702c787c441da30a49e5aaff818a7530f2a82313c326a509cb3bb98f7cf22d511e3265b99a14402b2b9a7c4614d40ed570e6a6ba5522f4752248e2f338
+DIST Oracle_VM_VirtualBox_Extension_Pack-5.0.12-104815.tar.gz 16937595 SHA256 ac1bc8452b7fdf183325272149e9f18b9810cc07adf18e48755385a9cd1b236d SHA512 4a21cd155d1e60d3b6a4f4864cd8ca8ccd75f02448e832d72b42284dde5aa3c4aeba7f7297e3e7e198e4b4c665d770ac65c1aeca3df1dfa6a8454c47553baad7 WHIRLPOOL bcf032d0e72b57be37fdfd40d3c2f418eab10e04bfcbf1b99374b1fa9d2b5ced38c5cfc560b1c13492144a32a3c035b72649d9ae57851f6d430a4e59897cebe2
 DIST VirtualBox-4.3.28-100309-Linux_amd64.run 85677523 SHA256 8c862533f876dc32fbfae993597b1123e2feac81a302c60e73b7ee891e17a77f SHA512 75dc2cd257b187b0a497b87c2f1e576a57ceece290327a98804c903810522444b0a64a704bc51a25945dbaa5c0caf30898ba258829577e2f17f7c736fcf59bb0 WHIRLPOOL c8d5d885807ad633bf1c4c6f98cac8dddf4002dc2e21ed2d2fb2f0a859f447b7ce06d1c49c4daff4147b25ca4992da14b6b75b39f47075c861732e6ef00091d1
 DIST VirtualBox-4.3.28-100309-Linux_x86.run 85083598 SHA256 aeb224d7136314865db8175db665408a3dc08f50ed68fbd4bf1568b32b7ea2f6 SHA512 110e20a45657c7677fcab0158d31052c909893b8f618adad2a2c95ad119d47d7c35d4aedf3692dd650fda62ba0747acf202364c14034e5c10d17cd45a9918707 WHIRLPOOL 35c97248985d11c77194ac03448357331e08b7ef64a77ba416564b6051eaf74ffb5a0acdf835bfcf71657c5fdd58066947b0ba1c42e91d34dbf026434f662f67
 DIST VirtualBox-4.3.32-103443-Linux_amd64.run 81100243 SHA256 e99dbf0e382081fa78cbc5803b473e2fe4bc945eb50cf0b5717853f4cdb34da3 SHA512 c68cf69de524ec0229d07943087bc433b0902710f48ddd67106f0f10500d38d38a0e3ff97e40bc81495f12f2bcd68ee0f3d19fda46c999960fd1b3f64bf220f3 WHIRLPOOL 15aa5ce0b49ac7c75fc6191e4a0283a721db247a667f63b94f04dbf1f00122958c8945181f4ec5791b1a6ba6425f98a3bf92f80eebf29b831260cc8274cf1cd7
@@ -11,10 +11,10 @@ DIST VirtualBox-4.3.34-104062-Linux_amd64.run 81212882 SHA256 4deaf99020c73b0a49
 DIST VirtualBox-4.3.34-104062-Linux_x86.run 80567757 SHA256 c113c44582898436cec4374b0c1dd2e150227add4507a836664a5717e2bf8655 SHA512 cd47ee3fafaea2f43cfd01db29d380f9dde883039ad07ed9bc79a0b4884bfb0c9e1c97a9750642e73b6969af501cc34b59929b6ee6ac28e60d95ab2fdf41d24e WHIRLPOOL 5047c599b3a7f091f012a68889792d37e5463213ee5be151f1e2665c38f991aadf1bcf85df2495d9bf3e62e35f3e2627c103a0d293119d9550beed8d20b4dffb
 DIST VirtualBox-5.0.10-104061-Linux_amd64.run 84448721 SHA256 77c3500f460f24850c796fbef84d7ecd7cf05b5a34256e712172e6f159f119e9 SHA512 431edd417f7e7931dfa4314ef095aedc3eb489349d16a13cb8bae1c9fbf6b19aed00e845b9389ff1805959649b8cabb6b8e38c36cb7b65f8450d403f68b6d414 WHIRLPOOL 0d598ec0be6a8ea41c3908c47c072480bd37542a633493834367941c063734104d73f2cb2c8ceb2d34625d89249e18bc98383970f5647c69858b1caa0c7e9447
 DIST VirtualBox-5.0.10-104061-Linux_x86.run 83537357 SHA256 7860f1a07f2535873ccfe2a46f63d71fa8ee491e7f194e577001d2f27ba4f7c3 SHA512 657071112ce8b54335d1ff67feab8785c13e5e09370763472d8f99970bef41aa4da3a4db158d5f778e8a39af05464538047c71742156a5749c2858cf7d6a04aa WHIRLPOOL 78718e91978e13eacbc4ac9b035b07043effb5785ffec3475f710e775b94736df98c4b45a6fdcd93733e418fc62a91992cf761c41b98e7288ec4714599669aab
-DIST VirtualBox-5.0.8-103449-Linux_amd64.run 84540882 SHA256 91bea0393f0b0afdc139660f23d77512723d367446d482545ded2eeeaba851d0 SHA512 5ab4d98070ba062cdacd88f60454333bdfa416fe0065978d3358fe1aaa7bb839f4a940630e9bb2f0e114879f2a839e3e1daf6d5000d11094c56951decda5babf WHIRLPOOL 915e6c7f30012087d9e37283fe3f073b9119aaadfb8a996899d9201003a8b30a490a5ecd9c61e3c919e957cda5ba9483df15d59d7ea2a13b600818ec9cc5f9d4
-DIST VirtualBox-5.0.8-103449-Linux_x86.run 83752397 SHA256 3b18e5bb5cde12d4d91add03c500862292cf44a4d4e9831ab8668312644562f8 SHA512 d4b7d602ebfc93df92f6dd4b3e050ab765c2f0caf7bbf0b85e674f8a349f9fe6c878777e85fffb3b74888252dd94c7c3d0447e6463ac2d6d39af3a20a67f7397 WHIRLPOOL 94cdd4d5f1b4504ab681aa511cbb2befcf1cebbd61b9eeec694b4758d887769b458daa20afc68a5fbadabbe97627e7c81718f17f5902f5de3e80ce6b59d3fb25
+DIST VirtualBox-5.0.12-104815-Linux_amd64.run 84592081 SHA256 5f182a1c98f72888c973d9ebb8429835fef8c48e9bd2ed436dd7cbeebe0e0f02 SHA512 6a14d92794bab5fdf7b79e48b02afe91863d693aa5d94f15e5d69ac377c1597fe3b6e0e390cf5ae5b0de77f85f52aa07b776bb50f3ed4a89e504b38d28da0411 WHIRLPOOL 6c9531c6833bad16486300c04635e454e96ff15c1dfaed1f85602eadd21a269e2ede3499dfd2a0641527cf49276e7f1ccfa80578e3f296f03d86d5c3b1725e77
+DIST VirtualBox-5.0.12-104815-Linux_x86.run 83752398 SHA256 a428cc9e260ec6c730fe4efdd99ac4fb14d1523d57dc97f8e38f3dd6bbdb073e SHA512 4a89eaa5a269ac6624d7c9bc0d3937d77cfb0d024629850e9e3b9bb616282e8cf252aa23acc69008d9380cfbd20f99c0cd7f5e74f6edd1912094cf037ee51e71 WHIRLPOOL e016412b5ff2bf256a4a4e5d37b2ea73f12f55e0d3f10d17c090185a6dbfee1b1de474e99739de72dbbd898151db6ee51470e71453b4fedf98918e195e98ae90
 DIST VirtualBoxSDK-4.3.28-100309.zip 11698378 SHA256 fe0cc316cecb3dfe9bbb925e6c023620d4cfd8e137b2a9b9f40f22f527af16fa SHA512 6af7d2107cff080281a356cbf522961b2e9d1917e861e410b169ce5ca3cefe05cc87e4e01f78ae171f8716f7006c031f14fc01d8d282a872a4f619638049b11a WHIRLPOOL 23a77dbc410a28b2799264da88d79b2c4335c07da67dd8bf4be26cac271e3ed38a9bf4fb2966ec0a3c06fb869bb252f5fa6a34a9a9c62cbb9a2fb0ad76442f66
 DIST VirtualBoxSDK-4.3.32-103443.zip 11435565 SHA256 84ff42f0e9d8f8945387247e7f57123d37cc2c53035ab1eca5414ca82102613a SHA512 914951d91adfa0d77e29863c7108d2e116a01562d0e0454b1203ae7d6e7e0a224f65a51cbf1e83b8067cb40da65708d2022ab5be35f2905a28f032653c827869 WHIRLPOOL 2e53a6f2d6e6e4f328139b03de8bf09b1a72ca3981addef7a2d02d8dbc02e8ea6c319b16facdcdb1be5d941d7d24b64598990112d3d52ca5e5c9b0a2c4d8e89e
 DIST VirtualBoxSDK-4.3.34-104062.zip 11436429 SHA256 5663713e2eb0eb248941e332f8bd06c2e98c3411f7ec354bbc32d5460c2044ad SHA512 cb3a85317370788ac8aa23d12110feb5a821c51acb27fc83ee8912cb3e38391897b9174eea54c88be139c0083f637bbf0146253d92fbdc83cf0a377b27bf68f7 WHIRLPOOL c885e99160e7fe94879692cbaae7532542b5af74c18f3f68b09d0c9a190cd009978ae24c7321e27828b247e48ddaaedf6e42cdc3d1b6d05a3651113c868f5f4e
 DIST VirtualBoxSDK-5.0.10-104061.zip 9634423 SHA256 270b9e8eb29ca7490cabe94cb7992c1a91f3bb002d1698d64ab4c787e55e9d80 SHA512 69dbbd49b1bee9ccc23bc5e9b2fd001043687d3993d0ecc285158aeca1282cd18b8308aa340e2d7b18c9c170c55f229df7041408a1e9811d78ba890c0ebc4ed0 WHIRLPOOL 1ea777baff50ba59544e0dde00b9969477b229f6d9db705a5e64d035f9ca532dce3f453e0e59fe7a12976d431e9048d43a7c23f42bdbd58e25b1014e6366abfc
-DIST VirtualBoxSDK-5.0.8-103449.zip 9635495 SHA256 c79826d184058701d0d2dbd345b7f188cee5dcac4297895f326cc18fc1253e92 SHA512 7161e8366cc9487bcadabc4a9ed9b27df6abdbc7d3fd82b9f824cc3a3054a6840526204b4e0366962a50d54f19f528f90efcb27cd2ddbf7b9e36d27ae7a573de WHIRLPOOL 933b70e5ebf33f3512e8f25312d27ebcbd3b272f9e07e41edad60f7e3fe6dc88f3b5a9d3b00c2e6d23d2ae8ec9c2d7e6f64680678a168e4d67f94bd9d8b15b65
+DIST VirtualBoxSDK-5.0.12-104815.zip 9632898 SHA256 2abc87108dfbca1e1818c7d420d2aa6cc382d7722f29edce2f7fa1c63772f0af SHA512 1acf69cfe33ecea59b8294f758150c8ed6d64d209c700e0555ef17abb4e66e81398ee1512406d14f5833d10d7a61f9446a020e68ed360a228946824f4bae9cee WHIRLPOOL ae2f33d10c13ab2927c5457bde024c10badf63b440820c25302cea216ca684eb28983c68f49de2c1fb0200cb48d6741c7270cb99a8075177ec60183c8b5777b2
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-5.0.8.103449.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-5.0.12.104815.ebuild
index be7050520b60..be7050520b60 100644
--- a/app-emulation/virtualbox-bin/virtualbox-bin-5.0.8.103449.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-5.0.12.104815.ebuild
diff --git a/app-emulation/virtualbox-extpack-oracle/Manifest b/app-emulation/virtualbox-extpack-oracle/Manifest
index 7ce640622c8a..9763be54ab35 100644
--- a/app-emulation/virtualbox-extpack-oracle/Manifest
+++ b/app-emulation/virtualbox-extpack-oracle/Manifest
@@ -2,4 +2,4 @@ DIST Oracle_VM_VirtualBox_Extension_Pack-4.3.28-100309.tar.gz 15961939 SHA256 72
 DIST Oracle_VM_VirtualBox_Extension_Pack-4.3.32-103443.tar.gz 15994576 SHA256 3f041c019985c35974bf034a9f7d941149fcc3e23a6200b47579140405af5f88 SHA512 212c21f6fc0af093e2d409827348d776377164b9c78b6c01dc710d4a63f53fa7ef52a66491d81b96dc64af4747d79ca0d0df55b052cf6b1c8ceb239c32dc1c75 WHIRLPOOL d67b55c409c6e06080010a25a4a64e660dcd0efaadffe2311166bed06c3f494a5f20cff131a42e07e82aba3cab7f53dea101fb3e5fabeecc2bdb0dd4a167c0ce
 DIST Oracle_VM_VirtualBox_Extension_Pack-4.3.34-104062.tar.gz 15994268 SHA256 b9c03b6db79de16f70134884c18cb4854a8c24cb36f90e3a9d2b93eb09fb6b37 SHA512 39b06eb26fcc01dc70de0a9d099a8919c53f72d9a74133d803bb5d10ea06cd390a6dd3853a024b311695c57805d6e2b664ec667fa0d882142f4a33fdfb01b642 WHIRLPOOL 1a3e98def84beeb73a8cc531bc1bfb98cdb3a3c02373aff910c89b023c85d22eb46d349a2c6ca19f37032113bad2dbc7f61b0960f7af3b2ca4d4c63a301a27f7
 DIST Oracle_VM_VirtualBox_Extension_Pack-5.0.10-104061.tar.gz 16918255 SHA256 c846fa26fec8587e57180c85c408cad377c48ad26830b0dc839ebf9025e3d29c SHA512 ae6bab29c14b1ace849ebf5715360fc0921950c62345e18709347f44c07f88727bf1785d53437e39d67f8c56d92cef1f6e3d03c3f7d6dd76c6d4d9ee7f1f1d5b WHIRLPOOL 822c3c9b20f9171b3e9d1896c2ff648ead049d63e45b8353da5d37e7f874433878fedcfb2f10ae5f50e4860466560a37b6102e8ffb3e9625106ce5188f491726
-DIST Oracle_VM_VirtualBox_Extension_Pack-5.0.8-103449.tar.gz 16880584 SHA256 febd2c99909cb932a98c2b9f73ce8eb03fc183c8c8f2fc874985cf3d598f6b94 SHA512 6a29aa1c52b460bded6e342cc66bb28d93f7f4c71eb108854dd2ba6934ae399e6ee7bd8acd29dda934f2933eb05b2e3878568fee76e5eb55ae43a695123568df WHIRLPOOL d6865e702c787c441da30a49e5aaff818a7530f2a82313c326a509cb3bb98f7cf22d511e3265b99a14402b2b9a7c4614d40ed570e6a6ba5522f4752248e2f338
+DIST Oracle_VM_VirtualBox_Extension_Pack-5.0.12-104815.tar.gz 16937595 SHA256 ac1bc8452b7fdf183325272149e9f18b9810cc07adf18e48755385a9cd1b236d SHA512 4a21cd155d1e60d3b6a4f4864cd8ca8ccd75f02448e832d72b42284dde5aa3c4aeba7f7297e3e7e198e4b4c665d770ac65c1aeca3df1dfa6a8454c47553baad7 WHIRLPOOL bcf032d0e72b57be37fdfd40d3c2f418eab10e04bfcbf1b99374b1fa9d2b5ced38c5cfc560b1c13492144a32a3c035b72649d9ae57851f6d430a4e59897cebe2
diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.0.8.103449.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.0.12.104815.ebuild
index 19d40ce0c134..19d40ce0c134 100644
--- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.0.8.103449.ebuild
+++ b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.0.12.104815.ebuild
diff --git a/app-emulation/virtualbox-guest-additions/Manifest b/app-emulation/virtualbox-guest-additions/Manifest
index 2abbf724df0c..e08d25af7826 100644
--- a/app-emulation/virtualbox-guest-additions/Manifest
+++ b/app-emulation/virtualbox-guest-additions/Manifest
@@ -2,4 +2,4 @@ DIST VirtualBox-4.3.28.tar.bz2 100092002 SHA256 e157ab76d1958ae2c56b2a3875194fbf
 DIST VirtualBox-4.3.32.tar.bz2 98168101 SHA256 dc5bf4e6f9989792d31bac174d20d7fc9e638654fa5a99c02b20a60557927261 SHA512 856b36cd90647cdceb7e182d066e9e1489d2bae0b71ce8b2f6324cd2d9854806eaea0fe0aad2d4e8b84bd836c688e13258ae69e094320572729b7d886c8d35f0 WHIRLPOOL 441041947dcd190d73a9cc5007bc0001b6eeb36ba958f4a09fca775670faff690423095d334e258fc0d6dcbef01d74a085505c8549397ced5dbe75ca96724144
 DIST VirtualBox-4.3.34.tar.bz2 98166680 SHA256 076507e924d3c5ae05c5e80a720b897da4a57a636a506a7d369b28f08b11d6c1 SHA512 1eeca08990d426155550d8920c159e41320bfedb53561b1752bd6816fa588588672ad364e73baf9b7b45e8352ae8feb1c649ba1748253da47586b55fe89e8fe3 WHIRLPOOL 1249e1d61aec38d439d1060457a1a0d0294a65d78dfa426026f3abe1882c429c628ea58f556bdeaf1a88d3cdd3b9095f1e4c6f1fae2176f39f8da5bb3d091809
 DIST VirtualBox-5.0.10.tar.bz2 110904399 SHA256 56eafae439b91ea3c3748f2128b2969ba76983acf821acaa08e043c129b45a89 SHA512 8836e5b57ed46b57b12a9fdb6a632e895c3106dad58c3ab3e28f9178ce69499c493a935b6df8b872dc4677c12eb826a46113bdb902e4fb3d2f8ee6d768e53930 WHIRLPOOL 05516c1d9a3cd876a67a73b86df47ec7d1ef08ed921cb3e25ef483676413982ac8a7ce6562f3003240d862a33759aee5e6c94a303a2a35b66025d72cb15d4404
-DIST VirtualBox-5.0.8.tar.bz2 110540476 SHA256 e043518b7ab150e478c00b622360a5feb95f4e5b19e72bfcc71174356e2dacb3 SHA512 2a8e0f3e5fbb4b45786aa48cb408cf712cd968af65b25219eb39d54274612978704359b620179d751e828783950eb29d4cf330ac408a84dd65edbd0d98e25aa4 WHIRLPOOL 2b054cdb5c7c39008e876f0703e154509f4a79183aa85c4998717ae07a72e015a71bd22dc0427c8a464b3e16db92ebe9d731971f9788fbe56c8cc936669496fe
+DIST VirtualBox-5.0.12.tar.bz2 111001547 SHA256 de0362b1d404d1ca0298db1984acb6f0f1c6210313aeb744fea345ad9201e86e SHA512 eef01d1a5121905d2fbfcd48081f18db06433187bfbfea6a006b3adea11cad8c8351025fd19fa115c132231592330b17bfeba033a3a168f3064176a3f7586d7a WHIRLPOOL bd73e67c83a524cb021ff92c4c3d655f6a1019e2d48f3ec97aee937543ca9da6f7ba2a1e70a6b75092dce3c8db8f3c7887300104fafa23432b94bc832c5e5447
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.0.8.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.0.12.ebuild
index a1d8560671d8..a1d8560671d8 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.0.8.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.0.12.ebuild
diff --git a/app-emulation/virtualbox-modules/Manifest b/app-emulation/virtualbox-modules/Manifest
index 4e1b450874e1..9b96f3cf12b7 100644
--- a/app-emulation/virtualbox-modules/Manifest
+++ b/app-emulation/virtualbox-modules/Manifest
@@ -2,4 +2,4 @@ DIST vbox-kernel-module-src-4.3.28.tar.xz 539876 SHA256 fb052997ec4992b0ee102475
 DIST vbox-kernel-module-src-4.3.32.tar.xz 546132 SHA256 4f0cf8a2d0f6714a5825551fa6ad38b85a70aac3a9949771bdcd85916ed12dae SHA512 7289dc1dd3a7e8812a57d3d1411c99ac25ddb33991e06e49a6212b030c6b6c2f08075c471f474c539b26be8a221934261af8f67a1aa4572f2e9cdb7433623a57 WHIRLPOOL 771c655bb5a7179d798330e438a3799d79cd1711844e491badaf7b6e0cb25fe2017a753675b0700b6ee2d8251bcc603f84a703cbe73b5bfcb46859b781d7c2d9
 DIST vbox-kernel-module-src-4.3.34.tar.xz 543584 SHA256 ab9ab4c0c9e315ee447813a056b83b264e7baea073195c347903f9e7014dd0c8 SHA512 44eaf10a7063d0761c98e02ec8b6dda2c20de9cd188b8beedd9546dd348e976440ade034779a6adcaaf385fd34b4600f254dc5a987d580db4eb81da5c0b57509 WHIRLPOOL 3279d351493af02ab8ea3e66f14b3ab7e2073f3478b0cfd757424c825f512d739a65dc8d6d074f57d4639e61a6205ede63aa0483340d72ba938e823cf28e0ede
 DIST vbox-kernel-module-src-5.0.10.tar.xz 592612 SHA256 d62362fe55291e94dfde20461549a4898fa782869e0cf88301cc3c09e6638f30 SHA512 e9a6166912f0550dde2fc2d62a104480ed179c3121c43ca66e4ee17ade51c71b3d9bfb2fc00a9af318a8fe0b2115f650023a80612d3f279d2b3b33a767664bbb WHIRLPOOL 4889f17ca4b33a12bc1d99e9ac5418834003957d8590ffcad9875ba5172edb26055c74c3d0daf0dba2c7b0c60faf3eb1ac92c94c63b74abe7965a46ef080d972
-DIST vbox-kernel-module-src-5.0.8.tar.xz 594164 SHA256 16513e3bec113e6e594a58ff0999ba70de4214c889dafed90ca181a6a603457d SHA512 91faf0054cd359a7455c1933dea3a37829f092eb966d8d2c6855061d3ecadfa1ea91a2258479f5696f373577f7aef1939bdd5808f9ca336e15f5476f4f6d464e WHIRLPOOL 837578475126fe8484e89140248971ce89e637a629a26b1324dc0b8b22d65fe351a1860d5c009223723a9d420d1a6f859c12c17ade510451177a6213f1905328
+DIST vbox-kernel-module-src-5.0.12.tar.xz 593196 SHA256 c24f56bbd04ccfb34af94d7d89c921e23d470b5b5720c2b819811c93226a072c SHA512 d6d474db87d854f2932639e564f0f6bb12d8852d5bbf8e19408aff0c53280116a3c0177b83f61b1c034edaa7404e9ba6584f762ad3b9003846016c8f873a9715 WHIRLPOOL 19d555eb05dfc4fae67595cdb8f4db38710ec66fca95216ce7783ef46c15a04d9347c82403877c1ddb01f16b6b02c2f9196879905a1d40ac81ca5db965472d47
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-5.0.8.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-5.0.12.ebuild
index 4bf941558d0d..4bf941558d0d 100644
--- a/app-emulation/virtualbox-modules/virtualbox-modules-5.0.8.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-5.0.12.ebuild
diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest
index 9453ddaced08..fffa04a41112 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -2,6 +2,6 @@ DIST VirtualBox-4.3.28.tar.bz2 100092002 SHA256 e157ab76d1958ae2c56b2a3875194fbf
 DIST VirtualBox-4.3.32.tar.bz2 98168101 SHA256 dc5bf4e6f9989792d31bac174d20d7fc9e638654fa5a99c02b20a60557927261 SHA512 856b36cd90647cdceb7e182d066e9e1489d2bae0b71ce8b2f6324cd2d9854806eaea0fe0aad2d4e8b84bd836c688e13258ae69e094320572729b7d886c8d35f0 WHIRLPOOL 441041947dcd190d73a9cc5007bc0001b6eeb36ba958f4a09fca775670faff690423095d334e258fc0d6dcbef01d74a085505c8549397ced5dbe75ca96724144
 DIST VirtualBox-4.3.34.tar.bz2 98166680 SHA256 076507e924d3c5ae05c5e80a720b897da4a57a636a506a7d369b28f08b11d6c1 SHA512 1eeca08990d426155550d8920c159e41320bfedb53561b1752bd6816fa588588672ad364e73baf9b7b45e8352ae8feb1c649ba1748253da47586b55fe89e8fe3 WHIRLPOOL 1249e1d61aec38d439d1060457a1a0d0294a65d78dfa426026f3abe1882c429c628ea58f556bdeaf1a88d3cdd3b9095f1e4c6f1fae2176f39f8da5bb3d091809
 DIST VirtualBox-5.0.10.tar.bz2 110904399 SHA256 56eafae439b91ea3c3748f2128b2969ba76983acf821acaa08e043c129b45a89 SHA512 8836e5b57ed46b57b12a9fdb6a632e895c3106dad58c3ab3e28f9178ce69499c493a935b6df8b872dc4677c12eb826a46113bdb902e4fb3d2f8ee6d768e53930 WHIRLPOOL 05516c1d9a3cd876a67a73b86df47ec7d1ef08ed921cb3e25ef483676413982ac8a7ce6562f3003240d862a33759aee5e6c94a303a2a35b66025d72cb15d4404
-DIST VirtualBox-5.0.8.tar.bz2 110540476 SHA256 e043518b7ab150e478c00b622360a5feb95f4e5b19e72bfcc71174356e2dacb3 SHA512 2a8e0f3e5fbb4b45786aa48cb408cf712cd968af65b25219eb39d54274612978704359b620179d751e828783950eb29d4cf330ac408a84dd65edbd0d98e25aa4 WHIRLPOOL 2b054cdb5c7c39008e876f0703e154509f4a79183aa85c4998717ae07a72e015a71bd22dc0427c8a464b3e16db92ebe9d731971f9788fbe56c8cc936669496fe
+DIST VirtualBox-5.0.12.tar.bz2 111001547 SHA256 de0362b1d404d1ca0298db1984acb6f0f1c6210313aeb744fea345ad9201e86e SHA512 eef01d1a5121905d2fbfcd48081f18db06433187bfbfea6a006b3adea11cad8c8351025fd19fa115c132231592330b17bfeba033a3a168f3064176a3f7586d7a WHIRLPOOL bd73e67c83a524cb021ff92c4c3d655f6a1019e2d48f3ec97aee937543ca9da6f7ba2a1e70a6b75092dce3c8db8f3c7887300104fafa23432b94bc832c5e5447
 DIST virtualbox-4.3.16-patches-01.tar.xz 4288 SHA256 270c4f01b2c13c4133987b3acc073dfbf78840212cf09f083dbf8fc80407ce6f SHA512 595f88c4b388b4807347c15c1750ec73aceba1c82ad993e9a05c7b78dfece7b679aff0338b3a48e2ccee7911fb5ed0dba803052332a270230078551f747052bc WHIRLPOOL 2157ee3fb9beed906cff28647c869e37d62551ad8c93801c0f0ec6893675f11786aa6d92acf11c348d30aa58b6e03a3faa879c664dddac6e5b8525035986c9ca
 DIST virtualbox-5.0.2-patches-01.tar.xz 4556 SHA256 8fcfa7972b0942f3e65bda73a35a6feb234aad770016fb4caafba105757d7ada SHA512 14ce8f0b17e593b2de676e0beaab688f29606aaea330151038fbb9259d3f5e4c22f254d1fa6cc45f968d81cf9f7d71deb9a7a32f565d07c1d9fa615431472ca9 WHIRLPOOL be73fd5576732f70f6ebb33a9d604d46a8fabdbdb0e187af3435f75412e21f62c0774130a9a6315e6b87ecf96d02398ffce828b3ab8f584716ed9a12e06d7cde
diff --git a/app-emulation/virtualbox/virtualbox-5.0.8.ebuild b/app-emulation/virtualbox/virtualbox-5.0.12.ebuild
index 6a55b8560100..6a55b8560100 100644
--- a/app-emulation/virtualbox/virtualbox-5.0.8.ebuild
+++ b/app-emulation/virtualbox/virtualbox-5.0.12.ebuild
diff --git a/app-laptop/tp_smapi/tp_smapi-0.41-r1.ebuild b/app-laptop/tp_smapi/tp_smapi-0.41-r1.ebuild
new file mode 100644
index 000000000000..fe6add2bf3e0
--- /dev/null
+++ b/app-laptop/tp_smapi/tp_smapi-0.41-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit flag-o-matic linux-mod
+
+DESCRIPTION="IBM ThinkPad SMAPI BIOS driver"
+HOMEPAGE="https://github.com/evgeni/tp_smapi/ http://tpctl.sourceforge.net/"
+SRC_URI="mirror://github/evgeni/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="hdaps"
+
+RESTRICT="userpriv"
+
+# We need dmideode if the kernel does not support DMI_DEV_TYPE_OEM_STRING
+# in dmi.h
+DEPEND="sys-apps/dmidecode"
+RDEPEND="${DEPEND}"
+
+pkg_pretend() {
+	linux-mod_pkg_setup
+
+	if kernel_is lt 2 6 19; then
+		eerror
+		eerror "${P} requires Linux kernel 2.6.19 or above."
+		eerror
+		die "Unsupported kernel version"
+	fi
+
+	MODULE_NAMES="thinkpad_ec(extra:) tp_smapi(extra:)"
+	BUILD_PARAMS="KSRC=${KV_DIR} KBUILD=${KV_OUT_DIR}"
+	BUILD_TARGETS="default"
+
+	if use hdaps; then
+		CONFIG_CHECK="~INPUT_UINPUT"
+		WARNING_INPUT_UINPUT="Your kernel needs uinput for the hdaps module to perform better"
+		linux-info_pkg_setup
+
+		MODULE_NAMES="${MODULE_NAMES} hdaps(extra:)"
+		BUILD_PARAMS="${BUILD_PARAMS} HDAPS=1"
+
+		CONFIG_CHECK="~!SENSORS_HDAPS"
+		ERROR_SENSORS_HDAPS="${P} with USE=hdaps conflicts with in-kernel HDAPS (CONFIG_SENSORS_HDAPS)"
+		linux-info_pkg_setup
+	fi
+}
+
+pkg_setup() {
+	# run again as pkg_pretend is not var safe
+	pkg_pretend
+}
+
+src_compile() {
+	# Kernel Makefiles may pull in -mpreferred-stack-boundary=3
+	# which requires that SSE disabled or compilation will fail.
+	# So we need to ensure that appended user CLAGS do not re-enable SSE
+	# https://bugs.gentoo.org/show_bug.cgi?id=492964
+	replace-flags '-msse*' ''
+
+	linux-mod_src_compile
+}
+
+src_install() {
+	linux-mod_src_install
+	dodoc CHANGES README
+	newinitd "${FILESDIR}"/${PN}-0.40-initd smapi
+	newconfd "${FILESDIR}"/${PN}-0.40-confd smapi
+}
diff --git a/app-pda/libimobiledevice/Manifest b/app-pda/libimobiledevice/Manifest
index 29dd46e11f84..6441fa75ff29 100644
--- a/app-pda/libimobiledevice/Manifest
+++ b/app-pda/libimobiledevice/Manifest
@@ -1 +1,2 @@
 DIST libimobiledevice-1.1.6.tar.bz2 619429 SHA256 1fcd56489a27181617507b1d8aaf122f66d9860c0fe5af4c78f9e0ed129e33e0 SHA512 ffc741eba65e73890ff50c906520b02189169ca92e95bcd3c8805caa1b1b44e4b1eaddad438c10fdbc112a867cdcfbe6a3dd667be1c639ad5a72ce621ee41a4f WHIRLPOOL 412c6f7523cd17178f639f7c3a8baa89857eff9c85d5e009bcb991591ca1304b6e4f80c2644289105831ee74d8848bee24708b598853a9444f4188a6731b9aa7
+DIST libimobiledevice-1.2.0.tar.bz2 631495 SHA256 786b0de0875053bf61b5531a86ae8119e320edab724fc62fe2150cc931f11037 SHA512 0de5f768aeb5d62445892855d84ceaff776f6667733c351ed6c34bf9d500802762d1a06e5efdf57f33cafc9ee788041cd9b6748fb9bad6c2e4ae2f9b9aa93589 WHIRLPOOL ca0d709fcc844811fa19b1b149afd81c15f75c213384789b1bc1a4ec838f12ffa33c6f78753befd4eae81156cb1c002d24e7ddc50a59f374164c33ddfd37ddb6
diff --git a/app-pda/libimobiledevice/libimobiledevice-1.1.6-r1.ebuild b/app-pda/libimobiledevice/libimobiledevice-1.1.6-r1.ebuild
new file mode 100644
index 000000000000..2ea6d8d5f947
--- /dev/null
+++ b/app-pda/libimobiledevice/libimobiledevice-1.1.6-r1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
+inherit eutils python-r1
+
+DESCRIPTION="Support library to communicate with Apple iPhone/iPod Touch devices"
+HOMEPAGE="http://www.libimobiledevice.org/"
+SRC_URI="http://www.libimobiledevice.org/downloads/${P}.tar.bz2"
+
+# While COPYING* doesn't mention 'or any later version', all the headers do, hence use +
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0/4" # based on SONAME of libimobiledevice.so
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="gnutls python static-libs"
+
+RDEPEND=">=app-pda/libplist-1.11:=
+	>=app-pda/libusbmuxd-1.0.9:=
+	gnutls? (
+		dev-libs/libgcrypt:0
+		>=dev-libs/libtasn1-1.1
+		>=net-libs/gnutls-2.2.0
+		)
+	!gnutls? ( dev-libs/openssl:0 )
+	python? (
+		${PYTHON_DEPS}
+		app-pda/libplist[python(-),${PYTHON_USEDEP}]
+		)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	python? ( >=dev-python/cython-0.17[${PYTHON_USEDEP}] )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DOCS=( AUTHORS NEWS README )
+
+BUILD_DIR="${S}_build"
+
+src_configure() {
+	local ECONF_SOURCE=${S}
+
+	local myeconfargs=( $(use_enable static-libs static) )
+	use gnutls && myeconfargs+=( --disable-openssl )
+
+	do_configure() {
+		mkdir -p "${BUILD_DIR}" || die
+		pushd "${BUILD_DIR}" >/dev/null || die
+		econf "${myeconfargs[@]}" "${@}"
+		popd >/dev/null || die
+	}
+
+	do_configure --without-cython
+	use python && python_foreach_impl do_configure
+}
+
+src_compile() {
+	python_compile() {
+		emake -C "${BUILD_DIR}"/cython -j1 \
+			VPATH="${S}/cython:${native_builddir}/cython" \
+			imobiledevice_la_LIBADD="${native_builddir}/src/libimobiledevice.la"
+	}
+
+	local native_builddir=${BUILD_DIR}
+	pushd "${BUILD_DIR}" >/dev/null || die
+	emake -j1
+	use python && python_foreach_impl python_compile
+	popd >/dev/null || die
+}
+
+src_install() {
+	python_install() {
+		emake -C "${BUILD_DIR}/cython" -j1 \
+			VPATH="${S}/cython:${native_builddir}/cython" \
+			DESTDIR="${D}" install
+	}
+
+	local native_builddir=${BUILD_DIR}
+	pushd "${BUILD_DIR}" >/dev/null || die
+	emake -j1 DESTDIR="${D}" install
+	use python && python_foreach_impl python_install
+	popd >/dev/null || die
+
+	dodoc docs/html/*
+	if use python; then
+		insinto /usr/include/${PN}/cython
+		doins cython/imobiledevice.pxd
+	fi
+	prune_libtool_files --all
+}
diff --git a/app-pda/libimobiledevice/libimobiledevice-1.2.0.ebuild b/app-pda/libimobiledevice/libimobiledevice-1.2.0.ebuild
new file mode 100644
index 000000000000..9a6116918c94
--- /dev/null
+++ b/app-pda/libimobiledevice/libimobiledevice-1.2.0.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
+inherit eutils python-r1
+
+DESCRIPTION="Support library to communicate with Apple iPhone/iPod Touch devices"
+HOMEPAGE="http://www.libimobiledevice.org/"
+SRC_URI="http://www.libimobiledevice.org/downloads/${P}.tar.bz2"
+
+# While COPYING* doesn't mention 'or any later version', all the headers do, hence use +
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0/6" # based on SONAME of libimobiledevice.so
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="gnutls python static-libs"
+
+RDEPEND=">=app-pda/libplist-1.11:=
+	>=app-pda/libusbmuxd-1.0.9:=
+	gnutls? (
+		dev-libs/libgcrypt:0
+		>=dev-libs/libtasn1-1.1
+		>=net-libs/gnutls-2.2.0
+		)
+	!gnutls? ( dev-libs/openssl:0 )
+	python? (
+		${PYTHON_DEPS}
+		app-pda/libplist[python(-),${PYTHON_USEDEP}]
+		)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	python? ( >=dev-python/cython-0.17[${PYTHON_USEDEP}] )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DOCS=( AUTHORS NEWS README )
+
+BUILD_DIR="${S}_build"
+
+src_configure() {
+	local ECONF_SOURCE=${S}
+
+	local myeconfargs=( $(use_enable static-libs static) )
+	use gnutls && myeconfargs+=( --disable-openssl )
+
+	do_configure() {
+		mkdir -p "${BUILD_DIR}" || die
+		pushd "${BUILD_DIR}" >/dev/null || die
+		econf "${myeconfargs[@]}" "${@}"
+		popd >/dev/null || die
+	}
+
+	do_configure --without-cython
+	use python && python_foreach_impl do_configure
+}
+
+src_compile() {
+	python_compile() {
+		emake -C "${BUILD_DIR}"/cython -j1 \
+			VPATH="${S}/cython:${native_builddir}/cython" \
+			imobiledevice_la_LIBADD="${native_builddir}/src/libimobiledevice.la"
+	}
+
+	local native_builddir=${BUILD_DIR}
+	pushd "${BUILD_DIR}" >/dev/null || die
+	emake -j1
+	use python && python_foreach_impl python_compile
+	popd >/dev/null || die
+}
+
+src_install() {
+	python_install() {
+		emake -C "${BUILD_DIR}/cython" -j1 \
+			VPATH="${S}/cython:${native_builddir}/cython" \
+			DESTDIR="${D}" install
+	}
+
+	local native_builddir=${BUILD_DIR}
+	pushd "${BUILD_DIR}" >/dev/null || die
+	emake -j1 DESTDIR="${D}" install
+	use python && python_foreach_impl python_install
+	popd >/dev/null || die
+
+	dodoc docs/html/*
+	if use python; then
+		insinto /usr/include/${PN}/cython
+		doins cython/imobiledevice.pxd
+	fi
+	prune_libtool_files --all
+}
diff --git a/app-pda/libplist/Manifest b/app-pda/libplist/Manifest
index ca10a4fc8e5c..020ea780f113 100644
--- a/app-pda/libplist/Manifest
+++ b/app-pda/libplist/Manifest
@@ -1 +1,2 @@
 DIST libplist-1.11.tar.bz2 355365 SHA256 28e1518eeea054f4eec9a1c93d9575d56193b290c53c1b753773a5e0add95235 SHA512 1c415670877c7091ded541dc36a6bc91132f714a0d3590090ead40ed972e0e076285441d3d219827cc425bc41fcbc101825e937620b7b4f2c1afe4bef8487fa2 WHIRLPOOL a2c74d3454b80696ab45922fe410833912554588d9ed5c177cbed1865bd98099b29a20ab6cf14a0b7c98de59d082fd15392915a94f33d27b16109300a0de2e4c
+DIST libplist-1.12.tar.bz2 384321 SHA256 0effdedcb3de128c4930d8c03a3854c74c426c16728b8ab5f0a5b6bdc0b644be SHA512 8af40d8f457ca9a8a9061e9429698c696200714cc05dcbe981e900106c52cd5222edb9dd8d8976bccd0c8997508ed14fb2e10f0ed29383f2ad4f7c5eb7eec0b3 WHIRLPOOL 7d3c4f7822683018b5b0e794d509b9cf5a703605ed772df849ad9ebba6e8191f2eb629444c07d2dcb265520d24c94f13287f200fec34779c9e6fe029536183a7
diff --git a/app-pda/libplist/libplist-1.11-r2.ebuild b/app-pda/libplist/libplist-1.11-r2.ebuild
new file mode 100644
index 000000000000..2f5331b864b2
--- /dev/null
+++ b/app-pda/libplist/libplist-1.11-r2.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
+inherit eutils python-r1
+
+DESCRIPTION="Support library to deal with Apple Property Lists (Binary & XML)"
+HOMEPAGE="http://www.libimobiledevice.org/"
+SRC_URI="http://www.libimobiledevice.org/downloads/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0/2" # based on SONAME of libplist.so
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd"
+IUSE="python static-libs"
+
+RDEPEND=">=dev-libs/libxml2-2.7.8
+	python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	python? ( >=dev-python/cython-0.17[${PYTHON_USEDEP}] )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DOCS=( AUTHORS NEWS README )
+
+RESTRICT="test" # TODO: src_test() was dropped from 1.10 (cmake) -> 1.11 (autotools)
+
+BUILD_DIR="${S}_build"
+
+src_configure() {
+	local ECONF_SOURCE=${S}
+	local myeconfargs=( $(use_enable static-libs static) )
+
+	do_configure() {
+		mkdir -p "${BUILD_DIR}" || die
+		pushd "${BUILD_DIR}" >/dev/null || die
+		econf "${myeconfargs[@]}" "${@}"
+		popd >/dev/null || die
+	}
+
+	do_configure --without-cython
+	use python && python_foreach_impl do_configure
+}
+
+src_compile() {
+	python_compile() {
+		emake -C "${BUILD_DIR}"/cython -j1 \
+			VPATH="${S}/cython:${native_builddir}/cython" \
+			plist_la_LIBADD="${native_builddir}/src/libplist.la"
+	}
+
+	local native_builddir=${BUILD_DIR}
+	pushd "${BUILD_DIR}" >/dev/null || die
+	emake -j1
+	use python && python_foreach_impl python_compile
+	popd >/dev/null || die
+}
+
+src_install() {
+	python_install() {
+		emake -C "${BUILD_DIR}/cython" -j1 \
+			VPATH="${S}/cython:${native_builddir}/cython" \
+			DESTDIR="${D}" install
+	}
+
+	local native_builddir=${BUILD_DIR}
+	pushd "${BUILD_DIR}" >/dev/null || die
+	emake -j1 DESTDIR="${D}" install
+	use python && python_foreach_impl python_install
+	popd >/dev/null || die
+
+	if use python ; then
+		insinto /usr/include/plist/cython
+		doins cython/plist.pxd
+	fi
+	prune_libtool_files --all
+}
diff --git a/app-pda/libplist/libplist-1.12.ebuild b/app-pda/libplist/libplist-1.12.ebuild
new file mode 100644
index 000000000000..f674ed03a676
--- /dev/null
+++ b/app-pda/libplist/libplist-1.12.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
+inherit eutils python-r1
+
+DESCRIPTION="Support library to deal with Apple Property Lists (Binary & XML)"
+HOMEPAGE="http://www.libimobiledevice.org/"
+SRC_URI="http://www.libimobiledevice.org/downloads/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0/3" # based on SONAME of libplist.so
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd"
+IUSE="python static-libs"
+
+RDEPEND=">=dev-libs/libxml2-2.7.8
+	python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	python? ( >=dev-python/cython-0.17[${PYTHON_USEDEP}] )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DOCS=( AUTHORS NEWS README )
+
+RESTRICT="test" # TODO: src_test() was dropped from 1.10 (cmake) -> 1.11 (autotools)
+
+BUILD_DIR="${S}_build"
+
+src_configure() {
+	local ECONF_SOURCE=${S}
+	local myeconfargs=( $(use_enable static-libs static) )
+
+	do_configure() {
+		mkdir -p "${BUILD_DIR}" || die
+		pushd "${BUILD_DIR}" >/dev/null || die
+		econf "${myeconfargs[@]}" "${@}"
+		popd >/dev/null || die
+	}
+
+	do_configure --without-cython
+	use python && python_foreach_impl do_configure
+}
+
+src_compile() {
+	python_compile() {
+		emake -C "${BUILD_DIR}"/cython -j1 \
+			VPATH="${S}/cython:${native_builddir}/cython" \
+			plist_la_LIBADD="${native_builddir}/src/libplist.la"
+	}
+
+	local native_builddir=${BUILD_DIR}
+	pushd "${BUILD_DIR}" >/dev/null || die
+	emake -j1
+	use python && python_foreach_impl python_compile
+	popd >/dev/null || die
+}
+
+src_install() {
+	python_install() {
+		emake -C "${BUILD_DIR}/cython" -j1 \
+			VPATH="${S}/cython:${native_builddir}/cython" \
+			DESTDIR="${D}" install
+	}
+
+	local native_builddir=${BUILD_DIR}
+	pushd "${BUILD_DIR}" >/dev/null || die
+	emake -j1 DESTDIR="${D}" install
+	use python && python_foreach_impl python_install
+	popd >/dev/null || die
+
+	if use python ; then
+		insinto /usr/include/plist/cython
+		doins cython/plist.pxd
+	fi
+	prune_libtool_files --all
+}
diff --git a/app-portage/eclass-manpages/eclass-manpages-20150814-r1.ebuild b/app-portage/eclass-manpages/eclass-manpages-20150814-r1.ebuild
new file mode 100644
index 000000000000..eafea7c90de1
--- /dev/null
+++ b/app-portage/eclass-manpages/eclass-manpages-20150814-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+DESCRIPTION="collection of Gentoo eclass manpages"
+HOMEPAGE="https://www.gentoo.org/"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE=""
+
+S=${WORKDIR}
+
+genit() {
+	local e=${1:-${ECLASSDIR}}
+	einfo "Generating man pages from: ${e}"
+	# Need `bash` because the .sh isn't +x on the servers #451352
+	env ECLASSDIR=${e} bash "${FILESDIR}"/eclass-to-manpage.sh || die
+}
+
+src_compile() {
+	# First process any eclasses found in overlays.  Then process
+	# the main eclassdir last so that its output will clobber anything
+	# that might have come from overlays.  Main tree wins!
+	local o e
+	for o in $(portageq get_repos /) ; do
+		e="$(portageq get_repo_path / ${o})/eclass"
+		[[ -d ${e} ]] || continue
+		genit "${e}" || die
+	done
+	genit || die
+}
+
+src_install() {
+	doman *.5
+}
diff --git a/app-portage/gentoolkit/files/0.3.1-setup.py-print.patch b/app-portage/gentoolkit/files/0.3.1-setup.py-print.patch
new file mode 100644
index 000000000000..29f7a186d1ef
--- /dev/null
+++ b/app-portage/gentoolkit/files/0.3.1-setup.py-print.patch
@@ -0,0 +1,29 @@
+From 4e06e9f032ed187ce682434955778c3241854e26 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Sun, 20 Dec 2015 15:19:06 -0500
+Subject: [PATCH] Remove useless print() in set_version
+
+This was causing a TypeError in python3.
+
+Bug: https://bugs.gentoo.org/568906
+---
+ setup.py | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index b32b7d6..01e4b3e 100755
+--- a/setup.py
++++ b/setup.py
+@@ -80,9 +80,6 @@ class set_version(core.Command):
+ 				with io.open(f[0], 'r', 1, 'utf_8') as s:
+ 					for line in s:
+ 						newline = re.sub(pattern %f[1], '"%s"' % ver, line, 1)
+-						if newline != line:
+-							#log.info("%s: %s" % (f, newline))
+-							print("%s: %s" % (f[0], newline.encode('utf_8').strip('\n')))
+ 						updated_file.append(newline)
+ 				with io.open(f[0], 'w', 1, 'utf_8') as s:
+ 					s.writelines(updated_file)
+-- 
+2.6.4
+
diff --git a/app-portage/gentoolkit/gentoolkit-0.3.0.9-r2.ebuild b/app-portage/gentoolkit/gentoolkit-0.3.0.9-r2.ebuild
index 182dc47c0907..f1d049783c9e 100644
--- a/app-portage/gentoolkit/gentoolkit-0.3.0.9-r2.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-0.3.0.9-r2.ebuild
@@ -7,7 +7,7 @@ EAPI="5"
 PYTHON_COMPAT=(python{2_7,3_3,3_4} pypy)
 PYTHON_REQ_USE="xml(+),threads(+)"
 
-inherit distutils-r1
+inherit distutils-r1 eutils
 
 DESCRIPTION="Collection of administration scripts for Gentoo"
 HOMEPAGE="https://www.gentoo.org/proj/en/portage/tools/index.xml"
@@ -36,6 +36,7 @@ PATCHES=(
 )
 
 python_prepare_all() {
+	epatch "${FILESDIR}/0.3.1-setup.py-print.patch"
 	python_setup
 	echo VERSION="${PVR}" "${PYTHON}" setup.py set_version
 	VERSION="${PVR}" "${PYTHON}" setup.py set_version
diff --git a/app-portage/gentoolkit/gentoolkit-0.3.1.ebuild b/app-portage/gentoolkit/gentoolkit-0.3.1.ebuild
index 4311b00395b3..7621d423fa82 100644
--- a/app-portage/gentoolkit/gentoolkit-0.3.1.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-0.3.1.ebuild
@@ -7,7 +7,7 @@ EAPI="5"
 PYTHON_COMPAT=(python{2_7,3_3,3_4,3_5} pypy)
 PYTHON_REQ_USE="xml(+),threads(+)"
 
-inherit distutils-r1
+inherit distutils-r1 eutils
 
 DESCRIPTION="Collection of administration scripts for Gentoo"
 HOMEPAGE="https://www.gentoo.org/proj/en/portage/tools/index.xml"
@@ -28,6 +28,7 @@ RDEPEND="${DEPEND}
 	sys-apps/grep"
 
 python_prepare_all() {
+	epatch "${FILESDIR}/0.3.1-setup.py-print.patch"
 	python_setup
 	echo VERSION="${PVR}" "${PYTHON}" setup.py set_version
 	VERSION="${PVR}" "${PYTHON}" setup.py set_version
diff --git a/app-shells/mksh/Manifest b/app-shells/mksh/Manifest
index 87de785af50d..341f83ac0d66 100644
--- a/app-shells/mksh/Manifest
+++ b/app-shells/mksh/Manifest
@@ -2,3 +2,4 @@ DIST mksh-R50d.tgz 374014 SHA256 a2268826a1463959ff7b7979fbf9176f1298400ecc24ae1
 DIST mksh-R50e.tgz 376013 SHA256 ad3c148769d08cf934a96be2837599ba9db355f38a8f49c7bc8876b80d2e08da SHA512 70d904eb4dfdaf28ee5858d1abec296d69e428e3a81e5802640bc4b95a4c77e08ad8f301b29063f329081428e4b9583f0203e9b509263e8e7b9a705ac63acde5 WHIRLPOOL 1b6d6e0c4413eac44f033945fc2fbe2891623821c1f1a5ceea0084dc834d8754f2582ffac72567138f337e7fdf069f19a79644fc3987fd6cb971c74bde5c209f
 DIST mksh-R50f.tgz 377797 SHA256 74e051ce92ece9555d91505b956572f64668fc88c5ccabee742099e7f29a2bcb SHA512 ca0b5d986727afc8b295b4a81c84e0048f1650c4ea3c45dcc05cabcc474bca4ab4719a063b708f3ddee08d65f35651652c0938b4279f6d706182d46ea5566cc1 WHIRLPOOL a5845cf4fa89b91f076e6eb7af5a176e98dd766a9dc3840acb832f3305c1b7b4f5e01871684a33b0491e34f841a5f6d75f34fba78f99be4852634f337b2054b4
 DIST mksh-R51.tgz 382169 SHA256 9feeaa5ff33d8199c0123675dec29785943ffc67152d58d431802bc20765dadf SHA512 dea2dea283959c0564cb6e9dbb9eecf004365cd01d83f1a8bbaff319c8ebefc4eb5e85898e207c7ce0577af525be0563e7c6b5f4b3449a2439e93f3f8bfd43ea WHIRLPOOL e626b4ffe5f637486a75a4008e51ddd3dd4c9c739dcb6b1502ee0b04f9ade20e55856497dacb5e7228d5b16af015e55fd33753b1d092c8aa7adcd5dd5e30681a
+DIST mksh-R52.tgz 383814 SHA256 45c2f5cdd2c63a6a831ffae65cea0afd021eabb983537aa21ff893ee38b3768f SHA512 83b478baa401dc6116c363043d9d6629028bbcdf19448db939738c5b98f8e4f7da92932296c2ee813b317151d31a1b6cd55d27f062f79e587e22991b018a0285 WHIRLPOOL 524524b950d5f7f21a2660235f955c45e645bcebf1e6120e71c183a0d50da5974840d7f70a18ab6d0766ad5345f62cd657f2fbcc1cd2d33976943f3bb28c243a
diff --git a/app-shells/mksh/mksh-52.ebuild b/app-shells/mksh/mksh-52.ebuild
new file mode 100644
index 000000000000..ee08d617cf75
--- /dev/null
+++ b/app-shells/mksh/mksh-52.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="MirBSD KSH Shell"
+HOMEPAGE="http://mirbsd.de/mksh"
+SRC_URI="http://www.mirbsd.org/MirOS/dist/mir/mksh/${PN}-R${PV}.tgz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
+IUSE="static"
+DEPEND="static? ( dev-libs/klibc )"
+RDEPEND=""
+S="${WORKDIR}/${PN}"
+
+src_compile() {
+	tc-export CC
+	# we want to build static with klibc
+	if use static ; then
+		unset CC
+		export CC="/usr/bin/klcc"
+		export LDSTATIC="-static"
+	fi
+	export CPPFLAGS="${CPPFLAGS} -DMKSH_DEFAULT_PROFILEDIR=\\\"${EPREFIX}/etc\\\""
+	# we can't assume lto existing/enabled, so we add a fallback
+	sh Build.sh -r -c lto || sh Build.sh -r || die
+}
+
+src_install() {
+	exeinto /bin
+	doexe mksh
+	doman mksh.1
+	dodoc dot.mkshrc
+}
+
+src_test() {
+	./test.sh || die
+}
+
+pkg_postinst() {
+	ebegin "Updating /etc/shells"
+	( grep -v "^/bin/mksh$" "${ROOT}"etc/shells; echo "/bin/mksh" ) > "${T}"/shells
+	mv -f "${T}"/shells "${ROOT}"etc/shells
+	eend $?
+}
diff --git a/app-text/asciidoc/asciidoc-9999.ebuild b/app-text/asciidoc/asciidoc-9999.ebuild
index 81bb1da1eed0..27a930e58f13 100644
--- a/app-text/asciidoc/asciidoc-9999.ebuild
+++ b/app-text/asciidoc/asciidoc-9999.ebuild
@@ -92,7 +92,7 @@ src_install() {
 		dosym ../../../asciidoc/images /usr/share/doc/${PF}/examples
 	fi
 
-	readme.gentoo.create_doc
+	readme.gentoo_create_doc
 	dodoc BUGS CHANGELOG README docbook-xsl/asciidoc-docbook-xsl.txt \
 			dblatex/dblatex-readme.txt filters/code/code-filter-readme.txt
 }
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index 69a4a7bf3ae9..3e280edb7815 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -1,3 +1,3 @@
 DIST calibre-1.20.0.tar.xz 32430560 SHA256 475e09b1be4b9977240cbbe6743ab79da4b1f1afe3fe6015d212d868e8f2fac4 SHA512 84ac25080cf4948398b79f9a1af688cca9cf9a5a9200b2aad649f5fda1cd0556be4ade0c8b09ea6ffcc95654eac0aaaa5b8f8ed6ea9830174bc150e64de85e31 WHIRLPOOL 61b6ecde2e3f8679c1afea95dcd152a94ce03522c06dff34b406a5705f6255243f0565fbb5f9bef3ac96d7127190bd1b4363233fa24fafcd0412e061201f6fe8
 DIST calibre-2.35.0.tar.xz 37470944 SHA256 7d883c7ed5cf7c3c2e53c4d18e3a67c15d8a0d3425df57919adb57132860518f SHA512 a693c23e93ad1086fe70b0cc7dcf43b1a9c004f045a3c2fac42f6a4b9f231d4f1e7b55c8bae133ac48389d4e233e245deb958365e9c0283cd8668f0f5a2326a2 WHIRLPOOL b07308d7bb9803a3a882aaf4143d287352aafae69383276d6ee95f7b92a8f65c50c8a5cdc6c242ae87d8faf13ad830fcea9e27364749614219bb221a3d6ac36a
-DIST calibre-2.43.0.tar.xz 38556328 SHA256 1156c78ab2a048272bd3e79920c65a4ab326507c668f9c550ef40ee30e470c41 SHA512 76d6560a8c68647888f822cc80c259587498ea4680e9fdef67a406304fb7701a7e35d0f6f5dce2026e32c2461e968b3208cfb6ce8604be6be4c170e4aebb148a WHIRLPOOL 0e7317bca7dbc87983864196d715b4e4f76ca33e0db4ce9ec4ec79d4c8efe223d621bd9d4001c8ace9ec5fb77c8ced01b52d5275a707e253b9ae93e709ffc81f
+DIST calibre-2.47.0.tar.xz 38924632 SHA256 048681cf6cb09b136017c6c99a1f1d908c6fcc3cdb2d40455cb4af8725395d0c SHA512 932ab2bae12ce128fa497bdd95d3c5f4f67e65bced5b73882f9b812cd9290c0a89c04c89ad3e1b421119c1ca88b5bfb7870a3060c91b5c8198e5ad709dbfdc96 WHIRLPOOL 15f4d3e19eafc57aabb526147926a4fa3343d340fcbc528df91ade6d82a7bfa6f993baee6224508c8dbf551d9640c16db71fc30c438675d09876b633dd3f6ea8
diff --git a/app-text/calibre/calibre-2.43.0.ebuild b/app-text/calibre/calibre-2.47.0.ebuild
index 98566c1715d0..98566c1715d0 100644
--- a/app-text/calibre/calibre-2.43.0.ebuild
+++ b/app-text/calibre/calibre-2.47.0.ebuild
diff --git a/app-text/dvipng/dvipng-1.15.ebuild b/app-text/dvipng/dvipng-1.15.ebuild
index 803f1c63e121..f55955e141f4 100644
--- a/app-text/dvipng/dvipng-1.15.ebuild
+++ b/app-text/dvipng/dvipng-1.15.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3+ Texinfo-manual"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="truetype test"
 
 RDEPEND="
diff --git a/app-text/rnv/metadata.xml b/app-text/rnv/metadata.xml
index f9d73871b422..64bd34360c45 100644
--- a/app-text/rnv/metadata.xml
+++ b/app-text/rnv/metadata.xml
@@ -11,9 +11,4 @@
 	<upstream>
 		<remote-id type="sourceforge">rnv</remote-id>
 	</upstream>
-	<use>
-		<flag name="scheme">
-			Enable scheme support based on <pkg>dev-scheme/scm</pkg>
-		</flag>
-	</use>
 </pkgmetadata>
diff --git a/dev-db/barman/Manifest b/dev-db/barman/Manifest
index 7cda572d30f1..e4e10ba280e3 100644
--- a/dev-db/barman/Manifest
+++ b/dev-db/barman/Manifest
@@ -1,2 +1,3 @@
 DIST barman-1.4.0.tar.gz 120590 SHA256 d18c331bd6d8931bd60dab272bc9d512eb494bfddb11964d7ca430f51b7e45e9 SHA512 415fd5597df94fb43b8c48ec1250c22e6bbe21217fe9937d6c0cf6ef8ab68bea21b9341c18a2e97f7af92b516f0201b82fa1279af6994d6fa60d441d3f9326e2 WHIRLPOOL 6e1e1c112ad5ef1afc76369d0f4428128ce85d2abe4a298b2eed73efc6bd2e248dd81baa3f6839360ea162dc676103f4e59f13fefe102ea609455e1330444e93
 DIST barman-1.4.1.tar.gz 122048 SHA256 38a649ab1cea811e2db9410d87c08423beb3135f88b1160913bcb9f16a10b1df SHA512 3f6d55ceee55efc95d526848292f68c80bbee4081fc26714b0da52990e3a05030ae2f89561a4c4c71c273bb1c07f009dc0bbbbebbc5cde87831b514e918ad531 WHIRLPOOL 8f42844f5d9514b0d8c14ff2ad03f1e8e3994e0e394e7e7a761b0a95ed6a8c9a4eea791a82a14b346cbcf3354aaa8f56547290eddc75ea0f57e775a55db70499
+DIST barman-1.5.0.tar.gz 128132 SHA256 21188b11f64dd13e70236456ca7ad43fc21ccb1956e093ced7f8f810b13d972a SHA512 7b9501277868b141f3813a545fe5463a1f7cddb0d4aaeb6c13a21aa969ced4a0a53a38ecb6e091b84c0174dae0593235cb8b586bdd244b30776273030cdfc1e8 WHIRLPOOL 5d5630370c5c30f79228e4007ff0608d2c6c44eee4e6d2f7dca2518c432bae24ddb5f6f32680b4759277d4b5e572140906f658f4d2db2d2fd82e1fea965675fe
diff --git a/dev-db/barman/barman-1.5.0.ebuild b/dev-db/barman/barman-1.5.0.ebuild
new file mode 100644
index 000000000000..d312a7ea25b1
--- /dev/null
+++ b/dev-db/barman/barman-1.5.0.ebuild
@@ -0,0 +1,26 @@
+# 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
+
+DESCRIPTION="Administration tool for disaster recovery of PostgreSQL servers"
+
+HOMEPAGE="http://www.pgbarman.org"
+SRC_URI="http://downloads.sourceforge.net/project/pgbarman/${PV}/${P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+
+RDEPEND="dev-python/argh[${PYTHON_USEDEP}]
+	>=dev-python/psycopg-2[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/argcomplete[${PYTHON_USEDEP}]
+	net-misc/rsync
+	dev-db/postgresql[server]"
+DEPEND=""
diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index ab28e672b2fb..d1d69ed0c87f 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -6,3 +6,4 @@ DIST mongodb-src-r2.6.8.tar.gz 14545274 SHA256 1997f60d9de17320f22c604d8aa1cbe5f
 DIST mongodb-src-r3.0.5.tar.gz 26332788 SHA256 05b16a7991aa65b1d396a3dc622107fba3216fffa8b9ed0817e76ae95f5f7fdb SHA512 17c66f9501e6517feba069f85bb468a421c45300306977ebfed71e6ce120e2bed64f14698e470c644360e23f40132171d64ac85f0962aa3ba824a48cf228775a WHIRLPOOL 7ed1f2b0daf7cb9ff081e69823e79504b8c99a221c74c2a541d673febacad9e555ef34eb4f2e97effe7e6fddafb81b903ab5a4ac8c4e8951640a0f2c6828ba14
 DIST mongodb-src-r3.0.6.tar.gz 26241944 SHA256 609f6bd416ed11898b49406332b8ff301de239ba72df0bdbf1603233229c822d SHA512 1990e9011ae586e30aef28be58f9fc6d8b7f45b787dbde9785c82eff6fb0a70ea45152e450c032a898e6464bbb9b1683082f2a072ba874f7532e167330658175 WHIRLPOOL 4090cfb5912f81e6329d3c3680009037f22cd406611f78dc0ddd6fc9a63ee5261c7751fe83c60add2d5917f57b2a3c2796c48abb6f633157a8811d0571793a35
 DIST mongodb-src-r3.0.7.tar.gz 26261343 SHA256 2d25bae7c3bfb3c0e168fcad526dc212da72faaeae6d1573db631cacb172a7e7 SHA512 183691c5dc137ea4b86d53d24d2935fd66ed8de60fbf5eca0a0a39c159be1f29043cd655cde1a213a98a76b2b3e6369dbccf790b02a1cc4b622c067ad3c0c91b WHIRLPOOL 986d962e76122142ca810eb7fe13ef66c88c7e354f066292836fc1207fa64c8bbb7fc49d1392db503c8a594d2593e2a19d831d7367462fcfa43eea38768e6323
+DIST mongodb-src-r3.0.8.tar.gz 26245612 SHA256 3574f2f577e212ff1876485e1502c91f70f996fbbcc5a4657fe440ac76bd97a5 SHA512 3b8578ed2a6196cda0867d219214e1dc9fe95ecaa8320cdee3766c9a8a78e9cf66013769a3fbbf03ccf9a35d97e02a1eaa5fe8fc7429a0d76dd78486db7520ac WHIRLPOOL ded0b84b940c66b8a7ef6b363f179a4b2c1ddc23a3077b9cadb01f76c2a90956f0a720e713d4806db6132ac96b1026b82c2bf966ec3869af095e12590ea04d0e
diff --git a/dev-db/mongodb/mongodb-3.0.8.ebuild b/dev-db/mongodb/mongodb-3.0.8.ebuild
new file mode 100644
index 000000000000..1e9188ce3a8d
--- /dev/null
+++ b/dev-db/mongodb/mongodb-3.0.8.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+SCONS_MIN_VERSION="2.3.0"
+CHECKREQS_DISK_BUILD="2400M"
+CHECKREQS_DISK_USR="512M"
+CHECKREQS_MEMORY="1024M"
+
+inherit eutils flag-o-matic multilib pax-utils scons-utils systemd user versionator check-reqs
+
+MY_P=${PN}-src-r${PV/_rc/-rc}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="http://www.mongodb.org"
+SRC_URI="http://downloads.mongodb.org/src/${MY_P}.tar.gz"
+
+LICENSE="AGPL-3 Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug kerberos libressl mms-agent ssl +tools"
+
+RDEPEND="app-arch/snappy
+	>=dev-cpp/yaml-cpp-0.5.1
+	>=dev-libs/boost-1.57[threads(+)]
+	>=dev-libs/libpcre-8.30[cxx]
+	dev-libs/snowball-stemmer
+	net-libs/libpcap
+	sys-libs/zlib
+	mms-agent? ( app-admin/mms-agent )
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-1.0.1g:0= )
+		libressl? ( dev-libs/libressl:= )
+	)"
+DEPEND="${RDEPEND}
+	>=sys-devel/gcc-4.8.2:*
+	sys-libs/ncurses
+	sys-libs/readline
+	kerberos? ( dev-libs/cyrus-sasl[kerberos] )"
+PDEPEND="tools? ( >=app-admin/mongo-tools-${PV} )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	enewgroup mongodb
+	enewuser mongodb -1 -1 /var/lib/${PN} mongodb
+
+	# Maintainer notes
+	#
+	# --use-system-tcmalloc is strongly NOT recommended:
+	# https://www.mongodb.org/about/contributors/tutorial/build-mongodb-from-source/
+	#
+	# --c++11 is required by scons instead of auto detection:
+	# https://jira.mongodb.org/browse/SERVER-19661
+
+	scons_opts="--variant-dir=build --cc=$(tc-getCC) --cxx=$(tc-getCXX) --c++11"
+	scons_opts+=" --disable-warnings-as-errors"
+	scons_opts+=" --use-system-boost"
+	scons_opts+=" --use-system-pcre"
+	scons_opts+=" --use-system-snappy"
+	scons_opts+=" --use-system-stemmer"
+	scons_opts+=" --use-system-yaml"
+
+	if use debug; then
+		scons_opts+=" --dbg=on"
+	fi
+
+	if use prefix; then
+		scons_opts+=" --cpppath=${EPREFIX}/usr/include"
+		scons_opts+=" --libpath=${EPREFIX}/usr/$(get_libdir)"
+	fi
+
+	if use kerberos; then
+		scons_opts+=" --use-sasl-client"
+	fi
+
+	if use ssl; then
+		scons_opts+=" --ssl"
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-3.0.0-fix-scons.patch"
+}
+
+src_compile() {
+	# respect mongoDB upstream's basic recommendations
+	# see bug #536688 and #526114
+	if ! use debug; then
+		filter-flags '-m*'
+		filter-flags '-O?'
+	fi
+	escons ${scons_opts} core tools
+}
+
+src_install() {
+	escons ${scons_opts} --nostrip install --prefix="${ED}"/usr
+
+	for x in /var/{lib,log}/${PN}; do
+		keepdir "${x}"
+		fowners mongodb:mongodb "${x}"
+	done
+
+	doman debian/mongo*.1
+	dodoc README docs/building.md
+
+	newinitd "${FILESDIR}/${PN}.initd-r2" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd-r2" ${PN}
+	newinitd "${FILESDIR}/${PN/db/s}.initd-r2" ${PN/db/s}
+	newconfd "${FILESDIR}/${PN/db/s}.confd-r2" ${PN/db/s}
+
+	insinto /etc
+	newins "${FILESDIR}/${PN}.conf-r3" ${PN}.conf
+	newins "${FILESDIR}/${PN/db/s}.conf-r2" ${PN/db/s}.conf
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+	# see bug #526114
+	pax-mark emr "${ED}"/usr/bin/{mongo,mongod,mongos}
+}
+
+pkg_preinst() {
+	# wrt bug #461466
+	if [[ "$(get_libdir)" == "lib64" ]]; then
+		rmdir "${ED}"/usr/lib/ &>/dev/null
+	fi
+}
+
+src_test() {
+	escons ${scons_opts} dbtest
+	"${S}"/dbtest --dbpath=unittest || die "dbtest failed"
+	escons ${scons_opts} smokeCppUnittests --smokedbprefix="smokecpptest" || die "smokeCppUnittests tests failed"
+}
+
+pkg_postinst() {
+	if [[ ${REPLACING_VERSIONS} < 3.0 ]]; then
+		ewarn "!! IMPORTANT !!"
+		ewarn " "
+		ewarn "${PN} configuration files have changed !"
+		ewarn " "
+		ewarn "Make sure you migrate from /etc/conf.d/${PN} to the new YAML standard in /etc/${PN}.conf"
+		ewarn "  http://docs.mongodb.org/manual/reference/configuration-options/"
+		ewarn " "
+		ewarn "Make sure you also follow the upgrading process :"
+		ewarn "  http://docs.mongodb.org/master/release-notes/3.0-upgrade/"
+		ewarn " "
+		ewarn "MongoDB 3.0 introduces the WiredTiger storage engine."
+		ewarn "WiredTiger is incompatible with MMAPv1 and you need to dump/reload your data if you want to use it."
+		ewarn "Once you have your data dumped, you need to set storage.engine: wiredTiger in /etc/${PN}.conf"
+		ewarn "  http://docs.mongodb.org/master/release-notes/3.0-upgrade/#change-storage-engine-to-wiredtiger"
+	fi
+}
diff --git a/dev-java/colt/colt-1.2.0-r2.ebuild b/dev-java/colt/colt-1.2.0-r2.ebuild
index 037f0c5f0e00..f3bc76b54dd1 100644
--- a/dev-java/colt/colt-1.2.0-r2.ebuild
+++ b/dev-java/colt/colt-1.2.0-r2.ebuild
@@ -29,15 +29,15 @@ JAVA_ANT_REWRITE_CLASSPATH="true"
 EANT_GENTOO_CLASSPATH="concurrent-util"
 
 java_prepare() {
-        find "${S}" -iname '*.jar' -delete || die
+	find "${S}" -iname '*.jar' -delete || die
 
-        epatch "${FILESDIR}/${P}-benchmark-no-deprecation.patch"
+	epatch "${FILESDIR}/${P}-benchmark-no-deprecation.patch"
 }
 
 src_install() {
-        java-pkg_dojar lib/${PN}.jar
+	java-pkg_dojar lib/${PN}.jar
 
-        dohtml README.html || die
-        use doc && java-pkg_dojavadoc doc/api
-        use source && java-pkg_dosrc src/*
+	dohtml README.html || die
+	use doc && java-pkg_dojavadoc doc/api
+	use source && java-pkg_dosrc src/*
 }
diff --git a/dev-java/javacup/metadata.xml b/dev-java/javacup/metadata.xml
index 3364029ae5a8..7303cef96964 100644
--- a/dev-java/javacup/metadata.xml
+++ b/dev-java/javacup/metadata.xml
@@ -2,10 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>java</herd>
-	<use>
-		<flag name="system-jflex">
-			Build against system <pkg>dev-java/jflex</pkg> rather than the bundled one.
-			Disabling this flag allows breaking the circular dependency when necessary.
-		</flag>
-	</use>
 </pkgmetadata>
diff --git a/dev-java/tomcat-native/tomcat-native-1.2.2.ebuild b/dev-java/tomcat-native/tomcat-native-1.2.2.ebuild
index a9cfc4233870..052754ca3e54 100644
--- a/dev-java/tomcat-native/tomcat-native-1.2.2.ebuild
+++ b/dev-java/tomcat-native/tomcat-native-1.2.2.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Native APR library for Tomcat"
 SLOT="0"
 SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.tar.gz"
 HOMEPAGE="http://tomcat.apache.org/"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 LICENSE="Apache-2.0"
 IUSE="test"
 
diff --git a/dev-lang/hy/hy-0.11.0-r1.ebuild b/dev-lang/hy/hy-0.11.0-r1.ebuild
new file mode 100644
index 000000000000..c0e9079ffe85
--- /dev/null
+++ b/dev-lang/hy/hy-0.11.0-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+RESTRICT="test" # needs some pointy sticks. Seriously.
+PYTHON_COMPAT=(python2_7 python3_3 python3_4)
+
+inherit distutils-r1
+DESCRIPTION="A LISP dialect running in python"
+HOMEPAGE="http://hylang.org/"
+SRC_URI="https://github.com/hylang/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="test doc examples"
+
+RDEPEND="dev-python/flake8[${PYTHON_USEDEP}]
+	>=dev-python/rply-0.7.0[${PYTHON_USEDEP}]
+	>=dev-python/astor-0.5[${PYTHON_USEDEP}]
+	dev-python/clint[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/tox[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+	)"
+src_prepare() {
+	use examples && EXAMPLES=( eg/. )
+	use doc && HTML_DOCS=( docs/_build/html/. )
+}
+
+python_compile_all() {
+	use doc && make docs || die
+}
+
+python_test() {
+	nosetests || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-lang/moarvm/Manifest b/dev-lang/moarvm/Manifest
index 141514ef5327..27a1762c352d 100644
--- a/dev-lang/moarvm/Manifest
+++ b/dev-lang/moarvm/Manifest
@@ -5,3 +5,4 @@ DIST MoarVM-2015.04.tar.gz 3148539 SHA256 9dc9efc2e7d16e9d2adf5d17dc377ad22e66c4
 DIST MoarVM-2015.05.tar.gz 3150053 SHA256 828843eb3da020ee24ff83933b63aebf4aa774b815a3dfa3a758d6334779565e SHA512 6db5eba4a6b6b6efc5b7a6b3e251428ebdfea9279fc15854238a943377a64f4db26f0e1c3cccf473d07f308f38e97b65983ddc0e1f884d9b6b6fc61034085474 WHIRLPOOL bf7770a67556e0830e6cf71e3e40d53cb41ef3c6970edbd88a2d8d843d98f30e578e7a83a950cffb31a17863efa1d99594737a1a1da8dfdc19dd60092d56b179
 DIST MoarVM-2015.06.tar.gz 3155073 SHA256 8dfe52630a3fcc749b653591f8a4e7fa723cd204cf0f6133b62b70d1b9c5980f SHA512 427e036fcee06b65642c9e07ea687c28593a432e2b6f1ee0bc503f6ce32f93f77219bb9e80aec1d1300dc0ba4b92cc467a04896a0ead4b2ef89656d6844913ad WHIRLPOOL cf6af05afd5eb872954d9e9fcb86d06061e9b7ab80799afdeb10f6e255d15766d6def2054c3e3e79be83fc61d036bc39b14cf57e9f32a7a6c47046a6b90d03e6
 DIST MoarVM-2015.07.tar.gz 3225835 SHA256 310a4ea6dbaacaf1837606edf6c42170143f60c8e29eb94c7e6fea810b6af10b SHA512 304d6ce5c50a5091daa02dab0fe328875d392fee29aed397db530324c51b909529ede9f703f18f43bbc398c70ec85958ffed3a8bc06d77e29ec193561165b581 WHIRLPOOL 6036fb9cba88a12edc3c5332d706cd11e6604d418217f880f9b409e16b22fd4610bc6c8e606888d69ccee9dbd7836d9ebcc3006a8bf6cce766334192ff3e7f52
+DIST MoarVM-2015.11.tar.gz 3261494 SHA256 eca0efcd620c51909b6caea8e3c8085f0de1dbb629dc064bea3a916a9bead5cf SHA512 338f220a0462431425c3c999233470686d342899e56473f9beb3d8a509daf25866b5c4419e28a1f3a4902526690e80b581b8567d6327d49b4c4b9a81eb932569 WHIRLPOOL a03c22ef4fd15864c141df7867cf4089da8382fb457179bdafd95cb2625d69df3a252bf41caa0327ea20ec664aa5ab1553eadb8d59c5ebb0942a8758f143e372
diff --git a/dev-lang/moarvm/moarvm-2015.11.ebuild b/dev-lang/moarvm/moarvm-2015.11.ebuild
new file mode 100644
index 000000000000..af545660fe2e
--- /dev/null
+++ b/dev-lang/moarvm/moarvm-2015.11.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils multilib
+
+MY_PN="MoarVM"
+
+DESCRIPTION="A 6model-based VM for NQP and Rakudo Perl 6"
+HOMEPAGE="http://moarvm.org"
+SRC_URI="http://moarvm.org/releases/${MY_PN}-${PV}.tar.gz"
+LICENSE="Artistic-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND="dev-libs/libuv"
+DEPEND="${RDEPEND}
+	dev-lang/perl"
+
+S="${WORKDIR}/MoarVM-${PV}"
+
+src_configure() {
+	perl Configure.pl --prefix="${D}/usr"|| die
+}
+
+src_install() {
+	emake install
+}
diff --git a/dev-lang/nqp/Manifest b/dev-lang/nqp/Manifest
index 0062ba5901b7..310ed209e4d4 100644
--- a/dev-lang/nqp/Manifest
+++ b/dev-lang/nqp/Manifest
@@ -5,3 +5,4 @@ DIST nqp-2015.04.tar.gz 4995958 SHA256 a58e45ae42035102222bf3b3b62bd3892ccaec5ae
 DIST nqp-2015.05.tar.gz 4985712 SHA256 ad54f05422d0fbe14483b91de26c195a2d7e21e19446c6374aba5342458c7762 SHA512 0190f8e27b6dcc77cfc8f35efb7b7871e2efb56284ad7cb25b5662c14d5844262d2c491a43f8b60d567402bf2dd5264ad8736de3334d804173e3aa36a93c7449 WHIRLPOOL f4ebddf27db049478ed70c6dfbce0bda06aecddc6a088f73ee484b6f2da5aa2c59ea60619b871477b2c08ccf9969ccfcc636972d14c9c3da791a929f402f1259
 DIST nqp-2015.06.tar.gz 4986918 SHA256 07dd6ea9762c9a3d5e477472cd65584b5e00fef1403c540d2b4ce802c2cc9d26 SHA512 f5d8e9dc057d303745d691eb6f92222c6586077a8f5c3ce0bf8557f715fa7e9ddea6a333e7db1743ed9982189e13e920c0228b40e22bfd3eac9b889a589bc3cb WHIRLPOOL a8164398f54fbc1609f52352e01112681390959a53b1c3d61192800ad2ec40e3ac79c2cb67108f10ab3bd277a540b52aa16e2d989461a860990cef5c92f02b3a
 DIST nqp-2015.07.2.tar.gz 5001361 SHA256 45cde1880b314d98dd20062e93ef28f083dbf2239784e8f050456df8520a25c1 SHA512 b40ad51e37504b0c05e3d27c7a09543bb4735b3d8758a34805034600e362ae327434584f6824ef72587c37de5b51b476dbb05e8f0f248dc49ed64449f2ba1917 WHIRLPOOL 692f4ac9c669f7cf3b56e81b659f4b1d50296b4dccf9effa6f08aca9082f3b501fad140f7411e9ddbada15a5c458be21b699e850ed04574ed53699d2d28be084
+DIST nqp-2015.11.tar.gz 5113497 SHA256 f9a5e33e628d56b1210a049363198ed05b465024d4f259809f1b1617eb49b568 SHA512 94f464c055b308ee408240d3cbb7e30b71de99c14e97b5bbaa5fbbe4bc021f60b5567de0113628e2dfb89152eb6a00c8d0cfee92c3b54c5c5fd473c2f00e2cf7 WHIRLPOOL 57151fe290dc6674cb10b190349d8809cff90d10385500fda7772d2d78539d492b18be49d1bd903a96c6a9d1bc26a797f7cf3f956891b0af3820c70ce7307d7d
diff --git a/dev-lang/nqp/nqp-2015.11.ebuild b/dev-lang/nqp/nqp-2015.11.ebuild
new file mode 100644
index 000000000000..12f4c3c135e0
--- /dev/null
+++ b/dev-lang/nqp/nqp-2015.11.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# still not working
+RESTRICT="test"
+
+inherit eutils multilib versionator
+
+GITCRAP=a796efb
+PARROT_VERSION="6.7.0"
+
+DESCRIPTION="Not Quite Perl, a Perl 6 bootstrapping compiler"
+HOMEPAGE="http://rakudo.org/"
+SRC_URI="https://github.com/perl6/${PN}/tarball/${PV} -> ${P}.tar.gz"
+
+LICENSE="Artistic-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="doc parrot java +moar"
+REQUIRED_USE="|| ( parrot java moar )"
+
+RDEPEND="parrot? ( >=dev-lang/parrot-${PARROT_VERSION}:=[unicode] )
+	java? ( >=virtual/jre-1.7 )
+	moar? ( =dev-lang/moarvm-${PV} )
+	dev-libs/libffi"
+DEPEND="${RDEPEND}
+	java? ( >=virtual/jdk-1.7 )
+	dev-lang/perl"
+
+S=${WORKDIR}/perl6-nqp-${GITCRAP}
+
+src_configure() {
+	use java && myconf+="jvm,"
+	use parrot && myconf+="parrot,"
+	use moar && myconf+="moar,"
+	perl Configure.pl --backend=${myconf} --prefix=/usr || die
+	# dirty hack to make dyncall not fail
+	sed -i -e 's/-Werror=missing-prototypes//' Makefile || die
+	sed -i -e 's/-Werror=missing-declarations//' Makefile || die
+	sed -i -e 's/-Werror=strict-prototypes//' Makefile || die
+
+	# more dirty hack to allow building with newer gcc
+	sed -i -e 's/-Werror=implicit-function-declaration//' Makefile || die
+	sed -i -e 's/-Werror=nested-externs//' Makefile || die
+}
+
+src_compile() {
+	emake -j1 || die
+}
+
+src_test() {
+	emake -j1 test || die
+}
+
+src_install() {
+	emake DESTDIR="${ED}" install || die
+
+	dodoc CREDITS README.pod || die
+
+	if use doc; then
+		dodoc -r docs/* || die
+	fi
+}
diff --git a/dev-lang/parrot/Manifest b/dev-lang/parrot/Manifest
index 02f8b99333c4..d31e4fc57421 100644
--- a/dev-lang/parrot/Manifest
+++ b/dev-lang/parrot/Manifest
@@ -1,5 +1,6 @@
 DIST parrot-7.0.2.tar.gz 4697530 SHA256 1a8e9e203ad8ac92c89422603d1603fa821e957aa3a9ae57420c737d93c55213 SHA512 9fcd3d27c71a37841c81353aea3e393822358521e18f02644caa360de8d0f90b04c040839539769f0565c76fecc345a8c803c8e1b2cb0ec14675077a84cb4714 WHIRLPOOL e3f42c54c2c1dc422a7307e1f45689a81e27ffece6178e96067ae5a1ced168cf27849765249759d4fbc0b355151dc1d274dc97a8fb6a17cf9eece831415f2a71
 DIST parrot-7.1.0.tar.gz 4688341 SHA256 fe2cac1f5b811f36d6de7454ef1ff394ad66474f203813e5369b4dc68305964b SHA512 b7d261e82934aa84b3d93b2e68b3eb0f13dea684665ca2448a0e2139aa6676c1ff2da1a8056332a7f2538bee6158953be5bceed0ac8a9b277827ec7bcba46cb8 WHIRLPOOL 8083787f8779664e4ec7b3426b3e103dff9a22dfb18051e7617b6738b44156e1084f1691ce02e5869abba4d6455628c30631a9b5c86bc90779e6d2051e85d87b
+DIST parrot-7.11.0.tar.gz 4703987 SHA256 02c7bb4ce1f7b1643e57393bf58536a15c3c2edfa0d70870cf5aa4e38988a72e SHA512 6f321a7d92b43413bc8cf2d2a03378e27de49573968471ad833232f90f0b61eae81626a80be94d84a783153c5beca3ba57c31fcc861b8b3c6cd33cd2d433a19a WHIRLPOOL 726099fe77580aee4cd5d6fe40510b8b1802c734182da1266aa0e22bba09d9974585732b66a0a3741235c72f724f06e67942d9a6485883229d718fc05f391851
 DIST parrot-7.2.0.tar.gz 4700915 SHA256 f4792fc1a82040dd855f73890de6fa26759aa62f4b4ad1aa468597592b7bf3bf SHA512 9b29394e753a88ecc5f581e73cb2c01cbf65442f754dacda1e7b4ff68ce527248d831de56a597512418918660ec12829259fd4ad3a235d1e22012c88a933242b WHIRLPOOL abef905a53830d7e352f5d64bb26c8861f10b2188fea36f3d1a426cf6e0fd5b0383345d1f6b7ba32dc47b8f7666566a6ac987f7b8e1b5b198192c30e5fcb815e
 DIST parrot-7.3.0.tar.gz 4687210 SHA256 23d2f59a0399a63a835087a192bede02a25f21fbcf5e42ed113b4c6dcdbea6b1 SHA512 e0aa408733af7939bdd4149952765fada0dcd6ce08b6a95f19ceab974f202fa3e440ffcb604f28fe9fd1b3b860a3400890b81e24984efdd88595f985041f3112 WHIRLPOOL fa2f32eb04d0a2be18fef4d420fa88808859d42474869d46ae6f44f3caa8611297de19b35dd337993de7e6e33df139b79e228c19a4fd7386b611643d557361e9
 DIST parrot-7.5.0.tar.gz 4693149 SHA256 71c25d2eb0798f1fc1c0890f6e4aed9d5f2a6e4e248456b3502f7721758267fe SHA512 6c009dec6bdb9f419b20f3bb6c103b16018b27b2ed0094f13c957f66d9735cfc126c15f787d4ce577cd0c6492d61264c35c23d50ab29517b65f00df7c4b4d619 WHIRLPOOL 7c0da3ad36d92cdae3d89de5f0938a4744c87301d8d0e76fec9bf7421dda7459ab083e112867702cfb6cfee3f308c856e5d7dcb547b35d27754d23e98dff8c3c
diff --git a/dev-lang/parrot/parrot-7.11.0.ebuild b/dev-lang/parrot/parrot-7.11.0.ebuild
new file mode 100644
index 000000000000..1e07b6833216
--- /dev/null
+++ b/dev-lang/parrot/parrot-7.11.0.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils multilib
+
+# weird failures
+RESTRICT="test"
+
+DESCRIPTION="Virtual machine designed to efficiently compile and execute bytecode for dynamic languages"
+HOMEPAGE="http://www.parrot.org/"
+SRC_URI="ftp://ftp.parrot.org/pub/parrot/releases/all/${PV}/${P}.tar.gz"
+
+LICENSE="Artistic-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="opengl nls doc examples gdbm +gmp ssl +unicode pcre"
+
+RDEPEND="sys-libs/readline
+	dev-libs/libffi
+	opengl? ( media-libs/freeglut )
+	nls? ( sys-devel/gettext )
+	unicode? ( >=dev-libs/icu-2.6:= )
+	gdbm? ( >=sys-libs/gdbm-1.8.3-r1 )
+	gmp? ( >=dev-libs/gmp-4.1.4 )
+	ssl? ( dev-libs/openssl )
+	pcre? ( dev-libs/libpcre )
+	doc? ( dev-perl/JSON )"
+
+DEPEND="dev-lang/perl[doc?]
+	${RDEPEND}"
+
+src_configure() {
+	myconf="--disable-rpath"
+	use unicode || myconf+=" --without-icu"
+	use ssl     || myconf+=" --without-crypto"
+	use gdbm    || myconf+=" --without-gdbm"
+	use nls     || myconf+=" --without-gettext"
+	use gmp     || myconf+=" --without-gmp"
+	use opengl  || myconf+=" --without-opengl"
+	use pcre    || myconf+=" --without-pcre"
+
+	perl Configure.pl \
+		--ccflags="${CFLAGS}" \
+		--linkflags="${LDFLAGS}" \
+		--prefix="${EPREFIX}"/usr \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		--mandir="${EPREFIX}"/usr/share/man \
+		--sysconfdir="${EPREFIX}"/etc \
+		--sharedstatedir="${EPREFIX}"/var/lib/parrot \
+		$myconf || die
+}
+
+src_compile() {
+	export LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}"${S}"/blib/lib
+	# occasionally dies in parallel make
+	emake -j1 || die
+	if use doc ; then
+		emake -j1 html || die
+	fi
+}
+
+src_test() {
+	emake -j1 test || die
+}
+
+src_install() {
+	emake -j1 install-dev DESTDIR="${D}" DOC_DIR="${EPREFIX}/usr/share/doc/${PF}" || die
+	dodoc CREDITS DONORS.pod PBC_COMPAT PLATFORMS RESPONSIBLE_PARTIES TODO || die
+	dosym /usr/bin/parrot-ops2c /usr/bin/ops2c || die
+	if use examples; then
+		insinto "/usr/share/doc/${PF}/examples"
+		doins -r examples/* || die
+	fi
+	if use doc; then
+		insinto "/usr/share/doc/${PF}/editor"
+		doins -r editor || die
+		cd docs/html
+		dohtml -r developer.html DONORS.pod.html index.html ops.html parrotbug.html pdds.html \
+			pmc.html tools.html docs src tools || die
+	fi
+}
diff --git a/dev-lang/pocl/Manifest b/dev-lang/pocl/Manifest
index 56f3cbe787f5..2912c389d1a2 100644
--- a/dev-lang/pocl/Manifest
+++ b/dev-lang/pocl/Manifest
@@ -1 +1,2 @@
 DIST pocl-0.11.tar.gz 1561743 SHA256 24bb801fb87d104b66faaa95d1890776fdeabb37ad1b12fb977281737c7f29bb SHA512 052cbac36a12a5b015779740c45b64adde5fa58a090f298b69de1df3ac9875d7bfc6dfe9f7ae95d14d974d7b44dc64e53ce6ad3a9b8e74708d546ef6e1032151 WHIRLPOOL 860a87904408eb7394e126bf5c8cab619d8f1d48a57440e9d73f585c5eaa1a70e53c5843f4ffbaa742447cd0e8ebf9c11fc0917357f6af203ecb1c3c48c0fa87
+DIST pocl-0.12.tar.gz 1741325 SHA256 5160d7a59721e6a7d0fc85868381c0afceaa7c07b9956c9be1e3b51e80c29f76 SHA512 3c0d3377a866e8bc7e3e911598b8b50ce473e545586c8755ec22f5bf0e5cf55fdebb0eb3fa521521a7ea2919b1c985d04531fcdad18997250c02de852b80e9ee WHIRLPOOL c7ab4bde1d7a0baef8bf00ea6bd8dff5c4e4c893da918c8ed7fb84f7247d9ea6c5adb78fb560132e564a4a49cba3286790abce70723bfdcf603727e5c62ff972
diff --git a/dev-lang/pocl/pocl-0.12.ebuild b/dev-lang/pocl/pocl-0.12.ebuild
new file mode 100644
index 000000000000..24f24a31016f
--- /dev/null
+++ b/dev-lang/pocl/pocl-0.12.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="PortableCL: opensource implementation of the OpenCL standard"
+HOMEPAGE="http://portablecl.org/"
+SRC_URI="http://portablecl.org/downloads/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="dev-libs/ocl-icd
+	sys-devel/llvm[clang]
+	sys-apps/hwloc"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+pkg_pretend() {
+	# Needs an OpenCL 1.2 ICD, mesa and nvidia are invalid
+	# Maybe ati works, feel free to add/fix if you can test
+	if [[ $(eselect opencl show) == 'ocl-icd' ]]; then
+		einfo "Valid OpenCL ICD set"
+	else
+		eerror "Please use a supported ICD:"
+		eerror "eselect opencl set ocl-icd"
+		die "OpenCL ICD not set to a supported value"
+	fi
+}
diff --git a/dev-lang/rakudo/Manifest b/dev-lang/rakudo/Manifest
index 9c9d9e346121..58499ac360c9 100644
--- a/dev-lang/rakudo/Manifest
+++ b/dev-lang/rakudo/Manifest
@@ -5,3 +5,4 @@ DIST rakudo-2015.04.tar.gz 2481636 SHA256 ba61883218617a2993169b4b318bb5b89d2642
 DIST rakudo-2015.05.tar.gz 2503009 SHA256 81ecf442e5c1720d8112effc5531f171c83907e29510c536cb16c8637d9d8924 SHA512 eb8774b0642bddbb6f11d3aa6041b25da495080d75fd1a0364002f071044d4e08cd798e2449d7b55622287ec482206e3327e8ba0b5973a17c0369c95c16e5dc1 WHIRLPOOL 135c6d3ca2eed5fb8fa529ceeb1a3c842e6174c34c1d259ca573bec0c3b8bea6f5967c8c404cd3cb6bccd6188eadf82bbb4407a01f7bf4ae4fb03dfaf7198181
 DIST rakudo-2015.06.tar.gz 2505308 SHA256 eea69522bc415a2566acb7277db44e5e0df558b3f3d667b64c4e700e917d18fa SHA512 1fb7f6fa42cc71977c26663ae38f5421b390781825e8acd0a0fae9c2781aa06018db3b474a0da43eb519eeb1aed8220df686968e2484272df095e21476b3023d WHIRLPOOL afea51402961a0ca2428a9e8ea5bda48b23b955fb04ad86aeb002b2a387c98931c3e03de24dda247b42a4e00ce772234f52bf6cb76f2951b28f57bef8908b56c
 DIST rakudo-2015.07.2.tar.gz 2539175 SHA256 1794f2d670af1174aee620587270c05fbc06ef3026ae144daac436101856c492 SHA512 2e487df689c40b45673fc14a66127f893a5b0db13c5747e030dbc4b293cec76114b88909598f2ac7d607e7fe6d8fa632ee0c7386a064da31e76feeec48406d5f WHIRLPOOL bfa2ae4c3f5e24f641eaf8c52d96e61c9cfc48d4ecd9fcacae5a19ed1f60d636d3241fddf2bcbf40df2f2b98add912992c8e955dd237b7583af38c17bbb6713c
+DIST rakudo-2015.11.tar.gz 2643309 SHA256 a27c8357d06ebfcd1337003c869686f5041aba563a3a8c57bc3c555334e43bc3 SHA512 e4d662709cf47b2b98398c5781973d1abd008f6f13b170fdba418bf36ff552e6c33caee26e2833539828c06ab7562f02cf5e54789f898e2e2d1d31db98d2e95e WHIRLPOOL 22fdaaf616dc62606ca320cb08231b2ae0740e4191f238f2fa26247b2fcd45ae061a2b4f1c616181ea68339a45054751fef0ebab825e98580ecede43c039805e
diff --git a/dev-lang/rakudo/rakudo-2015.11.ebuild b/dev-lang/rakudo/rakudo-2015.11.ebuild
new file mode 100644
index 000000000000..744a9057d317
--- /dev/null
+++ b/dev-lang/rakudo/rakudo-2015.11.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils multilib
+
+DESCRIPTION="A Perl 6 implementation built on the Parrot virtual machine"
+HOMEPAGE="http://rakudo.org/"
+SRC_URI="http://rakudo.org/downloads/${PN}/${P}.tar.gz"
+
+LICENSE="Artistic-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc java +moar"
+
+RDEPEND=">=dev-lang/nqp-${PV}[java?,moar?]"
+DEPEND="${RDEPEND}
+	dev-lang/perl"
+
+src_configure() {
+	use java && myconf+="jvm,"
+	use moar && myconf+="moar,"
+	perl Configure.pl --backends=${myconf} --prefix=/usr || die
+}
+
+src_test() {
+	emake -j1 test || die
+}
+
+src_install() {
+	emake -j1 DESTDIR="${ED}" install || die
+
+	dodoc CREDITS README.md docs/ChangeLog docs/ROADMAP || die
+
+	if use doc; then
+		dohtml -A svg docs/architecture.html docs/architecture.svg || die
+		dodoc docs/*.pod || die
+		docinto announce
+		dodoc docs/announce/* || die
+	fi
+}
diff --git a/dev-libs/libcroco/Manifest b/dev-libs/libcroco/Manifest
index 77a507ac8c28..c4a4067d8926 100644
--- a/dev-libs/libcroco/Manifest
+++ b/dev-libs/libcroco/Manifest
@@ -1,3 +1,4 @@
 DIST libcroco-0.6.10.tar.xz 476928 SHA256 72066611df77f5c4fb28268cfc7306ecc1517212a6182c2ea756c326a154246c SHA512 c990fc7873f6c6bf2c6994409cb7f79aa19a73a44d4b62a5dae81c2f9ff587cf6c778a87dc3e0d32da6df5a6764f39feed9d39938cdb8056d198ff869b2e6839 WHIRLPOOL 6ffce77ee04be812d81863dde90ff1461ae6449722366ab7e116fd0bdbe0c8ab0838c59986283cb00799e1061f3e83516e067685f7a53c3f2f58fb8bc81c437b
+DIST libcroco-0.6.11.tar.xz 477312 SHA256 132b528a948586b0dfa05d7e9e059901bca5a3be675b6071a90a90b81ae5a056 SHA512 441b9c6d9b6acd4ff908100573c6f24bcf46a20ec94360bdcf4765e37a7d45dc59e6a0889917f3486503b274d05cd79a63178e74d029209c16b8e3351a1160da WHIRLPOOL e4874167bd8d1336ed2ad6180d7780962da0f84ac09b24652105baea34a46769881f8112900e606312bf1d7c01045d8cfc187c8c327bbd834bba70a982edbcb9
 DIST libcroco-0.6.8.tar.xz 464992 SHA256 ea6e1b858c55219cefd7109756bff5bc1a774ba7a55f7d3ccd734d6b871b8570 SHA512 acfbebb59e5ea1e70da41f35970fb40a58331a1258eee6c981a575fdd23b420b4cc6d8983c90ad1e6afc0a461e675cb24667e03cfc8ec1aa5e9918e606913413 WHIRLPOOL 704fd5d6df6d62c15645b9901b807e5fd8916567fd32b975f4bd0ce013126617cc16e6a14fc334d0733012cfde8403978f5a23c1254fcdfae156a0720fa266e7
 DIST libcroco-0.6.9.tar.xz 475844 SHA256 38b9a6aed1813e55b3ca07a68d1af845ad4d1f984602e9272fe692930c0be0ae SHA512 2bdb16a9004ff7304bc3cf91495925d1502c165b54dc1121d2f0fc9b627ec9c5b81e78b48e3f092855c3accc3295e5a3870eb6225ddb1b1fcd037004af78583b WHIRLPOOL 59767afbbb9a180eb87a5821ec85df50f85a16d687687de1267c86218d1bc587bf37759ba05a34bf0d109dc8e5b7b69209c5c5bdf930fd721e42533670bdb523
diff --git a/dev-libs/libcroco/libcroco-0.6.11.ebuild b/dev-libs/libcroco/libcroco-0.6.11.ebuild
new file mode 100644
index 000000000000..74ab744bc6b5
--- /dev/null
+++ b/dev-libs/libcroco/libcroco-0.6.11.ebuild
@@ -0,0 +1,56 @@
+# 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 multilib-minimal
+
+DESCRIPTION="Generic Cascading Style Sheet (CSS) parsing and manipulation toolkit"
+HOMEPAGE="https://git.gnome.org/browse/libcroco/"
+
+LICENSE="LGPL-2"
+SLOT="0.6"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+RDEPEND="
+	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
+	>=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-util/gtk-doc-am
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+"
+
+src_prepare() {
+	if ! use test; then
+		# don't waste time building tests
+		sed 's/^\(SUBDIRS .*\=.*\)tests\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
+			|| die "sed failed"
+	fi
+
+	gnome2_src_prepare
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} \
+	gnome2_src_configure \
+		--disable-static \
+		$([[ ${CHOST} == *-darwin* ]] && echo --disable-Bsymbolic)
+
+	if multilib_is_native_abi; then
+		ln -s "${S}"/docs/reference/html docs/reference/html || die
+	fi
+}
+
+multilib_src_install() {
+	gnome2_src_install
+}
+
+multilib_src_install_all() {
+	DOCS="AUTHORS ChangeLog HACKING NEWS README TODO"
+	einstalldocs
+}
diff --git a/dev-libs/libev/Manifest b/dev-libs/libev/Manifest
index 9dc9c95a9295..983ff8cb64c2 100644
--- a/dev-libs/libev/Manifest
+++ b/dev-libs/libev/Manifest
@@ -1,4 +1,4 @@
 DIST libev-4.15.tar.gz 513919 SHA256 b2dd43a073556f5350cbed05b6ef444dcc4b563f4e0b1009d7bf448261606feb SHA512 bb3ab98d92e565bf2273d71c9004b84ad3b305c4e883482392fe6c701949344731bb4e391ac77578f71d9a80f0ec4b6afc2ae5449d4093cdcbee26d7dc17929d WHIRLPOOL 9f3c44e4978c5d387bd6478bc3ce41894f875eef00eb2328dc47ab90683e3003662d6ac5c5406c8592ad3dc690d7768dcfb83d6916b6851d4988a53c20d72b51
-DIST libev-4.18.tar.gz 517265 SHA256 38300812f870150d44db4fd073658db7eaceb4125f5c51cf395ee4409453fe4f SHA512 b2eb423012a134b1689603ef62b5fa576f9fd1484ac8825d1e478d1da58ce6503970de07eebfad9dcc77ee60cd4fd17152e103345ac1934c04ed2eee249bd227 WHIRLPOOL 9eab082d74555dae199a220895ce9e82dc8ee47ef6939b1ed6294a6a109cb831c309d7df8ed8e95ef3b5025c639eae60d517da81e3363d20e3b829d2d8c69c1b
 DIST libev-4.19.tar.gz 524429 SHA256 88fc5f89ca96ceca14c16c10e7be3e921dae65e84932d680c2fd6a40173edccb SHA512 0d1c8707ba0b665b4570a1dc4125d1fd9b0a25f8cad6552cb1fe8a7ea90920b14c15ad3a32806ddcd7efe68bb397dab973b3ee609dac5015c0d76959d850aaf1 WHIRLPOOL d0047ef29b45401f246318ed90c568570c584fe6492498cb12f3ef61e79da5f95acf325b75200b363b7c64fc85a54cc2d3a15d9727c94b8bdcc663cc740ddbe5
 DIST libev-4.20.tar.gz 530091 SHA256 f870334c7fa961e7f31087c7d76abf849f596e3048f8ed2a0aaa983cd73d449e SHA512 0623f3fd4c8125c90b50d20aec2bd1bb2e42e4853723bb987d6289e588b3e063a002adc0fbcf9ee6a6f6c10eaf317b6aceb5cad139ff92f98af4df9001d901a6 WHIRLPOOL cd2e93c9653c4f8a1856f8ce3c4fd6d78613c4fed7e100d59b35b87b116132166b75baefd488cb32a18961d7dfce7e24293d7c586a4adaa2fb7a719df51bed57
+DIST libev-4.22.tar.gz 531533 SHA256 736079e8ac543c74d59af73f9c52737b3bfec9601f020bf25a87a4f4d0f01bd6 SHA512 333f03065cec2615054892957cb87f8fe8461f7ac4e9f1e3ce362d3d2c32e62bffb635ec8cf1c0ec348923067c635d795d89eefc02e57395ae6aff27dc3ead3e WHIRLPOOL 38de041c8c86b8229102ce4d68884fbf5f74b261a353acb2f0ccac92e85319357eaa2f4e6023239b8680139ea0a3f9a283d8cad4a1516e0eb8aed8edc5cd25f6
diff --git a/dev-libs/libev/libev-4.18.ebuild b/dev-libs/libev/libev-4.22.ebuild
index 172e9a7ddc1f..fdf615188227 100644
--- a/dev-libs/libev/libev-4.18.ebuild
+++ b/dev-libs/libev/libev-4.22.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -25,9 +25,6 @@ DOCS=( Changes README )
 src_prepare() {
 	sed -i -e "/^include_HEADERS/s/ event.h//" Makefile.am || die
 
-	# bug #493050
-	sed -i -e "/^AM_INIT_AUTOMAKE/a\ " configure.ac || die
-
 	# bug #411847
 	epatch "${FILESDIR}/${PN}-pc.patch"
 
diff --git a/dev-libs/liblinear/liblinear-210-r1.ebuild b/dev-libs/liblinear/liblinear-210-r1.ebuild
index cbd8d0e4de54..97dfda445313 100644
--- a/dev-libs/liblinear/liblinear-210-r1.ebuild
+++ b/dev-libs/liblinear/liblinear-210-r1.ebuild
@@ -35,7 +35,7 @@ src_prepare() {
 		-e '/^CFLAGS/d;/^CXXFLAGS/d' \
 		-e 's|$${SHARED_LIB_FLAG}|& $(LDFLAGS)|g' \
 		Makefile || die
-	if use blas; then 
+	if use blas; then
 		sed -i -e 's:blas/blas.a::g' Makefile || die
 	fi
 }
diff --git a/dev-libs/liblognorm/liblognorm-1.1.2-r1.ebuild b/dev-libs/liblognorm/liblognorm-1.1.2-r1.ebuild
index 066a0c4bda91..7bfd3d80cfa8 100644
--- a/dev-libs/liblognorm/liblognorm-1.1.2-r1.ebuild
+++ b/dev-libs/liblognorm/liblognorm-1.1.2-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://www.liblognorm.com/files/download/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/2"
-KEYWORDS="~amd64 ~arm ~hppa ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm hppa ~x86 ~amd64-linux"
 IUSE="debug doc static-libs test"
 
 RDEPEND="
diff --git a/dev-libs/totem-pl-parser/Manifest b/dev-libs/totem-pl-parser/Manifest
index 05ecc42fe305..ae676bc457eb 100644
--- a/dev-libs/totem-pl-parser/Manifest
+++ b/dev-libs/totem-pl-parser/Manifest
@@ -1 +1,2 @@
 DIST totem-pl-parser-3.10.5.tar.xz 1594516 SHA256 a746580f61b678029dadaa824a6923445afd944d12c40c5fccb27159799c8137 SHA512 d3b29b8bd265e4e8df2820b309bf78f58faec3ee4314b0453f11a0db754ed3b6c2b223e697498925810df660a89d5d6275959b7104f632054b5984f7d9aad553 WHIRLPOOL 06e38e67212764fca629b592d7dc5c4dfa222ac61076fd73434721f3dd78d8da5f6a716085bccf65e50512aabf5d92ad3d04797ab87275dc4e4ee14df4699964
+DIST totem-pl-parser-3.10.6.tar.xz 1606636 SHA256 98a5d9bed1b1c012aeb2692ded2fd49399593f70f297f43e01fc1c5e13576757 SHA512 366de6ea11eb7ad80de9832eecd814fa3868fb9e3149f314f7056861eff1b6f6943b009b637145984d33f51fddfcb93ec2bd9103b6fcb68732cddcc77fbc4721 WHIRLPOOL 02d5ca378828b41b2bbc8750c15c70bebbeef7283a92e1bca8265623ff276091cddf0acc9740ec7af797a03bbbf1036ad14079f28b1527799838c0cd719e1bd6
diff --git a/dev-libs/totem-pl-parser/totem-pl-parser-3.10.6.ebuild b/dev-libs/totem-pl-parser/totem-pl-parser-3.10.6.ebuild
new file mode 100644
index 000000000000..c30f438fcd1c
--- /dev/null
+++ b/dev-libs/totem-pl-parser/totem-pl-parser-3.10.6.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome2
+
+DESCRIPTION="Playlist parsing library"
+HOMEPAGE="https://developer.gnome.org/totem-pl-parser/stable/"
+
+LICENSE="LGPL-2+"
+SLOT="0/18"
+IUSE="archive crypt +introspection +quvi test"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+RDEPEND="
+	>=dev-libs/glib-2.31:2
+	dev-libs/gmime:2.6
+	>=net-libs/libsoup-2.43:2.4
+	archive? ( >=app-arch/libarchive-3 )
+	crypt? ( dev-libs/libgcrypt:0= )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
+	quvi? ( >=media-libs/libquvi-0.9.1:0= )
+"
+DEPEND="${RDEPEND}
+	!<media-video/totem-2.21
+	>=dev-util/intltool-0.35
+	>=dev-util/gtk-doc-am-1.14
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+	test? (
+		gnome-base/gvfs[http]
+		sys-apps/dbus )
+"
+# eautoreconf needs:
+#	dev-libs/gobject-introspection-common
+#	>=gnome-base/gnome-common-3.6
+
+src_prepare() {
+	# Disable tests requiring network access, bug #346127
+	# 3rd test fails on upgrade, not once installed
+	sed -e 's:\(g_test_add_func.*/parser/resolution.*\):/*\1*/:' \
+		-e 's:\(g_test_add_func.*/parser/parsing/itms_link.*\):/*\1*/:' \
+		-e 's:\(g_test_add_func.*/parser/parsability.*\):/*\1/:'\
+		-i plparse/tests/parser.c || die "sed failed"
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		$(use_enable archive libarchive) \
+		$(use_enable crypt libgcrypt) \
+		$(use_enable quvi) \
+		$(use_enable introspection)
+}
+
+src_test() {
+	# This is required as told by upstream in bgo#629542
+	GVFS_DISABLE_FUSE=1 dbus-run-session emake check || die "emake check failed"
+}
diff --git a/dev-libs/userspace-rcu/Manifest b/dev-libs/userspace-rcu/Manifest
index e6e7c7d8d366..391aaa525e19 100644
--- a/dev-libs/userspace-rcu/Manifest
+++ b/dev-libs/userspace-rcu/Manifest
@@ -3,3 +3,4 @@ DIST userspace-rcu-0.7.13.tar.bz2 390152 SHA256 368a0db48926b127f86f62595f67b21f
 DIST userspace-rcu-0.8.4.tar.bz2 418911 SHA256 96c0a157e94a15b1506efe9aedd98145e6eb41a3fbcf5b0d118b7a783b22fe12 SHA512 62a2c7bc9923947bcdd17f7bc5ff6d12e6bc7b63d108977dc9dd990827c043452974800bb494b80c383279916482e12b441184834b4c84a226113af4923e32e6 WHIRLPOOL 487dbc84f15144a9035eaa938dd7f075d573cd72c7be51e5adee8507594a87d75ee6f621accdda80708693fea36d9f2db017d2936c10ff74cf0bd6342eeba2bd
 DIST userspace-rcu-0.8.5.tar.bz2 423913 SHA256 a2562eaca107ec6eca2856632b6035c6aaf38df79020195ed8955a7b4773312a SHA512 4b2090e7fd1c6f771e7fc0f8dde9cd1cbde64fe6295f3c96b2ad13b6581d8a07e0ab9b8a7e97021049c4ecc35303b709903ba593a64ba84c958f4c4b95d93a45 WHIRLPOOL b37d9801d508b608009febbd94ac831f54238419969038f02ee480ca4a488c7aaa3b7dd23d672ed58296f43917fe6e2f1afcd579da41ba75fb40e2dc3a11face
 DIST userspace-rcu-0.8.6.tar.bz2 424037 SHA256 b1a5d3bce014ba7a702759bc60b692c1cd46ff0e8a5b53f0d0a95e22db74ab21 SHA512 027c215570b1ff94d0b7dd66934aece525461ddc8b172000c72af5b2e76115da9d18a635bbfb81dbd749c52463c5f4dd27f5700a30f367a4fb5fe0db6c128a6d WHIRLPOOL a652e9d8141356edfa5a67e6c884101f46c0d67e1089528b6c9a17e8def7057d09e4c75afed6bbb0eb2a2de32300dd7958cde51ae8b639a600c4049fc6babd7d
+DIST userspace-rcu-0.9.1.tar.bz2 468197 SHA256 f8d278e9d95bec97c9ba954fc4c3fb584936bc0010713a8fe358b916bafd8715 SHA512 958234d72319decef07093c13b067e398c1b285ac714ab1dda89c2ad2ba0627d053e0cdabb07d480e399ebd60215445002876bd99f2829ca1e5582ada639f730 WHIRLPOOL e8d39b626529894a88a74d308ceb759a0166888113b5ca7e021e5a1c816126f98331ccb78d7a8d245f1aa16df06b6f45323c01dcf9bbc6e742b27fa5f76c2b24
diff --git a/dev-libs/userspace-rcu/metadata.xml b/dev-libs/userspace-rcu/metadata.xml
index 96a2d586367d..8597f04b7089 100644
--- a/dev-libs/userspace-rcu/metadata.xml
+++ b/dev-libs/userspace-rcu/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
+<use>
+<flag name='regression-test'>Run regression tests (requires FEATURES=test)</flag>
+</use>
 </pkgmetadata>
diff --git a/dev-libs/userspace-rcu/userspace-rcu-0.9.1.ebuild b/dev-libs/userspace-rcu/userspace-rcu-0.9.1.ebuild
new file mode 100644
index 000000000000..d09291de5700
--- /dev/null
+++ b/dev-libs/userspace-rcu/userspace-rcu-0.9.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools-utils
+
+DESCRIPTION="userspace RCU (read-copy-update) library"
+HOMEPAGE="http://lttng.org/urcu"
+SRC_URI="http://lttng.org/files/urcu/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0/4" # subslot = soname version
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+IUSE="static-libs regression-test test"
+
+DEPEND="test? ( sys-process/time )"
+
+# tests fail with separate build dir
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+src_configure() {
+	local myeconfargs=(
+		--docdir="${EPREFIX}/usr/share/doc/${PF}"
+	)
+	autotools-utils_src_configure
+}
+
+src_test() {
+	default
+	if use regression-test; then
+		emake -C tests/regression regtest
+	fi
+}
diff --git a/dev-perl/HTML-Format/HTML-Format-2.140.0.ebuild b/dev-perl/HTML-Format/HTML-Format-2.140.0.ebuild
new file mode 100644
index 000000000000..0ce1a53f7df4
--- /dev/null
+++ b/dev-perl/HTML-Format/HTML-Format-2.140.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_NAME=HTML-Formatter
+DIST_AUTHOR=NIGELM
+DIST_VERSION=2.14
+inherit perl-module
+
+DESCRIPTION="HTML Formatter"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="test"
+
+RDEPEND="
+	virtual/perl-Carp
+	virtual/perl-Data-Dumper
+	virtual/perl-Encode
+	dev-perl/Font-AFM
+	dev-perl/HTML-Tree
+	virtual/perl-IO
+	virtual/perl-parent
+"
+DEPEND="${RDEPEND}
+	>=dev-perl/Module-Build-0.280.0
+	test? (
+		dev-perl/File-Slurper
+		virtual/perl-File-Spec
+		virtual/perl-Scalar-List-Utils
+		>=virtual/perl-Test-Simple-0.960.0
+	)
+"
diff --git a/dev-perl/HTML-Format/Manifest b/dev-perl/HTML-Format/Manifest
index 4d7246b435e0..c78bc7d5c500 100644
--- a/dev-perl/HTML-Format/Manifest
+++ b/dev-perl/HTML-Format/Manifest
@@ -1,2 +1,3 @@
 DIST HTML-Format-2.10.tar.gz 45383 SHA256 149f4ac19733042e3f81b965047e9a053d8e5eb0832437625f4b9de860d5819a SHA512 a15a471fab17285704dbfb91b226d75d2bda0fbacbb5ce9259bc72fd4e7d5ba2129b5b4f133d68ebe3f03ddad0620e2e757f29bf4c7af819bf00333c2fad200c WHIRLPOOL 75bea74964f996e1b73cf665f4705f9157922c1d5ec50700857672c84087577a2836e97f2e4098fedf4fe0d22be8b92caf9cf9a0bae02098e2b3955e9a40bbcf
 DIST HTML-Format-2.11.tar.gz 48697 SHA256 44a3af6b9d0184bb4cc300624352760e4435c3d802521742f42dd228e44d4a95 SHA512 e664b442fdde64009c48998c1168558a8256f81d4a9d2f3b610ad89ddfcfa846dfaaef837becda4a0ee4df1b36c05ca066d45ac374a23159ffdaba82730089fe WHIRLPOOL b832f691beead56e26ed78055293f344000c9a243886e6131b959cfc91729e4bcb4ef907481804afde3fe2253c893d28156443996eada2de0d3bac6a4427780e
+DIST HTML-Formatter-2.14.tar.gz 51298 SHA256 d28eeeab48ab5f7bfcc73cc106b0f756073d98d48dfdb91ca2951f832f8e035e SHA512 616ee70f3a6038589d9348a1463bd9c1cac4d7fe00aff5dbb52968d0ef44129658ff6cdc114f2c389a1eed068a64f48ab34bb90b60d3f20a0a024750ddadda42 WHIRLPOOL fdf953e6115a1c0f82366707cab0bd7d80e1a1173e76e7231e9d702dfdad2b23b3d298859986e79304c4fd1b23d0481003f615cad8c802b8880999ee3f08700d
diff --git a/dev-perl/HTTP-Server-Simple/HTTP-Server-Simple-0.510.0.ebuild b/dev-perl/HTTP-Server-Simple/HTTP-Server-Simple-0.510.0.ebuild
new file mode 100644
index 000000000000..094d083b1360
--- /dev/null
+++ b/dev-perl/HTTP-Server-Simple/HTTP-Server-Simple-0.510.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_AUTHOR=BPS
+DIST_VERSION=0.51
+inherit perl-module
+
+DESCRIPTION="Lightweight HTTP Server"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="test"
+
+RDEPEND="
+	dev-perl/CGI
+	>=virtual/perl-Socket-1.940.0
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		dev-perl/Test-Pod
+		dev-perl/Test-Pod-Coverage
+	)
+"
diff --git a/dev-perl/HTTP-Server-Simple/Manifest b/dev-perl/HTTP-Server-Simple/Manifest
index a21cfb50dc37..7609fd0b5c3d 100644
--- a/dev-perl/HTTP-Server-Simple/Manifest
+++ b/dev-perl/HTTP-Server-Simple/Manifest
@@ -1,2 +1,3 @@
 DIST HTTP-Server-Simple-0.44.tar.gz 33804 SHA256 cff4f882da63a9a71271e25d1dc9160e64e5dd1195ed0a63894609ada7bb7416 SHA512 d8a3abd636de5cbd1b169911d02bb207d071f3f4ec9056f7ae4892062ff57b61737e4dfd03db8629ae553368c97b40baa88d021f6e4f973900d94abcc780591e WHIRLPOOL c8d112eefddf60d69eb17b1779a8744507da9bb6e759247da6309ba12188dcdc76a99ab439b8079fd865d87f3c0b003550d62172b8e7fbde970c3ac5a9bda388
 DIST HTTP-Server-Simple-0.50.tar.gz 36290 SHA256 5bd8117f469f566f55ee12406a1f9e03942d6f64e42f6e7461051e738bc27602 SHA512 601486cfa0744db9a131d6720873ef1cf995000671cd373854c29fc9a0b482d4f7ace69b97a48019897675714320e718b87e87fdcfe084e88c762ea2249120a2 WHIRLPOOL 1590c52ff7daa1489fb0666184d5eaef770bb1ce3ebe089dc8417b80c75db3a6b3adcaf4d13d39db05ac6737cca129b3e075263b6b3967a7a60d6a57b18ca61b
+DIST HTTP-Server-Simple-0.51.tar.gz 35056 SHA256 b9dc5c9f12c16ca39a96f0ede1e27a18a5594274ff8f583000788a7fca136dfb SHA512 92cb45fc8b57237c064b780ccdfd3ca959daff73cb054590574053cc3dedc81e14627c2aee6d26da48f717f31925d099dd9d11b0e9cd0a98cb3b06221820fabd WHIRLPOOL 449677370d084430afa03e3abdcb42615a7be0a24d94c4b605b196f4b8789ac4642637550c2462e5df364cceaac7fc4f985cde9681e681385cec29f2cd6490cf
diff --git a/dev-perl/Log-Agent/Log-Agent-1.1.0.ebuild b/dev-perl/Log-Agent/Log-Agent-1.1.0.ebuild
new file mode 100644
index 000000000000..5dfc68de0f6b
--- /dev/null
+++ b/dev-perl/Log-Agent/Log-Agent-1.1.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_AUTHOR=MROGASKI
+DIST_VERSION=1.001
+inherit perl-module
+
+DESCRIPTION="A general logging framework"
+
+LICENSE="Artistic-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? ( virtual/perl-Test-Simple )
+"
+
+DIST_TEST=do
diff --git a/dev-perl/Log-Agent/Manifest b/dev-perl/Log-Agent/Manifest
index 45545df088ae..546fbc97c37b 100644
--- a/dev-perl/Log-Agent/Manifest
+++ b/dev-perl/Log-Agent/Manifest
@@ -1,2 +1,3 @@
 DIST Log-Agent-0.307.tar.gz 55238 SHA256 668b3b798a093b4ac78765d7ede6cf1133a50d7be11a6c717bca6e351d40e7fe SHA512 ecf706a739c6c56052e53296bddce06c5b3983631827737d6a08611105c43f4adcd8df0342b9aaaddbc4318a142848efdcfd644e42fd9871838bfb884a2f916b WHIRLPOOL 16112cd7a5d4117f084c6615b8de1ff93ab2f84026bed7113ae232816af82536b08e3c2e683ab883fb0f681b7e8764fcc4a6433d0d0f4a8250636fc886f8c317
 DIST Log-Agent-1.000.tar.gz 55407 SHA256 c25be2fcc9be011ad0b0a5a84d767cac8489c0a791c7961c4ee809ee9509f373 SHA512 5bdb068ebce637d88a5bfe51162de773dec4938aa2d9285130d7f51e9d875e02842387fda52c4189fa329f747ce34290bdd3e46b0a1eadfd7384008de998c302 WHIRLPOOL 040329bb8de096423805de46eb25709355345a168cc85f7f14f2e072fcdcda507231c1b08130f19667e690b738d8a0e15d198b63366187f82710535300c8281d
+DIST Log-Agent-1.001.tar.gz 56215 SHA256 9a7827fa862e3bb3af121518fcfbac4f505fdadbe863496dc18ee7daabdeae85 SHA512 b8d3a15e40129add73bb4967ecc5daf37c0fd8a17eb75ed86fe338a9eb228b37ddd56b9bbf9bdef91f8453eb1b53d7fe303a96f68cbb0834820f2354fa37b5e7 WHIRLPOOL 8b421a6e1eb08f2f7744d56c8fd066c907bb2a4b8964005123ed817c1a0604fa3a51a098fa285c2af0e7ad11e70900d6d574bdef94e02218a944da684f8a0c0e
diff --git a/dev-perl/Math-BigInt-GMP/Manifest b/dev-perl/Math-BigInt-GMP/Manifest
index 999135a4d1d2..00a25acbce4e 100644
--- a/dev-perl/Math-BigInt-GMP/Manifest
+++ b/dev-perl/Math-BigInt-GMP/Manifest
@@ -1,2 +1,3 @@
 DIST Math-BigInt-GMP-1.38.tar.gz 55585 SHA256 1ad0cac911a08f150c5e5a8286aec20de21c863bd27b8f002456cff11e086f15 SHA512 e33abe8c3b939e559be4e3ec61ce77a6fb3da6451ea88cb22fd4785cfebc816024e957ad02e81b43ee982346e0e444630ee5d93a87a02182a765374d1a694222 WHIRLPOOL 15c9d6fedd1f14401171b66a6094ef092ebf7ba991bbf82827da1d8973beed37adae4d0ba85e2aed0db9f5ec6f4bc4e12c1ed143645492ccf2b13b551e3f9922
 DIST Math-BigInt-GMP-1.46.tar.gz 58150 SHA256 414a0c22d195ebc426fed535cf8dc6a3ca2de9da270c828c313c018ab5335772 SHA512 4b8426d82e28fbd4d827f58f49540f0cc1d6c95b0ce5cdf9cd7c5c797b9f7777d534df57950d2f29dd5640b947005071a8f6c7d1235657710113e9e323444876 WHIRLPOOL 5b62bcffbd788ea8e97672c48e6e241e7f2a4ae52c60d9f58ceec973b6b39bccbb33367f841106be8f80f5336998568433534984a7e11ef3df1f99f7f8981e58
+DIST Math-BigInt-GMP-1.47.tar.gz 58266 SHA256 9ed3101d39fc118e025604e48894b88bf674f44c745a591c580987b2f24127e8 SHA512 fea2ce1324feecbbe44ae7d84944362354f35aeb96dbd79a0ca04f806617819051c19442b7d1672ed47e6ab1322ace06ff209cac2810f9f2b14711dacf444d26 WHIRLPOOL a19d9d32a5087b2dce3e6a7232a59137ff7778777a958cd5e4359d0f981a61c2c77a03e6154fdc71cbc2e589132017ba6e650cffb066dec6dd40fe5360c1031b
diff --git a/dev-perl/Math-BigInt-GMP/Math-BigInt-GMP-1.380.0.ebuild b/dev-perl/Math-BigInt-GMP/Math-BigInt-GMP-1.380.0.ebuild
index 32a26d1bcb50..93460d15c79a 100644
--- a/dev-perl/Math-BigInt-GMP/Math-BigInt-GMP-1.380.0.ebuild
+++ b/dev-perl/Math-BigInt-GMP/Math-BigInt-GMP-1.380.0.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="alpha amd64 hppa ppc sparc x86"
 IUSE=""
 
 RDEPEND=">=virtual/perl-Math-BigInt-1.999.300
-	 >=dev-libs/gmp-4.0.0"
+	 >=dev-libs/gmp-4.0.0:0"
 DEPEND="${RDEPEND}"
 
 SRC_TEST="do"
diff --git a/dev-perl/Math-BigInt-GMP/Math-BigInt-GMP-1.460.0.ebuild b/dev-perl/Math-BigInt-GMP/Math-BigInt-GMP-1.460.0.ebuild
index 86ecbad8d319..0e62f383ff31 100644
--- a/dev-perl/Math-BigInt-GMP/Math-BigInt-GMP-1.460.0.ebuild
+++ b/dev-perl/Math-BigInt-GMP/Math-BigInt-GMP-1.460.0.ebuild
@@ -14,8 +14,8 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
 IUSE=""
 
-RDEPEND=">=virtual/perl-Math-BigInt-1.999.300
-	 >=dev-libs/gmp-4.0.0"
+RDEPEND=">=virtual/perl-Math-BigInt-1.999.709
+	 >=dev-libs/gmp-4.0.0:0"
 DEPEND="${RDEPEND}"
 
 PERL_RM_FILES=(
diff --git a/dev-perl/Math-BigInt-GMP/Math-BigInt-GMP-1.470.0.ebuild b/dev-perl/Math-BigInt-GMP/Math-BigInt-GMP-1.470.0.ebuild
new file mode 100644
index 000000000000..934dad59caa1
--- /dev/null
+++ b/dev-perl/Math-BigInt-GMP/Math-BigInt-GMP-1.470.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_AUTHOR=PJACKLAM
+DIST_VERSION=1.47
+inherit perl-module
+
+DESCRIPTION="Use the GMP library for Math::BigInt routines"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=virtual/perl-Math-BigInt-1.999.709
+	>=virtual/perl-XSLoader-0.20.0
+	>=dev-libs/gmp-4.0.0:0
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? ( >=virtual/perl-Test-Simple-0.470.0 )
+"
diff --git a/dev-perl/glib-perl/Manifest b/dev-perl/glib-perl/Manifest
index b2c428c39805..fd40319dbe70 100644
--- a/dev-perl/glib-perl/Manifest
+++ b/dev-perl/glib-perl/Manifest
@@ -1,4 +1,4 @@
 DIST Glib-1.301.tar.gz 284547 SHA256 1df55a02c4d173ff4e417503b67e6d7896409966a1560d3bb2b4e50f658a9376 SHA512 f69de4bd9d3ecca0018d1f8a2fddb81a88529580ddbede3beaf2d3f9c2867eb127e8c1f7433f5bc2933a6adbe6265390c7e4d46592357a8414efbef6f4d9c2e7 WHIRLPOOL 27fccd60371629ec0d65822e8ada2af3c8d2da24bc4c8482413888303fc9fab41ea167375a783d3dafede75db95c4bcbf03cfbcde0f4e85f094d4d5491da4fb5
 DIST Glib-1.305.tar.gz 286063 SHA256 2955483a00db4a18953ee7b557e8638415e2aa7e96e75851ba10fbdc68a9108e SHA512 e475ee3ef66d4a9dc3199dbf1ccb4d9d0b12f06ecbb0773f16091f72bfb957dfc24db07ff3b474f93949b0d6028d4078014f1707a63ed32abf39824c99baae49 WHIRLPOOL c3d75a0be528beb1a923ebc75f9dde11575ffcbbe442ae015e6482f950c37c321c6ec5ee2f946f458016e85ccc599ebc058112af561864008a080d669dd378d0
-DIST Glib-1.310.tar.gz 295350 SHA256 f645aac388c7103e217d8b3a75d55be8e2327b5fc77a01fd1af50404dac168c7 SHA512 b04a1ba7488d8b8b01ee54d220acb88dc40ceda6e1ec94d2a08c55a2b31ad4d6736190525334a7e51c0f67de08a352f797bbea7600f68717ab071136b97bf086 WHIRLPOOL ff1bc6cc87d5738aa48f01cdba9f845445657a589cc7415f7b8c5c81dd9e73a42969bfe4bde6eff6851fdf47344f8de5adb39e14d286e5aaf324a6e27ae662f7
 DIST Glib-1.313.tar.gz 295561 SHA256 b29f5cd93f151cd52ef288220df4d5cccb844190c34cde8962c27fb804194f98 SHA512 9a0fff69bab175c6a3d23d0f0aafe05a3a2ab97fe999176a2f07a87cbddea904906d5ff804906588d6eb50650b8722c1c2f7a6c140b593a874d06cf8900aecde WHIRLPOOL 18ebfb8d35bddf460bb799fc9c802b9a9865a7ceaca3073fead9e9568269eff4b287a9fba926ea0b0b6840f559d8c365f8cf0d306f2bb97f7d550b1ee23a92a5
+DIST Glib-1.314.tar.gz 296480 SHA256 b47e9e0117325085457b263b3a70847ed908419e06e8975f36f2b953f5f4908e SHA512 2a61a81f9b3d0404fa2e731d3851d67dc2bfc499a34bd77e0a9b6875a889f0faf5ac5fe2f24f8df7e2059283716e91aba5596556aad43f454e8cfd56fe866607 WHIRLPOOL a1dee6daf8a6cda5ea8da85a5a57551075c8a030f67c8f42c900547ed2754acc98633d12bf8f8d5641f14f9426e2d40309da7e22150a2bb4b7179e58900797fe
diff --git a/dev-perl/glib-perl/glib-perl-1.310.0.ebuild b/dev-perl/glib-perl/glib-perl-1.314.0.ebuild
index 1775f34a96ff..4d67186e12b2 100644
--- a/dev-perl/glib-perl/glib-perl-1.310.0.ebuild
+++ b/dev-perl/glib-perl/glib-perl-1.314.0.ebuild
@@ -2,11 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
-MY_PN=Glib
-MODULE_AUTHOR=XAOC
-MODULE_VERSION=1.310
+DIST_NAME=Glib
+DIST_AUTHOR=XAOC
+DIST_VERSION=1.314
 inherit perl-module
 
 DESCRIPTION="Glib - Perl wrappers for the GLib utility and Object libraries"
@@ -27,5 +27,3 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	dev-perl/Log-Agent
 "
-
-SRC_TEST="do"
diff --git a/dev-python/astroid/Manifest b/dev-python/astroid/Manifest
index 72ca4ba9a36b..74450d819a82 100644
--- a/dev-python/astroid/Manifest
+++ b/dev-python/astroid/Manifest
@@ -1,2 +1,3 @@
 DIST astroid-1.3.8.tar.gz 155302 SHA256 3971c35c675dc7acfceb636eb1758b7df9fc3ad75b5f81ca89f57ccf51719442 SHA512 316d3a6a12d95b3bebe7ffe47de840cbff96f357c7c324f6684bb713bca191cfaf87fe226c3c1145049611a2035890bdf11845bf923f7d0087a0d1e565d5d5c5 WHIRLPOOL 456ebef20c278047ae0e85fb1386f63eb7c13dda295ddace9704df5255b5004887f6f5201097b2337cc678a9891f33aa5628cbf7acc01c4eb9ff3dc3c091408a
 DIST astroid-1.4.1.tar.gz 179485 SHA256 2417a2c62f07bb77485efb6dd94567ac165808a4248ecb09754116662ffa9fc2 SHA512 5efc0235314cf68801ec4c4ca7688386bace0bbc5a0a92dffc6241d8fab69b5b7ddbe3385c1d909ebb2cb260174c93ce6f0408c3c0745ebbc7f6c1923a0ce59f WHIRLPOOL 7a2f5618d77eba504b7d1b8d39d3c488962d871d3b0ef5723d0bd5eb338cf7da8ce9d09a64e6c33ca22f175bcdf901f2d5f88df92cb3387d1a05dc810b3d12de
+DIST astroid-1.4.2.tar.gz 181042 SHA256 b734fa504179a93aa03314df48b45fb1d9d0d8770a1126e7a126c9ac4aebd5c3 SHA512 faddbb830370232f4b3ea6cdd454da352a682b73062d9bac37ac28711dc6b17a071278d7b5019a7ba85ac4c1845752db42c0fe122be082bbc262a159b92276e2 WHIRLPOOL 18443d0dbfd6575836209c523b5d3c7eebf509a23395bb0e0e2bac43c117b3b2269c9bf6ddb4cfc896b1232f1f4d9a86ac3ebf40ba950a25070a8771e54cc7ac
diff --git a/dev-python/astroid/astroid-1.4.2.ebuild b/dev-python/astroid/astroid-1.4.2.ebuild
new file mode 100644
index 000000000000..3ea11164c7a3
--- /dev/null
+++ b/dev-python/astroid/astroid-1.4.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Abstract Syntax Tree for logilab packages"
+HOMEPAGE="https://bitbucket.org/logilab/astroid https://pypi.python.org/pypi/astroid"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x86-macos"
+IUSE="test"
+
+# https://bitbucket.org/logilab/astroid/issues/276/testfailures-with-141
+RESTRICT=test
+
+# Version specified in __pkginfo__.py.
+RDEPEND="
+	dev-python/lazy-object-proxy[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/wrapt[${PYTHON_USEDEP}]"
+DEPEND="
+	app-arch/unzip
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+#	test? (
+#		${RDEPEND}
+#		>=dev-python/pylint-1.4.0[${PYTHON_USEDEP}]
+#		dev-python/pytest[${PYTHON_USEDEP}]
+#		$(python_gen_cond_dep 'dev-python/egenix-mx-base[${PYTHON_USEDEP}]' python2_7)
+#	)"
+# Required for tests
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_test() {
+	${EPYTHON} -m unittest discover -p "unittest*.py" --verbose || die
+}
diff --git a/dev-python/pyamf/Manifest b/dev-python/pyamf/Manifest
index 7ce6de7fc79f..0bf8e7c8164d 100644
--- a/dev-python/pyamf/Manifest
+++ b/dev-python/pyamf/Manifest
@@ -1,2 +1 @@
-DIST PyAMF-0.7.0.tar.gz 1647988 SHA256 5e9c68a2acc00ee99d1ca1f578c4fc0cbc16e33339a6d5a0d8d313a4c0f42663 SHA512 dcaf808a11c73f9e9b548c9e81100eb28ee1e3c1e2d44b0fb08f58ab3693a49c69b95040e25e612e3864d268436829c4ab7389e1ed9c0704f37a9d350dd9c82d WHIRLPOOL 535fdedea37a866045a34f89b5f255f13d4d3ebc1a1a1fbdba2c233fdd5fedfb1436e4993d69940cbdd5f26898c3d6264afa9bdac21217f38d3d2e955058c369
-DIST PyAMF-0.7.2.tar.gz 1648116 SHA256 3e39d43989f75a4d35f4c2a591d8163637f67eaf856bdae749bd8b64b1c1b672 SHA512 5372e40752a75919122c1a8630dbf6333ca2c9d8c79d004a58f857b2656e2cccd96ba5ff24aca9352a8db2e66419760cf3309b5cafb7ad5e1097473fa4a8bbe8 WHIRLPOOL 5ba25ed6ee2bde8dc2800c6d5093509622214a2ed5a5cf51a023c0a8a72618f7156b550e67816bc51f53d2f84c9993fdc8caf37a4ad23bb1006b08522f38cdec
+DIST PyAMF-0.8.0.tar.gz 1651369 SHA256 0455d68983e3ee49f82721132074877428d58acec52f19697a88c03b5fba74e4 SHA512 1da66afbfb6cc32886a8680b5f610d17b3ad6e5cca338deb7f8d8c5e61f0f4e165b6602936590b4053a3bc98d0e36f898e5913e7d59d8444faf385fa036fd81e WHIRLPOOL 259c6164febcbf95b3755b4e05ba2325001ed52e19afb51349803ff7205fb2ca3bce41f1524f46f193748d0b939eb1230fc5a2ea7f9ae739fcb7c859c719066f
diff --git a/dev-python/pyamf/pyamf-0.7.0.ebuild b/dev-python/pyamf/pyamf-0.7.0.ebuild
deleted file mode 100644
index cfccd8feb048..000000000000
--- a/dev-python/pyamf/pyamf-0.7.0.ebuild
+++ /dev/null
@@ -1,35 +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
-
-MY_PN=PyAMF
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Action Message Format (AMF) support for Python"
-HOMEPAGE="https://github.com/hydralabs/pyamf"
-SRC_URI="https://github.com/hydralabs/pyamf/releases/download/v${PV}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S=${WORKDIR}/${MY_P}
-
-python_test() {
-	esetup.py test
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "PyAMF optionally integrates with several third-party libraries"
-		elog "and web frameworks. See the README or the Optional Extras section at"
-		elog "https://github.com/hydralabs/pyamf/blob/master/doc/install.rst"
-	fi
-}
diff --git a/dev-python/pyamf/pyamf-0.7.2.ebuild b/dev-python/pyamf/pyamf-0.8.0.ebuild
index 405b0fe77502..25130d89ef9c 100644
--- a/dev-python/pyamf/pyamf-0.7.2.ebuild
+++ b/dev-python/pyamf/pyamf-0.8.0.ebuild
@@ -3,6 +3,7 @@
 # $Id$
 
 EAPI=5
+
 PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
@@ -17,8 +18,11 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
+IUSE=""
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/defusedxml[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
 
 S=${WORKDIR}/${MY_P}
 
diff --git a/dev-python/pylint/Manifest b/dev-python/pylint/Manifest
index e015e540abb8..e760a833e1c8 100644
--- a/dev-python/pylint/Manifest
+++ b/dev-python/pylint/Manifest
@@ -1,3 +1,4 @@
 DIST pylint-1.4.4.tar.gz 342461 SHA256 0561af4d6bd4fa9e8e02f3997fe93684f7187c57bcef9db8c2ea9fb0d7d2f022 SHA512 bcbf5439628a071055cea441455f6c0fe0cbfae2617c473bc376b880421f17f78653901d7cf49950653436a0991a3bafbc2df15744ff24a3b059de53e518b331 WHIRLPOOL 9b8f5384691f5e762bfd7313691783e0b1a9148effec0b29f2e538f587dfa03f57413817589f8fc3f152c05330b7f39c8ede27720ff6ad12496f9101d824fedf
 DIST pylint-1.4.5.tar.gz 342366 SHA256 cd6623bdd6e79b6b1e4c24672bdfa5923ce14541cf26fecd2bbc56845d136086 SHA512 530cdf53c411afc2b96d1716c5f9effa7b6406f9957c2b5183f651f47e458c28692e183f905a321adeb4919bd0ec68a4148fb171294ad08dfb5b87d37668849f WHIRLPOOL d4ccb18f42ab9b270c949ce145ec22a0f0f0f065f97e2f9fadd29b5503b348bee7ecf1321055b91dca3a9690946c238b09221521612c68f64d42d6170d92d7b0
 DIST pylint-1.5.1.tar.gz 419684 SHA256 044e9f03eee51ac1cb05f094af6ccc2a2195c558d233819c22527062dff46225 SHA512 4ea88259ad9b63f02220a32365a446417db751809d24bef5f5a3c4ab4ec62942c02b46acf4dd60f2f3ac849789e306db03bd958d3d181d4c42860efa551927e3 WHIRLPOOL 1a35194d53bb77695164b356abeada82597ca7f228d2d8a9c43ac9880727136d829e135c2fbd85e41ddcd826099cb3d77d42d8b5b55e8952da0ab9f183e4d244
+DIST pylint-1.5.2.tar.gz 419023 SHA256 983bec35e10b0c5f0ec33c03629fe832642c46b76a43edce37a2e8d2708d2179 SHA512 27c4c28ff2aa80fba95033c84af7732365dcf8351cd0caee0205d28100106e194071d51d17d133ccf5ea95a6165896c43851dd397e02676d12720f426cc52afc WHIRLPOOL 16eebbd15f1af4b1932e26419ecb607604fc4b25973c54c444f98be46fd95b374bb0ddc8e5bd3880a272766426f241d6a694433ec9db8d44b559ecda7d231321
diff --git a/dev-python/pylint/pylint-1.5.2.ebuild b/dev-python/pylint/pylint-1.5.2.ebuild
new file mode 100644
index 000000000000..d4adb716d28f
--- /dev/null
+++ b/dev-python/pylint/pylint-1.5.2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} pypy )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Python code static checker"
+HOMEPAGE="http://www.logilab.org/project/pylint https://pypi.python.org/pypi/pylint"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="doc examples test"
+
+RDEPEND="
+	>=dev-python/astroid-1.4.1[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( ${RDEPEND} )"
+
+RESTRICT="test" # needs pygtk
+
+# Usual. Requ'd for impl specific failures in test phase
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_compile_all() {
+	# selection of straight html triggers a trivial annoying bug, we skirt it
+	use doc && PYTHONPATH="${S}" emake -e -C doc singlehtml
+}
+
+python_test() {
+	# Test suite appears not to work under Python 3.
+	# https://bitbucket.org/logilab/pylint/issue/240/
+	local msg="Test suite broken with ${EPYTHON}"
+	if python_is_python3; then
+		einfo "${msg}"
+		return 0
+	fi
+
+	pytest || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	doman man/{pylint,pyreverse}.1
+	use examples && local EXAMPLES=( examples/. )
+	use doc && local HTML_DOCS=( doc/_build/singlehtml/. )
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	# Optional dependency on "tk" USE flag would break support for Jython.
+	optfeature "pylint-gui script requires dev-lang/python with \"tk\" USE flag enabled." dev-lang/python[tk]
+}
diff --git a/dev-python/pypy/pypy-9999.ebuild b/dev-python/pypy/pypy-9999.ebuild
new file mode 100644
index 000000000000..302e84393a75
--- /dev/null
+++ b/dev-python/pypy/pypy-9999.ebuild
@@ -0,0 +1,258 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 pypy )
+EHG_REPO_URI="https://bitbucket.org/pypy/pypy"
+inherit check-reqs eutils mercurial multilib multiprocessing pax-utils python-any-r1 toolchain-funcs versionator
+
+CPY_PATCHSET_VERSION="2.7.10-0"
+
+DESCRIPTION="A fast, compliant alternative implementation of the Python language"
+HOMEPAGE="http://pypy.org/"
+SRC_URI="
+	https://dev.gentoo.org/~floppym/python/python-gentoo-patches-${CPY_PATCHSET_VERSION}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0/$(get_version_component_range 1-2 ${PV})"
+KEYWORDS=""
+IUSE="bzip2 doc gdbm +jit low-memory ncurses sandbox shadowstack sqlite cpu_flags_x86_sse2 test tk"
+
+RDEPEND=">=sys-libs/zlib-1.1.3:0=
+	virtual/libffi:0=
+	virtual/libintl:0=
+	dev-libs/expat:0=
+	dev-libs/openssl:0=[-bindist]
+	bzip2? ( app-arch/bzip2:0= )
+	gdbm? ( sys-libs/gdbm:0= )
+	ncurses? ( sys-libs/ncurses:0= )
+	sqlite? ( dev-db/sqlite:3= )
+	tk? (
+		dev-lang/tk:0=
+		dev-tcltk/tix:0=
+	)
+	!dev-python/pypy-bin:0"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx )
+	${PYTHON_DEPS}
+	test? ( dev-python/pytest )"
+PDEPEND="app-admin/python-updater"
+
+S="${WORKDIR}/${P}-src"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		if use low-memory; then
+			if ! python_is_installed pypy; then
+				eerror "USE=low-memory requires a (possibly old) version of dev-python/pypy"
+				eerror "or dev-python/pypy-bin being installed. Please install it using e.g.:"
+				eerror
+				eerror "  $ emerge -1v dev-python/pypy-bin"
+				eerror
+				eerror "before attempting to build dev-python/pypy[low-memory]."
+				die "dev-python/pypy-bin (or dev-python/pypy) needs to be installed for USE=low-memory"
+			fi
+
+			CHECKREQS_MEMORY="1750M"
+			use amd64 && CHECKREQS_MEMORY="3500M"
+		else
+			CHECKREQS_MEMORY="3G"
+			use amd64 && CHECKREQS_MEMORY="6G"
+		fi
+
+		check-reqs_pkg_pretend
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		pkg_pretend
+
+		if python_is_installed pypy; then
+			if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] || use low-memory; then
+				einfo "Using already-installed PyPy to perform the translation."
+				local EPYTHON=pypy
+			else
+				einfo "Using ${EPYTHON} to perform the translation. Please note that upstream"
+				einfo "recommends using PyPy for that. If you wish to do so, please unset"
+				einfo "the EPYTHON variable."
+			fi
+		fi
+
+		python-any-r1_pkg_setup
+	fi
+}
+
+src_unpack() {
+	default
+	mercurial_src_unpack
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/4.0.0-gentoo-path.patch" \
+		"${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch" \
+		"${FILESDIR}"/2.5.0-shared-lib.patch	# 517002
+
+	sed -e "s^@EPREFIX@^${EPREFIX}^" \
+		-e "s^@libdir@^$(get_libdir)^" \
+		-i lib-python/2.7/distutils/command/install.py || die
+
+	# apply CPython stdlib patches
+	pushd lib-python/2.7 > /dev/null || die
+	epatch "${FILESDIR}"/2.5.0_all_distutils_cxx.patch \
+		"${WORKDIR}"/patches/22_all_turkish_locale.patch \
+		"${WORKDIR}"/patches/62_all_xml.use_pyxml.patch
+	popd > /dev/null || die
+
+	epatch_user
+}
+
+src_compile() {
+	tc-export CC
+
+	local jit_backend
+	if use jit; then
+		jit_backend='--jit-backend='
+
+		# We only need the explicit sse2 switch for x86.
+		# On other arches we can rely on autodetection which uses
+		# compiler macros. Plus, --jit-backend= doesn't accept all
+		# the modern values...
+
+		if use x86; then
+			if use cpu_flags_x86_sse2; then
+				jit_backend+=x86
+			else
+				jit_backend+=x86-without-sse2
+			fi
+		else
+			jit_backend+=auto
+		fi
+	fi
+
+	local args=(
+		--shared
+		$(usex jit -Ojit -O2)
+		$(usex shadowstack --gcrootfinder=shadowstack '')
+		$(usex sandbox --sandbox '')
+
+		${jit_backend}
+		--make-jobs=$(makeopts_jobs)
+
+		pypy/goal/targetpypystandalone
+	)
+
+	# Avoid linking against libraries disabled by use flags
+	local opts=(
+		bzip2:bz2
+		ncurses:_minimal_curses
+	)
+
+	local opt
+	for opt in "${opts[@]}"; do
+		local flag=${opt%:*}
+		local mod=${opt#*:}
+
+		args+=(
+			$(usex ${flag} --withmod --withoutmod)-${mod}
+		)
+	done
+
+	local interp=( "${PYTHON}" )
+	if use low-memory; then
+		interp=( env PYPY_GC_MAX_DELTA=200MB
+			"${PYTHON}" --jit loop_longevity=300 )
+	fi
+
+	set -- "${interp[@]}" rpython/bin/rpython --batch "${args[@]}"
+	echo -e "\033[1m${@}\033[0m"
+	"${@}" || die "compile error"
+
+	use doc && emake -C pypy/doc/ html
+	pax-mark m "${ED%/}${INSDESTTREE}/pypy-c"
+}
+
+src_test() {
+	# (unset)
+	local -x PYTHONDONTWRITEBYTECODE
+
+	./pypy-c ./pypy/test_all.py --pypy=./pypy-c lib-python || die
+}
+
+src_install() {
+	einfo "Installing PyPy ..."
+	insinto "/usr/$(get_libdir)/pypy"
+	doins -r include lib_pypy lib-python pypy-c libpypy-c.so
+	fperms a+x ${INSDESTTREE}/pypy-c ${INSDESTTREE}/libpypy-c.so
+	pax-mark m "${ED%/}${INSDESTTREE}/pypy-c" "${ED%/}${INSDESTTREE}/libpypy-c.so"
+	dosym ../$(get_libdir)/pypy/pypy-c /usr/bin/pypy
+	dodoc README.rst
+
+	if ! use gdbm; then
+		rm -r "${ED%/}${INSDESTTREE}"/lib_pypy/gdbm.py \
+			"${ED%/}${INSDESTTREE}"/lib-python/*2.7/test/test_gdbm.py || die
+	fi
+	if ! use sqlite; then
+		rm -r "${ED%/}${INSDESTTREE}"/lib-python/*2.7/sqlite3 \
+			"${ED%/}${INSDESTTREE}"/lib_pypy/_sqlite3.py \
+			"${ED%/}${INSDESTTREE}"/lib-python/*2.7/test/test_sqlite.py || die
+	fi
+	if ! use tk; then
+		rm -r "${ED%/}${INSDESTTREE}"/lib-python/*2.7/{idlelib,lib-tk} \
+			"${ED%/}${INSDESTTREE}"/lib_pypy/_tkinter \
+			"${ED%/}${INSDESTTREE}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
+	fi
+
+	# Install docs
+	use doc && dohtml -r pypy/doc/_build/html/
+
+	einfo "Generating caches and byte-compiling ..."
+
+	local -x PYTHON=${ED%/}${INSDESTTREE}/pypy-c
+	local -x LD_LIBRARY_PATH="${ED%/}${INSDESTTREE}"
+	# we can't use eclass function since PyPy is dumb and always gives
+	# paths relative to the interpreter
+	local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy/site-packages
+	python_export pypy EPYTHON
+
+	echo "EPYTHON='${EPYTHON}'" > epython.py || die
+	python_domodule epython.py
+
+	# Generate Grammar and PatternGrammar pickles.
+	"${PYTHON}" -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
+		|| die "Generation of Grammar and PatternGrammar pickles failed"
+
+	# Generate cffi modules
+	# Please keep in sync with pypy/tool/build_cffi_imports.py!
+#cffi_build_scripts = {
+#    "sqlite3": "_sqlite3_build.py",
+#    "audioop": "_audioop_build.py",
+#    "tk": "_tkinter/tklib_build.py",
+#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
+#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
+#    "gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
+#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
+	cffi_targets=( audioop syslog pwdgrp )
+	use gdbm && cffi_targets+=( gdbm )
+	use ncurses && cffi_targets+=( curses )
+	use sqlite && cffi_targets+=( sqlite3 )
+	use tk && cffi_targets+=( tkinter/tklib )
+
+	local t
+	# all modules except tkinter output to .
+	# tkinter outputs to the correct dir ...
+	cd "${ED%/}${INSDESTTREE}"/lib_pypy || die
+	for t in "${cffi_targets[@]}"; do
+		# tkinter doesn't work via -m
+		"${PYTHON}" "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
+	done
+
+	# Cleanup temporary objects
+	find "${ED%/}${INSDESTTREE}" -name "_cffi_*.[co]" -delete || die
+	find "${ED%/}${INSDESTTREE}" -type d -empty -delete || die
+
+	# compile the installed modules
+	python_optimize "${ED%/}${INSDESTTREE}"
+}
diff --git a/dev-python/pypy3/files/2.5.0-shared-lib.patch b/dev-python/pypy3/files/2.5.0-shared-lib.patch
new file mode 100644
index 000000000000..ddd74730f3dd
--- /dev/null
+++ b/dev-python/pypy3/files/2.5.0-shared-lib.patch
@@ -0,0 +1,12 @@
+diff -ur pypy-2.5.0-src.orig/rpython/translator/platform/posix.py pypy-2.5.0-src/rpython/translator/platform/posix.py
+--- rpython/translator/platform/posix.py	2015-02-03 05:12:49.000000000 +0800
++++ rpython/translator/platform/posix.py	2015-03-22 07:36:01.420116684 +0800
+@@ -183,7 +183,7 @@
+                    'int main(int argc, char* argv[]) '
+                    '{ return $(PYPY_MAIN_FUNCTION)(argc, argv); }" > $@')
+             m.rule('$(DEFAULT_TARGET)', ['$(TARGET)', 'main.o'],
+-                   '$(CC_LINK) $(LDFLAGS_LINK) main.o -L. -l$(SHARED_IMPORT_LIB) -o $@ $(RPATH_FLAGS)')
++                   '$(CC_LINK) $(LDFLAGS_LINK) main.o -L. -l$(SHARED_IMPORT_LIB) \'-Wl,-rpath,$$ORIGIN\' -o $@')
+ 
+         return m
+ 
diff --git a/dev-python/pypy3/files/21_all_distutils_c++.patch b/dev-python/pypy3/files/21_all_distutils_c++.patch
new file mode 100644
index 000000000000..f12df8ac4070
--- /dev/null
+++ b/dev-python/pypy3/files/21_all_distutils_c++.patch
@@ -0,0 +1,251 @@
+http://bugs.python.org/issue1222585
+
+--- Lib/distutils/cygwinccompiler.py
++++ Lib/distutils/cygwinccompiler.py
+@@ -136,9 +136,13 @@
+         self.set_executables(compiler='gcc -mcygwin -O -Wall',
+                              compiler_so='gcc -mcygwin -mdll -O -Wall',
+                              compiler_cxx='g++ -mcygwin -O -Wall',
++                             compiler_so_cxx='g++ -mcygwin -mdll -O -Wall',
+                              linker_exe='gcc -mcygwin',
+                              linker_so=('%s -mcygwin %s' %
+-                                        (self.linker_dll, shared_option)))
++                                        (self.linker_dll, shared_option)),
++                             linker_exe_cxx='g++ -mcygwin',
++                             linker_so_cxx=('%s -mcygwin %s' %
++                                            (self.linker_dll, shared_option)))
+ 
+         # cygwin and mingw32 need different sets of libraries
+         if self.gcc_version == "2.91.57":
+@@ -162,8 +166,12 @@
+                 raise CompileError(msg)
+         else: # for other files use the C-compiler
+             try:
+-                self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
+-                           extra_postargs)
++                if self.detect_language(src) == 'c++':
++                    self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] +
++                               extra_postargs)
++                else:
++                    self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
++                               extra_postargs)
+             except DistutilsExecError as msg:
+                 raise CompileError(msg)
+ 
+@@ -294,10 +302,15 @@
+         self.set_executables(compiler='gcc -mno-cygwin -O -Wall',
+                              compiler_so='gcc -mno-cygwin -mdll -O -Wall',
+                              compiler_cxx='g++ -mno-cygwin -O -Wall',
++                             compiler_so_cxx='g++ -mno-cygwin -mdll -O -Wall',
+                              linker_exe='gcc -mno-cygwin',
+                              linker_so='%s -mno-cygwin %s %s'
+                                         % (self.linker_dll, shared_option,
+-                                           entry_point))
++                                           entry_point),
++                             linker_exe_cxx='g++ -mno-cygwin',
++                             linker_so_cxx='%s -mno-cygwin %s %s'
++                                            % (self.linker_dll, shared_option,
++                                               entry_point))
+         # Maybe we should also append -mthreads, but then the finished
+         # dlls need another dll (mingwm10.dll see Mingw32 docs)
+         # (-mthreads: Support thread-safe exception handling on `Mingw32')
+--- Lib/distutils/emxccompiler.py
++++ Lib/distutils/emxccompiler.py
+@@ -63,8 +63,12 @@
+         # XXX optimization, warnings etc. should be customizable.
+         self.set_executables(compiler='gcc -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
+                              compiler_so='gcc -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
++                             compiler_cxx='g++ -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
++                             compiler_so_cxx='g++ -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
+                              linker_exe='gcc -Zomf -Zmt -Zcrtdll',
+-                             linker_so='gcc -Zomf -Zmt -Zcrtdll -Zdll')
++                             linker_so='gcc -Zomf -Zmt -Zcrtdll -Zdll',
++                             linker_exe_cxx='g++ -Zomf -Zmt -Zcrtdll',
++                             linker_so_cxx='g++ -Zomf -Zmt -Zcrtdll -Zdll')
+ 
+         # want the gcc library statically linked (so that we don't have
+         # to distribute a version dependent on the compiler we have)
+@@ -81,8 +85,12 @@
+                 raise CompileError(msg)
+         else: # for other files use the C-compiler
+             try:
+-                self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
+-                           extra_postargs)
++                if self.detect_language(src) == 'c++':
++                    self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] +
++                               extra_postargs)
++                else:
++                    self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
++                               extra_postargs)
+             except DistutilsExecError as msg:
+                 raise CompileError(msg)
+ 
+--- Lib/distutils/sysconfig_cpython.py
++++ Lib/distutils/sysconfig_cpython.py
+@@ -170,9 +170,12 @@
+                 _osx_support.customize_compiler(_config_vars)
+                 _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True'
+ 
+-        (cc, cxx, opt, cflags, ccshared, ldshared, shlib_suffix, ar, ar_flags) = \
+-            get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
+-                            'CCSHARED', 'LDSHARED', 'SHLIB_SUFFIX', 'AR', 'ARFLAGS')
++        (cc, cxx, ccshared, ldshared, ldcxxshared, shlib_suffix, ar, ar_flags) = \
++            get_config_vars('CC', 'CXX', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED',
++                            'SHLIB_SUFFIX', 'AR', 'ARFLAGS')
++
++        cflags = ''
++        cxxflags = ''
+ 
+         newcc = None
+         if 'CC' in os.environ:
+@@ -181,19 +184,27 @@
+             cxx = os.environ['CXX']
+         if 'LDSHARED' in os.environ:
+             ldshared = os.environ['LDSHARED']
++        if 'LDCXXSHARED' in os.environ:
++            ldcxxshared = os.environ['LDCXXSHARED']
+         if 'CPP' in os.environ:
+             cpp = os.environ['CPP']
+         else:
+             cpp = cc + " -E"           # not always
+         if 'LDFLAGS' in os.environ:
+             ldshared = ldshared + ' ' + os.environ['LDFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS']
+         if 'CFLAGS' in os.environ:
+-            cflags = opt + ' ' + os.environ['CFLAGS']
++            cflags = os.environ['CFLAGS']
+             ldshared = ldshared + ' ' + os.environ['CFLAGS']
++        if 'CXXFLAGS' in os.environ:
++            cxxflags = os.environ['CXXFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS']
+         if 'CPPFLAGS' in os.environ:
+             cpp = cpp + ' ' + os.environ['CPPFLAGS']
+             cflags = cflags + ' ' + os.environ['CPPFLAGS']
++            cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS']
+             ldshared = ldshared + ' ' + os.environ['CPPFLAGS']
++            ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS']
+         if 'AR' in os.environ:
+             ar = os.environ['AR']
+         if 'ARFLAGS' in os.environ:
+@@ -202,13 +213,17 @@
+             archiver = ar + ' ' + ar_flags
+ 
+         cc_cmd = cc + ' ' + cflags
++        cxx_cmd = cxx + ' ' + cxxflags
+         compiler.set_executables(
+             preprocessor=cpp,
+             compiler=cc_cmd,
+             compiler_so=cc_cmd + ' ' + ccshared,
+-            compiler_cxx=cxx,
++            compiler_cxx=cxx_cmd,
++            compiler_so_cxx=cxx_cmd + ' ' + ccshared,
+             linker_so=ldshared,
+             linker_exe=cc,
++            linker_so_cxx=ldcxxshared,
++            linker_exe_cxx=cxx,
+             archiver=archiver)
+ 
+         compiler.shared_lib_extension = shlib_suffix
+--- Lib/distutils/unixccompiler.py
++++ Lib/distutils/unixccompiler.py
+@@ -52,14 +52,17 @@
+     # are pretty generic; they will probably have to be set by an outsider
+     # (eg. using information discovered by the sysconfig about building
+     # Python extensions).
+-    executables = {'preprocessor' : None,
+-                   'compiler'     : ["cc"],
+-                   'compiler_so'  : ["cc"],
+-                   'compiler_cxx' : ["c++"],  # pypy: changed, 'cc' is bogus
+-                   'linker_so'    : ["cc", "-shared"],
+-                   'linker_exe'   : ["cc"],
+-                   'archiver'     : ["ar", "-cr"],
+-                   'ranlib'       : None,
++    executables = {'preprocessor'    : None,
++                   'compiler'        : ["cc"],
++                   'compiler_so'     : ["cc"],
++                   'compiler_cxx'    : ["c++"],
++                   'compiler_so_cxx' : ["c++"],
++                   'linker_so'       : ["cc", "-shared"],
++                   'linker_exe'      : ["cc"],
++                   'linker_so_cxx'   : ["c++", "-shared"],
++                   'linker_exe_cxx'  : ["c++"],
++                   'archiver'        : ["ar", "-cr"],
++                   'ranlib'          : None,
+                   }
+ 
+     if sys.platform[:6] == "darwin":
+@@ -108,12 +111,19 @@
+ 
+     def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts):
+         compiler_so = self.compiler_so
++        compiler_so_cxx = self.compiler_so_cxx
+         if sys.platform == 'darwin':
+             compiler_so = _osx_support.compiler_fixup(compiler_so,
+                                                     cc_args + extra_postargs)
++            compiler_so_cxx = _osx_support.compiler_fixup(compiler_so_cxx,
++                                                    cc_args + extra_postargs)
+         try:
+-            self.spawn(compiler_so + cc_args + [src, '-o', obj] +
+-                       extra_postargs)
++            if self.detect_language(src) == 'c++':
++                self.spawn(compiler_so_cxx + cc_args + [src, '-o', obj] +
++                           extra_postargs)
++            else:
++                self.spawn(compiler_so + cc_args + [src, '-o', obj] +
++                           extra_postargs)
+         except DistutilsExecError as msg:
+             raise CompileError(msg)
+ 
+@@ -171,22 +181,16 @@
+                 ld_args.extend(extra_postargs)
+             self.mkpath(os.path.dirname(output_filename))
+             try:
+-                if target_desc == CCompiler.EXECUTABLE:
+-                    linker = self.linker_exe[:]
++                if target_lang == "c++":
++                    if target_desc == CCompiler.EXECUTABLE:
++                        linker = self.linker_exe_cxx[:]
++                    else:
++                        linker = self.linker_so_cxx[:]
+                 else:
+-                    linker = self.linker_so[:]
+-                if target_lang == "c++" and self.compiler_cxx:
+-                    # skip over environment variable settings if /usr/bin/env
+-                    # is used to set up the linker's environment.
+-                    # This is needed on OSX. Note: this assumes that the
+-                    # normal and C++ compiler have the same environment
+-                    # settings.
+-                    i = 0
+-                    if os.path.basename(linker[0]) == "env":
+-                        i = 1
+-                        while '=' in linker[i]:
+-                            i += 1
+-                    linker[i] = self.compiler_cxx[i]
++                    if target_desc == CCompiler.EXECUTABLE:
++                        linker = self.linker_exe[:]
++                    else:
++                        linker = self.linker_so[:]
+ 
+                 if sys.platform == 'darwin':
+                     linker = _osx_support.compiler_fixup(linker, ld_args)
+--- Lib/_osx_support.py
++++ Lib/_osx_support.py
+@@ -14,13 +14,13 @@
+ # configuration variables that may contain universal build flags,
+ # like "-arch" or "-isdkroot", that may need customization for
+ # the user environment
+-_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'LDFLAGS', 'CPPFLAGS', 'BASECFLAGS',
+-                            'BLDSHARED', 'LDSHARED', 'CC', 'CXX',
+-                            'PY_CFLAGS', 'PY_LDFLAGS', 'PY_CPPFLAGS',
+-                            'PY_CORE_CFLAGS')
++_UNIVERSAL_CONFIG_VARS = ('CFLAGS', 'CXXFLAGS', 'LDFLAGS', 'CPPFLAGS',
++                          'BASECFLAGS', 'BLDSHARED', 'LDSHARED', 'LDCXXSHARED',
++                          'CC', 'CXX', 'PY_CFLAGS', 'PY_LDFLAGS',
++                          'PY_CPPFLAGS', 'PY_CORE_CFLAGS')
+ 
+ # configuration variables that may contain compiler calls
+-_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'CC', 'CXX')
++_COMPILER_CONFIG_VARS = ('BLDSHARED', 'LDSHARED', 'LDCXXSHARED', 'CC', 'CXX')
+ 
+ # prefix added to original configuration variable names
+ _INITPRE = '_OSX_SUPPORT_INITIAL_'
diff --git a/dev-python/pypy3/files/4.0.0-gentoo-path.patch b/dev-python/pypy3/files/4.0.0-gentoo-path.patch
new file mode 100644
index 000000000000..1c0270d93bae
--- /dev/null
+++ b/dev-python/pypy3/files/4.0.0-gentoo-path.patch
@@ -0,0 +1,50 @@
+From 165e05bbdc93e54411217c0198d0a5cbb9de4e33 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Fri, 27 Nov 2015 17:02:42 +0100
+Subject: [PATCH] Gentoo: override paths for system-wide install based on
+ sys.prefix
+
+Override all default distutils install paths to ones suitable for
+system-wide install when sys.prefix indicates we're running the Gentoo
+system-wide install of PyPy with no prefix overrides (e.g. virtualenv).
+
+Fixes: https://bugs.gentoo.org/462306
+Fixes: https://bugs.gentoo.org/465546
+---
+ lib-python/3/distutils/command/install.py | 13 ++++++++++++-
+ 1 file changed, 12 insertions(+), 1 deletion(-)
+
+diff --git a/lib-python/3/distutils/command/install.py b/lib-python/3/distutils/command/install.py
+index fc43951..fed5218 100644
+--- a/lib-python/3/distutils/command/install.py
++++ b/lib-python/3/distutils/command/install.py
+@@ -90,6 +90,13 @@ INSTALL_SCHEMES = {
+         'scripts': '$base/bin',
+         'data'   : '$base',
+         },
++    'gentoo': {
++        'purelib': '$base/site-packages',
++        'platlib': '$base/site-packages',
++        'headers': '$base/include',
++        'scripts': '@EPREFIX@/usr/bin',
++        'data'   : '@EPREFIX@/usr',
++        },
+     }
+ 
+ # The keys to an installation scheme; if any new types of files are to be
+@@ -476,7 +483,11 @@ class install (Command):
+         # it's the caller's problem if they supply a bad name!
+         if (hasattr(sys, 'pypy_version_info') and
+             not name.endswith(('_user', '_home'))):
+-            name = 'pypy'
++            if self.install_base == os.path.normpath('@EPREFIX@/usr/@libdir@/pypy'):
++                # override paths for system-wide install
++                name = 'gentoo'
++            else:
++                name = 'pypy'
+         scheme = INSTALL_SCHEMES[name]
+         for key in SCHEME_KEYS:
+             attrname = 'install_' + key
+-- 
+2.6.3
+
diff --git a/dev-python/pypy3/pypy3-9999.ebuild b/dev-python/pypy3/pypy3-9999.ebuild
new file mode 100644
index 000000000000..73bd1594c24e
--- /dev/null
+++ b/dev-python/pypy3/pypy3-9999.ebuild
@@ -0,0 +1,238 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# pypy3 needs to be built using python 2
+PYTHON_COMPAT=( python2_7 pypy )
+EHG_PROJECT="pypy"
+EHG_REPO_URI="https://bitbucket.org/pypy/pypy"
+EHG_REVISION="py3k"
+inherit check-reqs eutils mercurial multilib multiprocessing pax-utils python-any-r1 toolchain-funcs versionator
+
+DESCRIPTION="A fast, compliant alternative implementation of the Python language"
+HOMEPAGE="http://pypy.org/"
+SRC_URI=""
+
+LICENSE="MIT"
+SLOT="0/$(get_version_component_range 1-2 ${PV})"
+KEYWORDS=""
+IUSE="bzip2 gdbm +jit low-memory ncurses sandbox shadowstack sqlite cpu_flags_x86_sse2 test tk"
+
+RDEPEND=">=sys-libs/zlib-1.1.3:0=
+	virtual/libffi:0=
+	virtual/libintl:0=
+	dev-libs/expat:0=
+	dev-libs/openssl:0=[-bindist]
+	bzip2? ( app-arch/bzip2:0= )
+	gdbm? ( sys-libs/gdbm:0= )
+	ncurses? ( sys-libs/ncurses:0= )
+	sqlite? ( dev-db/sqlite:3= )
+	tk? (
+		dev-lang/tk:0=
+		dev-tcltk/tix:0=
+	)
+	!dev-python/pypy3-bin:0"
+DEPEND="${RDEPEND}
+	low-memory? ( virtual/pypy:0 )
+	!low-memory? ( ${PYTHON_DEPS} )"
+PDEPEND="app-admin/python-updater"
+
+S="${WORKDIR}/${P}-src"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		if use low-memory; then
+			CHECKREQS_MEMORY="1750M"
+			use amd64 && CHECKREQS_MEMORY="3500M"
+		else
+			CHECKREQS_MEMORY="3G"
+			use amd64 && CHECKREQS_MEMORY="6G"
+		fi
+
+		check-reqs_pkg_pretend
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		pkg_pretend
+
+		# unset to allow forcing pypy below :)
+		use low-memory && local EPYTHON=
+		if python_is_installed pypy && [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]]; then
+			einfo "Using PyPy to perform the translation."
+			local EPYTHON=pypy
+		else
+			einfo "Using ${EPYTHON:-python2} to perform the translation. Please note that upstream"
+			einfo "recommends using PyPy for that. If you wish to do so, please install"
+			einfo "virtual/pypy and ensure that EPYTHON variable is unset."
+		fi
+
+		python-any-r1_pkg_setup
+	fi
+}
+
+src_unpack() {
+	default
+	mercurial_src_unpack
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/4.0.0-gentoo-path.patch" \
+		"${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch" \
+		"${FILESDIR}"/2.5.0-shared-lib.patch	# 517002
+
+	sed -e "s^@EPREFIX@^${EPREFIX}^" \
+		-e "s^@libdir@^$(get_libdir)^" \
+		-i lib-python/3/distutils/command/install.py || die
+
+	# apply CPython stdlib patches
+	pushd lib-python/3 > /dev/null || die
+	epatch "${FILESDIR}"/21_all_distutils_c++.patch
+	popd > /dev/null || die
+
+	epatch_user
+}
+
+src_compile() {
+	tc-export CC
+
+	local jit_backend
+	if use jit; then
+		jit_backend='--jit-backend='
+
+		# We only need the explicit sse2 switch for x86.
+		# On other arches we can rely on autodetection which uses
+		# compiler macros. Plus, --jit-backend= doesn't accept all
+		# the modern values...
+
+		if use x86; then
+			if use cpu_flags_x86_sse2; then
+				jit_backend+=x86
+			else
+				jit_backend+=x86-without-sse2
+			fi
+		else
+			jit_backend+=auto
+		fi
+	fi
+
+	local args=(
+		--shared
+		$(usex jit -Ojit -O2)
+		$(usex shadowstack --gcrootfinder=shadowstack '')
+		$(usex sandbox --sandbox '')
+
+		${jit_backend}
+		--make-jobs=$(makeopts_jobs)
+
+		pypy/goal/targetpypystandalone
+	)
+
+	# Avoid linking against libraries disabled by use flags
+	local opts=(
+		bzip2:bz2
+		ncurses:_minimal_curses
+	)
+
+	local opt
+	for opt in "${opts[@]}"; do
+		local flag=${opt%:*}
+		local mod=${opt#*:}
+
+		args+=(
+			$(usex ${flag} --withmod --withoutmod)-${mod}
+		)
+	done
+
+	local interp=( "${PYTHON}" )
+	if use low-memory; then
+		interp=( env PYPY_GC_MAX_DELTA=200MB
+			"${PYTHON}" --jit loop_longevity=300 )
+	fi
+
+	set -- "${interp[@]}" rpython/bin/rpython --batch "${args[@]}"
+	echo -e "\033[1m${@}\033[0m"
+	"${@}" || die "compile error"
+
+	#use doc && emake -C pypy/doc/ html
+	pax-mark m "${ED%/}${INSDESTTREE}/pypy-c"
+}
+
+src_install() {
+	einfo "Installing PyPy ..."
+	insinto "/usr/$(get_libdir)/pypy3"
+	doins -r include lib_pypy lib-python pypy-c libpypy-c.so
+	fperms a+x ${INSDESTTREE}/pypy-c ${INSDESTTREE}/libpypy-c.so
+	pax-mark m "${ED%/}${INSDESTTREE}/pypy-c" "${ED%/}${INSDESTTREE}/libpypy-c.so"
+	dosym ../$(get_libdir)/pypy3/pypy-c /usr/bin/pypy3
+	dodoc README.rst
+
+	if ! use gdbm; then
+		rm -r "${ED%/}${INSDESTTREE}"/lib_pypy/gdbm.py \
+			"${ED%/}${INSDESTTREE}"/lib-python/*3/test/test_gdbm.py || die
+	fi
+	if ! use sqlite; then
+		rm -r "${ED%/}${INSDESTTREE}"/lib-python/*3/sqlite3 \
+			"${ED%/}${INSDESTTREE}"/lib_pypy/_sqlite3.py \
+			"${ED%/}${INSDESTTREE}"/lib-python/*3/test/test_sqlite.py || die
+	fi
+	if ! use tk; then
+		rm -r "${ED%/}${INSDESTTREE}"/lib-python/*3/{idlelib,tkinter} \
+			"${ED%/}${INSDESTTREE}"/lib_pypy/_tkinter \
+			"${ED%/}${INSDESTTREE}"/lib-python/*3/test/test_{tcl,tk,ttk*}.py || die
+	fi
+
+	# Install docs
+	#use doc && dohtml -r pypy/doc/_build/html/
+
+	einfo "Generating caches and byte-compiling ..."
+
+	local -x PYTHON=${ED%/}${INSDESTTREE}/pypy-c
+	local -x LD_LIBRARY_PATH="${ED%/}${INSDESTTREE}"
+	# we can't use eclass function since PyPy is dumb and always gives
+	# paths relative to the interpreter
+	local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy3/site-packages
+	python_export pypy3 EPYTHON
+
+	echo "EPYTHON='${EPYTHON}'" > epython.py || die
+	python_domodule epython.py
+
+	# Generate Grammar and PatternGrammar pickles.
+	"${PYTHON}" -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
+		|| die "Generation of Grammar and PatternGrammar pickles failed"
+
+	# Generate cffi modules
+	# Please keep in sync with pypy/tool/build_cffi_imports.py!
+#cffi_build_scripts = {
+#    "sqlite3": "_sqlite3_build.py",
+#    "audioop": "_audioop_build.py",
+#    "tk": "_tkinter/tklib_build.py",
+#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
+#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
+#    "gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
+#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
+	cffi_targets=( audioop syslog pwdgrp )
+	use gdbm && cffi_targets+=( gdbm )
+	use ncurses && cffi_targets+=( curses )
+	use sqlite && cffi_targets+=( sqlite3 )
+	use tk && cffi_targets+=( tkinter/tklib )
+
+	local t
+	# all modules except tkinter output to .
+	# tkinter outputs to the correct dir ...
+	cd "${ED%/}${INSDESTTREE}"/lib_pypy || die
+	for t in "${cffi_targets[@]}"; do
+		# tkinter doesn't work via -m
+		"${PYTHON}" "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
+	done
+
+	# Cleanup temporary objects
+	find "${ED%/}${INSDESTTREE}" -name "_cffi_*.[co]" -delete || die
+	find "${ED%/}${INSDESTTREE}" -type d -empty -delete || die
+
+	# compile the installed modules
+	python_optimize "${ED%/}${INSDESTTREE}"
+}
diff --git a/dev-python/sepolgen/metadata.xml b/dev-python/sepolgen/metadata.xml
index 0e4542860a13..48cda10cf190 100644
--- a/dev-python/sepolgen/metadata.xml
+++ b/dev-python/sepolgen/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>selinux</herd>
-  <longdescription>Python module needed for audit2allow</longdescription>
-  <upstream>
-    <remote-id type="github">SELinuxProject/selinux</remote-id>
-  </upstream>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
+	<longdescription>Python module needed for audit2allow</longdescription>
+	<upstream>
+		<remote-id type="github">SELinuxProject/selinux</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/sympy/metadata.xml b/dev-python/sympy/metadata.xml
index 6a28c74a99d2..d24ae6385695 100644
--- a/dev-python/sympy/metadata.xml
+++ b/dev-python/sympy/metadata.xml
@@ -21,7 +21,6 @@
     <flag name="texmacs">Add <pkg>app-office/texmacs</pkg>
   interface</flag>
     <flag name="theano">Add support for <pkg>dev-python/theano</pkg></flag>
-    <flag name="system-mpmath">Use mpmath from portage instead of the bundled one</flag>
   </use>
   <upstream>
     <remote-id type="pypi">sympy</remote-id>
diff --git a/dev-python/torment/Manifest b/dev-python/torment/Manifest
index 8b6e830b2837..23271252a368 100644
--- a/dev-python/torment/Manifest
+++ b/dev-python/torment/Manifest
@@ -1,3 +1,3 @@
-DIST torment-2.1.0.tar.gz 30608 SHA256 d8d21efd1a30c0bb964b43e47b41cc261d4b2417b09fd3945090bf48fd3d0248 SHA512 502a61372f61d653f98ed20e0d074d1c411cc33be08ae91fec4e7606b1d3d3b78fd4fee8b1908b4fc721e7fe6029400063e9a94830a589e572baf824e7e0a261 WHIRLPOOL 7fe54b057ea89823b1b861c61e771f02a8a66a755f5667c89728bfab8e52006524cc960fece75f77d00b1aa894e0f3853df59a79cddf70a28b27b08d31de856b
 DIST torment-3.0.0.tar.gz 33898 SHA256 ad3ead69f1c9e5ec1dc92a83bceca186f0d6a4544f983222c32c4d0a5e7f3b45 SHA512 1fac30a0e97a6505c7e9cbbfaa141e2378cf26345fd4679d6eff75a4472054771b2421b044f9ff0daa8671e1b27989508e7a9885dfb98e3a07bd3e842d4bbb77 WHIRLPOOL 353cd7a8b66f2936c5476e8e50e2f6428bdc6f4e0bdbb2ea99c93018ebe6587ad4d3c6310fd55fe21cbdefc3174425a34d10aa072cbc27ebcbe3f5f114f4c913
 DIST torment-3.0.1.tar.gz 33908 SHA256 06f4aa429fa68255512cd9fffbaefad85a06afe4bbc5e3c293c33a72184fe46d SHA512 c57451d18cf90204247054fcc9717d8b3587e8be38433d907f51703c3f571638793cc5078cc5ad9e0ffccd024251a086e2d1dd47ad92fea89cc65a8de6c2a7c1 WHIRLPOOL 50bc8f1fbcdf6553ecf21580b6e7df802235097ebad829cca1b964806e265fc401f7a5d4200267a9a6d3c11fbe7d5986177b2aa3d8032da4260cc33c3a794120
+DIST torment-3.0.2.tar.gz 33955 SHA256 64f053082bd4a1dbc1f4218ed359c45c27dd58ea1a0b62322249cb6d06ab52f9 SHA512 92361c2e4f5aed05e290be2de21648ec52040ffc77c693c177cbd99bbd98f443aa2adb5caf10bc8f7a44573c44a0148afe103d228af4ee00576bb9ff0a1d200f WHIRLPOOL d94c4785e93c6277ccd3d2ce68c650be00262f0451b04bb0cdc0e7d5ad84c27cc7a712e2219f4be3419c21f80b755593bc93ac11154b31fdd845b376caeab19c
diff --git a/dev-python/torment/torment-2.1.0.ebuild b/dev-python/torment/torment-3.0.2.ebuild
index f890bde9a256..bafdaac857ea 100644
--- a/dev-python/torment/torment-2.1.0.ebuild
+++ b/dev-python/torment/torment-3.0.2.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=5
-PYTHON_COMPAT=( python3_3 python3_4 )
+PYTHON_COMPAT=( python3_4 )
 
 inherit distutils-r1
 
diff --git a/dev-ros/test_roslaunch/Manifest b/dev-ros/test_roslaunch/Manifest
index 1e41e2eb115c..645f05b71e57 100644
--- a/dev-ros/test_roslaunch/Manifest
+++ b/dev-ros/test_roslaunch/Manifest
@@ -1,3 +1 @@
-DIST ros_comm-1.11.14.tar.gz 945041 SHA256 8e7beff35711b1918501c69cca4f29648d4d4207878edab069bcd59d515c78f3 SHA512 be768faa0a2f45c464e963934a95dc617cac6c3fcec2388602a27846774c25b882b5139099ce10d1d051a21d5938819942e079836d14618071bc7ad90ee78bab WHIRLPOOL e047ce984086655294c20dbf0715cc29f51ec358f075f02de80c5de0d4ef8059990dc8312d78d7a7fa91c4a974dc21cba15d6eacafe02fd3df527770e50f75a5
-DIST ros_comm-1.11.15.tar.gz 946139 SHA256 532b8cc764e9ca8765484a4468b8537c1ddd84342896267cf3e9f6b19c1b7203 SHA512 8eea3fc948093a7640851f18856f2a20748afb80f935e28d230dc2095956d753bde5081dcd020d09638d9c5d63e031257515b6c6874286c03737507e67cce270 WHIRLPOOL 5e0a971f4312dce99c2e2c11841445cea999dbe5b1ebde3ce26badb9a7eaf9fb84220ed5d1e0088e85835104ddad3cd4d555708d010f83da6e84d257bafe699b
 DIST ros_comm-1.11.16.tar.gz 947310 SHA256 b8f48c57d58b623c0b9828476fd8fc785570238d1e117fddaae9aaf8600915d3 SHA512 a97678acbafbe33d063f2c69b42e11bc4815c18ba9bb701542fb272d95410d2c1c2a133aa40ad2211ea1b0c2535938a364adac8099b5231c50e37fa42fff5d3d WHIRLPOOL 16dbdb2f754f16ae73b989e443de9f9e4fdbea2f9411c63d02a53a46517fb565dd97d5ea2b155833bcd592d7e9dd23ae3e7676dd1a49ea3dd509ab47f28082f2
diff --git a/dev-ros/test_roslaunch/test_roslaunch-1.11.14.ebuild b/dev-ros/test_roslaunch/test_roslaunch-1.11.14.ebuild
deleted file mode 100644
index 665859925fc0..000000000000
--- a/dev-ros/test_roslaunch/test_roslaunch-1.11.14.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for roslaunch"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_USEDEP}]
-		dev-ros/roslaunch[${PYTHON_USEDEP}]
-		dev-python/rospkg[${PYTHON_USEDEP}]
-	)
-"
diff --git a/dev-ros/test_roslaunch/test_roslaunch-1.11.15.ebuild b/dev-ros/test_roslaunch/test_roslaunch-1.11.15.ebuild
deleted file mode 100644
index 665859925fc0..000000000000
--- a/dev-ros/test_roslaunch/test_roslaunch-1.11.15.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for roslaunch"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	test? (
-		dev-ros/rostest[${PYTHON_USEDEP}]
-		dev-ros/roslaunch[${PYTHON_USEDEP}]
-		dev-python/rospkg[${PYTHON_USEDEP}]
-	)
-"
diff --git a/dev-ros/test_roslaunch/test_roslaunch-1.11.16.ebuild b/dev-ros/test_roslaunch/test_roslaunch-1.11.16-r1.ebuild
index 665859925fc0..e5299e80d7b9 100644
--- a/dev-ros/test_roslaunch/test_roslaunch-1.11.16.ebuild
+++ b/dev-ros/test_roslaunch/test_roslaunch-1.11.16-r1.ebuild
@@ -18,8 +18,8 @@ IUSE=""
 
 RDEPEND=""
 DEPEND="${RDEPEND}
+	dev-ros/rostest[${PYTHON_USEDEP}]
 	test? (
-		dev-ros/rostest[${PYTHON_USEDEP}]
 		dev-ros/roslaunch[${PYTHON_USEDEP}]
 		dev-python/rospkg[${PYTHON_USEDEP}]
 	)
diff --git a/dev-ros/test_roslaunch/test_roslaunch-9999.ebuild b/dev-ros/test_roslaunch/test_roslaunch-9999.ebuild
index 665859925fc0..e5299e80d7b9 100644
--- a/dev-ros/test_roslaunch/test_roslaunch-9999.ebuild
+++ b/dev-ros/test_roslaunch/test_roslaunch-9999.ebuild
@@ -18,8 +18,8 @@ IUSE=""
 
 RDEPEND=""
 DEPEND="${RDEPEND}
+	dev-ros/rostest[${PYTHON_USEDEP}]
 	test? (
-		dev-ros/rostest[${PYTHON_USEDEP}]
 		dev-ros/roslaunch[${PYTHON_USEDEP}]
 		dev-python/rospkg[${PYTHON_USEDEP}]
 	)
diff --git a/dev-ruby/bundler/Manifest b/dev-ruby/bundler/Manifest
index 496fc9cff32e..0c3bae56e52a 100644
--- a/dev-ruby/bundler/Manifest
+++ b/dev-ruby/bundler/Manifest
@@ -1,3 +1,4 @@
 DIST bundler-1.10.6.tar.gz 313526 SHA256 6c700c2183577be4991b82a975b981bf85a6eb32c9a9a86027aa8e88f1768c19 SHA512 63791bca60c0981aebd69a8fab8bd3741976a0c2a94a5d99f54560917e3a9661b87812385d88a9b858e8d08ffe3b68b42e1c06eb8370dd216713fd6daa1a2166 WHIRLPOOL f74fdfa82a96a8bb3f695bd4126283bc1076a42944227476bda98084e8e50f56e87508f8e63f102fc6297f38ae6325130a9750ee1ccb340c2163d35ab1ed1e36
+DIST bundler-1.11.2.tar.gz 329289 SHA256 8f84487d197f7fcd1753dbe92403febb1ad1ac4ef847fadb473ca9ec62647c8d SHA512 04f324b1a6c23b4e92f2b8c1c974a9420af21f95569b8617d600c9d307af142d109c606cce5f64601e79620f31194d1b4b9f72982b7009c37c5a7a5dd1d973a6 WHIRLPOOL 45fb426c454da025c938bab216f6cd41832779b827736aa66b8536877ae5eb161813f34ffcd1280f410a55140673ad10916f4407bf894eec6c23fcad0045ba80
 DIST bundler-1.8.9.tar.gz 290462 SHA256 9ecbe18147b990e8c5c7f299e9bc7b63eb274f54b05134ad334e0abeb943f733 SHA512 2e3378e2c329c53eb6e578b496e1fb332c4f96eca58299e59dd8cb7f5d3b78f43bc6bf96c452cbeb99a0459c016a824248f907b58dcc2081490e4f59ea7a32ba WHIRLPOOL 887a72075093405dd5c94902865589e4946d70f1cc390725e8ae35f6a36cdc2bdd05b9c27958a5c2497d6f42011791c2432f15ab45e1ccbc8c7f0d7da37799c9
 DIST bundler-1.9.10.tar.gz 301546 SHA256 ea56d906a96f14ffb8ebd3bd5f35ebb4389901be10c8470f6741d6567f16f844 SHA512 0cd05ae67543c5993d2e33cc9287dc375703cda3250de3556442ae513825b200d534640a9232806b1c4bdec192937de2b40d54563030d9aff8f7727f349a7b17 WHIRLPOOL ac2a118bd85d5b6c9ef2819dec95c6580c769a4985429fd959cffc0e0a6be1f6e37106b2d713e42c360dd19761b71f93dbf519f68fd5bcda0ffb09f97e5eff89
diff --git a/dev-ruby/bundler/bundler-1.11.2.ebuild b/dev-ruby/bundler/bundler-1.11.2.ebuild
new file mode 100644
index 000000000000..1730e4726257
--- /dev/null
+++ b/dev-ruby/bundler/bundler-1.11.2.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby20 ruby21 ruby22"
+
+#RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+# No documentation task
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md ISSUES.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="An easy way to vendor gem dependencies"
+HOMEPAGE="https://github.com/carlhuda/bundler"
+SRC_URI="https://github.com/carlhuda/bundler/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc test"
+
+ruby_add_rdepend virtual/rubygems
+
+ruby_add_bdepend "doc? ( app-text/ronn )"
+
+# ruby_add_bdepend "test? ( app-text/ronn )"
+
+# The specs require a number of gems to be installed in a temporary
+# directory, but this requires network access. All tests should still
+# pass with network access.
+RESTRICT="test"
+
+RDEPEND+=" dev-vcs/git"
+
+all_ruby_prepare() {
+	# Bundler only supports running the specs from git:
+	# https://github.com/carlhuda/bundler/issues/issue/738
+	sed -i -e '/when Bundler is bundled/,/^  end/ s:^:#:' spec/runtime/setup_spec.rb || die
+
+	# Fails randomly and no clear cause can be found. Might be related
+	# to bug 346357. This was broken in previous releases without a
+	# failing spec, so patch out this spec for now since it is not a
+	# regression.
+	sed -i -e '/works when you bundle exec bundle/,/^  end/ s:^:#:' spec/install/deploy_spec.rb || die
+
+	# Remove unneeded git dependency from gemspec, which we need to use
+	# for bug 491826
+	sed -i -e '/files/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid specs that are not compatible with all rspec versions.
+	sed -e '/has no malformed whitespace/,/^  end/ s:^:#:' \
+		-e '/uses double-quotes consistently/,/^  end/ s:^:#:' \
+		-i spec/quality_spec.rb || die
+
+	# Avoid spec failing with git 2.0.
+	sed -i -e '/on releasing/,/^        end/ s:^:#:' spec/bundler/gem_helper_spec.rb || die
+}
+
+each_ruby_compile() {
+	if use doc ; then
+		${RUBY} -S rake man:build || die
+	fi
+}
diff --git a/dev-ruby/bunny/Manifest b/dev-ruby/bunny/Manifest
index 2b61a4eefef4..17758bfcd63f 100644
--- a/dev-ruby/bunny/Manifest
+++ b/dev-ruby/bunny/Manifest
@@ -1,5 +1,3 @@
-DIST bunny-1.6.3.gem 180224 SHA256 3eb1339993db6ea5b8655be374c0427924c13bdc9cafee8141e513d334e0a52d SHA512 ceeca544cd05c78adb3bd3164ca84851b65270ecd069e923979b432abc92160642f334df088364ae9960b2c3523260a0ffcd06dd20b51bd798178231efa74a95 WHIRLPOOL 7a9a20240e15c3b480aa870c6270f08ba0d95d12d4ea68e71c444e5abe4933a9dfadbe3babf71c1e35c78a04be09a0d8c01159781b749db3be79189ddede9e13
-DIST bunny-1.7.0.gem 181248 SHA256 889b3bb5b173d8ce16ec7d96cd72ccd742a3e31eaaf0f0336b762cec1f0bf806 SHA512 158ea3906c1318458da7551519ff00e30191f91f0cf3ea777b1069f55cd5fce865591495f56177f8d23a4498bdf95b145caa2027136fab2d3108af6a685eca59 WHIRLPOOL 05fa177b554a5d0c4a76f953242b3d715c4dc969b939375ac22e5d054fee4a1a6634c8a851f25f11120037a1992af7202ff5727452415cea5a3e60cea6c24a03
 DIST bunny-2.0.1.gem 183296 SHA256 ceff06015fa1ddc3aeea397f23242a9de13f3bc7f3481ace1a0b194d66a84236 SHA512 53ef3ec503f4ed5cbcec72343a492f102c358f7f2bd6f4833a3306384faf03195e59f9ca5ef9a7e0d7dc21ae1428c9b107bbbc5a4691853920d3410765e576be WHIRLPOOL 465ea17a2c1ed51127ed37f4ad8fc916d9227111debec127bfcd4e539a7c697c8f5395c3f26cc47c4665948f7e67027d1d0b20c1235b93482aa17302bcbf7771
-DIST bunny-2.2.0.gem 183808 SHA256 901b9e4ccac2edc7b1e08ca63083e519410b46a0c8d23438a6be6570be8282f1 SHA512 f7043ddb7d0f7e9cf365d27456b0545110aa9b61cbbf89fdb73cb73cc60b14d7d9d13c4e6292347a43698053ac06468fe7e10f6bcf4a22306040e85e83fd6d36 WHIRLPOOL 35cbee6eaca8b19248e8f3c344838651ecde93b65eee632c468fa45327adf8685f2deba394a6435fe9635aa5f4a1a0df3284f6c48551be2cd62b88b4880ae658
 DIST bunny-2.2.1.gem 184320 SHA256 ff05d3a86257e0cc8c1480a7918da9d476bed90ece06fbfbb19319b9c224a81b SHA512 649aa1e1110a5feda751e471251b24ab3e43fabe9c95d9502bc18e5b0ff39543de329f7135fbc6adbe8dd4d12324dfe9a01a254fdf6e79e4daa12c782138fe03 WHIRLPOOL c0972565ee3e0213eb2b98d30af1f90a94bf3db19fa36b24da33388e4345a323ee536f7bbd2dd5b685abd14bcdec67ca278e63fbc20c5fc108e3b273b3bcd26e
+DIST bunny-2.2.2.gem 184320 SHA256 36a2b307dcc7f271e9027cb8dde5827b7e02c6a8e4694c0e693b746e4d171a9b SHA512 f87994ab4e491c7e4527189a5a76ce2e4d0a6c7555f913ddefed77d95c62a080b7b629020c66afc0a6cb8ea1d7a310aba0e4dedfc6c3e5b97daf4d4c9378f517 WHIRLPOOL 42fa1e2ed8737dfcaf91a900d282a33adc151d5f996ca6bdc840b4919d1bba16c6c1e7f9240a6e1bef02a37e73d722e3e9ed5bafeb4045687b2ece33cb0054a6
diff --git a/dev-ruby/bunny/bunny-1.6.3.ebuild b/dev-ruby/bunny/bunny-1.6.3.ebuild
deleted file mode 100644
index f53f3f7659ec..000000000000
--- a/dev-ruby/bunny/bunny-1.6.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-# Tests require a live AMQP server.
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_EXTRADOC="ChangeLog.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Another synchronous Ruby AMQP client"
-HOMEPAGE="https://github.com/celldee/bunny"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/amq-protocol-1.9.2"
-
-all_ruby_install() {
-	all_fakegem_install
-
-	insinto /usr/share/doc/${PF}
-	doins -r examples || die
-}
diff --git a/dev-ruby/bunny/bunny-1.7.0.ebuild b/dev-ruby/bunny/bunny-1.7.0.ebuild
deleted file mode 100644
index f53f3f7659ec..000000000000
--- a/dev-ruby/bunny/bunny-1.7.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-# Tests require a live AMQP server.
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_EXTRADOC="ChangeLog.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Another synchronous Ruby AMQP client"
-HOMEPAGE="https://github.com/celldee/bunny"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/amq-protocol-1.9.2"
-
-all_ruby_install() {
-	all_fakegem_install
-
-	insinto /usr/share/doc/${PF}
-	doins -r examples || die
-}
diff --git a/dev-ruby/bunny/bunny-2.2.0.ebuild b/dev-ruby/bunny/bunny-2.2.2.ebuild
index d4bedab2f7d6..19d3a89aab5b 100644
--- a/dev-ruby/bunny/bunny-2.2.0.ebuild
+++ b/dev-ruby/bunny/bunny-2.2.2.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"
 
 RUBY_FAKEGEM_TASK_DOC=""
 
@@ -22,7 +22,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-ruby_add_rdepend "dev-ruby/amq-protocol:2"
+ruby_add_rdepend ">=dev-ruby/amq-protocol-2.0.1:2"
 
 all_ruby_install() {
 	all_fakegem_install
diff --git a/dev-ruby/dbf/Manifest b/dev-ruby/dbf/Manifest
index 9dc0889f67c0..b6f479a03f41 100644
--- a/dev-ruby/dbf/Manifest
+++ b/dev-ruby/dbf/Manifest
@@ -3,3 +3,4 @@ DIST dbf-2.0.13.gem 125952 SHA256 d970c42f6f677df3b31788814845ac3135979987641447
 DIST dbf-2.0.8.gem 115712 SHA256 d953117337e3d12720815304b5e584ccdd7d081b65d0a01dd2d825087e1b4f79 SHA512 b2098359f88b5df50113af979d0d95591b1b15db22e8554bced14f4a5190ac3f490971e7f857bb832d4957f82e6f82d5cbcea0332401a54cf41b897bfb1f3b74 WHIRLPOOL 7afdf410cfc43009e407a14ffe5944d1639ec4318d9517314b9d41734341777ce5833033462accf3ea699d26b4fd4a3fb410875ee4b9eda197199cefd3db7836
 DIST dbf-3.0.0.gem 125952 SHA256 d3c2dfd562d254bd5a566bf231fa61b25b18c952190de2d67c6d628bc785d81f SHA512 b84bd1dc62a27f5c8c30a03bce5eb90c4a461d2821cfe7da4a6505fb602592f74541e00ee4f2e40d4e16c9321b3f1ec07c11c992dfef62be5b98c58a65e5c264 WHIRLPOOL 87ed38184455eac2ce2c74385b1ffe37b4d5775432f4f9065804e96d4eb465eec1e982ee5d1d571a2163be4f42d9c6f80006e847b3dc712ef870594702776f8b
 DIST dbf-3.0.1.gem 125952 SHA256 baa8342d8a7bb27239a713ed48ed1d1252878e293fcac0c24d97ad884e12e49e SHA512 64f94f29c36084ba31a993767555e52687467ed7c5c6d21a2efc1cdfe4d7f414531fd1b5dc2b7e9b73f5d9a5456e0e81b91123eb3084ebb4ca9ed62a91e466ac WHIRLPOOL 430e63d7982e7f5f95487818a1bdb6bca2fa6667c4d35aa0e4d72c0b205db34a8750ab9e2bf0f11270d63a71fde71e25b1e949d4d78137d95cb8c6edafd0aafe
+DIST dbf-3.0.3.gem 125952 SHA256 5db79720ae7079c9539be3abc4a2801ee9ea4d0a4fc5ca3ded44f9ef67015b24 SHA512 6f04ec0903ac3daa24bf388a103248cbd7fd9353616cd738c5e0b72f8c27a0cd19d9113655b1e5dd9d6193b6549496526febf7ba49ed729a1a2f1f77cc202a97 WHIRLPOOL 786ed9d7954536b795c1225a067064c673ba7a630df213e3d13526b1388739c3a9a4eb3f90eec3e8fcbb9e630930d694f595475176aa880e66f9a028578c20a0
diff --git a/dev-ruby/dbf/dbf-3.0.3.ebuild b/dev-ruby/dbf/dbf-3.0.3.ebuild
new file mode 100644
index 000000000000..05c2593c51f5
--- /dev/null
+++ b/dev-ruby/dbf/dbf-3.0.3.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md docs/*"
+
+inherit ruby-fakegem
+
+DESCRIPTION="a small fast library for reading dBase, xBase, Clipper and FoxPro
+database files"
+HOMEPAGE="https://github.com/infused/dbf"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
diff --git a/dev-ruby/hashie/Manifest b/dev-ruby/hashie/Manifest
index f960fd5fa2e8..ba30922e0b5e 100644
--- a/dev-ruby/hashie/Manifest
+++ b/dev-ruby/hashie/Manifest
@@ -1,2 +1,3 @@
 DIST hashie-2.1.2.gem 34816 SHA256 a9e1e4928bf4f5a5683ea9c7ef29e50fb93f72542f9a9550e205fe33a6568923 SHA512 6f72998710da58a2584939b4e74a114ae54168902020dc16ec5ea0422a91316b84aa6835fffb36a2985634f24ff5b0d01bcdb50134a414a269a4881ebcd728ac WHIRLPOOL 6b67c04ef9dc33a9ffdf25d14440bdd3ce621f1bde9b4eb806de63fa39edc76627f80d10435efc708fc48d24f1450046f33aceb20d76238a0cf8b67ddcf72e78
 DIST hashie-3.4.2.gem 56320 SHA256 b68373c5f6589c5222638433918bc3e256acbaead7f883e5ec18420f507b17ca SHA512 9081d91ad014914f59ec4e18b92c27b6f316f03f476c94d3b469bda54f201d339d553ef142018f0e605d3571418af784d57e25211a6c141cd8eb5a56497c28d6 WHIRLPOOL cc76a268a7b8abc618b236a1958db783a5dc9e14c92b719782db71dd1a518e436b4e801f6854e5c8958298d4212814bae23893c1fe2a42561de28ba993847b2f
+DIST hashie-3.4.3.gem 58880 SHA256 29213491e9f74158b9a7ec0806b3698039357209a6b24553cfd767f6418365c7 SHA512 1a9f3169308e99559c67e021f0d4174618fd6e4cb6a53b4c7889b609ea32e2d7cde7216de2e3d485f496fa73491702e3af81b6875071b35ecfe5609d925225f7 WHIRLPOOL 09ab898ad08a975c69beb12bf2154c20d9ca00b698610101497705370f17c66f7d389b55b92378c83b02d53f3218351c3ccca119c8df5f80ce199dd7acb08722
diff --git a/dev-ruby/hashie/hashie-3.4.3.ebuild b/dev-ruby/hashie/hashie-3.4.3.ebuild
new file mode 100644
index 000000000000..5c9bfcbf867b
--- /dev/null
+++ b/dev-ruby/hashie/hashie-3.4.3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby20 ruby21"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Hashie is a small collection of tools that make hashes more powerful"
+HOMEPAGE="http://intridea.com/posts/hashie-the-hash-toolkit"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/activesupport )"
+
+all_ruby_prepare() {
+	# Remove bundler and fix one spec that depends on its requires
+	#rm Gemfile || die
+	sed -i -e '/[Bb]undler/d' Rakefile || die
+	sed -e '/pry/ s:^:#:' -i spec/spec_helper.rb || die
+
+	# Avoid dependency on rspec-pending_for and its dependencies
+	sed -i -e '/pending_for/ s:^:#:' \
+		spec/spec_helper.rb \
+		spec/hashie/mash_spec.rb \
+		spec/hashie/extensions/strict_key_access_spec.rb || die
+}
diff --git a/dev-ruby/spring/Manifest b/dev-ruby/spring/Manifest
index 4dd58efd3331..f1ed08787f9e 100644
--- a/dev-ruby/spring/Manifest
+++ b/dev-ruby/spring/Manifest
@@ -1,3 +1,4 @@
 DIST spring-1.4.0.tar.gz 38007 SHA256 a27501bd182893d6071b46c03d47cb43ab78b4515901420e487d7a4b78821aa7 SHA512 b7096861dd19c3869f3899d8a48f26f39a6496f3b1a1c407d91c48b7896212f3eb18a477c6a3416c8522e1b8de955c20372814c29babbd465d8c0bdff51c928d WHIRLPOOL 8af890262cb45b579bed035b460c87d96cf13b5cc60f642669ab59bb5ea9af470a0cdb220d26bbc466fb1e1913b29ffbf404acebef37a1e05b9b0a86d8c874b6
 DIST spring-1.4.4.tar.gz 38696 SHA256 8ffef93424f39bb8e80df3e765be90b84bb1fdd0d46abe7409bde7a1bc009d07 SHA512 aa77b41aa0139e2707bc44e806c23b5eb3824adcdcc3657b04a7d6dca58b40a8b76e26437711b5f1849b135237e82f89a03712fad1990c40037f638dff953a73 WHIRLPOOL 90c3ad321b680aa04fbcb8d31883538fa3dd538a769741881110ee42abb08d74af63cc2e468a995c60ff4ae83a93221e0ba794557c9f6c000ba69c933366d641
 DIST spring-1.5.0.tar.gz 38804 SHA256 f853278d10fb26e1c4c68a3497ce3922c6f64ad7d3e3f9a61057ab3bd62bc8c8 SHA512 09bd53192ac835990e740fb73477065e623df50ae986eb433a6a44468bcc3b928b6a624edb50a2255cc0cab6375dd2bc81b96783ced9d773ad69c7696587eec5 WHIRLPOOL 914f2c43ea624cdb6fded00a48782a74a2198e7212e5c8de0d0fcf79f06fa70ca92e31c2ee15a1325d5ba4fbc9ca640a0b28888107df86c78cecf50944e0d8e9
+DIST spring-1.6.0.tar.gz 39122 SHA256 9f0917d410a24e970fc7a6082f12548be617393162bbe9c646464b2912bd445f SHA512 ce5792cd2626a9e60ee73e24bd8a221aa93d3af2e6741e7e4df81b3a18fe79da46e2004f7d29f9a3db1a788663151a7869b4a738c239f6a13b5f2374c4ba9af7 WHIRLPOOL a213e56eefc724e9c45418c7073b7410bf11c2deb5746a2740e4a168bebfb39a22aa1ddb5b216eee92c9fabf02cffe7b1e51bfcf71abc9864ce9fc226b4a37bc
diff --git a/dev-ruby/spring/spring-1.6.0.ebuild b/dev-ruby/spring/spring-1.6.0.ebuild
new file mode 100644
index 000000000000..cd7a65f1f2c9
--- /dev/null
+++ b/dev-ruby/spring/spring-1.6.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_TASK_TEST="test:unit"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Rails application preloader"
+HOMEPAGE="https://github.com/rails/spring"
+SRC_URI="https://github.com/rails/spring/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="1.1"
+KEYWORDS="~amd64"
+
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/rubygems-2.1.0"
+
+ruby_add_bdepend "test? ( dev-ruby/bundler dev-ruby/activesupport )"
+
+all_ruby_prepare() {
+	sed -i -e '/files/d' \
+		-e '/bump/d' ${PN}.gemspec || die
+	sed -i -e '/bump/d' Rakefile || die
+}
diff --git a/dev-scheme/chicken/metadata.xml b/dev-scheme/chicken/metadata.xml
index cc5af33bd39b..7f6452901120 100644
--- a/dev-scheme/chicken/metadata.xml
+++ b/dev-scheme/chicken/metadata.xml
@@ -18,8 +18,4 @@ standard, the Revised5 Report on the Algorithmic Language Scheme (R5RS ), and
 includes many enhancements and extensions. CHICKEN runs on MacOS X, Windows, and
 many Unix flavours.
 </longdescription>
-<use>
-	<flag name="parallel-build">Enable testing parallel build mode added in 
-		4.7.3 version. Can still be not working</flag>
-</use>
 </pkgmetadata>
diff --git a/dev-util/cucumber-core/Manifest b/dev-util/cucumber-core/Manifest
index 25ddf2a9c6d5..c06f0e3b0aae 100644
--- a/dev-util/cucumber-core/Manifest
+++ b/dev-util/cucumber-core/Manifest
@@ -1,2 +1,3 @@
 DIST cucumber-core-1.2.0.gem 41984 SHA256 390e4d05a99d4b648f75343b553cb22c59aa9b4e461ab383323d4ca381b4b4bb SHA512 b24a108a0147afca99d292df7c64320190a1fa0b2fcc08038f3a98eb09d29f3f02e0581004a168e80e0c2091e7e981494f86e9086ff81504a014b52f5fe5ceeb WHIRLPOOL e49a4814d2810abfb1f8d4b79d858c87ce128c98d2e238147d0599eab7acdafa25fa438f1f1addd50dd195484f79fb0257f29dfb5fa5bbba07f173f313b6bedb
 DIST cucumber-core-1.3.0.gem 44032 SHA256 28dfebe5e003a28c60266468f781968e30fe26858a823001be3f9aa481fbb98a SHA512 82d5185669ff8962cd4a1da7257e1144028cf0718c6a324facf4686a287526abb5c7848898bb25a848ba535ef0526daea13ec3de93b2b2ffce76c49cfd60ed0b WHIRLPOOL 7278feb976665e7bee4a7b43b0ca320bf95747c919addef167ef56d20293b0a878bf06d2669f97454c63675fad79801c6b906e08a2b3c8991f5d44eaf8d40634
+DIST cucumber-core-1.3.1.gem 44544 SHA256 0c86987380e5e91904dc98939aa3b88e66fc6151af4500a1e61bb67f0bccc573 SHA512 ad8be64c7c5203e660e1826d479d572f03f71dcea9105f21688427979bab821fec03c704fe30233137afc1865fc4d09ed6a1272921ba9fde1d149b9266f0b673 WHIRLPOOL aa95879115e8e8714e1e8154d4bb113786f45006a51eca2b18463d0c48fd24a9a0b39ff92bc54feb16d3d4cc5af3d6c50426736f1f5eb20ce28a6ea68cffeed9
diff --git a/dev-util/cucumber-core/cucumber-core-1.3.1.ebuild b/dev-util/cucumber-core/cucumber-core-1.3.1.ebuild
new file mode 100644
index 000000000000..ed7b162250c0
--- /dev/null
+++ b/dev-util/cucumber-core/cucumber-core-1.3.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="HISTORY.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Executable feature scenarios"
+HOMEPAGE="https://github.com/aslakhellesoy/cucumber/wikis"
+LICENSE="Ruby"
+
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE="test"
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/unindent-1.0
+	)"
+
+USE_RUBY=${USE_RUBY/ruby22} ruby_add_bdepend "test? ( >=dev-ruby/kramdown-1.4.2 )"
+
+ruby_add_rdepend "
+	>=dev-ruby/gherkin3-3.1.0:3
+"
+
+each_ruby_prepare() {
+	case ${RUBY} in
+		*ruby22)
+			# Avoid dependency on kramdown so we can add the ruby22
+			# target.
+			rm -f spec/readme_spec.rb || die
+			;;
+	esac
+}
diff --git a/dev-util/fhist/Manifest b/dev-util/fhist/Manifest
index efecc0b1baeb..367d0984e544 100644
--- a/dev-util/fhist/Manifest
+++ b/dev-util/fhist/Manifest
@@ -1,2 +1,3 @@
 DIST fhist-1.16.tar.gz 383180 SHA256 3f71c86939694755e456a9c82156f779063e74240d21da2251f33ae3c25ea336 SHA512 919fc4d424e1f878404ec2d305dbcd66a4697c88c38af54033bdb178704cf08997c816d75db93ddbfc5248f29b997c4b8aaa3fd98ee790c32582124fc332bc1d WHIRLPOOL 6469fc9a4a5ed9f82af0dca8f1f167b9c56385283328d0c24bcd88b7e38fbf9912eeb71a37a64687f9bf1c58e0996ec7ae71649ae6fa4b0622b83f65bfc8526a
 DIST fhist-1.19.tar.gz 409083 SHA256 e18d97f6ff5c44593f82775eb82540d870409ed80712eead8fd41684f194f62c SHA512 d93f0ce1b29e527af5de3f49d44ebc11567f53bb0b428322daa42b0a4a14ae75333ffcb9a65ba14b2a6240d57be7bdf7632e6b4eccd071d4e9b6e90c14c317a9 WHIRLPOOL 072a3231c3994310396f00dfab0b7214e23c5e59bfa511ba0987ff89b686e3d4a33bf6f10e77fad3f1e80857f337a47a77204d3dd14aa62f42932b48d088afeb
+DIST fhist-1.21.D001.tar.gz 409961 SHA256 bc8963b142d3686c3848a74ec996cb8619cd7843deb2f99709d81bed30f6843b SHA512 9f69ba29bdd44b4888decdcfb7db49a29a1c9611ae5cd733af2e3ec04afc498674854616335d13ca732a6485cbffafc6a4072d14a9638ead1dea4412a2070f97 WHIRLPOOL 70f070ac04a4648c8575ee6ffd95edc6d5f6ee0a25e5269842f2d41dac1e600c193a72c1138a4267a02bda4137ed216b9f2c6ae5a758cf8270b1699bd6c5466f
diff --git a/dev-util/fhist/fhist-1.19.ebuild b/dev-util/fhist/fhist-1.19.ebuild
index 7e50006d988b..f9ee56c2a55a 100644
--- a/dev-util/fhist/fhist-1.19.ebuild
+++ b/dev-util/fhist/fhist-1.19.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=4
 
-inherit eutils
+inherit eutils flag-o-matic
 
 DESCRIPTION="File history and comparison tools"
 HOMEPAGE="http://fhist.sourceforge.net/fhist.html"
@@ -23,8 +23,8 @@ DEPEND="${RDEPEND}
 	sys-devel/bison
 	test? ( app-arch/sharutils )"
 
-MAKEOPTS+=" -j1"
-
 src_prepare() {
+	MAKEOPTS+=" -j1"
 	epatch "${FILESDIR}"/${PV}-ldflags.patch
+	append-cflags -fgnu89-inline
 }
diff --git a/dev-util/fhist/fhist-1.21.ebuild b/dev-util/fhist/fhist-1.21.ebuild
new file mode 100644
index 000000000000..d3a2b031b687
--- /dev/null
+++ b/dev-util/fhist/fhist-1.21.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="File history and comparison tools"
+HOMEPAGE="http://fhist.sourceforge.net/fhist.html"
+SRC_URI="http://fhist.sourceforge.net/${P}.D001.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	dev-libs/libexplain
+	sys-devel/gettext
+	sys-apps/groff"
+DEPEND="${RDEPEND}
+	sys-devel/bison
+	test? ( app-arch/sharutils )"
+
+src_prepare() {
+	MAKEOPTS+=" -j1"
+	epatch "${FILESDIR}"/${P}-ldflags.patch
+	append-cflags -fgnu89-inline
+}
diff --git a/dev-util/fhist/files/fhist-1.21-ldflags.patch b/dev-util/fhist/files/fhist-1.21-ldflags.patch
new file mode 100644
index 000000000000..00aab69d7495
--- /dev/null
+++ b/dev-util/fhist/files/fhist-1.21-ldflags.patch
@@ -0,0 +1,40 @@
+ Makefile.in | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index ba4e4c2..c0e552a 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -916,8 +916,8 @@ common/libcommon.a: $(common_obj)
+ fcomp_obj = fcomp/main.$(OBJEXT)
+ 
+ bin/fcomp$(EXEEXT): $(fcomp_obj) common/libcommon.a .bin
+-	$(CC) $(CPPFLAGS) $(CFLAGS) -o $@ $(fcomp_obj) common/libcommon.a \
+-		$(LDFLAGS) $(LIBS)
++	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $(fcomp_obj) common/libcommon.a \
++		$(LIBS)
+ 
+ $(bindir)/fcomp$(EXEEXT): bin/fcomp$(EXEEXT) .bindir
+ 	$(INSTALL_PROGRAM) bin/fcomp$(EXEEXT) $@
+@@ -928,8 +928,8 @@ fhist_obj = fhist/breaks.$(OBJEXT) fhist/diff.$(OBJEXT) fhist/extract.$(OBJEXT)
+ 		fhist/subroutine.$(OBJEXT) fhist/update.$(OBJEXT)
+ 
+ bin/fhist$(EXEEXT): $(fhist_obj) common/libcommon.a .bin
+-	$(CC) $(CPPFLAGS) $(CFLAGS) -o $@ $(fhist_obj) common/libcommon.a \
+-		$(LDFLAGS) $(LIBS)
++	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $(fhist_obj) common/libcommon.a \
++		$(LIBS)
+ 
+ $(bindir)/fhist$(EXEEXT): bin/fhist$(EXEEXT) .bindir
+ 	$(INSTALL_PROGRAM) bin/fhist$(EXEEXT) $@
+@@ -937,8 +937,8 @@ $(bindir)/fhist$(EXEEXT): bin/fhist$(EXEEXT) .bindir
+ fmerge_obj = fmerge/main.$(OBJEXT) fmerge/work.$(OBJEXT)
+ 
+ bin/fmerge$(EXEEXT): $(fmerge_obj) common/libcommon.a .bin
+-	$(CC) $(CPPFLAGS) $(CFLAGS) -o $@ $(fmerge_obj) common/libcommon.a \
+-		$(LDFLAGS) $(LIBS)
++	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $(fmerge_obj) common/libcommon.a \
++		$(LIBS)
+ 
+ $(bindir)/fmerge$(EXEEXT): bin/fmerge$(EXEEXT) .bindir
+ 	$(INSTALL_PROGRAM) bin/fmerge$(EXEEXT) $@
diff --git a/dev-util/fhist/metadata.xml b/dev-util/fhist/metadata.xml
index f17c90b91e13..d575582d205e 100644
--- a/dev-util/fhist/metadata.xml
+++ b/dev-util/fhist/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>
 	<herd>shell-tools</herd>
diff --git a/eclass/mercurial.eclass b/eclass/mercurial.eclass
index f58335a4ce75..bf85aaab6395 100644
--- a/eclass/mercurial.eclass
+++ b/eclass/mercurial.eclass
@@ -112,7 +112,7 @@ mercurial_fetch() {
 		die "failed to create ${EHG_STORE_DIR}/${EHG_PROJECT}"
 	chmod -f g+rw "${EHG_STORE_DIR}/${EHG_PROJECT}" || \
 		echo "Warning: failed to chmod g+rw ${EHG_PROJECT}"
-	cd "${EHG_STORE_DIR}/${EHG_PROJECT}" || \
+	pushd "${EHG_STORE_DIR}/${EHG_PROJECT}" > /dev/null || \
 		die "failed to cd to ${EHG_STORE_DIR}/${EHG_PROJECT}"
 
 	# Clone/update repository:
@@ -122,12 +122,13 @@ mercurial_fetch() {
 			rm -rf "${module}"
 			die "failed to clone ${EHG_REPO_URI}"
 		}
-		cd "${module}"
 	elif [[ -z "${EHG_OFFLINE}" ]]; then
 		einfo "Updating ${EHG_STORE_DIR}/${EHG_PROJECT}/${module} from ${EHG_REPO_URI}"
-		cd "${module}" || die "failed to cd to ${module}"
+		pushd "${module}" > /dev/null || die "failed to cd to ${module}"
 		${EHG_PULL_CMD} "${EHG_REPO_URI}" || die "update failed"
+		popd > /dev/null || die
 	fi
+	popd > /dev/null || die
 
 	# Checkout working copy:
 	einfo "Creating working directory in ${sourcedir} (target revision: ${EHG_REVISION})"
diff --git a/eclass/readme.gentoo-r1.eclass b/eclass/readme.gentoo-r1.eclass
index c07665072c2b..07320c0e08bd 100644
--- a/eclass/readme.gentoo-r1.eclass
+++ b/eclass/readme.gentoo-r1.eclass
@@ -21,8 +21,6 @@
 if [[ -z ${_README_GENTOO_ECLASS} ]]; then
 _README_GENTOO_ECLASS=1
 
-inherit eutils
-
 case "${EAPI:-0}" in
 	0|1|2|3)
 		die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}"
@@ -61,15 +59,16 @@ readme.gentoo_create_doc() {
 	debug-print-function ${FUNCNAME} "${@}"
 
 	if [[ -n "${DOC_CONTENTS}" ]]; then
-		eshopts_push
-		set -f
 		if [[ -n "${DISABLE_AUTOFORMATTING}" ]]; then
-			echo "${DOC_CONTENTS}" > "${T}"/README.gentoo
+			echo "${DOC_CONTENTS}" > "${T}"/README.gentoo || die
 		else
+			local saved_flags=$-
+			set -f				# disable filename expansion in echo arguments
 			echo -e ${DOC_CONTENTS} | fold -s -w 70 \
 				| sed 's/[[:space:]]*$//' > "${T}"/README.gentoo
+			assert
+			set +f -${saved_flags}
 		fi
-		eshopts_pop
 	elif [[ -f "${FILESDIR}/README.gentoo-${SLOT%/*}" ]]; then
 		cp "${FILESDIR}/README.gentoo-${SLOT%/*}" "${T}"/README.gentoo || die
 	elif [[ -f "${FILESDIR}/README.gentoo${README_GENTOO_SUFFIX}" ]]; then
diff --git a/games-engines/scummvm-tools/scummvm-tools-1.7.0-r1.ebuild b/games-engines/scummvm-tools/scummvm-tools-1.7.0-r1.ebuild
index 2ae1a49cef55..babf5c50dffa 100644
--- a/games-engines/scummvm-tools/scummvm-tools-1.7.0-r1.ebuild
+++ b/games-engines/scummvm-tools/scummvm-tools-1.7.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/scummvm/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
 IUSE="flac iconv mad png vorbis"
 RESTRICT="test" # some tests require external files
 
diff --git a/games-fps/alienarena/alienarena-20130827.ebuild b/games-fps/alienarena/alienarena-20130827.ebuild
index 0ff39102a75c..3193fa85769c 100644
--- a/games-fps/alienarena/alienarena-20130827.ebuild
+++ b/games-fps/alienarena/alienarena-20130827.ebuild
@@ -8,7 +8,8 @@ inherit eutils gnome2-utils games
 MY_PN=alienarena-7.66
 DESCRIPTION="Fast-paced multiplayer deathmatch game"
 HOMEPAGE="http://red.planetarena.org/"
-SRC_URI="http://icculus.org/alienarena/Files/${MY_PN}-linux${PV}.tar.gz"
+SRC_URI="http://icculus.org/alienarena/Files/${MY_PN}-linux${PV}.tar.gz
+	http://red.planetarena.org/files/${MY_PN}-linux${PV}.tar.gz"
 
 LICENSE="GPL-2 free-noncomm"
 SLOT="0"
diff --git a/games-fps/warsow/warsow-1.5.1-r1.ebuild b/games-fps/warsow/warsow-1.5.1-r1.ebuild
index b36b9e39ab3f..b9324efa4b36 100644
--- a/games-fps/warsow/warsow-1.5.1-r1.ebuild
+++ b/games-fps/warsow/warsow-1.5.1-r1.ebuild
@@ -41,7 +41,7 @@ RDEPEND=">=dev-libs/libRocket-1.2.1_p20130110
 		x11-libs/libXrandr
 		x11-libs/libXxf86dga
 		x11-libs/libXxf86vm
-		virtual/jpeg
+		virtual/jpeg:0
 		virtual/opengl
 		openal? ( media-libs/openal )
 	)"
diff --git a/games-puzzle/enigma/enigma-1.21-r2.ebuild b/games-puzzle/enigma/enigma-1.21-r2.ebuild
index ccf4dd6f80e1..f1c6028ba52f 100644
--- a/games-puzzle/enigma/enigma-1.21-r2.ebuild
+++ b/games-puzzle/enigma/enigma-1.21-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/enigma-game/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE="nls"
 
 COMMON_DEPS="media-libs/sdl-ttf
diff --git a/games-strategy/liquidwar6/liquidwar6-0.4.3681-r1.ebuild b/games-strategy/liquidwar6/liquidwar6-0.4.3681-r1.ebuild
index 96c3643253b1..d056ac0534cc 100644
--- a/games-strategy/liquidwar6/liquidwar6-0.4.3681-r1.ebuild
+++ b/games-strategy/liquidwar6/liquidwar6-0.4.3681-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://www.ufoot.org/download/liquidwar/v6/${MY_PV}/${MY_P}.tar.gz
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="doc gles2 gtk libcaca +maps nls +ogg openmp readline test"
 
 # yes, cunit is rdep
diff --git a/games-strategy/scorched3d/scorched3d-44-r1.ebuild b/games-strategy/scorched3d/scorched3d-44-r1.ebuild
index cbbdb22118b0..d82dfe32e86c 100644
--- a/games-strategy/scorched3d/scorched3d-44-r1.ebuild
+++ b/games-strategy/scorched3d/scorched3d-44-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/scorched3d/Scorched3D-${PV}-src.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ppc64 ~x86"
 IUSE="dedicated mysql"
 
 RDEPEND="media-libs/libsdl[video]
diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest
index 295367edb961..b36db1dd22b7 100644
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -1,3 +1,4 @@
 DIST nautilus-3.16.2.tar.xz 3325172 SHA256 3e7ecdda3a47b6ad03098270940aa506782866fa3602d91e711d99f96741478f SHA512 06b4c338fe2295122b35053d754d8bb797cfeedf736db3a52dd290d7742d79fbbf50c23a3d59e62ef937f3ebf6b67f26f12a652b75d42a8b44462a3e1eef1be1 WHIRLPOOL bd6d3aee888474e247f19cf95fecead27a86296afcab04de7052b8403df95d9b776b0c93bad04b748ba638d4edfc3fc11e8fbce50142a0aad517a0ed35038f9c
 DIST nautilus-3.18.2.tar.xz 3316652 SHA256 68dcf668e2ca93126a899d2e236ef37af2aea93e3fc25eee23ccd7ba911d424a SHA512 ac40683027f3318bbea23feee7a654502106932b049faa4bcbc1340a7fbafaa7e8857237b1ec5a0bcbee25e8d75eb1e9c8136cd5b748f9009e72589e73908e86 WHIRLPOOL 317258a102cf89497cfe87965614f77bff189ad3539c61f777b0d19bd0f8febe316a1389f47256f65de50b23b8c79382ac5b45cfb94919c8bf2a7e1fbe26a304
 DIST nautilus-3.18.3.tar.xz 3343876 SHA256 44802222779123ad9f818ac9020f1417afd18e81d2f5c385a46cc5cf3b36a99d SHA512 05318b42fe2921c4c65a16b97b8c774f0897a3045d216227d697b754d8e1ec97e87db7d7f78d4078793da9bed302834a7c1786d85e5c2815e4208e7cfd2f818f WHIRLPOOL 30c532c868412897690929e707aa241a3641c1058e2558053141ba5b373928ce55b101b3dad6d40f34e1633a4edba7ac06c473f19d0aa18ff04e0b82cee65634
+DIST nautilus-3.18.4.tar.xz 3343956 SHA256 4ff2c78dba352b4666bb30e0c80ed786eed09199fd624f00810fce4d987fcd26 SHA512 671abbb45d888260ed8591106a0da5d9703b050d2d962101eecfa6107ad4d0dfb792f6a8215f70d9c7e98898922ed78c4216c5e327bab573773422626d0905f4 WHIRLPOOL a4887cdfce94a09d8aaafde3eb36172cfc53c2b03d38f92ba429e9e73acf1f7f9d7ca51a54c0a221e51f1a9127e8ed195dd835d2a6f45255feef75ce061d9238
diff --git a/gnome-base/nautilus/nautilus-3.18.4.ebuild b/gnome-base/nautilus/nautilus-3.18.4.ebuild
new file mode 100644
index 000000000000..c2d5e3dabe34
--- /dev/null
+++ b/gnome-base/nautilus/nautilus-3.18.4.ebuild
@@ -0,0 +1,128 @@
+# 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" # Needed with USE 'sendto'
+
+inherit autotools eutils gnome2 readme.gentoo virtualx
+
+DESCRIPTION="A file manager for the GNOME desktop"
+HOMEPAGE="https://wiki.gnome.org/Apps/Nautilus"
+
+LICENSE="GPL-2+ LGPL-2+ FDL-1.1"
+SLOT="0"
+
+# TODO: control profiling ?
+IUSE="exif gnome +introspection packagekit +previewer selinux sendto tracker xmp"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux"
+
+# FIXME: tests fails under Xvfb, but pass when building manually
+# "FAIL: check failed in nautilus-file.c, line 8307"
+# need org.gnome.SessionManager service (aka gnome-session) but cannot find it
+RESTRICT="test"
+
+# Require {glib,gdbus-codegen}-2.30.0 due to GDBus API changes between 2.29.92
+# and 2.30.0
+COMMON_DEPEND="
+	>=dev-libs/glib-2.45.7:2[dbus]
+	>=x11-libs/pango-1.28.3
+	>=x11-libs/gtk+-3.18.5:3[introspection?]
+	>=dev-libs/libxml2-2.7.8:2
+	>=gnome-base/gnome-desktop-3:3=
+
+	gnome-base/dconf
+	>=gnome-base/gsettings-desktop-schemas-3.8.0
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrender
+
+	exif? ( >=media-libs/libexif-0.6.20 )
+	introspection? ( >=dev-libs/gobject-introspection-0.6.4:= )
+	selinux? ( >=sys-libs/libselinux-2 )
+	tracker? ( >=app-misc/tracker-0.16:= )
+	xmp? ( >=media-libs/exempi-2.1.0 )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-lang/perl-5
+	>=dev-util/gdbus-codegen-2.33
+	>=dev-util/gtk-doc-am-1.10
+	>=dev-util/intltool-0.40.1
+	sys-devel/gettext
+	virtual/pkgconfig
+	x11-proto/xproto
+"
+RDEPEND="${COMMON_DEPEND}
+	packagekit? ( app-admin/packagekit-base )
+	sendto? ( !<gnome-extra/nautilus-sendto-3.0.1 )
+"
+
+# For eautoreconf
+#	gnome-base/gnome-common
+#	dev-util/gtk-doc-am"
+
+PDEPEND="
+	gnome? (
+		>=x11-themes/gnome-icon-theme-1.1.91
+		x11-themes/gnome-icon-theme-symbolic )
+	tracker? ( >=gnome-extra/nautilus-tracker-tags-0.12 )
+	previewer? ( >=gnome-extra/sushi-0.1.9 )
+	sendto? ( >=gnome-extra/nautilus-sendto-3.0.1 )
+	>=gnome-base/gvfs-1.14[gtk]
+"
+# Need gvfs[gtk] for recent:/// support
+
+src_prepare() {
+	if use previewer; then
+		DOC_CONTENTS="nautilus uses gnome-extra/sushi to preview media files.
+			To activate the previewer, select a file and press space; to
+			close the previewer, press space again."
+	fi
+
+	# Control selinux support
+	# https://bugzilla.gnome.org/show_bug.cgi?id=758632
+	epatch "${FILESDIR}"/${PN}-3.18.2-automagic-selinux.patch
+
+	eautoreconf
+
+	# Remove -D*DEPRECATED flags. Don't leave this for eclass! (bug #448822)
+	sed -e 's/DISABLE_DEPRECATED_CFLAGS=.*/DISABLE_DEPRECATED_CFLAGS=/' \
+		-i configure || die "sed failed"
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	DOCS="AUTHORS HACKING MAINTAINERS NEWS README* THANKS"
+	gnome2_src_configure \
+		--disable-profiling \
+		--disable-update-mimedb \
+		$(use_enable exif libexif) \
+		$(use_enable introspection) \
+		$(use_enable packagekit) \
+		$(use_enable sendto nst-extension) \
+		$(use_enable selinux) \
+		$(use_enable tracker) \
+		$(use_enable xmp)
+}
+
+src_test() {
+	gnome2_environment_reset
+	Xemake check
+}
+
+src_install() {
+	use previewer && readme.gentoo_create_doc
+	gnome2_src_install
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	if use previewer; then
+		readme.gentoo_print_elog
+	else
+		elog "To preview media files, emerge nautilus with USE=previewer"
+	fi
+}
diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
index e15074f2b02d..3c200bf45aa1 100644
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -1,2 +1,3 @@
 DIST evolution-data-server-3.16.5.tar.xz 5364120 SHA256 e44ad4143402957cab8cab1a6b3d7057d8b111d268c6b9ad4e4008850f5b244c SHA512 7f4fd758175d3d48d249cebd855fe684b808574421f1d09ee90aad16c76da89980f17bb2fa9741187adb44327166ebcb78c5330f28f01b20f3810c36653f78d1 WHIRLPOOL 559b4e2f1de4f26bf5806c1f5cabc3afe6aea910fa0dcf657947d085ea2344250b8b149a7d6760d342abb1893872b937c7d7626648cff2fe12fe531fb52cd3c2
 DIST evolution-data-server-3.18.2.tar.xz 5410148 SHA256 5942fc1cf395acdc15425939d83824d861d01c57225ee3fc8c1d77009468ce9b SHA512 b90d7b53048dad2ac94e414e55f99eeb7695475c4db8c7d803206eabfe8a7b2a42a9c5083119e72fbe4ccc6afc8b120087da712dfc40c953bb66cb3bcbefe2f7 WHIRLPOOL 992b262ce926bdf176a5d5cb041e25e61be3609eedee1d35d7232afcc4e576da571bcef98a695cfa908b92c567c128a39846f528eb5ed51967e6535c976c2025
+DIST evolution-data-server-3.18.3.tar.xz 5411056 SHA256 9de9d6392822bb4b89318a88f5db1fd2f0f09899b793a0dd5525a656ed0e8163 SHA512 af17a550991a453de9e953c343e774c0ee1155a483a3c2d55e3da9b5ba9a99adbbc9de56c57d27176c8508dec8bba771480a1787d88fb09daaab57b9c1cdf712 WHIRLPOOL 01871974e33cf3510a181ea5a3e1ade4cc29675445b39b0de3e64ad93ab0de5b2330c778e8ef201e43d071c79b1825ab01731b71497b49e1f7b65bd02f3b3da9
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.18.3.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.18.3.ebuild
new file mode 100644
index 000000000000..555a55c4c711
--- /dev/null
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.18.3.ebuild
@@ -0,0 +1,130 @@
+# 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=( python2_7 python3_4 pypy pypy2_0 )
+VALA_MIN_API_VERSION="0.22"
+VALA_USE_DEPEND="vapigen"
+
+inherit db-use flag-o-matic gnome2 python-any-r1 vala virtualx
+
+DESCRIPTION="Evolution groupware backend"
+HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
+
+# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
+LICENSE="|| ( LGPL-2 LGPL-3 ) BSD Sleepycat"
+SLOT="0/54" # subslot = libcamel-1.2 soname version
+IUSE="api-doc-extras +gnome-online-accounts +gtk +introspection ipv6 ldap kerberos vala +weather"
+REQUIRED_USE="vala? ( introspection )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris"
+
+# sys-libs/db is only required for migrating from <3.13 versions
+# gdata-0.15.1 is required for google tasks
+RDEPEND="
+	>=app-crypt/gcr-3.4
+	>=app-crypt/libsecret-0.5[crypt]
+	>=dev-db/sqlite-3.7.17:=
+	>=dev-libs/glib-2.40:2
+	>=dev-libs/libgdata-0.10:=
+	>=dev-libs/libical-0.43:=
+	>=net-libs/libsoup-2.42:2.4
+	>=dev-libs/libxml2-2
+	>=dev-libs/nspr-4.4:=
+	>=dev-libs/nss-3.9:=
+	>=sys-libs/db-4:=
+
+	dev-libs/icu:=
+	sys-libs/zlib:=
+	virtual/libiconv
+
+	gtk? (
+		>=app-crypt/gcr-3.4[gtk]
+		>=x11-libs/gtk+-3.10:3
+	)
+	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8 )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.12:= )
+	kerberos? ( virtual/krb5:= )
+	ldap? ( >=net-nds/openldap-2:= )
+	weather? ( >=dev-libs/libgweather-3.10:2= )
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	dev-util/gdbus-codegen
+	dev-util/gperf
+	>=dev-util/gtk-doc-am-1.14
+	>=dev-util/intltool-0.35.5
+	>=gnome-base/gnome-common-3.5.5
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+# eautoreconf needs:
+#	>=gnome-base/gnome-common-2
+
+# Some tests fail due to missings locales.
+# Also, dbus tests are flacky, bugs #397975 #501834
+# It looks like a nightmare to disable those for now.
+RESTRICT="test"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	use vala && vala_src_prepare
+
+	# Fix relink issues in src_install
+	ELTCONF="--reverse-deps"
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# /usr/include/db.h is always db-1 on FreeBSD
+	# so include the right dir in CPPFLAGS
+	append-cppflags "-I$(db_includedir)"
+
+	# phonenumber does not exist in tree
+	gnome2_src_configure \
+		$(use_enable api-doc-extras gtk-doc) \
+		$(use_with api-doc-extras private-docs) \
+		$(use_enable gnome-online-accounts goa) \
+		$(use_enable gtk) \
+		$(use_enable introspection) \
+		$(use_enable ipv6) \
+		$(use_with kerberos krb5 "${EPREFIX}"/usr) \
+		$(use_with kerberos krb5-libs "${EPREFIX}"/usr/$(get_libdir)) \
+		$(use_with ldap openldap) \
+		$(use_enable vala vala-bindings) \
+		$(use_enable weather) \
+		--enable-google \
+		--enable-largefile \
+		--enable-smime \
+		--with-libdb="${EPREFIX}"/usr \
+		--without-phonenumber \
+		--disable-examples \
+		--disable-uoa
+}
+
+src_install() {
+	gnome2_src_install
+
+	if use ldap; then
+		insinto /etc/openldap/schema
+		doins "${FILESDIR}"/calentry.schema
+		dosym /usr/share/${PN}/evolutionperson.schema /etc/openldap/schema/evolutionperson.schema
+	fi
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	unset ORBIT_SOCKETDIR
+	unset SESSION_MANAGER
+	unset DISPLAY
+	Xemake check
+}
diff --git a/gnome-extra/evolution-ews/Manifest b/gnome-extra/evolution-ews/Manifest
index d7caa4abdb8d..aebec290a19f 100644
--- a/gnome-extra/evolution-ews/Manifest
+++ b/gnome-extra/evolution-ews/Manifest
@@ -1,5 +1,4 @@
 DIST evolution-ews-3.12.11.tar.xz 663288 SHA256 adbf4efd25e9c2df823a20d14f45027bacbaf14d57ffb5978ae4d33184315e83 SHA512 4756a185c55118622cff175c3fa8d4a2ae3e82ff926542dfd88d299a7f82e23dc90f66de0ce7e97db8a79dbd2a07d635ab9bdc8fac8f0be3bf10d5efb77a067e WHIRLPOOL 5802f9df6bf3d79c23238672da643cc781c048b1a2b0d4ee20dc6348c998a656567ccca8299ad8aa00e537c82e11fb9e26770d78adb70cf7a6030e802521ac22
-DIST evolution-ews-3.16.3.tar.xz 683876 SHA256 529d3aa62a6d6d129871d005d95f27b433ad7aeb99f48f395347e18fb0586ad0 SHA512 462b2c77033b351ddcd72ef4b4f7d8d5e4f7782d1ff4d25760d31fb7c0c1ed303fdc47063932961810b103204a59eccd91d4c888554010cd64c46be5eaeb53d9 WHIRLPOOL 56ff69cc1341ab9a7b38cdc8091dc15c3bba72226105f9fd907d800cffbeefe83555732c3e70d7edd76bdf6f9132e9621fd00252bf4a794198c7608c347af1a4
-DIST evolution-ews-3.16.4.tar.xz 684676 SHA256 fabacc8a3acb5998fa0aa750927defe3cd8198e3a8300190cb613dd779803bd4 SHA512 62b03cd7f6ddd648d781dafe4a40b0d128edfe21d6a28e15e8c1e70069c694bf1b66dbf9ede0613ca8ca08b234bae2f83280152f80afcdacd01decffdf07808f WHIRLPOOL cbcb1723779563680e3006c5149c83189d8cde0558a42d716389641be9d52147bd71b0e1259f36a3467fa8d83123c78f8bb01cfd6393bd7e4c4953794c7df716
 DIST evolution-ews-3.16.5.tar.xz 684684 SHA256 d67e0cbf94800fb7035205bf8fd61ae1413ae7ba79265f8750fde1e7fb25eb58 SHA512 f046f3e0581cd21441b3737ff2fdd7cc3fa1333c3de8c3cf0be48f39239985cb68cbbd04089a84fa5f31ef84cc4100cf8a9ac0d1e6e261522f6e5305e505c0c7 WHIRLPOOL 960c84417c0b6a4374e5f063619c5495afc3b8eb0902b452021513c3a25fa1af148a71b3adbc19b915c857a4337f97de4eb0dac098db97a14e4ec362e36b0f28
 DIST evolution-ews-3.18.2.tar.xz 702672 SHA256 cc7c767f327dbaeb7961139d98ea17b1685c3584c728bb967140ae6c68458a9f SHA512 27d730a41c9e55ccc29b19060486253b50db190d41f634ad3ea4032e29b9f43867598e684947a1894dde6ab7731faed68e407ec69f10f1ae759a0537c1a88255 WHIRLPOOL 50fed90d8fd54b708ac83260d2d4ff25d2ab0782292fadedae1b9ff36ef19727b77775d5575e63129d5a70d94312d3277bd55952a653d0964d5a1d2fd081fc8a
+DIST evolution-ews-3.18.3.tar.xz 703116 SHA256 b42dd81dfa1db4cdccff5a14a8f233b2b85d26033b585bcad9122d7ccd2b3b13 SHA512 daa77c2b4f3bcc8c1f56d5e1904b7d4b826ef61298ecce9d6b69e389523071b4da54ee04d73af196d8fed0ccf93a26b8fd32e2f85e2d9f3392da7689b62d7291 WHIRLPOOL a2bb480aa6c56bf8735238653b5645eedd1bd56657027d08b35b2bd76820e8e7190c1b799c1b004656c5c783f015d9ff861519bd092d8957053b6125285a5da9
diff --git a/gnome-extra/evolution-ews/evolution-ews-3.16.3-r1.ebuild b/gnome-extra/evolution-ews/evolution-ews-3.16.3-r1.ebuild
deleted file mode 100644
index a1e8b9e6b4f3..000000000000
--- a/gnome-extra/evolution-ews/evolution-ews-3.16.3-r1.ebuild
+++ /dev/null
@@ -1,47 +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 autotools eutils gnome2
-
-DESCRIPTION="Evolution module for connecting to Microsoft Exchange Web Services"
-HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="
-	dev-db/sqlite:3=
-	>=dev-libs/glib-2.40:2
-	dev-libs/libical:0=
-	>=dev-libs/libxml2-2
-	>=gnome-extra/evolution-data-server-${PV}:0=
-	>=mail-client/evolution-${PV}:2.0
-	>=net-libs/libsoup-2.42:2.4
-	>=x11-libs/gtk+-3:3
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.9
-	>=dev-util/intltool-0.35.5
-	virtual/pkgconfig
-	test? ( net-libs/uhttpmock )
-"
-
-src_prepare() {
-	# Install locales in proper dir (from 'master')
-	epatch "${FILESDIR}"/${PN}-3.16.3-localedir.patch
-	eautoreconf
-}
-
-src_configure() {
-	# We don't have libmspack, needing internal lzx
-	gnome2_src_configure \
-		--with-internal-lzx \
-		$(use_enable test tests)
-}
diff --git a/gnome-extra/evolution-ews/evolution-ews-3.16.4.ebuild b/gnome-extra/evolution-ews/evolution-ews-3.18.3.ebuild
index f511fc91a43c..f511fc91a43c 100644
--- a/gnome-extra/evolution-ews/evolution-ews-3.16.4.ebuild
+++ b/gnome-extra/evolution-ews/evolution-ews-3.18.3.ebuild
diff --git a/gnome-extra/evolution-ews/files/evolution-ews-3.16.3-localedir.patch b/gnome-extra/evolution-ews/files/evolution-ews-3.16.3-localedir.patch
deleted file mode 100644
index e04d7baa32fd..000000000000
--- a/gnome-extra/evolution-ews/files/evolution-ews-3.16.3-localedir.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 6f6bdc4b755ff2089d645ce1b2d09114fa72a1f9 Mon Sep 17 00:00:00 2001
-From: Milan Crha <mcrha@redhat.com>
-Date: Thu, 11 Jun 2015 10:11:15 +0200
-Subject: configure.ac: Do not override localedir variable
-
-It could place locale files into $PREFIX/locale, instead of $PREFIX/share/locale.
-The change follows bug 703732.
-
-diff --git a/configure.ac b/configure.ac
-index 1d4d746..ede1ef2 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -199,9 +199,6 @@ GETTEXT_PACKAGE=evolution-ews
- AC_SUBST(GETTEXT_PACKAGE)
- AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Package name for gettext])
- 
--localedir='$(prefix)/$(DATADIRNAME)/locale'
--AC_SUBST(localedir)
--
- dnl ****************************
- dnl Initialize libtool
- dnl ****************************
--- 
-cgit v0.10.2
-
diff --git a/gnome-extra/nemo/metadata.xml b/gnome-extra/nemo/metadata.xml
index ea7543e7c187..721f1fd5cd9e 100644
--- a/gnome-extra/nemo/metadata.xml
+++ b/gnome-extra/nemo/metadata.xml
@@ -3,8 +3,6 @@
 <pkgmetadata>
 	<herd>gnome</herd>
 	<use>
-		<flag name="l10n">Pull in <pkg>gnome-extra/cinnamon-translations</pkg> for
-		localization support</flag>
 		<flag name="packagekit">Use packagekit to search for programs to open
 		unknown file types</flag>
 		<flag name="tracker">Add support for <pkg>app-misc/tracker</pkg> search</flag>
diff --git a/mail-client/claws-mail/Manifest b/mail-client/claws-mail/Manifest
index 8038f183ac61..072118c19b20 100644
--- a/mail-client/claws-mail/Manifest
+++ b/mail-client/claws-mail/Manifest
@@ -1,6 +1,4 @@
-DIST claws-mail-3.10.1.tar.xz 6669376 SHA256 4cb7c42995b1a5d7567a0909ce2080c05eec74a4d966da7a7a872f5eba018459 SHA512 b001683522a9a2bb9b1680f8ff608172a3fe9c4f556c8aa818b4259801bc92f722093850218377aba3a5fe549f0f09164c2e7623042bca0dbf3fd1071436dc80 WHIRLPOOL 0bcf92138081cd6fe0bef18a85acc9939fe61ab87faafc27a0ded24e321b4a35c0a1f6736aee6b0eef7d2d451c037cddcb280fece1a1c38c2e8f20c45ef685f7
-DIST claws-mail-3.11.1.tar.xz 6908772 SHA256 d72381b6c9f872638cae2c208925e19bd5d4a9476bb9049742f1ba27c3efd133 SHA512 ae4f0d4299647e201e94111a6eb26cce1d6a72045c317b879a07847cfcc75c35dfdf571f2826d365800586f5798131ce95985f746f7dbdd878f3766370ab3570 WHIRLPOOL 3ddf72a97990e087cd0c8a0417d6f57ee607e62bc5d644c6fb1892f349e9646a76664888a4540b6d22f5afe065e6e1e58d63188387cc829fda6fefe55ea4183d
 DIST claws-mail-3.12.0.tar.xz 6615768 SHA256 272ad6aaa066a4f5e0f26ed151b23b836a65190e6b45c049479b5e7677e4d6ca SHA512 f6eb3eb9f252f93aab21305118eca34abab3a75abb6619a7ab4a79338a640de6012eeb9ffb4a1317cc3c1abfc830b8399e82a93b430aa72c131e14f9f630b321 WHIRLPOOL 202da4117b2678a55b06f97b83e2d267719f1dcadcac5d09c1f0224409c53e2a19b6a8c0eea4d5762348c1c9f206a657496c4efb72aa9bc363e25662f21a63ab
 DIST claws-mail-3.13.0.tar.xz 6582288 SHA256 365076806c63dd8a1d6f08ead6a863a01ba05819c1a860ea7bbee8fcda4bf93a SHA512 5682a5e4642870a69374dc304d446db9dfd427bf8bd6f924a1193366098e07ca63623caefa454d62b413b8bb614fc7f1c0853852a1c44908c8541e554f3439e2 WHIRLPOOL 09a1bdcd5ba34a8cc359ec9659e54b3958c59f939b1eca36489b1db3163cb9cedb70c478896e769563781cd2044aaa90ece3c00d6dc90f1ea3533f884ec5999f
+DIST claws-mail-3.13.1.tar.xz 5581304 SHA256 ad3cc8227b5f6236445698d9b18b0876ebd887b6828e74439552c20ef2d92a11 SHA512 526458434ca865e05c1201c6125f59cdc6e000b854f7075fd59401ddf1d4ea2d9b17b562de4570469f383b35fce5081d1c69185373bdb588538a498231b00ee3 WHIRLPOOL e002b4b98acf390ec82e6a8b70554be37191761ae7711261100e69000907d9cf90bdc1ac6c6010d749e4f7c16cbb93c0cf95efb1edf28c8625f1b40069e8fd9d
 DIST claws-mail-3.9.0.tar.bz2 7425870 SHA256 ed70975a5056b3ffc4fe6e977f0d9606febc1499763c090241b029a73ff24e65 SHA512 5cb17106fee4549464eca03c8630fa4c46ee7b236c51eefbeb00f8a3602937cbe6073617f47a94732983ec3bc8838bc80e567f2e55cce1b30db453f350f590e8 WHIRLPOOL 4f2bef9d2240037eb6fd9b62b48c7173fddbd4fcb7258d4c5e0ee0e322894d741532c2ad716fbac96e465f87fe428fa6e926a04e7e8de1beaf68b8cb0a12c9a4
-DIST claws-mail-3.9.3.tar.bz2 9463943 SHA256 53aacceab45af6c3ee1f0668956a6e3328d21ac4efcfc0aa8dfd7d7552a62372 SHA512 b9e7a686650bfc496bf7e6b8ca196a890e3c5b2cbce486f7940245e42dc7a9fc53d81f688d88e298f310fd71e378ea4ea29a57c8510cccb6312d4ba1c79e3d42 WHIRLPOOL 58a7c431e214e82f6629e881eaf04b8f587f5aab1f5e990f9e20dff875821e1b0e8e7c0ab7ab47329f20a2e384dd203ea8b3afbe58175f3a48c963917311359e
diff --git a/mail-client/claws-mail/claws-mail-3.11.1-r1.ebuild b/mail-client/claws-mail/claws-mail-3.11.1-r1.ebuild
deleted file mode 100644
index 46fb1b2c47d5..000000000000
--- a/mail-client/claws-mail/claws-mail-3.11.1-r1.ebuild
+++ /dev/null
@@ -1,207 +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 )
-AUTOTOOLS_AUTORECONF=yes
-
-inherit autotools-utils multilib gnome2-utils eutils python-single-r1
-
-DESCRIPTION="An email client (and news reader) based on GTK+"
-HOMEPAGE="http://www.claws-mail.org/"
-
-SRC_URI="mirror://sourceforge/${PN}/Claws%20Mail/${PV}/${P}.tar.xz"
-
-SLOT="0"
-LICENSE="GPL-3"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-
-IUSE="archive bogofilter calendar clamav dbus debug doc gdata gtk3 +imap ipv6 ldap +libcanberra +libindicate +libnotify networkmanager nntp +notification pda pdf perl +pgp python rss session smime spamassassin spam-report spell +gnutls startup-notification valgrind webkit xface"
-REQUIRED_USE="networkmanager? ( dbus )
-	smime? ( pgp )
-	libcanberra? ( notification )
-	libindicate? ( notification )
-	libnotify? ( notification )"
-
-# Plugins are all integrated or dropped since 3.9.1
-PLUGINBLOCK="!!mail-client/claws-mail-acpi-notifier
-	!!mail-client/claws-mail-archive
-	!!mail-client/claws-mail-att-remover
-	!!mail-client/claws-mail-attachwarner
-	!!mail-client/claws-mail-clamd
-	!!mail-client/claws-mail-fancy
-	!!mail-client/claws-mail-fetchinfo
-	!mail-client/claws-mail-gdata
-	!!mail-client/claws-mail-geolocation
-	!!mail-client/claws-mail-gtkhtml
-	!!mail-client/claws-mail-mailmbox
-	!!mail-client/claws-mail-newmail
-	!!mail-client/claws-mail-notification
-	!!mail-client/claws-mail-perl
-	!!mail-client/claws-mail-python
-	!!mail-client/claws-mail-rssyl
-	!!mail-client/claws-mail-spam-report
-	!!mail-client/claws-mail-tnef-parse
-	!!mail-client/claws-mail-vcalendar
-	!!mail-client/claws-mail-address_keeper
-	!!mail-client/claws-mail-pdf-viewer"
-
-COMMONDEPEND=">=sys-devel/gettext-0.12.1
-	gdata? ( >=dev-libs/libgdata-0.6.4 )
-	gtk3? ( x11-libs/gtk+:3 )
-	!gtk3? ( >=x11-libs/gtk+-2.20:2 )
-	pda? ( >=app-pda/jpilot-0.99 )
-	gnutls? ( >=net-libs/gnutls-2.2.0 )
-	ldap? ( >=net-nds/openldap-2.0.7 )
-	pgp? ( >=app-crypt/gpgme-0.4.5 )
-	valgrind? ( dev-util/valgrind )
-	dbus? ( >=dev-libs/dbus-glib-0.60 )
-	spell? ( >=app-text/enchant-1.0.0 )
-	imap? ( >=net-libs/libetpan-0.57 )
-	nntp? ( >=net-libs/libetpan-0.57 )
-	startup-notification? ( x11-libs/startup-notification )
-	session? ( x11-libs/libSM
-			x11-libs/libICE )
-	archive? ( app-arch/libarchive
-		>=net-misc/curl-7.9.7 )
-	bogofilter? ( mail-filter/bogofilter )
-	notification? (
-		libnotify? ( x11-libs/libnotify )
-		libcanberra? (  media-libs/libcanberra[gtk] )
-		libindicate? ( dev-libs/libindicate:3[gtk] )
-		dev-libs/glib:2
-	)
-	smime? ( >=app-crypt/gpgme-0.4.5 )
-	calendar? ( >=net-misc/curl-7.9.7 )
-	pdf? ( app-text/poppler[cairo] )
-	spam-report? ( >=net-misc/curl-7.9.7 )
-	webkit? ( >=net-libs/webkit-gtk-1.0:2
-		>=net-libs/libsoup-gnome-2.26:2.4 )
-"
-
-DEPEND="${PLUGINBLOCK}
-	${COMMONDEPEND}
-	app-arch/xz-utils
-	xface? ( >=media-libs/compface-1.4 )
-	virtual/pkgconfig"
-
-RDEPEND="${COMMONDEPEND}
-	pdf? ( app-text/ghostscript-gpl )
-	clamav? ( app-antivirus/clamav )
-	networkmanager? ( net-misc/networkmanager )
-	perl? ( dev-lang/perl:= )
-	python? ( ${PYTHON_DEPS}
-		>=dev-python/pygtk-2.10.3 )
-	rss? ( net-misc/curl
-		dev-libs/libxml2 )
-	app-misc/mime-types
-	x11-misc/shared-mime-info"
-
-PATCHES=( "${FILESDIR}/${P}_RSSyl-encodings-fix.patch" )
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable debug crash-dialog)
-		$(use_enable valgrind valgrind)
-		$(use_enable doc manual)
-		$(use_enable gtk3)
-		$(use_enable ipv6)
-		$(use_enable ldap)
-		$(use_enable dbus dbus)
-		$(use_enable networkmanager)
-		$(use_enable pda jpilot)
-		$(use_enable session libsm)
-		$(use_enable spell enchant)
-		$(use_enable gnutls)
-		$(use_enable startup-notification)
-		$(use_enable xface compface)
-		$(use_enable archive archive-plugin)
-		$(use_enable bogofilter bogofilter-plugin)
-		$(use_enable calendar vcalendar-plugin)
-		$(use_enable clamav clamd-plugin)
-		$(use_enable gdata gdata-plugin)
-		$(use_enable notification notification-plugin)
-		$(use_enable pdf pdf_viewer-plugin)
-		$(use_enable perl perl-plugin)
-		$(use_enable pgp pgpmime-plugin)
-		$(use_enable pgp pgpinline-plugin)
-		$(use_enable pgp pgpcore-plugin)
-		$(use_enable python python-plugin)
-		$(use_enable rss rssyl-plugin)
-		$(use_enable spamassassin spamassassin-plugin)
-		$(use_enable smime smime-plugin)
-		$(use_enable spam-report spam_report-plugin)
-		$(use_enable webkit fancy-plugin)
-		--enable-new-addrbook
-		--enable-nls
-		--enable-acpi_notifier-plugin
-		--enable-address_keeper-plugin
-		--enable-att_remover-plugin
-		--enable-attachwarner-plugin
-		--enable-fetchinfo-plugin
-		--enable-mailmbox-plugin
-		--enable-newmail-plugin
-		--enable-tnef_parse-plugin
-		--disable-generic-umpc
-		--disable-bsfilter-plugin
-		--disable-geolocation-plugin
-	)
-
-	# libetpan is needed if user wants nntp or imap functionality
-	if use imap || use nntp; then
-		myeconfargs+=( --enable-libetpan )
-	else
-		myeconfargs+=( --disable-libetpan )
-	fi
-
-	autotools-utils_src_configure
-}
-
-src_install() {
-	local DOCS=( AUTHORS ChangeLog* INSTALL* NEWS README* TODO* )
-	autotools-utils_src_install
-
-	# Makefile install claws-mail.png in /usr/share/icons/hicolor/48x48/apps
-	# => also install it in /usr/share/pixmaps for other desktop envs
-	# => also install higher resolution icons in /usr/share/icons/hicolor/...
-	insinto /usr/share/pixmaps
-	doins ${PN}.png || die
-	local res resdir
-	for res in 64x64 128x128 ; do
-		resdir="/usr/share/icons/hicolor/${res}/apps"
-		insinto ${resdir}
-		newins ${PN}-${res}.png ${PN}.png || die
-	done
-
-	docinto tools
-	dodoc tools/README*
-
-	domenu ${PN}.desktop
-
-	einfo "Installing extra tools"
-	cd "${S}"/tools
-	exeinto /usr/$(get_libdir)/${PN}/tools
-	doexe *.pl *.py *.conf *.sh || die
-	doexe tb2claws-mail update-po uudec uuooffice || die
-
-	# kill useless files
-	rm -f "${D}"/usr/lib*/claws-mail/plugins/*.{a,la}
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	ewarn "When upgrading from version 3.9.0 or below some changes have happened:"
-	ewarn "- There are no individual plugins in mail-client/claws-mail-* anymore, but they are integrated mostly controlled through USE flags"
-	ewarn "- Plugins with no special dependencies are just built and can be loaded through the interface"
-	ewarn "- The gtkhtml2, dillo and trayicon plugins have been dropped entirely"
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/mail-client/claws-mail/claws-mail-3.10.1.ebuild b/mail-client/claws-mail/claws-mail-3.13.1.ebuild
index 40257c5b551d..e043cd7f3d9c 100644
--- a/mail-client/claws-mail/claws-mail-3.10.1.ebuild
+++ b/mail-client/claws-mail/claws-mail-3.13.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="5"
+EAPI=5
 
 PYTHON_COMPAT=( python2_7 )
 AUTOTOOLS_AUTORECONF=yes
@@ -12,18 +12,18 @@ inherit autotools-utils multilib gnome2-utils eutils python-single-r1
 DESCRIPTION="An email client (and news reader) based on GTK+"
 HOMEPAGE="http://www.claws-mail.org/"
 
-SRC_URI="mirror://sourceforge/${PN}/Claws%20Mail/${PV}/${P}.tar.xz"
+SRC_URI="http://www.claws-mail.org/download.php?file=releases/${P}.tar.xz"
 
 SLOT="0"
 LICENSE="GPL-3"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 
-IUSE="archive bogofilter calendar clamav dbus debug doc gdata gtk3 +imap ipv6 ldap +libcanberra +libindicate +libnotify networkmanager nntp +notification pda pdf perl +pgp python rss session smime spamassassin spam-report spell +gnutls startup-notification valgrind webkit xface"
-REQUIRED_USE="networkmanager? ( dbus )
-	smime? ( pgp )
-	libcanberra? ( notification )
+IUSE="archive bogofilter calendar clamav dbus debug doc gdata gtk3 +imap ipv6 ldap +libcanberra +libindicate +libnotify networkmanager nntp +notification pda pdf perl +pgp python rss session sieve smime spamassassin spam-report spell +gnutls startup-notification valgrind webkit xface"
+REQUIRED_USE="libcanberra? ( notification )
 	libindicate? ( notification )
-	libnotify? ( notification )"
+	libnotify? ( notification )
+	networkmanager? ( dbus )
+	smime? ( pgp )"
 
 # Plugins are all integrated or dropped since 3.9.1
 PLUGINBLOCK="!!mail-client/claws-mail-acpi-notifier
@@ -49,7 +49,7 @@ PLUGINBLOCK="!!mail-client/claws-mail-acpi-notifier
 	!!mail-client/claws-mail-pdf-viewer"
 
 COMMONDEPEND=">=sys-devel/gettext-0.12.1
-	gdata? ( >=dev-libs/libgdata-0.6.4 )
+	gdata? ( >=dev-libs/libgdata-0.17.1 )
 	gtk3? ( x11-libs/gtk+:3 )
 	!gtk3? ( >=x11-libs/gtk+-2.20:2 )
 	pda? ( >=app-pda/jpilot-0.99 )
@@ -71,7 +71,7 @@ COMMONDEPEND=">=sys-devel/gettext-0.12.1
 		libnotify? ( x11-libs/libnotify )
 		libcanberra? (  media-libs/libcanberra[gtk] )
 		libindicate? ( dev-libs/libindicate:3[gtk] )
-		dev-libs/glib
+		dev-libs/glib:2
 	)
 	smime? ( >=app-crypt/gpgme-0.4.5 )
 	calendar? ( >=net-misc/curl-7.9.7 )
@@ -91,7 +91,7 @@ RDEPEND="${COMMONDEPEND}
 	pdf? ( app-text/ghostscript-gpl )
 	clamav? ( app-antivirus/clamav )
 	networkmanager? ( net-misc/networkmanager )
-	perl? ( dev-lang/perl )
+	perl? ( dev-lang/perl:= )
 	python? ( ${PYTHON_DEPS}
 		>=dev-python/pygtk-2.10.3 )
 	rss? ( net-misc/curl
@@ -129,10 +129,11 @@ src_configure() {
 		$(use_enable python python-plugin)
 		$(use_enable rss rssyl-plugin)
 		$(use_enable spamassassin spamassassin-plugin)
+		$(use_enable sieve managesieve-plugin)
 		$(use_enable smime smime-plugin)
 		$(use_enable spam-report spam_report-plugin)
 		$(use_enable webkit fancy-plugin)
-		--enable-new-addrbook
+		--enable-alternate-addressbook
 		--enable-nls
 		--enable-acpi_notifier-plugin
 		--enable-address_keeper-plugin
@@ -144,7 +145,6 @@ src_configure() {
 		--enable-tnef_parse-plugin
 		--disable-generic-umpc
 		--disable-bsfilter-plugin
-		--disable-geolocation-plugin
 	)
 
 	# libetpan is needed if user wants nntp or imap functionality
@@ -165,12 +165,12 @@ src_install() {
 	# => also install it in /usr/share/pixmaps for other desktop envs
 	# => also install higher resolution icons in /usr/share/icons/hicolor/...
 	insinto /usr/share/pixmaps
-	doins ${PN}.png || die
+	doins ${PN}.png
 	local res resdir
 	for res in 64x64 128x128 ; do
 		resdir="/usr/share/icons/hicolor/${res}/apps"
 		insinto ${resdir}
-		newins ${PN}-${res}.png ${PN}.png || die
+		newins ${PN}-${res}.png ${PN}.png
 	done
 
 	docinto tools
@@ -181,8 +181,8 @@ src_install() {
 	einfo "Installing extra tools"
 	cd "${S}"/tools
 	exeinto /usr/$(get_libdir)/${PN}/tools
-	doexe *.pl *.py *.conf *.sh || die
-	doexe tb2claws-mail update-po uudec uuooffice || die
+	doexe *.pl *.py *.conf *.sh
+	doexe tb2claws-mail update-po uudec uuooffice
 
 	# kill useless files
 	rm -f "${D}"/usr/lib*/claws-mail/plugins/*.{a,la}
diff --git a/mail-client/claws-mail/claws-mail-3.9.3.ebuild b/mail-client/claws-mail/claws-mail-3.9.3.ebuild
deleted file mode 100644
index 6f53b6811a54..000000000000
--- a/mail-client/claws-mail/claws-mail-3.9.3.ebuild
+++ /dev/null
@@ -1,204 +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 )
-AUTOTOOLS_AUTORECONF=yes
-
-inherit autotools-utils multilib gnome2-utils eutils python-single-r1
-
-DESCRIPTION="An email client (and news reader) based on GTK+"
-HOMEPAGE="http://www.claws-mail.org/"
-
-SRC_URI="mirror://sourceforge/sylpheed-claws/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-3"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-
-IUSE="archive bogofilter calendar clamav dbus debug doc gdata gtk3 +imap ipv6 ldap +libcanberra +libindicate +libnotify networkmanager nntp +notification pda pdf perl +pgp python rss session smime spamassassin spam-report spell +gnutls startup-notification valgrind webkit xface"
-REQUIRED_USE="networkmanager? ( dbus )
-	smime? ( pgp )
-	libcanberra? ( notification )
-	libindicate? ( notification )
-	libnotify? ( notification )"
-
-# Plugins are all integrated or dropped since 3.9.1
-PLUGINBLOCK="!!mail-client/claws-mail-acpi-notifier
-	!!mail-client/claws-mail-archive
-	!!mail-client/claws-mail-att-remover
-	!!mail-client/claws-mail-attachwarner
-	!!mail-client/claws-mail-clamd
-	!!mail-client/claws-mail-fancy
-	!!mail-client/claws-mail-fetchinfo
-	!mail-client/claws-mail-gdata
-	!!mail-client/claws-mail-geolocation
-	!!mail-client/claws-mail-gtkhtml
-	!!mail-client/claws-mail-mailmbox
-	!!mail-client/claws-mail-newmail
-	!!mail-client/claws-mail-notification
-	!!mail-client/claws-mail-perl
-	!!mail-client/claws-mail-python
-	!!mail-client/claws-mail-rssyl
-	!!mail-client/claws-mail-spam-report
-	!!mail-client/claws-mail-tnef-parse
-	!!mail-client/claws-mail-vcalendar
-	!!mail-client/claws-mail-address_keeper
-	!!mail-client/claws-mail-pdf-viewer"
-
-COMMONDEPEND=">=sys-devel/gettext-0.12.1
-	gdata? ( >=dev-libs/libgdata-0.6.4 )
-	gtk3? ( x11-libs/gtk+:3 )
-	!gtk3? ( >=x11-libs/gtk+-2.20:2 )
-	pda? ( >=app-pda/jpilot-0.99 )
-	gnutls? ( >=net-libs/gnutls-2.2.0 )
-	ldap? ( >=net-nds/openldap-2.0.7 )
-	pgp? ( >=app-crypt/gpgme-0.4.5 )
-	valgrind? ( dev-util/valgrind )
-	dbus? ( >=dev-libs/dbus-glib-0.60 )
-	spell? ( >=app-text/enchant-1.0.0 )
-	imap? ( >=net-libs/libetpan-0.57 )
-	nntp? ( >=net-libs/libetpan-0.57 )
-	startup-notification? ( x11-libs/startup-notification )
-	session? ( x11-libs/libSM
-			x11-libs/libICE )
-	archive? ( app-arch/libarchive
-		>=net-misc/curl-7.9.7 )
-	bogofilter? ( mail-filter/bogofilter )
-	notification? (
-		libnotify? ( x11-libs/libnotify )
-		libcanberra? (  media-libs/libcanberra[gtk] )
-		libindicate? ( dev-libs/libindicate:3[gtk] )
-		dev-libs/glib
-	)
-	smime? ( >=app-crypt/gpgme-0.4.5 )
-	calendar? ( >=net-misc/curl-7.9.7 )
-	pdf? ( app-text/poppler[cairo] )
-	spam-report? ( >=net-misc/curl-7.9.7 )
-	webkit? ( >=net-libs/webkit-gtk-1.0:2
-		>=net-libs/libsoup-gnome-2.26:2.4 )
-"
-
-DEPEND="${PLUGINBLOCK}
-	${COMMONDEPEND}
-	xface? ( >=media-libs/compface-1.4 )
-	virtual/pkgconfig"
-
-RDEPEND="${COMMONDEPEND}
-	pdf? ( app-text/ghostscript-gpl )
-	clamav? ( app-antivirus/clamav )
-	networkmanager? ( net-misc/networkmanager )
-	perl? ( dev-lang/perl )
-	python? ( ${PYTHON_DEPS}
-		>=dev-python/pygtk-2.10.3 )
-	rss? ( net-misc/curl
-		dev-libs/libxml2 )
-	app-misc/mime-types
-	x11-misc/shared-mime-info"
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable debug crash-dialog)
-		$(use_enable valgrind valgrind)
-		$(use_enable doc manual)
-		$(use_enable gtk3)
-		$(use_enable ipv6)
-		$(use_enable ldap)
-		$(use_enable dbus dbus)
-		$(use_enable networkmanager)
-		$(use_enable pda jpilot)
-		$(use_enable session libsm)
-		$(use_enable spell enchant)
-		$(use_enable gnutls)
-		$(use_enable startup-notification)
-		$(use_enable xface compface)
-		$(use_enable archive archive-plugin)
-		$(use_enable bogofilter bogofilter-plugin)
-		$(use_enable calendar vcalendar-plugin)
-		$(use_enable clamav clamd-plugin)
-		$(use_enable gdata gdata-plugin)
-		$(use_enable notification notification-plugin)
-		$(use_enable pdf pdf_viewer-plugin)
-		$(use_enable perl perl-plugin)
-		$(use_enable pgp pgpmime-plugin)
-		$(use_enable pgp pgpinline-plugin)
-		$(use_enable pgp pgpcore-plugin)
-		$(use_enable python python-plugin)
-		$(use_enable rss rssyl-plugin)
-		$(use_enable spamassassin spamassassin-plugin)
-		$(use_enable smime smime-plugin)
-		$(use_enable spam-report spam_report-plugin)
-		$(use_enable webkit fancy-plugin)
-		--enable-new-addrbook
-		--enable-nls
-		--enable-acpi_notifier-plugin
-		--enable-address_keeper-plugin
-		--enable-att_remover-plugin
-		--enable-attachwarner-plugin
-		--enable-fetchinfo-plugin
-		--enable-mailmbox-plugin
-		--enable-newmail-plugin
-		--enable-tnef_parse-plugin
-		--disable-generic-umpc
-		--disable-bsfilter-plugin
-		--disable-geolocation-plugin
-	)
-
-	# libetpan is needed if user wants nntp or imap functionality
-	if use imap || use nntp; then
-		myeconfargs+=( --enable-libetpan )
-	else
-		myeconfargs+=( --disable-libetpan )
-	fi
-
-	autotools-utils_src_configure
-}
-
-src_install() {
-	local DOCS=( AUTHORS ChangeLog* INSTALL* NEWS README* TODO* )
-	autotools-utils_src_install
-
-	# Makefile install claws-mail.png in /usr/share/icons/hicolor/48x48/apps
-	# => also install it in /usr/share/pixmaps for other desktop envs
-	# => also install higher resolution icons in /usr/share/icons/hicolor/...
-	insinto /usr/share/pixmaps
-	doins ${PN}.png || die
-	local res resdir
-	for res in 64x64 128x128 ; do
-		resdir="/usr/share/icons/hicolor/${res}/apps"
-		insinto ${resdir}
-		newins ${PN}-${res}.png ${PN}.png || die
-	done
-
-	docinto tools
-	dodoc tools/README*
-
-	domenu ${PN}.desktop
-
-	einfo "Installing extra tools"
-	cd "${S}"/tools
-	exeinto /usr/$(get_libdir)/${PN}/tools
-	doexe *.pl *.py *.conf *.sh || die
-	doexe tb2claws-mail update-po uudec uuooffice || die
-
-	# kill useless files
-	rm -f "${D}"/usr/lib*/claws-mail/plugins/*.{a,la}
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	ewarn "When upgrading from version 3.9.0 or below some changes have happened:"
-	ewarn "- There are no individual plugins in mail-client/claws-mail-* anymore, but they are integrated mostly controlled through USE flags"
-	ewarn "- Plugins with no special dependencies are just built and can be loaded through the interface"
-	ewarn "- The gtkhtml2, dillo and trayicon plugins have been dropped entirely"
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/mail-client/claws-mail/files/claws-3.9.0_fix-search-field_part1.patch b/mail-client/claws-mail/files/claws-3.9.0_fix-search-field_part1.patch
deleted file mode 100644
index 0bdadd68da22..000000000000
--- a/mail-client/claws-mail/files/claws-3.9.0_fix-search-field_part1.patch
+++ /dev/null
@@ -1,149 +0,0 @@
-Make combo search field work again.
-
-Gentoo bug: https://bugs.gentoo.org/show_bug.cgi?id=455590
-Upstream commit: http://www.claws-mail.org/tracker/getpatchset.php?ver=3.9.0cvs8
---- src/advsearch.c	24 Oct 2012 07:48:24 -0000	1.1.2.7
-+++ src/advsearch.c	16 Nov 2012 13:10:05 -0000	1.1.2.8
-@@ -314,32 +314,6 @@
- 	return returnstr;
- }
- 
--// --------------------------
--
--static gchar *expand_tag_search_string(const gchar *search_string)
--{
--	gchar *newstr = NULL;
--	gchar **words = search_string ? g_strsplit(search_string, " ", -1):NULL;
--	gint i = 0;
--	while (words && words[i] && *words[i]) {
--		g_strstrip(words[i]);
--		if (!newstr) {
--			newstr = g_strdup_printf("tag matchcase \"%s\"", words[i]);
--		} else {
--			gint o_len = strlen(newstr);
--			gint s_len = 17; /* strlen("|tag matchcase \"\"") */
--			gint n_len = s_len + strlen(words[i]);
--			newstr = g_realloc(newstr, o_len + n_len + 1);
--			strcpy(newstr + o_len, "|tag matchcase \"");
--			strcpy(newstr + o_len + (s_len - 1), words[i]);
--			strcpy(newstr + o_len + (n_len - 1), "\"");
--		}
--		i++;
--	}
--	g_strfreev(words);
--	return newstr;
--}
--
- static void prepare_matcher_extended(AdvancedSearch *search)
- {
- 	gchar *newstr = advsearch_expand_search_string(search->request.matchstring);
-@@ -350,19 +324,51 @@
- 	}
- }
- 
-+#define debug_matcher_list(prefix, list)					\
-+do {										\
-+	gchar *str = list ? matcherlist_to_string(list) : g_strdup("(NULL)");	\
-+										\
-+	debug_print("%s: %s\n", prefix, str);					\
-+										\
-+	g_free(str);								\
-+} while(0)
-+
- static void prepare_matcher_tag(AdvancedSearch *search)
- {
--	char *newstr = expand_tag_search_string(search->request.matchstring);
--	search->predicate = matcher_parser_get_cond(newstr, &search->is_fast);
--	g_free(newstr);
-+	gchar **words = search->request.matchstring 
-+			? g_strsplit(search->request.matchstring, " ", -1)
-+			: NULL;
-+	gint i = 0;
-+
-+	if (search->predicate == NULL) {
-+		search->predicate = g_new0(MatcherList, 1);
-+		search->predicate->bool_and = FALSE;
-+		search->is_fast = TRUE;
-+	}
-+
-+	while (words && words[i] && *words[i]) {
-+		MatcherProp *matcher;
-+
-+		g_strstrip(words[i]);
-+
-+		matcher = matcherprop_new(MATCHCRITERIA_TAG, NULL,
-+					  MATCHTYPE_MATCHCASE, words[i], 0);
-+
-+		search->predicate->matchers = g_slist_prepend(search->predicate->matchers, matcher);
-+
-+		i++;
-+	}
-+	g_strfreev(words);
- }
- 
- static void prepare_matcher_header(AdvancedSearch *search, gint match_header)
- {
- 	MatcherProp *matcher;
- 
--	if (search->predicate == NULL)
-+	if (search->predicate == NULL) {
- 		search->predicate = g_new0(MatcherList, 1);
-+		search->predicate->bool_and = FALSE;
-+	}
- 
- 	matcher = matcherprop_new(match_header, NULL, MATCHTYPE_MATCHCASE,
- 			search->request.matchstring, 0);
-@@ -373,10 +379,18 @@
- static void prepare_matcher_mixed(AdvancedSearch *search)
- {
- 	prepare_matcher_tag(search);
-+	debug_matcher_list("tag matcher list", search->predicate);
-+
-+	/* we want an OR search */
-+	if (search->predicate)
-+		search->predicate->bool_and = FALSE;
- 
- 	prepare_matcher_header(search, MATCHCRITERIA_SUBJECT);
-+	debug_matcher_list("tag + subject matcher list", search->predicate);
- 	prepare_matcher_header(search, MATCHCRITERIA_FROM);
-+	debug_matcher_list("tag + subject + from matcher list", search->predicate);
- 	prepare_matcher_header(search, MATCHCRITERIA_TO);
-+	debug_matcher_list("tag + subject + from + to matcher list", search->predicate);
- }
- 
- static void prepare_matcher(AdvancedSearch *search)
-@@ -398,26 +412,32 @@
- 	switch (search->request.type) {
- 		case ADVANCED_SEARCH_SUBJECT:
- 			prepare_matcher_header(search, MATCHCRITERIA_SUBJECT);
-+			debug_matcher_list("subject search", search->predicate);
- 			break;
- 
- 		case ADVANCED_SEARCH_FROM:
- 			prepare_matcher_header(search, MATCHCRITERIA_FROM);
-+			debug_matcher_list("from search", search->predicate);
- 			break;
- 
- 		case ADVANCED_SEARCH_TO:
- 			prepare_matcher_header(search, MATCHCRITERIA_TO);
-+			debug_matcher_list("to search", search->predicate);
- 			break;
- 
- 		case ADVANCED_SEARCH_TAG:
--			prepare_matcher_header(search, MATCHCRITERIA_TAG);
-+			prepare_matcher_tag(search);
-+			debug_matcher_list("tag search", search->predicate);
- 			break;
- 
- 		case ADVANCED_SEARCH_MIXED:
- 			prepare_matcher_mixed(search);
-+			debug_matcher_list("mixed search", search->predicate);
- 			break;
- 
- 		case ADVANCED_SEARCH_EXTENDED:
- 			prepare_matcher_extended(search);
-+			debug_matcher_list("extended search", search->predicate);
- 			break;
- 
- 		default:
-
diff --git a/mail-client/claws-mail/files/claws-3.9.0_fix-search-field_part2.patch b/mail-client/claws-mail/files/claws-3.9.0_fix-search-field_part2.patch
deleted file mode 100644
index bb8a78aac832..000000000000
--- a/mail-client/claws-mail/files/claws-3.9.0_fix-search-field_part2.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Make combo search field work again.
-
-Gentoo bug: https://bugs.gentoo.org/show_bug.cgi?id=455590
-Upstream commit: http://www.claws-mail.org/tracker/getpatchset.php?ver=3.9.0cvs9
-
---- src/advsearch.c	16 Nov 2012 13:10:05 -0000	1.1.2.8
-+++ src/advsearch.c	16 Nov 2012 13:11:55 -0000	1.1.2.9
-@@ -368,6 +368,7 @@
- 	if (search->predicate == NULL) {
- 		search->predicate = g_new0(MatcherList, 1);
- 		search->predicate->bool_and = FALSE;
-+		search->is_fast = TRUE;
- 	}
- 
- 	matcher = matcherprop_new(match_header, NULL, MATCHTYPE_MATCHCASE,
-
diff --git a/mail-client/claws-mail/files/claws-mail-3.11.1_RSSyl-encodings-fix.patch b/mail-client/claws-mail/files/claws-mail-3.11.1_RSSyl-encodings-fix.patch
deleted file mode 100644
index 82e13b25390f..000000000000
--- a/mail-client/claws-mail/files/claws-mail-3.11.1_RSSyl-encodings-fix.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Andrej Kacian <ticho@claws-mail.org>
-Date: Thu, 1 Jan 2015 22:36:36 +0000 (+0100)
-Subject: RSSyl: Fix handling of feeds with encodings unknown to expat. Turns out the only... 
-X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=d05156031070efe6104695acad93aa879bc0f084
-
-RSSyl: Fix handling of feeds with encodings unknown to expat. Turns out the only thing missing was that HAVE_ICONV macro (from config.h) was not defined in parser.c, so our "unknown encoding" expat handler function did nothing. Fixes bug #3339.
----
-
-diff --git a/src/plugins/rssyl/libfeed/parser.c b/src/plugins/rssyl/libfeed/parser.c
-index bb0bb0d..14f4a36 100644
---- a/src/plugins/rssyl/libfeed/parser.c
-+++ b/src/plugins/rssyl/libfeed/parser.c
-@@ -17,6 +17,10 @@
-  * Boston, MA 02111-1307, USA.
-  */
- 
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
- #include <glib.h>
- #include <curl/curl.h>
- #include <expat.h>
diff --git a/mail-client/claws-mail/files/claws-mail-3.9.1_fix-nntp-segfault.patch b/mail-client/claws-mail/files/claws-mail-3.9.1_fix-nntp-segfault.patch
deleted file mode 100644
index 0abc3725a70b..000000000000
--- a/mail-client/claws-mail/files/claws-mail-3.9.1_fix-nntp-segfault.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-claws-mail 3.9.1 reproducible segfaults on exit when compiled with NNTP support.
-
-Apparently the pointer returned by account_get_list() is truncated to an integer due to a missing function definition:
-
-(gdb) r
-Starting program: /usr/local/bin/claws-mail 
-[New LWP 101084]
-[New Thread 80ac06400 (LWP 101084)]
-
-Program received signal SIGSEGV, Segmentation fault.
-[Switching to Thread 80ac06400 (LWP 101084)]
-0x00000000005331f9 in nntp_disconnect_all (have_connectivity=1) at news.c:1418
-1418		for (list = account_get_list(); list != NULL; list = list->next) {
-(gdb) where
-#0  0x00000000005331f9 in nntp_disconnect_all (have_connectivity=1) at news.c:1418
-#1  0x0000000000669cf3 in nntp_main_done (have_connectivity=1) at nntp-thread.c:163
-#2  0x00000000004e59aa in exit_claws (mainwin=0x80acf23c0) at main.c:1811
-#3  0x00000000004e2627 in main (argc=1, argv=0x7fffffffd8b0) at main.c:1739
-(gdb) p list
-$1 = (GList *) 0xb836a00
-
-
-Gentoo bug: https://bugs.gentoo.org/show_bug.cgi?id=469838
-Upstream bug: http://www.thewildbeast.co.uk/claws-mail/bugzilla/show_bug.cgi?id=2924
-Upstream fix: http://git.claws-mail.org/?p=claws.git;a=patch;h=8891f6e23e51b38c54c7b717fa0922cb101b76a2
-
---- a/src/news.c
-+++ b/src/news.c
-@@ -56,6 +56,7 @@
- #include "remotefolder.h"
- #include "alertpanel.h"
- #include "inc.h"
-+#include "account.h"
- #ifdef USE_GNUTLS
- #  include "ssl.h"
- #endif
diff --git a/mail-client/claws-mail/files/claws-mail-3.9.1_libsoup-check-fix.patch b/mail-client/claws-mail/files/claws-mail-3.9.1_libsoup-check-fix.patch
deleted file mode 100644
index 3b5c452b7652..000000000000
--- a/mail-client/claws-mail/files/claws-mail-3.9.1_libsoup-check-fix.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-
-libsoup is not obligatory, but nonetheless a mandatory check existed.
-Fixed in releases >3.9.1
-
-Gentoo bug: https://bugs.gentoo.org/show_bug.cgi?id=469014
-Upstream commit: http://git.claws-mail.org/?p=claws.git;a=commitdiff;h=d04c724c9e74f7c5d1f247e41a21e472790d9992
-
-
---- configure.ac.orig
-+++ configure.ac
-@@ -1107,14 +1107,17 @@
- AC_SUBST(WEBKIT_CFLAGS)
- 
- dnl libsoup ********************************************************************
--PKG_CHECK_MODULES(LIBSOUP, libsoup-2.4)
-+PKG_CHECK_MODULES(LIBSOUP, libsoup-2.4, HAVE_LIBSOUP=yes, HAVE_LIBSOUP=no)
-+if test x"$HAVE_LIBSOUP" = xyes; then
-+	AC_DEFINE(HAVE_LIBSOUP, 1, [Define if libsoup is available])
-+fi
- AC_SUBST(LIBSOUP_CFLAGS)
- AC_SUBST(LIBSOUP_LIBS)
- 
- dnl libsoup-gnome **************************************************************
- PKG_CHECK_MODULES(LIBSOUP_GNOME, libsoup-gnome-2.4 >= 2.26, HAVE_LIBSOUP_GNOME=yes, HAVE_LIBSOUP_GNOME=no)
- if test x"$HAVE_LIBSOUP_GNOME" = xyes; then
--	AC_DEFINE(HAVE_LIBSOUP_GNOME, 1, [Define if libsoup is available])
-+	AC_DEFINE(HAVE_LIBSOUP_GNOME, 1, [Define if libsoup_gnome is available])
- fi
- AC_SUBST(LIBSOUP_GNOME_CFLAGS)
- AC_SUBST(LIBSOUP_GNOME_LIBS)
diff --git a/mail-client/claws-mail/metadata.xml b/mail-client/claws-mail/metadata.xml
index 798d327418ff..a129ca79ec50 100644
--- a/mail-client/claws-mail/metadata.xml
+++ b/mail-client/claws-mail/metadata.xml
@@ -3,8 +3,8 @@
 <pkgmetadata>
 	<herd>net-mail</herd>
 	<maintainer>
-		<email>fauli@gentoo.org</email>
-		<name>Christian Faulhammer</name>
+		<email>polynomial-c@gentoo.org</email>
+		<name>Lars Wendler</name>
 	</maintainer>
 	<use>
 		<flag name="archive">Enable archiving plugin</flag>
diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
index 07d2397b2f04..56485fd58584 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -1,3 +1,4 @@
 DIST evolution-3.12.11.tar.xz 11360812 SHA256 f9ec78ae7b9aadb7efc76777c4c93a98f7c61be2a4cfaaf351dd051604e981f5 SHA512 aef832fbfd6d7449f234e9cb0fdfabc2b75373220e37f5bc58379a2e91a3eacc39e6f8f37078c46adc11d5aa8f2d466974b8dcdcf88a68e68e7ad4a5f659a49c WHIRLPOOL 34a83a6a9be6c2e65fad3732fd86a523282fb8a1cb876da33595cec92c6c16fb8144ad6188381be9c58a301cc4e52fce04e577fd663ebfe31b0f96678126edbc
 DIST evolution-3.16.5.tar.xz 11962476 SHA256 fef4e8d0a81dc4562f984dddc5ccfee885506a2e030692b5ac6cd50e32efce37 SHA512 6f99982c42d462cc449eb8c56e22cde1ff628111b52e12fd6c8cbcbf86dbc047431aea2507c7026589bfe54b020443f3a647190de72cc235ce45f72f8d55b222 WHIRLPOOL 462e71bd51a0d5be9d5f6d9f965ae3121612ebd56066de43d328dd003cd61ab155af0c48b58868bf220e6956eee01844cbe923ea64fb30a9b88ba10d1e4c74e3
 DIST evolution-3.18.2.tar.xz 12036024 SHA256 91b83efaba7e6964657eaa17d4ba820335688fe78c6e85d4a0d337303ed14a8c SHA512 d300b9b25c1251b75d8381a87d89a34a17f11cd42c60f57febf507b09379bd2c7f85148601fa523df668a5efa6d57b805abc13ad1608013762dd4ff1fb48c3e1 WHIRLPOOL 19b17f981028b68212fa419597d3f71e6ccc26cce111f6a9595caeb28cba8a4cc43ead66adf2d0ba92ab4cb57f4962110cd2653ef8563c5bb0843082870cbd46
+DIST evolution-3.18.3.tar.xz 12057880 SHA256 f073b7cbef4ecc3dc4c3e0b80f98198eec577a20cae93e784659e8cf5af7c9b9 SHA512 8a4e6bda99838ca5a68d1a9868b4da37ca83a974d51883b26460f846c520069567559785d6bb33a5f948b8aeed5fd70a1ef225797a1ad8d75de1195037fc545d WHIRLPOOL 3638c61a4d74e1304621a36f949bc39bd5e4a4d0ccb8235946349f543a06fcecc2361f14523dbd2422ec1d1ef2f95b04a43d65fbd6355e98335057744217cd6a
diff --git a/mail-client/evolution/evolution-3.18.3.ebuild b/mail-client/evolution/evolution-3.18.3.ebuild
new file mode 100644
index 000000000000..c65ba0091af9
--- /dev/null
+++ b/mail-client/evolution/evolution-3.18.3.ebuild
@@ -0,0 +1,148 @@
+# 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 flag-o-matic readme.gentoo gnome2
+
+DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
+HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
+
+# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
+LICENSE="|| ( LGPL-2 LGPL-3 ) CC-BY-SA-3.0 FDL-1.3+ OPENLDAP"
+SLOT="2.0"
+IUSE="+bogofilter crypt highlight ldap map spamassassin spell ssl +weather"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~ia64 ~x86 ~x86-fbsd"
+
+# We need a graphical pinentry frontend to be able to ask for the GPG
+# password from inside evolution, bug 160302
+PINENTRY_DEPEND="|| ( app-crypt/pinentry[gnome-keyring] app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] )"
+
+# glade-3 support is for maintainers only per configure.ac
+# pst is not mature enough and changes API/ABI frequently
+# dconf explicitely needed for backup plugin
+# gnome-desktop support is optional with --enable-gnome-desktop
+# gnome-autoar (currently disabled because no release has been made)
+COMMON_DEPEND="
+	>=app-crypt/gcr-3.4
+	>=app-text/enchant-1.1.7
+	>=dev-libs/glib-2.40:2[dbus]
+	>=dev-libs/libxml2-2.7.3:2
+	>=gnome-base/gnome-desktop-2.91.3:3=
+	>=gnome-base/gsettings-desktop-schemas-2.91.92
+	>=gnome-extra/evolution-data-server-3.18.2:=[gtk,weather?]
+	>=media-libs/libcanberra-0.25[gtk3]
+	>=net-libs/libsoup-2.42:2.4
+	>=net-libs/webkit-gtk-2.2:3
+	>=x11-libs/cairo-1.9.15:=[glib]
+	>=x11-libs/gdk-pixbuf-2.24:2
+	>=x11-libs/gtk+-3.10:3
+	>=x11-libs/libnotify-0.7:=
+	>=x11-misc/shared-mime-info-0.22
+
+	>=app-text/iso-codes-0.49
+	dev-libs/atk
+	gnome-base/dconf
+	dev-libs/libical:=
+	x11-libs/libSM
+	x11-libs/libICE
+
+	crypt? (
+		>=app-crypt/gnupg-1.4
+		${PINENTRY_DEPEND}
+		x11-libs/libcryptui )
+	map? (
+		>=media-libs/libchamplain-0.12:0.12[gtk]
+		>=media-libs/clutter-1.0.0:1.0
+		>=media-libs/clutter-gtk-0.90:1.0
+		>=sci-geosciences/geocode-glib-3.10.0
+		x11-libs/mx:1.0 )
+	spell? ( app-text/gtkspell:3 )
+	ldap? ( >=net-nds/openldap-2:= )
+	ssl? (
+		>=dev-libs/nspr-4.6.1:=
+		>=dev-libs/nss-3.11:= )
+	weather? ( >=dev-libs/libgweather-3.10:2= )
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.40.0
+	dev-util/itstool
+	virtual/pkgconfig
+"
+# eautoreconf needs:
+#	app-text/yelp-tools
+#	>=gnome-base/gnome-common-2.12
+RDEPEND="${COMMON_DEPEND}
+	bogofilter? ( mail-filter/bogofilter )
+	highlight? ( app-text/highlight )
+	spamassassin? ( mail-filter/spamassassin )
+	!gnome-extra/evolution-exchange
+"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="To change the default browser if you are not using GNOME, edit
+~/.local/share/applications/mimeapps.list so it includes the
+following content:
+
+[Default Applications]
+x-scheme-handler/http=firefox.desktop
+x-scheme-handler/https=firefox.desktop
+
+(replace firefox.desktop with the name of the appropriate .desktop
+file from /usr/share/applications if you use a different browser)."
+
+src_prepare() {
+	# Fix relink issues in src_install
+	ELTCONF="--reverse-deps"
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Use NSS/NSPR only if 'ssl' is enabled.
+	gnome2_src_configure \
+		--without-glade-catalog \
+		--disable-autoar \
+		--disable-code-coverage \
+		--disable-installed-tests \
+		--disable-pst-import \
+		--enable-canberra \
+		$(use_enable crypt libcryptui) \
+		$(use_enable highlight text-highlight) \
+		$(use_enable map contact-maps) \
+		$(use_enable spell gtkspell) \
+		$(use_enable ssl nss) \
+		$(use_enable ssl smime) \
+		$(use_with bogofilter) \
+		$(use_with ldap openldap) \
+		$(use_with spamassassin) \
+		$(usex ssl --enable-nss=yes "--without-nspr-libs
+			--without-nspr-includes
+			--without-nss-libs
+			--without-nss-includes") \
+		$(use_enable weather)
+}
+
+src_install() {
+	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS* README"
+
+	gnome2_src_install
+
+	# Problems with prelink:
+	# https://bugzilla.gnome.org/show_bug.cgi?id=731680
+	# https://bugzilla.gnome.org/show_bug.cgi?id=732148
+	# https://bugzilla.redhat.com/show_bug.cgi?id=1114538
+	echo PRELINK_PATH_MASK=/usr/bin/evolution > ${T}/99${PN}
+	doenvd "${T}"/99${PN}
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	readme.gentoo_print_elog
+}
diff --git a/mail-client/thunderbird/thunderbird-38.4.0.ebuild b/mail-client/thunderbird/thunderbird-38.4.0.ebuild
index 8241cc5d2d5b..20bc030a1d2d 100644
--- a/mail-client/thunderbird/thunderbird-38.4.0.ebuild
+++ b/mail-client/thunderbird/thunderbird-38.4.0.ebuild
@@ -56,7 +56,7 @@ ASM_DEPEND=">=dev-lang/yasm-1.1"
 
 CDEPEND="
 	>=dev-libs/nss-3.19.2
-	>=dev-libs/nspr-4.10.8
+	>=dev-libs/nspr-4.10.10
 	!x11-plugins/enigmail
 	crypt?  ( || (
 		( >=app-crypt/gnupg-2.0
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index 5997eead4714..0a0d5ba906d4 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -2,5 +2,5 @@ DIST postfix-2.10.9.tar.gz 3820525 SHA256 e47eb56db2d238b9c5a5147a516fa406ab6afb
 DIST postfix-2.11.7.tar.gz 4031689 SHA256 05828b5b846e48fdc80db67d85409066010614af521070df4733459fbf447e20 SHA512 a1e146db6d2d71abb1dd7c70cde24e6410b599458ffa8061a0161be9475452034d9dcc7ec3976042b379cd84f5ebdba2f9d8d829637ff376ccaf7e87bcabe7a3 WHIRLPOOL 990cf17bc8d0cb8c8de0aa42f16125b1393feb42ed2eca3cb66ddd4d0b5d9425f619ee22047745fdd2f0069dc321e942ecc326bfbb88519fccf4931f95b1c483
 DIST postfix-3.0.2.tar.gz 4239235 SHA256 68256314202f5f0f24022d64f7ac664d28fa1394d07c84a37c3fc7a2d040be80 SHA512 b097ff5cb1707361af568bbcf8b9d264dfefe7a9fd5c2fb4ce731a2ff6a632c3341ace43afe7f1600f2096592535cf9a300322f78c92000e752e0df7d3c39021 WHIRLPOOL 3fd230321577c0226926701a17803b038a281b46abe884899ca38ea18c5fd9c13ef90900e5fdd17db20ecf8dc63b373cb9f378f1402660be2908192900cba47a
 DIST postfix-3.0.3.tar.gz 4240588 SHA256 401e46ec3450569dcce60d1d8ca22a19ab1f7f817b0cc730cdf4875ba608ac02 SHA512 b6cd091a8cdda9678fa2979082e47a363dd086e4376effc0a427d1beb5eb35bd7dc28003ad28323c42318d7f630e0d8b105c56fd1a63bd5b5a20501db68ac524 WHIRLPOOL b013164f12e2adde464052f37584320687716f18c65cdd01344848bbcdd5a08be16c741234a063d717474a50be0d14d7b5574ccb69dc56e00f30b619d148c9f9
-DIST postfix-3.1-20151129.tar.gz 4315043 SHA256 27d89ea464234bd6ed32d57445f30ac4b5cc70efebb778052a341ee95c324a1e SHA512 71b205d5939c00707901c7f6ede557be58227550bedfa598f1e35f47e816c3a309afbb47ac88ad739471d01e5d860b5c6f5bf362aa4ea72ec0dbecdae1aa7457 WHIRLPOOL f64c3b1ac4aac93a5c3fcd2a2b438c00fc23f7a734155c87c52960d7d9e8edf1ded4499c5ad16e5bcd04ab4702fd3238b46d30a89783ee36864d3ba59b662bc4
+DIST postfix-3.1-20151218.tar.gz 4315185 SHA256 7b298644b729f4bae25facfee7d33eceaf5b2f87abdcaf35e4c52b1981cde87a SHA512 80f1086d9f3e3d3274903a1437df8a2c780112e39bacd2ce23188c41c62bd7efada1be00ca3c0be3d88867f513d575ab54305b1a1fd04bf16279c466e4a95b41 WHIRLPOOL 65821e9230a9da667846745d2d38fa4755a9258ca76093a2e520551e7cc2e2cd60ec0e05c8bd9cac02763f42c13e19732c173d3c6177f059a7de7c2516ea5945
 DIST postfix-vda-v13-2.10.0.patch 55701 SHA256 6208021eb0b37ac6482e334e538ed5700cc22c4d4dd66ed9e975ae5f20bf935f SHA512 0b4b53a8cd28abf56eee3b2ed63ca1814251b60816e6ca1143249d25fd6ef7f905bec3134125ac6e851af685db8aae878012113693261529ae2ddbcf1bd93e62 WHIRLPOOL d98b7d2177b8b69738086880fd08c336fa60b99ff7413624e628fd5f17be2064f2ccaa37c047d3013ed41c0ff1bcb76e7962f8390c4179f28ab11733dd3b59d3
diff --git a/mail-mta/postfix/postfix-3.1_pre20151129.ebuild b/mail-mta/postfix/postfix-3.1_pre20151218.ebuild
index 9ba2dc5e1d50..9ba2dc5e1d50 100644
--- a/mail-mta/postfix/postfix-3.1_pre20151129.ebuild
+++ b/mail-mta/postfix/postfix-3.1_pre20151218.ebuild
diff --git a/media-fonts/symbola/symbola-8.00.ebuild b/media-fonts/symbola/symbola-8.00.ebuild
index a3fce54130b2..397a00d3f571 100644
--- a/media-fonts/symbola/symbola-8.00.ebuild
+++ b/media-fonts/symbola/symbola-8.00.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://users.teilar.gr/~g1951d/${MY_PN}.zip -> ${P}.zip"
 LICENSE="Unicode_Fonts_for_Ancient_Scripts"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~x86"
 IUSE="doc"
 
 DEPEND="app-arch/unzip"
diff --git a/media-gfx/gthumb/metadata.xml b/media-gfx/gthumb/metadata.xml
index 415357c02fb3..3a949feaea9f 100644
--- a/media-gfx/gthumb/metadata.xml
+++ b/media-gfx/gthumb/metadata.xml
@@ -5,7 +5,6 @@
 	<use>
 		<flag name="http">Enable webservice integration through <pkg>net-libs/libsoup</pkg></flag>
 		<flag name="json">Compile code that uses the libjson-glib library</flag>
-		<flag name="libsecret">Enable libsecret support to store login credentials</flag>
 		<flag name="slideshow">Enable slideshow plugin</flag>
 		<flag name="webp">Enable support for webp image format</flag>
 	</use>
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 7b4578630dc2..c13dce7543bd 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,3 +1,4 @@
 DIST ImageMagick-6.9.0-3.tar.xz 7898568 SHA256 f00452ba2c05c2df9624c62d7adb49ecf17140edd6e5f355cceca051dab1fb38 SHA512 0ff1ac91fa4330544cf6ba9ac8bfd48fce5a0a702b4578e1dcd23989c52c2287e1d6291c231591457a87652a59d908bade148e4e94676a887293671dfec99a4c WHIRLPOOL 0ca86ecb04a18aee95aa2990b73f0f87a7c800b028c45c6af5a906bc0b2f9a380b2ac52bf825cfda8396b4c8dc9b1768be7b46000b9bee9b6f4aaa1bf7d7dea8
 DIST ImageMagick-6.9.1-8.tar.xz 8286604 SHA256 987b353058482b5ba15d42746eebc51c15eb05241ce94f22381b8aae0b841617 SHA512 feace56b4a409fa91b2827a3eae1a870541528a3f327e5d06a96ff4f97e8d94418c8f92e731b7276c41aef321584a75a4621fa2f361e9b20309a546d9a1f9fea WHIRLPOOL d2e3aa949a216829c5f2bea1149c31b0cd5ef83d0855863e6b0682afc0ee9fcc1f516893b9b0f612c5e64cb746225c3f9c2ab1c3f29332a6904ca53cb9117e7b
 DIST ImageMagick-6.9.2-0.tar.xz 8241360 SHA256 07a2de28f7f9ab888ef47c02eb7e10cc3e0dd0e9797c5d71d6e71d19f842399e SHA512 fc8c0f26447dc8225a30fd0c6e373cbc10161abffb9f511f137b1a78c2ab764782b3a2ce984177f99e0d5057a674465ebb27ff1260cef59ef3f8a73c82a8b617 WHIRLPOOL d53b963c15c79ff7de0077af2c2af740eb78c29a988a088b50ba8b79c2179def6e62806de6d30fced165df24eccf1019c42a1a130bef63066e824fadea4f3c0b
+DIST ImageMagick-6.9.2-10.tar.xz 8755528 SHA256 da2f6fba43d69f20ddb11783f13f77782b0b57783dde9cda39c9e5e733c2013c SHA512 707e4f8008a74dd4203f3535569e4f00006341d5ecadcd6924826768f94dafc3eb3b67f8d04cf9d6310c6d8cc87c86b2eb6b6529020481fc0412911cfa2defba WHIRLPOOL 33a405cfd89832cd1adc8c72b4559d86120e303ec44df814ec5af79d8ef3e2c67d404110b8090e8b52b4eb6c1e843e24478859f47425ec67a23a5ff5b78fc219
diff --git a/media-gfx/imagemagick/imagemagick-6.9.2.10.ebuild b/media-gfx/imagemagick/imagemagick-6.9.2.10.ebuild
new file mode 100644
index 000000000000..d5e42477623c
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-6.9.2.10.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils flag-o-matic libtool multilib toolchain-funcs versionator
+
+MY_P=ImageMagick-$(replace_version_separator 3 '-')
+
+DESCRIPTION="A collection of tools and libraries for many image formats"
+HOMEPAGE="http://www.imagemagick.org/"
+SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
+
+LICENSE="imagemagick"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="autotrace bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q64 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
+
+RESTRICT="perl? ( userpriv )"
+
+RDEPEND="
+	dev-libs/libltdl:0
+	autotrace? ( >=media-gfx/autotrace-0.31.1 )
+	bzip2? ( app-arch/bzip2 )
+	corefonts? ( media-fonts/corefonts )
+	djvu? ( app-text/djvu )
+	fftw? ( sci-libs/fftw:3.0 )
+	fontconfig? ( media-libs/fontconfig )
+	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
+	graphviz? ( media-gfx/graphviz )
+	jbig? ( >=media-libs/jbigkit-2:= )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
+	lcms? ( media-libs/lcms:2= )
+	lqr? ( media-libs/liblqr )
+	opencl? ( virtual/opencl )
+	openexr? ( media-libs/openexr:0= )
+	pango? ( x11-libs/pango )
+	perl? ( >=dev-lang/perl-5.8.8:0= )
+	png? ( media-libs/libpng:0= )
+	postscript? ( app-text/ghostscript-gpl )
+	raw? ( media-gfx/ufraw )
+	svg? ( gnome-base/librsvg )
+	tiff? ( media-libs/tiff:0= )
+	truetype? (
+		media-fonts/urw-fonts
+		>=media-libs/freetype-2
+		)
+	webp? ( media-libs/libwebp:0= )
+	wmf? ( media-libs/libwmf )
+	X? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libXext
+		x11-libs/libXt
+		)
+	xml? ( dev-libs/libxml2:= )
+	lzma? ( app-arch/xz-utils )
+	zlib? ( sys-libs/zlib:= )"
+DEPEND="${RDEPEND}
+	!media-gfx/graphicsmagick[imagemagick]
+	virtual/pkgconfig
+	X? ( x11-proto/xextproto )"
+
+REQUIRED_USE="corefonts? ( truetype )
+	test? ( corefonts )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch_user
+
+	elibtoolize # for Darwin modules
+
+	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
+	shopt -s nullglob
+	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
+	if test -n "${mesa_cards}"; then
+		addpredict "${mesa_cards}"
+	fi
+	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
+	if test -n "${ati_cards}"; then
+		addpredict "${ati_cards}"
+	fi
+	shopt -u nullglob
+	addpredict /dev/nvidiactl
+}
+
+src_configure() {
+	local depth=16
+	use q8 && depth=8
+	use q32 && depth=32
+	use q64 && depth=64
+
+	local openmp=disable
+	use openmp && { tc-has-openmp && openmp=enable; }
+
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
+
+	CONFIG_SHELL=$(type -P bash) \
+	econf \
+		$(use_enable static-libs static) \
+		$(use_enable hdri) \
+		$(use_enable opencl) \
+		--with-threads \
+		--with-modules \
+		--with-quantum-depth=${depth} \
+		$(use_with cxx magick-plus-plus) \
+		$(use_with perl) \
+		--with-perl-options='INSTALLDIRS=vendor' \
+		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts \
+		$(use_with bzip2 bzlib) \
+		$(use_with X x) \
+		$(use_with zlib) \
+		$(use_with autotrace) \
+		$(use_with postscript dps) \
+		$(use_with djvu) \
+		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu \
+		$(use_with fftw) \
+		$(use_with fpx) \
+		$(use_with fontconfig) \
+		$(use_with truetype freetype) \
+		$(use_with postscript gslib) \
+		$(use_with graphviz gvc) \
+		$(use_with jbig) \
+		$(use_with jpeg) \
+		$(use_with jpeg2k openjp2) \
+		$(use_with lcms) \
+		$(use_with lqr) \
+		$(use_with lzma) \
+		$(use_with openexr) \
+		$(use_with pango) \
+		$(use_with png) \
+		$(use_with svg rsvg) \
+		$(use_with tiff) \
+		$(use_with webp) \
+		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts) \
+		$(use_with wmf) \
+		$(use_with xml) \
+		--${openmp}-openmp \
+		--with-gcc-arch=no-automagic
+}
+
+src_test() {
+	LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \
+	emake check
+}
+
+src_install() {
+	# Ensure documentation installation files and paths with each release!
+	emake \
+		DESTDIR="${D}" \
+		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
+		install
+
+	rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
+	dodoc {AUTHORS,README}.txt ChangeLog
+
+	if use perl; then
+		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
+		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
+	fi
+
+	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
+
+	if use opencl; then
+		cat <<-EOF > "${T}"/99${PN}
+		SANDBOX_PREDICT="/dev/nvidiactl:/dev/ati/card:/dev/dri/card"
+		EOF
+
+		insinto /etc/sandbox.d
+		doins "${T}"/99${PN} #472766
+	fi
+
+	insinto /usr/share/${PN}
+	doins config/*icm
+}
diff --git a/media-radio/ax25-apps/ax25-apps-0.0.8_rc4.ebuild b/media-radio/ax25-apps/ax25-apps-0.0.8_rc4.ebuild
index 62f4777fa5dc..455e04ef06d0 100644
--- a/media-radio/ax25-apps/ax25-apps-0.0.8_rc4.ebuild
+++ b/media-radio/ax25-apps/ax25-apps-0.0.8_rc4.ebuild
@@ -17,7 +17,7 @@ KEYWORDS="amd64 ppc x86"
 IUSE=""
 
 RDEPEND=">=dev-libs/libax25-0.0.12_rc2
-	sys-libs/ncurses"
+	sys-libs/ncurses:="
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	!media-sound/listen
diff --git a/media-radio/qrq/qrq-0.3.1.ebuild b/media-radio/qrq/qrq-0.3.1.ebuild
index cefc3258e02a..12720926cc62 100644
--- a/media-radio/qrq/qrq-0.3.1.ebuild
+++ b/media-radio/qrq/qrq-0.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="pulseaudio"
 
-DEPEND="sys-libs/ncurses
+DEPEND="sys-libs/ncurses:*
 	pulseaudio? ( media-sound/pulseaudio )"
 RDEPEND="${DEPEND}"
 
diff --git a/media-radio/unixcw/Manifest b/media-radio/unixcw/Manifest
index aec6a819e72c..b614d7b7e5b0 100644
--- a/media-radio/unixcw/Manifest
+++ b/media-radio/unixcw/Manifest
@@ -1,3 +1,2 @@
-DIST unixcw-3.4.0.tar.gz 700095 SHA256 11a678ec616f8b22d319c988365750bb7e0ee7570c7dcdbbd37669d6123ea972 SHA512 9271c47c77d2240387c3d305d952f09eb1ecdb6f9191a16e03f00d2921d16e229b4ee50f05d540fd3ed3da4040c134e1e8ac414ac81d983200c630c55f4f372f WHIRLPOOL c41b132e164792b43faf1bc24cf8cc034f62c8b18cd252b42cfde348a004f0b028e91a589c4e0f6a060ebd4c7bb901b1a406bff175f0cccdb3ac9286a684736a
-DIST unixcw-3.4.1.tar.gz 692181 SHA256 9c0bb1fc4a2a18918fe8b73ddc72df8806181fa490e0b2ef5ea116b934ac0727 SHA512 0dd8717ef921019adfb94812f2c9ec3f0be88b94910eb3548e71383523a1f5de13f1ed60be98ab1bcd568ccabc3dfff38100f1b97fbf54b0b5ef8469dfa013e7 WHIRLPOOL 333df1c05442e5152a391a52d1af0c9fffa1e5bba65b203485df3bb78f3bafa40df43cb1b588213b5685e85d791478ce00beda131559368bed201ced67999982
 DIST unixcw-3.4.2.tar.gz 730461 SHA256 ace7d16cfc8f84ffe041de6774baa0727ed0230657cf8a93cb4addf1cb4e8b2a SHA512 118e4f7fcca78713e5be5aa2faccec4e26979e95dcc300bf259534bb417eee7b21591ecb778467591b1a3b61c9ede18f229f88cd1bba2d6bc54f4d410096e0c9 WHIRLPOOL e8959ccb6eca32f4d468dbdb1add61dad6be30b453369385a1c857309ea89d052e4ef5577c4e17f101a79ee762f10ead3ec1fae72a394455ac473c4758fe0e3c
+DIST unixcw-3.5.0.tar.gz 739258 SHA256 82c455b67c6444165ec59f75bc29ad0665b79d70489bd09e3166fd1ccde718e6 SHA512 82128656dce56558f4a41be394afd1579f9de43f170c695e09e25e231b8416993b1cb94215325b39645391b2a43ede8119291efad284fecc35eb8a753669e8ec WHIRLPOOL 3c6dd3bcfa4d43f114938a1048e04f21a63199bb7c291e415e5b035dfe6c59031c60760ad65721cea84ee942ef6263f1938fa9093e6ab6c620875433b415c878
diff --git a/media-radio/unixcw/unixcw-3.4.0.ebuild b/media-radio/unixcw/unixcw-3.4.0.ebuild
deleted file mode 100644
index 47ca4d636860..000000000000
--- a/media-radio/unixcw/unixcw-3.4.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils flag-o-matic multilib
-
-DESCRIPTION="A package of programs that fit together to form a morse code tutor program"
-HOMEPAGE="http://unixcw.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ppc x86"
-IUSE="alsa ncurses pulseaudio suid qt4"
-
-RDEPEND="ncurses? ( sys-libs/ncurses )
-	qt4? ( dev-qt/qtgui:4[qt3support] )
-	alsa? ( media-libs/alsa-lib )
-	pulseaudio? ( media-sound/pulseaudio )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/libtool
-	!<=app-misc/cw-1.0.16-r1"
-
-src_prepare() {
-	append-cflags -std=gnu99
-}
-
-src_configure() {
-	econf --libdir=/usr/$(get_libdir) \
-		$(use_enable pulseaudio ) \
-		$(use_enable alsa ) \
-		$(use_enable ncurses cwcp ) \
-		$(use_enable qt4 xcwcp )
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	prune_libtool_files
-	dodoc ChangeLog NEWS README
-	if ! use suid ; then
-		fperms 711 /usr/bin/cw
-		if use ncurses ; then
-			fperms 711 /usr/bin/cwcp
-		fi
-		if use qt4 ; then
-			fperms 711 /usr/bin/xcwcp
-		fi
-	fi
-}
-
-pkg_postinst() {
-	if use suid ; then
-		ewarn "You have choosen to install 'cw', 'cwcp' and 'xcwcp' setuid"
-		ewarn "by setting USE=suid."
-		ewarn "Be aware that this is a security risk and not recommended."
-		ewarn ""
-		ewarn "These files do only need root access if you want to use the"
-		ewarn "PC speaker for morse sidetone output. You can alternativly"
-		ewarn "drop USE=suid and use sudo."
-	else
-		elog "Be aware that 'cw', 'cwcp' and 'xcwcp' needs root access if"
-		elog "you want to use the PC speaker for morse sidetone output."
-		elog "You can call the programs via sudo for that (see 'man sudo')."
-	fi
-}
diff --git a/media-radio/unixcw/unixcw-3.4.2.ebuild b/media-radio/unixcw/unixcw-3.4.2.ebuild
index 47ca4d636860..59ac7b4e7759 100644
--- a/media-radio/unixcw/unixcw-3.4.2.ebuild
+++ b/media-radio/unixcw/unixcw-3.4.2.ebuild
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 ppc x86"
 IUSE="alsa ncurses pulseaudio suid qt4"
 
-RDEPEND="ncurses? ( sys-libs/ncurses )
+RDEPEND="ncurses? ( sys-libs/ncurses:* )
 	qt4? ( dev-qt/qtgui:4[qt3support] )
 	alsa? ( media-libs/alsa-lib )
 	pulseaudio? ( media-sound/pulseaudio )"
diff --git a/media-radio/unixcw/unixcw-3.4.1.ebuild b/media-radio/unixcw/unixcw-3.5.0.ebuild
index 47ca4d636860..8f624adceba2 100644
--- a/media-radio/unixcw/unixcw-3.4.1.ebuild
+++ b/media-radio/unixcw/unixcw-3.5.0.ebuild
@@ -12,11 +12,13 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ppc x86"
-IUSE="alsa ncurses pulseaudio suid qt4"
+KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+IUSE="alsa ncurses pulseaudio suid qt5"
 
-RDEPEND="ncurses? ( sys-libs/ncurses )
-	qt4? ( dev-qt/qtgui:4[qt3support] )
+RDEPEND="ncurses? ( sys-libs/ncurses:= )
+	qt5? ( dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5 )
 	alsa? ( media-libs/alsa-lib )
 	pulseaudio? ( media-sound/pulseaudio )"
 DEPEND="${RDEPEND}
@@ -33,7 +35,7 @@ src_configure() {
 		$(use_enable pulseaudio ) \
 		$(use_enable alsa ) \
 		$(use_enable ncurses cwcp ) \
-		$(use_enable qt4 xcwcp )
+		$(use_enable qt5 xcwcp )
 }
 
 src_install() {
@@ -45,7 +47,7 @@ src_install() {
 		if use ncurses ; then
 			fperms 711 /usr/bin/cwcp
 		fi
-		if use qt4 ; then
+		if use qt5 ; then
 			fperms 711 /usr/bin/xcwcp
 		fi
 	fi
diff --git a/media-sound/spek/spek-0.8.3-r1.ebuild b/media-sound/spek/spek-0.8.3-r1.ebuild
index e61810978aa7..8a9099526c7f 100644
--- a/media-sound/spek/spek-0.8.3-r1.ebuild
+++ b/media-sound/spek/spek-0.8.3-r1.ebuild
@@ -30,7 +30,7 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	need-wxwidgets unicode
-	
+
 	if [ $(gcc-major-version) -lt "4" ] ; then
 		die "You need to activate at least gcc:4.7"
 	fi
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index e6688a6a15cb..83c8f7a88a63 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -4,3 +4,4 @@ DIST ffmpeg-2.7.2.tar.bz2 8157217 SHA256 7ceb7550ad628c526fa6c9ff23fdfb687a62f54
 DIST ffmpeg-2.8.1.tar.bz2 8564488 SHA256 e2ed5ab28dee1af94336739173eb0019afc21a54e38a96f4e3208e94a07866e2 SHA512 5c493f1eb84dd916f12a709a77ca0317a03ce88caaa1ee5e06b4e03c60ef4520ba58c8972841de25dcadb0da42e88592e6a87c3aca18dba62e246256c33fcf91 WHIRLPOOL f0f26375960dff80055fe257b63f11a1cc598bef9450d0da4a619bfc61ba6df185ea0dcf9c566810c7917159bb193d30a1009051c5b32ea1d746b289c782b8aa
 DIST ffmpeg-2.8.2.tar.bz2 8573586 SHA256 830ec647f7ad774fc0caf17ba47774bf5dee7a89cbd65894f364a87ba3ad21b2 SHA512 15c1c09d7d4bb8cc7babff4c782e4bf6621ed86d6b02bffb5468bdcd294a1144bf56a8a758d2801200bb89c26ce8f5a086d818affb473364424f94f701cbf749 WHIRLPOOL 83ae9a00cba7bc906672f55d796b044d3f4baad9a56804f6482e7c27b9f526d1364dfddaa22ef32b921e5dcd0158222897935544a34c1d1e7c3b9d681067d2e0
 DIST ffmpeg-2.8.3.tar.bz2 8576798 SHA256 1bcf993a71839bb4a37eaa0c51daf315932b6dad6089f672294545cc51a5caf6 SHA512 aadfab7db84b85cbfe44a5c7b47e447a1711c3d78fa195f30d3f6644e95842c8d484172e4c98f75cbae5d3783f4dd2972a892123d9a9ff90be32db20b0dc8aa6 WHIRLPOOL c004fe02f300772b439ae070538d4ef4c5c514dd8a080de8e1a560597e79607b709319072f6120c35722481bc11f30077cc74a64800e390a7c5fabe82ded1718
+DIST ffmpeg-2.8.4.tar.bz2 8579383 SHA256 83cc8136a7845546062a43cda9ae3cf0a02f43ef5e434d2f997f055231a75f8e SHA512 37f88c05fd0b8d1c4de83f5330f756cddd157ba78487d78436899d46a49a4e420eb086d263dd77c6c31a61c91f7839f40b07ed87817d686498b90caf9d870aa5 WHIRLPOOL 7e1a85a0eb00f33aad4d18b6a8d4d76c78aa0654c4ce10a864996239950fadd4a4995c481cd0e95a6f669c566cacd3da9ada4c66bb0fba011d4d942c8679eb99
diff --git a/media-video/ffmpeg/ffmpeg-2.8.4.ebuild b/media-video/ffmpeg/ffmpeg-2.8.4.ebuild
new file mode 100644
index 000000000000..912ed82350de
--- /dev/null
+++ b/media-video/ffmpeg/ffmpeg-2.8.4.ebuild
@@ -0,0 +1,455 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+# Subslot: libavutil major.libavcodec major.libavformat major
+# Since FFmpeg ships several libraries, subslot is kind of limited here.
+# Most consumers will use those three libraries, if a "less used" library
+# changes its soname, consumers will have to be rebuilt the old way
+# (preserve-libs).
+# If, for example, a package does not link to libavformat and only libavformat
+# changes its ABI then this package will be rebuilt needlessly. Hence, such a
+# package is free _not_ to := depend on FFmpeg but I would strongly encourage
+# doing so since such a case is unlikely.
+FFMPEG_SUBSLOT=54.56.56
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-2"
+	EGIT_REPO_URI="git://source.ffmpeg.org/ffmpeg.git"
+fi
+
+inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM}
+
+DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec"
+HOMEPAGE="http://ffmpeg.org/"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SRC_URI=""
+elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
+	SRC_URI="mirror://gentoo/${P}.tar.bz2"
+else # Release
+	SRC_URI="http://ffmpeg.org/releases/${P/_/-}.tar.bz2"
+fi
+FFMPEG_REVISION="${PV#*_p}"
+
+SLOT="0/${FFMPEG_SUBSLOT}"
+LICENSE="
+	!gpl? ( LGPL-2.1 )
+	gpl? ( GPL-2 )
+	amr? (
+		gpl? ( GPL-3 )
+		!gpl? ( LGPL-3 )
+	)
+	encode? (
+		aac? (
+			gpl? ( GPL-3 )
+			!gpl? ( LGPL-3 )
+		)
+		amrenc? (
+			gpl? ( GPL-3 )
+			!gpl? ( LGPL-3 )
+		)
+	)
+	samba? ( GPL-3 )
+"
+if [ "${PV#9999}" = "${PV}" ] ; then
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+fi
+
+# Options to use as use_enable in the foo[:bar] form.
+# This will feed configure with $(use_enable foo bar)
+# or $(use_enable foo foo) if no :bar is set.
+# foo is added to IUSE.
+FFMPEG_FLAG_MAP=(
+		+bzip2:bzlib cpudetection:runtime-cpudetect debug doc gnutls +gpl
+		+hardcoded-tables +iconv lzma +network openssl +postproc
+		samba:libsmbclient sdl:ffplay sdl vaapi vdpau X:xlib xcb:libxcb
+		xcb:libxcb-shm xcb:libxcb-xfixes +zlib
+		# libavdevice options
+		cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal
+		opengl
+		# indevs
+		libv4l:libv4l2 pulseaudio:libpulse
+		# decoders
+		amr:libopencore-amrwb amr:libopencore-amrnb fdk:libfdk-aac
+		jpeg2k:libopenjpeg bluray:libbluray celt:libcelt gme:libgme gsm:libgsm
+		modplug:libmodplug opus:libopus quvi:libquvi librtmp ssh:libssh
+		schroedinger:libschroedinger speex:libspeex vorbis:libvorbis vpx:libvpx
+		zvbi:libzvbi
+		# libavfilter options
+		bs2b:libbs2b flite:libflite frei0r fribidi:libfribidi fontconfig ladspa
+		libass truetype:libfreetype
+		# libswresample options
+		libsoxr
+		# Threads; we only support pthread for now but ffmpeg supports more
+		+threads:pthreads
+)
+
+# Same as above but for encoders, i.e. they do something only with USE=encode.
+FFMPEG_ENCODER_FLAG_MAP=(
+	aac:libvo-aacenc amrenc:libvo-amrwbenc mp3:libmp3lame
+	aacplus:libaacplus faac:libfaac snappy:libsnappy theora:libtheora
+	twolame:libtwolame wavpack:libwavpack webp:libwebp x264:libx264 x265:libx265
+	xvid:libxvid
+)
+
+IUSE="
+	alsa +encode examples jack libressl oss pic static-libs test v4l
+	${FFMPEG_FLAG_MAP[@]%:*}
+	${FFMPEG_ENCODER_FLAG_MAP[@]%:*}
+"
+
+# Strings for CPU features in the useflag[:configure_option] form
+# if :configure_option isn't set, it will use 'useflag' as configure option
+ARM_CPU_FEATURES=( armv5te armv6 armv6t2 neon armvfp:vfp )
+MIPS_CPU_FEATURES=( mipsdspr1 mipsdspr2 mipsfpu )
+PPC_CPU_FEATURES=( altivec )
+X86_CPU_FEATURES_RAW=( 3dnow:amd3dnow 3dnowext:amd3dnowext avx:avx avx2:avx2 fma3:fma3 fma4:fma4 mmx:mmx mmxext:mmxext sse:sse sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4 sse4_2:sse42 xop:xop )
+X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} )
+X86_CPU_REQUIRED_USE="
+	cpu_flags_x86_avx2? ( cpu_flags_x86_avx )
+	cpu_flags_x86_fma4? ( cpu_flags_x86_avx )
+	cpu_flags_x86_fma3? ( cpu_flags_x86_avx )
+	cpu_flags_x86_xop?  ( cpu_flags_x86_avx )
+	cpu_flags_x86_avx?  ( cpu_flags_x86_sse4_2 )
+	cpu_flags_x86_sse4_2?  ( cpu_flags_x86_sse4_1 )
+	cpu_flags_x86_sse4_1?  ( cpu_flags_x86_ssse3 )
+	cpu_flags_x86_ssse3?  ( cpu_flags_x86_sse3 )
+	cpu_flags_x86_sse3?  ( cpu_flags_x86_sse2 )
+	cpu_flags_x86_sse2?  ( cpu_flags_x86_sse )
+	cpu_flags_x86_sse?  ( cpu_flags_x86_mmxext )
+	cpu_flags_x86_mmxext?  ( cpu_flags_x86_mmx )
+	cpu_flags_x86_3dnowext?  ( cpu_flags_x86_3dnow )
+	cpu_flags_x86_3dnow?  ( cpu_flags_x86_mmx )
+"
+
+IUSE="${IUSE}
+	${ARM_CPU_FEATURES[@]%:*}
+	${MIPS_CPU_FEATURES[@]%:*}
+	${PPC_CPU_FEATURES[@]%:*}
+	${X86_CPU_FEATURES[@]%:*}
+"
+
+CPU_REQUIRED_USE="
+	${X86_CPU_REQUIRED_USE}
+"
+
+# "$(tc-arch):XXX" form where XXX_CPU_FEATURES are the cpu features that apply to
+# $(tc-arch).
+CPU_FEATURES_MAP="
+	arm:ARM
+	arm64:ARM
+	mips:MIPS
+	ppc:PPC
+	ppc64:PPC
+	x86:X86
+	amd64:X86
+"
+
+FFTOOLS=( aviocat cws2fws ffescape ffeval ffhash fourcc2pixfmt graph2dot ismindex pktdumper qt-faststart sidxindex trasher )
+IUSE="${IUSE} ${FFTOOLS[@]/#/+fftools_}"
+
+RDEPEND="
+	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+	amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] )
+	bluray? ( >=media-libs/libbluray-0.3.0-r1[${MULTILIB_USEDEP}] )
+	bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] )
+	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
+	cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] )
+	celt? ( >=media-libs/celt-0.11.1-r1[${MULTILIB_USEDEP}] )
+	encode? (
+		aac? ( >=media-libs/vo-aacenc-0.1.3[${MULTILIB_USEDEP}] )
+		aacplus? ( >=media-libs/libaacplus-2.0.2-r1[${MULTILIB_USEDEP}] )
+		amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
+		faac? ( >=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}] )
+		mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
+		snappy? ( >=app-arch/snappy-1.1.2-r1[${MULTILIB_USEDEP}] )
+		theora? (
+			>=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}]
+			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
+		)
+		twolame? ( >=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}] )
+		wavpack? ( >=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}] )
+		webp? ( >=media-libs/libwebp-0.3.0[${MULTILIB_USEDEP}] )
+		x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )
+		x265? ( >=media-libs/x265-1.6:=[${MULTILIB_USEDEP}] )
+		xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )
+	)
+	fdk? ( >=media-libs/fdk-aac-0.1.3:=[${MULTILIB_USEDEP}] )
+	flite? ( >=app-accessibility/flite-1.4-r4[${MULTILIB_USEDEP}] )
+	fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
+	frei0r? ( media-plugins/frei0r-plugins )
+	fribidi? ( >=dev-libs/fribidi-0.19.6[${MULTILIB_USEDEP}] )
+	gme? ( >=media-libs/game-music-emu-0.6.0[${MULTILIB_USEDEP}] )
+	gnutls? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] )
+	gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] )
+	iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
+	iec61883? (
+		>=media-libs/libiec61883-1.2.0-r1[${MULTILIB_USEDEP}]
+		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
+		>=sys-libs/libavc1394-0.5.4-r1[${MULTILIB_USEDEP}]
+	)
+	ieee1394? (
+		>=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}]
+		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
+	)
+	jack? ( >=media-sound/jack-audio-connection-kit-0.121.3-r1[${MULTILIB_USEDEP}] )
+	jpeg2k? ( >=media-libs/openjpeg-1.5.0:0[${MULTILIB_USEDEP}] )
+	libass? ( >=media-libs/libass-0.10.2[${MULTILIB_USEDEP}] )
+	libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] )
+	libsoxr? ( >=media-libs/soxr-0.1.0[${MULTILIB_USEDEP}] )
+	libv4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] )
+	modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )
+	openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] )
+	opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
+	openssl? (
+		!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
+		libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
+	)
+	opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
+	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
+	quvi? ( media-libs/libquvi:0.4[${MULTILIB_USEDEP}] )
+	librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
+	samba? ( >=net-fs/samba-3.6.23-r1[${MULTILIB_USEDEP}] )
+	schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] )
+	sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,${MULTILIB_USEDEP}] )
+	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
+	ssh? ( >=net-libs/libssh-0.5.5[${MULTILIB_USEDEP}] )
+	truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
+	vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] )
+	vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
+	vorbis? (
+		>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
+		>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
+	)
+	vpx? ( >=media-libs/libvpx-1.4.0:=[${MULTILIB_USEDEP}] )
+	X? (
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		!xcb? ( >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}] )
+		>=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]
+	)
+	xcb? ( >=x11-libs/libxcb-1.4[${MULTILIB_USEDEP}] )
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+	zvbi? ( >=media-libs/zvbi-0.2.35[${MULTILIB_USEDEP}] )
+	!media-video/qt-faststart
+	postproc? ( !media-libs/libpostproc )
+"
+
+DEPEND="${RDEPEND}
+	>=sys-devel/make-3.81
+	doc? ( app-text/texi2html )
+	fontconfig? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	gnutls? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	ieee1394? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}] )
+	libv4l? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	cpu_flags_x86_mmx? ( >=dev-lang/yasm-1.2 )
+	librtmp? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	schroedinger? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	test? ( net-misc/wget sys-devel/bc )
+	truetype? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	v4l? ( sys-kernel/linux-headers )
+"
+
+RDEPEND="${RDEPEND}
+	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3
+		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
+
+# Code requiring FFmpeg to be built under gpl license
+GPL_REQUIRED_USE="
+	postproc? ( gpl )
+	frei0r? ( gpl )
+	cdio? ( gpl )
+	samba? ( gpl )
+	zvbi? ( gpl )
+	encode? (
+		x264? ( gpl )
+		x265? ( gpl )
+		xvid? ( gpl )
+		X? ( !xcb? ( gpl ) )
+	)
+"
+REQUIRED_USE="
+	libv4l? ( v4l )
+	fftools_cws2fws? ( zlib )
+	test? ( encode )
+	${GPL_REQUIRED_USE}
+	${CPU_REQUIRED_USE}"
+RESTRICT="
+	encode? ( faac? ( bindist ) aacplus? ( bindist ) )
+	gpl? ( openssl? ( bindist ) fdk? ( bindist ) )
+"
+
+S=${WORKDIR}/${P/_/-}
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/libavutil/avconfig.h
+)
+
+src_prepare() {
+	if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot
+		export revision=git-N-${FFMPEG_REVISION}
+	fi
+	epatch_user
+}
+
+multilib_src_configure() {
+	local myconf=( ${EXTRA_FFMPEG_CONF} )
+
+	local ffuse=( "${FFMPEG_FLAG_MAP[@]}" )
+	use openssl && use gpl && myconf+=( --enable-nonfree )
+	use samba && myconf+=( --enable-version3 )
+
+	# Encoders
+	if use encode ; then
+		ffuse+=( "${FFMPEG_ENCODER_FLAG_MAP[@]}" )
+
+		# Licensing.
+		if use aac || use amrenc ; then
+			myconf+=( --enable-version3 )
+		fi
+		if use aacplus || use faac ; then
+			myconf+=( --enable-nonfree )
+		fi
+	else
+		myconf+=( --disable-encoders )
+	fi
+
+	# Indevs
+	use v4l || myconf+=( --disable-indev=v4l2 --disable-outdev=v4l2 )
+	for i in alsa oss jack ; do
+		use ${i} || myconf+=( --disable-indev=${i} )
+	done
+	use xcb || ffuse+=( X:x11grab )
+
+	# Outdevs
+	for i in alsa oss sdl ; do
+		use ${i} || myconf+=( --disable-outdev=${i} )
+	done
+
+	# Decoders
+	use amr && myconf+=( --enable-version3 )
+	use fdk && use gpl && myconf+=( --enable-nonfree )
+
+	for i in "${ffuse[@]#+}" ; do
+		myconf+=( $(use_enable ${i%:*} ${i#*:}) )
+	done
+
+	# (temporarily) disable non-multilib deps
+	if ! multilib_is_native_abi; then
+		for i in frei0r ; do
+			myconf+=( --disable-${i} )
+		done
+	fi
+
+	# CPU features
+	for i in ${CPU_FEATURES_MAP} ; do
+		if [ "$(tc-arch)" = "${i%:*}" ] ; then
+			local var="${i#*:}_CPU_FEATURES[@]"
+			for j in ${!var} ; do
+				use ${j%:*} || myconf+=( --disable-${j#*:} )
+			done
+		fi
+	done
+
+	if use pic ; then
+		myconf+=( --enable-pic )
+		# disable asm code if PIC is required
+		# as the provided asm decidedly is not PIC for x86.
+		[[ ${ABI} == x86 ]] && myconf+=( --disable-asm )
+	fi
+	[[ ${ABI} == x32 ]] && myconf+=( --disable-asm ) #427004
+
+	# Try to get cpu type based on CFLAGS.
+	# Bug #172723
+	# We need to do this so that features of that CPU will be better used
+	# If they contain an unknown CPU it will not hurt since ffmpeg's configure
+	# will just ignore it.
+	for i in $(get-flag mcpu) $(get-flag march) $(get-flag mtune) ; do
+		[[ ${i} = native ]] && i="host" # bug #273421
+		myconf+=( --cpu=${i} )
+		break
+	done
+
+	# Mandatory configuration
+	myconf=(
+		--enable-avfilter
+		--enable-avresample
+		--disable-stripping
+		"${myconf[@]}"
+	)
+
+	# cross compile support
+	if tc-is-cross-compiler ; then
+		myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- )
+		case ${CHOST} in
+			*freebsd*)
+				myconf+=( --target-os=freebsd )
+				;;
+			mingw32*)
+				myconf+=( --target-os=mingw32 )
+				;;
+			*linux*)
+				myconf+=( --target-os=linux )
+				;;
+		esac
+	fi
+
+	set -- "${S}/configure" \
+		--prefix="${EPREFIX}/usr" \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--shlibdir="${EPREFIX}/usr/$(get_libdir)" \
+		--mandir="${EPREFIX}/usr/share/man" \
+		--enable-shared \
+		--cc="$(tc-getCC)" \
+		--cxx="$(tc-getCXX)" \
+		--ar="$(tc-getAR)" \
+		--optflags=" " \
+		$(use_enable static-libs static) \
+		"${myconf[@]}"
+	echo "${@}"
+	"${@}" || die
+}
+
+multilib_src_compile() {
+	emake V=1
+
+	if multilib_is_native_abi; then
+		for i in "${FFTOOLS[@]}" ; do
+			if use fftools_${i} ; then
+				emake V=1 tools/${i}
+			fi
+		done
+	fi
+}
+
+multilib_src_install() {
+	emake V=1 DESTDIR="${D}" install install-man
+
+	if multilib_is_native_abi; then
+		for i in "${FFTOOLS[@]}" ; do
+			if use fftools_${i} ; then
+				dobin tools/${i}
+			fi
+		done
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc Changelog README.md CREDITS doc/*.txt doc/APIchanges
+	[ -f "RELEASE_NOTES" ] && dodoc "RELEASE_NOTES"
+	use doc && dohtml -r doc/*
+	if use examples ; then
+		dodoc -r doc/examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
+
+multilib_src_test() {
+	LD_LIBRARY_PATH="${BUILD_DIR}/libpostproc:${BUILD_DIR}/libswscale:${BUILD_DIR}/libswresample:${BUILD_DIR}/libavcodec:${BUILD_DIR}/libavdevice:${BUILD_DIR}/libavfilter:${BUILD_DIR}/libavformat:${BUILD_DIR}/libavutil:${BUILD_DIR}/libavresample" \
+		emake V=1 fate
+}
diff --git a/media-video/mjpg-streamer/mjpg-streamer-0_pre20120621-r1.ebuild b/media-video/mjpg-streamer/mjpg-streamer-0_pre20120621-r1.ebuild
index 7c0a0c247a65..a5274584d54d 100644
--- a/media-video/mjpg-streamer/mjpg-streamer-0_pre20120621-r1.ebuild
+++ b/media-video/mjpg-streamer/mjpg-streamer-0_pre20120621-r1.ebuild
@@ -33,7 +33,6 @@ src_prepare() {
 	epatch "${FILESDIR}/${PV}-make-var-instead-of-cmd.patch"
 	epatch "${FILESDIR}/${PV}-to-work-with-kernel-3.18.patch"
 
-
 	local flag switch
 
 	for flag in ${IUSE_PLUGINS}; do
diff --git a/media-video/movit/Manifest b/media-video/movit/Manifest
index 1416774117a8..5017057252d6 100644
--- a/media-video/movit/Manifest
+++ b/media-video/movit/Manifest
@@ -3,3 +3,4 @@ DIST movit-1.1.1.tar.gz 507273 SHA256 4fd1a90608a1b06cd9faf20ec99cd4d0a5cb18a904
 DIST movit-1.1.2.tar.gz 858539 SHA256 417e1810d588e5b4b2e82f05c2b6a86f4d14a3d9d9f4f26f4e009fce064d6a4a SHA512 082aab059864fd4feb9a66c0e7bab64babedfbdcc442ab5b1522ab60f678039d03e9c1c88095abe0e7196367c3ec1c8a9c90134cf5f97e4af31a3f7cbe98d661 WHIRLPOOL d305bd194d38b6da263471df443ef98c6854b2637eccfc6c376d0b9556a1c5be1e56b1d38f3097a0b2b8f91451728ffa4e476b46b17e829eb534f25c7053b7d1
 DIST movit-1.1.3.tar.gz 510811 SHA256 897fa5df7b261446dbed439c200f77b18a48e3693a0e6d666acf04eede806360 SHA512 ca8baa92907421d762a475fd06380fd3c9301df008ff60aaadf584f06185b0beed80633603073252492d4ad7f514ea6e09917862ba4d4630cf3bb0ecffa6f02f WHIRLPOOL 8f7efd99ee75b1e4990eac7a26fc0b0673fdfcecb49dfcc83211a0bd0e4af06a3b7b14b2b744b3823f0df6be49c020e2d9666f73257c53581fb24094330097b2
 DIST movit-1.1.tar.gz 507154 SHA256 41dcd3ccefbe218b7ccc47a7ac2577cf261f1ea10298f26ff16ffc353adf0f25 SHA512 ecb84f918b28b507c06cde680da5114fdf19b224a71e202d6f932de0e080e941f7977e590476eda9ffc9fc5839126b1f2d1056dd80039ced894281a51eebcf30 WHIRLPOOL c349a9f12b5966e57fa0b09811bbf3cf4a36abbb06b3df5cc3b9fa1b42efa7e902be9625b09e161d0250034aa05c3901db5ec9e24b8af554fb046ad725cda04a
+DIST movit-1.2.0.tar.gz 534145 SHA256 aeda1212288277ca136f2483765577a43ebd718be835dde73d81cf4b682fd473 SHA512 7c75ae60e2b5248e2691074d67005728555d6b7fea320ac9d7bcd401c1640467f18f78e446e57894d9b3b3b6a597ee0603ccdd963f21a408e96c7f0d0f5ac154 WHIRLPOOL 3b937f8964e79066f2b9811f80d0bd8d97375d3a2154a8763f5caac0a416432c6229de7c711edd606f1d7b7970ba2da97b2b2647b61b435a677267c0d24187ac
diff --git a/media-video/movit/movit-1.2.0.ebuild b/media-video/movit/movit-1.2.0.ebuild
new file mode 100644
index 000000000000..08927148bea1
--- /dev/null
+++ b/media-video/movit/movit-1.2.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# no sane way to use OpenGL from within tests?
+RESTRICT="test"
+
+DESCRIPTION="Modern Video Toolkit"
+HOMEPAGE="http://movit.sesse.net/"
+# Tests need gtest, makefile unconditionally builds tests, so ... yey!
+SRC_URI="http://movit.sesse.net/${P}.tar.gz
+	https://googletest.googlecode.com/files/gtest-1.7.0.zip"
+LICENSE="GPL-2+"
+SLOT="0"
+
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="media-libs/mesa
+	>=dev-cpp/eigen-3.2.0:3
+	media-libs/libepoxy
+	sci-libs/fftw
+	media-libs/libsdl2
+	"
+DEPEND="${RDEPEND}"
+
+src_compile() {
+	GTEST_DIR="${WORKDIR}/gtest-1.7.0" emake
+}
+
+src_test() {
+	GTEST_DIR="${WORKDIR}/gtest-1.7.0" emake check
+}
diff --git a/media-video/qgifer/files/qgifer-0.2.1-opencv3.patch b/media-video/qgifer/files/qgifer-0.2.1-opencv3.patch
new file mode 100644
index 000000000000..89c79ff17943
--- /dev/null
+++ b/media-video/qgifer/files/qgifer-0.2.1-opencv3.patch
@@ -0,0 +1,44 @@
+diff -Naur qgifer-0.2.1-source/CMakeLists.txt qgifer-0.2.1-modified/CMakeLists.txt
+--- qgifer-0.2.1-source/CMakeLists.txt	2013-06-04 18:33:16.000000000 +0200
++++ qgifer-0.2.1-modified/CMakeLists.txt	2015-12-19 20:58:13.772808845 +0100
+@@ -35,7 +35,7 @@
+ 	SET(GIF_INCLUDE_DIR "C:\\Program Files\\GnuWin32\\include")
+ ENDIF(WIN32)
+ 
+-FIND_PACKAGE( OpenCV REQUIRED core highgui imgproc )
++FIND_PACKAGE( OpenCV REQUIRED core highgui imgproc videoio)
+ FIND_PACKAGE(Qt4 REQUIRED)
+ FIND_PACKAGE(GIF REQUIRED)
+ 
+@@ -148,9 +148,9 @@
+ QT4_ADD_RESOURCES(RESOURCES_RCC ${RESOURCES})
+ 
+ IF(WIN32)
+-	SET( OPENCV_LIBS "-lopencv_core244 -lopencv_highgui244 -lopencv_imgproc244" )
++	SET( OPENCV_LIBS "-lopencv_core244 -lopencv_highgui244 -lopencv_imgproc244 -lopencv_videoio244" )
+ ELSE(WIN32)
+-	SET( OPENCV_LIBS "-lopencv_core -lopencv_highgui -lopencv_imgproc" )
++	SET( OPENCV_LIBS "-lopencv_core -lopencv_highgui -lopencv_imgproc -lopencv_videoio" )
+ ENDIF(WIN32)
+ 
+ SET( GIF_LIBS "-lgif" )	
+@@ -207,7 +207,7 @@
+ #SET(CPACK_SOURCE_PACKAGE_FILE_NAME "${PACKAGE_NAME}_${QGIFER_VERSION_MAJOR}.${QGIFER_VERSION_MINOR}.${QGIFER_VERSION_PATCH}")
+  
+ #set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON) #za pierwszym razem, pozniej dodano | dla nowszych opencv
+-SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= 2.1.3), libc6 (>= 2.3.6-6~), libgcc1 (>= 1:4.1.1), libgif4 (>= 4.1.4), libopencv-core2.3 | libopencv-core2.4, libopencv-highgui2.3 | libopencv-highgui2.4, libopencv-imgproc2.3 | libopencv-imgproc2.4, libqtcore4 (>= 4:4.7.0~beta1), libqtgui4 (>= 4:4.6.1), libstdc++6 (>= 4.1.1)")
++SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= 2.1.3), libc6 (>= 2.3.6-6~), libgcc1 (>= 1:4.1.1), libgif4 (>= 4.1.4), libopencv-core2.3 | libopencv-core2.4 | libopencv-core3.0, libopencv-highgui2.3 | libopencv-highgui2.4 | libopencv-highgui3.0, libopencv-imgproc2.3 | libopencv-imgproc2.4 | libopencv-imgproc3.0, libqtcore4 (>= 4:4.7.0~beta1), libqtgui4 (>= 4:4.6.1), libstdc++6 (>= 4.1.1)")
+  
+ SET(CPACK_DEBIAN_PACKAGE_PRIORITY "optional")
+ SET(CPACK_DEBIAN_PACKAGE_SECTION "video")
+diff -Naur qgifer-0.2.1-source/src/frameplayer.h qgifer-0.2.1-modified/src/frameplayer.h
+--- qgifer-0.2.1-source/src/frameplayer.h	2013-06-04 18:14:55.000000000 +0200
++++ qgifer-0.2.1-modified/src/frameplayer.h	2015-12-19 21:01:44.419870869 +0100
+@@ -23,6 +23,7 @@
+ #include <opencv2/core/core.hpp>
+ #include <opencv2/highgui/highgui.hpp>
+ #include <opencv2/imgproc/imgproc.hpp>
++#include <opencv2/videoio/videoio.hpp>
+ #include <QWidget>
+ #include <QImage>
+ #include <QStatusBar>
diff --git a/media-video/qgifer/metadata.xml b/media-video/qgifer/metadata.xml
index 0f6f89d4e523..01ae2462ba08 100644
--- a/media-video/qgifer/metadata.xml
+++ b/media-video/qgifer/metadata.xml
@@ -12,6 +12,7 @@
 	</longdescription>
 	<use>
 		<flag name="imagemagick">Use imagemagick for image operations</flag>
+		<flag name="opencv3">Use opencv-3.* for video operations instead opencv-2.*</flag>
 	</use>
 	<upstream>
 		<remote-id type="sourceforge">qgifer</remote-id>
diff --git a/media-video/qgifer/qgifer-0.2.1-r1.ebuild b/media-video/qgifer/qgifer-0.2.1-r1.ebuild
new file mode 100644
index 000000000000..2c646a902fed
--- /dev/null
+++ b/media-video/qgifer/qgifer-0.2.1-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit cmake-utils
+
+DESCRIPTION="A video-based animated GIF creator"
+HOMEPAGE="https://sourceforge.net/projects/qgifer/"
+SRC_URI="mirror://sourceforge/${PN}/${P}-source.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="debug imagemagick opencv3"
+
+RDEPEND="media-libs/giflib:0
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	imagemagick? ( media-gfx/imagemagick:0 )
+	!opencv3? ( >=media-libs/opencv-2.4.9[ffmpeg] <media-libs/opencv-3.0.0[ffmpeg] )
+	opencv3? ( >=media-libs/opencv-3.0.0[ffmpeg] )
+	virtual/ffmpeg:0"
+
+DEPEND="${RDEPEND}
+	>=dev-util/cmake-2.8:0"
+
+S="${WORKDIR}/${P}-source"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-desktop.patch
+
+	if use opencv3 ; then
+		epatch "${FILESDIR}"/${P}-opencv3.patch
+	fi
+}
+
+src_configure() {
+	local mycmakeargs
+
+	use debug && mycmakeargs=( -DRELEASE_MODE=OFF )
+
+	cmake-utils_src_configure
+}
diff --git a/net-analyzer/snort/Manifest b/net-analyzer/snort/Manifest
index 20d8bf973adc..c64d2f5ce705 100644
--- a/net-analyzer/snort/Manifest
+++ b/net-analyzer/snort/Manifest
@@ -7,3 +7,4 @@ DIST snort-2.9.7.0.tar.gz 6340553 SHA256 9738afea45d20b7f77997cc00055e7dd70f6aea
 DIST snort-2.9.7.2.tar.gz 6352738 SHA256 db57c532919d9ababac127f29dbdc05ed832394880e46cad81a5dde713ccb4be SHA512 4732014d0049671b1a81857e25a5ffbc3cbccb698be2b3406f69a45603a6b9f34343469ee14fa513199cf9b890a278cc777b42493850cff6fcb3493bb9b73dce WHIRLPOOL 2eec2345e0b945ff504025b2e552729bb5542d351bf1d92e2806be0f1e8d251283d4f984d89058731f5a0150bb1c2a7dd012e9bfbfbd0a3596bfc50321a93cb9
 DIST snort-2.9.7.3.tar.gz 6300073 SHA256 8cc3613b888fc54947a2beec773c76d9a20368f2659b31d45a9f0b11e66cc229 SHA512 949213d44d08c7f70bd45bc4947c9c35bfcd2ca3a54ec8a28d0c03e3868a485d2c208ec7850398f69d706c74fbad1389af445eb1107e678ff95714b5696f27b7 WHIRLPOOL 6d6e2da52f7f141bf6702c8604855ef351c055dbce2805341af16deafa5a0e288266e9632f770e29d209a59cce0d9c17f017bfb612f870dbf5b88c8c0d75e46d
 DIST snort-2.9.7.5.tar.gz 6312847 SHA256 ad03f11b5301b16642199a86aa90388eaa53f5003f83b0c5595745a490047be1 SHA512 fa1b299c72a44a8cb64361e8dab9fad5bfec36bbb05ebed2407002b2c5d97256d7d67599cb1f29406b5ee0916f2f85a173610d403cd34c57f74f7049c10eb038 WHIRLPOOL 6c7270d7edfc552f074fa2fb8ed067a12a48e4e159ceaa4be1f3c877996df5630aa42721aa637a846701072834e167445a67bbfa2deb93933048b1e4f70a8e1b
+DIST snort-2.9.8.0.tar.gz 6323095 SHA256 bddd5d01d10d20c182836fa0199cd3549239b7a9d0fd5bbb10226feb8b42d231 SHA512 46e5f19be5eccad2d5b4d3d55ce42fe616cd5f605b7178ed98e86cc8f2f4cf0f796fad80033d81b71bea7da2abfb6d0b340815ee158190f9b974f671045bf002 WHIRLPOOL 1e15ec4e2e54bd878f654484d7617249f5e34bc5c87bd0022ee923e0bab15e1733841ad234817d5209c0063c76d3e4e3db2343130eb77450260945324862ba12
diff --git a/net-analyzer/snort/snort-2.9.8.0.ebuild b/net-analyzer/snort/snort-2.9.8.0.ebuild
new file mode 100644
index 000000000000..dcc015235dbf
--- /dev/null
+++ b/net-analyzer/snort/snort-2.9.8.0.ebuild
@@ -0,0 +1,250 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+inherit autotools multilib user
+
+DESCRIPTION="The de facto standard for intrusion detection/prevention"
+HOMEPAGE="http://www.snort.org/"
+SRC_URI="https://www.snort.org/downloads/${PN}/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="static +gre +mpls +targetbased +ppm +perfprofiling
++non-ether-decoders control-socket file-inspect high-availability
+shared-rep side-channel sourcefire linux-smp-stats inline-init-failopen
++threads debug +active-response +normalizer reload-error-restart
++react +flexresp3 large-pcap-64bit selinux"
+
+DEPEND=">=net-libs/libpcap-1.3.0
+	>=net-libs/daq-2.0.2
+	>=dev-libs/libpcre-8.33
+	dev-libs/libdnet
+	sys-libs/zlib"
+
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-snort )"
+
+REQUIRED_USE="!kernel_linux? ( !shared-rep )"
+
+pkg_setup() {
+
+	# pre_inst() is a better place to put this
+	# but we need it here for the 'fowners' statements in src_install()
+	enewgroup snort
+	enewuser snort -1 -1 /dev/null snort
+
+}
+
+src_prepare() {
+
+	# Multilib fix for the sf_engine
+	ebegin "Applying multilib fix"
+	sed -i -e 's|${exec_prefix}/lib|${exec_prefix}/'$(get_libdir)'|g' \
+		"${WORKDIR}/${P}/src/dynamic-plugins/sf_engine/Makefile.am" \
+		|| die "sed for sf_engine failed"
+
+	# Multilib fix for the curent set of dynamic-preprocessors
+	for i in file ftptelnet smtp ssh dns ssl dcerpc2 sdf imap pop sip reputation gtp modbus dnp3; do
+		sed -i -e 's|${exec_prefix}/lib|${exec_prefix}/'$(get_libdir)'|g' \
+			"${WORKDIR}/${P}/src/dynamic-preprocessors/$i/Makefile.am" \
+			|| die "sed for $i failed."
+	done
+	eend
+
+	AT_M4DIR=m4 eautoreconf
+}
+
+src_configure() {
+
+	econf \
+		$(use_enable !static shared) \
+		$(use_enable static) \
+		$(use_enable static so-with-static-lib) \
+		$(use_enable gre) \
+		$(use_enable mpls) \
+		$(use_enable targetbased) \
+		$(use_enable control-socket) \
+		$(use_enable file-inspect) \
+		$(use_enable high-availability ha) \
+		$(use_enable non-ether-decoders) \
+		$(use_enable shared-rep) \
+		$(use_enable side-channel) \
+		$(use_enable sourcefire) \
+		$(use_enable ppm) \
+		$(use_enable perfprofiling) \
+		$(use_enable linux-smp-stats) \
+		$(use_enable inline-init-failopen) \
+		$(use_enable threads pthread) \
+		$(use_enable debug) \
+		$(use_enable debug debug-msgs) \
+		$(use_enable debug corefiles) \
+		$(use_enable !debug dlclose) \
+		$(use_enable active-response) \
+		$(use_enable normalizer) \
+		$(use_enable reload-error-restart) \
+		$(use_enable react) \
+		$(use_enable flexresp3) \
+		$(use_enable large-pcap-64bit large-pcap) \
+		--enable-reload \
+		--disable-build-dynamic-examples \
+		--disable-profile \
+		--disable-ppm-test \
+		--disable-intel-soft-cpm \
+		--disable-static-daq
+}
+
+src_install() {
+
+	emake DESTDIR="${D}" install
+
+	dodir /var/log/snort \
+		/var/run/snort \
+		/etc/snort/rules \
+		/etc/snort/so_rules \
+		/usr/$(get_libdir)/snort_dynamicrules
+
+	# config.log and build.log are needed by Sourcefire
+	# to trouble shoot build problems and bug reports so we are
+	# perserving them incase the user needs upstream support.
+	dodoc RELEASE.NOTES ChangeLog \
+		doc/* \
+		tools/u2boat/README.u2boat
+
+	insinto /etc/snort
+	doins etc/attribute_table.dtd \
+		etc/classification.config \
+		etc/gen-msg.map \
+		etc/reference.config \
+		etc/threshold.conf \
+		etc/unicode.map
+
+	# We use snort.conf.distrib because the config file is complicated
+	# and the one shipped with snort can change drastically between versions.
+	# Users should migrate setting by hand and not with etc-update.
+	newins etc/snort.conf snort.conf.distrib
+
+	# config.log and build.log are needed by Sourcefire
+	# to troubleshoot build problems and bug reports so we are
+	# preserving them incase the user needs upstream support.
+	if [ -f "${WORKDIR}/${PF}/config.log" ]; then
+		dodoc "${WORKDIR}/${PF}/config.log"
+	fi
+	if [ -f "${T}/build.log" ]; then
+		dodoc "${T}/build.log"
+	fi
+
+	insinto /etc/snort/preproc_rules
+	doins preproc_rules/decoder.rules \
+		preproc_rules/preprocessor.rules \
+		preproc_rules/sensitive-data.rules
+
+	fowners -R snort:snort \
+		/var/log/snort \
+		/var/run/snort \
+		/etc/snort
+
+	newinitd "${FILESDIR}/snort.rc12" snort
+	newconfd "${FILESDIR}/snort.confd.2" snort
+
+	# Sourcefire uses Makefiles to install docs causing Bug #297190.
+	# This removes the unwanted doc directory and rogue Makefiles.
+	rm -rf "${D}"usr/share/doc/snort || die "Failed to remove SF doc directories"
+	rm "${D}"usr/share/doc/"${PF}"/Makefile* || die "Failed to remove doc make files"
+
+	# Remove unneeded .la files (Bug #382863)
+	rm "${D}"usr/$(get_libdir)/snort_dynamicengine/libsf_engine.la || die
+	rm "${D}"usr/$(get_libdir)/snort_dynamicpreprocessor/libsf_*_preproc.la || die "Failed to remove libsf_?_preproc.la"
+
+	# Set the correct lib path for dynamicengine, dynamicpreprocessor, and dynamicdetection
+	sed -i -e 's|/usr/local/lib|/usr/'$(get_libdir)'|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Set the correct rule location in the config
+	sed -i -e 's|RULE_PATH ../rules|RULE_PATH /etc/snort/rules|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Set the correct preprocessor/decoder rule location in the config
+	sed -i -e 's|PREPROC_RULE_PATH ../preproc_rules|PREPROC_RULE_PATH /etc/snort/preproc_rules|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Enable the preprocessor/decoder rules
+	sed -i -e 's|^# include $PREPROC_RULE_PATH|include $PREPROC_RULE_PATH|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	sed -i -e 's|^# dynamicdetection directory|dynamicdetection directory|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Just some clean up of trailing /'s in the config
+	sed -i -e 's|snort_dynamicpreprocessor/$|snort_dynamicpreprocessor|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Make it clear in the config where these are...
+	sed -i -e 's|^include classification.config|include /etc/snort/classification.config|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	sed -i -e 's|^include reference.config|include /etc/snort/reference.config|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Disable all rule files by default.
+	sed -i -e 's|^include $RULE_PATH|# include $RULE_PATH|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Disable normalizer preprocessor config if normalizer USE flag not set.
+	if ! use normalizer; then
+		sed -i -e 's|^preprocessor normalize|#preprocessor normalize|g' \
+			"${D}etc/snort/snort.conf.distrib" || die
+	fi
+
+	# Set the configured DAQ to afpacket
+	sed -i -e 's|^# config daq: <type>|config daq: afpacket|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Set the location of the DAQ modules
+	sed -i -e 's|^# config daq_dir: <dir>|config daq_dir: /usr/'$(get_libdir)'/daq|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Set the DAQ mode to passive
+	sed -i -e 's|^# config daq_mode: <mode>|config daq_mode: passive|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Set snort to run as snort:snort
+	sed -i -e 's|^# config set_gid:|config set_gid: snort|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+	sed -i -e 's|^# config set_uid:|config set_uid: snort|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Set the default log dir
+	sed -i -e 's|^# config logdir:|config logdir: /var/log/snort/|g' \
+		"${D}etc/snort/snort.conf.distrib" || die
+
+	# Set the correct so_rule location in the config
+	 sed -i -e 's|SO_RULE_PATH ../so_rules|SO_RULE_PATH /etc/snort/so_rules|g' \
+		 "${D}etc/snort/snort.conf.distrib" || die
+}
+
+pkg_postinst() {
+
+	einfo "There have been a number of improvements and new features"
+	einfo "added to ${P}. Please review the RELEASE.NOTES and"
+	einfo "ChangLog located in /usr/share/doc/${PF}."
+	einfo
+	elog "The Sourcefire Vulnerability Research Team (VRT) recommends that"
+	elog "users migrate their snort.conf customizations to the latest config"
+	elog "file released by the VRT. You can find the latest version of the"
+	elog "Snort config file in /etc/snort/snort.conf.distrib."
+	elog
+	elog "!! It is important that you migrate to this new snort.conf file !!"
+	elog
+	elog "This version of the ebuild includes an updated init.d file and"
+	elog "conf.d file that rely on options found in the latest Snort"
+	elog "config file provided by the VRT."
+
+	if use debug; then
+		elog "You have the 'debug' USE flag enabled. If this has been done to"
+		elog "troubleshoot an issue by producing a core dump or a back trace,"
+		elog "then you need to also ensure the FEATURES variable in make.conf"
+		elog "contains the 'nostrip' option."
+	fi
+}
diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index 418a463086a6..731627a7a76a 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -1,3 +1,5 @@
+DIST zabbix-2.2.11.tar.gz 15147477 SHA256 9ad7bd71985dc316ee2a614bba2b1dd108d2a930c0a5cc5a8f75eb45a7a7e1ba SHA512 7447d3207bf67fdda67c1e56636ae114df7776a2ba4df4f9f260eef6a65e37d770ed73d6edd6438a9a783da1fc9bfede2d98acdc51fa6c7a130565efe8ae5b2d WHIRLPOOL e2b1f2ed019651d127a40f656117c9acccc8dcb1b9a8c0f9a773368de6d430d0716b5c50c42358992c9c2567c59cf0ec02bffea123ee4ac873be262aef0f2f6f
 DIST zabbix-2.2.5.tar.gz 14960556 SHA256 1e33f54d4accc5b6a0dccf4a308d27dc82de245567dffef823f9add9fa7d81b5 SHA512 0e229a2502f1332775db2107556b5e62267bcdf05dc483957960f563877ed970aef7ed465123576849413305e54309d83eeb75dd1f522c93cf09cd4b75265514 WHIRLPOOL 0a6b81f4e23ad8c8247b5356aa31bc4dfbd364642a647b9dff3216a0141cd2287b75731f396d26083aa412669a7efdb6f24fcb8592b4773c4a21d02b2f369681
 DIST zabbix-2.2.9.tar.gz 15032149 SHA256 7c8c319b34beb978e4b7be8c93e084485f93fe028dd9dbc6b674a7498d324439 SHA512 8400f875546140a7393ac6598a02e95645ac63ece1d958e7752737d0c0fff25e70923f2dd1ea29a9e73640b159da8a5286d9b1c31fbb3f090acbd07606c6113d WHIRLPOOL cb68a2c1467c83e8c2e2662af3995d7d90a00408009df2d9fe0b0d0d81191521b3f6e1624240150f68419252324e0d6e5653a3f19ed3b88adeb2719277172fb6
 DIST zabbix-2.4.5.tar.gz 14851092 SHA256 4e2cf1e4893a45d83379a05e2debabddf16beab324c93e84adc0bb57716fb957 SHA512 bdcba684b3d1cdb9eb5e1f9b370ef450201de8dbd9fe1619ef2b2437de6c34762dc041fa873976c4af0a2af229eec450aa58b1663feb75b6345d303484d35ead WHIRLPOOL 775e98b85152268b19cde553ff8bc7e86c0f6c5b873e85a0faca3edb5b51fe7d02267e52b3dccb0f08847bf11c6d0ba6b2d9f1e6bd472c882a2fac4326a83e10
+DIST zabbix-2.4.7.tar.gz 15012768 SHA256 d2c47b8f5b9b91f18010d54c45de55845d979014a8b3fe4bef64e0b08f8b00da SHA512 81860dfab38241e939a5cced50527fd16d35ec7b82232b2e0a4f17c90c1fc8ffb9bb95891ec27bb87445e5f81fba066dccc6b1a8833a4af4f483532f83d6172a WHIRLPOOL 03525fa3113f258af7fbd9cf3f501846b466afa48dca2874f2e28562f63cf5824df51c89349f0c10830bb7b5650f70a32443ba9af2d826d99d02cf7bb2a01e21
diff --git a/net-analyzer/zabbix/files/1.4.6/init.d/zabbix-agentd b/net-analyzer/zabbix/files/1.4.6/init.d/zabbix-agentd
deleted file mode 100644
index af8eaa5cff33..000000000000
--- a/net-analyzer/zabbix/files/1.4.6/init.d/zabbix-agentd
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-depend() {
-	need net
-	provide zabbix-agent
-	use zabbix-server
-}
-
-start() {
-	ebegin "Starting Zabbix agent"
-	start-stop-daemon --start --user zabbix --group zabbix --exec /usr/sbin/zabbix_agentd
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping Zabbix agent"
-	start-stop-daemon  --stop --pidfile /var/run/zabbix/zabbix_agentd.pid
-	eend $?
-}
diff --git a/net-analyzer/zabbix/files/1.4.6/init.d/zabbix-server b/net-analyzer/zabbix/files/1.4.6/init.d/zabbix-server
deleted file mode 100644
index 84c2adf443f7..000000000000
--- a/net-analyzer/zabbix/files/1.4.6/init.d/zabbix-server
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-depend() {
-	need net
-	use mysql postgresql
-}
-
-start() {
-	ebegin "Starting Zabbix server"
-	start-stop-daemon --start --user zabbix --group zabbix --exec /usr/sbin/zabbix_server
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping Zabbix server"
-	start-stop-daemon --stop --pidfile /var/run/zabbix/zabbix_server.pid
-	eend $?
-}
diff --git a/net-analyzer/zabbix/files/1.4.6/postinstall-en.txt b/net-analyzer/zabbix/files/1.4.6/postinstall-en.txt
deleted file mode 100644
index 9d13a9f3dbce..000000000000
--- a/net-analyzer/zabbix/files/1.4.6/postinstall-en.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Please change the values of the following variables in
-${MY_HTDOCSDIR}/include/db.inc.php:
-
-	DB_TYPE
-	DB_SERVER
-	DB_DATABASE
-	DB_USER
-	DB_PASSWORD
diff --git a/net-analyzer/zabbix/files/1.4.6/zabbix_agent.conf b/net-analyzer/zabbix/files/1.4.6/zabbix_agent.conf
deleted file mode 100644
index 42997388900e..000000000000
--- a/net-analyzer/zabbix/files/1.4.6/zabbix_agent.conf
+++ /dev/null
@@ -1,25 +0,0 @@
-# This is config file for zabbix_agent
-# To get more information about ZABBIX, 
-# go http://www.zabbix.com
-
-# IP address of ZABBIX server
-# Connections from other hosts will be denied
-Server=127.0.0.1
-
-# Spend no more than Timeout seconds on processing
-# Must be between 1 and 30
-Timeout=3
-
-####### USER-DEFINED MONITORED PARAMETERS #######
-# Format: UserParameter=<key>,<shell command>
-# Note that shell command must not return empty string or EOL only
-#UserParameter=system.test,who|wc -l
-### Set of parameter for monitoring MySQL server (v3.23.42 and later)
-### Change -u<username> and add -p<password> if required
-#UserParameter=mysql.ping,mysqladmin -uroot ping|grep alive|wc -l
-#UserParameter=mysql.uptime,mysqladmin -uroot status|cut -f2 -d":"|cut -f1 -d"T"
-#UserParameter=mysql.threads,mysqladmin -uroot status|cut -f3 -d":"|cut -f1 -d"Q"
-#UserParameter=mysql.questions,mysqladmin -uroot status|cut -f4 -d":"|cut -f1 -d"S"
-#UserParameter=mysql.slowqueries,mysqladmin -uroot status|cut -f5 -d":"|cut -f1 -d"O"
-#UserParameter=mysql.qps,mysqladmin -uroot status|cut -f9 -d":"
-#UserParameter=mysql.version,mysql -V
diff --git a/net-analyzer/zabbix/files/1.4.6/zabbix_agentd.conf b/net-analyzer/zabbix/files/1.4.6/zabbix_agentd.conf
deleted file mode 100644
index e040f17efcc9..000000000000
--- a/net-analyzer/zabbix/files/1.4.6/zabbix_agentd.conf
+++ /dev/null
@@ -1,70 +0,0 @@
-# This is config file for zabbix_agentd
-# To get more information about ZABBIX, go http://www.zabbix.com
-
-############ GENERAL PARAMETERS #################
-
-# List of comma delimited IP addresses (or hostnames) of ZABBIX servers. 
-# No spaces allowed. First entry is used for sending active checks.
-# Note that hostnames must resolve hostname->IP address and
-# IP address->hostname.
-Server=127.0.0.1
-
-# Server port for sending active checks
-ServerPort=10051
-
-# Unique hostname. Required for active checks.
-Hostname=localhost
-
-# Listen port. Default is 10050
-ListenPort=10050
-
-# IP address to bind agent
-# If missing, bind to all available IPs
-ListenIP=127.0.0.1
-
-# Number of pre-forked instances of zabbix_agentd.
-# Default value is 5
-# This parameter must be between 1 and 16
-StartAgents=5
-
-# How often refresh list of active checks. 2 minutes by default.
-#RefreshActiveChecks=120
-
-# Disable active checks. The agent will work in passive mode listening server.
-#DisableActive=1
-
-# Enable remote commands for ZABBIX agent. By default remote commands disabled.
-#EnableRemoteCommands=1
-
-# Specifies debug level
-# 0 - debug is not created
-# 1 - critical information
-# 2 - error information
-# 3 - warnings (default)
-# 4 - for debugging (produces lots of information)
-DebugLevel=3
-
-# Name of PID file
-PidFile=/var/run/zabbix/zabbix_agentd.pid
-
-# Name of log file.
-# If not set, syslog will be used
-LogFile=/var/log/zabbix/zabbix_agentd.log
-
-# Spend no more than Timeout seconds on processing
-# Must be between 1 and 30
-Timeout=3
-
-####### USER-DEFINED MONITORED PARAMETERS #######
-# Format: UserParameter=<key>,<shell command>
-# Note that shell command must not return empty string or EOL only
-#UserParameter=system.test,who|wc -l
-### Set of parameter for monitoring MySQL server (v3.23.42 and later)
-### Change -u<username> and add -p<password> if required
-#UserParameter=mysql.ping,mysqladmin -uroot ping|grep alive|wc -l
-#UserParameter=mysql.uptime,mysqladmin -uroot status|cut -f2 -d":"|cut -f1 -d"T"
-#UserParameter=mysql.threads,mysqladmin -uroot status|cut -f3 -d":"|cut -f1 -d"Q"
-#UserParameter=mysql.questions,mysqladmin -uroot status|cut -f4 -d":"|cut -f1 -d"S"
-#UserParameter=mysql.slowqueries,mysqladmin -uroot status|cut -f5 -d":"|cut -f1 -d"O"
-#UserParameter=mysql.qps,mysqladmin -uroot status|cut -f9 -d":"
-#UserParameter=mysql.version,mysql -V
diff --git a/net-analyzer/zabbix/files/1.4.6/zabbix_server.conf b/net-analyzer/zabbix/files/1.4.6/zabbix_server.conf
deleted file mode 100644
index 12490f881130..000000000000
--- a/net-analyzer/zabbix/files/1.4.6/zabbix_server.conf
+++ /dev/null
@@ -1,98 +0,0 @@
-# This is config file for ZABBIX server process
-# To get more information about ZABBIX, 
-# go http://www.zabbix.com
-
-############ GENERAL PARAMETERS #################
-
-# This defines which server this is.
-# Default value 1
-# This parameter must be between 1 and 255
-Server=1
-
-# Number of pre-forked instances of pollers
-# Default value is 6
-# This parameter must be between 6 and 255
-StartPollers=6
-
-# Number of pre-forked instances of trappers
-# Default value is 5
-# This parameter must be between 2 and 255
-StartTrappers=5
-
-# Listen interface for trapper. Trapper will listen all network interfaces
-# if this parameter is missing.
-ListenIP=127.0.0.1
-
-# Listen port for trapping. Default port number is 10051. This parameter 
-# must be between 1024 and 32767
-ListenPort=10051
-
-# How often ZABBIX will perform housekeeping procedure
-# (in hours)
-# Default value is 1 hour
-# Housekeeping is removing unnecessary information from
-# tables history, alert, and alarms
-# This parameter must be between 1 and 24
-HousekeepingFrequency=1
-
-# How often ZABBIX will try to send unsent alerts
-# (in seconds)
-# Default value is 30 seconds
-SenderFrequency=30
-
-# Uncomment this line to disable housekeeping procedure
-#DisableHousekeeping=1
-
-# Specifies debug level
-# 0 - debug is not created
-# 1 - critical information
-# 2 - error information
-# 3 - warnings (default)
-# 4 - for debugging (produces lots of information)
-DebugLevel=3
-
-# Specifies how long we wait for agent (in sec)
-# Must be between 1 and 30 
-Timeout=5
-
-# After how many seconds of unreachability treat a host as unavailable
-UnreachablePeriod=45
-
-# How ofter check host for availability during the unreachability period
-UnavailableDelay=15
-
-# How ofter check host for availability during the unavailability period
-UnavailableDelay=60
-
-# Name of PID file
-PidFile=/var/run/zabbix/zabbix_server.pid
-
-# Name of log file
-# If not set, syslog is used
-LogFile=/var/log/zabbix/zabbix_server.log
-
-#Location for custom alert scripts
-AlertScriptsPath=/var/lib/zabbix/scripts
-
-#Location of 'fping. Default is /usr/sbin/fping
-FpingLocation=/usr/sbin/fping
-
-# Frequency of ICMP pings. Defauls is 30 second.
-PingerFrequency=30
-
-# Database host name
-# Default is localhost
-DBHost=localhost
-
-# Database name
-DBName=zabbix
-
-# Database user
-DBUser=zabbix
-
-# Database password
-# Comment this line if no password used
-DBPassword=zabbix
-
-# Connect to MySQL using Unix socket?
-#DBSocket=/var/run/mysqld/mysqld.sock
diff --git a/net-analyzer/zabbix/files/1.6.5/init.d/zabbix-agentd b/net-analyzer/zabbix/files/1.6.5/init.d/zabbix-agentd
deleted file mode 100644
index af8eaa5cff33..000000000000
--- a/net-analyzer/zabbix/files/1.6.5/init.d/zabbix-agentd
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-depend() {
-	need net
-	provide zabbix-agent
-	use zabbix-server
-}
-
-start() {
-	ebegin "Starting Zabbix agent"
-	start-stop-daemon --start --user zabbix --group zabbix --exec /usr/sbin/zabbix_agentd
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping Zabbix agent"
-	start-stop-daemon  --stop --pidfile /var/run/zabbix/zabbix_agentd.pid
-	eend $?
-}
diff --git a/net-analyzer/zabbix/files/1.6.5/init.d/zabbix-server b/net-analyzer/zabbix/files/1.6.5/init.d/zabbix-server
deleted file mode 100644
index 84c2adf443f7..000000000000
--- a/net-analyzer/zabbix/files/1.6.5/init.d/zabbix-server
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-depend() {
-	need net
-	use mysql postgresql
-}
-
-start() {
-	ebegin "Starting Zabbix server"
-	start-stop-daemon --start --user zabbix --group zabbix --exec /usr/sbin/zabbix_server
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping Zabbix server"
-	start-stop-daemon --stop --pidfile /var/run/zabbix/zabbix_server.pid
-	eend $?
-}
diff --git a/net-analyzer/zabbix/files/1.6.5/postinstall-en.txt b/net-analyzer/zabbix/files/1.6.5/postinstall-en.txt
deleted file mode 100644
index 9d13a9f3dbce..000000000000
--- a/net-analyzer/zabbix/files/1.6.5/postinstall-en.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Please change the values of the following variables in
-${MY_HTDOCSDIR}/include/db.inc.php:
-
-	DB_TYPE
-	DB_SERVER
-	DB_DATABASE
-	DB_USER
-	DB_PASSWORD
diff --git a/net-analyzer/zabbix/files/1.6.5/zabbix_agent.conf b/net-analyzer/zabbix/files/1.6.5/zabbix_agent.conf
deleted file mode 100644
index dfa5c1bd3dee..000000000000
--- a/net-analyzer/zabbix/files/1.6.5/zabbix_agent.conf
+++ /dev/null
@@ -1,27 +0,0 @@
-# This is config file for zabbix_agent
-# To get more information about ZABBIX, 
-# go http://www.zabbix.com
-
-# IP address of ZABBIX server
-# Connections from other hosts will be denied
-
-Server=127.0.0.1
-
-# Spend no more than Timeout seconds on processing
-# Must be between 1 and 30
-
-Timeout=3
-
-####### USER-DEFINED MONITORED PARAMETERS #######
-# Format: UserParameter=<key>,<shell command>
-# Note that shell command must not return empty string or EOL only
-#UserParameter=system.test,who|wc -l
-### Set of parameter for monitoring MySQL server (v3.23.42 and later)
-### Change -u<username> and add -p<password> if required
-#UserParameter=mysql.ping,mysqladmin -uroot ping|grep alive|wc -l
-#UserParameter=mysql.uptime,mysqladmin -uroot status|cut -f2 -d":"|cut -f1 -d"T"
-#UserParameter=mysql.threads,mysqladmin -uroot status|cut -f3 -d":"|cut -f1 -d"Q"
-#UserParameter=mysql.questions,mysqladmin -uroot status|cut -f4 -d":"|cut -f1 -d"S"
-#UserParameter=mysql.slowqueries,mysqladmin -uroot status|cut -f5 -d":"|cut -f1 -d"O"
-#UserParameter=mysql.qps,mysqladmin -uroot status|cut -f9 -d":"
-#UserParameter=mysql.version,mysql -V
diff --git a/net-analyzer/zabbix/files/1.6.5/zabbix_agentd.conf b/net-analyzer/zabbix/files/1.6.5/zabbix_agentd.conf
deleted file mode 100644
index 44ce9d89a5e9..000000000000
--- a/net-analyzer/zabbix/files/1.6.5/zabbix_agentd.conf
+++ /dev/null
@@ -1,90 +0,0 @@
-# This is config file for zabbix_agentd
-# To get more information about ZABBIX, go http://www.zabbix.com
-
-############ GENERAL PARAMETERS #################
-
-# List of comma delimited IP addresses (or hostnames) of ZABBIX servers. 
-# No spaces allowed. First entry is used for sending active checks.
-# Note that hostnames must resolve hostname->IP address and
-# IP address->hostname.
-
-Server=127.0.0.1
-
-# Server port for sending active checks
-
-#ServerPort=10051
-
-# Unique hostname. Required for active checks.
-
-Hostname=ZABBIX Server
-
-# Listen port. Default is 10050
-
-#ListenPort=10050
-
-# IP address to bind agent
-# If missing, bind to all available IPs
-
-#ListenIP=127.0.0.1
-
-# Source IP address for outgouing connections
-#SourceIP=
-
-# Number of pre-forked instances of zabbix_agentd.
-# Default value is 5
-# This parameter must be between 1 and 16
-
-StartAgents=5
-
-# How often refresh list of active checks. 2 minutes by default.
-
-#RefreshActiveChecks=120
-
-# Disable active checks. The agent will work in passive mode listening server.
-
-#DisableActive=1
-
-# Enable remote commands for ZABBIX agent. By default remote commands disabled.
-
-#EnableRemoteCommands=1
-
-# Specifies debug level
-# 0 - debug is not created
-# 1 - critical information
-# 2 - error information
-# 3 - warnings (default)
-# 4 - for debugging (produces lots of information)
-
-DebugLevel=3
-
-# Name of PID file
-
-PidFile=/var/run/zabbix/zabbix_agentd.pid
-
-# Name of log file.
-# If not set, syslog will be used
-
-LogFile=/tmp/zabbix_agentd.log
-
-# Maximum size of log file in MB. Set to 0 to disable automatic log rotation.
-#LogFileSize=1
-
-# Spend no more than Timeout seconds on processing
-# Must be between 1 and 30
-
-Timeout=3
-
-####### USER-DEFINED MONITORED PARAMETERS #######
-# Format: UserParameter=<key>,<shell command>
-# Note that shell command must not return empty string or EOL only
-#UserParameter=system.test,who|wc -l
-### Set of parameter for monitoring MySQL server (v3.23.42 and later)
-### Change -u<username> and add -p<password> if required
-#UserParameter=mysql.ping,mysqladmin -uroot ping|grep alive|wc -l
-#UserParameter=mysql.uptime,mysqladmin -uroot status|cut -f2 -d":"|cut -f1 -d"T"
-#UserParameter=mysql.threads,mysqladmin -uroot status|cut -f3 -d":"|cut -f1 -d"Q"
-#UserParameter=mysql.questions,mysqladmin -uroot status|cut -f4 -d":"|cut -f1 -d"S"
-#UserParameter=mysql.slowqueries,mysqladmin -uroot status|cut -f5 -d":"|cut -f1 -d"O"
-#UserParameter=mysql.qps,mysqladmin -uroot status|cut -f9 -d":"
-#UserParameter=mysql.version,mysql -V
-
diff --git a/net-analyzer/zabbix/files/1.6.5/zabbix_proxy.conf b/net-analyzer/zabbix/files/1.6.5/zabbix_proxy.conf
deleted file mode 100644
index a09a7b623243..000000000000
--- a/net-analyzer/zabbix/files/1.6.5/zabbix_proxy.conf
+++ /dev/null
@@ -1,175 +0,0 @@
-# This is config file for ZABBIX server process
-# To get more information about ZABBIX, 
-# go http://www.zabbix.com
-
-############ GENERAL PARAMETERS #################
-
-# IP address (or hostname) of ZABBIX servers. 
-
-Server=127.0.0.1
-
-# Server port for sending active checks
-
-ServerPort=10051
-
-# Unique hostname.
-
-Hostname=proxy
-
-# Number of pre-forked instances of pollers
-# Default value is 5
-# This parameter must be between 0 and 255
-#StartPollers=5
-
-# Number of pre-forked instances of IPMI pollers
-# Default value is 0
-# This parameter must be between 0 and 255
-#StartIPMIPollers=0
-
-# Number of pre-forked instances of pollers for unreachable hosts
-# Default value is 1
-# This parameter must be between 0 and 255
-#StartPollersUnreachable=1
-
-# Number of pre-forked instances of trappers
-# Default value is 5
-# This parameter must be between 0 and 255
-#StartTrappers=5
-
-# Number of pre-forked instances of ICMP pingers
-# Default value is 1
-# This parameter must be between 0 and 255
-#StartPingers=1
-
-# Number of pre-forked instances of discoverers
-# Default value is 1
-# This parameter must be between 0 and 255
-#StartDiscoverers=1
-
-# Number of pre-forked instances of HTTP pollers
-# Default value is 1
-# This parameter must be between 0 and 255
-#StartHTTPPollers=1
-
-# Listen port for trapper. Default port number is 10051. This parameter 
-# must be between 1024 and 32767
-#ListenPort=10051
-
-# Source IP address for outgouing connections
-#SourceIP=
-
-# Listen interface for trapper. Trapper will listen all network interfaces
-# if this parameter is missing.
-#ListenIP=127.0.0.1
-
-# How often ZABBIX will perform sending hearbeat message
-# (in seconds)
-# Default value is 60 seconds
-# Set to 0 to disable heartbeat messages
-# This parameter must be between 0 and 3600
-#HeartbeatFrequency=60
-
-# How often ZABBIX will perform sync configuration data
-# (in seconds)
-# Default value is 3600 seconds (1h)
-# This parameter must be between 1 and 604800 (1 week)
-#ConfigFrequency=3600
-
-# How often ZABBIX will perform housekeeping procedure
-# (in hours)
-# Default value is 1 hour
-# Housekeeping is removing unnecessary information from
-# tables history, alert, and alarms
-# This parameter must be between 1 and 24
-#HousekeepingFrequency=1
-
-# How often ZABBIX will try to send unsent alerts
-# (in seconds)
-# Default value is 30 seconds
-#SenderFrequency=30
-
-# Local bufer size in hours. Proxy will keep collected data N hours.
-# Default value is 0 hours
-#ProxyLocalBuffer=0
-
-# Offline buffer size in hours. It is used when server is not available.
-# Older data is removed.
-# Default value is 1 hours
-#ProxyOfflineBuffer=1
-
-# Specifies debug level
-# 0 - debug is not created
-# 1 - critical information
-# 2 - error information
-# 3 - warnings (default)
-# 4 - for debugging (produces lots of information)
-#DebugLevel=3
-
-# Specifies how long we wait for agent response (in sec)
-# Must be between 1 and 30 
-Timeout=5
-
-# Specifies how many seconds trapper may spend processing new data
-# Must be between 1 and 30 
-#TrapperTimeout=5
-
-# After how many seconds of unreachability treat a host as unavailable
-#UnreachablePeriod=45
-
-# How ofter check host for availability during the unreachability period
-#UnavailableDelay=15
-
-# How ofter check host for availability during the unavailability period
-#UnavailableDelay=60
-
-# Name of PID file
-PidFile=/var/tmp/zabbix_proxy.pid
-
-# Name of log file
-# If not set, syslog is used
-LogFile=/tmp/zabbix_proxy.log
-
-# Maximum size of log file in MB. Set to 0 to disable automatic log rotation.
-#LogFileSize=1
-
-# Location for custom alert scripts
-AlertScriptsPath=/home/zabbix/bin/
-
-# Location of external scripts
-#ExternalScripts=/etc/zabbix/externalscripts
-
-# Location of 'fping. Default is /usr/sbin/fping
-# Make sure that fping binary has root permissions and SUID flag set
-#FpingLocation=/usr/sbin/fping
-
-# Location of fping6. Default is /usr/sbin/fping6
-# Make sure that fping binary has root permissions and SUID flag set
-#Fping6Location=/usr/sbin/fping6
-
-# Temporary directory. Default is /tmp
-#TmpDir=/tmp
-
-# Frequency of ICMP pings (item keys 'icmpping' and 'icmppingsec'). Defauls is 60 seconds.
-#PingerFrequency=60
-
-# Database host name
-# Default is localhost
-
-#DBHost=localhost
-
-# Database name
-# SQLite3 note: path to database file must be provided. DBUser and DBPassword are ignored.
-DBName=proxy
-
-# Database user
-
-DBUser=root
-
-# Database password
-# Comment this line if no password used
-
-#DBPassword=<password>
-
-# Connect to MySQL using Unix socket?
-
-#DBSocket=/tmp/mysql.sock
diff --git a/net-analyzer/zabbix/files/1.6.5/zabbix_server.conf b/net-analyzer/zabbix/files/1.6.5/zabbix_server.conf
deleted file mode 100644
index 2821ed2f1510..000000000000
--- a/net-analyzer/zabbix/files/1.6.5/zabbix_server.conf
+++ /dev/null
@@ -1,155 +0,0 @@
-# This is config file for ZABBIX server process
-# To get more information about ZABBIX, 
-# go http://www.zabbix.com
-
-############ GENERAL PARAMETERS #################
-
-# This defines unique NodeID in distributed setup,
-# Default value 0 (standalone server)
-# This parameter must be between 0 and 999
-#NodeID=0
-
-# Number of pre-forked instances of pollers
-# Default value is 5
-# This parameter must be between 0 and 255
-#StartPollers=5
-
-# Number of pre-forked instances of IPMI pollers
-# Default value is 0
-# This parameter must be between 0 and 255
-#StartIPMIPollers=0
-
-# Number of pre-forked instances of pollers for unreachable hosts
-# Default value is 1
-# This parameter must be between 0 and 255
-#StartPollersUnreachable=1
-
-# Number of pre-forked instances of trappers
-# Default value is 5
-# This parameter must be between 0 and 255
-#StartTrappers=5
-
-# Number of pre-forked instances of ICMP pingers
-# Default value is 1
-# This parameter must be between 0 and 255
-#StartPingers=1
-
-# Number of pre-forked instances of discoverers
-# Default value is 1
-# This parameter must be between 0 and 255
-#StartDiscoverers=1
-
-# Number of pre-forked instances of HTTP pollers
-# Default value is 1
-# This parameter must be between 0 and 255
-#StartHTTPPollers=1
-
-# Listen port for trapper. Default port number is 10051. This parameter 
-# must be between 1024 and 32767
-
-#ListenPort=10051
-
-# Source IP address for outgouing connections
-#SourceIP=
-
-# Listen interface for trapper. Trapper will listen all network interfaces
-# if this parameter is missing.
-
-#ListenIP=127.0.0.1
-
-# How often ZABBIX will perform housekeeping procedure
-# (in hours)
-# Default value is 1 hour
-# Housekeeping is removing unnecessary information from
-# tables history, alert, and alarms
-# This parameter must be between 1 and 24
-
-#HousekeepingFrequency=1
-
-# How often ZABBIX will try to send unsent alerts
-# (in seconds)
-# Default value is 30 seconds
-SenderFrequency=30
-
-# Uncomment this line to disable housekeeping procedure
-#DisableHousekeeping=1
-
-# Specifies debug level
-# 0 - debug is not created
-# 1 - critical information
-# 2 - error information
-# 3 - warnings (default)
-# 4 - for debugging (produces lots of information)
-
-DebugLevel=3
-
-# Specifies how long we wait for agent response (in sec)
-# Must be between 1 and 30 
-Timeout=5
-
-# Specifies how many seconds trapper may spend processing new data
-# Must be between 1 and 30 
-#TrapperTimeout=5
-
-# After how many seconds of unreachability treat a host as unavailable
-#UnreachablePeriod=45
-
-# How ofter check host for availability during the unreachability period
-#UnavailableDelay=15
-
-# How ofter check host for availability during the unavailability period
-#UnavailableDelay=60
-
-# Name of PID file
-
-PidFile=/var/run/zabbix/zabbix_server.pid
-
-# Name of log file
-# If not set, syslog is used
-
-LogFile=/tmp/zabbix_server.log
-
-# Maximum size of log file in MB. Set to 0 to disable automatic log rotation.
-#LogFileSize=1
-
-# Location for custom alert scripts
-AlertScriptsPath=/home/zabbix/bin/
-
-# Location of external scripts
-#ExternalScripts=/etc/zabbix/externalscripts
-
-# Location of fping. Default is /usr/sbin/fping
-# Make sure that fping binary has root permissions and SUID flag set
-#FpingLocation=/usr/sbin/fping
-
-# Location of fping6. Default is /usr/sbin/fping6
-# Make sure that fping binary has root permissions and SUID flag set
-#Fping6Location=/usr/sbin/fping6
-
-# Temporary directory. Default is /tmp
-#TmpDir=/tmp
-
-# Frequency of ICMP pings (item keys 'icmpping' and 'icmppingsec'). Defauls is 60 seconds.
-#PingerFrequency=60
-
-# Database host name
-# Default is localhost
-
-#DBHost=localhost
-
-# Database name
-# SQLite3 note: path to database file must be provided. DBUser and DBPassword are ignored.
-DBName=zabbix
-
-# Database user
-
-DBUser=root
-
-# Database password
-# Comment this line if no password used
-
-#DBPassword=<password>
-
-# Connect to MySQL using Unix socket?
-
-#DBSocket=/tmp/mysql.sock
diff --git a/net-analyzer/zabbix/files/1.6.5/zabbix_trapper.conf b/net-analyzer/zabbix/files/1.6.5/zabbix_trapper.conf
deleted file mode 100644
index 20222950bb96..000000000000
--- a/net-analyzer/zabbix/files/1.6.5/zabbix_trapper.conf
+++ /dev/null
@@ -1,44 +0,0 @@
-# This is config file for zabbix_trapper
-# To get more information about ZABBIX, 
-# go http://www.zabbix.com
-
-############ GENERAL PARAMETERS #################
-
-# Specifies debug level
-# 1 - critical information
-# 2 - warnings (default)
-# 3 - for debugging (produces lots of information)
-
-DebugLevel=2
-
-# Spend no more than Timeout seconds on processing
-# Must be between 1 and 30
-
-Timeout=3
-
-# Name of log file
-# If not set, syslog will be used
-
-LogFile=/tmp/zabbix_trapper.log
-
-# Database host name
-# Default is localhost
-
-#DBHost=localhost
-
-# Database name
-
-DBName=zabbix
-
-# Database user
-
-DBUser=root
-
-# Database password
-# Comment this line if no password used
-
-#DBPassword=<password>
-
-# Connect to MySQL usig Unix socket?
-
-#DBSocket=/tmp/mysql.sock
diff --git a/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-agentd b/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-agentd
deleted file mode 100644
index af8eaa5cff33..000000000000
--- a/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-agentd
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-depend() {
-	need net
-	provide zabbix-agent
-	use zabbix-server
-}
-
-start() {
-	ebegin "Starting Zabbix agent"
-	start-stop-daemon --start --user zabbix --group zabbix --exec /usr/sbin/zabbix_agentd
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping Zabbix agent"
-	start-stop-daemon  --stop --pidfile /var/run/zabbix/zabbix_agentd.pid
-	eend $?
-}
diff --git a/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-proxy b/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-proxy
deleted file mode 100644
index 4a007b1cae8f..000000000000
--- a/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-proxy
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-depend() {
-	need net
-	#use mysql postgresql
-}
-
-start() {
-	ebegin "Starting Zabbix proxy"
-	start-stop-daemon --start --user zabbix --group zabbix --exec /usr/sbin/zabbix_proxy
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping Zabbix proxy"
-	start-stop-daemon --stop --pidfile /var/run/zabbix/zabbix_proxy.pid
-	eend $?
-}
diff --git a/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-server b/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-server
deleted file mode 100644
index 84c2adf443f7..000000000000
--- a/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-server
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-depend() {
-	need net
-	use mysql postgresql
-}
-
-start() {
-	ebegin "Starting Zabbix server"
-	start-stop-daemon --start --user zabbix --group zabbix --exec /usr/sbin/zabbix_server
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping Zabbix server"
-	start-stop-daemon --stop --pidfile /var/run/zabbix/zabbix_server.pid
-	eend $?
-}
diff --git a/net-analyzer/zabbix/files/1.6.6/postinstall-en.txt b/net-analyzer/zabbix/files/1.6.6/postinstall-en.txt
deleted file mode 100644
index 9d13a9f3dbce..000000000000
--- a/net-analyzer/zabbix/files/1.6.6/postinstall-en.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Please change the values of the following variables in
-${MY_HTDOCSDIR}/include/db.inc.php:
-
-	DB_TYPE
-	DB_SERVER
-	DB_DATABASE
-	DB_USER
-	DB_PASSWORD
diff --git a/net-analyzer/zabbix/files/1.6.6/zabbix_agent.conf b/net-analyzer/zabbix/files/1.6.6/zabbix_agent.conf
deleted file mode 100644
index dfa5c1bd3dee..000000000000
--- a/net-analyzer/zabbix/files/1.6.6/zabbix_agent.conf
+++ /dev/null
@@ -1,27 +0,0 @@
-# This is config file for zabbix_agent
-# To get more information about ZABBIX, 
-# go http://www.zabbix.com
-
-# IP address of ZABBIX server
-# Connections from other hosts will be denied
-
-Server=127.0.0.1
-
-# Spend no more than Timeout seconds on processing
-# Must be between 1 and 30
-
-Timeout=3
-
-####### USER-DEFINED MONITORED PARAMETERS #######
-# Format: UserParameter=<key>,<shell command>
-# Note that shell command must not return empty string or EOL only
-#UserParameter=system.test,who|wc -l
-### Set of parameter for monitoring MySQL server (v3.23.42 and later)
-### Change -u<username> and add -p<password> if required
-#UserParameter=mysql.ping,mysqladmin -uroot ping|grep alive|wc -l
-#UserParameter=mysql.uptime,mysqladmin -uroot status|cut -f2 -d":"|cut -f1 -d"T"
-#UserParameter=mysql.threads,mysqladmin -uroot status|cut -f3 -d":"|cut -f1 -d"Q"
-#UserParameter=mysql.questions,mysqladmin -uroot status|cut -f4 -d":"|cut -f1 -d"S"
-#UserParameter=mysql.slowqueries,mysqladmin -uroot status|cut -f5 -d":"|cut -f1 -d"O"
-#UserParameter=mysql.qps,mysqladmin -uroot status|cut -f9 -d":"
-#UserParameter=mysql.version,mysql -V
diff --git a/net-analyzer/zabbix/files/1.6.6/zabbix_agentd.conf b/net-analyzer/zabbix/files/1.6.6/zabbix_agentd.conf
deleted file mode 100644
index aac55eeb489c..000000000000
--- a/net-analyzer/zabbix/files/1.6.6/zabbix_agentd.conf
+++ /dev/null
@@ -1,90 +0,0 @@
-# This is config file for zabbix_agentd
-# To get more information about ZABBIX, go http://www.zabbix.com
-
-############ GENERAL PARAMETERS #################
-
-# List of comma delimited IP addresses (or hostnames) of ZABBIX servers. 
-# No spaces allowed. First entry is used for sending active checks.
-# Note that hostnames must resolve hostname->IP address and
-# IP address->hostname.
-
-Server=127.0.0.1
-
-# Server port for sending active checks
-
-#ServerPort=10051
-
-# Unique hostname. Required for active checks.
-
-Hostname=ZABBIX Server
-
-# Listen port. Default is 10050
-
-#ListenPort=10050
-
-# IP address to bind agent
-# If missing, bind to all available IPs
-
-#ListenIP=127.0.0.1
-
-# Source IP address for outgouing connections
-#SourceIP=
-
-# Number of pre-forked instances of zabbix_agentd.
-# Default value is 5
-# This parameter must be between 1 and 16
-
-StartAgents=5
-
-# How often refresh list of active checks. 2 minutes by default.
-
-#RefreshActiveChecks=120
-
-# Disable active checks. The agent will work in passive mode listening server.
-
-#DisableActive=1
-
-# Enable remote commands for ZABBIX agent. By default remote commands disabled.
-
-#EnableRemoteCommands=1
-
-# Specifies debug level
-# 0 - debug is not created
-# 1 - critical information
-# 2 - error information
-# 3 - warnings (default)
-# 4 - for debugging (produces lots of information)
-
-DebugLevel=3
-
-# Name of PID file
-
-PidFile=/var/run/zabbix/zabbix_agentd.pid
-
-# Name of log file.
-# If not set, syslog will be used
-
-LogFile=/var/log/zabbix/zabbix_agentd.log
-
-# Maximum size of log file in MB. Set to 0 to disable automatic log rotation.
-#LogFileSize=1
-
-# Spend no more than Timeout seconds on processing
-# Must be between 1 and 30
-
-Timeout=3
-
-####### USER-DEFINED MONITORED PARAMETERS #######
-# Format: UserParameter=<key>,<shell command>
-# Note that shell command must not return empty string or EOL only
-#UserParameter=system.test,who|wc -l
-### Set of parameter for monitoring MySQL server (v3.23.42 and later)
-### Change -u<username> and add -p<password> if required
-#UserParameter=mysql.ping,mysqladmin -uroot ping|grep alive|wc -l
-#UserParameter=mysql.uptime,mysqladmin -uroot status|cut -f2 -d":"|cut -f1 -d"T"
-#UserParameter=mysql.threads,mysqladmin -uroot status|cut -f3 -d":"|cut -f1 -d"Q"
-#UserParameter=mysql.questions,mysqladmin -uroot status|cut -f4 -d":"|cut -f1 -d"S"
-#UserParameter=mysql.slowqueries,mysqladmin -uroot status|cut -f5 -d":"|cut -f1 -d"O"
-#UserParameter=mysql.qps,mysqladmin -uroot status|cut -f9 -d":"
-#UserParameter=mysql.version,mysql -V
-
diff --git a/net-analyzer/zabbix/files/1.6.6/zabbix_proxy.conf b/net-analyzer/zabbix/files/1.6.6/zabbix_proxy.conf
deleted file mode 100644
index e0380d4fab7c..000000000000
--- a/net-analyzer/zabbix/files/1.6.6/zabbix_proxy.conf
+++ /dev/null
@@ -1,175 +0,0 @@
-# This is config file for ZABBIX server process
-# To get more information about ZABBIX, 
-# go http://www.zabbix.com
-
-############ GENERAL PARAMETERS #################
-
-# IP address (or hostname) of ZABBIX servers. 
-
-Server=127.0.0.1
-
-# Server port for sending active checks
-
-ServerPort=10051
-
-# Unique hostname.
-
-Hostname=proxy
-
-# Number of pre-forked instances of pollers
-# Default value is 5
-# This parameter must be between 0 and 255
-#StartPollers=5
-
-# Number of pre-forked instances of IPMI pollers
-# Default value is 0
-# This parameter must be between 0 and 255
-#StartIPMIPollers=0
-
-# Number of pre-forked instances of pollers for unreachable hosts
-# Default value is 1
-# This parameter must be between 0 and 255
-#StartPollersUnreachable=1
-
-# Number of pre-forked instances of trappers
-# Default value is 5
-# This parameter must be between 0 and 255
-#StartTrappers=5
-
-# Number of pre-forked instances of ICMP pingers
-# Default value is 1
-# This parameter must be between 0 and 255
-#StartPingers=1
-
-# Number of pre-forked instances of discoverers
-# Default value is 1
-# This parameter must be between 0 and 255
-#StartDiscoverers=1
-
-# Number of pre-forked instances of HTTP pollers
-# Default value is 1
-# This parameter must be between 0 and 255
-#StartHTTPPollers=1
-
-# Listen port for trapper. Default port number is 10051. This parameter 
-# must be between 1024 and 32767
-#ListenPort=10051
-
-# Source IP address for outgouing connections
-#SourceIP=
-
-# Listen interface for trapper. Trapper will listen all network interfaces
-# if this parameter is missing.
-#ListenIP=127.0.0.1
-
-# How often ZABBIX will perform sending hearbeat message
-# (in seconds)
-# Default value is 60 seconds
-# Set to 0 to disable heartbeat messages
-# This parameter must be between 0 and 3600
-#HeartbeatFrequency=60
-
-# How often ZABBIX will perform sync configuration data
-# (in seconds)
-# Default value is 3600 seconds (1h)
-# This parameter must be between 1 and 604800 (1 week)
-#ConfigFrequency=3600
-
-# How often ZABBIX will perform housekeeping procedure
-# (in hours)
-# Default value is 1 hour
-# Housekeeping is removing unnecessary information from
-# tables history, alert, and alarms
-# This parameter must be between 1 and 24
-#HousekeepingFrequency=1
-
-# How often ZABBIX will try to send unsent alerts
-# (in seconds)
-# Default value is 30 seconds
-#SenderFrequency=30
-
-# Local bufer size in hours. Proxy will keep collected data N hours.
-# Default value is 0 hours
-#ProxyLocalBuffer=0
-
-# Offline buffer size in hours. It is used when server is not available.
-# Older data is removed.
-# Default value is 1 hours
-#ProxyOfflineBuffer=1
-
-# Specifies debug level
-# 0 - debug is not created
-# 1 - critical information
-# 2 - error information
-# 3 - warnings (default)
-# 4 - for debugging (produces lots of information)
-#DebugLevel=3
-
-# Specifies how long we wait for agent response (in sec)
-# Must be between 1 and 30 
-Timeout=5
-
-# Specifies how many seconds trapper may spend processing new data
-# Must be between 1 and 30 
-#TrapperTimeout=5
-
-# After how many seconds of unreachability treat a host as unavailable
-#UnreachablePeriod=45
-
-# How ofter check host for availability during the unreachability period
-#UnavailableDelay=15
-
-# How ofter check host for availability during the unavailability period
-#UnavailableDelay=60
-
-# Name of PID file
-PidFile=/var/run/zabbix/zabbix_proxy.pid
-
-# Name of log file
-# If not set, syslog is used
-LogFile=/var/log/zabbix/zabbix_proxy.log
-
-# Maximum size of log file in MB. Set to 0 to disable automatic log rotation.
-#LogFileSize=1
-
-# Location for custom alert scripts
-AlertScriptsPath=/home/zabbix/bin/
-
-# Location of external scripts
-#ExternalScripts=/etc/zabbix/externalscripts
-
-# Location of 'fping. Default is /usr/sbin/fping
-# Make sure that fping binary has root permissions and SUID flag set
-#FpingLocation=/usr/sbin/fping
-
-# Location of fping6. Default is /usr/sbin/fping6
-# Make sure that fping binary has root permissions and SUID flag set
-#Fping6Location=/usr/sbin/fping6
-
-# Temporary directory. Default is /tmp
-#TmpDir=/tmp
-
-# Frequency of ICMP pings (item keys 'icmpping' and 'icmppingsec'). Defauls is 60 seconds.
-#PingerFrequency=60
-
-# Database host name
-# Default is localhost
-
-#DBHost=localhost
-
-# Database name
-# SQLite3 note: path to database file must be provided. DBUser and DBPassword are ignored.
-DBName=proxy
-
-# Database user
-
-DBUser=root
-
-# Database password
-# Comment this line if no password used
-
-#DBPassword=<password>
-
-# Connect to MySQL using Unix socket?
-
-#DBSocket=/var/run/mysqld/mysqld.sock
diff --git a/net-analyzer/zabbix/files/1.6.6/zabbix_server.conf b/net-analyzer/zabbix/files/1.6.6/zabbix_server.conf
deleted file mode 100644
index 63f14c5de83a..000000000000
--- a/net-analyzer/zabbix/files/1.6.6/zabbix_server.conf
+++ /dev/null
@@ -1,155 +0,0 @@
-# This is config file for ZABBIX server process
-# To get more information about ZABBIX, 
-# go http://www.zabbix.com
-
-############ GENERAL PARAMETERS #################
-
-# This defines unique NodeID in distributed setup,
-# Default value 0 (standalone server)
-# This parameter must be between 0 and 999
-#NodeID=0
-
-# Number of pre-forked instances of pollers
-# Default value is 5
-# This parameter must be between 0 and 255
-#StartPollers=5
-
-# Number of pre-forked instances of IPMI pollers
-# Default value is 0
-# This parameter must be between 0 and 255
-#StartIPMIPollers=0
-
-# Number of pre-forked instances of pollers for unreachable hosts
-# Default value is 1
-# This parameter must be between 0 and 255
-#StartPollersUnreachable=1
-
-# Number of pre-forked instances of trappers
-# Default value is 5
-# This parameter must be between 0 and 255
-#StartTrappers=5
-
-# Number of pre-forked instances of ICMP pingers
-# Default value is 1
-# This parameter must be between 0 and 255
-#StartPingers=1
-
-# Number of pre-forked instances of discoverers
-# Default value is 1
-# This parameter must be between 0 and 255
-#StartDiscoverers=1
-
-# Number of pre-forked instances of HTTP pollers
-# Default value is 1
-# This parameter must be between 0 and 255
-#StartHTTPPollers=1
-
-# Listen port for trapper. Default port number is 10051. This parameter 
-# must be between 1024 and 32767
-
-#ListenPort=10051
-
-# Source IP address for outgouing connections
-#SourceIP=
-
-# Listen interface for trapper. Trapper will listen all network interfaces
-# if this parameter is missing.
-
-#ListenIP=127.0.0.1
-
-# How often ZABBIX will perform housekeeping procedure
-# (in hours)
-# Default value is 1 hour
-# Housekeeping is removing unnecessary information from
-# tables history, alert, and alarms
-# This parameter must be between 1 and 24
-
-#HousekeepingFrequency=1
-
-# How often ZABBIX will try to send unsent alerts
-# (in seconds)
-# Default value is 30 seconds
-SenderFrequency=30
-
-# Uncomment this line to disable housekeeping procedure
-#DisableHousekeeping=1
-
-# Specifies debug level
-# 0 - debug is not created
-# 1 - critical information
-# 2 - error information
-# 3 - warnings (default)
-# 4 - for debugging (produces lots of information)
-
-DebugLevel=3
-
-# Specifies how long we wait for agent response (in sec)
-# Must be between 1 and 30 
-Timeout=5
-
-# Specifies how many seconds trapper may spend processing new data
-# Must be between 1 and 30 
-#TrapperTimeout=5
-
-# After how many seconds of unreachability treat a host as unavailable
-#UnreachablePeriod=45
-
-# How ofter check host for availability during the unreachability period
-#UnavailableDelay=15
-
-# How ofter check host for availability during the unavailability period
-#UnavailableDelay=60
-
-# Name of PID file
-
-PidFile=/var/run/zabbix/zabbix_server.pid
-
-# Name of log file
-# If not set, syslog is used
-
-LogFile=/var/log/zabbix/zabbix_server.log
-
-# Maximum size of log file in MB. Set to 0 to disable automatic log rotation.
-#LogFileSize=1
-
-# Location for custom alert scripts
-AlertScriptsPath=/home/zabbix/bin/
-
-# Location of external scripts
-#ExternalScripts=/etc/zabbix/externalscripts
-
-# Location of fping. Default is /usr/sbin/fping
-# Make sure that fping binary has root permissions and SUID flag set
-#FpingLocation=/usr/sbin/fping
-
-# Location of fping6. Default is /usr/sbin/fping6
-# Make sure that fping binary has root permissions and SUID flag set
-#Fping6Location=/usr/sbin/fping6
-
-# Temporary directory. Default is /tmp
-#TmpDir=/tmp
-
-# Frequency of ICMP pings (item keys 'icmpping' and 'icmppingsec'). Defauls is 60 seconds.
-#PingerFrequency=60
-
-# Database host name
-# Default is localhost
-
-#DBHost=localhost
-
-# Database name
-# SQLite3 note: path to database file must be provided. DBUser and DBPassword are ignored.
-DBName=zabbix
-
-# Database user
-
-DBUser=root
-
-# Database password
-# Comment this line if no password used
-
-#DBPassword=<password>
-
-# Connect to MySQL using Unix socket?
-
-#DBSocket=/var/run/mysqld/mysqld.sock
diff --git a/net-analyzer/zabbix/files/1.6.6/zabbix_trapper.conf b/net-analyzer/zabbix/files/1.6.6/zabbix_trapper.conf
deleted file mode 100644
index 8bbe0f99a8cf..000000000000
--- a/net-analyzer/zabbix/files/1.6.6/zabbix_trapper.conf
+++ /dev/null
@@ -1,44 +0,0 @@
-# This is config file for zabbix_trapper
-# To get more information about ZABBIX, 
-# go http://www.zabbix.com
-
-############ GENERAL PARAMETERS #################
-
-# Specifies debug level
-# 1 - critical information
-# 2 - warnings (default)
-# 3 - for debugging (produces lots of information)
-
-DebugLevel=2
-
-# Spend no more than Timeout seconds on processing
-# Must be between 1 and 30
-
-Timeout=3
-
-# Name of log file
-# If not set, syslog will be used
-
-LogFile=/tmp/zabbix_trapper.log
-
-# Database host name
-# Default is localhost
-
-#DBHost=localhost
-
-# Database name
-
-DBName=zabbix
-
-# Database user
-
-DBUser=root
-
-# Database password
-# Comment this line if no password used
-
-#DBPassword=<password>
-
-# Connect to MySQL usig Unix socket?
-
-#DBSocket=/var/run/mysqld/mysqld.sock
diff --git a/net-analyzer/zabbix/files/2.0/init.d/zabbix-agentd b/net-analyzer/zabbix/files/2.0/init.d/zabbix-agentd
deleted file mode 100644
index fc21ec9dddaf..000000000000
--- a/net-analyzer/zabbix/files/2.0/init.d/zabbix-agentd
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-pid_file="/var/run/zabbix/zabbix_agentd.pid"
-
-depend() {
-	need net
-	provide zabbix-agent
-	use zabbix-server
-}
-
-start_pre() {
-	checkpath -d -m 0775 -o zabbix:zabbix /var/run/zabbix
-}
-
-start() {
-	ebegin "Starting Zabbix agent"
-	start-stop-daemon --start --pidfile ${pid_file} \
-		--user zabbix --group zabbix --exec /usr/sbin/zabbix_agentd -- -c /etc/zabbix/zabbix_agentd.conf
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping Zabbix agent"
-	start-stop-daemon  --stop --pidfile ${pid_file}
-	eend $?
-}
diff --git a/net-analyzer/zabbix/files/2.0/init.d/zabbix-proxy b/net-analyzer/zabbix/files/2.0/init.d/zabbix-proxy
deleted file mode 100644
index a16d391385a1..000000000000
--- a/net-analyzer/zabbix/files/2.0/init.d/zabbix-proxy
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-pid_file="/var/run/zabbix/zabbix_proxy.pid"
-
-depend() {
-	need net
-	provide zabbix-proxy
-}
-
-start_pre() {
-	checkpath -d -m 0775 -o zabbix:zabbix /var/run/zabbix
-}
-
-start() {
-	ebegin "Starting Zabbix proxy"
-	start-stop-daemon --start --pidfile ${pid_file} \
-		--user zabbix --group zabbix --exec /usr/sbin/zabbix_proxy -- -c /etc/zabbix/zabbix_proxy.conf
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping Zabbix proxy"
-	start-stop-daemon  --stop --pidfile ${pid_file}
-	eend $?
-}
diff --git a/net-analyzer/zabbix/files/2.0/init.d/zabbix-server b/net-analyzer/zabbix/files/2.0/init.d/zabbix-server
deleted file mode 100644
index 0a3096e584ee..000000000000
--- a/net-analyzer/zabbix/files/2.0/init.d/zabbix-server
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-pid_file="/var/run/zabbix/zabbix_server.pid"
-
-depend() {
-	need net
-	use mysql postgresql
-}
-start_pre() {
-	checkpath -d -m 0775 -o zabbix:zabbix /var/run/zabbix
-}
-
-start() {
-	ebegin "Starting Zabbix server"
-	start-stop-daemon --start --user zabbix --group zabbix --pidfile ${pid_file} \
-	        --exec /usr/sbin/zabbix_server -- -c /etc/zabbix/zabbix_server.conf
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping Zabbix server"
-	start-stop-daemon --stop --pidfile ${pid_file} 
-	eend $?
-}
diff --git a/net-analyzer/zabbix/files/2.0/patches/zbx282.patch b/net-analyzer/zabbix/files/2.0/patches/zbx282.patch
deleted file mode 100644
index 4f8ed94c2bd3..000000000000
--- a/net-analyzer/zabbix/files/2.0/patches/zbx282.patch
+++ /dev/null
@@ -1,182 +0,0 @@
---- configure.in	2013-02-12 04:27:27.000000000 -0700
-+++ configure.in	2013-05-03 07:59:46.318882346 -0600
-@@ -903,19 +903,32 @@
- 	AC_MSG_CHECKING([for the linux kernel version])
- 
- 	kernel=`uname -r`
-+	kernel_major=`uname -r|cut -d. -f1`
-+	kernel_minor=`uname -r|cut -d. -f2`
- 
--	case "${kernel}" in
--		2.6.*)
--			AC_MSG_RESULT([2.6 family (${kernel})])
--			AC_DEFINE([KERNEL_2_6], 1, [Define to 1 if you are using Linux 2.6.x])
--			;;
--		2.4.*)
--			AC_MSG_RESULT([2.4 family (${kernel})])
--			AC_DEFINE([KERNEL_2_4], 1, [Define to 1 if you are using Linux 2.4.x])
--			;;
--		*)
--			AC_MSG_RESULT([unknown family (${kernel})])
--			;;
-+        case "${kernel_major}" in
-+             2)
-+                    case "${$kernel_minor}" in
-+                         6) 
-+                                AC_MSG_RESULT([Linux Kernel >= 2.6.x family (${kernel})])
-+                                AC_DEFINE([KERNEL_2_6_Xplus], 1, [Define to 1 if you are using Linux >= 2.6.x])
-+                                ;;
-+                         4) 
-+                                AC_MSG_RESULT([2.4 family (${kernel})])
-+                                AC_DEFINE([KERNEL_2_4], 1, [Define to 1 if you are using Linux 2.4.x])
-+                                ;;
-+                    esac
-+                    ;;
-+             1)
-+                    echo
-+                    ;;
-+             0)
-+                    echo
-+                    ;;
-+             *)
-+                    AC_MSG_RESULT([Linux Kernel >= 2.6.x family (${kernel})])
-+                    AC_DEFINE([KERNEL_2_6_Xplus], 1, [Define to 1 if you are using Linux >= 2.6.x])
-+                    ;;
- 	esac
- fi
- 
---- include/config.h.in	2013-02-12 04:27:41.000000000 -0700
-+++ include/config.h.in	2013-05-03 07:47:39.658588709 -0600
-@@ -507,8 +507,8 @@
- /* Define to 1 if you are using Linux 2.4.x */
- #undef KERNEL_2_4
- 
--/* Define to 1 if you are using Linux 2.6.x */
--#undef KERNEL_2_6
-+/* Define to 1 if you are using Linux >= 2.6.x */
-+#undef KERNEL_2_6_Xplus
- 
- /* Define to 1 if LDAP depricated functions is used. */
- #undef LDAP_DEPRECATED
-
---- src/libs/zbxsysinfo/linux/sensors.c	2013-02-12 04:27:22.000000000 -0700
-+++ src/libs/zbxsysinfo/linux/sensors.c	2013-05-03 07:47:39.658588709 -0600
-@@ -20,14 +20,21 @@
- #include "common.h"
- #include "sysinfo.h"
- 
--#ifdef KERNEL_2_4
-+#if defined(KERNEL_2_4) || defined(KERNEL_2_6_Xplus)
- 
- #define DO_ONE	0
- #define DO_AVG	1
- #define DO_MAX	2
- #define DO_MIN	3
- 
-+#if defined(KERNEL_2_4)
- #define DEVICE_DIR	"/proc/sys/dev/sensors"
-+#endif
-+
-+#if defined(KERNEL_2_6_Xplus)
-+#define DEVICE_DIR	"/sys/class/hwmon"
-+#define	EXTRA		"device"
-+#endif
- 
- static void	count_sensor(int do_task, const char *filename, double *aggr, int *cnt)
- {
-@@ -46,9 +53,17 @@
- 
- 	zbx_fclose(f);
- 
--	if (1 == sscanf(line, "%*f\t%*f\t%lf\n", &value))
-+#if defined(KERNEL_2_6_Xplus)
-+       if (1 == sscanf(line, "%lf", &value))
-+#else
-+        if (1 == sscanf(line, "%*lf\t%*lf\t%lf\n", &value))
-+#endif
- 	{
- 		(*cnt)++;
-+#if defined(KERNEL_2_6_Xplus)
-+               if(NULL == strstr(filename, "fan"))
-+                       value = value / 1000;
-+#endif
- 
- 		switch (do_task)
- 		{
-@@ -70,11 +85,35 @@
- 
- static void	get_device_sensors(int do_task, const char *device, const char *name, double *aggr, int *cnt)
- {
-+#if defined(KERNEL_2_6_Xplus)
-+	struct stat buffer;
-+	int	use_extra = 0;
-+#endif
- 	char	sensorname[MAX_STRING_LEN];
-+	char	sensortest[MAX_STRING_LEN];
-+
-+#if defined(KERNEL_2_6_Xplus)
-+	zbx_snprintf(sensortest, sizeof(sensortest), "%s/%s/name", DEVICE_DIR, device);
-+	if(stat(sensortest, &buffer) != 0)
-+	{
-+		zbx_snprintf(sensortest, sizeof(sensortest), "%s/%s/device/name", DEVICE_DIR, device);
-+		if(stat(sensortest, &buffer) == 0)
-+		{
-+			use_extra = 1;
-+		}
-+	}
-+#endif
- 
- 	if (DO_ONE == do_task)
- 	{
-+#if defined(KERNEL_2_6_Xplus)
-+		if(use_extra)
-+			zbx_snprintf(sensorname, sizeof(sensorname), "%s/%s/%s/%s_input", DEVICE_DIR, device, EXTRA, name);
-+		else
-+			zbx_snprintf(sensorname, sizeof(sensorname), "%s/%s/%s_input", DEVICE_DIR, device, name);
-+#else
- 		zbx_snprintf(sensorname, sizeof(sensorname), "%s/%s/%s", DEVICE_DIR, device, name);
-+#endif
- 		count_sensor(do_task, sensorname, aggr, cnt);
- 	}
- 	else
-@@ -94,7 +133,14 @@
- 			if (NULL == zbx_regexp_match(deviceent->d_name, device, NULL))
- 				continue;
- 
-+#if defined(KERNEL_2_6_Xplus)
-+			if(use_extra)
-+				zbx_snprintf(devicename, sizeof(devicename), "%s/%s/%s", DEVICE_DIR, deviceent->d_name, EXTRA);
-+			else
-+				zbx_snprintf(devicename, sizeof(devicename), "%s/%s", DEVICE_DIR, deviceent->d_name);
-+#else
- 			zbx_snprintf(devicename, sizeof(devicename), "%s/%s", DEVICE_DIR, deviceent->d_name);
-+#endif
- 
- 			if (NULL == (sensordir = opendir(devicename)))
- 				continue;
-@@ -107,7 +153,19 @@
- 				if (NULL == zbx_regexp_match(sensorent->d_name, name, NULL))
- 					continue;
- 
-+#if defined(KERNEL_2_6_Xplus)
-+				if (0 != strcmp(sensorent->d_name + strlen(sensorent->d_name) - 6, "_input"))
-+					continue;
-+#endif
-+
-+#if defined(KERNEL_2_6_Xplus)
-+				if(use_extra)
-+					zbx_snprintf(sensorname, sizeof(sensorname), "%s/%s/%s", devicename, sensorent->d_name, EXTRA);
-+				else
-+					zbx_snprintf(sensorname, sizeof(sensorname), "%s/%s", devicename, sensorent->d_name);
-+#else
- 				zbx_snprintf(sensorname, sizeof(sensorname), "%s/%s", devicename, sensorent->d_name);
-+#endif
- 				count_sensor(do_task, sensorname, aggr, cnt);
- 			}
- 			closedir(sensordir);
-@@ -162,4 +220,4 @@
- 	return SYSINFO_RET_FAIL;
- }
- 
--#endif	/* KERNEL_2_4 */
-+#endif	/* KERNEL_2_4 || KERNEL_2_6_Xplus */
diff --git a/net-analyzer/zabbix/files/2.0/patches/zbx6097.patch b/net-analyzer/zabbix/files/2.0/patches/zbx6097.patch
deleted file mode 100644
index 65d92a873f8e..000000000000
--- a/net-analyzer/zabbix/files/2.0/patches/zbx6097.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-Index: frontends/php/authentication.php
-===================================================================
---- frontends/php/authentication.php	(revision 32376)
-+++ frontends/php/authentication.php	(revision 32393)
-@@ -101,12 +101,11 @@
- 			$config['authentication_type'] = $_REQUEST['config'];
- 
- 			// check login/password
--			$login = API::User()->ldapLogin(array(
--				'user' => get_request('user', $USER_DETAILS['alias']),
--				'password' => get_request('user_password', ''),
--				'cnf' => $ldap_cnf
--			));
-+			$ldap = new CLdap($ldap_cnf);
-+			$ldap->connect();
-+			$login = $ldap->checkPass(get_request('user', $USER_DETAILS['alias']), get_request('user_password', ''));
- 			if (!$login) {
-+				error(_('Login name or password is incorrect'));
- 				throw new Exception();
- 			}
- 
-@@ -129,12 +128,13 @@
- 	}
- 	elseif (isset($_REQUEST['test'])) {
- 		// check login/password
--		$result = API::User()->ldapLogin(array(
--			'user' => get_request('user', $USER_DETAILS['alias']),
--			'password' => get_request('user_password', ''),
--			'cnf' => $ldap_cnf
--		));
-+		$ldap = new CLdap($ldap_cnf);
-+		$ldap->connect();
-+		$result = $ldap->checkPass(get_request('user', $USER_DETAILS['alias']), get_request('user_password', ''));
- 
-+		if (!$result)
-+			error(_('Login name or password is incorrect'));{
-+		}
- 		show_messages($result, _('LDAP login successful'), _('LDAP login was not successful'));
- 	}
- }
-Index: frontends/php/api/classes/CUser.php
-===================================================================
---- frontends/php/api/classes/CUser.php	(revision 32376)
-+++ frontends/php/api/classes/CUser.php	(revision 32393)
-@@ -822,15 +822,12 @@
- 	// ******************************************************************************
- 	// LOGIN Methods
- 	// ******************************************************************************
--	public function ldapLogin($user) {
--		$cnf = isset($user['cnf']) ? $user['cnf'] : null;
--
--		if (is_null($cnf)) {
--			$config = select_config();
--			foreach ($config as $id => $value) {
--				if (zbx_strpos($id, 'ldap_') !== false) {
--					$cnf[str_replace('ldap_', '', $id)] = $config[$id];
--				}
-+	protected function ldapLogin($user) {
-+		$config = select_config();
-+		$cnf = array();
-+		foreach ($config as $id => $value) {
-+			if (zbx_strpos($id, 'ldap_') !== false) {
-+				$cnf[str_replace('ldap_', '', $id)] = $config[$id];
- 			}
- 		}
- 
diff --git a/net-analyzer/zabbix/files/2.0/patches/zbx7479.patch b/net-analyzer/zabbix/files/2.0/patches/zbx7479.patch
deleted file mode 100644
index 52cabd4750ea..000000000000
--- a/net-analyzer/zabbix/files/2.0/patches/zbx7479.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-Index: src/libs/zbxsysinfo/sysinfo.c
-===================================================================
---- src/libs/zbxsysinfo/sysinfo.c	(revision 40346)
-+++ src/libs/zbxsysinfo/sysinfo.c	(working copy)
-@@ -267,13 +267,49 @@
- 		test_parameter(commands[i].key, PROCESS_TEST | PROCESS_USE_TEST_PARAM);
- }
- 
-+static int	zbx_check_user_parameter(const char *param, char *error, int max_error_len)
-+{
-+	const char	suppressed_chars[] = "\\'\"`*?[]{}~$!&;()<>|#@\n", *c;
-+	char		*buf = NULL;
-+	size_t		buf_alloc = 128, buf_offset = 0;
-+
-+	if (0 != CONFIG_UNSAFE_USER_PARAMETERS)
-+		return SUCCEED;
-+
-+	for (c = suppressed_chars; '\0' != *c; c++)
-+	{
-+		if (NULL == strchr(param, *c))
-+			continue;
-+
-+		buf = zbx_malloc(buf, buf_alloc);
-+
-+		for (c = suppressed_chars; '\0' != *c; c++)
-+		{
-+			if (c != suppressed_chars)
-+				zbx_strcpy_alloc(&buf, &buf_alloc, &buf_offset, ", ");
-+
-+			if (0 != isprint(*c))
-+				zbx_chrcpy_alloc(&buf, &buf_alloc, &buf_offset, *c);
-+			else
-+				zbx_snprintf_alloc(&buf, &buf_alloc, &buf_offset, "0x%02x", *c);
-+		}
-+
-+		zbx_snprintf(error, max_error_len, "special characters \"%s\" are not allowed in the parameters", buf);
-+
-+		zbx_free(buf);
-+
-+		return FAIL;
-+	}
-+
-+	return SUCCEED;
-+}
-+
- static int	replace_param(const char *cmd, const char *param, char *out, int outlen, char *error, int max_error_len)
- {
- 	int		ret = SUCCEED;
- 	char		buf[MAX_STRING_LEN];
- 	char		command[MAX_STRING_LEN];
- 	char		*pl, *pr;
--	const char	suppressed_chars[] = "\\'\"`*?[]{}~$!&;()<>|#@", *c;
- 
- 	assert(out);
- 
-@@ -305,25 +341,10 @@
- 			{
- 				get_param(param, (int)(pr[1] - '0'), buf, sizeof(buf));
- 
--				if (0 == CONFIG_UNSAFE_USER_PARAMETERS)
--				{
--					for (c = suppressed_chars; '\0' != *c; c++)
--					{
--						if (NULL != strchr(buf, *c))
--						{
--							zbx_snprintf(error, max_error_len, "Special characters '%s'"
--									" are not allowed in the parameters",
--									suppressed_chars);
--							ret = FAIL;
--							break;
--						}
--					}
--				}
-+				if (SUCCEED != (ret = zbx_check_user_parameter(buf, error, max_error_len)))
-+					break;
- 			}
- 
--			if (FAIL == ret)
--				break;
--
- 			zbx_strlcat(out, buf, outlen);
- 			outlen -= MIN((int)strlen(buf), (int)outlen);
- 
diff --git a/net-analyzer/zabbix/files/2.0/zabbix_proxy.conf b/net-analyzer/zabbix/files/2.0/zabbix_proxy.conf
deleted file mode 100644
index 21eed90f2461..000000000000
--- a/net-analyzer/zabbix/files/2.0/zabbix_proxy.conf
+++ /dev/null
@@ -1,463 +0,0 @@
-# This is a configuration file for Zabbix Proxy process
-# To get more information about Zabbix,
-# visit http://www.zabbix.com
-
-############ GENERAL PARAMETERS #################
-
-### Option: ProxyMode
-#	Proxy operating mode
-#	0 - proxy in the active mode
-#	1 - proxy in the passive mode
-#
-# Mandatory: no
-# Default:
-# ProxyMode=0
-
-### Option: Server
-#	IP address (or hostname) of Zabbix server.
-#	Active proxy will get configuration data from the server.
-#	For a proxy in the passive mode this parameter will be ignored.
-#
-# Mandatory: yes (if ProxyMode is set to 0)
-# Default:
-# Server=
-
-Server=127.0.0.1
-
-### Option: ServerPort
-#	Port of Zabbix trapper on Zabbix server.
-#	For a proxy in the passive mode this parameter will be ignored.
-#
-# Mandatory: no
-# Range: 1024-32767
-# Default:
-# ServerPort=10051
-
-### Option: Hostname
-#	Unique, case sensitive Proxy name. Make sure the Proxy name is known to the server!
-#	Value is acquired from HostnameItem if undefined.
-#
-# Mandatory: no
-# Default:
-# Hostname=
-
-Hostname=proxy
-
-### Option: HostnameItem
-#	Item used for generating Hostname if it is undefined.
-#	Ignored if Hostname is defined.
-#
-# Mandatory: no
-# Default:
-# HostnameItem=system.hostname
-
-### Option: ListenPort
-#	Listen port for trapper.
-#
-# Mandatory: no
-# Range: 1024-32767
-# Default:
-# ListenPort=10051
-
-### Option: SourceIP
-#	Source IP address for outgoing connections.
-#
-# Mandatory: no
-# Default:
-# SourceIP=
-
-### Option: LogFile
-#	Name of log file.
-#	If not set, syslog is used.
-#
-# Mandatory: no
-# Default:
-# LogFile=
-
-LogFile=/var/log/zabbix/zabbix_proxy.log
-
-### Option: LogFileSize
-#	Maximum size of log file in MB.
-#	0 - disable automatic log rotation.
-#
-# Mandatory: no
-# Range: 0-1024
-# Default:
-# LogFileSize=1
-
-### Option: DebugLevel
-#	Specifies debug level
-#	0 - no debug
-#	1 - critical information
-#	2 - error information
-#	3 - warnings
-#	4 - for debugging (produces lots of information)
-#
-# Mandatory: no
-# Range: 0-4
-# Default:
-# DebugLevel=3
-
-### Option: PidFile
-#	Name of PID file.
-#
-# Mandatory: no
-# Default:
-# PidFile=/tmp/zabbix_proxy.pid
-
-### Option: DBHost
-#	Database host name.
-#	If set to localhost, socket is used for MySQL.
-#	If set to empty string, socket is used for PostgreSQL.
-#
-# Mandatory: no
-# Default:
-# DBHost=localhost
-
-### Option: DBName
-#	Database name.
-#	For SQLite3 path to database file must be provided. DBUser and DBPassword are ignored.
-#	Warning: do not attempt to use the same database Zabbix server is using.
-#
-# Mandatory: yes
-# Default:
-# DBName=
-
-DBName=zabbix_proxy
-
-### Option: DBSchema
-#	Schema name. Used for IBM DB2.
-#
-# Mandatory: no
-# Default:
-# DBSchema=
-
-### Option: DBUser
-#	Database user. Ignored for SQLite.
-#
-# Default:
-# DBUser=
-
-DBUser=zabbix
-
-### Option: DBPassword
-#	Database password. Ignored for SQLite.
-#	Comment this line if no password is used.
-#
-# Mandatory: no
-# Default:
-# DBPassword=
-
-### Option: DBSocket
-#	Path to MySQL socket.
-#
-# Mandatory: no
-# Default:
-# DBSocket=/tmp/mysql.sock
-
-# Option: DBPort
-#	Database port when not using local socket. Ignored for SQLite.
-#
-# Mandatory: no
-# Default (for MySQL):
-# DBPort=3306
-
-######### PROXY SPECIFIC PARAMETERS #############
-
-### Option: ProxyLocalBuffer
-#	Proxy will keep data locally for N hours, even if the data have already been synced with the server.
-#	This parameter may be used if local data will be used by third party applications.
-#
-# Mandatory: no
-# Range: 0-720
-# Default:
-# ProxyLocalBuffer=0
-
-### Option: ProxyOfflineBuffer
-#	Proxy will keep data for N hours in case if no connectivity with Zabbix Server.
-#	Older data will be lost.
-#
-# Mandatory: no
-# Range: 1-720
-# Default:
-# ProxyOfflineBuffer=1
-
-### Option: HeartbeatFrequency
-#	Frequency of heartbeat messages in seconds.
-#	Used for monitoring availability of Proxy on server side.
-#	0 - heartbeat messages disabled.
-#	For a proxy in the passive mode this parameter will be ignored.
-#
-# Mandatory: no
-# Range: 0-3600
-# Default:
-# HeartbeatFrequency=60
-
-### Option: ConfigFrequency
-#	How often proxy retrieves configuration data from Zabbix Server in seconds.
-#	For a proxy in the passive mode this parameter will be ignored.
-#
-# Mandatory: no
-# Range: 1-3600*24*7
-# Default:
-# ConfigFrequency=3600
-
-### Option: DataSenderFrequency
-#	Proxy will send collected data to the Server every N seconds.
-#	For a proxy in the passive mode this parameter will be ignored.
-#
-# Mandatory: no
-# Range: 1-3600
-# Default:
-# DataSenderFrequency=1
-
-############ ADVANCED PARAMETERS ################
-
-### Option: StartPollers
-#	Number of pre-forked instances of pollers.
-#
-# Mandatory: no
-# Range: 0-1000
-# Default:
-# StartPollers=5
-
-### Option: StartIPMIPollers
-#	Number of pre-forked instances of IPMI pollers.
-#
-# Mandatory: no
-# Range: 0-1000
-# Default:
-# StartIPMIPollers=0
-
-### Option: StartPollersUnreachable
-#	Number of pre-forked instances of pollers for unreachable hosts (including IPMI).
-#
-# Mandatory: no
-# Range: 0-1000
-# Default:
-# StartPollersUnreachable=1
-
-### Option: StartTrappers
-#	Number of pre-forked instances of trappers.
-#	Trappers accept incoming connections from Zabbix sender and active agents.
-#
-# Mandatory: no
-# Range: 0-1000
-# Default:
-# StartTrappers=5
-
-### Option: StartPingers
-#	Number of pre-forked instances of ICMP pingers.
-#
-# Mandatory: no
-# Range: 0-1000
-# Default:
-# StartPingers=1
-
-### Option: StartDiscoverers
-#	Number of pre-forked instances of discoverers.
-#
-# Mandatory: no
-# Range: 0-250
-# Default:
-# StartDiscoverers=1
-
-### Option: StartHTTPPollers
-#	Number of pre-forked instances of HTTP pollers.
-#
-# Mandatory: no
-# Range: 0-1000
-# Default:
-# StartHTTPPollers=1
-
-### Option: JavaGateway
-#	IP address (or hostname) of Zabbix Java gateway.
-#	Only required if Java pollers are started.
-#
-# Mandatory: no
-# Default:
-# JavaGateway=
-
-### Option: JavaGatewayPort
-#	Port that Zabbix Java gateway listens on.
-#
-# Mandatory: no
-# Range: 1024-32767
-# Default:
-# JavaGatewayPort=10052
-
-### Option: StartJavaPollers
-#	Number of pre-forked instances of Java pollers.
-#
-# Mandatory: no
-# Range: 0-1000
-# Default:
-# StartJavaPollers=0
-
-### Option: SNMPTrapperFile
-#	Temporary file used for passing data from SNMP trap daemon to the proxy.
-#	Must be the same as in zabbix_trap_receiver.pl or SNMPTT configuration file.
-#
-# Mandatory: no
-# Default:
-# SNMPTrapperFile=/tmp/zabbix_traps.tmp
-
-### Option: StartSNMPTrapper
-#	If 1, SNMP trapper process is started.
-#
-# Mandatory: no
-# Range: 0-1
-# Default:
-# StartSNMPTrapper=0
-
-### Option: ListenIP
-#	List of comma delimited IP addresses that the trapper should listen on.
-#	Trapper will listen on all network interfaces if this parameter is missing.
-#
-# Mandatory: no
-# Default:
-# ListenIP=0.0.0.0
-
-### Option: HousekeepingFrequency
-#	How often Zabbix will perform housekeeping procedure (in hours).
-#	Housekeeping is removing unnecessary information from history, alert, and alarms tables.
-#
-# Mandatory: no
-# Range: 1-24
-# Default:
-# HousekeepingFrequency=1
-
-### Option: CacheSize
-#	Size of configuration cache, in bytes.
-#	Shared memory size, for storing hosts and items data.
-#
-# Mandatory: no
-# Range: 128K-2G
-# Default:
-# CacheSize=8M
-
-### Option: StartDBSyncers
-#	Number of pre-forked instances of DB Syncers
-#
-# Mandatory: no
-# Range: 1-100
-# Default:
-# StartDBSyncers=4
-
-### Option: HistoryCacheSize
-#	Size of history cache, in bytes.
-#	Shared memory size for storing history data.
-#
-# Mandatory: no
-# Range: 128K-2G
-# Default:
-# HistoryCacheSize=8M
-
-### Option: HistoryTextCacheSize
-#	Size of text history cache, in bytes.
-#	Shared memory size for storing character, text or log history data.
-#
-# Mandatory: no
-# Range: 128K-2G
-# Default:
-# HistoryTextCacheSize=16M
-
-### Option: Timeout
-#	Specifies how long we wait for agent, SNMP device or external check (in seconds).
-#
-# Mandatory: no
-# Range: 1-30
-# Default:
-# Timeout=3
-
-### Option: TrapperTimeout
-#	Specifies how many seconds trapper may spend processing new data.
-#
-# Mandatory: no
-# Range: 1-300
-# Default:
-# TrapperTimeout=300
-
-### Option: UnreachablePeriod
-#	After how many seconds of unreachability treat a host as unavailable.
-#
-# Mandatory: no
-# Range: 1-3600
-# Default:
-# UnreachablePeriod=45
-
-### Option: UnavailableDelay
-#	How often host is checked for availability during the unavailability period, in seconds.
-#
-# Mandatory: no
-# Range: 1-3600
-# Default:
-# UnavailableDelay=60
-
-### Option: UnreachableDelay
-#	How often host is checked for availability during the unreachability period, in seconds.
-#
-# Mandatory: no
-# Range: 1-3600
-# Default:
-# UnreachableDelay=15
-
-### Option: ExternalScripts
-#	Full path to location of external scripts.
-#	Default depends on compilation options.
-#
-# Mandatory: no
-# Default:
-# ExternalScripts=${datadir}/zabbix/externalscripts
-
-### Option: FpingLocation
-#	Location of fping.
-#	Make sure that fping binary has root ownership and SUID flag set.
-#
-# Mandatory: no
-# Default:
-# FpingLocation=/usr/sbin/fping
-
-### Option: Fping6Location
-#	Location of fping6.
-#	Make sure that fping6 binary has root ownership and SUID flag set.
-#	Make empty if your fping utility is capable to process IPv6 addresses.
-#
-# Mandatory: no
-# Default:
-# Fping6Location=/usr/sbin/fping6
-
-### Option: SSHKeyLocation
-#	Location of public and private keys for SSH checks and actions
-#
-# Mandatory: no
-# Default:
-# SSHKeyLocation=
-
-### Option: LogSlowQueries
-#	How long a database query may take before being logged (in milliseconds).
-#	Only works if DebugLevel set to 3 or 4.
-#	0 - don't log slow queries.
-#
-# Mandatory: no
-# Range: 1-3600000
-# Default:
-# LogSlowQueries=0
-
-### Option: TmpDir
-#	Temporary directory.
-#
-# Mandatory: no
-# Default:
-# TmpDir=/tmp
-
-### Option: Include
-#	You may include individual files or all files in a directory in the configuration file.
-#	Installing Zabbix will create include directory in /usr/local/etc, unless modified during the compile time.
-#
-# Mandatory: no
-# Default:
-# Include=
-
-# Include=/usr/local/etc/zabbix_proxy.general.conf
-# Include=/usr/local/etc/zabbix_proxy.conf.d/
diff --git a/net-analyzer/zabbix/zabbix-2.2.11.ebuild b/net-analyzer/zabbix/zabbix-2.2.11.ebuild
new file mode 100644
index 000000000000..33b121098d01
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-2.2.11.ebuild
@@ -0,0 +1,363 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+# needed to make webapp-config dep optional
+WEBAPP_OPTIONAL="yes"
+inherit flag-o-matic webapp depend.php autotools java-pkg-opt-2 user systemd toolchain-funcs
+
+DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
+HOMEPAGE="http://www.zabbix.com/"
+MY_P=${P/_/}
+MY_PV=${PV/_/}
+SRC_URI="http://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+WEBAPP_MANUAL_SLOT="yes"
+KEYWORDS="~amd64 ~x86"
+IUSE="agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh snmp sqlite odbc static"
+
+COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
+	ldap? (
+		net-nds/openldap
+		=dev-libs/cyrus-sasl-2*
+		net-libs/gnutls
+	)
+	mysql? ( >=virtual/mysql-5.0.3 )
+	sqlite? ( >=dev-db/sqlite-3.3.5 )
+	postgres? ( dev-db/postgresql:* )
+	oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
+	xmpp? ( dev-libs/iksemel )
+	libxml2? ( dev-libs/libxml2 )
+	curl? ( net-misc/curl )
+	openipmi? ( sys-libs/openipmi )
+	ssh? ( net-libs/libssh2 )
+	java? ( virtual/jdk:* )
+	odbc? ( dev-db/unixODBC )"
+
+RDEPEND="${COMMON_DEPEND}
+	proxy? ( <=net-analyzer/fping-2.9 )
+	server? ( <=net-analyzer/fping-2.9
+		app-admin/webapp-config )
+	java?	(
+		>=virtual/jre-1.4
+		dev-java/slf4j-api
+	)
+	frontend? (
+		>=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
+		|| ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
+		media-libs/gd[png]
+		app-admin/webapp-config )"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+ZABBIXJAVA_BASE="opt/zabbix_java"
+
+java_prepare() {
+	cd "${S}/src/zabbix_java/lib"
+	rm -v *.jar || die
+
+	java-pkg_jar-from slf4j-api
+}
+
+src_prepare() {
+	eautoreconf
+}
+
+pkg_setup() {
+	if use server || use proxy ; then
+		local dbnum dbtypes="mysql oracle postgres sqlite" dbtype
+		declare -i dbnum=0
+		for dbtype in ${dbtypes}; do
+			use ${dbtype} && let dbnum++
+		done
+		if [ ${dbnum} -gt 1 ]; then
+			eerror
+			eerror "You can't use more than one database type in Zabbix."
+			eerror "Select exactly one database type out of these: ${dbtypes}"
+			eerror
+			die "Multiple database types selected."
+		elif [ ${dbnum} -lt 1 ]; then
+			eerror
+			eerror "Select exactly one database type out of these: ${dbtypes}"
+			eerror
+			die "No database type selected."
+		fi
+		if use oracle; then
+			if [ -z "${ORACLE_HOME}" ]; then
+				eerror
+				eerror "The environment variable ORACLE_HOME must be set"
+				eerror "and point to the correct location."
+				eerror "It looks like you don't have Oracle installed."
+				eerror
+				die "Environment variable ORACLE_HOME is not set"
+			fi
+			if has_version 'dev-db/oracle-instantclient-basic'; then
+				ewarn
+				ewarn "Please ensure you have a full install of the Oracle client."
+				ewarn "dev-db/oracle-instantclient* is NOT sufficient."
+				ewarn
+			fi
+		fi
+	fi
+
+	if use frontend; then
+		webapp_pkg_setup
+	fi
+
+	enewgroup zabbix
+	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
+}
+
+pkg_postinst() {
+	if use server || use proxy ; then
+		elog
+		elog "You may need to configure your database for Zabbix,"
+		elog "if you have not already done so. "
+		elog
+
+		zabbix_homedir=$(egethome zabbix)
+		if [ -n "${zabbix_homedir}" ] && \
+		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
+			ewarn
+			ewarn "The user 'zabbix' should have his homedir changed"
+			ewarn "to /var/lib/zabbix/home if you want to use"
+			ewarn "custom alert scripts."
+			ewarn
+			ewarn "A real homedir might be needed for configfiles"
+			ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
+			ewarn "using sendxmpp for Jabber alerts)."
+			ewarn
+			ewarn "To change the homedir use:"
+			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
+			ewarn
+		fi
+	fi
+
+	if use server; then
+		elog
+		elog "For distributed monitoring you have to run:"
+		elog
+		elog "zabbix_server -n <nodeid>"
+		elog
+		elog "This will convert database data for use with Node ID"
+		elog "and also adds a local node."
+		elog
+	fi
+
+	elog "--"
+	elog
+	elog "You may need to add these lines to /etc/services:"
+	elog
+	elog "zabbix-agent     10050/tcp Zabbix Agent"
+	elog "zabbix-agent     10050/udp Zabbix Agent"
+	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
+	elog "zabbix-trapper   10051/udp Zabbix Trapper"
+	elog
+
+	elog "Feel free to download or contribute gentoo specific zabbix templates"
+	elog "via https://github.com/deploylinux/gentooZabbixTemplates (WIP)."
+
+	# repeat fowners/fperms functionality from src_install()
+	# here to catch wrong permissions on existing files in
+	# the live filesystem (yeah, that sucks).
+	chown -R zabbix:zabbix \
+		"${ROOT}"/etc/zabbix \
+		"${ROOT}"/var/lib/zabbix \
+		"${ROOT}"/var/lib/zabbix/home \
+		"${ROOT}"/var/lib/zabbix/scripts \
+		"${ROOT}"/var/log/zabbix
+	chmod 0750 \
+		"${ROOT}"/etc/zabbix \
+		"${ROOT}"/var/lib/zabbix \
+		"${ROOT}"/var/lib/zabbix/home \
+		"${ROOT}"/var/lib/zabbix/scripts \
+		"${ROOT}"/var/log/zabbix
+
+	chmod 0640 \
+		"${ROOT}"/etc/zabbix/zabbix_*
+
+	if use server || use proxy ; then
+		# check for fping
+		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
+		case "${fping_perms}" in
+			4[157][157][157])
+				;;
+			*)
+				ewarn
+				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
+				ewarn "you have to make /usr/sbin/fping setuid root and executable"
+				ewarn "by everyone. Run the following command to fix it:"
+				ewarn
+				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
+				ewarn
+				ewarn "Please be aware that this might impose a security risk,"
+				ewarn "depending on the code quality of fping."
+				ewarn
+				;;
+		esac
+	fi
+}
+
+src_configure() {
+
+	econf \
+		$(use_enable server) \
+		$(use_enable proxy) \
+		$(use_enable agent) \
+		$(use_enable ipv6) \
+		$(use_enable static) \
+		$(use_enable java) \
+		$(use_with ldap) \
+		$(use_with snmp net-snmp) \
+		$(use_with mysql) \
+		$(use_with postgres postgresql) \
+		$(use_with oracle) \
+		$(use_with sqlite sqlite3) \
+		$(use_with xmpp jabber) \
+		$(use_with curl libcurl) \
+		$(use_with openipmi openipmi) \
+		$(use_with ssh ssh2) \
+		$(use_with libxml2) \
+		$(use_with odbc unixodbc) \
+		|| die "econf failed"
+}
+
+src_install() {
+	dodir \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	keepdir \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	if use server; then
+		insinto /etc/zabbix
+		doins "${FILESDIR}/2.2"/zabbix_server.conf
+		doinitd "${FILESDIR}/2.2"/init.d/zabbix-server
+		dosbin src/zabbix_server/zabbix_server
+		fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf
+		fperms 0640 /etc/zabbix/zabbix_server.conf
+		dodir /usr/share/zabbix
+		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
+		systemd_dounit "${FILESDIR}/zabbix-server.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf
+	fi
+
+	if use proxy; then
+		doinitd \
+			"${FILESDIR}/2.2"/init.d/zabbix-proxy
+		dosbin \
+			src/zabbix_proxy/zabbix_proxy
+		insinto /etc/zabbix
+		doins \
+			"${FILESDIR}/2.2"/zabbix_proxy.conf
+		dodir /usr/share/zabbix
+		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
+		systemd_dounit "${FILESDIR}/zabbix-proxy.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		insinto /etc/zabbix
+		doins \
+			"${FILESDIR}/2.2"/zabbix_agent.conf \
+			"${FILESDIR}/2.2"/zabbix_agentd.conf
+		doinitd "${FILESDIR}/2.2"/init.d/zabbix-agentd
+		dosbin \
+			src/zabbix_agent/zabbix_agent \
+			src/zabbix_agent/zabbix_agentd
+		dobin \
+			src/zabbix_sender/zabbix_sender \
+			src/zabbix_get/zabbix_get
+		fowners zabbix:zabbix \
+			/etc/zabbix/zabbix_agent.conf \
+			/etc/zabbix/zabbix_agentd.conf
+		fperms 0640 \
+			/etc/zabbix/zabbix_agent.conf \
+			/etc/zabbix/zabbix_agentd.conf
+		systemd_dounit "${FILESDIR}/zabbix-agentd.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf
+	fi
+
+	fowners zabbix:zabbix \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+	fperms 0750 \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	dodoc README INSTALL NEWS ChangeLog \
+		conf/zabbix_agent.conf \
+		conf/zabbix_agentd.conf \
+		conf/zabbix_proxy.conf \
+		conf/zabbix_agentd/userparameter_examples.conf \
+		conf/zabbix_agentd/userparameter_mysql.conf \
+		conf/zabbix_server.conf
+
+	if use frontend; then
+		webapp_src_preinst
+		cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
+		webapp_postinst_txt en "${FILESDIR}/"1.6.6/postinstall-en.txt
+		webapp_configfile \
+			"${MY_HTDOCSDIR}"/include/db.inc.php \
+			"${MY_HTDOCSDIR}"/include/config.inc.php
+		webapp_src_install
+	fi
+
+	if use java; then
+	   dodir \
+	   	/${ZABBIXJAVA_BASE} \
+		/${ZABBIXJAVA_BASE}/bin \
+		/${ZABBIXJAVA_BASE}/lib
+	   keepdir /${ZABBIXJAVA_BASE}
+	   exeinto /${ZABBIXJAVA_BASE}/bin
+	   doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
+	   exeinto /${ZABBIXJAVA_BASE}/lib
+	   doexe \
+	   	src/zabbix_java/lib/logback-classic-0.9.27.jar \
+		src/zabbix_java/lib/logback-console.xml \
+		src/zabbix_java/lib/logback-core-0.9.27.jar \
+		src/zabbix_java/lib/logback.xml \
+		src/zabbix_java/lib/android-json-4.3_r3.1.jar \
+		src/zabbix_java/lib/slf4j-api-1.6.1.jar
+	   exeinto /${ZABBIXJAVA_BASE}/
+	   doexe \
+	   	src/zabbix_java/settings.sh \
+		src/zabbix_java/startup.sh \
+		src/zabbix_java/shutdown.sh
+	   fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
+	fi
+
+}
+
+src_compile() {
+	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
+		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed"
+	fi
+}
diff --git a/net-analyzer/zabbix/zabbix-2.4.7.ebuild b/net-analyzer/zabbix/zabbix-2.4.7.ebuild
new file mode 100644
index 000000000000..01aca05aa5e4
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-2.4.7.ebuild
@@ -0,0 +1,363 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+# needed to make webapp-config dep optional
+WEBAPP_OPTIONAL="yes"
+inherit flag-o-matic webapp depend.php autotools java-pkg-opt-2 user systemd toolchain-funcs
+
+DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
+HOMEPAGE="http://www.zabbix.com/"
+MY_P=${P/_/}
+MY_PV=${PV/_/}
+SRC_URI="http://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+WEBAPP_MANUAL_SLOT="yes"
+KEYWORDS="~amd64 ~x86"
+IUSE="agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh snmp sqlite odbc static"
+
+COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
+	ldap? (
+		net-nds/openldap
+		=dev-libs/cyrus-sasl-2*
+		net-libs/gnutls
+	)
+	mysql? ( >=virtual/mysql-5.0.3 )
+	sqlite? ( >=dev-db/sqlite-3.3.5 )
+	postgres? ( dev-db/postgresql:* )
+	oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
+	xmpp? ( dev-libs/iksemel )
+	libxml2? ( dev-libs/libxml2 )
+	curl? ( net-misc/curl )
+	openipmi? ( sys-libs/openipmi )
+	ssh? ( net-libs/libssh2 )
+	java? ( virtual/jdk:* )
+	odbc? ( dev-db/unixODBC )"
+
+RDEPEND="${COMMON_DEPEND}
+	proxy? ( <=net-analyzer/fping-2.9 )
+	server? ( <=net-analyzer/fping-2.9
+		app-admin/webapp-config )
+	java?	(
+		>=virtual/jre-1.6
+		dev-java/slf4j-api
+	)
+	frontend? (
+		>=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
+		|| ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
+		media-libs/gd[png]
+		app-admin/webapp-config )"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+ZABBIXJAVA_BASE="opt/zabbix_java"
+
+java_prepare() {
+	cd "${S}/src/zabbix_java/lib"
+	rm -v *.jar || die
+
+	java-pkg_jar-from slf4j-api
+}
+
+src_prepare() {
+	eautoreconf
+}
+
+pkg_setup() {
+	if use server || use proxy ; then
+		local dbnum dbtypes="mysql oracle postgres sqlite" dbtype
+		declare -i dbnum=0
+		for dbtype in ${dbtypes}; do
+			use ${dbtype} && let dbnum++
+		done
+		if [ ${dbnum} -gt 1 ]; then
+			eerror
+			eerror "You can't use more than one database type in Zabbix."
+			eerror "Select exactly one database type out of these: ${dbtypes}"
+			eerror
+			die "Multiple database types selected."
+		elif [ ${dbnum} -lt 1 ]; then
+			eerror
+			eerror "Select exactly one database type out of these: ${dbtypes}"
+			eerror
+			die "No database type selected."
+		fi
+		if use oracle; then
+			if [ -z "${ORACLE_HOME}" ]; then
+				eerror
+				eerror "The environment variable ORACLE_HOME must be set"
+				eerror "and point to the correct location."
+				eerror "It looks like you don't have Oracle installed."
+				eerror
+				die "Environment variable ORACLE_HOME is not set"
+			fi
+			if has_version 'dev-db/oracle-instantclient-basic'; then
+				ewarn
+				ewarn "Please ensure you have a full install of the Oracle client."
+				ewarn "dev-db/oracle-instantclient* is NOT sufficient."
+				ewarn
+			fi
+		fi
+	fi
+
+	if use frontend; then
+		webapp_pkg_setup
+	fi
+
+	enewgroup zabbix
+	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
+}
+
+pkg_postinst() {
+	if use server || use proxy ; then
+		elog
+		elog "You may need to configure your database for Zabbix,"
+		elog "if you have not already done so. "
+		elog
+
+		zabbix_homedir=$(egethome zabbix)
+		if [ -n "${zabbix_homedir}" ] && \
+		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
+			ewarn
+			ewarn "The user 'zabbix' should have his homedir changed"
+			ewarn "to /var/lib/zabbix/home if you want to use"
+			ewarn "custom alert scripts."
+			ewarn
+			ewarn "A real homedir might be needed for configfiles"
+			ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
+			ewarn "using sendxmpp for Jabber alerts)."
+			ewarn
+			ewarn "To change the homedir use:"
+			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
+			ewarn
+		fi
+	fi
+
+	if use server; then
+		elog
+		elog "For distributed monitoring you have to run:"
+		elog
+		elog "zabbix_server -n <nodeid>"
+		elog
+		elog "This will convert database data for use with Node ID"
+		elog "and also adds a local node."
+		elog
+	fi
+
+	elog "--"
+	elog
+	elog "You may need to add these lines to /etc/services:"
+	elog
+	elog "zabbix-agent     10050/tcp Zabbix Agent"
+	elog "zabbix-agent     10050/udp Zabbix Agent"
+	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
+	elog "zabbix-trapper   10051/udp Zabbix Trapper"
+	elog
+
+	elog "Feel free to download or contribute gentoo specific zabbix templates"
+	elog "via https://github.com/deploylinux/gentooZabbixTemplates (WIP)."
+
+	# repeat fowners/fperms functionality from src_install()
+	# here to catch wrong permissions on existing files in
+	# the live filesystem (yeah, that sucks).
+	chown -R zabbix:zabbix \
+		"${ROOT}"/etc/zabbix \
+		"${ROOT}"/var/lib/zabbix \
+		"${ROOT}"/var/lib/zabbix/home \
+		"${ROOT}"/var/lib/zabbix/scripts \
+		"${ROOT}"/var/log/zabbix
+	chmod 0750 \
+		"${ROOT}"/etc/zabbix \
+		"${ROOT}"/var/lib/zabbix \
+		"${ROOT}"/var/lib/zabbix/home \
+		"${ROOT}"/var/lib/zabbix/scripts \
+		"${ROOT}"/var/log/zabbix
+
+	chmod 0640 \
+		"${ROOT}"/etc/zabbix/zabbix_*
+
+	if use server || use proxy ; then
+		# check for fping
+		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
+		case "${fping_perms}" in
+			4[157][157][157])
+				;;
+			*)
+				ewarn
+				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
+				ewarn "you have to make /usr/sbin/fping setuid root and executable"
+				ewarn "by everyone. Run the following command to fix it:"
+				ewarn
+				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
+				ewarn
+				ewarn "Please be aware that this might impose a security risk,"
+				ewarn "depending on the code quality of fping."
+				ewarn
+				;;
+		esac
+	fi
+}
+
+src_configure() {
+
+	econf \
+		$(use_enable server) \
+		$(use_enable proxy) \
+		$(use_enable agent) \
+		$(use_enable ipv6) \
+		$(use_enable static) \
+		$(use_enable java) \
+		$(use_with ldap) \
+		$(use_with snmp net-snmp) \
+		$(use_with mysql) \
+		$(use_with postgres postgresql) \
+		$(use_with oracle) \
+		$(use_with sqlite sqlite3) \
+		$(use_with xmpp jabber) \
+		$(use_with curl libcurl) \
+		$(use_with openipmi openipmi) \
+		$(use_with ssh ssh2) \
+		$(use_with libxml2) \
+		$(use_with odbc unixodbc) \
+		|| die "econf failed"
+}
+
+src_install() {
+	dodir \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	keepdir \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	if use server; then
+		insinto /etc/zabbix
+		doins "${FILESDIR}/2.4"/zabbix_server.conf
+		doinitd "${FILESDIR}/2.4"/init.d/zabbix-server
+		dosbin src/zabbix_server/zabbix_server
+		fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf
+		fperms 0640 /etc/zabbix/zabbix_server.conf
+		dodir /usr/share/zabbix
+		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
+		systemd_dounit "${FILESDIR}/zabbix-server.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf
+	fi
+
+	if use proxy; then
+		doinitd \
+			"${FILESDIR}/2.4"/init.d/zabbix-proxy
+		dosbin \
+			src/zabbix_proxy/zabbix_proxy
+		insinto /etc/zabbix
+		doins \
+			"${FILESDIR}/2.4"/zabbix_proxy.conf
+		dodir /usr/share/zabbix
+		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
+		systemd_dounit "${FILESDIR}/zabbix-proxy.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		insinto /etc/zabbix
+		doins \
+			"${FILESDIR}/2.4"/zabbix_agent.conf \
+			"${FILESDIR}/2.4"/zabbix_agentd.conf
+		doinitd "${FILESDIR}/2.4"/init.d/zabbix-agentd
+		dosbin \
+			src/zabbix_agent/zabbix_agent \
+			src/zabbix_agent/zabbix_agentd
+		dobin \
+			src/zabbix_sender/zabbix_sender \
+			src/zabbix_get/zabbix_get
+		fowners zabbix:zabbix \
+			/etc/zabbix/zabbix_agent.conf \
+			/etc/zabbix/zabbix_agentd.conf
+		fperms 0640 \
+			/etc/zabbix/zabbix_agent.conf \
+			/etc/zabbix/zabbix_agentd.conf
+		systemd_dounit "${FILESDIR}/zabbix-agentd.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf
+	fi
+
+	fowners zabbix:zabbix \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+	fperms 0750 \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	dodoc README INSTALL NEWS ChangeLog \
+		conf/zabbix_agent.conf \
+		conf/zabbix_agentd.conf \
+		conf/zabbix_proxy.conf \
+		conf/zabbix_agentd/userparameter_examples.conf \
+		conf/zabbix_agentd/userparameter_mysql.conf \
+		conf/zabbix_server.conf
+
+	if use frontend; then
+		webapp_src_preinst
+		cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
+		webapp_postinst_txt en "${FILESDIR}/"1.6.6/postinstall-en.txt
+		webapp_configfile \
+			"${MY_HTDOCSDIR}"/include/db.inc.php \
+			"${MY_HTDOCSDIR}"/include/config.inc.php
+		webapp_src_install
+	fi
+
+	if use java; then
+	   dodir \
+	   	/${ZABBIXJAVA_BASE} \
+		/${ZABBIXJAVA_BASE}/bin \
+		/${ZABBIXJAVA_BASE}/lib
+	   keepdir /${ZABBIXJAVA_BASE}
+	   exeinto /${ZABBIXJAVA_BASE}/bin
+	   doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
+	   exeinto /${ZABBIXJAVA_BASE}/lib
+	   doexe \
+	   	src/zabbix_java/lib/logback-classic-0.9.27.jar \
+		src/zabbix_java/lib/logback-console.xml \
+		src/zabbix_java/lib/logback-core-0.9.27.jar \
+		src/zabbix_java/lib/logback.xml \
+		src/zabbix_java/lib/android-json-4.3_r3.1.jar \
+		src/zabbix_java/lib/slf4j-api-1.6.1.jar
+	   exeinto /${ZABBIXJAVA_BASE}/
+	   doexe \
+	   	src/zabbix_java/settings.sh \
+		src/zabbix_java/startup.sh \
+		src/zabbix_java/shutdown.sh
+	   fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
+	fi
+
+}
+
+src_compile() {
+	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
+		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed"
+	fi
+}
diff --git a/net-firewall/fwknop/files/fwknopd.init-r1 b/net-firewall/fwknop/files/fwknopd.init
index 9e8ecdc36d97..9e8ecdc36d97 100644
--- a/net-firewall/fwknop/files/fwknopd.init-r1
+++ b/net-firewall/fwknop/files/fwknopd.init
diff --git a/net-firewall/fwknop/fwknop-2.6.7-r1.ebuild b/net-firewall/fwknop/fwknop-2.6.7-r1.ebuild
deleted file mode 100644
index 006ebd0a0569..000000000000
--- a/net-firewall/fwknop/fwknop-2.6.7-r1.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-DISABLE_AUTOFORMATTING=1
-
-DISTUTILS_OPTIONAL=1
-# Python extension supports only Python2
-# See https://github.com/mrash/fwknop/issues/167
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools-utils distutils-r1 linux-info readme.gentoo systemd
-
-DESCRIPTION="Single Packet Authorization and Port Knocking application"
-HOMEPAGE="http://www.cipherdyne.org/fwknop/ https://github.com/mrash/fwknop"
-SRC_URI="https://github.com/mrash/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="client extras firewalld gdbm gpg iptables python server udp-server"
-
-RDEPEND="
-	client? ( net-misc/wget[ssl] )
-	gpg? (
-		dev-libs/libassuan
-		dev-libs/libgpg-error
-	)
-	python? ( ${PYTHON_DEPS} )
-"
-DEPEND="${RDEPEND}
-	gdbm? ( sys-libs/gdbm )
-	gpg? ( app-crypt/gpgme )
-	firewalld? ( net-firewall/firewalld[${PYTHON_USEDEP}] )
-	iptables? ( net-firewall/iptables )
-	server? ( !udp-server? ( net-libs/libpcap ) )
-"
-
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-	firewalld? ( server )
-	iptables? ( server )
-	server? ( ^^ ( firewalld iptables ) )
-	udp-server? ( server )
-"
-
-DOCS=( ChangeLog README.md )
-DOC_CONTENTS="
-Example configuration files were installed in /etc/fwknopd directory.
-Please edit them to fit your needs and then remove the .example suffix.
-
-fwknopd supports several backends: firewalld, iptables, ipfw, pf, ipf.
-You can set the desired backend via FIREWALL_EXE option in fwknopd.conf
-instead of the default one chosen at compile time.
-"
-
-pkg_pretend() {
-	if use server; then
-		if ! linux_config_exists || ! linux_chkconfig_present NETFILTER_XT_MATCH_COMMENT; then
-			ewarn "fwknopd uses the iptables 'comment' match to expire SPA rules,"
-			ewarn "which is a major security feature and is enabled by default."
-			ewarn "Please either enable NETFILTER_XT_MATCH_COMMENT support in your"
-			ewarn "kernel, or set the appropriate ENABLE_{FIREWD,IPT}_COMMENT_CHECK"
-			ewarn "to 'N' in your fwknopd.conf file."
-		fi
-	fi
-}
-
-src_prepare() {
-	# Install example configs with .example suffix
-	if use server; then
-		sed -i -e 's/conf;/conf.example;/g' "${S}"/Makefile.am || die
-	fi
-
-	autotools-utils_src_prepare
-
-	if use python; then
-		cd "${S}"/python || die
-		distutils-r1_src_prepare
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--localstatedir=/run
-		--enable-digest-cache
-		$(use_enable client)
-		$(use_enable !gdbm file-cache)
-		$(use_enable server)
-		$(use_enable udp-server)
-		$(use_with gpg gpgme)
-	)
-	use firewalld && myeconfargs+=(--with-firewalld=/usr/sbin/firewalld)
-	use iptables && myeconfargs+=(--with-iptables=/sbin/iptables)
-
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	autotools-utils_src_compile
-
-	if use python; then
-		cd "${S}"/python || die
-		distutils-r1_src_compile
-	fi
-}
-
-src_install() {
-	autotools-utils_src_install
-	prune_libtool_files --modules
-
-	if use server; then
-		newinitd "${FILESDIR}/fwknopd.init-r1" fwknopd
-		newconfd "${FILESDIR}/fwknopd.confd" fwknopd
-		systemd_dounit extras/systemd/fwknopd.service
-		systemd_newtmpfilesd extras/systemd/fwknopd.tmpfiles.conf fwknopd.conf
-		readme.gentoo_create_doc
-	fi
-
-	use extras && dodoc "${S}/extras/apparmor/usr.sbin.fwknopd"
-
-	if use python; then
-		# Unset DOCS since distutils-r1.eclass interferes
-		local DOCS=()
-		cd "${S}"/python || die
-		distutils-r1_src_install
-	fi
-}
-
-pkg_postinst() {
-	use server && readme.gentoo_print_elog
-}
diff --git a/net-firewall/fwknop/fwknop-2.6.7-r2.ebuild b/net-firewall/fwknop/fwknop-2.6.7-r2.ebuild
index 46dbcae86577..50e95fe2c11c 100644
--- a/net-firewall/fwknop/fwknop-2.6.7-r2.ebuild
+++ b/net-firewall/fwknop/fwknop-2.6.7-r2.ebuild
@@ -113,7 +113,7 @@ src_install() {
 	prune_libtool_files --modules
 
 	if use server; then
-		newinitd "${FILESDIR}/fwknopd.init-r1" fwknopd
+		newinitd "${FILESDIR}/fwknopd.init" fwknopd
 		newconfd "${FILESDIR}/fwknopd.confd" fwknopd
 		systemd_dounit extras/systemd/fwknopd.service
 		systemd_newtmpfilesd extras/systemd/fwknopd.tmpfiles.conf fwknopd.conf
diff --git a/net-irc/irc-client/irc-client-2.10.3_p7.ebuild b/net-irc/irc-client/irc-client-2.10.3_p7.ebuild
index 7a3043fdd8a8..28c1ad81a79d 100644
--- a/net-irc/irc-client/irc-client-2.10.3_p7.ebuild
+++ b/net-irc/irc-client/irc-client-2.10.3_p7.ebuild
@@ -16,9 +16,9 @@ IUSE="ipv6"
 
 DEPEND="sys-libs/ncurses
 	sys-libs/zlib"
-# This and irc-client both install /usr/bin/irc #247987
+# This and ircci both install /usr/bin/irc #247987
 RDEPEND="${DEPEND}
-	!net-irc/irc-client"
+	!net-irc/ircii"
 
 S=${WORKDIR}/${MY_P}
 
diff --git a/net-libs/gupnp-ui/gupnp-ui-0.1.1.ebuild b/net-libs/gupnp-ui/gupnp-ui-0.1.1.ebuild
index 1d129c2e6dd1..90ac09f129c3 100644
--- a/net-libs/gupnp-ui/gupnp-ui-0.1.1.ebuild
+++ b/net-libs/gupnp-ui/gupnp-ui-0.1.1.ebuild
@@ -25,7 +25,7 @@ DEPEND="${RDEPEND}
 	sys-devel/gettext"
 
 PATCHES=(
-       "${FILESDIR}"/${P}-underlinking.patch
+	"${FILESDIR}"/${P}-underlinking.patch
 )
 
 src_configure() {
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.47.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.47.ebuild
index 4ef571ca68a6..c8d99669f82f 100644
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.47.ebuild
+++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.47.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/12"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="epoll messages ssl static-libs test"
 
 RDEPEND="ssl? (
diff --git a/net-libs/signond/signond-8.58.ebuild b/net-libs/signond/signond-8.58.ebuild
index 9343cf8f51f0..09bbe0b70377 100644
--- a/net-libs/signond/signond-8.58.ebuild
+++ b/net-libs/signond/signond-8.58.ebuild
@@ -32,6 +32,9 @@ DEPEND="${RDEPEND}
 "
 
 src_prepare() {
+	# remove unused dependency
+	sed -e "/xml \\\/d" -i src/signond/signond.pro || die
+
 	# ensure qt5 version of binary is used
 	sed -e "s|qdbusxml2cpp|$(qt5_get_bindir)/&|" -i src/signond/signond.pro || die
 
diff --git a/net-misc/htpdate/Manifest b/net-misc/htpdate/Manifest
index e8c9fa813e37..8ca591d6de9c 100644
--- a/net-misc/htpdate/Manifest
+++ b/net-misc/htpdate/Manifest
@@ -1,3 +1,3 @@
 DIST htpdate-1.0.7.tar.gz 16848 SHA256 ba0b3f7b42306f2e2e146624785f80cc472eac9e7885007df50af0e1a21735c4 SHA512 83408545d1d2cc794f62efaf348e54cc2ce47dfb27815710e92d0c7d34360a581e637ef82424030c8a4fcabcc9a07205518fac08f426b37c7c4519cfa6696360 WHIRLPOOL e2e949d20b8d4afecd6c3c09aefa203417b16a4061e6d2fe05cf5e37d0dc736604ed5e1f0d8c03146eb3b5031ffc3ed8ec3213171513e6140a098bd1d5f268fb
-DIST htpdate-1.1.1.tar.gz 13303 SHA256 6fca5f13e323d4bf8e4a2ae20dfaae527b745b3cf19e9aeccfe2f211e7cc7a7a SHA512 bfc463692b7c4fb962c0b6f34e6063d2506e383490e6d6972b7da3740fbd0b835a07cddd3470bea29f8d2770160fba5f87fd3d768cb27a1f04ea9f5a39522918 WHIRLPOOL 7faa7ce4dd96d48a2a7ddc20a61a7230d9658042f3c9e39229ade41a312d78a0d5827a3348b2671de36fdbcb0aa35873fa5bee6e0c13218e94fbc23f3f2730b7
 DIST htpdate-1.1.2.tar.gz 13330 SHA256 6babf7db26f8734aa245a261ebdd6b92989ed4ffd1db40f8480b33d4150488d2 SHA512 d20234b3f04499b77f7050522c23dc6c3d8fc27a22368e8553340eec76ce35964f7f9808a0e047840fcdbb1e61dfd9fa9e9cdb5d88c42d5f8970a62203fde424 WHIRLPOOL 82b8e088c4e45264abbd2a35c25729cb6afc3f3d8e47d11bfc06b0bb7f89eb85a8a5c475dcbf1c9007288248eef351291184f17d0b615fe937f7277f431b3c05
+DIST htpdate-1.1.3.tar.gz 13421 SHA256 b1d84d16ea8755352d187c346e78316ee545e2fbc3719cea001cdfaa3326cf41 SHA512 b6924f49165768e65b2a843db176aa9e8208bdc9e7390fbd2e802dcb1016d9fc897c717743ae559f7a6b17b18a44294a7b8adfa68b547ed8bf66135a12cc5b30 WHIRLPOOL 32d13472a233102e2095e9c6cf27df40d51b4b160c865ae6ea569611721bac3650b3b05840fc70478dccf490c0a1f046c42d5293a36028e46598272e3f6a6621
diff --git a/net-misc/htpdate/htpdate-1.1.1.ebuild b/net-misc/htpdate/htpdate-1.1.3.ebuild
index d70048232eea..d70048232eea 100644
--- a/net-misc/htpdate/htpdate-1.1.1.ebuild
+++ b/net-misc/htpdate/htpdate-1.1.3.ebuild
diff --git a/net-misc/mobile-broadband-provider-info/Manifest b/net-misc/mobile-broadband-provider-info/Manifest
index fde8e11d4d33..9f3908d3c40e 100644
--- a/net-misc/mobile-broadband-provider-info/Manifest
+++ b/net-misc/mobile-broadband-provider-info/Manifest
@@ -1 +1,2 @@
 DIST mobile-broadband-provider-info-20120614.tar.xz 73600 SHA256 72507a732e0cd16cf27424bb094b1c7a03e2206c119ad124722a283e587755f1 SHA512 780f9381d2b03a329cc420eca4dfcc5e89c0c29114db028d42aff417f09d7c01f3b474df27f6ecc838ae3e0a78a9efcb5ffe90e393b4ad71152d2e12231768b1 WHIRLPOOL 873b5f1bb3c4dcb3a8ee833747830e7022e35a0bdb79ee0eb27537277211751785d18a126c359b55afd2cbfee6a831d7b012f657778e284b1da5531fab264d4e
+DIST mobile-broadband-provider-info-20151214.tar.xz 84592 SHA256 8ae45d6f10fed9750e259935804c4f40a4372bb119f0504187e4221896b205a4 SHA512 c7e01aa00521c51c60ac46523f58bfa9a57c8bc583a895c738e76e02fee5cc31a509582d9e5123f68ccaf309f97194cde1842089be2cb6cb14464d183a31224d WHIRLPOOL 36f07d080d76c68d18d696ee98edb738177fc7a9cbb63145dd145603178e1f4fc2e95a3f7cd1bfc833574ff8e76a6d0ebbdfb43491d463b02a5f83b37834da40
diff --git a/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20151214.ebuild b/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20151214.ebuild
new file mode 100644
index 000000000000..0bd1b89c4017
--- /dev/null
+++ b/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20151214.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit gnome.org
+
+DESCRIPTION="Database of mobile broadband service providers"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager/MobileBroadband"
+
+LICENSE="CC-PD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+
+DEPEND="
+	test? ( dev-libs/libxml2 )
+"
+
+DOCS="README" # ChangeLog and NEWS are both dead
diff --git a/net-proxy/shadowsocks-libev/Manifest b/net-proxy/shadowsocks-libev/Manifest
index 3641624473dc..93bb668f3092 100644
--- a/net-proxy/shadowsocks-libev/Manifest
+++ b/net-proxy/shadowsocks-libev/Manifest
@@ -1,2 +1,2 @@
-DIST shadowsocks-libev-2.2.2.tar.gz 2492615 SHA256 9919d041a6ee4f7b7de2ea7209533b0b9d5fd5732eaa430a6f4055f6e7f1c23f SHA512 0d83a506e2ab95aa8ba1d1815d2e0a8213b96a901cf5e8939c00900167af96ae6045071f39fc07ac7daba328bc2eb1e89b0286e1e98744a8750916ec81b47f27 WHIRLPOOL 281ec6e2cc264c265c7a5b7de733e6cc71151a6d05c2fbf6f43b5cc8bea970229f74d04ec0633cd46d7fb49187d0fa834fcc0a0b039e078230168d89d0344432
 DIST shadowsocks-libev-2.2.3.tar.gz 2493211 SHA256 41a4746190698fc78b8e06c0f0e3638ca0bb1180a8cb77246736d88553b277f7 SHA512 28e20ce069b456cfc3d52437ded739d2995de7883fcb9b4c3cfde5bc78f33419cb75fa67812660d7456084e5a97e6a6531223486259a650988552494f02ebe9f WHIRLPOOL f20090a4366788315e0f442987cb20b79aca61a3424f7570bf5961f29c5634bcbf01df6a8ee012c7b38135f50ae1af940fecec8917bee1056d2c4ce6eca4b6b5
+DIST shadowsocks-libev-2.4.3.tar.gz 1461896 SHA256 5de76361a6b34385bf9ad255a69089a886f657d44c7e338a5dc191273e1cf9f3 SHA512 3dfa528fa01e7e9293a31cb55529cb77fc935e04ad9f2e27b5426eff61df27a8a31d1e98efd0fb07b2a2bcb5da00706d142448adbc51dcc15f2d3c6993736787 WHIRLPOOL 10819f54cc2aad5604e62fd4e4783597ff89b6753056a2961652384f175c65eb667fa0e42d097fbf25b9243714adf0f91d33dc0b5a71957adb82edee72209fc5
diff --git a/net-proxy/shadowsocks-libev/shadowsocks-libev-2.2.2.ebuild b/net-proxy/shadowsocks-libev/shadowsocks-libev-2.4.3.ebuild
index d871ca0b138d..d871ca0b138d 100644
--- a/net-proxy/shadowsocks-libev/shadowsocks-libev-2.2.2.ebuild
+++ b/net-proxy/shadowsocks-libev/shadowsocks-libev-2.4.3.ebuild
diff --git a/perl-core/Math-BigInt/Manifest b/perl-core/Math-BigInt/Manifest
index c981014e85a5..7f3517750df8 100644
--- a/perl-core/Math-BigInt/Manifest
+++ b/perl-core/Math-BigInt/Manifest
@@ -1 +1,2 @@
 DIST Math-BigInt-1.9993.tar.gz 215143 SHA256 d937c0d1afbb3ddd9b666177faf56471b6c2d1917863db5879d04a2d1a69bf7e SHA512 23ae7d11094f6bf5df45a2c3a01a7d9895b244156b8f48497edbfee4de0e56588e59abb4b1fa8808f2e221bd63eae175cd13987c7dc93867b8f969fbf54b6f15 WHIRLPOOL 70d9899003d1b547b066170fb397d03cfddd0edfdeb9beadf4998ee59f4b18fcbce480bf371ef2f3d35ec86f30b883fcdf2a70765cf239b0f73320766c8048e0
+DIST Math-BigInt-1.999710.tar.gz 225641 SHA256 879514c3dda33b6f05816569ca1a0f31b650df87660ecf80afbd60e396118610 SHA512 a5f938f5f2c61fd1b4c5c01caa99104aea2a009c8f6e089b465d52948a631cd7cb2df2c54917d9e4bd0bc34281c3a8aa865eb3bf7e6e84f15cff1eb79ccf358d WHIRLPOOL 73e26895de11824008b41e39968903c9a7b888a5b199e64f235e2b86e2360df8b095e6a9f2e29c3c29a385025e33cbbd88dc3f84220c6fd89add49596a1814ee
diff --git a/perl-core/Math-BigInt/Math-BigInt-1.999.710.ebuild b/perl-core/Math-BigInt/Math-BigInt-1.999.710.ebuild
new file mode 100644
index 000000000000..049411973d59
--- /dev/null
+++ b/perl-core/Math-BigInt/Math-BigInt-1.999.710.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_AUTHOR=PJACKLAM
+DIST_VERSION=1.999710
+inherit perl-module
+
+DESCRIPTION="Arbitrary size floating point math package"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~ppc-macos ~x86-solaris"
+IUSE="test"
+
+RDEPEND="
+	>=virtual/perl-Math-Complex-1.390.0
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? ( >=virtual/perl-Test-Simple-0.930.100 )
+"
+
+PDEPEND="
+	>=virtual/perl-Math-BigInt-FastCalc-0.270.0
+	>=virtual/perl-bignum-0.220.0
+	>=virtual/perl-Math-BigRat-0.260.200
+"
+# where does this come from?
diff --git a/profiles/package.mask b/profiles/package.mask
index 660335482373..0c7b60e942c2 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -30,6 +30,14 @@
 
 #--- END OF EXAMPLES ---
 
+# Ulrich Müller <ulm@gentoo.org> (21 Dec 2015)
+# Masked for testing, see bug #448242.
+=sci-mathematics/maxima-5.37.3-r2
+
+# Hans de Graaff <graaff@gentoo.org> (21 Dec 2015)
+# Mask until issues with non-standard bin dir have been resolved.
+=dev-ruby/bundler-1.11*
+
 # Patrick Lauer <patrick@gentoo.org> (20 Dec 2015)
 # Mask TOFU release that doesn't work #567768 and friends
 =app-crypt/gkeys-gen-0.1-r1
@@ -38,13 +46,6 @@
 # Ebuild uninstallable #557090
 =app-crypt/gkeys-0.1-r1
 
-# Andreas K. Hüttel <dilfridge@gentoo.org> (21 Dec 2015)
-# Preparation for the Perl 5.22.1 version bump; work in
-# progress
-=dev-lang/perl-5.22.1
-=virtual/perl-Module-CoreList-5.201.512.130
-=virtual/perl-Storable-2.530.100
-
 # Michał Górny <mgorny@gentoo.org> (18 Dec 2015)
 # Contains privilege escalation vulnerability that could be used to
 # execute random Python code passed via D-Bus as root. Bug #568644.
diff --git a/profiles/targets/desktop/plasma/package.use b/profiles/targets/desktop/plasma/package.use
index 2c59c269694b..ffb262dbad9a 100644
--- a/profiles/targets/desktop/plasma/package.use
+++ b/profiles/targets/desktop/plasma/package.use
@@ -35,6 +35,7 @@ media-libs/mesa egl wayland
 # Allow certain KDE 4 components to be coinstalled with Plasma 5
 <dev-util/kdevelop-4.8.0 -gdbui
 kde-apps/kcontrol -handbook
+kde-apps/kde-wallpapers minimal
 kde-apps/kde4-l10n minimal
 kde-apps/kdeartwork-meta minimal
 kde-apps/kdebase-kioslaves minimal
diff --git a/sci-geosciences/qgis/metadata.xml b/sci-geosciences/qgis/metadata.xml
index be2c23b6863f..2d8595802e03 100644
--- a/sci-geosciences/qgis/metadata.xml
+++ b/sci-geosciences/qgis/metadata.xml
@@ -12,7 +12,6 @@
 </longdescription>
   <use>
     <flag name="bundled-libs">Use internal copy of <pkg>x11-libs/qwtpolar</pkg></flag>
-    <flag name="grass">Add support for <pkg>sci-geosciences/grass</pkg></flag>
     <flag name="spatialite">Enable Spatial DBMS over sqlite <pkg>dev-db/spatialite</pkg></flag>
   </use>
 </pkgmetadata>
diff --git a/sci-mathematics/cado-nfs/Manifest b/sci-mathematics/cado-nfs/Manifest
index b237edbbf30b..8aebd919f46a 100644
--- a/sci-mathematics/cado-nfs/Manifest
+++ b/sci-mathematics/cado-nfs/Manifest
@@ -2,3 +2,4 @@ DIST cado-nfs-1.1.tar.gz 1453860 SHA256 295c8662208c432a98157951ddc117820ff2e57e
 DIST cado-nfs-2.0.tar.gz 2088866 SHA256 67f2ca3f739e07e89c9873f98d876bf771a3900288eda3d724b06f5736b4bfa2 SHA512 7f531e9ad1445c763a2fd37441e2e3bf6d4184d0d93be414d078b7024860c9d85754afe6629d9436b540361183462792248a88c0af76407d10a621385ec5b18b WHIRLPOOL 91b7a874cedb90c555625f9a0187f62c2cfccebc7236182d6bba17187fa5080b5164b121361035f3c7281881cc44f026fb66c6b242f8abcf6b6628a6eb280b90
 DIST cado-nfs-2.1.1.tar.gz 2560216 SHA256 7493b3d38c7bb7db2e3e8068f6d7da2bf0429d5cc153af668f677af99f0320fa SHA512 8463fddc49cf7ad3caef47f9b96fd8ed63de63fa3aa9791b94e58d920f2bb66d843e6e53bab81eaea62d3cbdc834c4f7b7f294d255ac7def74ff51a651905002 WHIRLPOOL cecea890bc48b80ad8907e69f8ca386a45b99f4735cdec3bdfba936bf502b6efbf76bbae3f4a8f60e8f676c27f441ae03ec8327be05c92eecbcf7751b8d34f9f
 DIST cado-nfs-2.1.tar.gz 2558577 SHA256 ff50baeb2eb5bf0ff3dd8600056e8e762fa30c94c2425fb73843329ced2a5ae1 SHA512 fcdba87ca349485e6d25c1298cc90197855a2fa354b51edb827445b10e7cb023f5d239e02aba0cdae28b4f4b38d260b4b492cdf5eb0c929afdca6aa604b29191 WHIRLPOOL c23a7b5d184efa385689493831f70cff823811d8f320ea3e91f367c580b285dcf6515027d466784d56c5f3f49d51e1d3baccd566096af561710b9267d1e0bdda
+DIST cado-nfs-2.2.0.tar.gz 3197259 SHA256 b85ffd8c13eadb911e2f2f026fad1a4993f8f85a82326cc2b4f95bee536a6cb5 SHA512 983806522187a79a1d6113c2539c05d2d09caa823db9ba629d12501ac50b10daf673ca52039c403ea18f8befe0f6831af7e6586b6fcf0265555efe299f09f57f WHIRLPOOL c30a7ef57aa5ca37430138e9193af553ac0c240093362dbf31094732de2874aca44523ed6395f35c39158fde1863555b1f3e8a46d0175d502ed947f77e0daf90
diff --git a/sci-mathematics/cado-nfs/cado-nfs-2.2.0.ebuild b/sci-mathematics/cado-nfs/cado-nfs-2.2.0.ebuild
new file mode 100644
index 000000000000..44c8e43b78fe
--- /dev/null
+++ b/sci-mathematics/cado-nfs/cado-nfs-2.2.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+DESCRIPTION="Number Field Sieve (NFS) implementation for factoring integers"
+HOMEPAGE="http://cado-nfs.gforge.inria.fr/"
+SRC_URI="https://gforge.inria.fr/frs/download.php/file/35401/${P}.tar.gz"
+
+PYTHON_COMPAT=( python{2_7,3_4} )
+PYTHON_REQ_USE="sqlite"
+inherit eutils cmake-utils python-r1
+
+# Fails F9_{k,m}bucket_test F9_tracektest
+RESTRICT="test"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-libs/gmp
+	dev-lang/perl
+	!sci-mathematics/ggnfs
+	!sci-biology/shrimp
+	"
+DEPEND="${RDEPEND}
+	"
+
+src_prepare() {
+	# looks like packaging mistake
+	sed -i -e 's/add_executable (convert_rels convert_rels.c)//' misc/CMakeLists.txt || die
+	sed -i -e 's/target_link_libraries (convert_rels utils)//' misc/CMakeLists.txt || die
+	sed -i -e 's~install(TARGETS convert_rels RUNTIME DESTINATION bin/misc)~~' misc/CMakeLists.txt || die
+}
+
+src_configure() {
+	DESTINATION="/usr/libexec/cado-nfs" cmake-utils_src_configure
+}
+src_compile() {
+	# autodetection goes confused for gf2x
+	ABI=default cmake-utils_src_compile
+}
diff --git a/sci-mathematics/maxima/files/50maxima-gentoo.el b/sci-mathematics/maxima/files/50maxima-gentoo-0.el
index 20c7399164f7..ace2f4f6615d 100644
--- a/sci-mathematics/maxima/files/50maxima-gentoo.el
+++ b/sci-mathematics/maxima/files/50maxima-gentoo-0.el
@@ -1,6 +1,3 @@
-
-;;; maxima site-lisp configuration
-
 (add-to-list 'load-path "@SITELISP@")
 (autoload 'maxima-mode "maxima" "Maxima mode" t)
 (autoload 'maxima "maxima" "Maxima interactive" t)
diff --git a/sci-mathematics/maxima/files/50maxima-gentoo-1.el b/sci-mathematics/maxima/files/50maxima-gentoo-1.el
new file mode 100644
index 000000000000..be14dbfc7d2f
--- /dev/null
+++ b/sci-mathematics/maxima/files/50maxima-gentoo-1.el
@@ -0,0 +1,13 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'maxima-mode "maxima" "Maxima mode" t)
+(autoload 'maxima "maxima" "Maxima interactive" t)
+(autoload 'dbl "dbl" "Make a debugger to run lisp, maxima and or gdb in" t)
+(add-to-list 'auto-mode-alist '("\\.ma?[cx]\\'" . maxima-mode))
+
+;; emaxima mode
+(autoload 'emaxima-mode "emaxima" "EMaxima" t)
+(add-hook 'emaxima-mode-hook 'emaxima-mark-file-as-emaxima)
+
+;; imaxima
+(autoload 'imaxima "imaxima" "Image support for Maxima." t)
+(autoload 'imath-mode "imath" "Interactive Math minor mode." t)
diff --git a/sci-mathematics/maxima/maxima-5.34.1.ebuild b/sci-mathematics/maxima/maxima-5.34.1.ebuild
index b679a8acebf0..fa91b3df801d 100644
--- a/sci-mathematics/maxima/maxima-5.34.1.ebuild
+++ b/sci-mathematics/maxima/maxima-5.34.1.ebuild
@@ -168,7 +168,7 @@ src_install() {
 	dosym ../${PN}/${PV}/doc /usr/share/doc/${PF} || die
 
 	if use emacs; then
-		elisp-site-file-install "${FILESDIR}"/50maxima-gentoo.el || die
+		elisp-site-file-install "${FILESDIR}"/50maxima-gentoo-0.el || die
 	fi
 
 	# if we use ecls, build an ecls library for maxima
diff --git a/sci-mathematics/maxima/maxima-5.37.3-r1.ebuild b/sci-mathematics/maxima/maxima-5.37.3-r1.ebuild
index 85e215050dae..e71ebf02c7e3 100644
--- a/sci-mathematics/maxima/maxima-5.37.3-r1.ebuild
+++ b/sci-mathematics/maxima/maxima-5.37.3-r1.ebuild
@@ -162,7 +162,7 @@ src_install() {
 	dosym ../${PN}/${PV}/doc /usr/share/doc/${PF} || die
 
 	if use emacs; then
-		elisp-site-file-install "${FILESDIR}"/50maxima-gentoo.el || die
+		elisp-site-file-install "${FILESDIR}"/50maxima-gentoo-0.el || die
 	fi
 
 	# if we use ecls, build an ecls library for maxima
diff --git a/sci-mathematics/maxima/maxima-5.37.3-r2.ebuild b/sci-mathematics/maxima/maxima-5.37.3-r2.ebuild
new file mode 100644
index 000000000000..3afffbf4c4d4
--- /dev/null
+++ b/sci-mathematics/maxima/maxima-5.37.3-r2.ebuild
@@ -0,0 +1,200 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools elisp-common eutils
+
+DESCRIPTION="Free computer algebra environment based on Macsyma"
+HOMEPAGE="http://maxima.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2 GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+
+# Supported lisps
+LISPS=(     sbcl cmucl gcl             ecls clozurecl clisp )
+# <lisp> supports readline: . - no, y - yes
+SUPP_RL=(   .    .     y               .    .         y     )
+# . - just --enable-<lisp>, <flag> - --enable-<flag>
+CONF_FLAG=( .    .     .               ecl  ccl       .     )
+# patch file version; . - no patch
+PATCH_V=(   1    1     .               2    2         1     )
+
+IUSE="latex emacs tk nls unicode xemacs X ${LISPS[*]}"
+
+# Languages
+LANGS="es pt pt_BR"
+for lang in ${LANGS}; do
+	IUSE="${IUSE} linguas_${lang}"
+done
+
+# texlive-latexrecommended needed by imaxima for breqn.sty
+RDEPEND="!app-emacs/imaxima
+	X? ( x11-misc/xdg-utils
+		 sci-visualization/gnuplot[gd]
+		 tk? ( dev-lang/tk:0 ) )
+	latex? ( virtual/latex-base )
+	emacs? ( virtual/emacs
+		latex? ( app-emacs/auctex
+			app-text/ghostscript-gpl
+			dev-texlive/texlive-latexrecommended ) )
+	xemacs? ( app-editors/xemacs
+		latex? ( app-xemacs/auctex ) )"
+
+# generating lisp dependencies
+depends() {
+	local LISP DEP
+	LISP=${LISPS[$1]}
+	DEP="dev-lisp/${LISP}:="
+	if [ "${SUPP_RL[$1]}" = "." ]; then
+		DEP="${DEP} app-misc/rlwrap"
+	fi
+	echo ${DEP}
+}
+
+n=${#LISPS[*]}
+for ((n--; n >= 0; n--)); do
+	LISP=${LISPS[${n}]}
+	RDEPEND="${RDEPEND} ${LISP}? ( $(depends ${n}) )"
+	DEF_DEP="${DEF_DEP} !${LISP}? ( "
+done
+
+# default lisp
+DEF_LISP=0 # sbcl
+ARM_LISP=2 # gcl
+DEF_DEP="${DEF_DEP} arm? ( `depends ${ARM_LISP}` ) !arm? ( `depends ${DEF_LISP}` )"
+
+n=${#LISPS[*]}
+for ((n--; n >= 0; n--)); do
+	DEF_DEP="${DEF_DEP} )"
+done
+
+unset LISP
+
+RDEPEND="${RDEPEND}
+	${DEF_DEP}"
+
+DEPEND="${RDEPEND}
+	sys-apps/texinfo"
+
+TEXMF="${EPREFIX}"/usr/share/texmf-site
+
+pkg_setup() {
+	local n=${#LISPS[*]}
+
+	for ((n--; n >= 0; n--)); do
+		use ${LISPS[${n}]} && NLISPS="${NLISPS} ${n}"
+	done
+
+	if [ -z "${NLISPS}" ]; then
+		ewarn "No lisp specified in USE flags, choosing ${LISPS[${DEF_LISP}]} as default"
+		NLISPS=${DEF_LISP}
+	fi
+}
+
+src_prepare() {
+	local n PATCHES v
+	PATCHES=( rmaxima-0 wish-1 xdg-utils-0 db-0 )
+
+	n=${#PATCHES[*]}
+	for ((n--; n >= 0; n--)); do
+		epatch "${FILESDIR}"/${PATCHES[${n}]}.patch
+	done
+
+	n=${#LISPS[*]}
+	for ((n--; n >= 0; n--)); do
+		v=${PATCH_V[${n}]}
+		if [ "${v}" != "." ]; then
+			epatch "${FILESDIR}"/${LISPS[${n}]}-${v}.patch
+		fi
+	done
+
+	# bug #343331
+	rm share/Makefile.in || die
+	rm src/Makefile.in || die
+	touch src/*.mk
+	touch src/Makefile.am
+	eautoreconf
+}
+
+src_configure() {
+	local CONFS CONF n lang
+	for n in ${NLISPS}; do
+		CONF=${CONF_FLAG[${n}]}
+		if [ ${CONF} = . ]; then
+			CONF=${LISPS[${n}]}
+		fi
+		CONFS="${CONFS} --enable-${CONF}"
+	done
+
+	# enable existing translated doc
+	if use nls; then
+		for lang in ${LANGS}; do
+			if use "linguas_${lang}"; then
+				CONFS="${CONFS} --enable-lang-${lang}"
+				use unicode && CONFS="${CONFS} --enable-lang-${lang}-utf8"
+			fi
+		done
+	fi
+
+	econf ${CONFS} $(use_with tk wish) --with-lispdir="${EPREFIX}/${SITELISP}"/${PN}
+}
+
+src_compile() {
+	emake
+	use emacs && elisp-compile interfaces/emacs/{emaxima,imaxima}/*.el
+}
+
+src_install() {
+	docompress -x /usr/share/info
+	emake DESTDIR="${D}" emacsdir="${EPREFIX}/${SITELISP}/${PN}" install
+
+	use tk && make_desktop_entry xmaxima xmaxima \
+		/usr/share/${PN}/${PV}/xmaxima/maxima-new.png \
+		"Science;Math;Education"
+
+	rm -f "${ED}"/${SITELISP}/${PN}/emaxima.sty
+
+	if use latex; then
+		insinto ${TEXMF}/tex/latex/emaxima
+		doins interfaces/emacs/emaxima/emaxima.sty
+	fi
+
+	# do not use dodoc because interfaces can't read compressed files
+	# read COPYING before attempt to remove it from dodoc
+	insinto /usr/share/${PN}/${PV}/doc
+	doins AUTHORS COPYING README README.lisps
+	dodir /usr/share/doc
+	dosym ../${PN}/${PV}/doc /usr/share/doc/${PF}
+
+	if use emacs; then
+		elisp-install ${PN} interfaces/emacs/{emaxima,imaxima}/*.{el,elc,lisp}
+		elisp-site-file-install "${FILESDIR}"/50maxima-gentoo-1.el
+		insinto /usr/share/${PN}/${PV}/doc/imaxima
+		doins interfaces/emacs/imaxima/README
+		doins -r interfaces/emacs/imaxima/imath-example
+	else
+		# remove any emacs files installed by the build system
+		rm -rf "${ED}"/usr/share/emacs
+	fi
+
+	# if we use ecls, build an ecls library for maxima
+	if use ecls; then
+		ECLLIB=`ecl -eval "(princ (SI:GET-LIBRARY-PATHNAME))" -eval "(quit)"`
+		insinto "${ECLLIB#${EPREFIX}}"
+		doins src/binary-ecl/maxima.fas
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+	use latex && mktexlsr
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+	use latex && mktexlsr
+}
diff --git a/sec-policy/selinux-abrt/metadata.xml b/sec-policy/selinux-abrt/metadata.xml
index fb37d10688ed..fa2f0a94fb2d 100644
--- a/sec-policy/selinux-abrt/metadata.xml
+++ b/sec-policy/selinux-abrt/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for abrt</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-accountsd/metadata.xml b/sec-policy/selinux-accountsd/metadata.xml
index 27c99d1f6731..cb8510453748 100644
--- a/sec-policy/selinux-accountsd/metadata.xml
+++ b/sec-policy/selinux-accountsd/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for accountsd</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-acct/metadata.xml b/sec-policy/selinux-acct/metadata.xml
index 8ec916a68102..2b7c541f348d 100644
--- a/sec-policy/selinux-acct/metadata.xml
+++ b/sec-policy/selinux-acct/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for acct</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-ada/metadata.xml b/sec-policy/selinux-ada/metadata.xml
index 5da02091cab8..4335700d5e5f 100644
--- a/sec-policy/selinux-ada/metadata.xml
+++ b/sec-policy/selinux-ada/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for ada</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-afs/metadata.xml b/sec-policy/selinux-afs/metadata.xml
index 6c382d866dbd..dd1e5d3fc9b0 100644
--- a/sec-policy/selinux-afs/metadata.xml
+++ b/sec-policy/selinux-afs/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for afs</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-aide/metadata.xml b/sec-policy/selinux-aide/metadata.xml
index d0773e8d138d..502734c682a2 100644
--- a/sec-policy/selinux-aide/metadata.xml
+++ b/sec-policy/selinux-aide/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for aide</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-alsa/metadata.xml b/sec-policy/selinux-alsa/metadata.xml
index 310fb016ed5d..45e7b399cf07 100644
--- a/sec-policy/selinux-alsa/metadata.xml
+++ b/sec-policy/selinux-alsa/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for alsa</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-amanda/metadata.xml b/sec-policy/selinux-amanda/metadata.xml
index b77f18ece778..bd5d568bd63c 100644
--- a/sec-policy/selinux-amanda/metadata.xml
+++ b/sec-policy/selinux-amanda/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for amanda</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-amavis/metadata.xml b/sec-policy/selinux-amavis/metadata.xml
index e378579cf68b..d451ce151333 100644
--- a/sec-policy/selinux-amavis/metadata.xml
+++ b/sec-policy/selinux-amavis/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for amavis</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-android/metadata.xml b/sec-policy/selinux-android/metadata.xml
index 72d0b1f692a2..bc56a9d11140 100644
--- a/sec-policy/selinux-android/metadata.xml
+++ b/sec-policy/selinux-android/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for android</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-apache/metadata.xml b/sec-policy/selinux-apache/metadata.xml
index db28936352b4..cffcdb334080 100644
--- a/sec-policy/selinux-apache/metadata.xml
+++ b/sec-policy/selinux-apache/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for apache</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-apcupsd/metadata.xml b/sec-policy/selinux-apcupsd/metadata.xml
index 1beba9f9c21a..4b9e96c06db4 100644
--- a/sec-policy/selinux-apcupsd/metadata.xml
+++ b/sec-policy/selinux-apcupsd/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for apcupsd</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-apm/metadata.xml b/sec-policy/selinux-apm/metadata.xml
index 6b4791d367e1..48346a2c50f5 100644
--- a/sec-policy/selinux-apm/metadata.xml
+++ b/sec-policy/selinux-apm/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for apm</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-arpwatch/metadata.xml b/sec-policy/selinux-arpwatch/metadata.xml
index f48139b88951..831eae177b9e 100644
--- a/sec-policy/selinux-arpwatch/metadata.xml
+++ b/sec-policy/selinux-arpwatch/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for arpwatch</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-asterisk/metadata.xml b/sec-policy/selinux-asterisk/metadata.xml
index 1095e198079a..8a20e381882f 100644
--- a/sec-policy/selinux-asterisk/metadata.xml
+++ b/sec-policy/selinux-asterisk/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for asterisk</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-at/metadata.xml b/sec-policy/selinux-at/metadata.xml
index 9fc5dd4a172b..200f1a2a51b9 100644
--- a/sec-policy/selinux-at/metadata.xml
+++ b/sec-policy/selinux-at/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for at</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-automount/metadata.xml b/sec-policy/selinux-automount/metadata.xml
index 3546beabf631..7f7e7af4a452 100644
--- a/sec-policy/selinux-automount/metadata.xml
+++ b/sec-policy/selinux-automount/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for automount</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-avahi/metadata.xml b/sec-policy/selinux-avahi/metadata.xml
index 64c05fc1ce3b..b58e237d8121 100644
--- a/sec-policy/selinux-avahi/metadata.xml
+++ b/sec-policy/selinux-avahi/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for avahi</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-awstats/metadata.xml b/sec-policy/selinux-awstats/metadata.xml
index 7c2b0f2fb401..390956e9a0e6 100644
--- a/sec-policy/selinux-awstats/metadata.xml
+++ b/sec-policy/selinux-awstats/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for awstats</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-backup/metadata.xml b/sec-policy/selinux-backup/metadata.xml
index edb8c8851895..1b450e3380d3 100644
--- a/sec-policy/selinux-backup/metadata.xml
+++ b/sec-policy/selinux-backup/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for generic backup apps</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-bacula/metadata.xml b/sec-policy/selinux-bacula/metadata.xml
index bcbdae69aef9..55313fd95fbd 100644
--- a/sec-policy/selinux-bacula/metadata.xml
+++ b/sec-policy/selinux-bacula/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for bacula</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-base-policy/metadata.xml b/sec-policy/selinux-base-policy/metadata.xml
index 4adcb401b0bb..50877f7015b1 100644
--- a/sec-policy/selinux-base-policy/metadata.xml
+++ b/sec-policy/selinux-base-policy/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>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>
 		Gentoo SELinux base policy.  This contains policy for a system at the end of system installation.
 		There is no extra policy in this package.
diff --git a/sec-policy/selinux-base/metadata.xml b/sec-policy/selinux-base/metadata.xml
index 39f241587154..9493edb1d3bd 100644
--- a/sec-policy/selinux-base/metadata.xml
+++ b/sec-policy/selinux-base/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>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>
 		Gentoo SELinux base policy.  This contains policy for a system at the end of system installation.
 		There is no extra policy in this package.
diff --git a/sec-policy/selinux-bind/metadata.xml b/sec-policy/selinux-bind/metadata.xml
index b856e815c170..b899547c2931 100644
--- a/sec-policy/selinux-bind/metadata.xml
+++ b/sec-policy/selinux-bind/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for bind</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-bitcoin/metadata.xml b/sec-policy/selinux-bitcoin/metadata.xml
index f4345886e176..bff5c2213628 100644
--- a/sec-policy/selinux-bitcoin/metadata.xml
+++ b/sec-policy/selinux-bitcoin/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for bitcoin</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-bitlbee/metadata.xml b/sec-policy/selinux-bitlbee/metadata.xml
index cc849b1d2b37..d4b547c2b714 100644
--- a/sec-policy/selinux-bitlbee/metadata.xml
+++ b/sec-policy/selinux-bitlbee/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for bitlbee</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-bluetooth/metadata.xml b/sec-policy/selinux-bluetooth/metadata.xml
index 42cbc2945653..b7956961e3f3 100644
--- a/sec-policy/selinux-bluetooth/metadata.xml
+++ b/sec-policy/selinux-bluetooth/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for bluetooth</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-brctl/metadata.xml b/sec-policy/selinux-brctl/metadata.xml
index 79943b773f00..66ff67c2ca7c 100644
--- a/sec-policy/selinux-brctl/metadata.xml
+++ b/sec-policy/selinux-brctl/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for brctl</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-cachefilesd/metadata.xml b/sec-policy/selinux-cachefilesd/metadata.xml
index 11307c1424b4..421a5a26a3bb 100644
--- a/sec-policy/selinux-cachefilesd/metadata.xml
+++ b/sec-policy/selinux-cachefilesd/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for cachefilesd</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-calamaris/metadata.xml b/sec-policy/selinux-calamaris/metadata.xml
index 80d29e2ba539..e4ffc3257976 100644
--- a/sec-policy/selinux-calamaris/metadata.xml
+++ b/sec-policy/selinux-calamaris/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for calamaris</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-canna/metadata.xml b/sec-policy/selinux-canna/metadata.xml
index e696c216d0ba..e5828eaddabf 100644
--- a/sec-policy/selinux-canna/metadata.xml
+++ b/sec-policy/selinux-canna/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for canna</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-ccs/metadata.xml b/sec-policy/selinux-ccs/metadata.xml
index b54664195b8b..b3767ed853b7 100644
--- a/sec-policy/selinux-ccs/metadata.xml
+++ b/sec-policy/selinux-ccs/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for ccs</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-cdrecord/metadata.xml b/sec-policy/selinux-cdrecord/metadata.xml
index 642593a3faa9..f47ca30376c4 100644
--- a/sec-policy/selinux-cdrecord/metadata.xml
+++ b/sec-policy/selinux-cdrecord/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for cdrecord</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-ceph/metadata.xml b/sec-policy/selinux-ceph/metadata.xml
index 3df3b5d89fd2..bd9f07d2a0b2 100644
--- a/sec-policy/selinux-ceph/metadata.xml
+++ b/sec-policy/selinux-ceph/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for Ceph</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-cgmanager/metadata.xml b/sec-policy/selinux-cgmanager/metadata.xml
index 4d4ed18b4e16..0b65c6b51334 100644
--- a/sec-policy/selinux-cgmanager/metadata.xml
+++ b/sec-policy/selinux-cgmanager/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for Control Group manager daemon</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-cgroup/metadata.xml b/sec-policy/selinux-cgroup/metadata.xml
index 55fb23355ead..57b6309f07a8 100644
--- a/sec-policy/selinux-cgroup/metadata.xml
+++ b/sec-policy/selinux-cgroup/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for cgroup</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-chromium/metadata.xml b/sec-policy/selinux-chromium/metadata.xml
index 789f699204fc..a1c46b2cd39e 100644
--- a/sec-policy/selinux-chromium/metadata.xml
+++ b/sec-policy/selinux-chromium/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for chromium</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-chronyd/metadata.xml b/sec-policy/selinux-chronyd/metadata.xml
index 7c21281b07de..177a91c5f159 100644
--- a/sec-policy/selinux-chronyd/metadata.xml
+++ b/sec-policy/selinux-chronyd/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for chronyd</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-clamav/metadata.xml b/sec-policy/selinux-clamav/metadata.xml
index cefea4104e8a..ccd4db8e68f9 100644
--- a/sec-policy/selinux-clamav/metadata.xml
+++ b/sec-policy/selinux-clamav/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for clamav</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-clockspeed/metadata.xml b/sec-policy/selinux-clockspeed/metadata.xml
index 4ad3f058ea51..4f926b5bbc26 100644
--- a/sec-policy/selinux-clockspeed/metadata.xml
+++ b/sec-policy/selinux-clockspeed/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for clockspeed</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-collectd/metadata.xml b/sec-policy/selinux-collectd/metadata.xml
index 4e9111b6c4e8..622de86f0e12 100644
--- a/sec-policy/selinux-collectd/metadata.xml
+++ b/sec-policy/selinux-collectd/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for collectd</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-consolekit/metadata.xml b/sec-policy/selinux-consolekit/metadata.xml
index b23fe2d09c51..0b14d9a62d9a 100644
--- a/sec-policy/selinux-consolekit/metadata.xml
+++ b/sec-policy/selinux-consolekit/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for consolekit</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-corosync/metadata.xml b/sec-policy/selinux-corosync/metadata.xml
index 6e6fdaf7c616..185a21ecf161 100644
--- a/sec-policy/selinux-corosync/metadata.xml
+++ b/sec-policy/selinux-corosync/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for corosync</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-couchdb/metadata.xml b/sec-policy/selinux-couchdb/metadata.xml
index d8f21d71e6e2..061fcd1a9adb 100644
--- a/sec-policy/selinux-couchdb/metadata.xml
+++ b/sec-policy/selinux-couchdb/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for couchdb</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-courier/metadata.xml b/sec-policy/selinux-courier/metadata.xml
index 97a61d6f57cd..f6f43aa6cb13 100644
--- a/sec-policy/selinux-courier/metadata.xml
+++ b/sec-policy/selinux-courier/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for courier</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-cpucontrol/metadata.xml b/sec-policy/selinux-cpucontrol/metadata.xml
index c9cb931a230f..69b39d2ccc6b 100644
--- a/sec-policy/selinux-cpucontrol/metadata.xml
+++ b/sec-policy/selinux-cpucontrol/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for cpucontrol</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-cpufreqselector/metadata.xml b/sec-policy/selinux-cpufreqselector/metadata.xml
index 27a46e4132ab..c2882afde3db 100644
--- a/sec-policy/selinux-cpufreqselector/metadata.xml
+++ b/sec-policy/selinux-cpufreqselector/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for cpufreqselector</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-cups/metadata.xml b/sec-policy/selinux-cups/metadata.xml
index 01c116c2d9b4..1886f5c44184 100644
--- a/sec-policy/selinux-cups/metadata.xml
+++ b/sec-policy/selinux-cups/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for cups</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-cvs/metadata.xml b/sec-policy/selinux-cvs/metadata.xml
index 72fd68409ccb..76bce87eb932 100644
--- a/sec-policy/selinux-cvs/metadata.xml
+++ b/sec-policy/selinux-cvs/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for cvs</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-cyphesis/metadata.xml b/sec-policy/selinux-cyphesis/metadata.xml
index 1899fffdfe20..963a8d93914e 100644
--- a/sec-policy/selinux-cyphesis/metadata.xml
+++ b/sec-policy/selinux-cyphesis/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for cyphesis</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-daemontools/metadata.xml b/sec-policy/selinux-daemontools/metadata.xml
index 075b2bebf1c9..3c88f22caee6 100644
--- a/sec-policy/selinux-daemontools/metadata.xml
+++ b/sec-policy/selinux-daemontools/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for daemontools</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-dante/metadata.xml b/sec-policy/selinux-dante/metadata.xml
index 7d5b19129e9d..e45c4bf6f0eb 100644
--- a/sec-policy/selinux-dante/metadata.xml
+++ b/sec-policy/selinux-dante/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for dante</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-dbadm/metadata.xml b/sec-policy/selinux-dbadm/metadata.xml
index 5aa0a174da58..8cd126d7c0f2 100644
--- a/sec-policy/selinux-dbadm/metadata.xml
+++ b/sec-policy/selinux-dbadm/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for dbadm</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-dbskk/metadata.xml b/sec-policy/selinux-dbskk/metadata.xml
index 426d849511ee..8512beb71141 100644
--- a/sec-policy/selinux-dbskk/metadata.xml
+++ b/sec-policy/selinux-dbskk/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for dbskk</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-dbus/metadata.xml b/sec-policy/selinux-dbus/metadata.xml
index 6dd441f64eb5..9865a51d2b92 100644
--- a/sec-policy/selinux-dbus/metadata.xml
+++ b/sec-policy/selinux-dbus/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for dbus</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-dcc/metadata.xml b/sec-policy/selinux-dcc/metadata.xml
index a1cc605aee85..dd09e9694559 100644
--- a/sec-policy/selinux-dcc/metadata.xml
+++ b/sec-policy/selinux-dcc/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for dcc</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-ddclient/metadata.xml b/sec-policy/selinux-ddclient/metadata.xml
index 6035cfa4ba7a..ff218761244d 100644
--- a/sec-policy/selinux-ddclient/metadata.xml
+++ b/sec-policy/selinux-ddclient/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for ddclient</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-ddcprobe/metadata.xml b/sec-policy/selinux-ddcprobe/metadata.xml
index 14bf4799e971..cb9a7623c893 100644
--- a/sec-policy/selinux-ddcprobe/metadata.xml
+++ b/sec-policy/selinux-ddcprobe/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for ddcprobe</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-denyhosts/metadata.xml b/sec-policy/selinux-denyhosts/metadata.xml
index 181c8fcc10be..7947db1b086c 100644
--- a/sec-policy/selinux-denyhosts/metadata.xml
+++ b/sec-policy/selinux-denyhosts/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for denyhosts</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-devicekit/metadata.xml b/sec-policy/selinux-devicekit/metadata.xml
index 026df01f42fd..48f5143eb108 100644
--- a/sec-policy/selinux-devicekit/metadata.xml
+++ b/sec-policy/selinux-devicekit/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for devicekit</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-dhcp/metadata.xml b/sec-policy/selinux-dhcp/metadata.xml
index ad25a1bc4b57..d593bf414b91 100644
--- a/sec-policy/selinux-dhcp/metadata.xml
+++ b/sec-policy/selinux-dhcp/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for dhcp</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-dictd/metadata.xml b/sec-policy/selinux-dictd/metadata.xml
index c3b30ba025e2..b18ee4bb8202 100644
--- a/sec-policy/selinux-dictd/metadata.xml
+++ b/sec-policy/selinux-dictd/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for dictd</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-dirsrv/metadata.xml b/sec-policy/selinux-dirsrv/metadata.xml
index c2abf9591f70..3f5863597942 100644
--- a/sec-policy/selinux-dirsrv/metadata.xml
+++ b/sec-policy/selinux-dirsrv/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for dirsrv</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-distcc/metadata.xml b/sec-policy/selinux-distcc/metadata.xml
index 726aceed0ea0..d1bbb1f0e5ed 100644
--- a/sec-policy/selinux-distcc/metadata.xml
+++ b/sec-policy/selinux-distcc/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for distcc</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-djbdns/metadata.xml b/sec-policy/selinux-djbdns/metadata.xml
index 89e79b6283a2..7d0b1fd791d1 100644
--- a/sec-policy/selinux-djbdns/metadata.xml
+++ b/sec-policy/selinux-djbdns/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for djbdns</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-dkim/metadata.xml b/sec-policy/selinux-dkim/metadata.xml
index b1a035bfa5c9..82020f674383 100644
--- a/sec-policy/selinux-dkim/metadata.xml
+++ b/sec-policy/selinux-dkim/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for dkim</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-dmidecode/metadata.xml b/sec-policy/selinux-dmidecode/metadata.xml
index 651d7247cc25..cfbccb28f1a8 100644
--- a/sec-policy/selinux-dmidecode/metadata.xml
+++ b/sec-policy/selinux-dmidecode/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for dmidecode</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-dnsmasq/metadata.xml b/sec-policy/selinux-dnsmasq/metadata.xml
index b41efda22866..fc56166df895 100644
--- a/sec-policy/selinux-dnsmasq/metadata.xml
+++ b/sec-policy/selinux-dnsmasq/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for dnsmasq</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-dovecot/metadata.xml b/sec-policy/selinux-dovecot/metadata.xml
index 42e8a34dfda8..e186b7ee24a7 100644
--- a/sec-policy/selinux-dovecot/metadata.xml
+++ b/sec-policy/selinux-dovecot/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for dovecot</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-dpkg/metadata.xml b/sec-policy/selinux-dpkg/metadata.xml
index 3381586f0909..139385ca2aeb 100644
--- a/sec-policy/selinux-dpkg/metadata.xml
+++ b/sec-policy/selinux-dpkg/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for dpkg</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-dracut/metadata.xml b/sec-policy/selinux-dracut/metadata.xml
index 60e5eff72fa3..3d8b23d85f36 100644
--- a/sec-policy/selinux-dracut/metadata.xml
+++ b/sec-policy/selinux-dracut/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for dracut</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-dropbox/metadata.xml b/sec-policy/selinux-dropbox/metadata.xml
index 9d9d2032efd2..bfa85211dfd9 100644
--- a/sec-policy/selinux-dropbox/metadata.xml
+++ b/sec-policy/selinux-dropbox/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for dropbox</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-entropyd/metadata.xml b/sec-policy/selinux-entropyd/metadata.xml
index 459d58f79ac9..164732d6d8da 100644
--- a/sec-policy/selinux-entropyd/metadata.xml
+++ b/sec-policy/selinux-entropyd/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for various entropy daemons</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-evolution/metadata.xml b/sec-policy/selinux-evolution/metadata.xml
index 7732ae059757..982a2e667aa9 100644
--- a/sec-policy/selinux-evolution/metadata.xml
+++ b/sec-policy/selinux-evolution/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for evolution</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-exim/metadata.xml b/sec-policy/selinux-exim/metadata.xml
index 00a500409881..1c657daa0a79 100644
--- a/sec-policy/selinux-exim/metadata.xml
+++ b/sec-policy/selinux-exim/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for exim</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-fail2ban/metadata.xml b/sec-policy/selinux-fail2ban/metadata.xml
index 6d215bf30a68..b1da9d4496bf 100644
--- a/sec-policy/selinux-fail2ban/metadata.xml
+++ b/sec-policy/selinux-fail2ban/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for fail2ban</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-fetchmail/metadata.xml b/sec-policy/selinux-fetchmail/metadata.xml
index ade9e3b779d9..858843837b84 100644
--- a/sec-policy/selinux-fetchmail/metadata.xml
+++ b/sec-policy/selinux-fetchmail/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for fetchmail</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-finger/metadata.xml b/sec-policy/selinux-finger/metadata.xml
index d08fa6d9d9f7..4c297cfe10c6 100644
--- a/sec-policy/selinux-finger/metadata.xml
+++ b/sec-policy/selinux-finger/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for finger</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-flash/metadata.xml b/sec-policy/selinux-flash/metadata.xml
index 9b78656298aa..461a6ddd3996 100644
--- a/sec-policy/selinux-flash/metadata.xml
+++ b/sec-policy/selinux-flash/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for Macromedia Flash</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-fprintd/metadata.xml b/sec-policy/selinux-fprintd/metadata.xml
index 456fff2271a2..2aecc0ef968a 100644
--- a/sec-policy/selinux-fprintd/metadata.xml
+++ b/sec-policy/selinux-fprintd/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for fprintd</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-ftp/metadata.xml b/sec-policy/selinux-ftp/metadata.xml
index ca1762e73161..e756e1ebd524 100644
--- a/sec-policy/selinux-ftp/metadata.xml
+++ b/sec-policy/selinux-ftp/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for ftp</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-games/metadata.xml b/sec-policy/selinux-games/metadata.xml
index f766f5f1eec5..1d61d7feb077 100644
--- a/sec-policy/selinux-games/metadata.xml
+++ b/sec-policy/selinux-games/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for games</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-gatekeeper/metadata.xml b/sec-policy/selinux-gatekeeper/metadata.xml
index b12206f0b1c8..0baa83179a1e 100644
--- a/sec-policy/selinux-gatekeeper/metadata.xml
+++ b/sec-policy/selinux-gatekeeper/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for gatekeeper</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-gift/metadata.xml b/sec-policy/selinux-gift/metadata.xml
index 78fc3576054f..3cbb2dbd31f5 100644
--- a/sec-policy/selinux-gift/metadata.xml
+++ b/sec-policy/selinux-gift/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for gift</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-git/metadata.xml b/sec-policy/selinux-git/metadata.xml
index 02400cbfe2e9..b07074702067 100644
--- a/sec-policy/selinux-git/metadata.xml
+++ b/sec-policy/selinux-git/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for git</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-gitosis/metadata.xml b/sec-policy/selinux-gitosis/metadata.xml
index e7bc9d130c56..0ec56f30974c 100644
--- a/sec-policy/selinux-gitosis/metadata.xml
+++ b/sec-policy/selinux-gitosis/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for gitosis</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-gnome/metadata.xml b/sec-policy/selinux-gnome/metadata.xml
index 4fe2ce35576a..e8aa3af18a29 100644
--- a/sec-policy/selinux-gnome/metadata.xml
+++ b/sec-policy/selinux-gnome/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for gnome</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-googletalk/metadata.xml b/sec-policy/selinux-googletalk/metadata.xml
index 4b806babda6d..7b885899e14d 100644
--- a/sec-policy/selinux-googletalk/metadata.xml
+++ b/sec-policy/selinux-googletalk/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for Google Talk</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-gorg/metadata.xml b/sec-policy/selinux-gorg/metadata.xml
index e77d80838260..f333cfaac850 100644
--- a/sec-policy/selinux-gorg/metadata.xml
+++ b/sec-policy/selinux-gorg/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for gorg</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-gpg/metadata.xml b/sec-policy/selinux-gpg/metadata.xml
index 90905002d1bc..4e3c069d4b30 100644
--- a/sec-policy/selinux-gpg/metadata.xml
+++ b/sec-policy/selinux-gpg/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for gnupg</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-gpm/metadata.xml b/sec-policy/selinux-gpm/metadata.xml
index 23281f133f94..13cb26aa379f 100644
--- a/sec-policy/selinux-gpm/metadata.xml
+++ b/sec-policy/selinux-gpm/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for gpm</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-gpsd/metadata.xml b/sec-policy/selinux-gpsd/metadata.xml
index fc94126d4368..5ceaf08d8cca 100644
--- a/sec-policy/selinux-gpsd/metadata.xml
+++ b/sec-policy/selinux-gpsd/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for gpsd</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-hddtemp/metadata.xml b/sec-policy/selinux-hddtemp/metadata.xml
index 7689a327a770..298c5e42a58f 100644
--- a/sec-policy/selinux-hddtemp/metadata.xml
+++ b/sec-policy/selinux-hddtemp/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for hddtemp</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-howl/metadata.xml b/sec-policy/selinux-howl/metadata.xml
index 6a79e57f667b..49eaaab357a6 100644
--- a/sec-policy/selinux-howl/metadata.xml
+++ b/sec-policy/selinux-howl/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for howl</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-icecast/metadata.xml b/sec-policy/selinux-icecast/metadata.xml
index 7532d9ccdcc0..b2f6797a3b76 100644
--- a/sec-policy/selinux-icecast/metadata.xml
+++ b/sec-policy/selinux-icecast/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for icecast</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-ifplugd/metadata.xml b/sec-policy/selinux-ifplugd/metadata.xml
index 705d192675ff..55aeda726517 100644
--- a/sec-policy/selinux-ifplugd/metadata.xml
+++ b/sec-policy/selinux-ifplugd/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for ifplugd</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-imaze/metadata.xml b/sec-policy/selinux-imaze/metadata.xml
index 6c4c2b06ccc5..22a18bfb530f 100644
--- a/sec-policy/selinux-imaze/metadata.xml
+++ b/sec-policy/selinux-imaze/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for imaze</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-inetd/metadata.xml b/sec-policy/selinux-inetd/metadata.xml
index 0bed3d1ea693..e6d6ee2bef53 100644
--- a/sec-policy/selinux-inetd/metadata.xml
+++ b/sec-policy/selinux-inetd/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for inetd</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-inn/metadata.xml b/sec-policy/selinux-inn/metadata.xml
index a6c69b936a91..fa6eab88357c 100644
--- a/sec-policy/selinux-inn/metadata.xml
+++ b/sec-policy/selinux-inn/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for inn</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-ipsec/metadata.xml b/sec-policy/selinux-ipsec/metadata.xml
index 3bbae2279ffc..0236eb95166f 100644
--- a/sec-policy/selinux-ipsec/metadata.xml
+++ b/sec-policy/selinux-ipsec/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for ipsec</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-irc/metadata.xml b/sec-policy/selinux-irc/metadata.xml
index 654dd6a0e303..056ec1253937 100644
--- a/sec-policy/selinux-irc/metadata.xml
+++ b/sec-policy/selinux-irc/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for irc</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-ircd/metadata.xml b/sec-policy/selinux-ircd/metadata.xml
index 35ed1a3c97ab..65002e9613da 100644
--- a/sec-policy/selinux-ircd/metadata.xml
+++ b/sec-policy/selinux-ircd/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for ircd</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-irqbalance/metadata.xml b/sec-policy/selinux-irqbalance/metadata.xml
index 2ec6319458d3..9b5d511897f3 100644
--- a/sec-policy/selinux-irqbalance/metadata.xml
+++ b/sec-policy/selinux-irqbalance/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for irqbalance</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-jabber/metadata.xml b/sec-policy/selinux-jabber/metadata.xml
index 82e255025ea3..e1c596505231 100644
--- a/sec-policy/selinux-jabber/metadata.xml
+++ b/sec-policy/selinux-jabber/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for jabber</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-java/metadata.xml b/sec-policy/selinux-java/metadata.xml
index 901aaffae49f..94fa6295ebc7 100644
--- a/sec-policy/selinux-java/metadata.xml
+++ b/sec-policy/selinux-java/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for java</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-kdeconnect/metadata.xml b/sec-policy/selinux-kdeconnect/metadata.xml
index de83905bb29b..0e7135bd79b8 100644
--- a/sec-policy/selinux-kdeconnect/metadata.xml
+++ b/sec-policy/selinux-kdeconnect/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for kdeconnect</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-kdump/metadata.xml b/sec-policy/selinux-kdump/metadata.xml
index 62a070a73fec..e4a3e0f48f62 100644
--- a/sec-policy/selinux-kdump/metadata.xml
+++ b/sec-policy/selinux-kdump/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for kdump</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-kerberos/metadata.xml b/sec-policy/selinux-kerberos/metadata.xml
index 0a21fcac9a23..c9a227e3c7c3 100644
--- a/sec-policy/selinux-kerberos/metadata.xml
+++ b/sec-policy/selinux-kerberos/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for kerberos</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-kerneloops/metadata.xml b/sec-policy/selinux-kerneloops/metadata.xml
index 765d1f98a33d..2d7755c47ea6 100644
--- a/sec-policy/selinux-kerneloops/metadata.xml
+++ b/sec-policy/selinux-kerneloops/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for kerneloops</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-kismet/metadata.xml b/sec-policy/selinux-kismet/metadata.xml
index 967aedf55b44..3d349045d1f7 100644
--- a/sec-policy/selinux-kismet/metadata.xml
+++ b/sec-policy/selinux-kismet/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for kismet</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-ksmtuned/metadata.xml b/sec-policy/selinux-ksmtuned/metadata.xml
index 3b44850531ae..5c5bfcdf0255 100644
--- a/sec-policy/selinux-ksmtuned/metadata.xml
+++ b/sec-policy/selinux-ksmtuned/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for ksmtuned</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-kudzu/metadata.xml b/sec-policy/selinux-kudzu/metadata.xml
index 235e7ca625db..40247f066855 100644
--- a/sec-policy/selinux-kudzu/metadata.xml
+++ b/sec-policy/selinux-kudzu/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for kudzu</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-ldap/metadata.xml b/sec-policy/selinux-ldap/metadata.xml
index d873bf1f89a8..556e48eceb49 100644
--- a/sec-policy/selinux-ldap/metadata.xml
+++ b/sec-policy/selinux-ldap/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for openldap</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-links/metadata.xml b/sec-policy/selinux-links/metadata.xml
index 80b8415ab873..0579cb3847a8 100644
--- a/sec-policy/selinux-links/metadata.xml
+++ b/sec-policy/selinux-links/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for links</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-lircd/metadata.xml b/sec-policy/selinux-lircd/metadata.xml
index bbf99b9f1e96..eefa36011250 100644
--- a/sec-policy/selinux-lircd/metadata.xml
+++ b/sec-policy/selinux-lircd/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for lircd</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-loadkeys/metadata.xml b/sec-policy/selinux-loadkeys/metadata.xml
index 6c9b7570e7d7..83502d1c611f 100644
--- a/sec-policy/selinux-loadkeys/metadata.xml
+++ b/sec-policy/selinux-loadkeys/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for loadkeys</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-lockdev/metadata.xml b/sec-policy/selinux-lockdev/metadata.xml
index eab45545ff5e..9abd91c4fc5e 100644
--- a/sec-policy/selinux-lockdev/metadata.xml
+++ b/sec-policy/selinux-lockdev/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for lockdev</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-logrotate/metadata.xml b/sec-policy/selinux-logrotate/metadata.xml
index f5f0a6513b05..d52b8189340a 100644
--- a/sec-policy/selinux-logrotate/metadata.xml
+++ b/sec-policy/selinux-logrotate/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for logrotate</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-logsentry/metadata.xml b/sec-policy/selinux-logsentry/metadata.xml
index cc5ea2a427e8..69c72e8dbb90 100644
--- a/sec-policy/selinux-logsentry/metadata.xml
+++ b/sec-policy/selinux-logsentry/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for logsentry</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-logwatch/metadata.xml b/sec-policy/selinux-logwatch/metadata.xml
index cd2eb89e5488..56ac2e8e8fe2 100644
--- a/sec-policy/selinux-logwatch/metadata.xml
+++ b/sec-policy/selinux-logwatch/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for logwatch</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-lpd/metadata.xml b/sec-policy/selinux-lpd/metadata.xml
index 2513587b94ed..5e021454c72d 100644
--- a/sec-policy/selinux-lpd/metadata.xml
+++ b/sec-policy/selinux-lpd/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for lpd</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-mailman/metadata.xml b/sec-policy/selinux-mailman/metadata.xml
index 09ee9c0d4bb1..90af4104659e 100644
--- a/sec-policy/selinux-mailman/metadata.xml
+++ b/sec-policy/selinux-mailman/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for mailman</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-makewhatis/metadata.xml b/sec-policy/selinux-makewhatis/metadata.xml
index a756f775e7e2..81c37dba3f6f 100644
--- a/sec-policy/selinux-makewhatis/metadata.xml
+++ b/sec-policy/selinux-makewhatis/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for makewhatis</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-mandb/metadata.xml b/sec-policy/selinux-mandb/metadata.xml
index effd4b134a22..9809c8810397 100644
--- a/sec-policy/selinux-mandb/metadata.xml
+++ b/sec-policy/selinux-mandb/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for mandb</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-mcelog/metadata.xml b/sec-policy/selinux-mcelog/metadata.xml
index 7c3ac887a23f..3ca015380f87 100644
--- a/sec-policy/selinux-mcelog/metadata.xml
+++ b/sec-policy/selinux-mcelog/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for mcelog</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-memcached/metadata.xml b/sec-policy/selinux-memcached/metadata.xml
index 4c8c0d52c402..26e8f3cffd9b 100644
--- a/sec-policy/selinux-memcached/metadata.xml
+++ b/sec-policy/selinux-memcached/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for memcached</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-milter/metadata.xml b/sec-policy/selinux-milter/metadata.xml
index 86cec3edf015..55f78c315357 100644
--- a/sec-policy/selinux-milter/metadata.xml
+++ b/sec-policy/selinux-milter/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for milter</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-modemmanager/metadata.xml b/sec-policy/selinux-modemmanager/metadata.xml
index 32c552418b9f..39aa9d50b7d9 100644
--- a/sec-policy/selinux-modemmanager/metadata.xml
+++ b/sec-policy/selinux-modemmanager/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for modemmanager</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-mono/metadata.xml b/sec-policy/selinux-mono/metadata.xml
index 0ce797fc712c..31b84d068590 100644
--- a/sec-policy/selinux-mono/metadata.xml
+++ b/sec-policy/selinux-mono/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for mono</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-mozilla/metadata.xml b/sec-policy/selinux-mozilla/metadata.xml
index d718f1b5afdb..c7863aac7055 100644
--- a/sec-policy/selinux-mozilla/metadata.xml
+++ b/sec-policy/selinux-mozilla/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for mozilla</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-mpd/metadata.xml b/sec-policy/selinux-mpd/metadata.xml
index 8d1d1e650398..433cd0213bda 100644
--- a/sec-policy/selinux-mpd/metadata.xml
+++ b/sec-policy/selinux-mpd/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for mpd</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-mplayer/metadata.xml b/sec-policy/selinux-mplayer/metadata.xml
index 48c98f394c89..c392426c272e 100644
--- a/sec-policy/selinux-mplayer/metadata.xml
+++ b/sec-policy/selinux-mplayer/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for mplayer</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-mrtg/metadata.xml b/sec-policy/selinux-mrtg/metadata.xml
index 0e4cdf0a420a..a7dd2cf79528 100644
--- a/sec-policy/selinux-mrtg/metadata.xml
+++ b/sec-policy/selinux-mrtg/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for mrtg</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-munin/metadata.xml b/sec-policy/selinux-munin/metadata.xml
index 7582f6c1a8a3..a9d14f7f1541 100644
--- a/sec-policy/selinux-munin/metadata.xml
+++ b/sec-policy/selinux-munin/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for munin</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-mutt/metadata.xml b/sec-policy/selinux-mutt/metadata.xml
index 57fb29f6850d..9669b02ee3d9 100644
--- a/sec-policy/selinux-mutt/metadata.xml
+++ b/sec-policy/selinux-mutt/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for mutt</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-mysql/metadata.xml b/sec-policy/selinux-mysql/metadata.xml
index 343564dba353..ea754c05cfc0 100644
--- a/sec-policy/selinux-mysql/metadata.xml
+++ b/sec-policy/selinux-mysql/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for mysql</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-nagios/metadata.xml b/sec-policy/selinux-nagios/metadata.xml
index b1525c56401f..483037e227e6 100644
--- a/sec-policy/selinux-nagios/metadata.xml
+++ b/sec-policy/selinux-nagios/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for nagios</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-ncftool/metadata.xml b/sec-policy/selinux-ncftool/metadata.xml
index cec13cb02c25..50a94b5c73f0 100644
--- a/sec-policy/selinux-ncftool/metadata.xml
+++ b/sec-policy/selinux-ncftool/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for ncftool</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-nessus/metadata.xml b/sec-policy/selinux-nessus/metadata.xml
index 24a278716d3f..a61b6fbc3341 100644
--- a/sec-policy/selinux-nessus/metadata.xml
+++ b/sec-policy/selinux-nessus/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for nessus</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-networkmanager/metadata.xml b/sec-policy/selinux-networkmanager/metadata.xml
index 6670a2f4228d..98478a4ea34f 100644
--- a/sec-policy/selinux-networkmanager/metadata.xml
+++ b/sec-policy/selinux-networkmanager/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for networkmanager</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-nginx/metadata.xml b/sec-policy/selinux-nginx/metadata.xml
index a74b86c6ec6d..dcd938a13762 100644
--- a/sec-policy/selinux-nginx/metadata.xml
+++ b/sec-policy/selinux-nginx/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for nginx</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-nslcd/metadata.xml b/sec-policy/selinux-nslcd/metadata.xml
index b91c98cc26f0..09e0c7f52129 100644
--- a/sec-policy/selinux-nslcd/metadata.xml
+++ b/sec-policy/selinux-nslcd/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>hardened</herd>
-<longdescription>Gentoo SELinux policy for nslcd</longdescription>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
+	<longdescription>Gentoo SELinux policy for nslcd</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-ntop/metadata.xml b/sec-policy/selinux-ntop/metadata.xml
index b98a7c892201..a08d7a6c5d49 100644
--- a/sec-policy/selinux-ntop/metadata.xml
+++ b/sec-policy/selinux-ntop/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for ntop</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-ntp/metadata.xml b/sec-policy/selinux-ntp/metadata.xml
index 906e09ec1cbb..5f79b2ff18f2 100644
--- a/sec-policy/selinux-ntp/metadata.xml
+++ b/sec-policy/selinux-ntp/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for ntp</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-nut/metadata.xml b/sec-policy/selinux-nut/metadata.xml
index b93841c73744..bde8a1936755 100644
--- a/sec-policy/selinux-nut/metadata.xml
+++ b/sec-policy/selinux-nut/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for nut</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-nx/metadata.xml b/sec-policy/selinux-nx/metadata.xml
index 63b8d0b3a75b..c2c4c40a34bf 100644
--- a/sec-policy/selinux-nx/metadata.xml
+++ b/sec-policy/selinux-nx/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for nx</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-oddjob/metadata.xml b/sec-policy/selinux-oddjob/metadata.xml
index 1a90c82f80fe..f3e745f1ce24 100644
--- a/sec-policy/selinux-oddjob/metadata.xml
+++ b/sec-policy/selinux-oddjob/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for oddjob (helpers for PAM)</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-oident/metadata.xml b/sec-policy/selinux-oident/metadata.xml
index b709fd90ceca..640353e971fb 100644
--- a/sec-policy/selinux-oident/metadata.xml
+++ b/sec-policy/selinux-oident/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for oident</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-openct/metadata.xml b/sec-policy/selinux-openct/metadata.xml
index 530352ed3bf7..74f658b0f8c7 100644
--- a/sec-policy/selinux-openct/metadata.xml
+++ b/sec-policy/selinux-openct/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for openct</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-openrc/metadata.xml b/sec-policy/selinux-openrc/metadata.xml
index e173d0188734..1a794eab9237 100644
--- a/sec-policy/selinux-openrc/metadata.xml
+++ b/sec-policy/selinux-openrc/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for openrc</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-openvpn/metadata.xml b/sec-policy/selinux-openvpn/metadata.xml
index 643df9572f98..ba7549f93919 100644
--- a/sec-policy/selinux-openvpn/metadata.xml
+++ b/sec-policy/selinux-openvpn/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for openvpn</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-pan/metadata.xml b/sec-policy/selinux-pan/metadata.xml
index 95a7e9f7c85a..d7927d340337 100644
--- a/sec-policy/selinux-pan/metadata.xml
+++ b/sec-policy/selinux-pan/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for pan</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-pcmcia/metadata.xml b/sec-policy/selinux-pcmcia/metadata.xml
index 80f4dbfd41e7..6b067b8d5bfa 100644
--- a/sec-policy/selinux-pcmcia/metadata.xml
+++ b/sec-policy/selinux-pcmcia/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for pcmcia</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-pcscd/metadata.xml b/sec-policy/selinux-pcscd/metadata.xml
index 74d772de37cf..891de59d3c71 100644
--- a/sec-policy/selinux-pcscd/metadata.xml
+++ b/sec-policy/selinux-pcscd/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for pcscd</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-perdition/metadata.xml b/sec-policy/selinux-perdition/metadata.xml
index 3306f3014568..084d0c0a8af0 100644
--- a/sec-policy/selinux-perdition/metadata.xml
+++ b/sec-policy/selinux-perdition/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for perdition</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-phpfpm/metadata.xml b/sec-policy/selinux-phpfpm/metadata.xml
index b413ff054909..dcb049cc3576 100644
--- a/sec-policy/selinux-phpfpm/metadata.xml
+++ b/sec-policy/selinux-phpfpm/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for phpfpm</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-plymouthd/metadata.xml b/sec-policy/selinux-plymouthd/metadata.xml
index 4eef3756148b..28aa42ac3ead 100644
--- a/sec-policy/selinux-plymouthd/metadata.xml
+++ b/sec-policy/selinux-plymouthd/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for plymouthd</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-podsleuth/metadata.xml b/sec-policy/selinux-podsleuth/metadata.xml
index e8cb63d7a1db..6aeeebb19d95 100644
--- a/sec-policy/selinux-podsleuth/metadata.xml
+++ b/sec-policy/selinux-podsleuth/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for podsleuth</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-policykit/metadata.xml b/sec-policy/selinux-policykit/metadata.xml
index ab0ffc58825d..34d9813008de 100644
--- a/sec-policy/selinux-policykit/metadata.xml
+++ b/sec-policy/selinux-policykit/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for policykit</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-portmap/metadata.xml b/sec-policy/selinux-portmap/metadata.xml
index f7193df787e8..144d413cee8d 100644
--- a/sec-policy/selinux-portmap/metadata.xml
+++ b/sec-policy/selinux-portmap/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for portmap</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-postfix/metadata.xml b/sec-policy/selinux-postfix/metadata.xml
index 6cad3d52b046..bcdf87fbb8c6 100644
--- a/sec-policy/selinux-postfix/metadata.xml
+++ b/sec-policy/selinux-postfix/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for postfix</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-postgresql/metadata.xml b/sec-policy/selinux-postgresql/metadata.xml
index 4b6eb97826b5..00865a7d7f0f 100644
--- a/sec-policy/selinux-postgresql/metadata.xml
+++ b/sec-policy/selinux-postgresql/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for postgresql</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-postgrey/metadata.xml b/sec-policy/selinux-postgrey/metadata.xml
index fb1dfe320723..9a45ef4acd10 100644
--- a/sec-policy/selinux-postgrey/metadata.xml
+++ b/sec-policy/selinux-postgrey/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for postgrey</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-ppp/metadata.xml b/sec-policy/selinux-ppp/metadata.xml
index 7151d7cde06d..4c1a4eb2c8d3 100644
--- a/sec-policy/selinux-ppp/metadata.xml
+++ b/sec-policy/selinux-ppp/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for ppp</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-prelink/metadata.xml b/sec-policy/selinux-prelink/metadata.xml
index 32b1a2c60544..1c85d2983fe1 100644
--- a/sec-policy/selinux-prelink/metadata.xml
+++ b/sec-policy/selinux-prelink/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for prelink</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-prelude/metadata.xml b/sec-policy/selinux-prelude/metadata.xml
index 53582b00937d..118af658097a 100644
--- a/sec-policy/selinux-prelude/metadata.xml
+++ b/sec-policy/selinux-prelude/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for prelude</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-privoxy/metadata.xml b/sec-policy/selinux-privoxy/metadata.xml
index 4978d46386a5..9ed7f42e76b8 100644
--- a/sec-policy/selinux-privoxy/metadata.xml
+++ b/sec-policy/selinux-privoxy/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for privoxy</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-procmail/metadata.xml b/sec-policy/selinux-procmail/metadata.xml
index c33e4c8e1ea9..af8e67b79064 100644
--- a/sec-policy/selinux-procmail/metadata.xml
+++ b/sec-policy/selinux-procmail/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for procmail</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-psad/metadata.xml b/sec-policy/selinux-psad/metadata.xml
index 5c07254afd7f..51c0573cd358 100644
--- a/sec-policy/selinux-psad/metadata.xml
+++ b/sec-policy/selinux-psad/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for psad</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-publicfile/metadata.xml b/sec-policy/selinux-publicfile/metadata.xml
index e6548b5e1398..60fd8e5d73af 100644
--- a/sec-policy/selinux-publicfile/metadata.xml
+++ b/sec-policy/selinux-publicfile/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for publicfile</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-pulseaudio/metadata.xml b/sec-policy/selinux-pulseaudio/metadata.xml
index 51d57267f8f5..889cd60c09bb 100644
--- a/sec-policy/selinux-pulseaudio/metadata.xml
+++ b/sec-policy/selinux-pulseaudio/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for pulseaudio</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-puppet/metadata.xml b/sec-policy/selinux-puppet/metadata.xml
index 9c13f0a1f508..090fc5484431 100644
--- a/sec-policy/selinux-puppet/metadata.xml
+++ b/sec-policy/selinux-puppet/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for puppet</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-pyicqt/metadata.xml b/sec-policy/selinux-pyicqt/metadata.xml
index bfb68148ce69..962f3534441b 100644
--- a/sec-policy/selinux-pyicqt/metadata.xml
+++ b/sec-policy/selinux-pyicqt/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for pyicqt</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-pyzor/metadata.xml b/sec-policy/selinux-pyzor/metadata.xml
index 9b0612abef17..e40f91874cba 100644
--- a/sec-policy/selinux-pyzor/metadata.xml
+++ b/sec-policy/selinux-pyzor/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for pyzor</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-qemu/metadata.xml b/sec-policy/selinux-qemu/metadata.xml
index b289b7de9e22..28cc71c2842e 100644
--- a/sec-policy/selinux-qemu/metadata.xml
+++ b/sec-policy/selinux-qemu/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for qemu</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-qmail/metadata.xml b/sec-policy/selinux-qmail/metadata.xml
index 2562554bc5a0..5e0ad940aa1f 100644
--- a/sec-policy/selinux-qmail/metadata.xml
+++ b/sec-policy/selinux-qmail/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for qmail</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-quota/metadata.xml b/sec-policy/selinux-quota/metadata.xml
index e285658278de..ff75382367f9 100644
--- a/sec-policy/selinux-quota/metadata.xml
+++ b/sec-policy/selinux-quota/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for quota</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-radius/metadata.xml b/sec-policy/selinux-radius/metadata.xml
index ee6a97be0386..2472763d69ad 100644
--- a/sec-policy/selinux-radius/metadata.xml
+++ b/sec-policy/selinux-radius/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for radius</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-radvd/metadata.xml b/sec-policy/selinux-radvd/metadata.xml
index 9c5fc13fc5e4..4a7e8fc7d3db 100644
--- a/sec-policy/selinux-radvd/metadata.xml
+++ b/sec-policy/selinux-radvd/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for radvd</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-razor/metadata.xml b/sec-policy/selinux-razor/metadata.xml
index b6d5ad7bd916..5456b51d1c2a 100644
--- a/sec-policy/selinux-razor/metadata.xml
+++ b/sec-policy/selinux-razor/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for razor</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-remotelogin/metadata.xml b/sec-policy/selinux-remotelogin/metadata.xml
index 7aac438fd0e0..30679acbf699 100644
--- a/sec-policy/selinux-remotelogin/metadata.xml
+++ b/sec-policy/selinux-remotelogin/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for remotelogin</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-resolvconf/metadata.xml b/sec-policy/selinux-resolvconf/metadata.xml
index 181a73439b36..ae1977c68a71 100644
--- a/sec-policy/selinux-resolvconf/metadata.xml
+++ b/sec-policy/selinux-resolvconf/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for resolvconf</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-rgmanager/metadata.xml b/sec-policy/selinux-rgmanager/metadata.xml
index d111eac2111b..f979ee64da2e 100644
--- a/sec-policy/selinux-rgmanager/metadata.xml
+++ b/sec-policy/selinux-rgmanager/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for rgmanager</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-rngd/metadata.xml b/sec-policy/selinux-rngd/metadata.xml
index 13b5aba52598..667219126377 100644
--- a/sec-policy/selinux-rngd/metadata.xml
+++ b/sec-policy/selinux-rngd/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for rngd</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-roundup/metadata.xml b/sec-policy/selinux-roundup/metadata.xml
index 38cf0b46528e..967f7d635b10 100644
--- a/sec-policy/selinux-roundup/metadata.xml
+++ b/sec-policy/selinux-roundup/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for roundup</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-rpc/metadata.xml b/sec-policy/selinux-rpc/metadata.xml
index 91a1ff81d8b4..e37f2530441d 100644
--- a/sec-policy/selinux-rpc/metadata.xml
+++ b/sec-policy/selinux-rpc/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for rpc</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-rpcbind/metadata.xml b/sec-policy/selinux-rpcbind/metadata.xml
index 6f34cdbb64e7..6ce2cddb043c 100644
--- a/sec-policy/selinux-rpcbind/metadata.xml
+++ b/sec-policy/selinux-rpcbind/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for rpcbind</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-rpm/metadata.xml b/sec-policy/selinux-rpm/metadata.xml
index 97163ee01560..388931c6d251 100644
--- a/sec-policy/selinux-rpm/metadata.xml
+++ b/sec-policy/selinux-rpm/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for rpm</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-rssh/metadata.xml b/sec-policy/selinux-rssh/metadata.xml
index ea4760c07ebf..7ee519cb0f63 100644
--- a/sec-policy/selinux-rssh/metadata.xml
+++ b/sec-policy/selinux-rssh/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for rssh</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-rtkit/metadata.xml b/sec-policy/selinux-rtkit/metadata.xml
index c5749e0a2158..b3d2662a061a 100644
--- a/sec-policy/selinux-rtkit/metadata.xml
+++ b/sec-policy/selinux-rtkit/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for rtkit</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-rtorrent/metadata.xml b/sec-policy/selinux-rtorrent/metadata.xml
index a7241fcf9d64..8042c070c342 100644
--- a/sec-policy/selinux-rtorrent/metadata.xml
+++ b/sec-policy/selinux-rtorrent/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for rtorrent</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-salt/metadata.xml b/sec-policy/selinux-salt/metadata.xml
index 763039f8e689..6bb2ae17fe96 100644
--- a/sec-policy/selinux-salt/metadata.xml
+++ b/sec-policy/selinux-salt/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for salt</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-samba/metadata.xml b/sec-policy/selinux-samba/metadata.xml
index 277e4b1fb4ce..4c03069058e3 100644
--- a/sec-policy/selinux-samba/metadata.xml
+++ b/sec-policy/selinux-samba/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for samba</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-sasl/metadata.xml b/sec-policy/selinux-sasl/metadata.xml
index ab2a750e8dab..c1ae98d25eca 100644
--- a/sec-policy/selinux-sasl/metadata.xml
+++ b/sec-policy/selinux-sasl/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for sasl</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-screen/metadata.xml b/sec-policy/selinux-screen/metadata.xml
index 1ab23b173fe3..e403054b0fd4 100644
--- a/sec-policy/selinux-screen/metadata.xml
+++ b/sec-policy/selinux-screen/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for screen</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-sendmail/metadata.xml b/sec-policy/selinux-sendmail/metadata.xml
index ec0386ff6465..3a874d215a74 100644
--- a/sec-policy/selinux-sendmail/metadata.xml
+++ b/sec-policy/selinux-sendmail/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for sendmail</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-sensord/metadata.xml b/sec-policy/selinux-sensord/metadata.xml
index a00ebdbe57c9..1e1df1117939 100644
--- a/sec-policy/selinux-sensord/metadata.xml
+++ b/sec-policy/selinux-sensord/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for sensord</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-shorewall/metadata.xml b/sec-policy/selinux-shorewall/metadata.xml
index b1f12aadc006..acb824ac3800 100644
--- a/sec-policy/selinux-shorewall/metadata.xml
+++ b/sec-policy/selinux-shorewall/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for shorewall</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-shutdown/metadata.xml b/sec-policy/selinux-shutdown/metadata.xml
index 899b9bc6ddc0..5635bd837d7e 100644
--- a/sec-policy/selinux-shutdown/metadata.xml
+++ b/sec-policy/selinux-shutdown/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for shutdown</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-skype/metadata.xml b/sec-policy/selinux-skype/metadata.xml
index 810b56308173..0b1f0f12b89a 100644
--- a/sec-policy/selinux-skype/metadata.xml
+++ b/sec-policy/selinux-skype/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for skype</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-slocate/metadata.xml b/sec-policy/selinux-slocate/metadata.xml
index 9c7ca1f55019..8dab63eeefd0 100644
--- a/sec-policy/selinux-slocate/metadata.xml
+++ b/sec-policy/selinux-slocate/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for slocate</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-slrnpull/metadata.xml b/sec-policy/selinux-slrnpull/metadata.xml
index 135fbcf427bc..a54ffc0019d9 100644
--- a/sec-policy/selinux-slrnpull/metadata.xml
+++ b/sec-policy/selinux-slrnpull/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for slrnpull</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-smartmon/metadata.xml b/sec-policy/selinux-smartmon/metadata.xml
index 8422bf33dc42..e601d77bd3ae 100644
--- a/sec-policy/selinux-smartmon/metadata.xml
+++ b/sec-policy/selinux-smartmon/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for smartmon</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-smokeping/metadata.xml b/sec-policy/selinux-smokeping/metadata.xml
index 1fc6b7e18fde..dc9d116fbf8b 100644
--- a/sec-policy/selinux-smokeping/metadata.xml
+++ b/sec-policy/selinux-smokeping/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for smokeping</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-snmp/metadata.xml b/sec-policy/selinux-snmp/metadata.xml
index ebce23de8631..274248a53a6e 100644
--- a/sec-policy/selinux-snmp/metadata.xml
+++ b/sec-policy/selinux-snmp/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for SNMP</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-snort/metadata.xml b/sec-policy/selinux-snort/metadata.xml
index 87677ad97394..f57047f3cbba 100644
--- a/sec-policy/selinux-snort/metadata.xml
+++ b/sec-policy/selinux-snort/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for snort</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-soundserver/metadata.xml b/sec-policy/selinux-soundserver/metadata.xml
index 9e7dfbc10ccf..366b40ef28b6 100644
--- a/sec-policy/selinux-soundserver/metadata.xml
+++ b/sec-policy/selinux-soundserver/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for soundserver</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-spamassassin/metadata.xml b/sec-policy/selinux-spamassassin/metadata.xml
index fad91b456f71..88241750bd4f 100644
--- a/sec-policy/selinux-spamassassin/metadata.xml
+++ b/sec-policy/selinux-spamassassin/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for spamassassin</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-speedtouch/metadata.xml b/sec-policy/selinux-speedtouch/metadata.xml
index 6dc3c2b5b1dc..f3fdd65df077 100644
--- a/sec-policy/selinux-speedtouch/metadata.xml
+++ b/sec-policy/selinux-speedtouch/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for speedtouch</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-squid/metadata.xml b/sec-policy/selinux-squid/metadata.xml
index 0d9257780209..f2bfb16eadb0 100644
--- a/sec-policy/selinux-squid/metadata.xml
+++ b/sec-policy/selinux-squid/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for squid</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-sssd/metadata.xml b/sec-policy/selinux-sssd/metadata.xml
index b91499947072..3137ffd8e943 100644
--- a/sec-policy/selinux-sssd/metadata.xml
+++ b/sec-policy/selinux-sssd/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for SSSD</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-stunnel/metadata.xml b/sec-policy/selinux-stunnel/metadata.xml
index afd6269e6806..92c4355ded42 100644
--- a/sec-policy/selinux-stunnel/metadata.xml
+++ b/sec-policy/selinux-stunnel/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for stunnel</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-subsonic/metadata.xml b/sec-policy/selinux-subsonic/metadata.xml
index e6190a6138ca..751b153551af 100644
--- a/sec-policy/selinux-subsonic/metadata.xml
+++ b/sec-policy/selinux-subsonic/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for subsonic music streaming server</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-sudo/metadata.xml b/sec-policy/selinux-sudo/metadata.xml
index d843f2e9a0c5..b07c4a2633e7 100644
--- a/sec-policy/selinux-sudo/metadata.xml
+++ b/sec-policy/selinux-sudo/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for sudo</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-sxid/metadata.xml b/sec-policy/selinux-sxid/metadata.xml
index 7eaa3c146dad..2018436406f9 100644
--- a/sec-policy/selinux-sxid/metadata.xml
+++ b/sec-policy/selinux-sxid/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for sxid</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-sysstat/metadata.xml b/sec-policy/selinux-sysstat/metadata.xml
index 2f0198b460c7..6d1136564f16 100644
--- a/sec-policy/selinux-sysstat/metadata.xml
+++ b/sec-policy/selinux-sysstat/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for sysstat</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-tcpd/metadata.xml b/sec-policy/selinux-tcpd/metadata.xml
index 9f56ad59f2ca..1db163b13768 100644
--- a/sec-policy/selinux-tcpd/metadata.xml
+++ b/sec-policy/selinux-tcpd/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for tcpd</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-tcsd/metadata.xml b/sec-policy/selinux-tcsd/metadata.xml
index a89307f99f23..c8c516971e54 100644
--- a/sec-policy/selinux-tcsd/metadata.xml
+++ b/sec-policy/selinux-tcsd/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for tcsd</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-telnet/metadata.xml b/sec-policy/selinux-telnet/metadata.xml
index 366689ff4b80..db13b9031d81 100644
--- a/sec-policy/selinux-telnet/metadata.xml
+++ b/sec-policy/selinux-telnet/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for telnet</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-tftp/metadata.xml b/sec-policy/selinux-tftp/metadata.xml
index 5519139fd9a6..a956aded9330 100644
--- a/sec-policy/selinux-tftp/metadata.xml
+++ b/sec-policy/selinux-tftp/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for tftp</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-tgtd/metadata.xml b/sec-policy/selinux-tgtd/metadata.xml
index 9d243e059959..dac969590d2b 100644
--- a/sec-policy/selinux-tgtd/metadata.xml
+++ b/sec-policy/selinux-tgtd/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for tgtd</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-thunderbird/metadata.xml b/sec-policy/selinux-thunderbird/metadata.xml
index c29f2b2a7a8f..a4e25b66c726 100644
--- a/sec-policy/selinux-thunderbird/metadata.xml
+++ b/sec-policy/selinux-thunderbird/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for thunderbird</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-timidity/metadata.xml b/sec-policy/selinux-timidity/metadata.xml
index 3bf29bf54516..5ca62f09c055 100644
--- a/sec-policy/selinux-timidity/metadata.xml
+++ b/sec-policy/selinux-timidity/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for timidity</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-tmpreaper/metadata.xml b/sec-policy/selinux-tmpreaper/metadata.xml
index a0e1e8c6e252..936450693bc9 100644
--- a/sec-policy/selinux-tmpreaper/metadata.xml
+++ b/sec-policy/selinux-tmpreaper/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for tmpreaper</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-tor/metadata.xml b/sec-policy/selinux-tor/metadata.xml
index 666faf38597d..e9183d726c00 100644
--- a/sec-policy/selinux-tor/metadata.xml
+++ b/sec-policy/selinux-tor/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for tor</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-tripwire/metadata.xml b/sec-policy/selinux-tripwire/metadata.xml
index 23fb25c752f5..d1927be2b2d1 100644
--- a/sec-policy/selinux-tripwire/metadata.xml
+++ b/sec-policy/selinux-tripwire/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for tripwire</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-ucspitcp/metadata.xml b/sec-policy/selinux-ucspitcp/metadata.xml
index 0b51f5c3f1d6..c9dfe810bdf9 100644
--- a/sec-policy/selinux-ucspitcp/metadata.xml
+++ b/sec-policy/selinux-ucspitcp/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for ucspitcp</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-ulogd/metadata.xml b/sec-policy/selinux-ulogd/metadata.xml
index eb5d64e2d3eb..3997a0943425 100644
--- a/sec-policy/selinux-ulogd/metadata.xml
+++ b/sec-policy/selinux-ulogd/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for ulogd</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-uml/metadata.xml b/sec-policy/selinux-uml/metadata.xml
index f246b18611a2..0970379908de 100644
--- a/sec-policy/selinux-uml/metadata.xml
+++ b/sec-policy/selinux-uml/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for uml</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-unconfined/metadata.xml b/sec-policy/selinux-unconfined/metadata.xml
index 2fd988dda837..e51940135899 100644
--- a/sec-policy/selinux-unconfined/metadata.xml
+++ b/sec-policy/selinux-unconfined/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for unconfined domains</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-uptime/metadata.xml b/sec-policy/selinux-uptime/metadata.xml
index dc6080a548be..2fc88c49095a 100644
--- a/sec-policy/selinux-uptime/metadata.xml
+++ b/sec-policy/selinux-uptime/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for uptime</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-usbmuxd/metadata.xml b/sec-policy/selinux-usbmuxd/metadata.xml
index cf166305f986..3ad65f925edf 100644
--- a/sec-policy/selinux-usbmuxd/metadata.xml
+++ b/sec-policy/selinux-usbmuxd/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for usbmuxd</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-uucp/metadata.xml b/sec-policy/selinux-uucp/metadata.xml
index 81b3601287db..d59ebb5e4fea 100644
--- a/sec-policy/selinux-uucp/metadata.xml
+++ b/sec-policy/selinux-uucp/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for uucp</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-uwimap/metadata.xml b/sec-policy/selinux-uwimap/metadata.xml
index 43c5a79d5104..4bbe508b47d8 100644
--- a/sec-policy/selinux-uwimap/metadata.xml
+++ b/sec-policy/selinux-uwimap/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for uwimap</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-uwsgi/metadata.xml b/sec-policy/selinux-uwsgi/metadata.xml
index fa7a9632ed66..81ed1deb291a 100644
--- a/sec-policy/selinux-uwsgi/metadata.xml
+++ b/sec-policy/selinux-uwsgi/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for uWSGI</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-varnishd/metadata.xml b/sec-policy/selinux-varnishd/metadata.xml
index 2503e91ba8df..831656b8034c 100644
--- a/sec-policy/selinux-varnishd/metadata.xml
+++ b/sec-policy/selinux-varnishd/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for varnishd</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-vbetool/metadata.xml b/sec-policy/selinux-vbetool/metadata.xml
index 78332010ad90..af6f17e73220 100644
--- a/sec-policy/selinux-vbetool/metadata.xml
+++ b/sec-policy/selinux-vbetool/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for vbetool</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-vdagent/metadata.xml b/sec-policy/selinux-vdagent/metadata.xml
index 614543c023b6..0297b7f9a733 100644
--- a/sec-policy/selinux-vdagent/metadata.xml
+++ b/sec-policy/selinux-vdagent/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for vdagent</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-vde/metadata.xml b/sec-policy/selinux-vde/metadata.xml
index 1c55fb935241..013599db695e 100644
--- a/sec-policy/selinux-vde/metadata.xml
+++ b/sec-policy/selinux-vde/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for vde</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-virt/metadata.xml b/sec-policy/selinux-virt/metadata.xml
index 58b7e0693733..5375d195be92 100644
--- a/sec-policy/selinux-virt/metadata.xml
+++ b/sec-policy/selinux-virt/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for virt</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-vlock/metadata.xml b/sec-policy/selinux-vlock/metadata.xml
index b076a3f4ac64..9ce64957a6a4 100644
--- a/sec-policy/selinux-vlock/metadata.xml
+++ b/sec-policy/selinux-vlock/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for vlock</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-vmware/metadata.xml b/sec-policy/selinux-vmware/metadata.xml
index c603d1bfbd0b..543aeca25205 100644
--- a/sec-policy/selinux-vmware/metadata.xml
+++ b/sec-policy/selinux-vmware/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for vmware</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-vnstatd/metadata.xml b/sec-policy/selinux-vnstatd/metadata.xml
index 78279e20ce48..d2e379731630 100644
--- a/sec-policy/selinux-vnstatd/metadata.xml
+++ b/sec-policy/selinux-vnstatd/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for vnstatd</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-vpn/metadata.xml b/sec-policy/selinux-vpn/metadata.xml
index d8ec4b67498f..e17900a94df0 100644
--- a/sec-policy/selinux-vpn/metadata.xml
+++ b/sec-policy/selinux-vpn/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for vpn</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-watchdog/metadata.xml b/sec-policy/selinux-watchdog/metadata.xml
index c71dafe71325..8a3542d09b04 100644
--- a/sec-policy/selinux-watchdog/metadata.xml
+++ b/sec-policy/selinux-watchdog/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for watchdog</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-webalizer/metadata.xml b/sec-policy/selinux-webalizer/metadata.xml
index 1fc37de6a67b..a45361bd235e 100644
--- a/sec-policy/selinux-webalizer/metadata.xml
+++ b/sec-policy/selinux-webalizer/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for webalizer</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-wine/metadata.xml b/sec-policy/selinux-wine/metadata.xml
index 4957ab934e4d..a684b403beaa 100644
--- a/sec-policy/selinux-wine/metadata.xml
+++ b/sec-policy/selinux-wine/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for wine</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-wireshark/metadata.xml b/sec-policy/selinux-wireshark/metadata.xml
index 624d4cfdbba2..381de66edd7a 100644
--- a/sec-policy/selinux-wireshark/metadata.xml
+++ b/sec-policy/selinux-wireshark/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for wireshark</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-wm/metadata.xml b/sec-policy/selinux-wm/metadata.xml
index abb4afe838dc..f07a5e1245f9 100644
--- a/sec-policy/selinux-wm/metadata.xml
+++ b/sec-policy/selinux-wm/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for wm</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-xen/metadata.xml b/sec-policy/selinux-xen/metadata.xml
index 3999f4478d63..b4ccf2367e12 100644
--- a/sec-policy/selinux-xen/metadata.xml
+++ b/sec-policy/selinux-xen/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for xen</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-xfs/metadata.xml b/sec-policy/selinux-xfs/metadata.xml
index d1f8f286c828..c79b6a625d9f 100644
--- a/sec-policy/selinux-xfs/metadata.xml
+++ b/sec-policy/selinux-xfs/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for xfs</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-xprint/metadata.xml b/sec-policy/selinux-xprint/metadata.xml
index 859bf937bb56..0f031496797b 100644
--- a/sec-policy/selinux-xprint/metadata.xml
+++ b/sec-policy/selinux-xprint/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for xprint</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-xscreensaver/metadata.xml b/sec-policy/selinux-xscreensaver/metadata.xml
index bc9c09d5fa23..2af83e9d806c 100644
--- a/sec-policy/selinux-xscreensaver/metadata.xml
+++ b/sec-policy/selinux-xscreensaver/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for xscreensaver</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-xserver/metadata.xml b/sec-policy/selinux-xserver/metadata.xml
index c45c3a60d47e..f4f32b9555a6 100644
--- a/sec-policy/selinux-xserver/metadata.xml
+++ b/sec-policy/selinux-xserver/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for xserver</longdescription>
 </pkgmetadata>
diff --git a/sec-policy/selinux-zabbix/metadata.xml b/sec-policy/selinux-zabbix/metadata.xml
index 0232f85ddb6b..0a0d38c89ea0 100644
--- a/sec-policy/selinux-zabbix/metadata.xml
+++ b/sec-policy/selinux-zabbix/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>Gentoo SELinux policy for zabbix</longdescription>
 </pkgmetadata>
diff --git a/sys-apps/checkpolicy/metadata.xml b/sys-apps/checkpolicy/metadata.xml
index 92f48e017202..459d96e9329d 100644
--- a/sys-apps/checkpolicy/metadata.xml
+++ b/sys-apps/checkpolicy/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>SELinux policy compilier</longdescription>
 </pkgmetadata>
diff --git a/sys-apps/dbus/dbus-1.10.6.ebuild b/sys-apps/dbus/dbus-1.10.6.ebuild
index c7e7c59e5288..00b05ee6c75d 100644
--- a/sys-apps/dbus/dbus-1.10.6.ebuild
+++ b/sys-apps/dbus/dbus-1.10.6.ebuild
@@ -106,6 +106,7 @@ multilib_src_configure() {
 		--disable-checks
 		$(use_enable selinux)
 		$(use_enable selinux libaudit)
+		--disable-apparmor
 		$(use_enable kernel_linux inotify)
 		$(use_enable kernel_FreeBSD kqueue)
 		$(use_enable systemd)
diff --git a/sys-apps/policycoreutils/metadata.xml b/sys-apps/policycoreutils/metadata.xml
index 7190ed6251d1..ae1ae3aca8e3 100644
--- a/sys-apps/policycoreutils/metadata.xml
+++ b/sys-apps/policycoreutils/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>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>
 		Policycoreutils contains the policy core utilities that are required
 		for basic operation of a SELinux system.  These utilities include
diff --git a/sys-apps/secilc/metadata.xml b/sys-apps/secilc/metadata.xml
index 26d91deeb59f..1aa72422096a 100644
--- a/sys-apps/secilc/metadata.xml
+++ b/sys-apps/secilc/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>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>
         The SELinux CIL Compiler is a compiler that converts the CIL language as
         described on the CIL design wiki into a kernel binary policy file.
diff --git a/sys-apps/shadow/shadow-4.2.1-r2.ebuild b/sys-apps/shadow/shadow-4.2.1-r2.ebuild
index c376f1e08915..159744482661 100644
--- a/sys-apps/shadow/shadow-4.2.1-r2.ebuild
+++ b/sys-apps/shadow/shadow-4.2.1-r2.ebuild
@@ -36,7 +36,7 @@ RDEPEND="${RDEPEND}
 	pam? ( >=sys-auth/pambase-20150213 )"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-4.1.3-dots-in-usernames.patch 
+	"${FILESDIR}"/${PN}-4.1.3-dots-in-usernames.patch
 	"${FILESDIR}"/${P}-cross-size-checks.patch
 	"${FILESDIR}"/${P}-verbose-error-when-uid-doesnt-match.patch
 )
diff --git a/sys-apps/toybox/Manifest b/sys-apps/toybox/Manifest
index 1a4d5a692a44..e4c65a7c77c2 100644
--- a/sys-apps/toybox/Manifest
+++ b/sys-apps/toybox/Manifest
@@ -5,3 +5,4 @@ DIST toybox-0.5.0.tar.bz2 564512 SHA256 2718b42154be041435df48d5b5140f4e307767c3
 DIST toybox-0.5.1.tar.bz2 588987 SHA256 83baa69a26e03a920ea7e91fbeb9016178990450d4144d1a244275b44346a12c SHA512 4abab27ef1d3ecedc1b419ea7421c032bdb9bd375a808e8400eda6c409665b41f35bef959087b863bb661d54962fb8ce78ed1d74285040837611dfdb7c715d03 WHIRLPOOL 8b098073ca7a604205e6c1857fedacab1c42785281cd05fe76bb654a54fea77beb588d7f9bd575be9c2c12fe03ae6598ba2f31b683f1bafdf249d26b8b953df8
 DIST toybox-0.5.2.tar.gz 685909 SHA256 dec7f6433ee0e130f224fc63760b347ad0572280c4de32f1aaefbee813a79a00 SHA512 76b20c70a1568b03c32e5670f8fbc517b4d528c21e74fc44ce1241cb494ad329f8e3412bf6501521ad2c19d07f89046fba2c37f8a07f4aba1e0ebe1346d9c83d WHIRLPOOL 168b2039c02fd8381a8c5c4353ed1d365a4ed941477b5b1acb21f6330d4f8e0785c69511edd187de790d0d6b65a9d34218a01ca25747558a0890f5f4c7f6f44b
 DIST toybox-0.6.0.tar.gz 710572 SHA256 d0b9788f61b9f9cbc685eabc0bd89b6925201ecb15a0cb4fbbd5fbf658b99991 SHA512 ddbd2252cd64a3508b9cd9d8a0a574805583b5b9c3861c153d25e8a394115c28b5a58d02a5aa7d7f58b9b9f3effcd33ac3f55788e0f3c4ad4265233f49c6f3ff WHIRLPOOL 0a83bc9895fd0c43ac541afdbfb6caaa294639646c82e70090fd40b77cf5943009188bb8f1b12b1af82d9bb94dd345892b36a5f7849d7154d34efa0b1f1a5f17
+DIST toybox-0.6.1.tar.gz 736371 SHA256 122ceb30c6ca0e8b8e914a427b1aaa89715c53a3df500afc56524ce88426838c SHA512 256afdcb0303b8f7a0bfa411cd0300d45460229dac3bf86fa147bb9d7806dc1224d0b1e28e58472932d8468407491559c6369cb29e78f67691560825dc25a68a WHIRLPOOL 0a5194965d3b4f4521193a51523d59cd52f23999c95cf167234853004cb0c3503aa4df96e65ab1d524741ff8e1d47def8af072f7eb8e8d55caec9c24b5525039
diff --git a/sys-apps/toybox/toybox-0.6.1.ebuild b/sys-apps/toybox/toybox-0.6.1.ebuild
new file mode 100644
index 000000000000..71beeaa77fe1
--- /dev/null
+++ b/sys-apps/toybox/toybox-0.6.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils multiprocessing savedconfig toolchain-funcs
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/gfto/toybox.git"
+else
+	SRC_URI="http://landley.net/code/toybox/downloads/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+# makefile is stupid
+RESTRICT="test"
+
+DESCRIPTION="Common linux commands in a multicall binary"
+HOMEPAGE="http://landley.net/code/toybox/"
+
+# The source code does not explicitly say that it's BSD, but the author has repeatedly said it
+LICENSE="BSD-2"
+SLOT="0"
+IUSE=""
+
+src_prepare() {
+	epatch_user
+	restore_config .config
+}
+
+src_configure() {
+	if [ -f .config ]; then
+		yes "" | emake -j1 oldconfig > /dev/null
+		return 0
+	else
+		einfo "Could not locate user configfile, so we will save a default one"
+		emake defconfig > /dev/null
+	fi
+}
+
+src_compile() {
+	tc-export CC STRIP
+	export HOSTCC=$(tc-getBUILD_CC)
+	unset CROSS_COMPILE
+	export CPUS=$(makeopts_jobs)
+	emake V=1
+}
+
+src_test() {
+	emake test
+}
+
+src_install() {
+	save_config .config
+	newbin toybox_unstripped toybox
+}
diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest
index a4df18b3d2fc..ea635f0c4795 100644
--- a/sys-cluster/ceph/Manifest
+++ b/sys-cluster/ceph/Manifest
@@ -1,5 +1,4 @@
 DIST ceph-0.80.10.tar.bz2 4136018 SHA256 a7ca8a3d0710ab88adcd5c52aebe0a8ee573e247c1ccf5d84eea8a9ff07a51fa SHA512 7823a489b7654457512d300050410b4a91d615fbb467d341c76e76b77364d6a2afa763bceb2c6cd8ed05a45d7b0aef4c3baf80155cc3223e940b439e0571f3c9 WHIRLPOOL a03fc3a4ca8c49157ff3b51528418ca62c3520c4141e402863cf3475a11b240be5297f731bf1a4e77a01a476e80f5e06c0722d688fbb8ad2db26ef1975a450da
-DIST ceph-0.94.4.tar.bz2 7082496 SHA256 09b3a134c4eb06f770a72769d2aec3900c2c7f1d25092f93b0e8e73ab17e577c SHA512 3ae714d110d63717e7e49d07ac5523cbbd06b8fa140b842576f6afea780aec2408ccd053c109bf5e011018ff1c544366113e83e09ea79925e32d46e7360317ab WHIRLPOOL 8b53fb0410e6168d6385360005b29b919d7d4f255e06cc874fcbb35f1dc5566c0e97bbce50ec7ea2da479a0f068bf254abec474d155186085d500a0f4ea9eb01
 DIST ceph-0.94.5.tar.bz2 7084809 SHA256 7658bec8cf6e6c8f5ceb1e85116c4df2582c497ae686295abebc6fc82ec79211 SHA512 8bf57eceda37ec058bd7b9cf98ba0eda11c361156da4cea0aa99a3059d61fc2120ebb27f1bb07bae42e13836b57a5db8f3888401481e9125780a6df21ca90529 WHIRLPOOL cfedf299f86e19ff87615e851e4639d4045c0e26756d8896498e2e6eb8304808bc78837ec68b01936abd7fd2563aafe973109ba72d66b368304c38e38fc680f5
 DIST ceph-10.0.0.tar.gz 10429823 SHA256 fd92052e0de135e1f35ea2add44b5b8add28a2a8235639d69c33cced06a4a357 SHA512 f0e36bf83c97d1dc0328fbba96897e583c6d29b11dc54ea7fa0186ffaa1cf4d26519f336083825d64dda70bd290dc45bd6f3f17ff67ada33322caee5f2f3ce07 WHIRLPOOL f443ab25ab8f89455d76f509f215b55519f9338d3b9daec318b097de4dffff7009a01521da0d963c4b5549485b6aebca1c0a705746cf2e64fef8e9f5e66676cf
-DIST ceph-9.0.3.tar.bz2 7082795 SHA256 98ad66b35d3747d56e04fcf32a5387b765f86f43c6f09393fe9c7f17e4ae5418 SHA512 fdaebf26076490394229ef1716278ae82e6397651e25b911553db9f93b0d7ba8849320d770aef1363952e7c8e672616f5e61523fc4b79642fe81f1d2d71c4225 WHIRLPOOL cc11218246efe1d1f0a095ddc3466eacc64ffd032093cc0642a420ed9eb7fdd956b25693cc46e2dace216a6ec577c1c4d26457cf86f0319fe71c5a1125342128
+DIST ceph-9.2.0.tar.bz2 7663088 SHA256 706d33e097b4489a75cfaff8d835e05d91df6dac5cdd3a32a57404f0522dbdbb SHA512 d462f2e4696873552b232f0b89bcda8ddb0cddeab89cbab58e99eb068acb082a42cb558898bd4dee66239df64d15992cfd1c1158217b2ce60a465e1761bcea78 WHIRLPOOL d016b873a26afef4816921e5b9cbaae3ba4c9ece6683e3d60b1f689ab7dcc285bc386963e83b410a66a313cc953b7d0d9baa427b3b3eb12697daa08f3a5a6a18
diff --git a/sys-cluster/ceph/ceph-0.94.4.ebuild b/sys-cluster/ceph/ceph-0.94.4.ebuild
deleted file mode 100644
index 1a2b052a24b6..000000000000
--- a/sys-cluster/ceph/ceph-0.94.4.ebuild
+++ /dev/null
@@ -1,159 +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 )
-
-if [[ $PV = *9999* ]]; then
-	scm_eclass=git-r3
-	EGIT_REPO_URI="
-		git://github.com/ceph/ceph.git
-		https://github.com/ceph/ceph.git"
-	SRC_URI=""
-else
-	SRC_URI="http://ceph.com/download/${P}.tar.bz2"
-fi
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-
-inherit check-reqs autotools eutils multilib python-single-r1 udev readme.gentoo systemd ${scm_eclass}
-
-DESCRIPTION="Ceph distributed filesystem"
-HOMEPAGE="http://ceph.com/"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="babeltrace cryptopp debug fuse gtk libatomic +libaio lttng +nss radosgw static-libs jemalloc tcmalloc xfs zfs"
-
-CDEPEND="
-	app-arch/snappy
-	dev-libs/boost:=[threads]
-	dev-libs/fcgi
-	dev-libs/libaio
-	dev-libs/libedit
-	dev-libs/leveldb[snappy]
-	nss? ( dev-libs/nss )
-	cryptopp? ( dev-libs/crypto++ )
-	sys-apps/keyutils
-	sys-apps/util-linux
-	dev-libs/libxml2
-	babeltrace? ( dev-util/babeltrace )
-	fuse? ( sys-fs/fuse )
-	libatomic? ( dev-libs/libatomic_ops )
-	xfs? ( sys-fs/xfsprogs )
-	zfs? ( sys-fs/zfs )
-	gtk? (
-		x11-libs/gtk+:2
-		dev-cpp/gtkmm:2.4
-		gnome-base/librsvg
-	)
-	radosgw? (
-		dev-libs/fcgi
-		dev-libs/expat
-		net-misc/curl
-	)
-	jemalloc? ( dev-libs/jemalloc )
-	!jemalloc? ( dev-util/google-perftools )
-	lttng? ( dev-util/lttng-ust )
-	${PYTHON_DEPS}
-	"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	sys-apps/hdparm
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	^^ ( nss cryptopp )
-	?? ( jemalloc tcmalloc )
-	"
-
-STRIP_MASK="/usr/lib*/rados-classes/*"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.79-libzfs.patch
-)
-CHECKREQS_DISK_BUILD="1400M"
-
-pkg_setup() {
-	python_setup
-}
-
-src_prepare() {
-	[[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
-
-	epatch_user
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--without-hadoop
-		--docdir="${EPREFIX}/usr/share/doc/${PF}"
-		--includedir=/usr/include
-		$(use_with debug)
-		$(use_with fuse)
-		$(use_with libaio)
-		$(use_with libatomic libatomic-ops)
-		$(use_with nss)
-		$(use_with cryptopp)
-		$(use_with radosgw)
-		$(use_with gtk gtk2)
-		$(use_enable static-libs static)
-		$(use_with jemalloc)
-		$(use_with xfs libxfs)
-		$(use_with zfs libzfs)
-		--without-kinetic
-		--without-librocksdb
-		$(use_with lttng )
-		$(use_with babeltrace)
-	)
-
-	use jemalloc || \
-		myeconfargs+=( $(usex tcmalloc " --with-tcmalloc" " --with-tcmalloc-minimal") )
-
-	PYTHON="${EPYTHON}" \
-		econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	prune_libtool_files --all
-
-	exeinto /usr/$(get_libdir)/ceph
-	newexe src/init-ceph ceph_init.sh
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}"/ceph.logrotate ${PN}
-
-	chmod 644 "${ED}"/usr/share/doc/${PF}/sample.*
-
-	keepdir /var/lib/${PN}
-	keepdir /var/lib/${PN}/tmp
-	keepdir /var/log/${PN}/stat
-
-	newinitd "${FILESDIR}/rbdmap.initd" rbdmap
-	newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
-
-	systemd_dounit           "${FILESDIR}/ceph.target"
-	systemd_newunit          "${FILESDIR}/ceph-mds_at.service"      "ceph-mds@.service"
-	systemd_install_serviced "${FILESDIR}/ceph-mds_at.service.conf" "ceph-mds@.service"
-	systemd_newunit          "${FILESDIR}/ceph-osd_at.service"      "ceph-osd@.service"
-	systemd_install_serviced "${FILESDIR}/ceph-osd_at.service.conf" "ceph-osd@.service"
-	systemd_newunit          "${FILESDIR}/ceph-mon_at.service"      "ceph-mon@.service"
-	systemd_install_serviced "${FILESDIR}/ceph-mon_at.service.conf" "ceph-mon@.service"
-
-	python_fix_shebang \
-		"${ED}"/usr/sbin/{ceph-disk,ceph-create-keys} \
-		"${ED}"/usr/bin/{ceph,ceph-rest-api}
-
-	#install udev rules
-	udev_dorules udev/50-rbd.rules
-	udev_dorules udev/95-ceph-osd.rules
-
-	readme.gentoo_create_doc
-}
diff --git a/sys-cluster/ceph/ceph-10.0.0.ebuild b/sys-cluster/ceph/ceph-10.0.0.ebuild
index e2936b93772e..acb485b4278a 100644
--- a/sys-cluster/ceph/ceph-10.0.0.ebuild
+++ b/sys-cluster/ceph/ceph-10.0.0.ebuild
@@ -16,7 +16,7 @@ else
 fi
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 
-inherit check-reqs autotools eutils multilib python-single-r1 udev readme.gentoo systemd ${scm_eclass}
+inherit check-reqs autotools eutils multilib python-single-r1 udev user readme.gentoo systemd ${scm_eclass}
 
 DESCRIPTION="Ceph distributed filesystem"
 HOMEPAGE="http://ceph.com/"
@@ -75,7 +75,6 @@ STRIP_MASK="/usr/lib*/rados-classes/*"
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.79-libzfs.patch
 )
-CHECKREQS_DISK_BUILD="1400M"
 
 check-reqs_export_vars() {
 	# check-reqs does not support use flags, and there is a lot of variability
@@ -93,10 +92,16 @@ check-reqs_export_vars() {
 	fi
 }
 
+user_setup() {
+	enewgroup ceph
+	enewuser ceph -1 -1 /var/lib/ceph ceph
+}
+
 pkg_setup() {
 	python_setup
 	check-reqs_export_vars
 	check-reqs_pkg_setup
+	user_setup
 }
 
 src_prepare() {
@@ -132,6 +137,7 @@ src_configure() {
 		--without-librocksdb
 		$(use_with lttng )
 		$(use_with babeltrace)
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
 	)
 
 	use jemalloc || \
@@ -158,21 +164,19 @@ src_install() {
 	keepdir /var/lib/${PN}/tmp
 	keepdir /var/log/${PN}/stat
 
+	fowners ceph:ceph /var/lib/ceph
+
 	newinitd "${FILESDIR}/rbdmap.initd" rbdmap
 	newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
 	newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
 
-	systemd_dounit           "${FILESDIR}/ceph.target"
-	systemd_newunit          "${FILESDIR}/ceph-mds_at.service"      "ceph-mds@.service"
 	systemd_install_serviced "${FILESDIR}/ceph-mds_at.service.conf" "ceph-mds@.service"
-	systemd_newunit          "${FILESDIR}/ceph-osd_at.service"      "ceph-osd@.service"
 	systemd_install_serviced "${FILESDIR}/ceph-osd_at.service.conf" "ceph-osd@.service"
-	systemd_newunit          "${FILESDIR}/ceph-mon_at.service"      "ceph-mon@.service"
 	systemd_install_serviced "${FILESDIR}/ceph-mon_at.service.conf" "ceph-mon@.service"
 
 	python_fix_shebang \
 		"${ED}"/usr/sbin/{ceph-disk,ceph-create-keys} \
-		"${ED}"/usr/bin/{ceph,ceph-rest-api}
+		"${ED}"/usr/bin/{ceph,ceph-rest-api,ceph-detect-init,ceph-brag}
 
 	#install udev rules
 	udev_dorules udev/50-rbd.rules
diff --git a/sys-cluster/ceph/ceph-9.0.3.ebuild b/sys-cluster/ceph/ceph-9.2.0.ebuild
index c50d81af2e9a..434fd90e1a2e 100644
--- a/sys-cluster/ceph/ceph-9.0.3.ebuild
+++ b/sys-cluster/ceph/ceph-9.2.0.ebuild
@@ -16,7 +16,7 @@ else
 fi
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 
-inherit check-reqs autotools eutils multilib python-single-r1 udev readme.gentoo systemd ${scm_eclass}
+inherit check-reqs autotools eutils multilib python-single-r1 udev user readme.gentoo systemd ${scm_eclass}
 
 DESCRIPTION="Ceph distributed filesystem"
 HOMEPAGE="http://ceph.com/"
@@ -75,7 +75,6 @@ STRIP_MASK="/usr/lib*/rados-classes/*"
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.79-libzfs.patch
 )
-CHECKREQS_DISK_BUILD="1400M"
 
 check-reqs_export_vars() {
 	# check-reqs does not support use flags, and there is a lot of variability
@@ -88,15 +87,21 @@ check-reqs_export_vars() {
 		export CHECKREQS_DISK_BUILD="23G"
 		export CHECKREQS_DISK_USR="7G"
 	else
-		export CHECKREQS_DISK_BUILD="1400M"
+		export CHECKREQS_DISK_BUILD="9G"
 		export CHECKREQS_DISK_USR="450M"
 	fi
 }
 
+user_setup() {
+	enewgroup ceph
+	enewuser ceph -1 -1 /var/lib/ceph ceph
+}
+
 pkg_setup() {
 	python_setup
 	check-reqs_export_vars
 	check-reqs_pkg_setup
+	user_setup
 }
 
 src_prepare() {
@@ -132,6 +137,7 @@ src_configure() {
 		--without-librocksdb
 		$(use_with lttng )
 		$(use_with babeltrace)
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
 	)
 
 	use jemalloc || \
@@ -158,21 +164,19 @@ src_install() {
 	keepdir /var/lib/${PN}/tmp
 	keepdir /var/log/${PN}/stat
 
+	fowners ceph:ceph /var/lib/ceph
+
 	newinitd "${FILESDIR}/rbdmap.initd" rbdmap
 	newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
 	newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
 
-	systemd_dounit           "${FILESDIR}/ceph.target"
-	systemd_newunit          "${FILESDIR}/ceph-mds_at.service"      "ceph-mds@.service"
 	systemd_install_serviced "${FILESDIR}/ceph-mds_at.service.conf" "ceph-mds@.service"
-	systemd_newunit          "${FILESDIR}/ceph-osd_at.service"      "ceph-osd@.service"
 	systemd_install_serviced "${FILESDIR}/ceph-osd_at.service.conf" "ceph-osd@.service"
-	systemd_newunit          "${FILESDIR}/ceph-mon_at.service"      "ceph-mon@.service"
 	systemd_install_serviced "${FILESDIR}/ceph-mon_at.service.conf" "ceph-mon@.service"
 
 	python_fix_shebang \
 		"${ED}"/usr/sbin/{ceph-disk,ceph-create-keys} \
-		"${ED}"/usr/bin/{ceph,ceph-rest-api}
+		"${ED}"/usr/bin/{ceph,ceph-rest-api,ceph-detect-init,ceph-brag}
 
 	#install udev rules
 	udev_dorules udev/50-rbd.rules
diff --git a/sys-cluster/ceph/ceph-9999.ebuild b/sys-cluster/ceph/ceph-9999.ebuild
index fe924eb3be80..1805e16b30c1 100644
--- a/sys-cluster/ceph/ceph-9999.ebuild
+++ b/sys-cluster/ceph/ceph-9999.ebuild
@@ -17,7 +17,7 @@ else
 	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 fi
 
-inherit autotools eutils multilib python-any-r1 udev readme.gentoo ${scm_eclass}
+inherit autotools eutils multilib python-any-r1 udev user readme.gentoo ${scm_eclass}
 
 DESCRIPTION="Ceph distributed filesystem"
 HOMEPAGE="http://ceph.com/"
@@ -71,8 +71,14 @@ REQUIRED_USE="
 
 STRIP_MASK="/usr/lib*/rados-classes/*"
 
+user_setup() {
+	enewgroup ceph
+	enewuser ceph -1 -1 /var/lib/ceph ceph
+}
+
 pkg_setup() {
 	python-any-r1_pkg_setup
+	user_setup
 }
 
 src_prepare() {
@@ -99,6 +105,7 @@ src_configure() {
 		$(use_with tcmalloc) \
 		$(use_with xfs libxfs) \
 		$(use_with zfs libzfs)
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
 }
 
 src_install() {
@@ -118,12 +125,18 @@ src_install() {
 	keepdir /var/lib/${PN}/tmp
 	keepdir /var/log/${PN}/stat
 
+	fowners ceph:ceph /var/lib/ceph
+
 	newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
 	newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
 
+	systemd_install_serviced "${FILESDIR}/ceph-mds_at.service.conf" "ceph-mds@.service"
+	systemd_install_serviced "${FILESDIR}/ceph-osd_at.service.conf" "ceph-osd@.service"
+	systemd_install_serviced "${FILESDIR}/ceph-mon_at.service.conf" "ceph-mon@.service"
+
 	python_fix_shebang \
 		"${ED}"/usr/sbin/{ceph-disk,ceph-create-keys} \
-		"${ED}"/usr/bin/{ceph,ceph-rest-api}
+		"${ED}"/usr/bin/{ceph,ceph-rest-api,ceph-detect-init,ceph-brag}
 
 	#install udev rules
 	udev_dorules udev/50-rbd.rules
diff --git a/sys-cluster/ceph/files/README.gentoo b/sys-cluster/ceph/files/README.gentoo
index b0495158ec1d..c59612081366 100644
--- a/sys-cluster/ceph/files/README.gentoo
+++ b/sys-cluster/ceph/files/README.gentoo
@@ -16,3 +16,10 @@
    net-misc/ntp
    net-misc/openntpd
    net-misc/chrony
+
+4) Starting from version 9.0.x, Ceph daemons run as ‘ceph’ user instead root.
+   In order to fix this, we suggest to stop ceph daemons, and fix ownership
+
+    chown -R ceph:ceph /var/lib/ceph
+
+    https://ceph.com/releases/v9-2-0-infernalis-released/
diff --git a/sys-cluster/ceph/files/ceph-0.87.1-glibc-2.20.patch b/sys-cluster/ceph/files/ceph-0.87.1-glibc-2.20.patch
deleted file mode 100644
index 55a49d72f687..000000000000
--- a/sys-cluster/ceph/files/ceph-0.87.1-glibc-2.20.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From cf2104d4d991361c53f6e2fea93b69de10cd654b Mon Sep 17 00:00:00 2001
-From: Federico Simoncelli <fsimonce@redhat.com>
-Date: Sat, 15 Nov 2014 14:14:04 +0000
-Subject: [PATCH] common: do not unlock rwlock on destruction
-
-According to pthread_rwlock_unlock(3p):
-
- Results are undefined if the read-write lock rwlock is not held
- by the calling thread.
-
-and:
-
- https://sourceware.org/bugzilla/show_bug.cgi?id=17561
-
- Calling pthread_rwlock_unlock on an rwlock which is not locked
- is undefined.
-
-calling pthread_rwlock_unlock on RWLock destruction could cause
-an unknown behavior for two reasons:
-
-- the lock is acquired by another thread (undefined)
-- the lock is not acquired (undefined)
-
-Moreover since glibc-2.20 calling pthread_rwlock_unlock on a
-rwlock that is not locked results in a SIGILL that kills the
-application.
-
-This patch removes the pthread_rwlock_unlock call on destruction
-and replaces it with an assertion to check that the RWLock is
-not in use.
-
-Any code that relied on the implicit release is now going to
-break the assertion, e.g.:
-
- {
-   RWLock l;
-   l.get(for_write);
- } // implicit release, wrong.
-
-Signed-off-by: Federico Simoncelli <fsimonce@redhat.com>
----
- src/common/RWLock.h | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/common/RWLock.h b/src/common/RWLock.h
-index e647e17..6f0ab8e 100644
---- a/src/common/RWLock.h
-+++ b/src/common/RWLock.h
-@@ -46,7 +46,9 @@ class RWLock
-     return (nwlock.read() > 0);
-   }
-   virtual ~RWLock() {
--    pthread_rwlock_unlock(&L);
-+    // The following check is racy but we are about to destroy
-+    // the object and we assume that there are no other users.
-+    assert(!is_locked());
-     pthread_rwlock_destroy(&L);
-   }
- 
diff --git a/sys-cluster/ceph/files/ceph-fix-gnustack.patch b/sys-cluster/ceph/files/ceph-fix-gnustack.patch
deleted file mode 100644
index 3e2eace394c2..000000000000
--- a/sys-cluster/ceph/files/ceph-fix-gnustack.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/src/common/crc32c_intel_fast_asm.S b/src/common/crc32c_intel_fast_asm.S
-index 4ca5d65..68d3426 100644
---- a/src/common/crc32c_intel_fast_asm.S
-+++ b/src/common/crc32c_intel_fast_asm.S
-@@ -662,3 +662,6 @@ global %1_slver
- %endmacro
- ;;;       func            core, ver, snum
- slversion crc32_iscsi_00, 00,   02,  0014
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endiF
-diff --git a/src/common/crc32c_intel_fast_zero_asm.S b/src/common/crc32c_intel_fast_zero_asm.S
-index b7246f2..9728be9 100644
---- a/src/common/crc32c_intel_fast_zero_asm.S
-+++ b/src/common/crc32c_intel_fast_zero_asm.S
-@@ -644,3 +644,6 @@ global %1_slver
- %endmacro
- ;;;       func            core, ver, snum
- slversion crc32_iscsi_zero_00, 00,   02,  0014
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endiF
diff --git a/sys-cluster/ceph/files/ceph-mds_at.service b/sys-cluster/ceph/files/ceph-mds_at.service
deleted file mode 100644
index c28604e3c430..000000000000
--- a/sys-cluster/ceph/files/ceph-mds_at.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Ceph metadata server daemon
-After=network-online.target local-fs.target
-Wants=network-online.target local-fs.target
-PartOf=ceph.target
-
-[Service]
-Environment=CLUSTER=ceph
-ExecStart=/usr/bin/ceph-mds -f --cluster ${CLUSTER} --id %i
-
-[Install]
-WantedBy=ceph.target
diff --git a/sys-cluster/ceph/files/ceph-mon_at.service b/sys-cluster/ceph/files/ceph-mon_at.service
deleted file mode 100644
index 4f54cc158c5b..000000000000
--- a/sys-cluster/ceph/files/ceph-mon_at.service
+++ /dev/null
@@ -1,19 +0,0 @@
-[Unit]
-Description=Ceph cluster monitor daemon
-After=network-online.target
-Wants=network-online.target
-
-# According to:
-#   http://www.freedesktop.org/wiki/Software/systemd/NetworkTarget
-# these can be removed once ceph-mon will dynamically change network
-# configuration.
-After=network-online.target local-fs.target
-Wants=network-online.target local-fs.target
-PartOf=ceph.target
-
-[Service]
-Environment=CLUSTER=ceph
-ExecStart=/usr/bin/ceph-mon -f --cluster ${CLUSTER} --id %i
-
-[Install]
-WantedBy=ceph.target
diff --git a/sys-cluster/ceph/files/ceph-osd_at.service b/sys-cluster/ceph/files/ceph-osd_at.service
deleted file mode 100644
index 7bf125f63c78..000000000000
--- a/sys-cluster/ceph/files/ceph-osd_at.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Ceph object storage daemon
-After=network-online.target local-fs.target
-Wants=network-online.target local-fs.target
-PartOf=ceph.target
-
-[Service]
-Environment=CLUSTER=ceph
-ExecStart=/usr/bin/ceph-osd -f --cluster ${CLUSTER} --id %i
-ExecStartPre=/usr/libexec/ceph/ceph-osd-prestart.sh --cluster ${CLUSTER} --id %i
-
-[Install]
-WantedBy=ceph.target
diff --git a/sys-cluster/ceph/files/ceph.initd-r1 b/sys-cluster/ceph/files/ceph.initd-r1
index ca5ab60cc0b7..7f1558ddad93 100644
--- a/sys-cluster/ceph/files/ceph.initd-r1
+++ b/sys-cluster/ceph/files/ceph.initd-r1
@@ -22,7 +22,7 @@ is_type_valid() {
 }
 
 start_pre() {
-        checkpath -d -q $(dirname ${pidfile})
+        checkpath -d -q -o ceph $(dirname ${pidfile})
 }
 
 start() {
@@ -31,18 +31,18 @@ start() {
 		eerror "Please give valid Ceph Server Type: mds, mon, osd"
 		return 1
 	fi
-	${command} ${command_args}
+	start-stop-daemon --start -exec ${command} --user ceph --group ceph -- ${command_args}
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping Ceph ${type}.${id}"
-	start-stop-daemon --stop --pidfile ${pidfile}
+	start-stop-daemon --stop --user ceph --group ceph --pidfile ${pidfile}
 	eend $?
 }
 
 reload() {
 	ebegin "Reloading Ceph ${type}.${id}"
-	start-stop-daemon --signal 1 --pidfile ${pidfile}
+	start-stop-daemon --signal 1 --user ceph --group ceph --pidfile ${pidfile}
 	eend $?
 }
diff --git a/sys-cluster/mpich/Manifest b/sys-cluster/mpich/Manifest
index f630841da5d9..ac95bab25cd9 100644
--- a/sys-cluster/mpich/Manifest
+++ b/sys-cluster/mpich/Manifest
@@ -1,3 +1,4 @@
 DIST mpich-3.0.4.tar.gz 10921075 SHA256 cf638c85660300af48b6f776e5ecd35b5378d5905ec5d34c3da7a27da0acf0b3 SHA512 f9d8b2cf561fe5f85c12512ef4dd7b0cf5ec8b53ddb07bfa0d1db2e3c8ae0382c77e0661f46b82ec96b05d18ea2d25328bb84e9528ac06e5925f30ec8ef030d0 WHIRLPOOL 52c811d1adcba26424bb3f05b7b97faff16ab3762782474fcde5f49e9ca77155fb91d80967120d9277eed2adb116443afe444671eb6315a610587d55ac4ec9ed
 DIST mpich-3.1.3.tar.gz 11487313 SHA256 afb690aa828467721e9d9ab233fe00c68cae2b7b930d744cb5f7f3eb08c8602c SHA512 3071d75e925808c13ea528aaff81a2ee44a4eb9732c74005a0cedd5a710aeafc691d30c7a035ae0aba14bd2b837c1c788202a7612599d3ffac8e5a9299467c09 WHIRLPOOL ade5a2ab7a98a3ee353a0b41ad8c57b8676ea7e381e625c01237519c88e9e16c5330cf6c569707ded26462022dd8647ba0a24dc2c1559240781b0e4fa1c69511
 DIST mpich-3.1.4.tar.gz 11325036 SHA256 f68b5330e94306c00ca5a1c0e8e275c7f53517d01d6c524d51ce9359d240466b SHA512 55bd4d12a42b9ebc116016bd777eb2b8ed8c51e69f5ea5faf823eba0aeb7eadfe2848c4cca3032aa38841a25a4902c07cec2409811149a057c4aa99a25c6b6da WHIRLPOOL 243ea40dd67b7f8e6fecde58740c21703833ca2857922ad59c5744888145bbf0ee934a69128818cd5bb91f39a3e842c26b2eced20ba23e08c8968b903f1f9992
+DIST mpich-3.2.tar.gz 11862150 SHA256 0778679a6b693d7b7caff37ff9d2856dc2bfc51318bf8373859bfa74253da3dc SHA512 083c51655b4355827bd7fa4fe528046e2bc77b7747d869ff87b79fa324c3cc2a9b5640ccb7271490ccc0dd627e354a33a449bbab448501bbfddcfe5f999ee717 WHIRLPOOL 4196be94f5f5766f06e3f5893153e6d44fe93a5ef17dfcf3fce075b1506d5b762ba175dceeac0668284adc9f4a846917801f2138ed2d81f464d3a191b3f88f1c
diff --git a/sys-cluster/mpich/mpich-3.2.ebuild b/sys-cluster/mpich/mpich-3.2.ebuild
new file mode 100644
index 000000000000..3b08bfb87395
--- /dev/null
+++ b/sys-cluster/mpich/mpich-3.2.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+FORTRAN_NEEDED=fortran
+
+inherit fortran-2
+
+MY_PV=${PV/_/}
+DESCRIPTION="A high performance and portable MPI implementation"
+HOMEPAGE="http://www.mpich.org/"
+SRC_URI="http://www.mpich.org/static/downloads/${PV}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="mpich"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+cxx doc fortran mpi-threads romio threads"
+
+COMMON_DEPEND="
+	dev-libs/libaio
+	>=sys-apps/hwloc-1.9
+	romio? ( net-fs/nfs-utils )"
+
+DEPEND="${COMMON_DEPEND}
+	dev-lang/perl
+	sys-devel/libtool"
+
+RDEPEND="${COMMON_DEPEND}
+	!sys-cluster/mpich2
+	!sys-cluster/openmpi"
+
+S="${WORKDIR}"/${PN}-${MY_PV}
+
+pkg_setup() {
+	FORTRAN_STANDARD="77 90"
+	fortran-2_pkg_setup
+
+	if use mpi-threads && ! use threads; then
+		ewarn "mpi-threads requires threads, assuming that's what you want"
+	fi
+}
+
+src_prepare() {
+	# Using MPICHLIB_LDFLAGS doesn't seem to fully work.
+	sed -i 's| *@WRAPPER_LDFLAGS@ *||' \
+		src/packaging/pkgconfig/mpich.pc.in \
+		src/env/*.in \
+		|| die
+}
+
+src_configure() {
+	local c="--enable-shared"
+	local hydra_c="--with-hwloc-prefix=/usr"
+
+	# The configure statements can be somewhat confusing, as they
+	# don't all show up in the top level configure, however, they
+	# are picked up in the children directories.  Hence the separate
+	# local vars.
+
+	if use mpi-threads; then
+		# MPI-THREAD requries threading.
+		c="${c} --with-thread-package=pthreads"
+		c="${c} --enable-threads=runtime"
+	else
+		if use threads ; then
+			c="${c} --with-thread-package=pthreads"
+		else
+			c="${c} --with-thread-package=none"
+		fi
+		c="${c} --enable-threads=single"
+	fi
+
+	c="${c} --sysconfdir=${EPREFIX}/etc/${PN}"
+	c="${c} --docdir=${EPREFIX}/usr/share/doc/${PF}"
+
+	export MPICHLIB_CFLAGS=${CFLAGS}
+	export MPICHLIB_CPPFLAGS=${CPPFLAGS}
+	export MPICHLIB_CXXFLAGS=${CXXFLAGS}
+	export MPICHLIB_FFLAGS=${FFLAGS}
+	export MPICHLIB_FCFLAGS=${FCFLAGS}
+	export MPICHLIB_LDFLAGS=${LDFLAGS}
+	unset CFLAGS CPPFLAGS CXXFLAGS FFLAGS FCFLAGS LDFLAGS
+
+	econf ${c} \
+		--with-pm=hydra \
+		--disable-fast \
+		--enable-versioning \
+		${hydra_c}
+		$(use_enable romio) \
+		$(use_enable cxx) \
+		$(use_enable fortran f77) \
+		$(use_enable fortran fc)
+}
+
+src_test() {
+	emake -j1 check
+}
+
+src_install() {
+	default
+
+	dodir /usr/share/doc/${PF}
+	dodoc README{,.envvar} CHANGES RELEASE_NOTES
+	newdoc src/pm/hydra/README README.hydra
+	if use romio; then
+		newdoc src/mpi/romio/README README.romio
+	fi
+
+	if ! use doc; then
+		rm -rf "${D}"usr/share/doc/${PF}/www*
+	fi
+}
diff --git a/sys-devel/bison/bison-2.7.1.ebuild b/sys-devel/bison/bison-2.7.1.ebuild
index a9291bfa182e..951b3ffbffe0 100644
--- a/sys-devel/bison/bison-2.7.1.ebuild
+++ b/sys-devel/bison/bison-2.7.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static"
 
 RDEPEND=">=sys-devel/m4-1.4.16"
diff --git a/sys-fs/aufs3/Manifest b/sys-fs/aufs3/Manifest
index 45bd244beeb8..fe7be9e63831 100644
--- a/sys-fs/aufs3/Manifest
+++ b/sys-fs/aufs3/Manifest
@@ -10,3 +10,4 @@ DIST aufs3-standalone-3_p20151012.tar.xz 3122148 SHA256 f54f1f19bec26f653939e00b
 DIST aufs3-standalone-3_p20151102.tar.xz 3139016 SHA256 8d43e3c3c744ddfd250321d7a43ac98c77ff93d2775674f3c7a71183260702fb SHA512 0c0f261dc295d7b33560796f7baef761d802eac4de6b09be9a8f41689f3458149c271025e45d053fb188f56b6b2d6e5a02e159b0fefef090cbb0b44cfad78c4a WHIRLPOOL 1bcd9292362b27c564b5450c84b5f22bb16b2498b34507a78bf30df25c034bce4112ddec688f632f39cd935f1dd15dcf7f18213dc0d13a63aed1e2873da2d89b
 DIST aufs3-standalone-3_p20151109.tar.xz 3151124 SHA256 1fe9341fe93a469d3a17604c90f949304e035e687f1fc3fac4c9f76d93b9535d SHA512 3f3e018e5236e6e8d67c3d0dd13eb38dd9d72ec32c0e572bb9f3b4fb85b4ee7d9d50a5cf63bb6432c5625e8d98655e3f0c228bd66b79fae680dbe866553cbc40 WHIRLPOOL 28d853afe21c8ce5a1ae9a9b5394db87b823bd791e14c5c5d15f3943ff3c67b0ce2bf28b2287f4ce9fc79feeb44127f9a26ba888a8449859b9414880d6748762
 DIST aufs3-standalone-3_p20151116.tar.xz 3164412 SHA256 6702030b4a90b168d8ee227856caeaf999eec91e83bf96517d93cb1242d98ccd SHA512 40bdb947fd3da48d1d245c18cad3a23f61301e596e3b2b9b82b9915c239941af0b55c8491b408c66c07721385de365093601f764b43f096a432d76452f9d76e1 WHIRLPOOL e07ac272cc37eb74776b93030f3a201c8e2e0a7e73777c7e1140a41c83ac58b1e8c77fc4d52dfe9027d10442b5f6a1f11ea1a35a3b36ce8d87bd725f48cb5c3d
+DIST aufs3-standalone-3_p20151221.tar.xz 3174536 SHA256 2f84b85466244e11607680a9cc905f60c56fa4478c4b310366044999819ff58f SHA512 dadc95eea30c2e13ca0f4c316a5aa2a3ff7f8025eb7123a483713ee844a3f0eabe29ddd4c5497e368ba1b0f01008d3578f745eb0bdf5210fb71d2dd4ef54a711 WHIRLPOOL b6f2bde1de90074a238984d72041e27a6d8c7dfc828c055ebce9325d18c35b212770eae6a2ff619ad2b6e176d2833cdd9a184488fd0eb63acb15e5fece608bd6
diff --git a/sys-fs/aufs3/aufs3-3_p20151221.ebuild b/sys-fs/aufs3/aufs3-3_p20151221.ebuild
new file mode 100644
index 000000000000..9930d1ec65b1
--- /dev/null
+++ b/sys-fs/aufs3/aufs3-3_p20151221.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils flag-o-matic linux-info linux-mod multilib readme.gentoo toolchain-funcs
+
+AUFS_VERSION="${PV%%_p*}"
+# highest branch version
+PATCH_MAX_VER=19
+# highest supported version
+KERN_MAX_VER=20
+# lowest supported version
+KERN_MIN_VER=14
+
+DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
+HOMEPAGE="http://aufs.sourceforge.net/"
+SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs3-standalone-${PV}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
+
+DEPEND="
+	dev-util/patchutils
+	dev-vcs/git"
+RDEPEND="
+	sys-fs/aufs-util
+	!sys-fs/aufs
+	!sys-fs/aufs2
+	!sys-fs/aufs4"
+
+S="${WORKDIR}"/${PN}-standalone
+
+MODULE_NAMES="aufs(misc:${S})"
+
+pkg_setup() {
+	CONFIG_CHECK+=" !AUFS_FS"
+	use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
+	use nfs && CONFIG_CHECK+=" EXPORTFS"
+	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
+	use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
+	use pax_kernel && CONFIG_CHECK+=" PAX" && ERROR_PAX="Please use hardened sources"
+
+	# this is needed so merging a binpkg ${PN} is possible w/out a kernel unpacked on the system
+	[ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return
+
+	get_version
+	kernel_is lt 3 ${KERN_MIN_VER} 0 && die "the kernel version isn't supported by upstream anymore. Please upgrade."
+	kernel_is gt 3 ${KERN_MAX_VER} 99 && die "kernel too new"
+
+	linux-mod_pkg_setup
+
+	if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
+		PATCH_BRANCH="x-rcN"
+	elif [[ "${KV_MINOR}" == "14" ]] && [[ "${KV_PATCH}" -ge "21" ]]; then
+		PATCH_BRANCH="${KV_MINOR}".21+
+	elif [[ "${KV_MINOR}" == "18" ]] && [[ "${KV_PATCH}" -ge "1" ]]; then
+		PATCH_BRANCH="${KV_MINOR}".1+
+	else
+		PATCH_BRANCH="${KV_MINOR}"
+	fi
+
+	case ${KV_EXTRA} in
+			"")
+				elog "It seems you are using vanilla-sources with aufs3"
+				elog "Please use sys-kernel/aufs-sources with USE=vanilla"
+				elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade"
+			;;
+			"-gentoo")
+				elog "It seems you are using gentoo-sources with aufs3"
+				elog "Please use sys-kernel/aufs-sources"
+				elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade"
+			;;
+	esac
+
+	pushd "${T}" &> /dev/null
+	unpack ${A}
+	cd ${PN}-standalone || die
+	local module_branch=origin/${PN}.${PATCH_BRANCH}
+	einfo "Using ${module_branch} as patch source"
+	git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
+	combinediff ${PN}-base.patch ${PN}-standalone.patch  > "${T}"/combined-1.patch
+	combinediff "${T}"/combined-1.patch ${PN}-mmap.patch > ${PN}-standalone-base-mmap-combined.patch
+	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
+		if use kernel-patch; then
+			cd ${KV_DIR}
+			ewarn "Patching your kernel..."
+			patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch >/dev/null
+			epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
+			ewarn "You need to compile your kernel with the applied patch"
+			ewarn "to be able to load and use the aufs kernel module"
+		else
+			eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
+			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
+			eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
+			die "missing kernel patch, please apply it first"
+		fi
+	fi
+	popd &> /dev/null
+	export PKG_SETUP_HAS_BEEN_RAN=1
+}
+
+set_config() {
+	for option in $*; do
+		grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option"
+		sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
+	done
+}
+
+src_prepare() {
+	local module_branch=origin/${PN}.${PATCH_BRANCH}
+
+	einfo "Using for module creation branch ${module_branch}"
+	git checkout -q -b local-gentoo ${module_branch} || die
+
+	# All config options to off
+	sed "s:= y:=:g" -i config.mk || die
+
+	set_config RDU BRANCH_MAX_127 SBILIST
+
+	use debug && set_config DEBUG
+	use fuse && set_config BR_FUSE POLL
+	use hfs && set_config BR_HFSPLUS
+	use inotify && set_config HNOTIFY HFSNOTIFY
+	use nfs && set_config EXPORT
+	use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
+	use ramfs && set_config BR_RAMFS
+
+	if use pax_kernel; then
+		if kernel_is ge 3 11; then
+			epatch "${FILESDIR}"/pax-3.11.patch
+		else
+			epatch "${FILESDIR}"/pax-3.patch
+		fi
+	fi
+
+	sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die
+}
+
+src_compile() {
+	local ARCH=x86
+
+	emake \
+		CC=$(tc-getCC) \
+		LD=$(tc-getLD) \
+		LDFLAGS="$(raw-ldflags)" \
+		ARCH=$(tc-arch-kernel) \
+		CONFIG_AUFS_FS=m \
+		KDIR="${KV_OUT_DIR}"
+}
+
+src_install() {
+	linux-mod_src_install
+
+	insinto /usr/share/doc/${PF}
+
+	use doc && doins -r Documentation
+
+	use kernel-patch || doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
+
+	dodoc Documentation/filesystems/aufs/README "${T}"/${PN}-standalone/{aufs3-loopback,vfs-ino,tmpfs-idr}.patch
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_pkg_postinst
+	linux-mod_pkg_postinst
+}
diff --git a/sys-fs/aufs4/Manifest b/sys-fs/aufs4/Manifest
index 91d51647c211..2f6f6893e943 100644
--- a/sys-fs/aufs4/Manifest
+++ b/sys-fs/aufs4/Manifest
@@ -11,3 +11,4 @@ DIST aufs4-standalone-0_pre20151012.tar.xz 651492 SHA256 3cb564a71a4d4fe4f16c941
 DIST aufs4-standalone-0_pre20151102.tar.xz 677588 SHA256 5e0aa085e42dacc45991e49e485bf4f20cb911c71c8d5363ef2986733cb3d9ef SHA512 b4973078f31c50bb58afeb4fc5216a34d31b1dd4de60a5dd172962935becad60820146e22e39e88fc16a4c7a74e21923f02a77d6b0d8cd8aeef946806ed97932 WHIRLPOOL e04651079f1f04a74c330786ff3bbe72c367657ad8d0351ce251a4287ddee65231df410436f86474e6418b3e848eaa370f930376a2a1ad9fe57280b4d75be4cb
 DIST aufs4-standalone-0_pre20151109.tar.xz 697760 SHA256 6dc6341cf729106d0f53b36f100c8d561992985f8dd8000a0956d716b10321a9 SHA512 dcacf98040bd51ad974582e1129b1993d8945b19449dd1e9ce855a5eb1502b05ab67196fa0f61e10eb45a3496d9866c0137122486ef9021704a59a41a7ffa944 WHIRLPOOL 2fd61080044b11f05514d55c9edabb345109cd217a7fcafdae3cc9c2cf8322a998da0f6416e20782ae9dfebd9483d7d87c3280bdf86d718bc2df993e11f2925a
 DIST aufs4-standalone-0_pre20151116.tar.xz 741280 SHA256 362d56dac519b35e73cb93b0ed61442e9cfd01da463ab92579f7e231543dec66 SHA512 425adac57115b61af0d0db713cf60dfbd2820464b4e9beae84ae14bb2e37d99b4e940a67c82aae1fb7b1693a4c812e606239e7f7b254d62105da14973200b40e WHIRLPOOL 5d336ba26ffc4a9daa2675f28d88b53a306224bc42b2751f3cbe7d1fa2c34d93fb0babec82ff6aa844de56cfc5ddda17fc9deb5f1e6d43efc4b3a19389096be0
+DIST aufs4-standalone-0_pre20151221.tar.xz 782884 SHA256 7871f3159418956ab7498df800cf082c55ea84af82720c2fe254cfe0ddbb090f SHA512 a0f5e0af490209b3ac76bcb8c2ac31dcff05d881b9dad314c701ac84b990c26b0b5beb59f36ce5e373b6548052eeda1389bd8ba39a5be15b9eeea13dfc9b2c65 WHIRLPOOL 92cf2595e167a47f571d565a61e69dee779b8a7dc52400492eb52bf9107936787d570f48af517d935fedb8ef89cfafcdde0b8c0bae2968dd3e69a80b58e42f5d
diff --git a/sys-fs/aufs4/aufs4-0_pre20151221.ebuild b/sys-fs/aufs4/aufs4-0_pre20151221.ebuild
new file mode 100644
index 000000000000..e30e5f26aa7a
--- /dev/null
+++ b/sys-fs/aufs4/aufs4-0_pre20151221.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils flag-o-matic linux-info linux-mod multilib readme.gentoo toolchain-funcs
+
+AUFS_VERSION="${PV%%_p*}"
+# highest branch version
+PATCH_MAX_VER=3
+# highest supported version
+KERN_MAX_VER=4
+# lowest supported version
+KERN_MIN_VER=0
+
+DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
+HOMEPAGE="http://aufs.sourceforge.net/"
+SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs4-standalone-${PV}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
+
+DEPEND="
+	dev-util/patchutils
+	dev-vcs/git"
+RDEPEND="
+	sys-fs/aufs-util
+	!sys-fs/aufs
+	!sys-fs/aufs2
+	!sys-fs/aufs3"
+
+S="${WORKDIR}"/${PN}-standalone
+
+MODULE_NAMES="aufs(misc:${S})"
+
+pkg_setup() {
+	CONFIG_CHECK+=" !AUFS_FS"
+	use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
+	use nfs && CONFIG_CHECK+=" EXPORTFS"
+	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
+	use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
+	use pax_kernel && CONFIG_CHECK+=" PAX" && ERROR_PAX="Please use hardened sources"
+
+	# this is needed so merging a binpkg ${PN} is possible w/out a kernel unpacked on the system
+	[ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return
+
+	get_version
+	kernel_is lt 4 ${KERN_MIN_VER} 0 && die "the kernel version isn't supported by upstream anymore. Please upgrade."
+	kernel_is gt 4 ${KERN_MAX_VER} 99 && die "kernel too new"
+
+	linux-mod_pkg_setup
+
+	if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
+		PATCH_BRANCH="x-rcN"
+	else
+		PATCH_BRANCH="${KV_MINOR}"
+	fi
+
+	case ${KV_EXTRA} in
+			"")
+				elog "It seems you are using vanilla-sources with aufs4"
+				elog "Please use sys-kernel/aufs-sources with USE=vanilla"
+				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
+			;;
+			"-gentoo")
+				elog "It seems you are using gentoo-sources with aufs4"
+				elog "Please use sys-kernel/aufs-sources"
+				elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
+			;;
+	esac
+
+	pushd "${T}" &> /dev/null
+	unpack ${A}
+	cd ${PN}-standalone || die
+	local module_branch=origin/${PN}.${PATCH_BRANCH}
+	einfo "Using ${module_branch} as patch source"
+	git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
+	combinediff ${PN}-base.patch ${PN}-standalone.patch  > "${T}"/combined-1.patch
+	combinediff "${T}"/combined-1.patch ${PN}-mmap.patch > ${PN}-standalone-base-mmap-combined.patch
+	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
+		if use kernel-patch; then
+			cd ${KV_DIR}
+			ewarn "Patching your kernel..."
+			patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch >/dev/null
+			epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
+			ewarn "You need to compile your kernel with the applied patch"
+			ewarn "to be able to load and use the aufs kernel module"
+		else
+			eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
+			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
+			eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
+			die "missing kernel patch, please apply it first"
+		fi
+	fi
+	popd &> /dev/null
+	export PKG_SETUP_HAS_BEEN_RAN=1
+}
+
+set_config() {
+	for option in $*; do
+		grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option"
+		sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
+	done
+}
+
+src_prepare() {
+	local module_branch=origin/${PN}.${PATCH_BRANCH}
+
+	einfo "Using for module creation branch ${module_branch}"
+	git checkout -q -b local-gentoo ${module_branch} || die
+
+	# All config options to off
+	sed "s:= y:=:g" -i config.mk || die
+
+	set_config RDU BRANCH_MAX_127 SBILIST
+
+	use debug && set_config DEBUG
+	use fuse && set_config BR_FUSE POLL
+	use hfs && set_config BR_HFSPLUS
+	use inotify && set_config HNOTIFY HFSNOTIFY
+	use nfs && set_config EXPORT
+	use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
+	use ramfs && set_config BR_RAMFS
+
+	if use pax_kernel; then
+		epatch "${FILESDIR}"/pax-4.patch
+	fi
+
+	sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die
+}
+
+src_compile() {
+	local ARCH=x86
+
+	emake \
+		CC=$(tc-getCC) \
+		LD=$(tc-getLD) \
+		LDFLAGS="$(raw-ldflags)" \
+		ARCH=$(tc-arch-kernel) \
+		CONFIG_AUFS_FS=m \
+		KDIR="${KV_OUT_DIR}"
+}
+
+src_install() {
+	linux-mod_src_install
+
+	insinto /usr/share/doc/${PF}
+
+	use doc && doins -r Documentation
+
+	use kernel-patch || doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
+
+	dodoc Documentation/filesystems/aufs/README "${T}"/${PN}-standalone/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_pkg_postinst
+	linux-mod_pkg_postinst
+}
diff --git a/sys-kernel/git-sources/Manifest b/sys-kernel/git-sources/Manifest
index 21372d1b127d..79b5362058ee 100644
--- a/sys-kernel/git-sources/Manifest
+++ b/sys-kernel/git-sources/Manifest
@@ -4,3 +4,4 @@ DIST patch-4.4-rc2.xz 6472332 SHA256 04a2fe6ce8711a01617e459d6908bfbd7715a0e4106
 DIST patch-4.4-rc3.xz 6514956 SHA256 41b73ce54efdde419218de2ca2b1bcc2bc135b5e33ab870e28eb328fca962855 SHA512 08ac846d999c8997b24a85b316218dc27c0f4adb5ab38186668705e1ca06cb576e198c702eaaf97cdbfce4a6f69805765b63c16c97271dd702bab05708ac7897 WHIRLPOOL bf01ded5974cfa6d1d887ea558ccd8b0deae88f2d8836614d0579ca25afd6a7aec1c726ee5c01506b33835f3f5c0cea5125a452969def053fda810299704658e
 DIST patch-4.4-rc4.xz 6583896 SHA256 e2a1f4198c0f56b0fb9cdf7056a3efb5c99d117e6c55341b69f8e77c01bea450 SHA512 45cfa607086fd41f37e374696042fed0c122449652282d334c3d72c808d609108e99eee538eb9a7529a0498986d31984fc3714a29bab01210548c07647fd8e83 WHIRLPOOL 78274ee4996eaf9951be09cf96c951617adf1e01c29284893720ba37bca1485e9182f8d7e237a288ef053d2a0160869898df39e9130d10c317c0d3ad91617684
 DIST patch-4.4-rc5.xz 6618504 SHA256 d976f02cae338d12981c1d9479077379ac7b7b8210fa216549ca24c51b68d85a SHA512 38f1d3b1999374850e7c857d35afeca38d7ae253face09cc689220b38aa0e87a53effcfee13ad6b821a0a7b8a1a9c0ab7a2c0b114d63dbf44f48a41f0c32483f WHIRLPOOL 765f27ca1270a2d3b0d0013a34f71d3891742e57b18f641eacb1ba070abfa8928a7bea7b8e42717ac6568930e83db5c6d113bee40d0a46b17abfb03778b1c42e
+DIST patch-4.4-rc6.xz 6663416 SHA256 e4dde89da4c186e16f0af79fb812314a1afb2746349b57831baebb9c762b6c78 SHA512 a8b362c98f76997070e2b8703836c00e5938c37c9c3cf77f4d68c77f78ee5935e305210681c8d45d534027abca249e0b607a57fc4f7df15b756c2a32e4401427 WHIRLPOOL c3e6ba088509c3aa27da021aac74602d90a308d6c66440646ac97a046e644428cd9749d98e3dbcadb9cf6526fb35fea621e83fbd73e1233be8d261060c2d27aa
diff --git a/sys-kernel/git-sources/git-sources-4.4_rc6.ebuild b/sys-kernel/git-sources/git-sources-4.4_rc6.ebuild
new file mode 100644
index 000000000000..5b6ded7aad84
--- /dev/null
+++ b/sys-kernel/git-sources/git-sources-4.4_rc6.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+UNIPATCH_STRICTORDER="yes"
+K_NOUSENAME="yes"
+K_NOSETEXTRAVERSION="yes"
+K_NOUSEPR="yes"
+K_SECURITY_UNSUPPORTED="yes"
+K_BASE_VER="4.3"
+K_EXP_GENPATCHES_NOUSE="1"
+ETYPE="sources"
+CKV="${PVR/-r/-git}"
+
+# only use this if it's not an _rc/_pre release
+[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}"
+inherit kernel-2
+detect_version
+
+DESCRIPTION="The very latest -git version of the Linux kernel"
+HOMEPAGE="https://www.kernel.org"
+SRC_URI="${KERNEL_URI}"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
+experimental nature. If you have any issues, try a matching vanilla-sources
+ebuild -- if the problem is not there, please contact the upstream kernel
+developers at https://bugzilla.kernel.org and on the linux-kernel mailing list to
+report the problem so it can be fixed in time for the next kernel release."
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	>=sys-devel/patch-2.7.4"
+
+pkg_postinst() {
+	postinst_sources
+}
diff --git a/sys-kernel/vanilla-sources/metadata.xml b/sys-kernel/vanilla-sources/metadata.xml
index 47336f4e6c2a..1ad4546ee9e2 100644
--- a/sys-kernel/vanilla-sources/metadata.xml
+++ b/sys-kernel/vanilla-sources/metadata.xml
@@ -14,9 +14,6 @@
 	<longdescription>
 		Vanilla prepatch/rc sources, for people who like to have the latest kernel available
 	</longdescription>
-	<use>
-	  	<flag name='deblob'>Remove binary blobs from kernel sources to provide libre license compliance.</flag>
-	</use>
 	<upstream>
 		<remote-id type="cpe">cpe:/o:linux:linux_kernel</remote-id>
 	</upstream>
diff --git a/sys-libs/libselinux/metadata.xml b/sys-libs/libselinux/metadata.xml
index 3794d1d83f5a..66f680000e8f 100644
--- a/sys-libs/libselinux/metadata.xml
+++ b/sys-libs/libselinux/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>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>
 		Libselinux provides an API for SELinux applications to get and set
 		process and file security contexts and to obtain security policy
diff --git a/sys-libs/libsemanage/metadata.xml b/sys-libs/libsemanage/metadata.xml
index 83c24ee19582..0b389f5eafc5 100644
--- a/sys-libs/libsemanage/metadata.xml
+++ b/sys-libs/libsemanage/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>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>SELinux policy management libraries</longdescription>
 	<upstream>
 		<remote-id type="github">SELinuxProject/selinux</remote-id>
diff --git a/sys-libs/libsepol/metadata.xml b/sys-libs/libsepol/metadata.xml
index a19075f95396..0c8cd5bcb23f 100644
--- a/sys-libs/libsepol/metadata.xml
+++ b/sys-libs/libsepol/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>selinux</herd>
+	<maintainer>
+		<email>selinux@gentoo.org</email>
+		<name>SELinux Team</name>
+	</maintainer>
 	<longdescription>SELinux library for manipulating binary security policies</longdescription>
 	<upstream>
 		<remote-id type="github">SELinuxProject/selinux</remote-id>
diff --git a/sys-libs/ncurses/ncurses-5.9-r101.ebuild b/sys-libs/ncurses/ncurses-5.9-r101.ebuild
index a90cf859b8d1..541bb169dd6b 100644
--- a/sys-libs/ncurses/ncurses-5.9-r101.ebuild
+++ b/sys-libs/ncurses/ncurses-5.9-r101.ebuild
@@ -169,7 +169,6 @@ src_compile() {
 	multilib-minimal_src_compile
 }
 
-
 multilib_src_compile() {
 	local t
 	for t in "${NCURSES_TARGETS[@]}" ; do
diff --git a/sys-libs/ncurses/ncurses-5.9-r4.ebuild b/sys-libs/ncurses/ncurses-5.9-r4.ebuild
index 006c932ca533..78abd8707422 100644
--- a/sys-libs/ncurses/ncurses-5.9-r4.ebuild
+++ b/sys-libs/ncurses/ncurses-5.9-r4.ebuild
@@ -21,7 +21,7 @@ DEPEND="gpm? ( sys-libs/gpm )"
 #	berkdb? ( sys-libs/db )"
 # Block the older ncurses that installed all files w/SLOT=5. #557472
 RDEPEND="${DEPEND}
-	!<=sys-libs/ncurses-5.9-r4:0
+	!<=sys-libs/ncurses-5.9-r4:5
 	!<x11-terms/rxvt-unicode-9.06-r3
 	abi_x86_32? (
 		!<=app-emulation/emul-linux-x86-baselibs-20130224-r12
diff --git a/virtual/perl-Math-BigInt/perl-Math-BigInt-1.999.710.ebuild b/virtual/perl-Math-BigInt/perl-Math-BigInt-1.999.710.ebuild
new file mode 100644
index 000000000000..909e3487a0fb
--- /dev/null
+++ b/virtual/perl-Math-BigInt/perl-Math-BigInt-1.999.710.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DESCRIPTION="Virtual for ${PN#perl-}"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~ppc-macos ~x86-solaris"
+IUSE=""
+
+RDEPEND="
+	~perl-core/${PN#perl-}-${PV}
+"
diff --git a/x11-drivers/xf86-video-virtualbox/Manifest b/x11-drivers/xf86-video-virtualbox/Manifest
index 2abbf724df0c..e08d25af7826 100644
--- a/x11-drivers/xf86-video-virtualbox/Manifest
+++ b/x11-drivers/xf86-video-virtualbox/Manifest
@@ -2,4 +2,4 @@ DIST VirtualBox-4.3.28.tar.bz2 100092002 SHA256 e157ab76d1958ae2c56b2a3875194fbf
 DIST VirtualBox-4.3.32.tar.bz2 98168101 SHA256 dc5bf4e6f9989792d31bac174d20d7fc9e638654fa5a99c02b20a60557927261 SHA512 856b36cd90647cdceb7e182d066e9e1489d2bae0b71ce8b2f6324cd2d9854806eaea0fe0aad2d4e8b84bd836c688e13258ae69e094320572729b7d886c8d35f0 WHIRLPOOL 441041947dcd190d73a9cc5007bc0001b6eeb36ba958f4a09fca775670faff690423095d334e258fc0d6dcbef01d74a085505c8549397ced5dbe75ca96724144
 DIST VirtualBox-4.3.34.tar.bz2 98166680 SHA256 076507e924d3c5ae05c5e80a720b897da4a57a636a506a7d369b28f08b11d6c1 SHA512 1eeca08990d426155550d8920c159e41320bfedb53561b1752bd6816fa588588672ad364e73baf9b7b45e8352ae8feb1c649ba1748253da47586b55fe89e8fe3 WHIRLPOOL 1249e1d61aec38d439d1060457a1a0d0294a65d78dfa426026f3abe1882c429c628ea58f556bdeaf1a88d3cdd3b9095f1e4c6f1fae2176f39f8da5bb3d091809
 DIST VirtualBox-5.0.10.tar.bz2 110904399 SHA256 56eafae439b91ea3c3748f2128b2969ba76983acf821acaa08e043c129b45a89 SHA512 8836e5b57ed46b57b12a9fdb6a632e895c3106dad58c3ab3e28f9178ce69499c493a935b6df8b872dc4677c12eb826a46113bdb902e4fb3d2f8ee6d768e53930 WHIRLPOOL 05516c1d9a3cd876a67a73b86df47ec7d1ef08ed921cb3e25ef483676413982ac8a7ce6562f3003240d862a33759aee5e6c94a303a2a35b66025d72cb15d4404
-DIST VirtualBox-5.0.8.tar.bz2 110540476 SHA256 e043518b7ab150e478c00b622360a5feb95f4e5b19e72bfcc71174356e2dacb3 SHA512 2a8e0f3e5fbb4b45786aa48cb408cf712cd968af65b25219eb39d54274612978704359b620179d751e828783950eb29d4cf330ac408a84dd65edbd0d98e25aa4 WHIRLPOOL 2b054cdb5c7c39008e876f0703e154509f4a79183aa85c4998717ae07a72e015a71bd22dc0427c8a464b3e16db92ebe9d731971f9788fbe56c8cc936669496fe
+DIST VirtualBox-5.0.12.tar.bz2 111001547 SHA256 de0362b1d404d1ca0298db1984acb6f0f1c6210313aeb744fea345ad9201e86e SHA512 eef01d1a5121905d2fbfcd48081f18db06433187bfbfea6a006b3adea11cad8c8351025fd19fa115c132231592330b17bfeba033a3a168f3064176a3f7586d7a WHIRLPOOL bd73e67c83a524cb021ff92c4c3d655f6a1019e2d48f3ec97aee937543ca9da6f7ba2a1e70a6b75092dce3c8db8f3c7887300104fafa23432b94bc832c5e5447
diff --git a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.0.8.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.0.12.ebuild
index 1fad4cc497f3..1fad4cc497f3 100644
--- a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.0.8.ebuild
+++ b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.0.12.ebuild
diff --git a/x11-misc/xfe/xfe-1.40.1.ebuild b/x11-misc/xfe/xfe-1.40.1.ebuild
index f5568d999e7c..ab823b4c8dfd 100644
--- a/x11-misc/xfe/xfe-1.40.1.ebuild
+++ b/x11-misc/xfe/xfe-1.40.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ppc64 ~sparc ~x86"
 IUSE="debug nls startup-notification"
 
 RDEPEND="
author	Patrice Clement <monsieurp@gentoo.org>	2015-12-21 22:25:21 +0000
committer	Patrice Clement <monsieurp@gentoo.org>	2015-12-21 22:26:29 +0000
commit	46790bbc48a6eb09204fda13c861bfb26d72adb3 (patch)
tree	fbf5ae04c0162a7074cbe49fca019ba709ccfeaa
parent	dev-java/jebl: Stable for amd64. Retroactively mark stable for the remaining ... (diff)
parent	app-text/asciidoc-9999: fix a typo (diff)
download	gentoo-46790bbc48a6eb09204fda13c861bfb26d72adb3.tar.gz gentoo-46790bbc48a6eb09204fda13c861bfb26d72adb3.tar.bz2 gentoo-46790bbc48a6eb09204fda13c861bfb26d72adb3.zip