Sync with portage [Sun Jan 3 01:46:27 MSK 2016].

2016-01-03 01:46:28 +03:00 · 2016-01-03 01:46:28 +03:00 · 49dcb41aa3
commit 49dcb41aa3
parent 8f78320a96
3543 changed files with 5708 additions and 8975 deletions
--- a/app-backup/backintime/Manifest
+++ b/app-backup/backintime/Manifest
@ -1,5 +1,2 @@
-DIST backintime-1.0.24.tar.gz 507183 SHA256 5d9bac6fd74dd2258786b3481af260beb0f544d0e3560a0db2c8c0a87973384d SHA512 57469409e101207dd0c90f47ac7a709f5c7faab2cd7c60ff014a431912483b87e677bb7d0d2e25609d318f2a7ceb539bac4cc52bf7284d987200d98f2be670a7 WHIRLPOOL 476c158744918510d26d627f9cb833149ef99af85d3d423de2a2e61bc995032131f86df194825876f81ecb756109b328118be741f92cc98f11f7340c1a1e10ca
-DIST backintime-1.0.36.tar.gz 594612 SHA256 40ff1ed81fa4de3302acbc0154f2ec9ee17e77423d35e17c66eb110c2c171666 SHA512 0f78041c90c8242d6e4aabc97c67156e1ecf7d593adb40e417959f0d2dd0432ae95e3dd4c04603b170e7271f82e01ced4e7233794d81333e8b9ab3e9b9721776 WHIRLPOOL 8d9e752bae1000cd9690da095fa382c5deac8af8f107f3b1d39f7bf1d5f59091ccfc0b6f6c9b779f94fedd13e2e2daf7f2d53f5b54cb4050548eeb0345ba878e
-DIST backintime-1.0.40.tar.gz 595494 SHA256 09a79fe95b654e628a9d76d19f110bf5d29c7cf142b2ec5df2f1c8561b5551f2 SHA512 342a842ebac4b886ec8af8d30f0a01594b89cd4345c84c2cda463b7862d00955180a688f6661623502117896e95b63b8d44e5f3d0fc8152cca1ca3d816380e44 WHIRLPOOL 38c51e77d1661e0773ee17dc84cb2f9559c4a0b112db4c3de43a836ca099bfbd391a98846b349ef9e9794fc3befb73eef5400f080122d8e63eebec28bfc7f3c0
 DIST backintime-1.1.4.tar.gz 562964 SHA256 434fc1fb6d9ac20d7b04c791e39bf9e077773c696e18f2bf1aa8f3e7fb59a770 SHA512 a207833c9708166cfbc4e0aa36c6e1b0ee609d5e05a8f23c51c3242f8e32ae25df09255885a812ac32bdec7874266e8a167be076c8938d90ddfe76c5b2736aa7 WHIRLPOOL e3dee1d437657939ce3290d0717f9c6f31a656de8f4642bf7fbcca1dd5b7426ba7f068f8faa96e731c863e4a8e02d1e8d1526fbf466b7ea8ba1b1682fd43ab7f
 DIST backintime-1.1.8.tar.gz 617754 SHA256 a1f2d210e95633dfe383eb50b3b560d1e09c43de4ce89dd4cb193cab40cb8a1e SHA512 550e270dcf341ec5ad952f4decd836007d19ff9bf60cada834dfb488dbf29954b6fd3ed80a4f8fb4406a0166895a7f7c922e5622d06c43086dd54073e5aabd99 WHIRLPOOL ea9af3c432c61def4214e1d1e2c70e40cb7e50867bb0fa08930740c13133293ad135fd6c97295ab176deaedacb33e72583dc7c34dcfc3cb375a8b6e7fc7ab632
--- a/app-backup/backintime/backintime-1.0.24-r2.ebuild
+++ b/app-backup/backintime/backintime-1.0.24-r2.ebuild
@ -1,98 +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 eutils python-single-r1
-
-DESCRIPTION="Backup system inspired by TimeVault and FlyBack, with a GUI for GNOME and KDE4"
-HOMEPAGE="http://backintime.le-web.org/"
-SRC_URI="http://${PN}.le-web.org/wp-content/uploads/2009/03/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="kde gnome"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/keyring[${PYTHON_USEDEP}]
-	dev-python/notify-python[${PYTHON_USEDEP}]
-	net-misc/openssh
-	net-misc/rsync[xattr,acl]
-	kde? (
-		>=kde-base/kdelibs-4
-		kde-base/pykde4[${PYTHON_USEDEP}]
-		kde-apps/kompare:4
-		kde-apps/kdesu:4
-	)
-	gnome? (
-		gnome-base/libglade
-		dev-util/meld
-		gnome-base/gnome-session
-		dev-python/gnome-vfs-python
-		dev-python/libgnome-python
-		dev-python/pygobject:2[${PYTHON_USEDEP}]
-		dev-python/pygtk[${PYTHON_USEDEP}]
-		x11-libs/gksu
-	)"
-
-DEPEND="${RDEPEND}"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-S=${WORKDIR}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-dont-install-license.patch
-	epatch "${FILESDIR}"/${PN}-1.0.4-fix-configure-warning.diff
-
-	#fix doc install location
-	sed -i "s:/doc/kde4/HTML/:/doc/HTML/:g" kde4/Makefile.template || die
-	sed -i "s:/doc/backintime:/doc/${PF}:g" common/Makefile.template || die
-
-	cp "${FILESDIR}"/backintime-1.0.4-kde4-root.desktop \
-		kde4/backintime-kde4-root.desktop || die
-
-	#bug 482106
-	epatch "${FILESDIR}"/${P}-wrapper.patch
-	sed -e "s:^python2 :${PYTHON} :" \
-		-e "s:APP_PATH=\"/usr:APP_PATH=\"${EPREFIX}/usr:" \
-		-i kde4/backintime-kde4 gnome/backintime-gnome \
-			common/backintime || die
-
-	backintime_variants="common $(usex gnome gnome '') $(usex kde kde4 '')"
-	backintime_run() {
-		local variant
-		for variant in ${backintime_variants} ; do
-			einfo "$variant: run \"$@\""
-			pushd "${S}"/${variant} || die
-			"${@}" || die
-			popd
-		done
-	}
-
-	if [ -n ${LINGUAS+x} ] ; then
-		cd common/po || die
-		for po in *.po ; do
-			if ! has ${po/.po} ${LINGUAS} ; then
-				rm ${po} || die
-			fi
-		done
-	fi
-}
-
-src_configure() {
-	backintime_run econf
-}
-
-src_compile() {
-	backintime_run emake
-}
-
-src_install() {
-	backintime_run emake DESTDIR="${D}" install
-	python_optimize "${D}"
-}
--- a/app-backup/backintime/backintime-1.0.36-r2.ebuild
+++ b/app-backup/backintime/backintime-1.0.36-r2.ebuild
@ -1,98 +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 eutils python-single-r1
-
-DESCRIPTION="Backup system inspired by TimeVault and FlyBack, with a GUI for GNOME and KDE4"
-HOMEPAGE="http://backintime.le-web.org/"
-SRC_URI="http://${PN}.le-web.org/download/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="kde gnome"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/keyring[${PYTHON_USEDEP}]
-	dev-python/notify-python[${PYTHON_USEDEP}]
-	net-misc/openssh
-	net-misc/rsync[xattr,acl]
-	kde? (
-		>=kde-base/kdelibs-4
-		kde-base/pykde4[${PYTHON_USEDEP}]
-		kde-apps/kompare:4
-		kde-apps/kdesu:4
-	)
-	gnome? (
-		gnome-base/libglade
-		dev-util/meld
-		gnome-base/gnome-session
-		dev-python/gnome-vfs-python
-		dev-python/libgnome-python
-		dev-python/pygobject:2[${PYTHON_USEDEP}]
-		dev-python/pygtk[${PYTHON_USEDEP}]
-		x11-libs/gksu
-	)"
-
-DEPEND="${RDEPEND}"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-S=${WORKDIR}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.0.24-dont-install-license.patch
-
-	#fix doc install location
-	sed -i "s:/doc/kde4/HTML/:/doc/HTML/:g" kde4/Makefile.template || die
-	sed -i "s:/doc/backintime:/doc/${PF}:g" common/Makefile.template || die
-
-	cp "${FILESDIR}"/backintime-1.0.4-kde4-root.desktop \
-		kde4/backintime-kde4-root.desktop || die
-
-	#bug 482106
-	epatch "${FILESDIR}"/${P}-wrapper.patch
-	sed -e "s:^python2 :${PYTHON} :" \
-		-e "s:APP_PATH=\"/usr:APP_PATH=\"${EPREFIX}/usr:" \
-		-i kde4/backintime-kde4 gnome/backintime-gnome \
-			common/backintime || die
-
-	backintime_variants="common $(usex gnome gnome '') $(usex kde kde4 '')"
-	backintime_run() {
-		local variant
-		for variant in ${backintime_variants} ; do
-			einfo "$variant: run \"$@\""
-			pushd "${S}"/${variant} || die
-			"${@}" || die
-			popd
-		done
-	}
-
-	if [ -n ${LINGUAS+x} ] ; then
-		cd common/po || die
-		for po in *.po ; do
-			if ! has ${po/.po} ${LINGUAS} ; then
-				rm ${po} || die
-			fi
-		done
-	fi
-}
-
-src_configure() {
-	backintime_run econf
-}
-
-src_compile() {
-	backintime_run emake
-}
-
-src_install() {
-	backintime_run emake DESTDIR="${D}" install
-	python_optimize "${D}"
-}
--- a/app-backup/backintime/backintime-1.0.40.ebuild
+++ b/app-backup/backintime/backintime-1.0.40.ebuild
@ -1,98 +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 eutils python-single-r1
-
-DESCRIPTION="Backup system inspired by TimeVault and FlyBack, with a GUI for GNOME and KDE4"
-HOMEPAGE="http://backintime.le-web.org/"
-SRC_URI="http://${PN}.le-web.org/download/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="kde gnome"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/keyring[${PYTHON_USEDEP}]
-	dev-python/notify-python[${PYTHON_USEDEP}]
-	net-misc/openssh
-	net-misc/rsync[xattr,acl]
-	kde? (
-		>=kde-base/kdelibs-4
-		kde-base/pykde4[${PYTHON_USEDEP}]
-		kde-apps/kompare:4
-		kde-apps/kdesu:4
-	)
-	gnome? (
-		gnome-base/libglade
-		dev-util/meld
-		gnome-base/gnome-session
-		dev-python/gnome-vfs-python
-		dev-python/libgnome-python
-		dev-python/pygobject:2[${PYTHON_USEDEP}]
-		dev-python/pygtk[${PYTHON_USEDEP}]
-		x11-libs/gksu
-	)"
-
-DEPEND="${RDEPEND}"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-S=${WORKDIR}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.0.24-dont-install-license.patch
-
-	#fix doc install location
-	sed -i "s:/doc/kde4/HTML/:/doc/HTML/:g" kde4/Makefile.template || die
-	sed -i "s:/doc/backintime:/doc/${PF}:g" common/Makefile.template || die
-
-	cp "${FILESDIR}"/backintime-1.0.4-kde4-root.desktop \
-		kde4/backintime-kde4-root.desktop || die
-
-	#bug 482106
-	epatch "${FILESDIR}"/${PN}-1.0.36-wrapper.patch
-	sed -e "s:^python2 :${PYTHON} :" \
-		-e "s:APP_PATH=\"/usr:APP_PATH=\"${EPREFIX}/usr:" \
-		-i kde4/backintime-kde4 gnome/backintime-gnome \
-			common/backintime || die
-
-	backintime_variants="common $(usex gnome gnome '') $(usex kde kde4 '')"
-	backintime_run() {
-		local variant
-		for variant in ${backintime_variants} ; do
-			einfo "$variant: run \"$@\""
-			pushd "${S}"/${variant} || die
-			"${@}" || die
-			popd
-		done
-	}
-
-	if [ -n ${LINGUAS+x} ] ; then
-		cd common/po || die
-		for po in *.po ; do
-			if ! has ${po/.po} ${LINGUAS} ; then
-				rm ${po} || die
-			fi
-		done
-	fi
-}
-
-src_configure() {
-	backintime_run econf
-}
-
-src_compile() {
-	backintime_run emake
-}
-
-src_install() {
-	backintime_run emake DESTDIR="${D}" install
-	python_optimize "${D}"
-}
--- a/app-backup/ccollect/Manifest
+++ b/app-backup/ccollect/Manifest
@ -1,3 +1 @@
-DIST ccollect-0.5.1.tar.bz2 37397 SHA256 c3748b3aa52f8696b4cc5c6e760f5d94647c025348824303eef826aa9e7fe5e9 SHA512 93409ff0652575897fd63535daa32bd14baac329eafcbcb6f89d18a9686053360ae7a7953e39f67d68b5ceccd8c8e475132641ae1db2d1d289a91cb5054471eb WHIRLPOOL 049602daba95e3c3939e2d75d3094e74e18712d216a96c81ca32c722f7e40c5dc0b27e9ea5ee2a89c931ff096660f978d112d0a79441eaba4579fb71c16635b7
-DIST ccollect-0.7.1.tar.bz2 38054 SHA256 f1914a53954367a0110acc7e187298f5a0f7e40dd847baa328fa357aa3ea8640 SHA512 b436c7210c30b05c476a518b624c75f45a81eafe308bc6c8a16991910a85e02ee87b306511b8aaaf00bfe0cc05b0ba740eb8d839751cf8967e3f24a943460f10 WHIRLPOOL 837029c6c5ed933621a72c22193b2de567145254aaa0fcd5899b5bd74d3be3a4f4ee62cac88535c417d4a04d41f493e95f5862216d17942cca3f5657f3b2955e
 DIST ccollect-0.8.tar.bz2 60376 SHA256 d0b82b9b4fcd1601d8ea5fd2dae1fb22b1aaf23f12b5cfbf8b27b767e847929a SHA512 dc4b2a8687c636938154f8a4a4048c3f0ef13f6d6e3f6e66d8dcc8f544f3a390a98a8dbfb3ba2ba9019decbec5d628f07461dd3f803e14b2203972936ebf96f3 WHIRLPOOL fe2aaa405ab9f9038a5371170df86cbef2066d87ab948c59ddd2d55311af6a5a14d5bc0b6021c07d3123fb5f7ca5a59eff6f59c552db64f7f80999b31f6f9f9b
--- a/app-backup/ccollect/ccollect-0.5.1.ebuild
+++ b/app-backup/ccollect/ccollect-0.5.1.ebuild
@ -1,45 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-DESCRIPTION="(pseudo) incremental backup with different exclude lists using
-hardlinks and rsync"
-HOMEPAGE="http://unix.schottelius.org/ccollect/"
-SRC_URI="http://unix.schottelius.org/ccollect/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 hppa ppc x86"
-IUSE="doc"
-
-DEPEND="doc? ( >=app-text/asciidoc-7.0.2 )"
-RDEPEND="net-misc/rsync"
-
-src_compile() {
-	if use doc; then
-		make documentation
-	else
-		einfo 'Nothing to compile'
-	fi
-}
-
-src_install() {
-	dobin ccollect.sh
-
-	insinto /usr/share/${PN}/tools
-	doins tools/*
-
-	if use doc; then
-		dodoc doc/*
-
-		# dodoc is not recursive. So do a workaround.
-		insinto /usr/share/doc/${PF}/examples/
-		doins -r "${S}"/conf
-	fi
-}
-
-pkg_postinst() {
-	ewarn "If you're upgrading from 0.3.X or less, please run"
-	ewarn "/usr/share/ccollect/tools/config-pre-0.4-to-0.4.sh"
-	ewarn "because the old configuration is no longer compatible."
-}
--- a/app-backup/ccollect/ccollect-0.7.1.ebuild
+++ b/app-backup/ccollect/ccollect-0.7.1.ebuild
@ -1,73 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-
-DESCRIPTION="(pseudo) incremental backup with different exclude lists using hardlinks and rsync"
-HOMEPAGE="http://unix.schottelius.org/ccollect/"
-SRC_URI="http://unix.schottelius.org/ccollect/${P}.tar.bz2"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86"
-IUSE="doc examples"
-
-DEPEND="doc? ( >=app-text/asciidoc-8.1.0
-		app-text/docbook-xsl-stylesheets
-		app-text/docbook-xml-dtd:4.2
-		dev-libs/libxslt )"
-RDEPEND="net-misc/rsync"
-
-src_compile() {
-	if use doc; then
-		emake XSL=/usr/share/sgml/docbook/xsl-stylesheets/html/docbook.xsl documentation || die "building docs failed"
-	fi
-}
-
-src_install() {
-	dobin ccollect.sh
-	dosym ccollect.sh /usr/bin/ccollect
-
-	local tools="add_source analyse_logs check_config delete_source list_intervals logwrapper stats"
-	for t in ${tools} ; do
-		newbin tools/ccollect_${t}.sh ccollect_${t}
-	done
-
-	insinto /usr/share/${PN}/tools
-	doins tools/config-pre* tools/{gnu-du-backup-size-compare,report_success}.sh
-
-	dodoc CREDITS README
-	pushd doc/changes
-	for n in * ; do
-		newdoc ${n} NEWS-${n}
-	done
-	popd
-
-	if use doc; then
-		dohtml doc/*.htm doc/*.html
-		dohtml -r doc/man
-		doman doc/man/*.1
-	fi
-
-	if use examples ; then
-		# dodoc is not recursive. So do a workaround.
-		insinto /usr/share/doc/${PF}/examples/
-		cp -Rdp "${S}/conf" "${D}/usr/share/doc/${PF}/examples/"
-	fi
-}
-
-pkg_postinst() {
-	ewarn "If you're upgrading from 0.6.x or less, you'll have to"
-	ewarn "upgrade your existing configuration as follows:"
-	ewarn "1. Make the scripts in /usr/share/ccollect/scripts executable"
-	ewarn "2. Run all config-pre-\$VER-to-\$VER.sh in /usr/share/ccollect/scripts"
-	ewarn "   ascending order, where \$VER is greater or equal than the version"
-	ewarn "   you upgraded from."
-	ewarn "Example:"
-	ewarn "  You upgraded from 0.5, thus you have to run:"
-	ewarn "  /usr/share/ccollect/tools/config-pre-0.6-to-0.6.sh"
-	ewarn "  /usr/share/ccollect/tools/config-pre-0.7-to-0.7.sh"
-	elog "Please note that many tools are now installed directly to /usr/bin"
-	elog "as recommended by upstream."
-}
--- a/app-backup/cdbackup/Manifest
+++ b/app-backup/cdbackup/Manifest
@ -1,2 +1 @@
-DIST cdbackup-0.7.0.tar.gz 22004 SHA256 d960bd67cc06e972c099aca8139b3b2aa35e54d32fda1a6d58f354fb82892a5c SHA512 c64f5c9c4541384a6281ded526fe6b4e47a7912f4b6356474d89a715e8ba42eae7208a4d22f9ff1a7c1b2ce4e91cf0936b14cefba33652563a1c8236959d5ba8 WHIRLPOOL 457a1ca3efa801104b8248196b58c3873b311d3a0ac4e166238dd47017cbc18d01f000536f6c57f65934175bd4083c3fc3ad12f99232fe5a9e42a71c4e92530b
 DIST cdbackup-0.7.1.tar.gz 22710 SHA256 b9d94acd0065c243b2a9d5a47af768ddae003f81a181a61155065a11bb59449c SHA512 9246295090a7d52ff452d5d24a429f2a21179e4d8deb4e9d6f2ab607dd04230830e3524f25d0180e36f62c7f7f87dec11cb3c1c01cde51708d467d6e0a4afc8f WHIRLPOOL 4267f0b48c6835efc8ac4ee2851febdc149985fc466321c25a840a6539348941baf6c43c4e4425a4eb004c5cdf312e10a560a0e3a8ddceb4fa8442c485ec606e
--- a/app-backup/cdbackup/cdbackup-0.7.0.ebuild
+++ b/app-backup/cdbackup/cdbackup-0.7.0.ebuild
@ -1,34 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit toolchain-funcs
-
-DESCRIPTION="Allows streaming backup utilities to dump/restore from CD-R(W)s or DVD(+/-RW)s"
-HOMEPAGE="http://www.muempf.de/index.html"
-SRC_URI="http://www.muempf.de/down/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=app-cdr/cdrtools-1.11.28"
-DEPEND=""
-
-src_unpack() {
-	unpack ${A}
-
-	sed -i -e '/cd\(backup\|restore\)/,+1 s:CFLAGS:LDFLAGS:' \
-		"${S}"/Makefile || die "sed Makefile failed"
-}
-
-src_compile() {
-	emake CFLAGS="${CFLAGS}" CC="$(tc-getCC)" || die "make failed"
-}
-
-src_install() {
-	dobin cdbackup cdrestore || die "dobin failed"
-	doman cdbackup.1 cdrestore.1 || die "doman failed"
-	dodoc CHANGES CREDITS README || die "dodoc failed"
-}
--- a/app-backup/dar/Manifest
+++ b/app-backup/dar/Manifest
@ -1,8 +1,6 @@
-DIST dar-2.3.8.tar.gz 1195944 SHA256 ae0b03440a218e674cbfdd0c3b3c419b5a628db616c8d3a06e70ef496dda25d3 SHA512 7815e587898973b6360a788c1851d6c66617bbc88f615f0575a39e737486218b11c44662332e24305a40e2f4dd33794c3aa77691a27c25c0ec50043cc4fc3a18 WHIRLPOOL fc9a4fcc7cf5c61d708109e708845db244ebcd01d084cb5d1dc50d42a039d66178cdcfeb41ca5005f16d5eff48fc2cacb8bb811c3dcbe3a7d66b7002a8f30e9d
 DIST dar-2.4.10.tar.gz 1760827 SHA256 c00111b60264d9ae957c8a2b80fe889ec8803b62b98510c38cd8f9e74be0a15c SHA512 d5fb8dacc813027aded4e2ad9b84506bf18bd89b8412704170d655b1f1249f0f7404696c577532e140b0fd3026a1a285abc0c4ccad0618c7d02c052498aa4be6 WHIRLPOOL 818fe0d20ff88caec5428e4895ca2bd4a0ea2665a76a00f26af8bfd3011710c11fc07c848435a1e78feef372a14c1647bfbd78163b9e00aa2b497cee92463d63
 DIST dar-2.4.11.tar.gz 1760715 SHA256 c15fd11cc339363c25cbf24594eaa571235e00de60b6034a7a58d299ed864a5f SHA512 b1fc364083158f235610cc1860eb63f7147b3f268f2c2d6ec3a36e3d2c1e2cbe21ea7fa4d7ee7a9bc5d6b0c5dacaa9a0fa448225be67edda7f04cb364a374d50 WHIRLPOOL 9f9c57b34ec82cea37d6dd64bc4ee23f7b221dd2e6e52bdd5ffe78f75834b069b9033b2716391fe3453505224af5c49514c989685c3ae8730e67c7cf57b541ab
 DIST dar-2.4.12.tar.gz 1799320 SHA256 6bc4bec5692f970d58a649905afeabc0b4a8e10c9604cd6d16e7205ef343cf55 SHA512 3d0123ae51c275daae1a13a6a1ebc51bf4587fbd95bf99615b9563e00762c6437a438f7a76124ea2f4990386acf6231f42e52a428fa052b144b91690d6943429 WHIRLPOOL 221d51b4125da1f005e962b33a6d685cc929af56e379327554a8254e34f57d25acd0cd3bf49514e704000062b514756be1a516704a11560149a2856bd776431d
 DIST dar-2.4.13.tar.gz 1799774 SHA256 f3b2c3c7ad615b76683f8cdb6d025576f4373c75b9e37a9f340536054350c97a SHA512 28308101f5d73b7bb7ea181fc1df129ea2be888404d301b156938f8cfc47ed1ed2819be058ce910795c937c8bc267305e7e080c2b80f81a18df95ab9cfb7ad07 WHIRLPOOL 6a4b67d6da717e98c3f55df1589055435c92b5849e5f2b337beae96f0c2651a8b99db2c745b6bd739232c156ed04b83d3fa6e208836081a77681bd02e14bc1d6
 DIST dar-2.4.17.tar.gz 1800050 SHA256 5d861c39698b77124680914741e1e40e7e9bedb3fcedc6df8d468e619479833c SHA512 9f991c2801948ca52cbd78222f0a7e807e157efba8f32349ab802b40e8fef10e01e39a5ee581ce5c770e50d69562800c5bfbd0229e2d5d679823d08a5ee31afe WHIRLPOOL cb65f558d70307335b7337154a0fa840935f740bab02ebb91c6904db8b33ac30af97f68befa979bf447aeb54ee4cc53bf49d996fef05d9233f7cdda405beb884
-DIST dar-2.4.2.tar.gz 1741695 SHA256 38fe1b324550d856fb58684a7e471d00afabeee54cf97ed7ae9c3cc67af26c33 SHA512 9c5c1dd7b562571744f3ebdf13d951053b9122679b9f82b5c424d6978cc45993d23304fb79a044063e3d711a4db46c804873cc3d92702c542fbe804d246cb896 WHIRLPOOL ec4d3097d41f7207df94889f4d2b46d7e716e24540942372008fbab6e01dd6617385cccef34e71665d710751b52a8da783ed17d616f86fd2a5597e79b36927d0
 DIST dar-2.4.9.tar.gz 1751738 SHA256 3d11159a290886dde968e16d36f32fa8640029708457bc87cc0da6d0eac71643 SHA512 9a9b972599747493694fd838bafaa690e70490b5c500f084f0d0225e93a54ce40d61bc495827519c88f6a94542b88a1be5d11e5a98e672abe8659364d1b4c51f WHIRLPOOL f700bf7bd393e6dc2cce11e7bc56af0f130ea3fb714de04617a940ec15d6174c06b7a1051eb9c6ffa7a0ec686b1f13c288af1b541d49b332932743d0d617b56b
--- a/app-backup/dar/dar-2.3.8.ebuild
+++ b/app-backup/dar/dar-2.3.8.ebuild
@ -1,63 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit flag-o-matic
-
-DESCRIPTION="A full featured backup tool, aimed for disks (floppy,CDR(W),DVDR(W),zip,jazz etc.)"
-HOMEPAGE="http://dar.linux.free.fr/"
-SRC_URI="mirror://sourceforge/dar/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
-IUSE="acl dar32 dar64 doc nls ssl"
-
-RDEPEND=">=sys-libs/zlib-1.2.3
-	>=app-arch/bzip2-1.0.2
-	acl? ( sys-apps/attr )
-	nls? ( virtual/libintl )
-	ssl? ( dev-libs/openssl )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	doc? ( app-doc/doxygen )"
-
-pkg_setup() {
-	if use dar32 && use dar64 ; then
-		eerror "dar32 and dar64 cannot be enabled together."
-		eerror "Please remove one of them and try the emerge again."
-		die "Please remove dar32 or dar64."
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i -e '/^dist_noinst_DATA/s/$/ macro_tools.hpp/' \
-		-e '/^noinst_HEADERS/s/macro_tools.hpp//' \
-		src/libdar/Makefile* || die
-}
-
-src_compile() {
-	local myconf="--disable-upx"
-
-	# Bug 103741
-	filter-flags -fomit-frame-pointer
-
-	use acl || myconf="${myconf} --disable-ea-support"
-	use dar32 && myconf="${myconf} --enable-mode=32"
-	use dar64 && myconf="${myconf} --enable-mode=64"
-	use doc || myconf="${myconf} --disable-build-html"
-	# use examples && myconf="${myconf} --enable-examples"
-	use nls || myconf="${myconf} --disable-nls"
-	use ssl || myconf="${myconf} --disable-libcrypto-linking"
-
-	econf ${myconf} || die
-	emake || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" pkgdatadir=/usr/share/doc/${PF}/html install || die
-
-	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
-}
--- a/app-backup/dar/dar-2.4.2.ebuild
+++ b/app-backup/dar/dar-2.4.2.ebuild
@ -1,68 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-inherit confutils eutils flag-o-matic
-
-DESCRIPTION="A full featured backup tool, aimed for disks (floppy,CDR(W),DVDR(W),zip,jazz etc.)"
-HOMEPAGE="http://dar.linux.free.fr/"
-SRC_URI="mirror://sourceforge/dar/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux"
-IUSE="acl dar32 dar64 doc gcrypt lzo nls static static-libs"
-
-RESTRICT="test" # need to be run as root
-
-RDEPEND=">=sys-libs/zlib-1.2.3
-	>=app-arch/bzip2-1.0.2
-	acl? (
-		static? ( sys-apps/attr[static-libs] )
-		!static? ( sys-apps/attr )
-	)
-	gcrypt? ( dev-libs/libgcrypt:0 )
-	lzo? ( dev-libs/lzo )
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	doc? ( app-doc/doxygen )"
-
-pkg_setup() {
-	confutils_use_conflict dar32 dar64
-}
-
-src_configure() {
-	local myconf="--disable-upx"
-
-	# Bug 103741
-	filter-flags -fomit-frame-pointer
-
-	use acl || myconf="${myconf} --disable-ea-support"
-	use dar32 && myconf="${myconf} --enable-mode=32"
-	use dar64 && myconf="${myconf} --enable-mode=64"
-	use doc || myconf="${myconf} --disable-build-html"
-	# use examples && myconf="${myconf} --enable-examples"
-	use gcrypt || myconf="${myconf} --disable-libgcrypt-linking"
-	use lzo || myconf="${myconf} --disable-liblzo2-linking"
-	use nls || myconf="${myconf} --disable-nls"
-	if ! use static ; then
-		myconf="${myconf} --disable-dar-static"
-		if ! use static-libs ; then
-			myconf="${myconf} --disable-static"
-		fi
-	fi
-
-	econf ${myconf} || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" pkgdatadir="${EPREFIX}"/usr/share/doc/${PF}/html install || die
-
-	if ! use static-libs ; then
-		find "${ED}" "(" -name '*.la' -o -name '*.a' ")" -delete || die
-	fi
-
-	dodoc AUTHORS ChangeLog NEWS README THANKS TODO || die
-}
--- a/app-backup/mylvmbackup/Manifest
+++ b/app-backup/mylvmbackup/Manifest
@ -1,3 +1 @@
-DIST mylvmbackup-0.11.tar.gz 33481 SHA256 9ea7d7707389ff8928dd9afdb7d1321c8c93886a52e98b3ff76500ffbb3eb9b5 SHA512 cb293b8c2ee0b8a7ac9f5d47ece6292a2c441e61da76117e2b41b616ddca16a808b102a062d467e677274857c3bdac3bb9be712c5db0eca4690ff705114177e0 WHIRLPOOL 4431400149ecd6f9fc71ef2eb3dc63541fa213b5e75781abbac1946a73b7b5c783aeb063dac4160addb0ee198c4d8442732f8126f6cb5810a544234bb1df606a
-DIST mylvmbackup-0.13.tar.gz 37121 SHA256 03855cc0da77e95c0d7917228a9ef4a262ca6c450cb0c0265fa6f90c9f154e1d SHA512 02c21f0c729ff1acf571356547c703f4db3336ffc2bfffec7508e83d43b4beda1ca8e06a407936b847d57dc33b8a1d80872c6827984f80b327770c6942b31c32 WHIRLPOOL bf222ca5883d28872761ff95baebd59d20479b7be04b08af08567424f079a564b98764c0752109c78141786a09765148e4d58234d4e9ed53204e9d8f0b2e5794
 DIST mylvmbackup-0.14.tar.gz 57338 SHA256 a979082f525f5b0b44bd09169938f2b5d8394fc403fc8b6a6e8b809d7c1a5724 SHA512 e61f0c4e24b5482b2f7f4213e810a32776d1b39f589e27c309a4940943f3a9519041e53cf85a089a94100e2cc81715a033682bbe071220d755c14211b4177bfa WHIRLPOOL 004f32793e69b2c34f940b5ef91302468cafce76618f5d6f460bcaa37d0203200ee707bece883b130adb7cc8aecfc5b2c3a389051020e7465d6ebf1be37b67e1
--- a/app-backup/mylvmbackup/mylvmbackup-0.11.ebuild
+++ b/app-backup/mylvmbackup/mylvmbackup-0.11.ebuild
@ -1,31 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-DESCRIPTION="mylvmbackup is a tool for quickly creating backups of MySQL server's data files using LVM snapshots"
-HOMEPAGE="http://lenzg.net/mylvmbackup/"
-SRC_URI="http://lenzg.net/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
-IUSE=""
-DEPEND=">=app-text/asciidoc-8.1.0"
-RDEPEND="dev-perl/Config-IniFiles
-		>=sys-fs/lvm2-2.02.06
-		dev-perl/DBD-mysql
-		virtual/mysql
-		dev-perl/TimeDate"
-
-src_unpack() {
-	unpack ${A}
-	sed -i \
-		-e '/^prefix/s,/usr/local,/usr,' \
-		"${S}"/Makefile
-}
-
-src_install() {
-	emake -j1 install DESTDIR="${D}" mandir="/usr/share/man" || die
-	dodoc ChangeLog README TODO
-	keepdir /var/tmp/${PN}/{backup,mnt}
-	fperms 0700 /var/tmp/${PN}/
-}
--- a/app-backup/mylvmbackup/mylvmbackup-0.13.ebuild
+++ b/app-backup/mylvmbackup/mylvmbackup-0.13.ebuild
@ -1,32 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-DESCRIPTION="mylvmbackup is a tool for quickly creating backups of MySQL server's data files using LVM snapshots"
-HOMEPAGE="http://lenzg.net/mylvmbackup/"
-SRC_URI="http://lenzg.net/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
-IUSE=""
-DEPEND=""
-RDEPEND="dev-perl/Config-IniFiles
-		>=sys-fs/lvm2-2.02.06
-		dev-perl/DBD-mysql
-		virtual/mysql
-		dev-perl/TimeDate"
-
-src_unpack() {
-	unpack ${A}
-	sed -i \
-		-e '/^prefix/s,/usr/local,/usr,' \
-		"${S}"/Makefile
-	sed -i 's|mycnf=/etc/my.cnf|mycnf=/etc/mysql/my.cnf|' "${S}"/mylvmbackup.conf
-}
-
-src_install() {
-	emake install DESTDIR="${D}" mandir="/usr/share/man" || die
-	dodoc ChangeLog README TODO
-	keepdir /var/tmp/${PN}/{backup,mnt}
-	fperms 0700 /var/tmp/${PN}/
-}
--- a/app-backup/rdiff-backup/Manifest
+++ b/app-backup/rdiff-backup/Manifest
@ -1,2 +1 @@
-DIST rdiff-backup-1.2.8.tar.gz 196526 SHA256 0d91a85b40949116fa8aaf15da165c34a2d15449b3cbe01c8026391310ac95db SHA512 4230bdfca7fc2a5ffd7bdc92ca899cde3276042115b4f488255a201e6ea361eab4ce4ebaae15841c357f189e1c88ad037e2727dec0a05c61b1c6016fa807739c WHIRLPOOL 7ca049a78ac3d19083cfc08bfc09348837179e9c0cb151293e1cc972df48a21a9885d89bbeb2c9cacb443f5a8267df6720dce10c4673710bbcc51b98658df9ff
 DIST rdiff-backup-1.3.3.tar.gz 198412 SHA256 ee030ce638df0eb1047cf72578e0de15d9a3ee9ab24da2dc0023e2978be30c06 SHA512 e2731464a6ff146cdecac49d2d99275dc5e6b4a3ff5b8209fe6dc71fd80cdbf573d029531325a879e9a169c12b31568f75fdcb812f53df33896784c5bc550280 WHIRLPOOL 04f3257c8a1dd6b8c81ec1f7d3fb7d1e4bba9bb97020b0932d2a72d9279924147ec98c74e5f9952b5c14c50675ac03f7d7956875ce58c1e677571c9cfab57f89
--- a/app-backup/rdiff-backup/rdiff-backup-1.2.8-r1.ebuild
+++ b/app-backup/rdiff-backup/rdiff-backup-1.2.8-r1.ebuild
@ -1,32 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython"
-
-inherit distutils eutils
-
-DESCRIPTION="Remote incremental file backup utility; uses librsync's rdiff utility to create concise, versioned backups"
-HOMEPAGE="http://www.nongnu.org/rdiff-backup/"
-SRC_URI="http://savannah.nongnu.org/download/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 sh sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="acl xattr"
-
-DEPEND="~net-libs/librsync-0.9.7
-		!arm? ( xattr? ( dev-python/pyxattr )
-				acl? ( dev-python/pylibacl ) )"
-RDEPEND="${DEPEND}"
-
-DOCS="examples.html"
-PYTHON_MODNAME="rdiff_backup"
-
-src_prepare() {
-	distutils_src_prepare
-	epatch "${FILESDIR}"/rdiff-backup-1.2.8-popen2.patch
-}
--- a/app-backup/rdiff-backup/rdiff-backup-1.3.3.ebuild
+++ b/app-backup/rdiff-backup/rdiff-backup-1.3.3.ebuild
@ -1,27 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython"
-
-inherit distutils
-
-DESCRIPTION="Remote incremental file backup utility; uses librsync's rdiff utility to create concise, versioned backups"
-HOMEPAGE="http://www.nongnu.org/rdiff-backup/"
-SRC_URI="http://savannah.nongnu.org/download/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~mips ppc ppc64 sh sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="acl xattr"
-
-DEPEND="~net-libs/librsync-0.9.7
-		!arm? ( xattr? ( dev-python/pyxattr )
-				acl? ( dev-python/pylibacl ) )"
-RDEPEND="${DEPEND}"
-
-DOCS="examples.html"
-PYTHON_MODNAME="rdiff_backup"
--- a/app-benchmarks/ltp/Manifest
+++ b/app-benchmarks/ltp/Manifest
@ -1,5 +1,3 @@
-DIST ltp-20130503.tar.gz 4698775 SHA256 34519b6365cae24f8d8bb8a4ec0955d83999b1a4685d87305191cf2be7a2b5a1 SHA512 36ad9f808b41f6f4ee983cd697415ab8883e569268759c249eb680e8aab4147a1425407769af2b3643c117889b8b5da385cbabffe55d2fe04c00e46ef6f71a0e WHIRLPOOL a69888c7e887ba1fbb60811cb5e7b41a7444e0b367fe72fd4ec1c0e6d8f2931577edeac40d8008dae8d8a547cbff013f14dda6540da03f8017cc27ee528c9a66
-DIST ltp-20140828.tar.gz 4690629 SHA256 95febd3db2c33d74b180c532f8bf9a9bac3ce27e2603aee28cad15f85834cde9 SHA512 e685f109d0e74bfd2bcd7604c744872967d3a6d34d5fa8ee87867501da1162b27777f0c3c099836d9d14b2eab319bad6da87cb2e3fabec478cf95b692b4e2fe8 WHIRLPOOL 5cff0a5ef887135f8b1baa4f10df54f5422a22f71a5d417b1c25f0c2b8c9e40d238d743216e2128b6f30ab97b1949df168320198e991a20c455e3c669efb626b
 DIST ltp-20150119.tar.gz 4695541 SHA256 6cba3476e5bef74d21979c45d0629632bfaeaafc4dbbebccd187ba7b6b9dca52 SHA512 5e5624738da08a3f5f5b08d821a73666d6ef9957b62ff72bd12aba0d021c304dae5652956a6af60aa593256cadd98f061759d5a65045ff5b1864956ea5ad5186 WHIRLPOOL 0417bf1c41347aca68b9e9fb3b203c209f36112ecdf7f020d32060ac637949b1cf40e437f976352ebca1d4566394abe2149b14ad946e1fa2f37cf68397c3e610
 DIST ltp-20150420.tar.gz 4673384 SHA256 65a6ed64d55edc77f0ff690e269dc3ef32290d4499ccbb8f24b2cf59dd974408 SHA512 a5d259cf2a984eae1a0e6b7be538f06eb6021e0f961bb7683aaafc1bad347e73690fa5d6ae39beb6c92c9ea69e4160841d0e46ac49ccfa77053f1c7a0a854099 WHIRLPOOL 7d0b26c8a1f99cea1a609545671d6160278cf81c4654fff7dba84688e37b6f6349e3a2b90cb44ef7abf5c7cfad2187543431df23dd5833917f8b446db8425aec
 DIST ltp-20150903.tar.gz 4680969 SHA256 e670ae9f1e42bc8b500edd3c3a5cf09c6447c56d7738a22235c87a13739bcace SHA512 9d52e1f82e2052ec4ed8dde9e246fd1b9dc1b665110e7a20f11de741d41f024e85443571846efe3181592e7bf3b63ed88e9ae9878c5c6f4f759171b245948ef2 WHIRLPOOL 0665affbb226ccf26028818220c41d965c20e2bf257347f01ac6e90f6f8d6f579c4fb1a0d3154d3773b4189787c7e0d99cc6b06f873cff2b6c44a0c1de777d0c
--- a/app-benchmarks/ltp/ltp-20130503.ebuild
+++ b/app-benchmarks/ltp/ltp-20130503.ebuild
@ -1,77 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit autotools eutils readme.gentoo
-
-DESCRIPTION="A testsuite for the linux kernel"
-HOMEPAGE="http://linux-test-project.github.io/"
-SRC_URI="https://github.com/linux-test-project/ltp/archive/20130503.tar.gz -> ${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64 ~hppa ~ppc ~x86"
-IUSE="expect perl pm open-posix python rt"
-
-DEPEND="expect? ( dev-tcltk/expect )
-	perl? ( dev-lang/perl )
-	python? ( dev-lang/python )"
-
-RESTRICT="test"
-
-pkg_setup() {
-	# Don't create groups
-	export CREATE=0
-
-	DOC_CONTENTS="LTP requires root access to run the tests.
-		The LTP root directory is located in /opt/${PN}.
-		For more information please read the ltp-howto located in
-		/usr/share/doc/${PF}"
-}
-
-src_prepare() {
-	# regenerate
-	AT_M4DIR="m4" eautoreconf
-}
-
-src_configure() {
-	# FIXME: improve me
-	local myconf=
-	use open-posix && myconf+="--with-open-posix-testsuite "
-	use pm && mytconf+="--with-power-management-testsuite "
-	use rt && myconf+="--with-realtime-testsuite "
-	use perl && myconf+="--with-perl "
-	use python && myconf+="--with-python "
-	use expect && myconf+="--with-expect "
-
-	# Better put it into /opt/${PN} as everything needs to
-	# be under the same directory..
-
-	econf --prefix=/opt/${PN} ${myconf}
-}
-
-src_compile() {
-	# Posix testsuite does not seem to build with -j>1
-	# Is this maintained anymore?
-	if use open-posix; then
-		export MAKEOPTS="-j1"
-	fi
-	emake
-}
-
-src_install() {
-	default
-	dosym /usr/libexec/${PN}/runltp /usr/bin/runltp
-	# install docs
-	dodoc doc/MaintNotes
-	for txt in doc/*.txt; do
-		dodoc ${txt}
-	done
-	dodoc -r doc/examples doc/testcases
-	dohtml -r doc/automation-*.html
-	doman doc/man1/*.1
-	doman doc/man3/*.3
-	readme.gentoo_create_doc
-}
--- a/app-benchmarks/ltp/ltp-20140828.ebuild
+++ b/app-benchmarks/ltp/ltp-20140828.ebuild
@ -1,79 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit autotools eutils readme.gentoo
-
-DESCRIPTION="A testsuite for the linux kernel"
-HOMEPAGE="http://linux-test-project.github.io/"
-SRC_URI="https://github.com/linux-test-project/ltp/archive/20140828.tar.gz -> ${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64 ~hppa ~ppc ~x86"
-IUSE="expect perl pm open-posix python rt"
-
-DEPEND="expect? ( dev-tcltk/expect )
-	perl? ( dev-lang/perl )
-	python? ( dev-lang/python )"
-
-RESTRICT="test"
-
-pkg_setup() {
-	# Don't create groups
-	export CREATE=0
-
-	DOC_CONTENTS="LTP requires root access to run the tests.
-		The LTP root directory is located in /opt/${PN}.
-		For more information please read the ltp-howto located in
-		/usr/share/doc/${PF}"
-}
-
-src_prepare() {
-	# regenerate
-	AT_M4DIR="m4" eautoreconf
-}
-
-src_configure() {
-	# FIXME: improve me
-	local myconf=
-	use open-posix && myconf+="--with-open-posix-testsuite "
-	use pm && mytconf+="--with-power-management-testsuite "
-	use rt && myconf+="--with-realtime-testsuite "
-	use perl && myconf+="--with-perl "
-	use python && myconf+="--with-python "
-	use expect && myconf+="--with-expect "
-	# Prevent any kernel stuff for now as it leads to sandbox violations
-	myconf+="--without-modules --with-linux-dir=/dev/null"
-
-	# Better put it into /opt/${PN} as everything needs to
-	# be under the same directory..
-
-	econf --prefix=/opt/${PN} ${myconf}
-}
-
-src_compile() {
-	# Posix testsuite does not seem to build with -j>1
-	# Is this maintained anymore?
-	if use open-posix; then
-		export MAKEOPTS="-j1"
-	fi
-	emake
-}
-
-src_install() {
-	default
-	dosym /usr/libexec/${PN}/runltp /usr/bin/runltp
-	# install docs
-	dodoc doc/MaintNotes
-	for txt in doc/*.txt; do
-		dodoc ${txt}
-	done
-	dodoc -r doc/testcases
-	dohtml -r doc/automation-*.html
-	doman doc/man1/*.1
-	doman doc/man3/*.3
-	readme.gentoo_create_doc
-}
--- a/app-cdr/dvdisaster/Manifest
+++ b/app-cdr/dvdisaster/Manifest
@ -1,2 +1 @@
-DIST dvdisaster-0.72.2.tar.bz2 4145193 SHA256 62d00c399c99a3bba493405174aeb96bd8c2d428d01d24b46858a55531b725ae SHA512 5283c5a0f9120a02434c8561f130d497db8eb7dab646f12d9cba9bc3a3ffa97974d783a9a8c67fb0669bba9ab5306545457c29e64b6a6e7a2722d1833dbcba11 WHIRLPOOL b1732e89f11e3e2f29bfa0fc661502eae4c10eb27d6186ca0a79405ca3e40388a2499b9990046fe002717b76332437978b0bcc8ef1cc421fbcbb1abf85198d2e
 DIST dvdisaster_0.72.4.orig.tar.bz2 5097738 SHA256 444763bc40bcc8c396ecd7af0d5d6dd8c458009d4ed62af74ef54074541aa05e SHA512 aa0a9f3040d45b16a9117b2b6756d2423cf55db4a00e8314a164f6dc32863cd4e5a5b5ec009a56782aa2afe6031e3a32954014101abc67291428e9edea1b5272 WHIRLPOOL 888b9643e4102e4c7f237b336bbead60fd02833357775f586766672ea182ce680615a74f9547cf015b3e0edb269fe905a4dd5f28cbf765f3c7f114e097736208
--- a/app-cdr/dvdisaster/dvdisaster-0.72.2.ebuild
+++ b/app-cdr/dvdisaster/dvdisaster-0.72.2.ebuild
@ -1,88 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-inherit eutils gnome2-utils versionator
-
-MY_P=${PN}-$(replace_version_separator 2 '.')
-
-DESCRIPTION="Data-protection and recovery tool for DVDs"
-HOMEPAGE="http://dvdisaster.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 ppc x86"
-SLOT="0"
-IUSE="debug linguas_cs linguas_de linguas_it linguas_ru cpu_flags_x86_sse2"
-
-RDEPEND=">=x11-libs/gtk+-2.6:2
-	media-libs/libpng
-	sys-libs/zlib"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.72.1-libpng15.patch
-}
-
-# - There is no autotools, use_ functions won't work
-# - NLS disabled because sys-devel/gettext fails, if you enable it
-# you need also virtual/libintl because it links to it for FreeBSD
-src_configure() {
-	local myconf
-
-	if use cpu_flags_x86_sse2; then
-		myconf+=" --with-sse2=yes"
-	else
-		myconf+=" --with-sse2=no"
-	fi
-
-	use debug && myconf+=" --with-memdebug=yes"
-
-	./configure \
-		--prefix=/usr \
-		--bindir=/usr/bin \
-		--mandir=/usr/share/man \
-		--docdir=/usr/share/doc \
-		--docsubdir=${PF} \
-		--localedir=/usr/share/locale \
-		--buildroot="${D}" \
-		--with-nls=no \
-		${myconf} || die
-}
-
-src_install() {
-	emake install
-
-	newicon contrib/${PN}48.png ${PN}.png
-	make_desktop_entry ${PN} ${PN} ${PN} "System;Utility"
-
-	for res in 16 32 48 64; do
-		insinto /usr/share/icons/hicolor/${res}x${res}/apps
-		newins contrib/${PN}${res}.png ${PN}.png
-	done
-
-	local dest="${D}/usr/share"
-
-	for lang in cs de it ru; do
-		use linguas_${lang} || rm -rf ${dest}/doc/${PF}/${lang} \
-			${dest}/doc/${PF}/CREDITS.${lang} ${dest}/man/${lang}
-	done
-
-	rm -f "${D}"/usr/bin/*.sh
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
--- a/app-crypt/libu2f-host/libu2f-host-1.0.0-r1.ebuild
+++ b/app-crypt/libu2f-host/libu2f-host-1.0.0-r1.ebuild
@ -0,0 +1,64 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools-utils linux-info udev user
+
+DESCRIPTION="Yubico Universal 2nd Factor (U2F) Host C Library"
+HOMEPAGE="https://developers.yubico.com/libu2f-host/"
+SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.xz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="kernel_linux static-libs systemd"
+
+RDEPEND="
+	dev-libs/hidapi
+	dev-libs/json-c"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+RDEPEND="${RDEPEND}
+	systemd? ( sys-apps/systemd[acl] )"
+
+CONFIG_CHECK="~HIDRAW"
+
+pkg_setup() {
+	# The U2F device node will be owned by group 'plugdev'
+	# in non-systemd configurations
+	if ! use systemd; then
+		enewgroup plugdev
+	fi
+}
+
+src_prepare() {
+	autotools-utils_src_prepare
+
+	sed -e 's:TAG+="uaccess":MODE="0664", GROUP="plugdev":g' \
+		70-u2f.rules > 70-u2f-udev.rules || die
+}
+
+src_configure() {
+	autotools-utils_src_configure
+}
+
+src_install() {
+	autotools-utils_src_install
+
+	if use kernel_linux; then
+		if use systemd; then
+			udev_dorules 70-u2f.rules
+		else
+			udev_newrules 70-u2f-udev.rules 70-u2f.rules
+		fi
+	fi
+}
+
+pkg_postinst() {
+	if ! use systemd; then
+		elog "Users must be a member of the 'plugdev' group"
+		elog "to be able to access U2F devices"
+	fi
+}
--- a/app-forensics/afflib/Manifest
+++ b/app-forensics/afflib/Manifest
@ -1,3 +1 @@
-DIST afflib-3.7.1.tar.gz 779366 SHA256 7759a36259a070ae087da43a94f23d4026de871e16144d8c32d7b446f5155db2 SHA512 695b5535b7cbe6e1f9b702b40f8606e2dbb604761e2617cc88a61d99f7e296f0dccdf8f21c03bdb79ce5d1fcce543b3d5d23e6bb5c99e31d094e838c16a9443b WHIRLPOOL e6b8c8022cf1405bc4db8697fb20b2e4e21d7b90a3d035acfc56cc6afd742af86d1cffa998903af6ec53b6e370fe8c87e1fcf3188d005c6a7dd56b1cff3ec591
-DIST afflib-3.7.3.tar.gz 569264 SHA256 0bc786efbe4443ee0935eaedf8813d5ba00194dbe8c3340923cb7e38a3120978 SHA512 6c626c01aa8a8a0df47d7a34f14ad25ae818fdf49f142d36a624f747a54cbba88cbf32b8fdb541b37e41b5c28549343e81b4c26b4802299bc6111c6c04cdf6f9 WHIRLPOOL 8775f5e5be09673315002fe5ae74d277c049b109d0d35a2f40af84f68c54d8a9a1b2865e2f792394cbdd403af55e0d7e21f9b3a725d9796d01c855d6c8b26447
 DIST afflib-3.7.4.tar.gz 569346 SHA256 74934ae60a76616442f1d593bdeb93dd6aa105b5dc8cee7e8e5d7529a77f46c0 SHA512 58791388a05d614dd5f219a74173de2ff0938a1f93b21e2dd0731aca52ea544ba60cc4325f0d284937467ce600a4302b7a2f724d84710ecc7f12db1a22a8e41c WHIRLPOOL db8d5f48aecc55bd4ee0e6f45552e37e6aa1621674d93a448ae5a5a6b3bba1ae9c40d8aac2211b6e27bf1ba72e1c998b9bb01e6c24298ef4287d7a117db9d820
--- a/app-forensics/afflib/afflib-3.7.1.ebuild
+++ b/app-forensics/afflib/afflib-3.7.1.ebuild
@ -1,64 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-PYTHON_DEPEND="python? 2"
-AUTOTOOLS_AUTORECONF=1
-
-inherit autotools-utils python
-
-DESCRIPTION="Library that implements the AFF image standard"
-HOMEPAGE="https://github.com/simsong/AFFLIBv3"
-SRC_URI="mirror://github/simsong/AFFLIBv3/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 hppa ppc x86"
-IUSE="fuse ncurses python qemu readline s3 static-libs threads"
-
-RDEPEND="dev-libs/expat
-	dev-libs/openssl:0
-	sys-libs/zlib
-	fuse? ( sys-fs/fuse )
-	ncurses? ( sys-libs/ncurses )
-	readline? ( sys-libs/readline:0 )
-	s3? ( net-misc/curl )"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-python-module.patch
-	"${FILESDIR}"/${PN}-3.6.12-pyaff-header.patch
-)
-
-pkg_setup() {
-	if use python ; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
-}
-
-src_prepare() {
-	sed -e '/FLAGS/s: -g::' \
-		-e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' \
-		-i configure.ac || die
-
-	sed -i -e '/-static/d' tools/Makefile.am || die
-
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	# Hacks for automagic dependencies
-	use ncurses || export ac_cv_lib_ncurses_initscr=no
-	use readline || export ac_cv_lib_readline_readline=no
-
-	local myeconfargs=(
-		$(use_enable fuse)
-		$(use_enable python)
-		$(use_enable qemu)
-		$(use_enable s3)
-		$(use_enable threads threading)
-	)
-	autotools-utils_src_configure
-}
--- a/app-forensics/afflib/afflib-3.7.3.ebuild
+++ b/app-forensics/afflib/afflib-3.7.3.ebuild
@ -1,66 +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=1
-AUTOTOOLS_PRUNE_LIBTOOL_FILES=modules
-
-inherit autotools-utils python-single-r1
-
-MY_PN=AFFLIBv3
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Library that implements the AFF image standard"
-HOMEPAGE="https://github.com/simsong/AFFLIBv3/"
-SRC_URI="https://github.com/simsong/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86"
-IUSE="fuse ncurses python qemu readline s3 static-libs threads"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="dev-libs/expat
-	dev-libs/openssl:0
-	sys-libs/zlib
-	fuse? ( sys-fs/fuse )
-	ncurses? ( sys-libs/ncurses )
-	python? ( ${PYTHON_DEPS} )
-	readline? ( sys-libs/readline:0 )
-	s3? ( net-misc/curl )"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.7.1-python-module.patch
-	"${FILESDIR}"/${PN}-3.6.12-pyaff-header.patch
-)
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	sed -i '/FLAGS/s: -g::' configure.ac || die
-	sed -i '/-static/d' tools/Makefile.am || die
-
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	# Hacks for automagic dependencies
-	use ncurses || export ac_cv_lib_ncurses_initscr=no
-	use readline || export ac_cv_lib_readline_readline=no
-
-	local myeconfargs=(
-		$(use_enable fuse)
-		$(use_enable python)
-		$(use_enable qemu)
-		$(use_enable s3)
-		$(use_enable threads threading)
-	)
-	autotools-utils_src_configure
-}
--- a/app-forensics/aide/Manifest
+++ b/app-forensics/aide/Manifest
@ -1,3 +1,2 @@
-DIST aide-0.13.1.tar.gz 285400 SHA256 b55065413bad3c24af51a551e6ab7cd4a9ecd9f449929261a45fc2f53e040021 SHA512 ac0e49c49d1a4229cf473a60e9acd8e7dc7c3ee7c2d436a3b3d486131753fd914a73695675de6e7f9bb5cdadb2ed64760a9e834c935fb1a5c65bae0d7efa2946 WHIRLPOOL 5d7ee3b2a062c2c91e603c72ed1d76a1fc9d16f13e8253bab0b5f6335de239ef7e44c453ffe22da86f5b0bc8a69e0bf6276a4a52a1928339899298f07f1769df
 DIST aide-0.14.2.tar.gz 418098 SHA256 bf4cd417b0f4778b4f9a618d23e0b0b7db10349ba6a0129394dc82fbc2fa8b9b SHA512 4ef96078fde057a54dda467fb55711e30d947969873715a02052362c57112f5bfd3155460ef353f70ce69fea3a3c491b7925bebbdb7034dbf618c63c360347df WHIRLPOOL fa91e4493bcac4cf11a8fedfd5e3c490752936f9ea04871d812b831f33089b694892e32ed19cef273926d3a8c091fb15a7b98a5e5303f08609f164773475d142
 DIST aide-0.15.1.tar.gz 424970 SHA256 303e5c186257df8c86e418193199f4ea2183fc37d3d4a9098a614f61346059ef SHA512 6afe327474858c697ba017b02bd40717c33874e69b801c171c2496ff9042b557e840bef4a151bda0e4d835ddb0d972b88790237a72f250525dc1fc6b8fa673e7 WHIRLPOOL 4c21221cfbaeff3aa00a3f22c4e31c1fffd3f00d112828540ab6ab94dd019086244de71e5d19d1120078acc7b81b9efa5a36d55937292f523bcb4e064830ba6a
--- a/app-forensics/aide/aide-0.13.1-r3.ebuild
+++ b/app-forensics/aide/aide-0.13.1-r3.ebuild
@ -1,146 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit autotools eutils
-
-DESCRIPTION="AIDE (Advanced Intrusion Detection Environment) is a replacement for Tripwire"
-HOMEPAGE="http://aide.sourceforge.net/"
-SRC_URI="mirror://sourceforge/aide/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-IUSE="acl curl mhash nls postgres selinux static xattr zlib"
-#IUSE="acl audit curl mhash nls postgres selinux static xattr zlib"
-
-# libsandbox:  Can't dlopen libc: (null)
-RESTRICT="test"
-
-DEPEND="acl? ( sys-apps/acl )
-	curl? ( net-misc/curl )
-	mhash? ( >=app-crypt/mhash-0.9.2 )
-	!mhash? ( dev-libs/libgcrypt )
-	nls? ( virtual/libintl )
-	postgres? ( dev-db/postgresql )
-	selinux? (
-		sys-libs/libselinux
-		sec-policy/selinux-aide
-	)
-	xattr? ( sys-apps/attr )
-	zlib? ( sys-libs/zlib )"
-#	audit? ( sys-process/audit )
-
-RDEPEND="!static? ( ${DEPEND} )"
-
-DEPEND="${DEPEND}
-	nls? ( sys-devel/gettext )
-	sys-devel/bison
-	sys-devel/flex"
-
-pkg_setup() {
-	if use mhash && use postgres ; then
-		eerror "We cannot emerge aide with mhash and postgres USE flags at the same time."
-		eerror "Please remove mhash OR postgres USE flags."
-		die "Please remove either mhash or postgres USE flag."
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${P}-gentoo.patch"
-
-	# fix configure switch
-	epatch "${FILESDIR}/${P}-configure.patch"
-
-	# fix equal match issue, bug #204217
-	epatch "${FILESDIR}/${P}-equ-matching.patch"
-
-	# fix libgcrypt issue, bug #266175
-	epatch "${FILESDIR}/${P}-libgrypt_init.patch"
-
-	if ! use mhash ; then
-		# dev-libs/libgcrypt doesn't support whirlpool algorithm
-		sed -i -e 's/\+whirlpool//' doc/aide.conf.in || die
-	fi
-
-	if ! use selinux ; then
-		sed -i -e 's/\+selinux//' doc/aide.conf.in || die
-	fi
-
-	if ! use xattr ; then
-		sed -i -e 's/\+xattrs//' doc/aide.conf.in || die
-	fi
-
-	if ! use acl ; then
-		sed -i -e 's/\+acl//' doc/aide.conf.in || die
-	fi
-
-	eautoreconf
-}
-
-src_compile() {
-	local myconf="
-		$(use_with acl posix-acl)
-		$(use_with !mhash gcrypt)
-		$(use_with mhash mhash)
-		$(use_with nls locale)
-		$(use_with postgres psql)
-		$(use_with selinux)
-		$(use_enable static)
-		$(use_with xattr)
-		$(use_with zlib)
-		--sysconfdir=/etc/aide"
-#		$(use_with audit)
-
-	# curl doesn't work with static
-	use curl && ! use static && myconf="${myconf} --with-curl"
-
-	econf ${myconf} || die "econf failed"
-	# parallel make borked
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	keepdir /var/lib/aide
-	fowners root:0 /var/lib/aide
-	fperms 0755 /var/lib/aide
-
-	keepdir /var/log/aide
-
-	insinto /etc/aide
-	doins "${FILESDIR}"/aide.conf
-
-	dosbin "${FILESDIR}"/aideinit
-
-	dodoc ChangeLog AUTHORS NEWS README "${FILESDIR}"/aide.cron
-	dohtml doc/manual.html
-}
-
-pkg_postinst() {
-	elog
-	elog "A sample configuration file has been installed as"
-	elog "/etc/aide/aide.conf.  Please edit to meet your needs."
-	elog "Read the aide.conf(5) manual page for more information."
-	elog "A helper script, aideinit, has been installed and can"
-	elog "be used to make AIDE management easier. Please run"
-	elog "aideinit --help for more information"
-	elog
-
-	if use postgres; then
-		elog "Due to a bad assumption by aide, you must issue the following"
-		elog "command after the database initialization (aide --init ...):"
-		elog
-		elog 'psql -c "update pg_index set indisunique=false from pg_class \\ '
-		elog "  where pg_class.relname='TABLE_pkey' and \ "
-		elog '  pg_class.oid=pg_index.indexrelid" -h HOSTNAME -p PORT DBASE USER'
-		elog
-		elog "where TABLE, HOSTNAME, PORT, DBASE, and USER are the same as"
-		elog "your aide.conf."
-		elog
-	fi
-}
--- a/app-forensics/aide/aide-0.13.1-r5.ebuild
+++ b/app-forensics/aide/aide-0.13.1-r5.ebuild
@ -1,152 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit autotools eutils
-
-DESCRIPTION="AIDE (Advanced Intrusion Detection Environment) is a replacement for Tripwire"
-HOMEPAGE="http://aide.sourceforge.net/"
-SRC_URI="mirror://sourceforge/aide/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="acl curl mhash nls postgres selinux static xattr zlib"
-#IUSE="acl audit curl mhash nls postgres selinux static xattr zlib"
-
-# libsandbox:  Can't dlopen libc: (null)
-RESTRICT="test"
-
-DEPEND="acl? ( sys-apps/acl )
-	curl? ( net-misc/curl )
-	mhash? ( >=app-crypt/mhash-0.9.2 )
-	!mhash? ( dev-libs/libgcrypt )
-	nls? ( virtual/libintl )
-	postgres? ( dev-db/postgresql )
-	selinux? (
-		sys-libs/libselinux
-		sec-policy/selinux-aide
-	)
-	xattr? ( sys-apps/attr )
-	zlib? ( sys-libs/zlib )"
-#	audit? ( sys-process/audit )
-
-RDEPEND="!static? ( ${DEPEND} )"
-
-DEPEND="${DEPEND}
-	nls? ( sys-devel/gettext )
-	sys-devel/bison
-	sys-devel/flex"
-
-pkg_setup() {
-	if use mhash && use postgres ; then
-		eerror "We cannot emerge aide with mhash and postgres USE flags at the same time."
-		eerror "Please remove mhash OR postgres USE flags."
-		die "Please remove either mhash or postgres USE flag."
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${P}-gentoo.patch"
-
-	# fix configure switch
-	epatch "${FILESDIR}/${P}-configure.patch"
-
-	# fix equal match issue, bug #204217
-	epatch "${FILESDIR}/${P}-equ-matching.patch"
-
-	# fix libgcrypt issue, bug #266175
-	epatch "${FILESDIR}/${P}-libgrypt_init.patch"
-
-	# fix as-need issue, bug #271326
-	epatch "${FILESDIR}/${P}-as-needed.patch"
-
-	# fix zlib issue, bug #316665
-	epatch "${FILESDIR}/${P}-zlib.patch"
-
-	if ! use mhash ; then
-		# dev-libs/libgcrypt doesn't support whirlpool algorithm
-		sed -i -e 's/\+whirlpool//' doc/aide.conf.in || die
-	fi
-
-	if ! use selinux ; then
-		sed -i -e 's/\+selinux//' doc/aide.conf.in || die
-	fi
-
-	if ! use xattr ; then
-		sed -i -e 's/\+xattrs//' doc/aide.conf.in || die
-	fi
-
-	if ! use acl ; then
-		sed -i -e 's/\+acl//' doc/aide.conf.in || die
-	fi
-
-	eautoreconf
-}
-
-src_compile() {
-	local myconf="
-		$(use_with acl posix-acl)
-		$(use_with !mhash gcrypt)
-		$(use_with mhash mhash)
-		$(use_with nls locale)
-		$(use_with postgres psql)
-		$(use_with selinux)
-		$(use_enable static)
-		$(use_with xattr)
-		$(use_with zlib)
-		--sysconfdir=/etc/aide"
-#		$(use_with audit)
-
-	# curl doesn't work with static
-	use curl && ! use static && myconf="${myconf} --with-curl"
-
-	econf ${myconf} || die "econf failed"
-	# parallel make borked
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	keepdir /var/lib/aide
-	fowners root:0 /var/lib/aide
-	fperms 0755 /var/lib/aide
-
-	keepdir /var/log/aide
-
-	insinto /etc/aide
-	doins "${FILESDIR}"/aide.conf
-
-	dosbin "${FILESDIR}"/aideinit
-
-	dodoc ChangeLog AUTHORS NEWS README "${FILESDIR}"/aide.cron
-	dohtml doc/manual.html
-}
-
-pkg_postinst() {
-	elog
-	elog "A sample configuration file has been installed as"
-	elog "/etc/aide/aide.conf.  Please edit to meet your needs."
-	elog "Read the aide.conf(5) manual page for more information."
-	elog "A helper script, aideinit, has been installed and can"
-	elog "be used to make AIDE management easier. Please run"
-	elog "aideinit --help for more information"
-	elog
-
-	if use postgres; then
-		elog "Due to a bad assumption by aide, you must issue the following"
-		elog "command after the database initialization (aide --init ...):"
-		elog
-		elog 'psql -c "update pg_index set indisunique=false from pg_class \\ '
-		elog "  where pg_class.relname='TABLE_pkey' and \ "
-		elog '  pg_class.oid=pg_index.indexrelid" -h HOSTNAME -p PORT DBASE USER'
-		elog
-		elog "where TABLE, HOSTNAME, PORT, DBASE, and USER are the same as"
-		elog "your aide.conf."
-		elog
-	fi
-}
--- a/app-forensics/aide/aide-0.13.1.ebuild
+++ b/app-forensics/aide/aide-0.13.1.ebuild
@ -1,141 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit eutils autotools
-
-DESCRIPTION="AIDE (Advanced Intrusion Detection Environment) is a replacement for Tripwire"
-HOMEPAGE="http://aide.sourceforge.net/"
-SRC_URI="mirror://sourceforge/aide/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-IUSE="acl curl mhash nls postgres selinux static xattr zlib"
-#IUSE="acl audit curl mhash nls postgres selinux static xattr zlib"
-
-DEPEND="acl? ( sys-apps/acl )
-	curl? ( net-misc/curl )
-	mhash? ( >=app-crypt/mhash-0.9.2 )
-	!mhash? ( dev-libs/libgcrypt )
-	nls? ( virtual/libintl )
-	postgres? ( dev-db/postgresql )
-	selinux? (
-		sys-libs/libselinux
-		sec-policy/selinux-aide
-	)
-	xattr? ( sys-apps/attr )
-	zlib? ( sys-libs/zlib )"
-#	audit? ( sys-process/audit )
-
-RDEPEND="!static? ( ${DEPEND} )
-	virtual/mailx"
-
-DEPEND="${DEPEND}
-	nls? ( sys-devel/gettext )
-	sys-devel/bison
-	sys-devel/flex"
-
-pkg_setup() {
-	if use mhash && use postgres ; then
-		eerror "We cannot emerge aide with mhash and postgres USE flags at the same time."
-		eerror "Please remove mhash OR postgres USE flags."
-		die "Please remove either mhash or postgres USE flag."
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-
-	if ! use mhash ; then
-		# dev-libs/libgcrypt doesn't support whirlpool algorithm
-		sed -i -e 's/\+whirlpool//' doc/aide.conf.in || die
-	fi
-
-	if ! use selinux ; then
-		sed -i -e 's/\+selinux//' doc/aide.conf.in || die
-	fi
-
-	if ! use xattr ; then
-		sed -i -e 's/\+xattrs//' doc/aide.conf.in || die
-	fi
-
-	if ! use acl ; then
-		sed -i -e 's/\+acl//' doc/aide.conf.in || die
-	fi
-	eautoreconf
-}
-
-src_compile() {
-	local myconf="--sysconfdir=/etc/aide $(use_enable static)"
-
-	# --without-* borked
-	use zlib && myconf="${myconf} --with-zlib"
-	use nls  && myconf="${myconf} --with-locale"
-	use postgres && myconf="${myconf} --with-psql"
-	use selinux && myconf="${myconf} --with-selinux"
-	use acl && myconf="${myconf} --with-posix-acl"
-	use xattr && myconf="${myconf} --with-xattr"
-#	use audit && myconf="${myconf} --with-audit"
-
-	# curl doesn't work with static
-	use curl && ! use static && myconf="${myconf} --with-curl"
-
-	# If you use dev-libs/libgcrypt, --without-mhash is needed.
-	use mhash \
-		&& myconf="${myconf} --with-mhash" \
-		|| myconf="${myconf} --with-gcrypt --without-mhash"
-
-	econf ${myconf} || die
-	# parallel make borked
-	emake -j1 || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	keepdir /var/lib/aide
-	keepdir /var/log/aide
-
-	insinto /etc/aide
-	doins "${FILESDIR}"/aide.conf
-	# doins doc/aide.conf
-
-	dosbin "${FILESDIR}"/aideinit
-
-	exeinto /etc/cron.daily
-	doexe "${FILESDIR}"/aide.cron
-
-	dodoc ChangeLog AUTHORS NEWS README
-	dohtml doc/manual.html
-}
-
-pkg_postinst() {
-	chown root:0 /var/lib/aide
-	chmod 0755 /var/lib/aide
-
-	elog
-	elog "A sample configuration file has been installed as"
-	elog "/etc/aide/aide.conf.  Please edit to meet your needs."
-	elog "Read the aide.conf(5) manual page for more information."
-	elog "A cron file has been installed in /etc/cron.daily/aide.cron"
-	elog "A helper script, aideinit, has been installed and can"
-	elog "be used to make AIDE management easier. Please run"
-	elog "aideinit --help for more information"
-	elog
-
-	if use postgres; then
-		elog "Due to a bad assumption by aide, you must issue the following"
-		elog "command after the database initialization (aide --init ...):"
-		elog
-		elog 'psql -c "update pg_index set indisunique=false from pg_class \\ '
-		elog "  where pg_class.relname='TABLE_pkey' and \ "
-		elog '  pg_class.oid=pg_index.indexrelid" -h HOSTNAME -p PORT DBASE USER'
-		elog
-		elog "where TABLE, HOSTNAME, PORT, DBASE, and USER are the same as"
-		elog "your aide.conf."
-		elog
-	fi
-}
--- a/app-forensics/aide/files/aide-0.13.1-as-needed.patch
+++ b/app-forensics/aide/files/aide-0.13.1-as-needed.patch
@ -1,36 +0,0 @@
-diff -Naur aide-0.13.1.orig/configure.in aide-0.13.1/configure.in
--- aide-0.13.1.orig/configure.in	2006-12-09 06:49:21.000000000 +0900
-+++ aide-0.13.1/configure.in	2009-12-16 19:30:17.000000000 +0900
-@@ -546,12 +546,12 @@
- if test x$with_zlib = xyes; then
-   AC_CHECK_HEADERS(zlib.h,,
-  	[AC_MSG_ERROR([You don't have zlib properly installed. Install it or try --without-zlib.])])
-  save_LDFLAGS=$LDFLAGS
-  LDFLAGS="$LDFLAGS $LD_STATIC_FLAG"
-+#  saveLIBS=$LIBS
-+  LIBS="$LIBS -lz $LD_STATIC_FLAG"
-   AC_CHECK_LIB(z,gzdopen,,
-  	  [AC_MSG_ERROR([You don't have zlib properly installed. Install it or try --without-zlib.])]
-   )
-  LDFLAGS=$save_LDFLAGS
-+#  LIBS=$saveLIBS
-   AC_DEFINE(WITH_ZLIB,1,[use zlib])
- fi
- 
-@@ -565,13 +565,13 @@
- 	fi
-   AC_CHECK_HEADERS(curl/curl.h,,
-  	[AC_MSG_ERROR([You don't have curl properly installed. Install it or try --without-curl.])])
-#  save_LDFLAGS=$LDFLAGS
-+#  saveLIBS=$LIBS
- 	CFLAGS="$CFLAGS $CURL_CFLAGS"
-  LDFLAGS="$LDFLAGS $CURL_LIBS $LD_STATIC_FLAG"
-+  LIBS="$LIBS $CURL_LIBS $LD_STATIC_FLAG"
-   AC_CHECK_LIB(curl,curl_easy_init,havecurl=yes,
-  	[AC_MSG_ERROR([You don't have curl properly installed. Install it or try --without-curl.])]
- )
-#  LDFLAGS=$save_LDFLAGS
-+#  LIBS=$saveLIBS
-   AC_DEFINE(WITH_CURL,1,[use curl])
- 	compoptionstring="${compoptionstring}WITH_CURL\\n"],
- fi
--- a/app-forensics/aide/files/aide-0.13.1-configure.patch
+++ b/app-forensics/aide/files/aide-0.13.1-configure.patch
@ -1,74 +0,0 @@
--- configure.in.old	2008-01-26 15:07:28.000000000 +0100
-+++ configure.in	2008-01-26 15:14:05.000000000 +0100
-@@ -160,7 +160,9 @@
- fi
- 
- # Check whether static linking has explicitly been disabled
-AC_ARG_ENABLE(static,[  --disable-static        Disable static linking (lowers the security of aide)], [aide_static_choice=$enableval], [aide_static_choice=yes])
-+AC_ARG_ENABLE(static,
-+	      AC_HELP_STRING([--disable-static],[Disable static linking (lowers the security of aide)]),
-+	      [aide_static_choice=$enableval], [aide_static_choice=yes])
- 
- if test "$aide_static_choice" != "yes"; then
- 	LD_STATIC_FLAG=""
-@@ -190,8 +192,8 @@
- AC_CHECK_FUNCS(stricmp strnstr strnlen)
- 
- AC_ARG_WITH([mmap],
-	[AC_HELP_STRING([--with-mmap],
-		[use mmap @<:@default=check@:>@])],
-+	AC_HELP_STRING([--with-mmap],
-+		[use mmap @<:@default=check@:>@]),
- 	[],
- 	[with_mmap=check]
- )
-@@ -283,8 +285,8 @@
- AC_CHECK_HEADERS(syslog.h inttypes.h fcntl.h)
- 
- AC_ARG_WITH([locale],
-	[AC_HELP_STRING([--with-locale],
-		[use locale stuff])],
-+	AC_HELP_STRING([--with-locale],
-+		[use locale stuff]),
- 	[],
- 	[with_locale=no]
- )
-@@ -369,10 +371,10 @@
- 	[AC_HELP_STRING([--with-posix-acl],
- 		[use POSIX ACLs (no checking)])],
- 	[],
-	[with_posix_acl_support=no]
-+	[with_posix_acl=no]
- )
- 
-AS_IF([test "x$with_posix_acl_support" != xno],
-+AS_IF([test "x$with_posix_acl" != xno],
- 	[AC_DEFINE(WITH_POSIX_ACL,1,[use POSIX ACLs])
- 	AC_DEFINE(WITH_ACL,1,[use ACL])
- 	ACLLIB="-lacl"
-@@ -388,10 +390,10 @@
- 	[AC_HELP_STRING([--with-selinux],
- 		[use SELinux (no checking)])],
- 	[],
-	[with_selinux_support=no]
-+	[with_selinux=no]
- )
- 
-AS_IF([test "x$with_selinux_support" != xno],
-+AS_IF([test "x$with_selinux" != xno],
- 	[AC_DEFINE(WITH_SELINUX,1,[use SELinux])
- 	if test -n "$PKG_CONFIG" && $PKG_CONFIG --exists libselinux; then
- 		SELINUXLIB=$(${PKG_CONFIG} --libs libselinux --static)
-@@ -410,10 +412,10 @@
- 	[AC_HELP_STRING([--with-xattr],
- 		[use xattr (no checking)])],
- 	[],
-	[with_xattr_support=no]
-+	[with_xattr=no]
- )
- 	
-AS_IF([test "x$with_xattr_support" != xno],
-+AS_IF([test "x$with_xattr" != xno],
- 	[AC_DEFINE(WITH_XATTR,1,[use xattr])
- 	ATTRLIB=-lattr
- 	compoptionstring="${compoptionstring}WITH_XATTR\\n"
--- a/app-forensics/aide/files/aide-0.13.1-equ-matching.patch
+++ b/app-forensics/aide/files/aide-0.13.1-equ-matching.patch
@ -1,83 +0,0 @@
--- src/gen_list.c.orig	2007-12-19 15:37:13.000000000 -0800
-+++ src/gen_list.c	2007-12-19 16:19:43.000000000 -0800
-@@ -732,33 +732,6 @@
-   return retval;
- }
- 
-//this is used to check if $text if equal to a node in $rxrlist
-//should be used to check equ_rx_lst only
-int check_list_for_equal(list* rxrlist,char* text,DB_ATTR_TYPE* attr)
-{
-  list* r=NULL;
-  int retval=1;
-  char *temp;
-
-  for(r=rxrlist;r;r=r->next){
-    temp=((rx_rule*)r->data)->rx;
-    
-    //FIXME, if rx not begin with ^, may need to do something else
-    if(temp[0]=='^') //^ is for reg exp, we can ignore this character
-      temp++;
-
-    //we don't need to worry about buff-overflow, so strcmp is safe
-    if((retval=strcmp(temp, text))==0){
-      *attr=((rx_rule*)r->data)->attr;
-      error(231,"\"%s\" matches string from line #%ld: %s\n",text,((rx_rule*)r->data)->conf_lineno,((rx_rule*)r->data)->rx);
-      break;
-    } else {
-      error(231,"\"%s\" doesn't match string from line #%ld: %s\n",text,((rx_rule*)r->data)->conf_lineno,((rx_rule*)r->data)->rx);
-    }
-  }
-  return retval;
-}
-
- /* 
-  * Function check_node_for_match()
-  * calls itself recursively to go to the top and then back down.
-@@ -783,35 +756,24 @@
-     return retval;
-   }
-   
-  /* We need this to check whether this was the first one *
-   * to be called and not a recursive call */
-  if(!((retval&16)==16)){
-    retval|=16;
-+  /* if this call is not recursive we check the equals list and we set top *
-+   * and retval so we know following calls are recursive */
-+  if(!(retval&16)){
-     top=1;
-  } else {
-    top=0;
-  }
-  
-  /* if no deeper match found */
-  if(!((retval&8)==8)&&!((retval&4)==4)){
-+    retval|=16;
-+
-     if(!check_list_for_match(node->equ_rx_lst,text,attr)){
-      /*
-	Zhi Wen Wong added this line to fix bug that equ not work for 
-	compare
-	if we do "=/bin", we should only check /bin
-	so, /bin/bash or /bin/something should return 0 as neg
-      */
-      if(!check_list_for_equal(node->equ_rx_lst,text,attr))
-	retval|=(2|4);
-    };
-  };
-+      retval|=2|4;
-+    }
-+  }
-   /* We'll use retval to pass information on whether to recurse 
-    * the dir or not */
- 
- 
-  if(!((retval&8)==8)&&!((retval&4)==4)){
-+  /* If 4 and 8 are not set, we will check for matches */
-+  if(!(retval&(4|8))){
-     if(!check_list_for_match(node->sel_rx_lst,text,attr))
-      retval|=(1|8);
-+      retval|=1|8;
-   }
- 
-   /* Now let's check the ancestors */
--- a/app-forensics/aide/files/aide-0.13.1-gentoo.patch
+++ b/app-forensics/aide/files/aide-0.13.1-gentoo.patch
@ -1,36 +0,0 @@
-diff -Naur aide-0.13.1.orig/Makefile.am aide-0.13.1/Makefile.am
--- aide-0.13.1.orig/Makefile.am	2006-10-11 03:39:01.000000000 +0900
-+++ aide-0.13.1/Makefile.am	2007-09-27 01:35:39.000000000 +0900
-@@ -33,7 +33,7 @@
- 	src/aide -c doc/aide.conf -V20
- 
- update-db: all
-	src/aide -B "database_out=file://$(top_srcdir)/doc/aide.db" -c doc/aide.conf -i
-+	src/aide -B "database_out=file://$(abs_top_srcdir)/doc/aide.db" -c doc/aide.conf -i
- 
- dist-hook: configure
- 	mkdir $(distdir)/include
-diff -Naur aide-0.13.1.orig/doc/aide.conf.in aide-0.13.1/doc/aide.conf.in
--- aide-0.13.1.orig/doc/aide.conf.in	2006-11-25 04:53:56.000000000 +0900
-+++ aide-0.13.1/doc/aide.conf.in	2007-09-27 01:35:39.000000000 +0900
-@@ -19,7 +19,7 @@
- # corresponding line.
- #
- 
-@@define TOPDIR @top_srcdir@
-+@@define TOPDIR @abs_top_srcdir@
- 
- @@ifndef TOPDIR 
- @@define TOPDIR /
-diff -Naur aide-0.13.1.orig/src/Makefile.am aide-0.13.1/src/Makefile.am
--- aide-0.13.1.orig/src/Makefile.am	2006-10-28 06:10:38.000000000 +0900
-+++ aide-0.13.1/src/Makefile.am	2007-09-27 01:35:39.000000000 +0900
-@@ -20,6 +20,8 @@
- # This is no longer needed
- # SUBDIRS = crypt
- 
-+DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
-+
- bin_PROGRAMS = aide
- 
- aide_SOURCES =	\
--- a/app-forensics/aide/files/aide-0.13.1-libgrypt_init.patch
+++ b/app-forensics/aide/files/aide-0.13.1-libgrypt_init.patch
@ -1,49 +0,0 @@
-diff -urp aide-0.13.1.orig/doc/aide.1 aide-0.13.1/doc/aide.1
--- aide-0.13.1.orig/doc/aide.1	2009-04-14 15:46:20.000000000 -0700
-+++ aide-0.13.1/doc/aide.1	2009-04-14 15:49:18.000000000 -0700
-@@ -67,6 +67,7 @@ conditions:
- .IP "16 Unimplemented function error"
- .IP "17 Invalid configureline error"
- .IP "18 IO error"
-+.IP "19 Version mismatch error"
- .PP
- .SH NOTES
- Please note that due to mmap issues, aide cannot be terminated with
-diff -urp aide-0.13.1.orig/doc/aide.1.in aide-0.13.1/doc/aide.1.in
--- aide-0.13.1.orig/doc/aide.1.in	2009-04-14 15:46:20.000000000 -0700
-+++ aide-0.13.1/doc/aide.1.in	2009-04-14 15:49:56.000000000 -0700
-@@ -67,6 +67,7 @@ conditions:
- .IP "16 Unimplemented function error"
- .IP "17 Invalid configureline error"
- .IP "18 IO error"
-+.IP "19 Version mismatch error"
- .PP
- .SH NOTES
- Please note that due to mmap issues, aide cannot be terminated with
-diff -urp aide-0.13.1.orig/include/report.h aide-0.13.1/include/report.h
--- aide-0.13.1.orig/include/report.h	2009-04-14 15:46:20.000000000 -0700
-+++ aide-0.13.1/include/report.h	2009-04-14 15:46:28.000000000 -0700
-@@ -31,6 +31,7 @@
- #define UNIMPLEMENTED_FUNCTION_ERROR 16
- #define INVALID_CONFIGURELINE_ERROR 17
- #define IO_ERROR 18
-+#define VERSION_MISMATCH_ERROR 19
- 
- /* Errorcodes */
- #define HASH_ALGO_ERROR 30
-diff -urp aide-0.13.1.orig/src/md.c aide-0.13.1/src/md.c
--- aide-0.13.1.orig/src/md.c	2009-04-14 15:46:20.000000000 -0700
-+++ aide-0.13.1/src/md.c	2009-04-14 15:46:28.000000000 -0700
-@@ -201,6 +201,12 @@ int init_md(struct md_container* md) {
- #endif 
- #ifdef WITH_GCRYPT
-   error(255,"Gcrypt library initialization\n");
-+  	if(!gcry_check_version(GCRYPT_VERSION)) {
-+		error(0,"libgcrypt version mismatch\n");
-+		exit(VERSION_MISMATCH_ERROR);
-+	}
-+	gcry_control(GCRYCTL_DISABLE_SECMEM, 0);
-+	gcry_control(GCRYCTL_INITIALIZATION_FINISHED, 0);
- 	if(gcry_md_open(&md->mdh,0,0)!=GPG_ERR_NO_ERROR){
- 		error(0,"gcrypt_md_open failed\n");
- 		exit(IO_ERROR);
--- a/app-forensics/aide/files/aide-0.13.1-zlib.patch
+++ b/app-forensics/aide/files/aide-0.13.1-zlib.patch
@ -1,12 +0,0 @@
-diff -Naur aide-0.13.1.orig//src/be.c aide-0.13.1//src/be.c
--- aide-0.13.1.orig//src/be.c	2006-12-15 01:09:24.000000000 +0900
-+++ aide-0.13.1//src/be.c	2010-05-26 20:08:10.000000000 +0900
-@@ -161,7 +161,7 @@
- #endif
- #ifdef WITH_ZLIB
-     if(iszipped && !inout){
-      fh=gzdopen(fd,"wb9+");
-+      fh=gzdopen(fd,"wb9");
-       if(fh==NULL){
- 	error(0,_("Couldn't open file %s for %s"),u->value,
- 	      inout?"reading\n":"writing\n");
--- a/app-forensics/chkrootkit/Manifest
+++ b/app-forensics/chkrootkit/Manifest
@ -1,4 +1,2 @@
-DIST chkrootkit-0.48-gentoo.diff.bz2 4534 SHA256 af7cdac03a2357615e6a6973c8f892b7541912e05c90b4e876eb1c0c8976d7dc SHA512 926c6913cc9a13f5578070e48301c6f3ff026d3f4df236dcf4b53e092ba4ba288f7d77fa8d8c7268e0e3c21921ae20b4027898e872c59a0cb1c451961bf862fb WHIRLPOOL b836f0846d5dbdcfb1a17f89328be62428107789b463537b0eb4daf9547771c6227d3caa37921a6030ae949ed1fbcb5dd38a24b98c4f08e7148218e304df5ece
-DIST chkrootkit-0.48.tar.gz 38323 SHA256 b4b3d3540a7022aa7a81cae93f28c8475bc2660a21f88126725624c09769f1fb SHA512 df0348a1abd70ff905979ecead1e99b3fef1d706062112e3461e1e6b76e490e36466d46d254a02a2033e67e9774cfeb44ebff29fcc62a217e7a0e7843a239a24 WHIRLPOOL 76f9986dc0291789d16ae4ab1adb8c24b53c1013ad0984f9efe706aa52d0fb539ffc636ad738e3bc347081efad8f20c888d58cbb6a9619a540e9b383f7cd59ef
 DIST chkrootkit-0.49-gentoo.diff.bz2 5472 SHA256 85a01c8bb159420fc7681b5f3ec6529bc69cf10b3484daee0a5c126ef4a7b5d8 SHA512 4121d09f7bb6ad7d3f2ed42c914087f4724877def3c591fd6b7fa8e2b2b23a1b32b1bb1ba94dc079914c967d2483ebd614582b13afb4c1c801701a58ada89b62 WHIRLPOOL 25df5424700c72d19201faf6555790b04b878af3ef185f52f44807e018701926cd9e8d112343b86168ad6688df8fffcc2829c11886d8f628b03ff7f63f1ac7d0
 DIST chkrootkit-0.49.tar.gz 39421 SHA256 ccb87be09e8923d51f450a167f484414f70c36c942f8ef5b9e5e4a69b7baa17f SHA512 b796547fc483635ff6ee4e953f7dda34913189459de05b547522b79f8edeef5adae72cc05515b8ff9382cbabffd93cae7d114a40636e14c55da513bb42b05909 WHIRLPOOL c94f96f185ae5f5dd038a7b2ffd9603ee8c0f2fcbaeb3eb73d20260898f1677a2c1aad5cd6a257b29ca540d02916dca59434ff10b807567447889cf23f65b25e
--- a/app-forensics/chkrootkit/chkrootkit-0.48-r1.ebuild
+++ b/app-forensics/chkrootkit/chkrootkit-0.48-r1.ebuild
@ -1,48 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="a tool to locally check for signs of a rootkit"
-HOMEPAGE="http://www.chkrootkit.org/"
-SRC_URI="ftp://ftp.pangeia.com.br/pub/seg/pac/${P}.tar.gz
-	mirror://gentoo/${P}-gentoo.diff.bz2"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
-IUSE=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${WORKDIR}/${P}-gentoo.diff"
-	epatch "${FILESDIR}/${P}-shell-history-anomalies.diff"
-	epatch "${FILESDIR}/${P}-chkutmp.c-some-overruns-fixes.patch"
-	sed -i 's:/var/adm/:/var/log/:g' chklastlog.c || die "sed chklastlog.c failed"
-}
-
-src_compile() {
-	emake CC=$(tc-getCC) STRIP=true sense || die "emake sense failed"
-}
-
-src_install() {
-	dosbin chkdirs chklastlog chkproc chkrootkit chkwtmp chkutmp ifpromisc \
-		strings-static || die
-	dodoc ACKNOWLEDGMENTS README*
-
-	exeinto /etc/cron.weekly
-	newexe "${FILESDIR}"/${PN}.cron ${PN} || die
-}
-
-pkg_postinst() {
-	echo
-	elog "Edit /etc/cron.weekly/chkrootkit to activate chkrootkit!"
-	elog
-	elog "Some applications, such as portsentry, will cause chkrootkit"
-	elog "to produce false positives.  Read the chkrootkit FAQ at"
-	elog "http://www.chkrootkit.org/ for more information."
-	echo
-}
--- a/app-forensics/chkrootkit/files/chkrootkit-0.48-chkutmp.c-some-overruns-fixes.patch
+++ b/app-forensics/chkrootkit/files/chkrootkit-0.48-chkutmp.c-some-overruns-fixes.patch
@ -1,57 +0,0 @@
-=== modified file 'chkutmp.c'
--- chkutmp.c	2008-10-06 19:07:51 +0000
-+++ chkutmp.c	2007-10-20 07:56:19 +0000
-@@ -23,6 +23,7 @@
-  *
-  *  Changelog: 
-  *   Ighighi X - Improved speed via break command - 2005/03/27 
-+ *   Stewart Gebbie - fixed buffer overrun bug related to MAXREAD and UT_PIDLENGTH - 2007-10-20
-  *  
-  */
- 
-@@ -42,7 +43,7 @@
- #endif
- #include <ctype.h>
- 
-#define MAXREAD 1024
-+#define MAXREAD 4096
- #define MAXBUF 4096
- #define MAXLENGTH 256
- #define UT_PIDSIZE 12
-@@ -57,13 +58,13 @@
- #endif
- 
- struct ps_line {
-    char ps_tty[UT_LINESIZE];
-    char ps_user[UT_NAMESIZE];
-    char ps_args[MAXLENGTH];
-+    char ps_tty[UT_LINESIZE+1];
-+    char ps_user[UT_NAMESIZE+1];
-+    char ps_args[MAXLENGTH+1];
-     int ps_pid;
- };
- struct utmp_line {
-    char ut_tty[UT_LINESIZE];
-+    char ut_tty[UT_LINESIZE+1];
-     int ut_pid;
-     int ut_type;
- };
-@@ -77,7 +78,7 @@
- int fetchps(struct ps_line *psl_p)
- {
-     FILE *ps_fp;
-    char line[MAXREAD + 1], pid[UT_PIDSIZE];
-+    char line[MAXREAD + 1], pid[UT_PIDSIZE+1];
-     char *s, *d;
-     struct ps_line *curp = &psl_p[0];
-     struct ps_line *endp = &psl_p[MAXBUF];
-@@ -97,7 +98,7 @@
- 		while (isspace(*s))	/* skip spaces */
- 		    s++;
- 		d = pid;
-		for (x = 0; (!isspace(*s)) && (*d++ = *s++) && x <= UT_LINESIZE; x++)	/* grab pid */
-+		for (x = 0; (!isspace(*s)) && (*d++ = *s++) && x <= UT_PIDSIZE; x++)	/* grab pid */
- 		    ;
- 		*d = '\0';
- 		curp->ps_pid = atoi(pid);
-
--- a/app-forensics/chkrootkit/files/chkrootkit-0.48-shell-history-anomalies.diff
+++ b/app-forensics/chkrootkit/files/chkrootkit-0.48-shell-history-anomalies.diff
@ -1,21 +0,0 @@
-http://bugs.gentoo.org/show_bug.cgi?id=226067
-
-*** a/chkrootkit	Thu Jun 12 15:20:01 2008
--- b/chkrootkit	Thu Jun 12 15:28:09 2008
-***************
-*** 1098,1104 ****
-          echo "Warning: \`${files}' file size is zero"
-        files1=`${find} ${ROOTDIR}${HOME} ${findargs} -name '.*history' \( -links 2 -o -type l \)`
-        [ ! -z "${files1}" ] && \
-!         echo "Warning: \`${files}' is linked to another file"
-     fi
-     if [ -z "${files}" -a -z "${files1}" ]; then
-        if [ "${QUIET}" != "t" ]; then echo "nothing found"; fi
--- 1098,1104 ----
-          echo "Warning: \`${files}' file size is zero"
-        files1=`${find} ${ROOTDIR}${HOME} ${findargs} -name '.*history' \( -links 2 -o -type l \)`
-        [ ! -z "${files1}" ] && \
-!         echo "Warning: \`${files1}' is linked to another file"
-     fi
-     if [ -z "${files}" -a -z "${files1}" ]; then
-        if [ "${QUIET}" != "t" ]; then echo "nothing found"; fi
--- a/app-forensics/ovaldi/Manifest
+++ b/app-forensics/ovaldi/Manifest
@ -1,3 +1 @@
-DIST ovaldi-5.10.1.2-src.tar.bz2 14859172 SHA256 2d00a1bc730f6635beebd52611ee30c914169626ef5adf68ff313295c483d319 SHA512 77ffc04a8b33a43a9370b795e6af5e79e63ca59ec70c974408fffc163d487c654f153924494b14e1fc8b2ba2f33e96bc85e175fd8044e370a75a88f3f9c37fcb WHIRLPOOL 6c8e8da498c9f0c36be7a88a1293a984975e6fc90993fe6a860969af63cd8b9393e6adb4bf68893c6da468562322adb4b60a4894393bd7916047f900631f8296
 DIST ovaldi-5.10.1.4-src.tar.bz2 14868251 SHA256 92a22ad75ecdb02abb155e520cf249cc0f737c52b17380b1d58caf410f8c2560 SHA512 d7926a7416fe90013e203b333390e33d51c3eb0caa6ebba69dd593791a8377ac38f5db72fcff2d1ab2dd39a0f5d1b0d2a0d08f906d3e26740288532a27debb47 WHIRLPOOL b9e9142f3d51818c6fbdd12d036176a435bb7af4a75b39bd6bbaee9c542718f9058401ccdfb053a84bac97dfb9b5ba0acdbcf98c4085f6198ad51e94d6ea9d25
-DIST ovaldi-5.9.1-src.tar.bz2 14745625 SHA256 40161ac64fd221543a19f178de283919be2dd7f513a6fb354f1440fe1bfb98e1 SHA512 5ac3fb0b943aa6c650ae31131a41e059d2b338defe608b1a7b65ba776e249d005ccf4c3ff3ab64fb042a775c70467f4ca879de005f6bf78c19a4a0c782204d34 WHIRLPOOL d96fcf29bfbf301dde50e54a6d710db913520d7b0e47be8b17f2a202353f81eef94e2934d0aa84ca6ddd24dce8a0fdd9c4cfe6224f4757717c88317895ad12af
--- a/app-forensics/ovaldi/ovaldi-5.10.1.2.ebuild
+++ b/app-forensics/ovaldi/ovaldi-5.10.1.2.ebuild
@ -1,78 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=3
-
-inherit eutils
-
-DESCRIPTION="Free implementation of OVAL"
-HOMEPAGE="http://oval.mitre.org/language/interpreter.html"
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ldap rpm selinux"
-
-DEPEND="rpm? ( app-arch/rpm )
-	dev-libs/libgcrypt:0
-	dev-libs/libpcre
-	dev-libs/xalan-c
-	dev-libs/xerces-c
-	ldap? ( net-nds/openldap )"
-RDEPEND="${DEPEND}
-	selinux? ( sys-libs/libselinux )"
-
-S="${WORKDIR}/${P}-src"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-xerces3.patch
-	epatch "${FILESDIR}"/${P}-strnicmp.patch
-	epatch "${FILESDIR}"/${P}-missing-memory-header.patch
-	if ! use ldap ; then
-		einfo "Disabling LDAP probes"
-		epatch "${FILESDIR}"/${P}-disable-ldap-probes.patch
-		sed -i 's/-lldap//' project/linux/Makefile || die
-		sed -i 's/.*LDAPProbe.h.*//' src/linux/ProbeFactory.h || die
-		rm src/probes/independent/LDAPProbe.{cpp,h} || die
-	fi
-
-	# rpm probes support is build dependant only on the presence of the rpm binary
-	if use rpm ; then
-		#Same problems as bug 274679, so i do a local copy of the header and patch it
-		cp /usr/include/rpm/rpmdb.h src/probes/linux/ || die
-		epatch "${FILESDIR}"/use_local_rpmdb.patch
-		epatch "${FILESDIR}"/rpmdb.patch
-	else
-		einfo "Disabling rpm probes"
-		sed -i 's/^PACKAGE_RPM/#PACKAGE_RPM/' project/linux/Makefile || die
-	fi
-	# same thing for dpkg, but package dpkg is not sufficient, needs app-arch/apt-pkg that is not on tree
-	einfo "Disabling dpkg probes"
-	sed -i 's/^PACKAGE_DPKG/#PACKAGE_DPKG/' project/linux/Makefile || die
-
-	#Disabling SELinux support
-	if ! use selinux ; then
-		rm src/probes/linux/SelinuxSecurityContextProbe.cpp || die
-		rm src/probes/linux/SelinuxBooleanProbe.cpp || die
-		rm src/probes/linux/SelinuxBooleanProbe.h || die
-		epatch "${FILESDIR}"/${P}-disable-selinux-probes.patch
-	else
-		epatch "${FILESDIR}"/${P}-add-selinux-libs.patch
-	fi
-}
-
-src_compile () {
-	emake -C project/linux || die
-}
-
-src_install () {
-	# no make install in Makefile
-	dosbin project/linux/Release/ovaldi project/linux/ovaldi.sh || die
-	dodir /var/log/${PN} || die
-	insinto /usr/share/${PN}
-	doins xml/* || die
-	dodoc docs/{README.txt,version.txt} || die
-	doman docs/ovaldi.1 || die
-}
--- a/app-forensics/ovaldi/ovaldi-5.9.1.ebuild
+++ b/app-forensics/ovaldi/ovaldi-5.9.1.ebuild
@ -1,64 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=3
-
-inherit eutils
-
-DESCRIPTION="Free implementation of OVAL"
-HOMEPAGE="http://oval.mitre.org/language/interpreter.html"
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ldap rpm"
-
-DEPEND="rpm? ( app-arch/rpm )
-	dev-libs/libgcrypt:0
-	dev-libs/libpcre
-	dev-libs/xalan-c
-	dev-libs/xerces-c
-	ldap? ( net-nds/openldap )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${P}-src"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-xerces3.patch
-	epatch "${FILESDIR}"/${P}-strnicmp.patch
-	if ! use ldap ; then
-		einfo "Disabling LDAP probes"
-		epatch "${FILESDIR}"/${P}-disable-ldap-probes.patch
-		rm src/probes/independent/LDAPProbe.{cpp,h} || die
-	fi
-
-	# rpm probes support is build dependant only on the presence of the rpm binary
-	if use rpm ; then
-		#Same problems as bug 274679, so i do a local copy of the header and patch it
-		cp /usr/include/rpm/rpmdb.h src/probes/linux/ || die
-		epatch "${FILESDIR}"/use_local_rpmdb.patch
-		epatch "${FILESDIR}"/rpmdb.patch
-	else
-		einfo "Disabling rpm probes"
-		sed -i 's/^PACKAGE_RPM/#PACKAGE_RPM/' project/linux/Makefile || die
-	fi
-	# same thing for dpkg, but package dpkg is not sufficient, needs app-arch/apt-pkg that is not on tree
-	einfo "Disabling dpkg probes"
-	sed -i 's/^PACKAGE_DPKG/#PACKAGE_DPKG/' project/linux/Makefile || die
-}
-
-src_compile () {
-	emake -C project/linux || die
-}
-
-src_install () {
-	# no make install in Makefile
-	dosbin project/linux/Release/ovaldi project/linux/ovaldi.sh || die
-	dodir /var/log/${PN} || die
-	insinto /usr/share/${PN}
-	doins xml/* || die
-	dodoc docs/{README.txt,version.txt} || die
-	doman docs/ovaldi.1 || die
-}
--- a/app-forensics/rkhunter/Manifest
+++ b/app-forensics/rkhunter/Manifest
@ -1,2 +1 @@
-DIST rkhunter-1.4.0.tar.gz 244211 SHA256 8a03d6add50663531994d55aff058eced74c64df948b88176621cd761b68ccf9 SHA512 597e8b2e3f75cd1cb57dd3e33df004265f03ca1503310f984211612da43a160e5d3b50626b4918bd38bf0d239fe2e4a45e55a96212c5a3b5a5645e77e030b60a WHIRLPOOL 45c023b625c7c1664a9f99438b5bebe5ed70265346f122b9d71f91611439d77a2bda01c137698898314183458c4467c66f73bb703b83fbaae2ffe65ded3307ad
 DIST rkhunter-1.4.2.tar.gz 277707 SHA256 789cc84a21faf669da81e648eead2e62654cfbe0b2d927119d8b1e55b22b65c3 SHA512 a4e45caaaf5b8262619ebb890784c75c4e30db4c6c0eba305f86d419142b4796c95bc55fe8846dce8d58bc7636bdb365a4a8c41707f64d4d81373687c5a3b0d4 WHIRLPOOL 911ed8e37e112516adba3afb63e3d4862d061ea35cd4b8becea455922d6b2a744f4b8e7cf92685cff29c3192c594dfc58ba3c194f371dd4d95530bd4c09c5d84
--- a/app-forensics/rkhunter/rkhunter-1.4.0.ebuild
+++ b/app-forensics/rkhunter/rkhunter-1.4.0.ebuild
@ -1,68 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit eutils bash-completion-r1
-
-DESCRIPTION="Rootkit Hunter scans for known and unknown rootkits, backdoors, and sniffers"
-HOMEPAGE="http://rkhunter.sf.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~mips ppc x86"
-IUSE=""
-
-RDEPEND="
-	app-shells/bash
-	dev-lang/perl
-	sys-process/lsof[rpc]
-	virtual/cron
-	virtual/mailx
-"
-
-S="${WORKDIR}/${P}/files"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}.conf.patch"
-}
-
-src_install() {
-	# rkhunter requires to be root
-	dosbin ${PN}
-
-	# rkhunter doesn't create it by itself
-	dodir /var/lib/${PN}/tmp
-
-	insinto /etc
-	doins ${PN}.conf
-
-	exeinto /usr/lib/${PN}/scripts
-	doexe *.pl
-
-	insinto /var/lib/${PN}/db
-	doins *.dat
-
-	insinto /var/lib/${PN}/db/i18n
-	doins i18n/*
-
-	doman ${PN}.8
-	dodoc ACKNOWLEDGMENTS CHANGELOG FAQ README
-
-	exeinto /etc/cron.daily
-	newexe "${FILESDIR}/${PN}-1.3.cron" ${PN}
-
-	newbashcomp "${FILESDIR}/${PN}.bash-completion" ${PN}
-}
-
-pkg_postinst() {
-	elog "A cron script has been installed to /etc/cron.daily/rkhunter."
-	elog "To enable it, edit /etc/cron.daily/rkhunter and follow the"
-	elog "directions."
-	elog "If you want ${PN} to send mail, you will need to install"
-	elog "virtual/mailx or alter the EMAIL_CMD variable in the"
-	elog "cron script and possibly the MAIL_CMD variable in the"
-	elog "${PN}.conf file to use another mail client."
-}
--- a/app-misc/anki/anki-2.0.33.ebuild
+++ b/app-misc/anki/anki-2.0.33.ebuild
@ -15,7 +15,7 @@ SRC_URI="http://ankisrs.net/download/mirror/${P}.tgz"

 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="latex +recording +sound"

 RDEPEND="${PYTHON_DEPS}
--- a/app-text/sigil/Manifest
+++ b/app-text/sigil/Manifest
@ -1,3 +1,2 @@
 DIST sigil-0.8.7.tar.gz 19394061 SHA256 0352cc46714ebb5067a0fbdbbc76dded8f10ea0f4f43374c7dbcac6eba49e104 SHA512 24b74c835ae1f8fb887c9d2c59b3ccc6720ce1fe8d19a6b0056754ab5ea6e63c34c4b229f4e4b3a880e722876d288e58385f5a0ad15b295f147b77b1acf28652 WHIRLPOOL 2cb7a8a928069a2f005396faa9bdacde1f77f3cca3a3ba2458b8562e48298a127b9de9d7ecea5f106ad68865d5074b13fff5a234497b2b6655ac1a3c3edef827
-DIST sigil-0.9.0.tar.gz 17446877 SHA256 39887e1f76236e796d29c679f327c7183907c47b522794a00090eb1aa04dac92 SHA512 f83e5e8ae233e8784ad25345890a33424cf951a3d385d26a69b0efbabe87b22ab9466a6faed93f1106875642ef395c6f20c69b556661b6fe24388946d677746b WHIRLPOOL d6cca23116a428fc032538ab7fda1ab1d2afa703b8f665d58c03bcd5568e6174f1efbc43b7c5cb7f9e8b91866ea93d8cf01428fbd47748a26b4906152de972c8
-DIST sigil-0.9.1.tar.gz 17451106 SHA256 7ef13ae9f570ac51aa8d80890ff31bcdf8d1b488c1c4bbb315f1ca4b75237a63 SHA512 41327a67aea80f655f8662c0fcf7159db7d44a5cf89274777c719bcff2960e8ef11788c767c8ffba095c1fb4be320b055e1826bff8f6d0ca89999d52e750f7e0 WHIRLPOOL 49d3b4d10abebce045e55fac7350d7a7e09ebef9293593db6b5bc148507e289a9ab26ddaf6f0b53dfe7252be78f53fbcdc0c760b78ed642c74ee8f73a026a302
+DIST sigil-0.9.2.tar.gz 17448786 SHA256 d3c34ba1b63b080cb889dc5f11ba28f4db246151fbc3de162178290c8b9b3304 SHA512 8adc9571f653f126bf287a264325b3bf231c2022ddc9b1350e0e31125883c1d6b7b983660ccf2b1838ae2f3b15f968cee1e751afd51e2923f291e08f457315f9 WHIRLPOOL 2ee6fd609b9ffbd1c380a34ea0e5001a2ba92ba565dc1023ec0d02e90c3e693194792c962db516924578db82c7b56f97c01852f96e6ea3d0f80d05bc4a393acc
--- a/app-text/sigil/sigil-0.9.1.ebuild
+++ b/app-text/sigil/sigil-0.9.1.ebuild
@ -1,74 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-CMAKE_MIN_VERSION="3.0"
-
-# Sigil supports Python 3.5 already. Include it when our deps support it.
-PYTHON_COMPAT=( python3_4 )
-
-inherit eutils cmake-utils python-single-r1
-
-MY_PN="Sigil"
-
-DESCRIPTION="Sigil is a multi-platform WYSIWYG ebook editor for ePub format"
-HOMEPAGE="http://sigil-ebook.com/"
-SRC_URI="https://github.com/Sigil-Ebook/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	app-text/hunspell
-	dev-libs/boost[threads,${PYTHON_USEDEP}]
-	dev-libs/libpcre[pcre16]
-	dev-libs/xerces-c[icu]
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/cssselect[${PYTHON_USEDEP}]
-	dev-python/cssutils[${PYTHON_USEDEP}]
-	dev-python/html5lib[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/regex[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	>=dev-qt/qtconcurrent-5.4:5
-	>=dev-qt/qtcore-5.4:5
-	>=dev-qt/qtgui-5.4:5
-	>=dev-qt/qtnetwork-5.4:5
-	>=dev-qt/qtprintsupport-5.4:5
-	>=dev-qt/qtsvg-5.4:5
-	>=dev-qt/qtwebkit-5.4:5
-	>=dev-qt/qtwidgets-5.4:5
-	>=dev-qt/qtxml-5.4:5
-	>=dev-qt/qtxmlpatterns-5.4:5
-	sys-libs/zlib[minizip]
-"
-DEPEND="${RDEPEND}
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	>=sys-devel/gcc-4.8
-	virtual/pkgconfig
-	>=dev-qt/linguist-tools-5.4:5
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-DOCS=( ChangeLog.txt README.md )
-
-src_prepare() {
-	# sigil tries to copy non-needed qt libs for deb package, safe to ignore this completely
-	sed -e '/set( QT_LIBS/d' -i src/CMakeLists.txt || die "sed failed"
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_SYSTEM_LIBS=1
-		-DSYSTEM_LIBS_REQUIRED=1
-	)
-	cmake-utils_src_configure
-}
--- a/app-text/sigil/sigil-0.9.2.ebuild
+++ b/app-text/sigil/sigil-0.9.2.ebuild
--- a/dev-cpp/gstreamermm/metadata.xml
+++ b/dev-cpp/gstreamermm/metadata.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>gnome</herd>
+  <herd>gnome-mm</herd>
  <maintainer>
    <email>eva@gentoo.org</email>
    <name>Gilles Dartiguelongue</name>
--- a/dev-db/mysql-workbench/mysql-workbench-6.3.4-r2.ebuild
+++ b/dev-db/mysql-workbench/mysql-workbench-6.3.4-r2.ebuild
@ -0,0 +1,109 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+GCONF_DEBUG="no"
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+
+CMAKE_MIN_VERSION="2.8.11.1"
+
+inherit gnome2 eutils flag-o-matic python-single-r1 cmake-utils
+
+MY_P="${PN}-community-${PV}-src"
+
+DESCRIPTION="MySQL Workbench"
+HOMEPAGE="http://dev.mysql.com/workbench/"
+SRC_URI="mirror://mysql/Downloads/MySQLGUITools/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug doc gnome-keyring"
+
+# glibc: deprecated mutex functions, removed in 2.36.0
+CDEPEND="${PYTHON_DEPS}
+		dev-libs/glib:2
+		dev-cpp/atkmm
+		dev-cpp/pangomm
+		>=dev-cpp/glibmm-2.14:2
+		>=dev-cpp/gtkmm-2.14:2.4
+		dev-libs/atk
+		x11-libs/pango
+		>=x11-libs/gtk+-2.20:2
+		gnome-base/libglade:2.0
+		>=x11-libs/cairo-1.5.12[glib,svg]
+		dev-libs/libsigc++:2
+		>=dev-libs/boost-1.55.0[nls]
+		>=dev-cpp/ctemplate-0.95
+		>=dev-libs/libxml2-2.6.2:2
+		dev-libs/libzip
+		>=virtual/mysql-5.1
+		dev-libs/libpcre
+		>=sci-libs/gdal-1.11.1-r1[-mdb]
+		virtual/opengl
+		>=dev-lang/lua-5.1:0[deprecated]
+		|| ( sys-libs/e2fsprogs-libs dev-libs/ossp-uuid )
+		dev-libs/tinyxml[stl]
+		dev-db/mysql-connector-c++
+		dev-db/vsqlite++
+		|| ( dev-db/libiodbc dev-db/unixODBC )
+		gnome-keyring? ( gnome-base/libgnome-keyring )
+			dev-python/pexpect
+			>=dev-python/paramiko-1.7.4
+	"
+
+# lua perhaps no longer needed? Was used via libgrt only
+
+RDEPEND="${CDEPEND}
+		app-admin/sudo
+		>=sys-apps/net-tools-1.60_p20120127084908"
+
+DEPEND="${CDEPEND}
+		dev-java/antlr:3.5
+		dev-lang/swig
+		virtual/jre
+		virtual/pkgconfig"
+
+S="${WORKDIR}"/"${MY_P}"
+
+src_unpack() {
+	unpack ${PN}-community-${PV}-src.tar.gz
+}
+
+src_prepare() {
+	## Patch CMakeLists.txt
+	epatch "${FILESDIR}/${PN}-6.2.3-CMakeLists.patch" \
+		"${FILESDIR}/${PN}-6.2.5-wbcopytables.patch" \
+		"${FILESDIR}/${PN}-6.3.3-mysql_options4.patch" \
+		"${FILESDIR}/${PN}-6.3.4-cxx11.patch"
+
+	sed -i -e '/target_link_libraries/ s/sqlparser.grt/sqlparser.grt sqlparser/' \
+		modules/db.mysql.sqlparser/CMakeLists.txt
+
+	## remove hardcoded CXXFLAGS
+	sed -i -e 's/-O0 -g3//' ext/scintilla/gtk/CMakeLists.txt || die
+
+	## package is very fragile...
+	strip-flags
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	append-cxxflags -std=c++11
+	local mycmakeargs=(
+		$(cmake-utils_use_use gnome-keyring GNOME_KEYRING)
+		-DLIB_INSTALL_DIR="/usr/$(get_libdir)"
+		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
+		-DPYTHON_LIBRARY="$(python_get_library_path)"
+	)
+	ANTLR_JAR_PATH="/usr/share/antlr-3.5/antlr-runtime.jar" cmake-utils_src_configure
+}
+
+src_compile() {
+	# Work around parallel build issues, bug 507838
+	cmake-utils_src_compile -j1
+}
--- a/dev-db/phpmyadmin/phpmyadmin-4.4.15.2.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-4.4.15.2.ebuild
@ -15,7 +15,7 @@ HOMEPAGE="https://www.phpmyadmin.net/"
 SRC_URI="https://files.phpmyadmin.net/${MY_PN}/${MY_PV}/${MY_P}.tar.xz"

 LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 hppa ~ia64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="setup"

 RDEPEND="
--- a/dev-db/phpmyadmin/phpmyadmin-4.5.3.1.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-4.5.3.1.ebuild
@ -15,7 +15,7 @@ HOMEPAGE="https://www.phpmyadmin.net/"
 SRC_URI="https://files.phpmyadmin.net/${MY_PN}/${MY_PV}/${MY_P}.tar.xz"

 LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 hppa ~ia64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="setup"

 RDEPEND="
--- a/dev-games/clanlib/clanlib-2.3.7.ebuild
+++ b/dev-games/clanlib/clanlib-2.3.7.ebuild
@ -27,7 +27,7 @@ RDEPEND="sys-libs/zlib
 		app-arch/bzip2
 		x11-libs/libX11
 	)
-	sqlite? ( dev-db/sqlite:0 )
+	sqlite? ( dev-db/sqlite:3 )
 	sound? ( media-libs/alsa-lib )
 	mikmod? (
 		media-libs/libmikmod
--- a/dev-java/javax-inject/Manifest
+++ b/dev-java/javax-inject/Manifest
@ -1,2 +1 @@
-DIST javax.inject-1-bundle.jar 43323 SHA256 efe257736656de99747098ceafd64dae7b5722a585176eb79ee9dbf7cd995ee5 SHA512 397db77e3426a4539b895535557cbe9e1795c186a9bc397efa716b42d02b03c4403f20c4c13fb2b99b25e5a14abd3407e9d0d843cd4c3442a1386a2b30ba50e3 WHIRLPOOL 466ae846ad0c8abcc1279e314f79121bd17c627d3729e7dd1c144b5d67f161e0f5fdee278b51c689cdcdcc01ac5fe5f2c8b8b103d94e18413f2b37cfb1b4b7f7
 DIST javax.inject-1-sources.jar 10928 SHA256 c4b87ee2911c139c3daf498a781967f1eb2e75bc1a8529a2e7b328a15d0e433e SHA512 8bcfae4933073c212c3370a36cdacbff0474648720766df5d0acfc2dafd3307a514b7fb49c08762d32bfca9d8afce47cbfe1eba7399b459b6543472ac9de715b WHIRLPOOL 4ae44b7088d381f8875d910bafb74e99b724277bffc5274bde75588b614aa0defd66b43a0774957f9cba4d28435397b3e130d9373b0e68e3a29857f0a36cf18b
--- a/dev-java/javax-inject/javax-inject-1-r1.ebuild
+++ b/dev-java/javax-inject/javax-inject-1-r1.ebuild
@ -1,54 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-MY_P=${PN/-/.}-${PV}
-
-DESCRIPTION="Dependency injection for Java (JSR-330)"
-HOMEPAGE="https://code.google.com/p/atinject/"
-SRC_URI="https://atinject.googlecode.com/files/${MY_P}-bundle.jar"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-
-DEPEND=">=virtual/jdk-1.5
-	app-arch/unzip"
-
-RDEPEND=">=virtual/jre-1.5"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	unzip -q ${MY_P}-sources.jar || die
-}
-
-java_prepare() {
-	cp "${FILESDIR}"/${P}-build.xml build.xml || die
-
-	sed -i 's/\(<mkdir dir="${maven.build.outputDir}"\/>\)/\1<javac srcdir="." destdir="${maven.build.outputDir}" \/>/g' build.xml || die
-}
-
-src_compile() {
-	java-pkg-2_src_compile
-
-	if use doc ; then
-		javadoc -d javadoc $(find javax -name "*.java") || die "Javadoc failed"
-	fi
-}
-
-src_install() {
-	java-pkg_newjar target/javax.inject-${PV}.jar
-
-	use doc && java-pkg_dojavadoc javadoc
-	use source && java-pkg_dosrc javax
-}
--- a/dev-java/javax-inject/javax-inject-1-r2.ebuild
+++ b/dev-java/javax-inject/javax-inject-1-r2.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -16,7 +16,7 @@ SRC_URI="http://central.maven.org/maven2/javax/inject/${MY_PN}/${PV}/${MY_P}-sou

 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"

 IUSE=""

--- a/dev-libs/glib/glib-2.46.2-r1.ebuild
+++ b/dev-libs/glib/glib-2.46.2-r1.ebuild
@ -0,0 +1,318 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# Until bug #537330 glib is a reverse dependency of pkgconfig and, then
+# adding new dependencies end up making stage3 to grow. Every addition needs
+# then to be think very closely.
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+# Building with --disable-debug highly unrecommended.  It will build glib in
+# an unusable form as it disables some commonly used API.  Please do not
+# convert this to the use_enable form, as it results in a broken build.
+GCONF_DEBUG="yes"
+# Completely useless with or without USE static-libs, people need to use
+# pkg-config
+GNOME2_LA_PUNT="yes"
+
+inherit autotools bash-completion-r1 gnome2 libtool eutils flag-o-matic	multilib \
+	pax-utils python-r1 toolchain-funcs versionator virtualx linux-info multilib-minimal
+
+DESCRIPTION="The GLib library of C routines"
+HOMEPAGE="http://www.gtk.org/"
+SRC_URI="${SRC_URI}
+	http://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz" # pkg.m4 for eautoreconf
+
+LICENSE="LGPL-2+"
+SLOT="2"
+IUSE="dbus fam kernel_linux +mime selinux static-libs systemtap test utils xattr"
+REQUIRED_USE="
+	utils? ( ${PYTHON_REQUIRED_USE} )
+	test? ( ${PYTHON_REQUIRED_USE} )
+"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+
+RDEPEND="
+	!<dev-util/gdbus-codegen-${PV}
+	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
+	>=virtual/libffi-3.0.13-r1[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] )
+	xattr? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] )
+	fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] )
+	utils? (
+		${PYTHON_DEPS}
+		>=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}]
+		|| (
+			>=dev-libs/elfutils-0.142
+			>=dev-libs/libelf-0.8.12
+			>=sys-freebsd/freebsd-lib-9.2_rc1
+		)
+	)
+"
+DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	>=dev-libs/libxslt-1.0
+	>=sys-devel/gettext-0.11
+	>=dev-util/gtk-doc-am-1.20
+	systemtap? ( >=dev-util/systemtap-1.3 )
+	test? (
+		sys-devel/gdb
+		${PYTHON_DEPS}
+		>=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}]
+		>=sys-apps/dbus-1.2.14 )
+	!<dev-util/gtk-doc-1.15-r2
+"
+# gobject-introspection blocker to ensure people don't mix
+# different g-i and glib major versions
+
+PDEPEND="!<gnome-base/gvfs-1.6.4-r990
+	dbus? ( gnome-base/dconf )
+	mime? ( x11-misc/shared-mime-info )
+"
+# shared-mime-info needed for gio/xdgmime, bug #409481
+# dconf is needed to be able to save settings, bug #498436
+# Earlier versions of gvfs do not work with glib
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/gio-querymodules
+)
+
+pkg_setup() {
+	if use kernel_linux ; then
+		CONFIG_CHECK="~INOTIFY_USER"
+		if use test; then
+			CONFIG_CHECK="~IPV6"
+			WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them."
+		fi
+		linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	# Prevent build failure in stage3 where pkgconfig is not available, bug #481056
+	mv -f "${WORKDIR}"/pkg-config-*/pkg.m4 "${S}"/m4macros/ || die
+
+	if use test; then
+		# Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163
+		if ! has_version dev-util/desktop-file-utils ; then
+			ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system,"
+			ewarn "think on installing it to get these tests run."
+			sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die
+			sed -i -e "/g_test_add_func/d" gio/tests/desktop-app-info.c || die
+		fi
+
+		# gdesktopappinfo requires existing terminal (gnome-terminal or any
+		# other), falling back to xterm if one doesn't exist
+		if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then
+			ewarn "Some tests will be skipped due to missing terminal program"
+			sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die
+		fi
+
+		# Disable tests requiring dbus-python and pygobject; bugs #349236, #377549, #384853
+		if ! has_version dev-python/dbus-python || ! has_version 'dev-python/pygobject:3' ; then
+			ewarn "Some tests will be skipped due to dev-python/dbus-python or dev-python/pygobject:3"
+			ewarn "not being present on your system, think on installing them to get these tests run."
+			sed -i -e "/connection\/filter/d" gio/tests/gdbus-connection.c || die
+			sed -i -e "/connection\/large_message/d" gio/tests/gdbus-connection-slow.c || die
+			sed -i -e "/gdbus\/proxy/d" gio/tests/gdbus-proxy.c || die
+			sed -i -e "/gdbus\/proxy-well-known-name/d" gio/tests/gdbus-proxy-well-known-name.c || die
+			sed -i -e "/gdbus\/introspection-parser/d" gio/tests/gdbus-introspection.c || die
+			sed -i -e "/g_test_add_func/d" gio/tests/gdbus-threading.c || die
+			sed -i -e "/gdbus\/method-calls-in-thread/d" gio/tests/gdbus-threading.c || die
+			# needed to prevent gdbus-threading from asserting
+			ln -sfn $(type -P true) gio/tests/gdbus-testserver.py
+		fi
+
+		# Some tests need ipv6, upstream bug #667468
+		# https://bugs.gentoo.org/show_bug.cgi?id=508752
+		if [[ ! -f /proc/net/if_net6 ]]; then
+			sed -i -e "/gdbus\/peer-to-peer/d" gio/tests/gdbus-peer.c || die
+			sed -i -e "/gdbus\/delayed-message-processing/d" gio/tests/gdbus-peer.c || die
+			sed -i -e "/gdbus\/nonce-tcp/d" gio/tests/gdbus-peer.c || die
+		fi
+
+		# This test is prone to fail, bug #504024, upstream bug #723719
+		sed -i -e '/gdbus-close-pending/d' gio/tests/Makefile.am || die
+	else
+		# Don't build tests, also prevents extra deps, bug #512022
+		sed -i -e 's/ tests//' {.,gio,glib}/Makefile.am || die
+	fi
+
+	# gdbus-codegen is a separate package
+	epatch "${FILESDIR}"/${PN}-2.40.0-external-gdbus-codegen.patch
+
+	# leave python shebang alone
+	sed -e '/${PYTHON}/d' \
+		-i glib/Makefile.{am,in} || die
+
+	epatch_user
+
+	# Also needed to prevent cross-compile failures, see bug #267603
+	eautoreconf
+
+	gnome2_src_prepare
+
+	epunt_cxx
+}
+
+multilib_src_configure() {
+	# Avoid circular depend with dev-util/pkgconfig and
+	# native builds (cross-compiles won't need pkg-config
+	# in the target ROOT to work here)
+	if ! tc-is-cross-compiler && ! $(tc-getPKG_CONFIG) --version >& /dev/null; then
+		if has_version sys-apps/dbus; then
+			export DBUS1_CFLAGS="-I/usr/include/dbus-1.0 -I/usr/$(get_libdir)/dbus-1.0/include"
+			export DBUS1_LIBS="-ldbus-1"
+		fi
+		export LIBFFI_CFLAGS="-I$(echo /usr/$(get_libdir)/libffi-*/include)"
+		export LIBFFI_LIBS="-lffi"
+	fi
+
+	# These configure tests don't work when cross-compiling.
+	if tc-is-cross-compiler ; then
+		# https://bugzilla.gnome.org/show_bug.cgi?id=756473
+		case ${CHOST} in
+		hppa*|metag*) export glib_cv_stack_grows=yes ;;
+		*)            export glib_cv_stack_grows=no ;;
+		esac
+		# https://bugzilla.gnome.org/show_bug.cgi?id=756474
+		export glib_cv_uscore=no
+		# https://bugzilla.gnome.org/show_bug.cgi?id=756475
+		export ac_cv_func_posix_get{pwuid,grgid}_r=yes
+	fi
+
+	local myconf
+
+	case "${CHOST}" in
+		*-mingw*) myconf="${myconf} --with-threads=win32" ;;
+		*)        myconf="${myconf} --with-threads=posix" ;;
+	esac
+
+	# FIXME: Always use internal libpcre, bug #254659
+	# (maybe consider going back to system lib)
+	# libelf used only by the gresource bin
+	ECONF_SOURCE="${S}" gnome2_src_configure ${myconf} \
+		$(use_enable xattr) \
+		$(use_enable fam) \
+		$(use_enable selinux) \
+		$(use_enable static-libs static) \
+		$(use_enable systemtap dtrace) \
+		$(use_enable systemtap systemtap) \
+		$(multilib_native_use_enable utils libelf) \
+		--disable-compile-warnings \
+		--enable-man \
+		--with-pcre=internal \
+		--with-xml-catalog="${EPREFIX}/etc/xml/catalog"
+
+	if multilib_is_native_abi; then
+		local d
+		for d in glib gio gobject; do
+			ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die
+		done
+	fi
+}
+
+multilib_src_test() {
+	export XDG_CONFIG_DIRS=/etc/xdg
+	export XDG_DATA_DIRS=/usr/local/share:/usr/share
+	export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp"
+	export LC_TIME=C # bug #411967
+	python_export_best
+
+	# Related test is a bit nitpicking
+	mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
+	chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
+
+	# Hardened: gdb needs this, bug #338891
+	if host-is-pax ; then
+		pax-mark -mr "${BUILD_DIR}"/tests/.libs/assert-msg-test \
+			|| die "Hardened adjustment failed"
+	fi
+
+	# Need X for dbus-launch session X11 initialization
+	Xemake check
+}
+
+multilib_src_install() {
+	gnome2_src_install completiondir="$(get_bashcompdir)"
+}
+
+multilib_src_install_all() {
+	DOCS="AUTHORS ChangeLog* NEWS* README"
+	einstalldocs
+
+	if use utils ; then
+		python_replicate_script "${ED}"/usr/bin/gtester-report
+	else
+		rm "${ED}usr/bin/gtester-report"
+		rm "${ED}usr/share/man/man1/gtester-report.1"
+	fi
+
+	# Do not install charset.alias even if generated, leave it to libiconv
+	rm -f "${ED}/usr/lib/charset.alias"
+
+	# Don't install gdb python macros, bug 291328
+	rm -rf "${ED}/usr/share/gdb/" "${ED}/usr/share/glib-2.0/gdb/"
+}
+
+pkg_preinst() {
+	gnome2_pkg_preinst
+
+	# Make gschemas.compiled belong to glib alone
+	local cache="usr/share/glib-2.0/schemas/gschemas.compiled"
+
+	if [[ -e ${EROOT}${cache} ]]; then
+		cp "${EROOT}"${cache} "${ED}"/${cache} || die
+	else
+		touch "${ED}"/${cache} || die
+	fi
+
+	multilib_pkg_preinst() {
+		# Make giomodule.cache belong to glib alone
+		local cache="usr/$(get_libdir)/gio/giomodule.cache"
+
+		if [[ -e ${EROOT}${cache} ]]; then
+			cp "${EROOT}"${cache} "${ED}"/${cache} || die
+		else
+			touch "${ED}"/${cache} || die
+		fi
+	}
+
+	multilib_foreach_abi multilib_pkg_preinst
+}
+
+pkg_postinst() {
+	# force (re)generation of gschemas.compiled
+	GNOME2_ECLASS_GLIB_SCHEMAS="force"
+
+	gnome2_pkg_postinst
+
+	multilib_pkg_postinst() {
+		gnome2_giomodule_cache_update \
+			|| die "Update GIO modules cache failed (for ${ABI})"
+	}
+	multilib_foreach_abi multilib_pkg_postinst
+
+	if has_version '<x11-libs/gtk+-3.0.12:3'; then
+		# To have a clear upgrade path for gtk+-3.0.x users, have to resort to
+		# a warning instead of a blocker
+		ewarn
+		ewarn "Using <gtk+-3.0.12:3 with ${P} results in frequent crashes."
+		ewarn "You should upgrade to a newer version of gtk+:3 immediately."
+	fi
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+
+	if [[ -z ${REPLACED_BY_VERSION} ]]; then
+		multilib_pkg_postrm() {
+			rm -f "${EROOT}"usr/$(get_libdir)/gio/giomodule.cache
+		}
+		multilib_foreach_abi multilib_pkg_postrm
+		rm -f "${EROOT}"usr/share/glib-2.0/schemas/gschemas.compiled
+	fi
+}
--- a/dev-libs/qof/qof-0.8.8.ebuild
+++ b/dev-libs/qof/qof-0.8.8.ebuild
@ -1,62 +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="A Query Object Framework"
-HOMEPAGE="https://alioth.debian.org/projects/qof/"
-SRC_URI="mirror://debian//pool/main/q/${PN}/${PN}_${PV}.orig.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="2"
-KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86"
-IUSE="doc nls sqlite"
-
-RDEPEND="
-	dev-libs/libxml2
-	dev-libs/glib:2
-	sqlite? ( >=dev-db/sqlite-2.8.0:0 )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	virtual/yacc
-	>=sys-devel/gettext-0.19.2
-	!dev-libs/qof:0
-	doc? (
-		app-doc/doxygen
-		dev-texlive/texlive-latex )
-"
-
-src_prepare() {
-	# Remove some CFLAGS
-	epatch "${FILESDIR}"/${PN}-0.8.8-cflags.patch
-
-	# Delay build of unittests, bug #197999
-	epatch "${FILESDIR}"/${PN}-0.8.8-unittest.patch
-
-	# Fix use and build with yacc
-	epatch "${FILESDIR}"/${PN}-0.8.8-unistd-define.patch
-	epatch "${FILESDIR}"/${PN}-0.8.8-yacc-build.patch
-	rm lib/libsql/{lexer.c,parser.c,parser.h} || die
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-error-on-warning \
-		--disable-static \
-		--disable-gdasql \
-		--disable-gdabackend \
-		$(use_enable nls) \
-		$(use_enable sqlite) \
-		$(use_enable doc doxygen) \
-		$(use_enable doc latex-docs) \
-		$(use_enable doc html-docs)
-}
--- a/dev-perl/Class-MethodMaker/Class-MethodMaker-2.240.0.ebuild
+++ b/dev-perl/Class-MethodMaker/Class-MethodMaker-2.240.0.ebuild
@ -12,7 +12,7 @@ inherit perl-module eutils
 DESCRIPTION="Create generic methods for OO Perl"

 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""

 DEPEND="
--- a/dev-perl/Clone/Clone-0.380.0.ebuild
+++ b/dev-perl/Clone/Clone-0.380.0.ebuild
@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Recursively copy Perl datatypes"

 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~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 ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="test"

 RDEPEND=""
--- a/dev-perl/Convert-BinHex/Convert-BinHex-1.124.0.ebuild
+++ b/dev-perl/Convert-BinHex/Convert-BinHex-1.124.0.ebuild
@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Extract data from Macintosh BinHex files"

 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 ~x86"
 IUSE="test"

 RDEPEND="
--- a/dev-perl/Convert-Binary-C/Convert-Binary-C-0.770.0.ebuild
+++ b/dev-perl/Convert-Binary-C/Convert-Binary-C-0.770.0.ebuild
@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Binary Data Conversion using C Types"

 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""

 DEPEND="virtual/perl-ExtUtils-MakeMaker"
--- a/dev-perl/Crypt-Rijndael/Crypt-Rijndael-1.130.0.ebuild
+++ b/dev-perl/Crypt-Rijndael/Crypt-Rijndael-1.130.0.ebuild
@ -12,7 +12,7 @@ DESCRIPTION="Crypt::CBC compliant Rijndael encryption module"

 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="amd64 ~hppa ~ia64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="test"

 DEPEND="
--- a/dev-perl/Crypt-SSLeay/Crypt-SSLeay-0.720.0-r1.ebuild
+++ b/dev-perl/Crypt-SSLeay/Crypt-SSLeay-0.720.0-r1.ebuild
@ -12,7 +12,7 @@ DESCRIPTION="OpenSSL support for LWP"

 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="libressl test"

 RDEPEND="
--- a/dev-perl/Curses/Curses-1.320.0.ebuild
+++ b/dev-perl/Curses/Curses-1.320.0.ebuild
@ -12,7 +12,7 @@ inherit perl-module
 DESCRIPTION="Curses interface modules for Perl"

 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-solaris ~x86-solaris"
 IUSE="+unicode"

 DEPEND=">=sys-libs/ncurses-5:0=[unicode?]"
--- a/dev-perl/DBD-Pg/DBD-Pg-2.19.3-r1.ebuild
+++ b/dev-perl/DBD-Pg/DBD-Pg-2.19.3-r1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -16,7 +16,7 @@ IUSE=""

 RDEPEND="virtual/perl-version
 	>=dev-perl/DBI-1.52
-	dev-db/postgresql"
+	dev-db/postgresql:*"
 DEPEND="${RDEPEND}"

 # testcases require a local database with an
--- a/dev-perl/DBD-Pg/DBD-Pg-3.4.2.ebuild
+++ b/dev-perl/DBD-Pg/DBD-Pg-3.4.2.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

@ -16,7 +16,7 @@ IUSE=""

 RDEPEND="virtual/perl-version
 	>=dev-perl/DBI-1.614.0
-	dev-db/postgresql"
+	dev-db/postgresql:*"
 DEPEND="${RDEPEND}"

 # testcases require a local database with an
--- a/dev-perl/DBD-Pg/DBD-Pg-3.5.3.ebuild
+++ b/dev-perl/DBD-Pg/DBD-Pg-3.5.3.ebuild
@ -1,27 +1,30 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

-EAPI=5
+EAPI=6

-MODULE_AUTHOR=TURNSTEP
-MODULE_VERSION=3.3.0
+DIST_AUTHOR=TURNSTEP
 inherit perl-module

-DESCRIPTION="The Perl DBD::Pg Module"
+DESCRIPTION="PostgreSQL database driver for the DBI module"

 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""

-RDEPEND="virtual/perl-version
-	>=dev-perl/DBI-1.52
-	dev-db/postgresql"
-DEPEND="${RDEPEND}"
+RDEPEND="
+	virtual/perl-version
+	>=dev-perl/DBI-1.614.0
+	dev-db/postgresql:*
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+"

 # testcases require a local database with an
 # open password for the postgres user.
-SRC_TEST="skip"
+DIST_TEST="skip"

 src_prepare() {
 	postgres_include="$(readlink -f "${EPREFIX}"/usr/include/postgresql)"
--- a/dev-perl/DBD-Pg/Manifest
+++ b/dev-perl/DBD-Pg/Manifest
@ -1,3 +1,3 @@
 DIST DBD-Pg-2.19.3.tar.gz 237399 SHA256 37350d134b7fa88fb3b9432d92991e0a73f405bf5b3a4ee53430439280b8262a SHA512 e1183fda7abcd2ee05491fe269172e5fb09dba6cb329c6f6f1a5abb9dc9a98c414a0b67f3465b938b197bbe34e3ebc9ec6a4e810e1f9e2316753845ac5416fec WHIRLPOOL 427b1705a3d8e69032b2db5d7ad1d1c6de6353c44b5b6294352abfb28f100f2f572356a2402e285bfbb373384bff18fef7355c545ceb21fbffea07d5de75ec24
-DIST DBD-Pg-3.3.0.tar.gz 251408 SHA256 52f43de5b2d916d447d7ed252b127f728b226dc88db57d4fe9712e21d3586ffe SHA512 eb8fbc2e9ad3a846ee4ee580ad2d18cb99b8df48b1c30595d0ffc6ab6e0ff91c36f61e98120968285bd3818f0e565a43189066eda8f93a2972e1df3258ed4f8e WHIRLPOOL b0143c95422ca7e8566b7bf7b63ff8d83e5304a0a83b93a5acff30a3d2140243fb580fa36ac70aeebf8226d7990d56fd85b0ae942310944c21564b7b933b662a
 DIST DBD-Pg-3.4.2.tar.gz 253346 SHA256 7b76930cec143b90a068e1e64a3beb6f640c10b22d0a41f9a032516683892f24 SHA512 290f8e19d6920c1a514305a943ec4f63da14dd321e93a6e9cc4f6fce6737f308a3931135ec9ed0d4577f1ab97358106ca2def7ccb28a7c5c169a80ca5cda1d85 WHIRLPOOL a177efa5cd07c3064528329a9be72cd464671e55ac19ec564b75f8fe5e757c960a89d83d09a65e7e327bb88d9322465c0cdc320ddb33eb85a59bb29c9fe1dfbe
+DIST DBD-Pg-3.5.3.tar.gz 256570 SHA256 7e98a9b975256a4733db1c0e974cad5ad5cb821489323e395ed97bd058e0a90e SHA512 7a564e5c86fa41719289f6e391f0cd39f01df7d088892fca11175c60fec8a3af884f9204ae834caac2024ff0d45dcc013e314ec0c09a07fe7ee76170ec3a634f WHIRLPOOL 6f4091284c2c91b8c2126e06a2727b65e672db91ce5f265841ef3c02b977f48712e84ad013980bbe4a2e127f5003906bf315d7b6a86787440a9cc6688aa14cd8
--- a/dev-perl/DBD-SQLite/DBD-SQLite-1.460.0.ebuild
+++ b/dev-perl/DBD-SQLite/DBD-SQLite-1.460.0.ebuild
@ -1,40 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=ISHIGAKI
-MODULE_VERSION=1.46
-inherit perl-module
-
-DESCRIPTION="Self Contained RDBMS in a DBI Driver"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="test"
-
-RDEPEND="
-	>=dev-db/sqlite-3.6.22[extensions(+)]
-	>=dev-perl/DBI-1.57
-	!<dev-perl/DBD-SQLite-1
-"
-DEPEND="${RDEPEND}
-	test? (
-		>=virtual/perl-Test-Simple-0.86
-	)
-"
-
-SRC_TEST="do"
-
-src_prepare() {
-	perl-module_src_prepare
-	sed -i 's/^if ( 0 )/if ( 1 )/' "${S}"/Makefile.PL || die
-	# remove bundled sqlite (rt.cpan#61361)
-	for i in sqlite3{.c,.h,ext.h} ; do
-		rm ${i} || die
-		sed -i -e "/^${i}\$/d" MANIFEST || die
-	done
-
-	myconf="SQLITE_LOCATION=${EPREFIX}/usr"
-}
--- a/dev-perl/DBD-SQLite/Manifest
+++ b/dev-perl/DBD-SQLite/Manifest
@ -1,3 +1,2 @@
 DIST DBD-SQLite-1.35.tar.gz 1467375 SHA256 ff08d1ee50c057d03ab2901aa7896fda2226c30b85c0999f5858cd2a81b4bc7d SHA512 36ac23aa84c19aff170b5505f6d80c1a577176b2738030e3b161147b9b738fa76ab9a6a620c4ff4a2b9f6abd62520e9fd78111177e8bf347fca28ff8c97b31ca WHIRLPOOL e67e25bd8e8b70ba9bae603a0c0d608111871fdb126398cf8dd392df1544f4e7298ff7e605cc1a1f204efa4cbe679a4f178183ab1bd3cd370b4c1cd79a8c9d10
-DIST DBD-SQLite-1.46.tar.gz 1718862 SHA256 b2b179136cd7c0df7b0e4840ff3f46330f161e5fc646279748afa7a3144f7cc0 SHA512 1fbec00d99de9766450003716c8ef6eccdd08b3bc4523180d3fe1046404e3cdcdc3b893146cabf695dfb98bc3484018436412d47c134ce4a89c5348f0edc6012 WHIRLPOOL 2b15f4f9a3cd62cf00ac5058fb8aa54ba94b203e9061d909b688d49f67d5583f2ed992ee97bcbee91baa98799e675c0c423a05b52f345f50ff8366e507c70c6f
 DIST DBD-SQLite-1.48.tar.gz 1769115 SHA256 b397230f5d4cdc9923f91c62da9e535234f3055c528ede75afd7d24698030ea6 SHA512 9c00decdb6730c0e4be3fdd01fef6ebad0452cbe1b5141c23fee7d0c5ca0089f3cd4e5d70d331e959ec50546bb10154a3c2db4bfd27993912d5c788cef0a81ee WHIRLPOOL 8313333ba47203d2eb1434266af250dcfe9e360d697155d82bb24b6f0c0abf650d3cc787e6b9c93144e790de16aa1c318032626f867977b8dfeee92be53c3b12
--- a/dev-perl/DBD-mysql/DBD-mysql-4.32.0-r1.ebuild
+++ b/dev-perl/DBD-mysql/DBD-mysql-4.32.0-r1.ebuild
@ -11,7 +11,7 @@ inherit eutils perl-module
 DESCRIPTION="The Perl DBD:mysql Module"

 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="embedded test"

 RDEPEND="dev-perl/DBI
--- a/dev-perl/Data-Compare/Data-Compare-1.220.0-r1.ebuild
+++ b/dev-perl/Data-Compare/Data-Compare-1.220.0-r1.ebuild
@ -1,25 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=DCANTRELL
-MODULE_VERSION=1.22
-inherit perl-module
-
-DESCRIPTION="compare perl data structures"
-
-SLOT="0"
-KEYWORDS="amd64 hppa ~ppc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="test"
-
-RDEPEND="dev-perl/File-Find-Rule
-	dev-perl/Scalar-Properties"
-DEPEND="${RDEPEND}
-	test? (
-		dev-perl/Clone
-		dev-perl/Test-Pod
-	)"
-
-SRC_TEST="do"
--- a/dev-perl/Data-Compare/Data-Compare-1.250.0.ebuild
+++ b/dev-perl/Data-Compare/Data-Compare-1.250.0.ebuild
@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Compare perl data structures"

 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 hppa ~ppc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="test"

 RDEPEND="
--- a/dev-perl/Data-Compare/Manifest
+++ b/dev-perl/Data-Compare/Manifest
@ -1,2 +1 @@
-DIST Data-Compare-1.22.tar.gz 23483 SHA256 ce8f2c7cd8e7aad8bfa381824f43c0d2ae0ed8a21450817bbeb1d971b5c2e8af SHA512 ce106d573312b8e048afca4014dcf177c4afe2ba08c4022d6fe12e2fde5eb7a053d5e3f53bb5b23e1bb2887bd16c124e6ba0382775cedc0f0553893306cb7f89 WHIRLPOOL 59501d177b53b4397b25e166e5d6bb6ea61c76831b85d9f6cddea1ec0a960cf2230eab5c467eb66bfd765116593cac612b8534d7ea2bcdd29243fca88e6b6cb1
 DIST Data-Compare-1.25.tar.gz 26249 SHA256 1d4b36db545fa9fbacd8c012618f6a7846238ee12ab627a2764cfaf45ad4ea73 SHA512 6db1235672030aa1afe52de1de9fac1f8a2af9eed99a3143d6c5b30669908125f584638fe06b8b33208f6d7fb734ccec7381c9411408a3f4fde1998707f748c9 WHIRLPOOL 3619367a59703afa776284094851fe25cafe3a37036df09c480a66577ed61aaac5c3aba5cc70b5086dea5e76db5917e26d3265ca857a264ce270c064b4c0fa32
--- a/dev-perl/Data-Dump/Data-Dump-1.220.0-r1.ebuild
+++ b/dev-perl/Data-Dump/Data-Dump-1.220.0-r1.ebuild
@ -1,17 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=GAAS
-MODULE_VERSION=1.22
-inherit perl-module
-
-DESCRIPTION="Pretty printing of data structures"
-
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ~mips ppc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE=""
-
-SRC_TEST=do
--- a/dev-perl/Data-Dump/Data-Dump-1.230.0.ebuild
+++ b/dev-perl/Data-Dump/Data-Dump-1.230.0.ebuild
@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Pretty printing of data structures"

 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm hppa ~mips ppc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE=""

 SRC_TEST=do
--- a/dev-perl/Data-Dump/Manifest
+++ b/dev-perl/Data-Dump/Manifest
@ -1,2 +1 @@
-DIST Data-Dump-1.22.tar.gz 20621 SHA256 533caad79f2f5ff453ed30137c96c1cb2a7e83972bf9dc48d265e0e035a738b2 SHA512 b4d8d493b0b1707d3d33058d90663f55f335933ea57ac36ab99b4d1ffd1c932d21b161778cfdf622a94ce5ca40a943bca0efc1baf25e1db12f34a54741eef149 WHIRLPOOL 3f4410bb5e69f85a5b9956e80111adf042fa10225f8514a70a99747f7f6cbdd525a20d733db791d939abd88bff2677e9e07bb7607572c53f73fa8a860fbffede
 DIST Data-Dump-1.23.tar.gz 20771 SHA256 af53b05ef1387b4cab4427e6789179283e4f0da8cf036e8db516ddb344512b65 SHA512 6fd6c23bb6df7f7396219149dbfd23132fc2ea1dd344c32f62fc27a1afeeb28d7ebf2d429184bb6d1189f412e218f9e62a966b49fdd9ad5564e5152d67a02b96 WHIRLPOOL 1b195d161701566035d45bd40040ecf3230cda2cc047ce41c96615476b5fdc7d66b34507c8a0f4c32caf4e0312cd128ac1874b3874a1ede803f6afcba027285f
--- a/dev-perl/Data-ShowTable/Data-ShowTable-3.300.0-r1.ebuild
+++ b/dev-perl/Data-ShowTable/Data-ShowTable-3.300.0-r1.ebuild
@ -1,30 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=AKSTE
-MODULE_VERSION=3.3
-inherit perl-module
-
-DESCRIPTION="routines to display tabular data in several formats"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ia64 ppc sparc x86"
-IUSE=""
-
-PATCHES=( "${FILESDIR}"/3.3.patch )
-SRC_TEST=do
-
-src_test() {
-	# bug 403881
-	perl_rm_files t/list-wrap.t
-	perl-module_src_test
-}
-
-src_install () {
-	perl-module_src_install
-	dohtml *.html
-}
--- a/dev-perl/Data-ShowTable/Data-ShowTable-4.600.0.ebuild
+++ b/dev-perl/Data-ShowTable/Data-ShowTable-4.600.0.ebuild
@ -12,7 +12,7 @@ DESCRIPTION="routines to display tabular data in several formats"

 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="alpha amd64 ia64 ppc sparc x86"
 IUSE=""

 DEPEND="virtual/perl-ExtUtils-MakeMaker"
--- a/dev-perl/Data-ShowTable/Manifest
+++ b/dev-perl/Data-ShowTable/Manifest
@ -1,2 +1 @@
-DIST Data-ShowTable-3.3.tar.gz 94369 SHA256 57fc8e6b77bac1fdcbd564a8720c84fe2051e818d587f7898a8bbd9e794cecf7 SHA512 6a17fbe8f23a9380187317de543f14b20f702ba6a077d55413d29b020053a4ad06008be162dc8f62cfd6ce775715553fe8254558a73248800276dac37255d259 WHIRLPOOL e91539fb2e6440a396c64317f2264fbc8bb9816230a6d983d19d010969d4a569c36a1ca3c338873d49b15c988201de829bdea384a76e45d9f9cca4e0324139d0
 DIST Data-ShowTable-4.6.tar.gz 60826 SHA256 8f8958b99b1480104f7cbde877a5204c5cc6990a00ded07886cb43eb72527ba3 SHA512 9c3a49cd2db1f1f5727663adf32e70b51f46e13d5b039b7e04ac8d4d478a1f1bca720c1aff70548c0936453b3a9a16a7bf8738968a053f284d9c9d7661cc4fc1 WHIRLPOOL 7a280bd47107cca6fecab3c9b1866010a6b4fb71d40d17ef8e08b263c7752a43fc488649fd0d53dfe26466084ff4cbb4d4f90b0d55e111fe2f2d939465a79d4d
--- a/dev-perl/Date-Calc/Date-Calc-6.400.0.ebuild
+++ b/dev-perl/Date-Calc/Date-Calc-6.400.0.ebuild
@ -12,7 +12,7 @@ DESCRIPTION="Gregorian calendar date calculations"

 LICENSE="${LICENSE} LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""

 RDEPEND="
--- a/dev-perl/DateManip/DateManip-6.410.0.ebuild
+++ b/dev-perl/DateManip/DateManip-6.410.0.ebuild
@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MY_PN=Date-Manip
-MODULE_AUTHOR=SBECK
-MODULE_VERSION=6.41
-inherit perl-module
-
-DESCRIPTION="Perl date manipulation routines"
-
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
-IUSE="test"
-
-RDEPEND="
-	virtual/perl-Storable
-"
-DEPEND="${RDEPEND}
-	>=dev-perl/Module-Build-0.390.0
-	test? (
-		dev-perl/Test-Pod
-		dev-perl/Test-Pod-Coverage
-		dev-perl/Test-Inter
-	)
-"
-
-SRC_TEST="do"
-
-mydoc="HISTORY"
--- a/dev-perl/DateManip/DateManip-6.510.0.ebuild
+++ b/dev-perl/DateManip/DateManip-6.510.0.ebuild
@ -12,7 +12,7 @@ inherit perl-module
 DESCRIPTION="Perl date manipulation routines"

 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
 IUSE="test"

 RDEPEND="
--- a/dev-perl/DateManip/Manifest
+++ b/dev-perl/DateManip/Manifest
@ -1,3 +1,2 @@
-DIST Date-Manip-6.41.tar.gz 1975272 SHA256 f7f654d8a85836bfbb248e21dd2ad39e592aa259f247bf77ef791ff19360de09 SHA512 c958fd58c8905e63945835cbe83205efafd4466d8cc3c1a61ec52ae948679c27c525143d5509b4a384c0c05d045702fdb0c86d91968ef24f73d983b2e7042860 WHIRLPOOL 507e63e2665144f0f94cbcd40ea4c0109eda1dd89f3f95ae7249e4204cb213546ca07af5478da534e930cfe77fe27e1fff806c85d4872a4f99109070a9cb8ffc
 DIST Date-Manip-6.51.tar.gz 1799860 SHA256 23bca630398d33ee16d6d8b285206dfdfa93739da771d30e40ed6a28b0c8db29 SHA512 96e0ef8374680a6adb3a064509d50a0e9288b14ce1e728b181e0f344ff85dfeb7b26ad4117fcfc35d3a6e4d6db3e97da242e2f6a11a88a11571a9b1f169f8e54 WHIRLPOOL e22746dcbd39e19412000c4cd20a09757c20c12c5407b7206eccac80942376e2d02d0b856380fe13956734208717db0497d8e2be89bcfd34744216223e0f2446
 DIST Date-Manip-6.52.tar.gz 1833161 SHA256 3f7b31a0d9f47a111e1a128e708d4c1ee0f6815ead81737fc4de96438f61e511 SHA512 8a232e8fcc2c5abc1fb82c5096ae8a80b6a6c1d6ef94ca87cbdf15907dedfa64b41008149e0026e4898c96e649b1d69ca304fb529ea32253737e513b809afc6b WHIRLPOOL 8a44a26238799673fb132e73a7713f7ab0a6ee90ca3e416ae28f529507f0ffb0c7f45ad314fa3d2d6a57b39819ca516eda6272ff5815eb90c91c019f96bd86ec
--- a/dev-perl/DateTime-Format-HTTP/DateTime-Format-HTTP-0.400.0-r1.ebuild
+++ b/dev-perl/DateTime-Format-HTTP/DateTime-Format-HTTP-0.400.0-r1.ebuild
@ -1,23 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=CKRAS
-MODULE_VERSION=0.40
-inherit perl-module
-
-DESCRIPTION="Date conversion routines"
-
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	dev-perl/DateTime
-	dev-perl/libwww-perl"
-DEPEND="${RDEPEND}
-	dev-perl/Module-Build"
-
-SRC_TEST=do
--- a/dev-perl/DateTime-Format-HTTP/DateTime-Format-HTTP-0.420.0.ebuild
+++ b/dev-perl/DateTime-Format-HTTP/DateTime-Format-HTTP-0.420.0.ebuild
@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Date conversion routines"

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

 RDEPEND="
--- a/dev-perl/DateTime-Format-HTTP/Manifest
+++ b/dev-perl/DateTime-Format-HTTP/Manifest
@ -1,2 +1 @@
-DIST DateTime-Format-HTTP-0.40.tar.gz 17571 SHA256 214e9e2e364090ebc5bc682b29709828944ae67f0bb4a989dd1e6d010845213f SHA512 1884f692e0c8d40ce5dc1786131094d2064270fb1d1e32df3bf8bedaa4ac863f53688ec53e95260a48cd20e878a77af5952eb0d6f03ccd09b4a14d024f7167a0 WHIRLPOOL 54281e3cc0b6115ea9bdea999174ebe74453bc8b09067901e183c3e707170ce2a652e75f8997e509d0b6e3a80a3304bbddd267bd8b3bf3d568516c2600a965ad
 DIST DateTime-Format-HTTP-0.42.tar.gz 18170 SHA256 d04e769df45968dfd2d1bdc647a325c6877614069762786e6f137f1f5ec3d840 SHA512 d8ff064d4bd0c9f41ec14a6e06d12a401e9c5162ef1f41381ba4314fc4776d1898cf07971243cf1b4a90096a8ed5f59361616d3fc2d6c62a7bdbdcc331fe81b8 WHIRLPOOL f9d3a3d52834a767db6d139373acc9f71a50ce372cc940e9fea304b04c679ab3da193c6d3936578760949e6e7176afc6471bd5f3804bbfcb5fb7a4ccf9664d8c
--- a/dev-perl/DateTime-Format-Mail/DateTime-Format-Mail-0.300.100-r1.ebuild
+++ b/dev-perl/DateTime-Format-Mail/DateTime-Format-Mail-0.300.100-r1.ebuild
@ -1,22 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=DROLSKY
-MODULE_VERSION=0.3001
-inherit perl-module
-
-DESCRIPTION="Convert between DateTime and RFC2822/822 formats"
-
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-perl/Params-Validate-0.67
-		>=dev-perl/DateTime-0.17"
-DEPEND="${RDEPEND}
-		dev-perl/Module-Build"
-
-SRC_TEST="do"
--- a/dev-perl/DateTime-Format-Mail/DateTime-Format-Mail-0.402.0.ebuild
+++ b/dev-perl/DateTime-Format-Mail/DateTime-Format-Mail-0.402.0.ebuild
@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Convert between DateTime and RFC2822/822 formats"

 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-solaris"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-solaris"
 IUSE="test"

 RDEPEND="
--- a/dev-perl/DateTime-Format-Mail/Manifest
+++ b/dev-perl/DateTime-Format-Mail/Manifest
@ -1,2 +1 @@
-DIST DateTime-Format-Mail-0.3001.tar.gz 176473 SHA256 b3f36b15442ae3e47bf91f45bcdc23e3311dcd2a3c6bc5c691004ad95986af72 SHA512 7ad356f86bbc8c854d25806e1205834fe4c0f4f9a1ab065b81e72ef75a502f31ab82c166451e6d108faa3ceceae3103a15f4f9ad908c483bba4f068d0aad46ef WHIRLPOOL 5340172c11378c63d0ac0120e41e95eebc59cdf9335b2154e0d4f7f4fbd6b92c52a689c508e82475ccf6ada32866f4360fedaa1ea1cb0f1bd24d7d6b4dfeceb2
 DIST DateTime-Format-Mail-0.402.tar.gz 178213 SHA256 d788c883969e1647ed0524cc130d897276de23eaa3261f3616458ddd3a4a88fb SHA512 079a4a4e3dbd8b585726b03809e42436d48a71c94f4a94a662e7955278374ff564ee0fae4a4999f84f2f35d78b0d695b917a737e262a7499940272abd66ac5c6 WHIRLPOOL 31dc42331f7a3f8615d4c1376aa19459772c82f4d59bd2d820e4c6f245b4efa797cd922b841ca00a8e289b477bb1cdc4204a8c998576aa154830c15b19196433
--- a/dev-perl/DateTime-Locale/DateTime-Locale-0.450.0-r1.ebuild
+++ b/dev-perl/DateTime-Locale/DateTime-Locale-0.450.0-r1.ebuild
@ -1,23 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=DROLSKY
-MODULE_VERSION=0.45
-inherit perl-module
-
-DESCRIPTION="Localization support for DateTime"
-
-LICENSE="|| ( Artistic GPL-2 ) unicode"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-perl/Params-Validate-0.91
-	dev-perl/List-MoreUtils"
-DEPEND=">=dev-perl/Module-Build-0.35
-	${RDEPEND}"
-
-SRC_TEST="do"
--- a/dev-perl/DateTime-Locale/DateTime-Locale-0.460.0.ebuild
+++ b/dev-perl/DateTime-Locale/DateTime-Locale-0.460.0.ebuild
@ -12,7 +12,7 @@ DESCRIPTION="Localization support for DateTime"

 LICENSE="|| ( Artistic GPL-2 ) unicode"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="test"

 RDEPEND="
--- a/dev-perl/DateTime-Locale/DateTime-Locale-1.20.0.ebuild
+++ b/dev-perl/DateTime-Locale/DateTime-Locale-1.20.0.ebuild
@ -0,0 +1,35 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_AUTHOR=DROLSKY
+DIST_VERSION=1.02
+inherit perl-module
+
+DESCRIPTION="Localization support for DateTime"
+
+LICENSE="|| ( Artistic GPL-2+ ) unicode"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="test"
+
+RDEPEND="
+	virtual/perl-Carp
+	>=dev-perl/Dist-CheckConflicts-0.20.0
+	virtual/perl-Exporter
+	dev-perl/List-MoreUtils
+	dev-perl/Params-Validate
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-File-Spec
+		virtual/perl-Storable
+		dev-perl/Test-Fatal
+		>=virtual/perl-Test-Simple-0.960.0
+		dev-perl/Test-Requires
+		dev-perl/Test-Warnings
+	)
+"
--- a/dev-perl/DateTime-Locale/Manifest
+++ b/dev-perl/DateTime-Locale/Manifest
@ -1,2 +1,2 @@
-DIST DateTime-Locale-0.45.tar.gz 1079736 SHA256 8aa1b8db0baccc26ed88f8976a228d2cdf4f6ed4e10fc88c1501ecd8f3ccaf9c SHA512 dc2707b4ae5c3fd2bdaf9a5c61182925a9579474d2b5181a9350fac1a04240388cab63672384cde1a4a710cd4820305bf60d072f7f646251cdc630cf41b210df WHIRLPOOL 817e46997ef395de6dfe9c10fcbce8c18c62ad6c797b6747ec060e6f61c63a980b46b2942b3f59a3dcd6e4d8fe843f5de5d1b0e3444a9aebd41c92e47b970fe3
 DIST DateTime-Locale-0.46.tar.gz 2556441 SHA256 b4ceaa0dc0b89d4eb180eb970a927cf376e3d04ef42de98de2e034cd2021348d SHA512 36a13c10efca1299f4705a98bedd640d235df7478554f398648e124a3ecccfcd72b16b18882836d6e415e2114feb2dda4260f24774c6f741a705b1ba63b4363f WHIRLPOOL a1e071d01dfc2ce5c3250120162adcf1903569e40adfaab72f29ea5ff0daaab5a5ae29f6649c8c878a293d0b39425bb68639c0b89dd2831601701c2536000a8f
+DIST DateTime-Locale-1.02.tar.gz 930153 SHA256 63ad62bcc01c7007d233f6270c05059a6cdc4270812546450759d03d8cfcf355 SHA512 70c1fc6d06cd38553a03e3839ffd1b8aadba115159aba2fc8718d613cdadeee3bf91fe4bcb9d15b127edf633313124eea1e08913313c5fbc286999c286597c0d WHIRLPOOL 8e3cbef911f7517a821b99e974b66ddb71734925cf95a0eca5c66ff856a93581faf88815844770031e5e049b26513268cdf51675417abb337503482b5747e88b
--- a/dev-perl/DateTime-TimeZone/DateTime-TimeZone-1.810.0.ebuild
+++ b/dev-perl/DateTime-TimeZone/DateTime-TimeZone-1.810.0.ebuild
@ -1,40 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=DROLSKY
-MODULE_VERSION=1.81
-inherit perl-module
-
-DESCRIPTION="Time zone object base class and factory"
-
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-IUSE="test"
-
-RDEPEND="
-	dev-perl/Class-Load
-	>=dev-perl/Class-Singleton-1.30.0
-	virtual/perl-File-Spec
-	dev-perl/List-AllUtils
-	dev-perl/Module-Runtime
-	>=dev-perl/Params-Validate-0.720.0
-	virtual/perl-Scalar-List-Utils
-	dev-perl/Try-Tiny
-	virtual/perl-parent
-"
-DEPEND="${RDEPEND}
-	>=virtual/perl-ExtUtils-MakeMaker-6.310.0
-	test? (
-		virtual/perl-File-Spec
-		virtual/perl-File-Temp
-		virtual/perl-Storable
-		dev-perl/Test-Fatal
-		dev-perl/Test-Requires
-		>=virtual/perl-Test-Simple-0.920.0
-	)
-"
-
-SRC_TEST="do"
--- a/dev-perl/DateTime-TimeZone/DateTime-TimeZone-1.930.0.ebuild
+++ b/dev-perl/DateTime-TimeZone/DateTime-TimeZone-1.930.0.ebuild
@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Time zone object base class and factory"

 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="test"

 RDEPEND="
--- a/dev-perl/DateTime-TimeZone/DateTime-TimeZone-1.940.0.ebuild
+++ b/dev-perl/DateTime-TimeZone/DateTime-TimeZone-1.940.0.ebuild
@ -2,10 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$

-EAPI=5
+EAPI=6

-MODULE_AUTHOR=DROLSKY
-MODULE_VERSION=1.88
+DIST_AUTHOR=DROLSKY
+DIST_VERSION=1.94
 inherit perl-module

 DESCRIPTION="Time zone object base class and factory"
@ -17,8 +17,7 @@ IUSE="test"
 RDEPEND="
 	>=dev-perl/Class-Singleton-1.30.0
 	virtual/perl-File-Spec
-	dev-perl/List-AllUtils
-	virtual/perl-Scalar-List-Utils
+	>=virtual/perl-Scalar-List-Utils-1.330.0
 	dev-perl/Module-Runtime
 	>=dev-perl/Params-Validate-0.720.0
 	dev-perl/Try-Tiny
@ -35,5 +34,3 @@ DEPEND="${RDEPEND}
 		>=virtual/perl-Test-Simple-0.960.0
 	)
 "
-
-SRC_TEST=do
--- a/Show more
+++ b/Show more