removed depcracted ebuilds

Package-Manager: Portage-2.3.19, Repoman-2.3.6

98 files changed, 588 insertions, 1446 deletions

diff --git a/app-admin/eselect-gradle/Manifest b/app-admin/eselect-gradle/Manifest
deleted file mode 100644
index f56ef7d..0000000
--- a/app-admin/eselect-gradle/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-AUX gradle.eselect 3077 SHA256 75c434f77079b1cfea0a61a815a6e9dcaa84dbf10ca50415e34b2addc048aab7 SHA512 e475a7447a8d7918617e558347493c235a94fda56055c056f1f5a490865c4be1ffc2c427bf3852e00a3122a9be40fcb3633147a47e552d1c10b45231f39cf2e2 WHIRLPOOL 7a1d6184a4596895070e821ba323b7bca9a63df993be9ada206981790f47cffc301a56157a8110736889a3564dd3a1e9e350db57bca21f62e3a510ed80496054
-EBUILD eselect-gradle-0.1.ebuild 408 SHA256 2542f759da7f39dec5255519bbfa75ddb928c09e8ff0b646a28c793f60acee18 SHA512 fd75fd78e919cbab1b1c70e61f1789c89d40df573df284268d5755d64f1687f1018ab7075f5fc2ff0c662199f6f5d5d8fe41452bca26c1cbc238c720dd70e21d WHIRLPOOL 4b1313c64af96c772bf764b2b06daad2b5d3f38db58b73b835c4de8db95b062aa9921652e5f2c3814ad7dd0c9d8258075a7ea684bd28e3757f0233b5d77ae86c
diff --git a/app-admin/eselect-gradle/eselect-gradle-0.1.ebuild b/app-admin/eselect-gradle/eselect-gradle-0.1.ebuild
deleted file mode 100644
index 7920cdd..0000000
--- a/app-admin/eselect-gradle/eselect-gradle-0.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-DESCRIPTION="Manage multiple Gradle versions on one system"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="app-admin/eselect"
-
-S="${WORKDIR}"
-
-src_install() {
-	insinto /usr/share/eselect/modules
-	doins ${FILESDIR}/gradle.eselect
-}
diff --git a/app-admin/eselect-gradle/files/gradle.eselect b/app-admin/eselect-gradle/files/gradle.eselect
deleted file mode 100644
index 853143e..0000000
--- a/app-admin/eselect-gradle/files/gradle.eselect
+++ /dev/null
@@ -1,131 +0,0 @@
-# -*-eselect-*-  vim: ft=eselect
-# Copyright 2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2 or later
-# $Id: $
-
-DESCRIPTION="Manage the /usr/bin/gradle symlink"
-MAINTAINER=""
-VERSION=0.1
-
-# find a list of gradle symlink targets
-find_targets() {
-	local f
-	for f in "${EROOT}"/usr/bin/gradle?(-bin)-[[:digit:]]*; do
-		[[ -x ${f} ]] && basename "${f}"
-	done
-}
-
-remove_symlink() {
-	rm "${EROOT}/usr/bin/gradle" \
-		|| die -q "Could not remove symlink"
-}
-
-set_symlink() {
-	local target=$1
-
-	if is_number "${target}"; then
-		local targets=( $(find_targets) )
-		target=${targets[target-1]}
-	fi
-
-	[[ -z ${target} ]] \
-		&& die -q "Target \"${1}\" doesn't apper to be valid!"
-
-	[[ ! -x ${EROOT}/usr/bin/${target} ]] \
-		&& die -q "${EROOT}/usr/bin/${target} is not an executable"
-
-	ln -s "${target}" "${EROOT}/usr/bin/gradle" \
-		|| die -q "Could not set symlink"
-}
-
-describe_show() {
-	echo "Shows the current gradle symlink"
-}
-
-do_show() {
-	write_list_start "Current gradle symlink:"
-	if [[ -L ${EROOT}/usr/bin/gradle ]]; then
-		local gradle=$(cannonicalise "${EROOT}/usr/bin/gradle")
-		write_kv_list_entry "${gradle}" ""
-	else
-		write_kv_list_entry "(unset)" ""
-	fi
-}
-
-describe_list() {
-	echo "list available gradle symlink targets"
-}
-
-do_list() {
-	local i targets=( $(find_targets) )
-
-	write_list_start "Available gradle symlink targets:"
-	for (( i = 0; i < ${#targets[@]}; i++ )); do
-		# highligh the target where the symlink is pointing to
-		[[ ${targets[i]} = \
-			$(basename "$(canonicalise "${EROOT}/usr/bin/gradle")") ]] \
-			&& targets[i]=$(highlight_marker "${targets[i]}")
-	done
-	write_numbered_list -m "(none found)" "${targets[@]}"
-}
-
-describe_set() {
-	echo "Set a new gradle symlink target"
-}
-
-describe_set_parameters() {
-	echo "<target>"
-}
-
-describe_set_options() {
-	echo "target : Target name or number (from 'list' action)"
-}
-
-do_set() {
-	[[ -z $1 ]] && die -q "You didn't tell me what to set the symlink to"
-	[[ $# -gt 1 ]] && die -q "Too many parameters"
-	test_for_root
-
-	if [[ -L ${EROOT}/usr/bin/gradle ]]; then
-		# existing symmlink
-		remove_symlink
-		set_symlink "$1"
-	elif [[ -e ${EROOT}/usr/bin/gradle ]]; then
-		# we have someting strange
-		die -q "${EROOT}/usr/bin/gradle exists but is not a symlink"
-	else
-		set_symlink "$1"
-	fi
-}
-
-describe_update() {
-	echo "Automatically update the gradle symlink"
-}
-
-describe_update_options() {
-	echo "ifunset: Do not override currently set version"
-}
-
-do_update() {
-	[[ -z $1 || $1 == ifunset ]] || die -q "Usage error"
-	[[ $# -gt 1 ]] && die -q "Too many parameters"
-	test_for_root
-
-	if [[ -L ${EROOT}/usr/bin/gradle ]]; then
-		if [[ $1 == ifunset && -e ${EROOT}/usr/bin/gradle ]]; then
-			return
-		fi
-		remove_symlink
-	elif [[ -e ${EROOT}/usr/bin/gradle ]]; then
-		die -q "${EROOT}/usr/bin/gradle exists but is not a symlink"
-	fi
-
-	local targets=( $(find_targets) )
-	if [[ ${#targets[@]} -gt 0 ]]; then
-		set_symlink "${targets[${#targets[@]}-1]}"
-	fi
-}
-
-test_for_root() {
-	[[ -w ${EROOT}/usr/bin ]] || die -q "${EROOT}/usr/bin not writeable by current user. Are you root?"
-}
diff --git a/app-admin/gopass/Manifest b/app-admin/gopass/Manifest
deleted file mode 100644
index 347249c..0000000
--- a/app-admin/gopass/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-DIST gopass-1.0.1.tar.gz 817374 SHA256 729e3545a0582b5ff060c6b292dc11d894ef1cf9e02c4af401af1ed8c378c68c SHA512 4ccfa2d0bd0a54b75baa17aa3ddc8e8903d12e8702ec9ccbd0d33de8702d9ae6f3a1f0cfe7c9c91af963485cf148bc8b6d18c6e3873ad69b825b8b0d100a36d8 WHIRLPOOL 0b0d91179979615f0eb5e8129acb5e13db1b41c5870c93c3238781a99b44b6881090107c8c72752b3d35522655bf0bf8dddf0fee7081f69799cb04006490fb8d
-DIST gopass-1.0.2.tar.gz 846174 SHA256 aeab11850dd6956e5680150c070fc142f043631738d66f3e3c1bdcbf03682bda SHA512 eaf3ef77fd7f487bb5ee63abd7ca8a076216a52679a6cafcd5171d2ebd27b456208cfc8ed752fb65b63d1bd3bf26ca2322c2bc52f5b69518419fef976eed647f WHIRLPOOL 44d59f251bfde2523315f5bd4ff7c210c411e50160519712e74b904d50707d529a3ec65dc24362ff8351644e472f84e8365255aef5d6c51a4484830e6d2e4d5d
-DIST gopass-1.2.0.tar.gz 865343 SHA256 0e66eef04173ecdcc7aec38a8d9ec08192f4be17322adaeb83326add7534729b SHA512 fab9427b989bf5d49dd16e162217438393dc1d883ad2381bdb9ab94883aef84af52a658872f429007f156bf7150ffddb5ac371d5d09fd6527e15ab1953633b0e WHIRLPOOL 383f22d42ea7caf86a31c1c9f3357cc17988d35ba4ca407a0eaccb3663b23e31fb095804c5c4aac922f00e377f3baafea5a8dde8d69be108fc67f70610e9eb29
-EBUILD gopass-1.0.1.ebuild 1188 SHA256 d4876411bec25c31371ebe5663a57f6248b7b12414f5878428bd06cda402dcfa SHA512 70f5cd9a107901ded38d16122dc6c9206f4d080853a1702c3b00202f2faf8308aea9d3067e9e4e9954013553d9307dad7726a151c7820c8784c8ddcfb71f2e5b WHIRLPOOL 8951105dcf5502339612b77e0e2ccb8fc6210bfb51014ccc74dbc091726041ed1c8e6098bf00410e62b2aa8c500e00585a7dc17ceba1be852cd1624f94b32932
-EBUILD gopass-1.0.2.ebuild 1187 SHA256 572b16bbcb09f93289fba77814c1b436ec3d973af17cbe2f376ce2bbb1d4f078 SHA512 15bd72d932a2a7ad19643e5043a8be6869fc988258a8ad002a028aee38f8189bbeb59345e9c8113a9262281a3cd68d5dc783b2fd9d608dcc685fdc22f2633ff3 WHIRLPOOL c94438059cbb7455a89e01c187ff9771953797c30a1b423c39fb01d39107014095b5e64e922dbda5ab8d6ab663988498c9e8af15203009f147a4b5efc5416fd4
-EBUILD gopass-1.2.0.ebuild 1187 SHA256 572b16bbcb09f93289fba77814c1b436ec3d973af17cbe2f376ce2bbb1d4f078 SHA512 15bd72d932a2a7ad19643e5043a8be6869fc988258a8ad002a028aee38f8189bbeb59345e9c8113a9262281a3cd68d5dc783b2fd9d608dcc685fdc22f2633ff3 WHIRLPOOL c94438059cbb7455a89e01c187ff9771953797c30a1b423c39fb01d39107014095b5e64e922dbda5ab8d6ab663988498c9e8af15203009f147a4b5efc5416fd4
-EBUILD gopass-9999.ebuild 1188 SHA256 d4876411bec25c31371ebe5663a57f6248b7b12414f5878428bd06cda402dcfa SHA512 70f5cd9a107901ded38d16122dc6c9206f4d080853a1702c3b00202f2faf8308aea9d3067e9e4e9954013553d9307dad7726a151c7820c8784c8ddcfb71f2e5b WHIRLPOOL 8951105dcf5502339612b77e0e2ccb8fc6210bfb51014ccc74dbc091726041ed1c8e6098bf00410e62b2aa8c500e00585a7dc17ceba1be852cd1624f94b32932
-MISC metadata.xml 618 SHA256 3dce4f82dc34dd1e081707b7c4f451e64aec45b7926c6c9d55a4b42403cc4208 SHA512 8426972607b6d6bcca83dcce41e3a9def8f858901878a2c4fc456bfad2948ef3eadac96d8359f8469675aa3496dae572795f6ae1c007d43d08139816d71c42a7 WHIRLPOOL 0c8411f00620be3bc3e5d4b74d8efd6e833153aa7da3df7b5d2fd16f43e5c53b6ebce4334e3131f6cd43e6d5c43548b075275edcdfafd63291a7883efb8d27b0
diff --git a/app-admin/gopass/gopass-1.0.1.ebuild b/app-admin/gopass/gopass-1.0.1.ebuild
deleted file mode 100644
index 47b0643..0000000
--- a/app-admin/gopass/gopass-1.0.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit bash-completion-r1
-
-EGO_PN=github.com/justwatchcom/${PN}
-
-if [[ ${PV} == 9999 ]]; then
-	inherit golang-vcs
-else
-	KEYWORDS="~amd64 ~x86 ~arm"
-	EGIT_COMMIT="v${PV}"
-	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	inherit golang-vcs-snapshot
-fi
-
-DESCRIPTION="The team password manager. Written in Go."
-HOMEPAGE="https://www.justwatch.com/gopass"
-LICENSE="MIT"
-SLOT="0"
-IUSE="X zsh-completion test symlink"
-DEPEND=">=dev-lang/go-1.6:="
-RDEPEND="
-	app-crypt/gnupg
-	X? ( x11-misc/xclip )
-	zsh-completion? ( app-shells/gentoo-zsh-completions )
-	dev-vcs/git
-	symlink? ( !app-admin/pass )
-"
-
-src_compile() {
-	cd "${S}"/src/${EGO_PN} || die
-	GOPATH="${S}" LDFLAGS="" emake build || die
-}
-
-src_install() {
-	cd "${S}"/src/${EGO_PN} || die
-	emake DESTDIR="${D}" install
-	if use zsh-completion; then
-		emake zsh.completion || die
-		insinto /usr/share/zsh/site-functions
-		newins zsh.completion _${PN}
-	fi
-	emake bash.completion || die
-	newbashcomp bash.completion ${PN}
-	einstalldocs
-
-	if use symlink ; then
-		dosym gopass /usr/bin/pass
-	fi
-}
-
diff --git a/app-admin/gopass/gopass-1.0.2.ebuild b/app-admin/gopass/gopass-1.0.2.ebuild
deleted file mode 100644
index c6c0bbe..0000000
--- a/app-admin/gopass/gopass-1.0.2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit bash-completion-r1
-
-EGO_PN=github.com/justwatchcom/${PN}
-
-if [[ ${PV} == 9999 ]]; then
-	inherit golang-vcs
-else
-	KEYWORDS="~amd64 ~x86 ~arm"
-	EGIT_COMMIT="v${PV}"
-	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	inherit golang-vcs-snapshot
-fi
-
-DESCRIPTION="The team password manager. Written in Go."
-HOMEPAGE="https://www.justwatch.com/gopass"
-LICENSE="MIT"
-SLOT="0"
-IUSE="X zsh-completion test symlink"
-DEPEND=">=dev-lang/go-1.6:="
-RDEPEND="
-	app-crypt/gnupg
-	X? ( x11-misc/xclip )
-	zsh-completion? ( app-shells/gentoo-zsh-completions )
-	dev-vcs/git
-	symlink? ( !app-admin/pass )
-"
-
-src_compile() {
-	cd "${S}"/src/${EGO_PN} || die
-	GOPATH="${S}" LDFLAGS="" emake build || die
-}
-
-src_install() {
-	cd "${S}"/src/${EGO_PN} || die
-	emake DESTDIR="${D}" install
-	if use zsh-completion; then
-		emake zsh.completion || die
-		insinto /usr/share/zsh/site-functions
-		newins zsh.completion _${PN}
-	fi
-	emake bash.completion || die
-	newbashcomp bash.completion ${PN}
-	einstalldocs
-
-	if use symlink ; then
-		dosym gopass /usr/bin/pass
-	fi
-}
diff --git a/app-admin/gopass/gopass-1.2.0.ebuild b/app-admin/gopass/gopass-1.2.0.ebuild
deleted file mode 100644
index c6c0bbe..0000000
--- a/app-admin/gopass/gopass-1.2.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit bash-completion-r1
-
-EGO_PN=github.com/justwatchcom/${PN}
-
-if [[ ${PV} == 9999 ]]; then
-	inherit golang-vcs
-else
-	KEYWORDS="~amd64 ~x86 ~arm"
-	EGIT_COMMIT="v${PV}"
-	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	inherit golang-vcs-snapshot
-fi
-
-DESCRIPTION="The team password manager. Written in Go."
-HOMEPAGE="https://www.justwatch.com/gopass"
-LICENSE="MIT"
-SLOT="0"
-IUSE="X zsh-completion test symlink"
-DEPEND=">=dev-lang/go-1.6:="
-RDEPEND="
-	app-crypt/gnupg
-	X? ( x11-misc/xclip )
-	zsh-completion? ( app-shells/gentoo-zsh-completions )
-	dev-vcs/git
-	symlink? ( !app-admin/pass )
-"
-
-src_compile() {
-	cd "${S}"/src/${EGO_PN} || die
-	GOPATH="${S}" LDFLAGS="" emake build || die
-}
-
-src_install() {
-	cd "${S}"/src/${EGO_PN} || die
-	emake DESTDIR="${D}" install
-	if use zsh-completion; then
-		emake zsh.completion || die
-		insinto /usr/share/zsh/site-functions
-		newins zsh.completion _${PN}
-	fi
-	emake bash.completion || die
-	newbashcomp bash.completion ${PN}
-	einstalldocs
-
-	if use symlink ; then
-		dosym gopass /usr/bin/pass
-	fi
-}
diff --git a/app-admin/gopass/gopass-9999.ebuild b/app-admin/gopass/gopass-9999.ebuild
deleted file mode 100644
index 47b0643..0000000
--- a/app-admin/gopass/gopass-9999.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit bash-completion-r1
-
-EGO_PN=github.com/justwatchcom/${PN}
-
-if [[ ${PV} == 9999 ]]; then
-	inherit golang-vcs
-else
-	KEYWORDS="~amd64 ~x86 ~arm"
-	EGIT_COMMIT="v${PV}"
-	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	inherit golang-vcs-snapshot
-fi
-
-DESCRIPTION="The team password manager. Written in Go."
-HOMEPAGE="https://www.justwatch.com/gopass"
-LICENSE="MIT"
-SLOT="0"
-IUSE="X zsh-completion test symlink"
-DEPEND=">=dev-lang/go-1.6:="
-RDEPEND="
-	app-crypt/gnupg
-	X? ( x11-misc/xclip )
-	zsh-completion? ( app-shells/gentoo-zsh-completions )
-	dev-vcs/git
-	symlink? ( !app-admin/pass )
-"
-
-src_compile() {
-	cd "${S}"/src/${EGO_PN} || die
-	GOPATH="${S}" LDFLAGS="" emake build || die
-}
-
-src_install() {
-	cd "${S}"/src/${EGO_PN} || die
-	emake DESTDIR="${D}" install
-	if use zsh-completion; then
-		emake zsh.completion || die
-		insinto /usr/share/zsh/site-functions
-		newins zsh.completion _${PN}
-	fi
-	emake bash.completion || die
-	newbashcomp bash.completion ${PN}
-	einstalldocs
-
-	if use symlink ; then
-		dosym gopass /usr/bin/pass
-	fi
-}
-
diff --git a/app-admin/gopass/metadata.xml b/app-admin/gopass/metadata.xml
deleted file mode 100644
index 23b8f3a..0000000
--- a/app-admin/gopass/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>andy@ndyk.de</email>
-	</maintainer>
-	<longdescription lang="en">
-		gopass is a simple but powerful password manager for your terminal. 
-		100% pass compatible, team support and auto git push.
-		It stores each password in a gpg encrypted file that lives in the 
-		regular directory on your drive. This directory can optionally be 
-		managed using git. This makes it very easy to share 
-		a passwordstore with other people.
-	</longdescription>
-</pkgmetadata>
diff --git a/app-emulation/vagrant-bin/Manifest b/app-emulation/vagrant-bin/Manifest
deleted file mode 100644
index 2184709..0000000
--- a/app-emulation/vagrant-bin/Manifest
+++ /dev/null
@@ -1,14 +0,0 @@
-DIST vagrant_1.3.3_x86_64.deb 24368864 SHA256 d521858bd025ee79705495b00cc64eb88de3fe990dec6bda8a6b7382f9272153 SHA512 11c8b20aab0b137101eb31176060846fc2de71ce309ef3362d72ceee84a3c82b69f661c03180d15905d3c68382f0c95d4c2a42a668772da7338346489faf3e84 WHIRLPOOL 7cd76dfd193c2f05dd6b80ac9e43fb88da697dd52631ea66fa2ffacb7f63b08e489ff3c053744907b28323ad3a3f4744926e6a7582d62a5a062a482385377714
-DIST vagrant_1.3.5_i686.deb 23470646 SHA256 30a656ba96b07618e3b2506d3bc3ded706a33f375a46d866504c567484820137 SHA512 5fc43e78e4d3b38318e42e2309de8850cbb788438066efd2c43c7a71bd5d4c4d3eb1a471b4ac4936bc1b21f276543af24b1df71f32bfa6b9a3eae0870374f1fa WHIRLPOOL 0f607642f93d0c679db975beb46331c4e97b994184b0a92c52b8496472fb529677170d88a256cae1d71e28f2c03a43dfaeda848a4f29c132d60bf18a754efbdd
-DIST vagrant_1.3.5_x86_64.deb 24386372 SHA256 db7d06f46e801523d97b6e344ea0e4fe942f630cc20ab1706e4c996872f8cd71 SHA512 d7a6dc918110e7c8f5caad50e363fad4a7646f27af5d024f3871166b4e228907df8a7c13ab26fbbafa67cdc1d0acedd798381937702f0ddb100ffbd105f715fd WHIRLPOOL 6db2385c66d155c832a4cb92fa34741cfc0dda7ba52e6459bae5447929e6a490101599e2a6999eaf9089b64df0017b8d1ad325b8fe74060d71658ca4e334b754
-DIST vagrant_1.5.2_i686.deb 53710246 SHA256 2444c4e49fd397a98c4f1e8fcc540d26d8a8c766c9df4ea9c089042ad7a650c7 SHA512 975f55093fc366fc9221b3046bcce604f929477fd490a8953b13caeb77763b9d04a00a68c3a7fedfefeceec6b9f51bc12d7302674e19411b28b2c48f71309d34 WHIRLPOOL 35a04512dbd906044e6cb38dd815efcc4ef2b3c8e1becba1580c7f321491d3695aaadc77e33ab589cdefbaf821760c61766ea77620e9bc9b1df603dfd47a4fe0
-DIST vagrant_1.5.2_x86_64.deb 55327296 SHA256 bd20d89df7e33984614092b25864b530d4b73d4db1d04eab396f0457c184b6d7 SHA512 00cfed066e19fdd1365f541eb894838e423c9a00c1d9750ec920a0599c27c96737c1df921d4afdc2b4b02d1f8b940fab307d53a8b680a20069d772261b7caa83 WHIRLPOOL c2cefc1cf14dbeb8432358d7b331956eb4794634dcd5439201b0c4e1839b92610738387f00fd3d0dfa9561dfef798ea049e699e63d39f8b9ca592f5a081f0f06
-DIST vagrant_1.5.4_i686.deb 54110274 SHA256 82d52325550747622a6f4d9f74c126418c46dc8c40ac2acf6b95cb06fd158155 SHA512 60b7cd2ca375266ce73e7ea2e49e46f6293daffb8f9b5e011ce2d44f832262d40eb6bb7731a37651dda7e1d6ce83312e80b30727f48ae1abbf76eb1cb235e517 WHIRLPOOL 58e381c2a77a228357e814d7324ea55174bd4076fa8f43fd8188d7f431ca355f64071802a9e8d9487cd4b39cf470fe7e7eb4e253cbfae48a116698677d600bff
-DIST vagrant_1.5.4_x86_64.deb 55737164 SHA256 08142c24d6d26a0c22edf74cc912d1fd4bbef533751fcaf74dbc1418f4d2da1f SHA512 5af2ca1b3215ff793c9bfa5d544bad61b267b94fadc2709d9353ae6bd20a097396d50bae1f3e15df3a3a57849af2eb92a2f2f69460f700ef38247e5106e02020 WHIRLPOOL fbc5f5f573dc59c3ef28d3f0989ef1323a91c7df3e56f051d639a2ae5115e601b87d33cafa6ca04a64a897313b0534da6b5a1ae707f137897b5ff4169dc50df9
-DIST vagrant_1.6.1_i686.deb 92457308 SHA256 8a943dbdbacefb9281c41c96e58beeeb29117471ac15ebf11b635e30ef718bb3 SHA512 cc53a1b8c4c033186b890304d0470bbe05b87a1712d4f536d2c8f9bcc796184c5e7d730ac1a6c85460dd21d38e16bf28977ae7d7673fa01626d38a38985cf142 WHIRLPOOL 9c9d71026875c1dde577ac8832a041e6260ac30a8bc97ed5dc1676f60b2a39965a7fa0076118c520ac772bb793c92e7922e1d4a06ba64a77509ce08c03a7e869
-DIST vagrant_1.6.1_x86_64.deb 94699850 SHA256 bb1fb53afb6fb898579d8c28fcd681ec88b7a1a1e1ada0b106acee0dd7631465 SHA512 7a89a92c3d50599663b754e0388ffe7cb7c691b8852c62ef24b68cfe1c1cdb3f106f34c43aba949e6adc1d036c0dbddd6cc30c999721d6b7351669a2eb435bf7 WHIRLPOOL 34f27ccdc2ba36f05513b79fdcebde51560ab8ac7c62e95e5e0550cf91a0ed29865941fb909d61d8699c7328293fdef31d362b91f2068238355ec17336a4b30f
-EBUILD vagrant-bin-1.3.3.ebuild 594 SHA256 01f55a7e8771c2fa815a4c77bb9b202a348b84cd2fa5172a6643c5cbd5ae1b9f SHA512 5ee3b129fb989338e1ae23f180891eef03098e8bd709ef77c70cb7cd68f568b81e48c5a085581442d8e7213c44d167482d6c8457e97b31d4371be170148e2361 WHIRLPOOL 64ef7d9d9ed64323e27872bee9e127278581b0ebf873d05c7f7e07db66cebcf902f41ef5d73ce51dcd67dbe95bd7f8e1a41c137f91852e25b9524b84316ccfb8
-EBUILD vagrant-bin-1.3.5.ebuild 820 SHA256 a5ca4c8cb2eb14773689284b84a9d871848913ee4c142dd777725a4da6a51b8b SHA512 185d8b79a04e40e319d57769d7913e951f51f64bf497fbbb5168b8ac3d1888720844177c8d89e9d68bc4dc87d21717238b234059621b4237ab9688ad72792ff1 WHIRLPOOL 65b828efb67da10c8ebe3a61b951fe7ea3e3a7b62a452a5b48f072cef468b2496831c9f622c19fce22e42e7c9213026590c7a133c65e25cf37570df41ab1308b
-EBUILD vagrant-bin-1.5.2.ebuild 820 SHA256 5a26f503b4ba9f5eb3436ce5a471c5e687dd6494899f9a6c9eedcdaed6786ae6 SHA512 5e1276833b9e01a0ec2f8fa381546bebc1b84889eb4363e0fb0c20e608842955a9c984a980288d89d3adcf6621a844a5994b3589a74cdbe7ea8a59b1312e07d7 WHIRLPOOL 1baaa3c18236cfff96c7b3f507ff7fb3760b995d08cec7268e500b88948a4628203f0683a3d8241c2e990011b06b23af981237ff8d6d664bc63eb624b8532f42
-EBUILD vagrant-bin-1.5.4.ebuild 820 SHA256 5a26f503b4ba9f5eb3436ce5a471c5e687dd6494899f9a6c9eedcdaed6786ae6 SHA512 5e1276833b9e01a0ec2f8fa381546bebc1b84889eb4363e0fb0c20e608842955a9c984a980288d89d3adcf6621a844a5994b3589a74cdbe7ea8a59b1312e07d7 WHIRLPOOL 1baaa3c18236cfff96c7b3f507ff7fb3760b995d08cec7268e500b88948a4628203f0683a3d8241c2e990011b06b23af981237ff8d6d664bc63eb624b8532f42
-EBUILD vagrant-bin-1.6.1.ebuild 767 SHA256 a80b9ce95a0c6df37b77b880157c9201d23acc3f505845c089ebc62167637b42 SHA512 802302bcbaf5fb7cb3d85fa9228b1db8a96cd7f32c8ee2f940b4dc5726e3bd6a38a2b6f0c26df1d5242fc8087181c196a9c51de3e965b86651f6f8db1f0a1ff1 WHIRLPOOL 4e7ef75927b3cfed0bf774727b549dc9704bc67432ba295a28ae5cff8360aa7e7fcd0ac8ecfcb7a9ef35a4e69c4f4694b36b949e6df0f85dce0d3126b54deb17
diff --git a/app-emulation/vagrant-bin/vagrant-bin-1.3.3.ebuild b/app-emulation/vagrant-bin/vagrant-bin-1.3.3.ebuild
deleted file mode 100644
index 7f6741c..0000000
--- a/app-emulation/vagrant-bin/vagrant-bin-1.3.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit multilib unpacker eutils
-
-DESCRIPTION="Vagrant binary Package"
-HOMEPAGE=""
-SRC_URI="http://files.vagrantup.com/packages/db8e7a9c79b23264da129f55cf8569167fc22415/vagrant_1.3.3_x86_64.deb"
-
-LICENSE="gpl"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/opt/vagrant"
-QA_PREBUILT="*"
-
-src_install() {
-    local version flapper
-
-	dodir /opt/vagrant
-	cp -r ./* "${ED}opt/vagrant"
-
-	make_wrapper vagrant /opt/vagrant/bin/vagrant
-}
-
diff --git a/app-emulation/vagrant-bin/vagrant-bin-1.3.5.ebuild b/app-emulation/vagrant-bin/vagrant-bin-1.3.5.ebuild
deleted file mode 100644
index b380a8b..0000000
--- a/app-emulation/vagrant-bin/vagrant-bin-1.3.5.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit multilib unpacker eutils
-
-MY_COMMIT="a40522f5fabccb9ddabad03d836e120ff5d14093"
-DESCRIPTION="Vagrant is a tool for building complete development environments."
-HOMEPAGE="http://www.vagrantup.com/"
-SRC_URI_BASE="http://files.vagrantup.com/packages/${MY_COMMIT}"
-SRC_URI="x86? ( ${SRC_URI_BASE}/${PN/-bin/}_${PV}_i686.deb )
-         amd64? ( ${SRC_URI_BASE}/${PN/-bin/}_${PV}_x86_64.deb )"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="test strip"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/opt/vagrant"
-QA_PREBUILT="*"
-
-src_install() {
-    local version flapper
-
-	dodir /opt/vagrant
-	cp -r ./* "${ED}opt/vagrant"
-
-	make_wrapper vagrant /opt/vagrant/bin/vagrant
-}
diff --git a/app-emulation/vagrant-bin/vagrant-bin-1.5.2.ebuild b/app-emulation/vagrant-bin/vagrant-bin-1.5.2.ebuild
deleted file mode 100644
index 2bdfebc..0000000
--- a/app-emulation/vagrant-bin/vagrant-bin-1.5.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit multilib unpacker eutils
-
-MY_COMMIT="a40522f5fabccb9ddabad03d836e120ff5d14093"
-DESCRIPTION="Vagrant is a tool for building complete development environments."
-HOMEPAGE="http://www.vagrantup.com/"
-SRC_URI_BASE="http://dl.bintray.com/mitchellh/vagrant/"
-SRC_URI="x86? ( ${SRC_URI_BASE}/${PN/-bin/}_${PV}_i686.deb )
-         amd64? ( ${SRC_URI_BASE}/${PN/-bin/}_${PV}_x86_64.deb )"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="test strip mirror"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/opt/vagrant"
-QA_PREBUILT="*"
-
-src_install() {
-    local version flapper
-
-	dodir /opt/vagrant
-	cp -ar ./* "${ED}opt/vagrant"
-
-	make_wrapper vagrant /opt/vagrant/bin/vagrant
-}
diff --git a/app-emulation/vagrant-bin/vagrant-bin-1.5.4.ebuild b/app-emulation/vagrant-bin/vagrant-bin-1.5.4.ebuild
deleted file mode 100644
index 2bdfebc..0000000
--- a/app-emulation/vagrant-bin/vagrant-bin-1.5.4.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit multilib unpacker eutils
-
-MY_COMMIT="a40522f5fabccb9ddabad03d836e120ff5d14093"
-DESCRIPTION="Vagrant is a tool for building complete development environments."
-HOMEPAGE="http://www.vagrantup.com/"
-SRC_URI_BASE="http://dl.bintray.com/mitchellh/vagrant/"
-SRC_URI="x86? ( ${SRC_URI_BASE}/${PN/-bin/}_${PV}_i686.deb )
-         amd64? ( ${SRC_URI_BASE}/${PN/-bin/}_${PV}_x86_64.deb )"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="test strip mirror"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/opt/vagrant"
-QA_PREBUILT="*"
-
-src_install() {
-    local version flapper
-
-	dodir /opt/vagrant
-	cp -ar ./* "${ED}opt/vagrant"
-
-	make_wrapper vagrant /opt/vagrant/bin/vagrant
-}
diff --git a/app-emulation/vagrant-bin/vagrant-bin-1.6.1.ebuild b/app-emulation/vagrant-bin/vagrant-bin-1.6.1.ebuild
deleted file mode 100644
index 241fec8..0000000
--- a/app-emulation/vagrant-bin/vagrant-bin-1.6.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit multilib unpacker eutils
-
-DESCRIPTION="Vagrant is a tool for building complete development environments."
-HOMEPAGE="http://www.vagrantup.com/"
-SRC_URI_BASE="http://dl.bintray.com/mitchellh/vagrant/"
-SRC_URI="x86? ( ${SRC_URI_BASE}/${PN/-bin/}_${PV}_i686.deb )
-         amd64? ( ${SRC_URI_BASE}/${PN/-bin/}_${PV}_x86_64.deb )"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="test strip mirror"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/opt/vagrant"
-QA_PREBUILT="*"
-
-src_install() {
-    local version flapper
-
-	dodir /opt/vagrant
-	cp -ar ./* "${ED}opt/vagrant"
-
-	make_wrapper vagrant /opt/vagrant/bin/vagrant
-}
diff --git a/app-misc/khal/ChangeLog b/app-misc/khal/ChangeLog
deleted file mode 100644
index ee32e04..0000000
--- a/app-misc/khal/ChangeLog
+++ /dev/null
@@ -1,16 +0,0 @@
-# ChangeLog for app-misc/khal
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-*khal-0.1.0 (06 Apr 2014)
-
-  06 Apr 2014; Andrew Karpow (ndy) <andy@ndyk.de>
-  +khal-0.1.0.ebuild
-  First release of khal
-
-*khal-9999 (08 Oct 2013)
-
-  07 Oct 2013; Andrew Karpow (ndy) <andy@ndyk.de>
-  +khal-9999.ebuild:
-  Initial commit of khal-live ebuild
-
diff --git a/app-misc/khal/Manifest b/app-misc/khal/Manifest
index 7bb463e..0b193d8 100644
--- a/app-misc/khal/Manifest
+++ b/app-misc/khal/Manifest
@@ -1,6 +1 @@
-DIST khal-0.1.0.tar.gz 160158 SHA256 3630330dc4a4bfd725433cfbbae1d5624af1098c47885e61fa3db0b5d435dc21 SHA512 4d58f0a3789187edee12364b67cce31960709db9e4d8f9d1bee2cb7a42c0b448e83d48a7f6a094ce8b36da46385255e1d2b87ceefa7334b5ec477ef389c2c32c WHIRLPOOL adaeb14fa8310eabdfcc4e0da056f6489a0b0d98b9f949f0ca592e664253ef246689530f50dc10d7c912d702e1c9f7ef4d5624e55b43a997735798d521b88ca0
-DIST khal-0.1.1.tar.gz 160169 SHA256 9c040cd90c2a3464fbf16a5a4fa5fa579781e8f57eb16bf3158913b96b44b988 SHA512 b32ac375c1d89d9bf558fb8fb28840804811a1b6b711307dc45acfe3d00a7cd935c650314a8728ba411d236852aecc3f02437364bdd9130fecec93352fa7f117 WHIRLPOOL f1d4fb451f78c10ec132581629a7c3be55376e99d00de0f02313ac0608b4019d2eb590181e6b3a1797928435fc114fda99c289db57927f31cbb252e0fb20b71d
-EBUILD khal-0.1.0.ebuild 1005 SHA256 4a372fe6001982fad84f92461a08aeb4526eada362962d888747582607534238 SHA512 96b23f8ccf4d6e65b301bbe8b78dbf85861bb1b23ae9c5ee08eb77c65004256f4caf242c20739e03339b3c34b3bf9c8afc7fea31cd7211bfb41112fa7ac21d5f WHIRLPOOL a97265185b261f3e029a718909ae69d8819cfb8a8bc85e682fa4da0b9e2ab879ab0b9bb20a116add524badd2babea8519752895e5f35069793c0c11af4d7e8e4
-EBUILD khal-0.1.1.ebuild 1005 SHA256 4a372fe6001982fad84f92461a08aeb4526eada362962d888747582607534238 SHA512 96b23f8ccf4d6e65b301bbe8b78dbf85861bb1b23ae9c5ee08eb77c65004256f4caf242c20739e03339b3c34b3bf9c8afc7fea31cd7211bfb41112fa7ac21d5f WHIRLPOOL a97265185b261f3e029a718909ae69d8819cfb8a8bc85e682fa4da0b9e2ab879ab0b9bb20a116add524badd2babea8519752895e5f35069793c0c11af4d7e8e4
-EBUILD khal-9999.ebuild 909 SHA256 5fdfc12aba044add88360ac2375fb9037a9c1b1ec7679d53824e2f26965ff29a SHA512 676bb894a281e89ffe501774d0c26ef07dee65e12e18e01fa12339ee5da1dc385d1c9302f44484fd81e6d4a244ce347e0d6cc299f317996ce05709d86be6c145 WHIRLPOOL 0a3db56a25aee8346183e64364bdd0439615d8d93f2fbb4742fc2a2109aefe4eaf01bc13b0e1ca96c8ef690dcaae4c5ec494c477fe8e0dddbf1e244a49367df9
-MISC ChangeLog 372 SHA256 aae934e9e0b10773517219ec5ab18c21154189a4d23fe2097ceb0e6dd31943c8 SHA512 4d2ed8eec92fbf8e8e6da10782948ee5a710134bd28d027f5e224a0e48f61dd33b8fb45750488ee21a48c0ee885b06facfd4af0c41db67dcff1c05ba3905c99b WHIRLPOOL 5aca9c8720580f529f189c509ef7eac8c187461ca703832185f27e1a9df66386a7b76b91c62046adc8a37bfcd42f41b8a1cbc10e71aee2364cd71b574e96130c
+MISC metadata.xml 241 SHA256 6c8bf650f92e35ce441f4f7e664c261c396bf0b7387eead268ac7ac8c78d018a SHA512 4fd289d5889d95606c00514daf808a41d37c998c80c21fed5337cd259ef3605c14dd75186bedfd1b5abed98fcb590232553332468cb218cddcc7c089af81bc76 WHIRLPOOL e98ff9e57da40346406b3827c648ca386de579ea4a4c8904dc6288a1b1018c39d4e7c81787ff6ceec710c9f05465378920feba7745d5f27261d7c49436eee54e
diff --git a/app-misc/khal/khal-0.1.0.ebuild b/app-misc/khal/khal-0.1.0.ebuild
deleted file mode 100644
index 7033a23..0000000
--- a/app-misc/khal/khal-0.1.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-PYTHON_USE_WITH="sqlite"
-
-inherit distutils-r1
-
-DESCRIPTION="CLI calendar application build around CalDAV."
-HOMEPAGE="https://github.com/geier/khal"
-SRC_URI="https://github.com/geier/khal/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~x86 ~amd64"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=dev-python/lxml-3.0.0
-	dev-python/requests
-	>=dev-python/urwid-1.1.0
-	dev-python/pyxdg
-	>=dev-python/icalendar-3.1
-	dev-lang/python[sqlite]
-	virtual/python-argparse[${PYTHON_USEDEP}]
-	dev-python/keyring"
-RDEPEND="${DEPEND}"
-
-EXAMPLES=( khal.conf.sample )
-
-pkg_postinst() {
-	ewarn "Copy and edit the supplied khal.conf.sample file"
-	ewarn "(default location is ~/.config/khal/khal.conf)."
-	ewarn "Beware that only you can access this file,"
-	ewarn "if you have untrusted users on your machine,"
-	ewarn "since the password is stored in cleartext."
-}
diff --git a/app-misc/khal/khal-0.1.1.ebuild b/app-misc/khal/khal-0.1.1.ebuild
deleted file mode 100644
index 7033a23..0000000
--- a/app-misc/khal/khal-0.1.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-PYTHON_USE_WITH="sqlite"
-
-inherit distutils-r1
-
-DESCRIPTION="CLI calendar application build around CalDAV."
-HOMEPAGE="https://github.com/geier/khal"
-SRC_URI="https://github.com/geier/khal/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~x86 ~amd64"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=dev-python/lxml-3.0.0
-	dev-python/requests
-	>=dev-python/urwid-1.1.0
-	dev-python/pyxdg
-	>=dev-python/icalendar-3.1
-	dev-lang/python[sqlite]
-	virtual/python-argparse[${PYTHON_USEDEP}]
-	dev-python/keyring"
-RDEPEND="${DEPEND}"
-
-EXAMPLES=( khal.conf.sample )
-
-pkg_postinst() {
-	ewarn "Copy and edit the supplied khal.conf.sample file"
-	ewarn "(default location is ~/.config/khal/khal.conf)."
-	ewarn "Beware that only you can access this file,"
-	ewarn "if you have untrusted users on your machine,"
-	ewarn "since the password is stored in cleartext."
-}
diff --git a/app-misc/khal/khal-9999.ebuild b/app-misc/khal/khal-9999.ebuild
deleted file mode 100644
index 645b5d9..0000000
--- a/app-misc/khal/khal-9999.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-PYTHON_USE_WITH="sqlite"
-
-inherit distutils-r1 git-2
-
-DESCRIPTION="CLI calendar application build around CalDAV."
-HOMEPAGE="https://github.com/geier/khal"
-SRC_URI=""
-EGIT_REPO_URI="${HOMEPAGE}"
-
-LICENSE="MIT"
-KEYWORDS=""
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-python/lxml
-	dev-python/requests
-	>=dev-python/urwid-1.1.0
-	dev-python/pyxdg
-	>=dev-python/icalendar-3.1
-	virtual/python-argparse[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-EXAMPLES=( khal.conf.sample )
-
-pkg_postinst() {
-	ewarn "Copy and edit the supplied khal.conf.sample file"
-	ewarn "(default location is ~/.config/khal/khal.conf)."
-	ewarn "Beware that only you can access this file,"
-	ewarn "if you have untrusted users on your machine,"
-	ewarn "since the password is stored in cleartext."
-}
diff --git a/games-board/infector/metadata.xml b/app-misc/khal/metadata.xml
index 31dc017..f078bb8 100644
--- a/games-board/infector/metadata.xml
+++ b/app-misc/khal/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-wanted@gentoo.org</email></maintainer>
+	<maintainer type="person">
+		<email>andy@ndyk.de</email>
+		<name>Andrew Karpow</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-embedded/jlink/Manifest b/dev-embedded/jlink/Manifest
deleted file mode 100644
index 14a920f..0000000
--- a/dev-embedded/jlink/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-DIST JLink_Linux_V462a.tgz 5397885 SHA256 644cfe330894f275c96ffa285b848265c4d845a3011d81a2085a33375e03ebcb SHA512 ff84ee34da514cb13062896a01ac0bb85d2d85ad1246a7da41f77c2c8505cab51c94ff7d73efc1dab391fc8f32d83c861b586f3e0846c069fe14f99caea40bdd WHIRLPOOL 2f067b50168112f52555880b37a3b99d95b430eb878d0643cf6a25e6aed05988723cd7b6e61c5842804b6ea92edd29954e84a096abef161a79329a6558eb7bd1
-DIST JLink_Linux_V474.tgz 5626682 SHA256 839d90c3e1927dfbb7c24895d12b26590874ae4ee32de27d09c0643ed79fb5d5 SHA512 f8f3f3e9e30b50a105cb048ddfe51a8f24e877da566b4faafc03a2c70037fc98c5d53a8553817a8629bed4814f4c1d924630e416df9005b681fcd69f70554997 WHIRLPOOL ef5d500c05e98864927cdfaf1b994f1b0b23791de363fa624c660543d51df7955d69ef54da78bfdd6f00b29c6483c83657600c68c677f61f2857d2824dedace8
-DIST JLink_Linux_V480e_i386.tgz 6146930 SHA256 f3939f97cfa4087fcce753adb8c86a4b242361602864d2d25dc5f87b2edb6301 SHA512 0edb82e279af708841436e444116d299d25370fdcd189d4594aed5d633e1c105787e7ee930693f61c05573dac9e6ce423c75241f0f22fe2baf8d55f14eda057c WHIRLPOOL 64c59cb4f9bd31856ec5f6ac6dd089a2c3ca0e132625721a81b6f245f02c067a9fe8754e1c57939bff35d15e0a756cb0388759102e8cf11c240df871b1d70106
-DIST JLink_Linux_V480e_x86_64.tgz 6329325 SHA256 6ebb2f4709a3574bd81e80a7cc71a462c2f7069500e4b405ece3ac1072140181 SHA512 b9fd8614219c490a30bda36598bbaeddeeec36b669f1d4dbf4f81d246dedbd4cfdf4d940be433c15e06c84238c233c89b0aeb146411e80816b943b5ee08d9b7b WHIRLPOOL a987538573e2e6e1e0c0b43c3039153a490fcbdf5d2e84bf7bfabbe67a518ea81fb0119c0ec7efa35c511f32b6229611bebb8abeb9fe83a6daa8b14c86423076
-DIST JLink_Linux_V484a_i386.tgz 6269136 SHA256 a0e69e8be3b7fc8a614e25affd312b4298409ac24b6be8aca9cfc28937bd0058 SHA512 0b31ad7445896a72248f5d60eb1ea9e299b42f406bed19f2d2cf245d7c830d542a3b8fb139eb3cf3309693ccd80bb73f642776425da7797348a9d15c8511fbff WHIRLPOOL 4477202f244a56d0aeabb27dbc96dbd5d9c70f9d80a23c90e044a54ba26591404200e99474dbc8ddc229e2f4f941742b09b5e9f63bce963474bf5b8360df19b3
-DIST JLink_Linux_V484a_x86_64.tgz 6465452 SHA256 ae54a03010c1607cf4d3b1c9f151ec98271f6d980c0be55bbb2af94c4fa19748 SHA512 4f14bdd0d6b600b72003047820d68888181adead0ba5d5ce7bb6bc09be6c58ee347cfcab41416e7621fbc02c11ce2da7edd4684b5a012f956937df1fb8eb1ad8 WHIRLPOOL 40d8f55bc209bab4372a2886eb81e6ad43cd0199f3350e89f4c51a541c6428e76c9af5694993cfe0bd9c76985324a881fc2e5ed4562e6b83566b26e2d080eb69
-EBUILD jlink-4.62a.ebuild 1570 SHA256 ae3a706b38b345f0ea27faf665de5ee775ca871f5090c1cf29901fd61ba94383 SHA512 4715c63f53eff96fc58a2ed916a5a71aef045e95709ad8b93765a0905443eae2be8ee8024927591702250e943b1fd76a9f9a7a64eaae6037cc751e4cbb07fdb9 WHIRLPOOL 008c1ab08194d9b7bab94ada02f800a1fb94fa154296609137a30073037ad441f9eabccf7304acbf8efe556ad9efd7db42eca2e3ba2ae35db52071d1458a8c0b
-EBUILD jlink-4.74.ebuild 1878 SHA256 b76410baabaf4483c7789b81e8662df50731ac49bc68785626903fa15a484ed0 SHA512 02fe3b9ee1a7eadfac1318653efdf0f5e241e5f04b1568dae70a58c795ac34b4751a969d1072c47b38a606ca1a6f8a6650201f7f8dc664848e345ebf4b3af568 WHIRLPOOL 7f4b71ad823178b4070d8ad9043de14b07c63759cbedac9f476f0d2654134d4308a5486ab166657c96ac1858986b6f6f1a30217c0380ed72f38b5926d40cbb8f
-EBUILD jlink-4.80e.ebuild 1573 SHA256 92fcf294c1ec1dd3516f3cc43ac80736159ebae80951579087195b264422f848 SHA512 f3fd7815234cd5bb95db1d006f6db36885e2a5c77276635535a9ffa5dd6db1ee35dd2ff9475bdd101b73146a75ac32b9c7585e502850f75c6ac0c1f8a5306b87 WHIRLPOOL bd8a990ffcff4f6cb10948fde52c2b81f9b9e4aee792bd4740bf19d815d9ff74b8dd5b6773fa66bd791137bca1795c9b68ef3a49ab840564f724ac3b738cd2b8
-EBUILD jlink-4.84a.ebuild 1839 SHA256 be0c5525e19d9442700381cf6d71402ade1cf637de693e731f04136778e34f9a SHA512 eb2baeabd77ea4414c8251f1fa5bfad10f9cb4939de88c6d09d53d5367d576f7dc0dfc611f259f0f496883ec6dbdb590d29f287156ed0d606b20c7a7ef986f54 WHIRLPOOL 5efd2b30caa1294464faed78041949e6357afdf22cbf079f2e45101386774388aacf311460c04983f7861f3e136e2d514c12aa69c7bf02b7e1d95e938b088529
diff --git a/dev-embedded/jlink/jlink-4.62a.ebuild b/dev-embedded/jlink/jlink-4.62a.ebuild
deleted file mode 100644
index de22686..0000000
--- a/dev-embedded/jlink/jlink-4.62a.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit eutils
-
-FILENAME="JLink_Linux_V${PV/./}"
-INSTALLDIR="/opt/${PN}"
-
-DESCRIPTION="J-Link gdb-server and commander for Segger J-Link jtag adapter"
-HOMEPAGE="http://www.segger.com/jlink-software.html"
-SRC_URI="${FILENAME}.tgz"
-
-LICENSE="J-Link EDU Terms of Use"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-RESTRICT="fetch strip"
-DEPEND=""
-RDEPEND="${DEPEND}
-	amd64? ( app-emulation/emul-linux-x86-xlibs )"
-
-S=${WORKDIR}/${FILENAME}
-
-src_install() {
-	dodir ${INSTALLDIR} || die
-	dodir ${INSTALLDIR}/lib || die
-	dodir ${INSTALLDIR}/doc || die
-
-	local BINS="JLinkExe JLinkGDBServer JLinkRemoteServer"
-	for wrapper in $BINS ; do
-		make_wrapper $wrapper ./$wrapper ${INSTALLDIR} lib
-	done
-
-	exeinto ${INSTALLDIR}
-	doexe $BINS || die
-
-	exeinto ${INSTALLDIR}/lib
-	doexe "libjlinkarm.so.${PV}" || die
-	dosym "libjlinkarm.so.${PV}" ${INSTALLDIR}/lib/libjlinkarm.so.${PV:0:1} || die
-	if use amd64; then
-		dosym /lib32/libreadline.so.6 ${INSTALLDIR}/lib/libreadline.so.5 || die
-	fi
-
-	insinto ${INSTALLDIR}/doc
-	doins README.txt || die
-	doins Doc/{UM08001_JLinkARM.pdf,UM08005_JLinkGDBServer.pdf} || die
-	doins Doc/ReleaseNotes/ReleaseJLinkARM.html || die
-
-	insinto ${INSTALLDIR}
-	doins -r Samples || die "doins failed"
-
-	insinto /lib/udev/rules.d/
-	doins 45-jlink.rules || die "doins udev rules failed"
-}
-
-pkg_postinst() {
-	enewgroup plugdev
-	elog "To be able to access the jlink usb adapter, you have to be"
-	elog "a member of the 'plugdev' group."
-}
diff --git a/dev-embedded/jlink/jlink-4.74.ebuild b/dev-embedded/jlink/jlink-4.74.ebuild
deleted file mode 100644
index 51b481f..0000000
--- a/dev-embedded/jlink/jlink-4.74.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit versionator
-
-MY_MINOR="$(get_version_component_range 2-2)"
-MY_SUBMINOR="$(get_version_component_range 3-3)"
-if [[ ${MY_SUBMINOR} =~ ^-?[0-9]+$ ]]
-then
-	MY_SUBMINOR_CHAR="$(printf \\$(printf '%03o' $((96+${MY_SUBMINOR}))))"
-fi
-
-MY_PV="$(get_major_version)${MY_MINOR}${MY_SUBMINOR_CHAR}"
-FILENAME="JLink_Linux_V${MY_PV}"
-INSTALLDIR="/opt/${PN}"
-
-DESCRIPTION="J-Link gdb-server and commander for Segger J-Link jtag adapter"
-HOMEPAGE="http://www.segger.com/jlink-software.html"
-SRC_URI="${FILENAME}.tgz"
-
-LICENSE="J-Link EDU Terms of Use"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-RESTRICT="fetch strip"
-DEPEND=""
-RDEPEND="${DEPEND}
-	amd64? ( app-emulation/emul-linux-x86-xlibs )"
-
-S=${WORKDIR}/${FILENAME}
-
-src_install() {
-	dodir ${INSTALLDIR} || die
-	dodir ${INSTALLDIR}/lib || die
-	dodir ${INSTALLDIR}/doc || die
-
-	local BINS="JLinkExe JLinkGDBServer JLinkRemoteServer JLinkSWOViewer"
-	for wrapper in $BINS ; do
-		make_wrapper $wrapper ./$wrapper ${INSTALLDIR} lib
-	done
-
-	exeinto ${INSTALLDIR}
-	doexe $BINS || die
-
-	exeinto ${INSTALLDIR}/lib
-	doexe "libjlinkarm.so.${PV}.0" || die
-	dosym "libjlinkarm.so.${PV}.0" ${INSTALLDIR}/lib/libjlinkarm.so.$(get_major_version) || die
-	if use amd64; then
-		dosym /lib32/libreadline.so.6 ${INSTALLDIR}/lib/libreadline.so.5 || die
-	fi
-
-	insinto ${INSTALLDIR}/doc
-	doins README.txt || die
-	doins Doc/{UM08001_JLinkARM.pdf,UM08005_JLinkGDBServer.pdf} || die
-	doins Doc/ReleaseNotes/ReleaseJLinkARM.html || die
-
-	insinto ${INSTALLDIR}
-	doins -r Samples || die "doins failed"
-
-	insinto /lib/udev/rules.d/
-	doins 45-jlink.rules || die "doins udev rules failed"
-}
-
-pkg_postinst() {
-	enewgroup plugdev
-	elog "To be able to access the jlink usb adapter, you have to be"
-	elog "a member of the 'plugdev' group."
-}
diff --git a/dev-embedded/jlink/jlink-4.80e.ebuild b/dev-embedded/jlink/jlink-4.80e.ebuild
deleted file mode 100644
index ce4e8c8..0000000
--- a/dev-embedded/jlink/jlink-4.80e.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit versionator
-
-MY_P="JLink_Linux_V${PV/\./}_$(usex amd64 'x86_64' 'i386')"
-INSTALLDIR="/opt/${PN}"
-
-DESCRIPTION="J-Link gdb-server and commander for Segger J-Link jtag adapter"
-HOMEPAGE="http://www.segger.com/jlink-software.html"
-SRC_URI="amd64? ( JLink_Linux_V${PV/\./}_x86_64.tgz )
-	x86? ( JLink_Linux_V${PV/\./}_i386.tgz )"
-LICENSE="J-Link EDU Terms of Use"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-RESTRICT="fetch strip"
-DEPEND=""
-RDEPEND="${DEPEND}
-	dev-libs/libedit"
-
-S=${WORKDIR}/${MY_P}
-
-src_install() {
-	dodir ${INSTALLDIR} || die
-	dodir ${INSTALLDIR}/lib || die
-	dodir ${INSTALLDIR}/doc || die
-
-	local BINS="JLinkExe JLinkGDBServer JLinkRemoteServer JLinkSWOViewer"
-	for wrapper in $BINS ; do
-		make_wrapper $wrapper ./$wrapper ${INSTALLDIR} lib
-	done
-
-	exeinto ${INSTALLDIR}
-	doexe $BINS || die
-
-	exeinto ${INSTALLDIR}/lib
-	doexe "libjlinkarm.so.${PV/[a-z]/}.5" || die
-	dosym "libjlinkarm.so.${PV/[a-z]/}.5" ${INSTALLDIR}/lib/libjlinkarm.so.$(get_major_version) || die
-
-	insinto ${INSTALLDIR}/doc
-	doins README.txt || die
-	doins Doc/License.txt
-	doins Doc/UM08001_JLink.pdf || die
-	doins Doc/ReleaseNotes/ReleaseJLink.html || die
-
-	insinto ${INSTALLDIR}
-	doins -r Samples || die "doins failed"
-
-	insinto /lib/udev/rules.d/
-	doins 99-jlink.rules || die "doins udev rules failed"
-}
-
-pkg_postinst() {
-	enewgroup plugdev
-	elog "To be able to access the jlink usb adapter, you have to be"
-	elog "a member of the 'plugdev' group."
-}
diff --git a/dev-embedded/jlink/jlink-4.84a.ebuild b/dev-embedded/jlink/jlink-4.84a.ebuild
deleted file mode 100644
index c6c0dc0..0000000
--- a/dev-embedded/jlink/jlink-4.84a.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit versionator
-
-MY_P="JLink_Linux_V${PV/\./}_$(usex amd64 'x86_64' 'i386')"
-INSTALLDIR="/opt/${PN}"
-
-DESCRIPTION="J-Link gdb-server and commander for Segger J-Link jtag adapter"
-HOMEPAGE="http://www.segger.com/jlink-software.html"
-SRC_URI="amd64? ( JLink_Linux_V${PV/\./}_x86_64.tgz )
-	x86? ( JLink_Linux_V${PV/\./}_i386.tgz )"
-LICENSE="J-Link Terms of Use"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-QA_PREBUILT="*"
-
-RESTRICT="fetch strip"
-DEPEND=""
-RDEPEND="${DEPEND}
-	dev-libs/libedit"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_nofetch() {
-    einfo "Segger requires you to download the needed files manually after"
-    einfo "entering the serial number of your debugging probe."
-    einfo
-	einfo "Download ${SRC_URI}"
-    einfo "from ${HOMEPAGE} and place it in ${DISTDIR}"
-}
-
-src_install() {
-	dodir ${INSTALLDIR} || die
-	dodir ${INSTALLDIR}/lib || die
-	dodir ${INSTALLDIR}/doc || die
-
-	local BINS="JLinkExe JLinkGDBServer JLinkRemoteServer JLinkSWOViewer"
-	for wrapper in $BINS ; do
-		make_wrapper $wrapper ./$wrapper ${INSTALLDIR} lib
-	done
-
-	exeinto ${INSTALLDIR}
-	doexe $BINS || die
-
-	exeinto ${INSTALLDIR}/lib
-	doexe "libjlinkarm.so.${PV/[a-z]/}.1" || die
-	dosym "libjlinkarm.so.${PV/[a-z]/}.1" ${INSTALLDIR}/lib/libjlinkarm.so.$(get_major_version) || die
-
-	insinto ${INSTALLDIR}/doc
-	doins README.txt || die
-	doins Doc/License.txt
-	doins Doc/UM08001_JLink.pdf || die
-	doins Doc/ReleaseNotes/ReleaseJLink.html || die
-
-	insinto ${INSTALLDIR}
-	doins -r Samples || die "doins failed"
-
-	insinto /lib/udev/rules.d/
-	doins 99-jlink.rules || die "doins udev rules failed"
-}
-
-pkg_postinst() {
-	enewgroup plugdev
-	elog "To be able to access the jlink usb adapter, you have to be"
-	elog "a member of the 'plugdev' group."
-}
diff --git a/dev-embedded/xvcd/Manifest b/dev-embedded/xvcd/Manifest
deleted file mode 100644
index 4149019..0000000
--- a/dev-embedded/xvcd/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-AUX xvcd-remove-ftdi-async-mode.patch 756 SHA256 a13aa6503447a7d5cbe6a98f9b35e648e4f975788bf4bcd2a31b38e25f325394 SHA512 53411808beaab49f72e5329e9d7ed218bc5dc1bc16a3b5e12413bfc0e5f80edc60605c99471ee7ef41ae65d9ac9242044796d9a6add820e26d11fbb1c528300f WHIRLPOOL 3f03d4e7d45bb458268eff57ba69347c109e519acf46bc20e78cfc7eb258f0565e0366043264b46cf88ee531b130b600907f658f297142d5bb75aa9b412c4abb
-EBUILD xvcd-9999.ebuild 651 SHA256 c8585da57ae97d2fdb0dfcec50b5ab8197e855b1dcb486fce0e95102875f7374 SHA512 6b3a4eb107796a1a00acaabb0a7332ddbd3456204ba6b608cfd27be7eb8bdc6acbe664651c6ac0a265b3aa2be9f851daf7eb8fc7081ce8394d74438a529abf65 WHIRLPOOL beced6b87cbfe6a92d4d5fecc2b8644f5561118f40247b50cd498ae41ddd92b4250a5841a0ceb6a4989e47dd704b475d6f2d24096c62a7e009a8a6c9dc3f3600
diff --git a/dev-embedded/xvcd/files/xvcd-remove-ftdi-async-mode.patch b/dev-embedded/xvcd/files/xvcd-remove-ftdi-async-mode.patch
deleted file mode 100644
index b4d8892..0000000
--- a/dev-embedded/xvcd/files/xvcd-remove-ftdi-async-mode.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git src/io_ftdi.c src/io_ftdi.c
-index 782b206..92bca2d 100644
---- src/io_ftdi.c
-+++ src/io_ftdi.c
-@@ -10,8 +10,6 @@
- #define PORT_TMS            0x08
- #define IO_OUTPUT (PORT_TCK|PORT_TDI|PORT_TMS)
- 
--#define USE_ASYNC
--
- #ifndef USE_ASYNC
- #define FTDI_MAX_WRITESIZE 256
- #endif
-@@ -77,7 +75,6 @@ int io_scan(const unsigned char *TMS, const unsigned char *TDI, unsigned char *T
- 	unsigned char buffer[16384];
- 	int i, res; 
- #ifndef USE_ASYNC
--#error no async
- 	int r, t;
- #endif
- 	
-@@ -125,7 +122,7 @@ int io_scan(const unsigned char *TMS, const unsigned char *TDI, unsigned char *T
- 			if (res < 0)
- 			{
- 				fprintf(stderr, "ftdi_read_data %d (%s)\n", res, ftdi_get_error_string(&ftdi));
--				return -1
-+				return -1;
- 			}
- 			
- 			i += res;
diff --git a/dev-embedded/xvcd/xvcd-9999.ebuild b/dev-embedded/xvcd/xvcd-9999.ebuild
deleted file mode 100644
index edc3596..0000000
--- a/dev-embedded/xvcd/xvcd-9999.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit git-2 eutils
-
-DESCRIPTION="xvcd - The Xilinx Virtual Cable Daemon"
-HOMEPAGE="https://github.com/tmbinc/xvcd"
-EGIT_REPO_URI="git://github.com/tmbinc/xvcd.git"
-if use ftdi; then
-	EGIT_BRANCH="ftdi"
-fi
-
-LICENSE=""
-SLOT="0"
-KEYWORDS=""
-IUSE="ftdi"
-
-DEPEND="ftdi? ( dev-embedded/libftdi )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	if use ftdi; then
-		epatch "${FILESDIR}/xvcd-remove-ftdi-async-mode.patch"
-	fi
-}
-
-
-src_compile() {
-	cd "src/"
-	emake || die "emake failed"
-}
-
-src_install() {
-	dobin src/${PN}
-	dodoc README
-}
diff --git a/dev-java/gradle-bin/Manifest b/dev-java/gradle-bin/Manifest
deleted file mode 100644
index 5c287b6..0000000
--- a/dev-java/gradle-bin/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST gradle-1.11-all.zip 56940872 SHA256 07e58cd960722c419eb0f6a807228e7179bb43bc266f390cde4632abdacdd659 SHA512 6361d5eb3a9e72d54235d2696e57cab1c1884ace10c707c99a3919d29a20619025f8964421e57e26e5cda68376eabf2166b231141d77ebf45ec60789793294da WHIRLPOOL ee6c7d7764a9e083a06a3a40916bfbc7995c0a2aaf36bef213213e5717ff68c3d528e9999a5399d70d47f5bb4c54d538b7405433a2ab3b7ead6e95a6ac9162a0
-DIST gradle-1.9-all.zip 54348845 SHA256 eeb919fe734bc4a63aaf75c05c19bc55c8bccc925b0eca4269c67f7e8cf48efb SHA512 b34f0c3d11297784532044b73074d96c4309ae382d919ce6504cb2c238fe4709a5d73958de110ea70e529fb9141d8abb00964a293f556b081dd72a58bb0734f9 WHIRLPOOL ddb868d4f97cb965322ec234b652f8322a75a5ca319728c016caa07b69845309b683c2fdbf856663ed74a7973700bcb48cbbd2c3b9ebc412eabdd2af47579b7d
-EBUILD gradle-bin-1.11.ebuild 1412 SHA256 1f1ed99ae02e60c0d036f51d6f23527dd41fdc2371c27311cca99260219aaad7 SHA512 aefde2f6e8c6177ef2cd4d637b7860e57d22037e4ea8f8bf03863aef3a43e23512d536492a97c62e3081fdc00f8d8a30479f941293c06af6bafaaf9c175b20f1 WHIRLPOOL e81ea218f4d1f2ff264ddc4aac8c0134ac16d00b07fda64a24f27b3fcd23c0b8de0f2b97697236d64b52284d4785a78d4d3aeffc9e54c4c7fab74990fddb256b
-EBUILD gradle-bin-1.9.ebuild 1412 SHA256 1f1ed99ae02e60c0d036f51d6f23527dd41fdc2371c27311cca99260219aaad7 SHA512 aefde2f6e8c6177ef2cd4d637b7860e57d22037e4ea8f8bf03863aef3a43e23512d536492a97c62e3081fdc00f8d8a30479f941293c06af6bafaaf9c175b20f1 WHIRLPOOL e81ea218f4d1f2ff264ddc4aac8c0134ac16d00b07fda64a24f27b3fcd23c0b8de0f2b97697236d64b52284d4785a78d4d3aeffc9e54c4c7fab74990fddb256b
diff --git a/dev-java/gradle-bin/gradle-bin-1.11.ebuild b/dev-java/gradle-bin/gradle-bin-1.11.ebuild
deleted file mode 100644
index d8da5e8..0000000
--- a/dev-java/gradle-bin/gradle-bin-1.11.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit java-pkg-2
-
-MY_PN=${PN%%-bin}
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A project automation and build tool similar to Apache Ant and Apache Maven with a Groovy based DSL"
-SRC_URI="http://services.gradle.org/distributions/${MY_P}-all.zip"
-HOMEPAGE="http://www.gradle.org/"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-
-DEPEND="app-arch/zip
-	app-admin/eselect-gradle"
-RDEPEND=">=virtual/jdk-1.5"
-
-IUSE="source doc examples"
-
-S="${WORKDIR}/${MY_P}"
-
-
-src_unpack() {
-	unpack ${A}
-}
-
-
-src_install() {
-	local gradle_dir="${EROOT}usr/share/${P}/"
-
-	dodoc changelog.txt getting-started.html
-
-	insinto "${gradle_dir}"
-
-	# source
-	if use source ; then
-		java-pkg_dosrc src/*
-	fi
-
-	# docs
-	if use doc ; then
-		java-pkg_dojavadoc docs
-	fi
-
-	# examples
-	if use examples ; then
-		java-pkg_doexamples samples
-	fi
-
-	# jars in lib/
-	cd lib || die "lib/ not found"
-	for jar in *.jar; do
-		java-pkg_newjar ${jar} ${jar}
-	done
-
-	# plugins in lib/plugins
-	cd plugins
-	java-pkg_jarinto ${JAVA_PKG_JARDEST}/plugins
-	for jar in *.jar; do
-		java-pkg_newjar ${jar} ${jar}
-	done
-
-	java-pkg_dolauncher "${P}" --main org.gradle.launcher.GradleMain --java_args "-Dgradle.home=${gradle_dir}/lib \${GRADLE_OPTS}"
-}
-
-pkg_postinst() {
-	eselect gradle update ifunset
-}
-
-pkg_postrm() {
-	eselect gradle update ifunset
-}
diff --git a/dev-java/gradle-bin/gradle-bin-1.9.ebuild b/dev-java/gradle-bin/gradle-bin-1.9.ebuild
deleted file mode 100644
index d8da5e8..0000000
--- a/dev-java/gradle-bin/gradle-bin-1.9.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit java-pkg-2
-
-MY_PN=${PN%%-bin}
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A project automation and build tool similar to Apache Ant and Apache Maven with a Groovy based DSL"
-SRC_URI="http://services.gradle.org/distributions/${MY_P}-all.zip"
-HOMEPAGE="http://www.gradle.org/"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-
-DEPEND="app-arch/zip
-	app-admin/eselect-gradle"
-RDEPEND=">=virtual/jdk-1.5"
-
-IUSE="source doc examples"
-
-S="${WORKDIR}/${MY_P}"
-
-
-src_unpack() {
-	unpack ${A}
-}
-
-
-src_install() {
-	local gradle_dir="${EROOT}usr/share/${P}/"
-
-	dodoc changelog.txt getting-started.html
-
-	insinto "${gradle_dir}"
-
-	# source
-	if use source ; then
-		java-pkg_dosrc src/*
-	fi
-
-	# docs
-	if use doc ; then
-		java-pkg_dojavadoc docs
-	fi
-
-	# examples
-	if use examples ; then
-		java-pkg_doexamples samples
-	fi
-
-	# jars in lib/
-	cd lib || die "lib/ not found"
-	for jar in *.jar; do
-		java-pkg_newjar ${jar} ${jar}
-	done
-
-	# plugins in lib/plugins
-	cd plugins
-	java-pkg_jarinto ${JAVA_PKG_JARDEST}/plugins
-	for jar in *.jar; do
-		java-pkg_newjar ${jar} ${jar}
-	done
-
-	java-pkg_dolauncher "${P}" --main org.gradle.launcher.GradleMain --java_args "-Dgradle.home=${gradle_dir}/lib \${GRADLE_OPTS}"
-}
-
-pkg_postinst() {
-	eselect gradle update ifunset
-}
-
-pkg_postrm() {
-	eselect gradle update ifunset
-}
diff --git a/dev-libs/cyberjack/Manifest b/dev-libs/cyberjack/Manifest
new file mode 100644
index 0000000..423c6ea
--- /dev/null
+++ b/dev-libs/cyberjack/Manifest
@@ -0,0 +1,9 @@
+AUX cyberjack-3.99.5_p03-gcc47.patch 705 SHA256 f3a19a32fec0ed9b17a4c6e97d08f196a5596d12e5926b5e66d67d6f1a1085a9 SHA512 d05d4af0178003f722c49e06a1fc5027261f36c71f4ca3c9cadef627b6dd5719fed3d65358a6917711b1a5772498b8420e5645e8a51ff5c2f0616c1de361d088 WHIRLPOOL 093d35207833117d5c4b309c12cedebbc03345caa3e666d7929d0091c0763c118716b38e060c5f7201262e83a3631ede96e12786ee05b8920786db9883eef995
+AUX cyberjack-3.99.5_p05-install.patch 780 SHA256 84b17d3eebdb080fcb5e9aa723cf1cfa65c580033712966b5e73c759fddd8ace SHA512 823485a46c6f80ecaf06065f285360daf907016d1c5c8d0dbf2a08610f4fb68975a716d23ff8e05d3c1a2187bb68fa72e74f0a5b1f2caf57746b85fa98418be8 WHIRLPOOL 1287a9f5d59ee07d3f4fa0115c9087ede882291414e1e8c2ee9881b8319a1c6cfd508601029b043e3a78d91523a2e5d9aeda3fcffda83547ea3a5aa209c1b4ea
+AUX cyberjack-3.99.5_p05-manpages.patch 812 SHA256 316204a6aba79eb4b5c6c14090135fe6be179f56017b6a1b0c68c43c9e6367b1 SHA512 f92c59197e9b32f304ee18405c9d718715a3088a4d95a39e695e5733490ec941340086479f2e15caac5ce5158f6814f757abfd91f06ce904e95a9a90f6761b04 WHIRLPOOL 76dee1617f8540de23713f81f0dcfca082e24bf3fea4ab929378d833bbfa76f9a008c64215fbb119ed301a375e1686b2728af3c3535058cc7f55df16dd2883c2
+AUX cyberjack-3.99.5_p05-returnvalue.patch 930 SHA256 d797ffbe5c08d3b45c576d8696896057a9bdcc887f641a844d046696d117396e SHA512 437e4515bf3a2809ad69ad89c00b7b4c09f54bcc983a45449127135d5202ef166f6d1962f898329860d76ef487f02b2d1a366de9759e63e89c2fc8f6e8759d2b WHIRLPOOL d46d6dc2673d3372fa298b40bc0b221b90b644f88d0730b32c83fc576e7773e175bd07f421f3b7c2bad6c03e337c562574598bcf80dceead8e1fdb95c53f5562
+AUX cyberjack-r1.rules 895 SHA256 a9495e404083061398dd5805a20cee099be00f46a2e66b6b7d0e363f24f328b2 SHA512 baeae4d96ffe6d965d123f54969595bc52f57b6f5c0418adad76b3f69ee2365c9840956ca37eb8ac8478f5a90971b4101bef95aba40711b1a4feb4be49f99a8c WHIRLPOOL cb24bfe998d391074c4aef865256f685c6182f5021d61793c6cdfecba39b7017ddde01c5e572f16f03f9aa26ed95111602931a487765983bcd94aca73db556d6
+AUX cyberjack.rules 321 SHA256 294d043daeb3b1c321cda80fd2b3b51ce1d29e754e9fadb5a042e08c7781980d SHA512 ca7ece7d34b21055e7a38efa04914dd07dab423041142eef309352924207c4ae25bfde3b1cc171eb6aec32539589006900669e38d5d699f1f942cd344c7a0cda WHIRLPOOL 7e6d4e7adaa99e1e2be96103e1caf60b6a481458a96782ba760855e18f3dd7cc8fdc150d0d20d5e4fab3a3eb3f3e3a4898b72afa51b44a59985cbf2514dcbe74
+DIST pcsc-cyberjack-3.99.5final.SP08.tar.bz2 786514 SHA256 ab42b81ad685302c89763faaf0d90e23f804134e020d653323ad9f95a43655fc SHA512 8630297b48e578d47e90cc3e216ff0daebfadee783f338588a5ad99132b5260901cf6545d292d312e054bcdd4a6e2d377a6c881d68e6c6bc062b0a435287181d WHIRLPOOL 0fb4de26b6f7a117d648ebabf7f7b4c1ec68a261a454728ccacbb37b15c07764a0f85d441e06c7627ae891dadab0fcbee61cd31063069b7aeeca8f02241a4ee6
+EBUILD cyberjack-3.99.5_p08.ebuild 1957 SHA256 fe8d51f7668de9987367f031363158f2eb8be660abe04e17a6857f82ce5dc36e SHA512 2df584c9fb685e654ce57ac66e30d0b02fb24238d1d2fa7d58e747ecfa0392b62ebbb23baece9c14a1feb0ae580895b6c4820f68185ee6d27747f74065e08d38 WHIRLPOOL b4b11102842b984925c8e51cca181eccfcd5bbd59b95b9bb4d0e1f8975ae12b79196a4086e901f63f0b825df4e002a4c2e17d475e4ec233fedf32e9f2c99fdde
+MISC metadata.xml 364 SHA256 3a6668471296e199143800e86d63d5fc173d7ec067b06378dbbd40f88e619a57 SHA512 b1388581284b41463cf68bd461e61ab9595526cb65a780565556ceec34b21c8442452879f228d4f602acb146c642628831092e83596303d5c230daf53a360ae0 WHIRLPOOL 307d4452af3794213db394ac80a748f33cb9255bf147bd824c91ec6de62fd7338675b5cbec97995317e4df1f4e9a95cc6d65f9dfed5dc8ca091163dcc7456260
diff --git a/dev-libs/cyberjack/cyberjack-3.99.5_p08.ebuild b/dev-libs/cyberjack/cyberjack-3.99.5_p08.ebuild
new file mode 100644
index 0000000..f14caac
--- /dev/null
+++ b/dev-libs/cyberjack/cyberjack-3.99.5_p08.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools versionator eutils linux-info toolchain-funcs udev
+
+MY_PV="${PV/_p/_SP}"
+MY_PV2="${PV/_p/final.SP}"
+MY_P="pcsc-${PN}-${MY_PV2}"
+MY_P2="${PN}-$(get_version_component_range 4 $MY_PV)"
+
+DESCRIPTION="REINER SCT cyberJack pinpad/e-com USB user space driver library"
+HOMEPAGE="http://www.reiner-sct.de/ http://www.libchipcard.de/"
+SRC_URI="http://support.reiner-sct.de/downloads/LINUX/V${MY_PV}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="fox static-libs threads +udev +usb"
+
+# FIXME:
+# xml is actually optional but the code is still used anyway. We'll have to wait
+# until upstream fixed it.
+COMMON_DEPEND="sys-apps/pcsc-lite
+	usb? ( virtual/libusb:1 )
+	fox? (
+		>=x11-libs/fox-1.6
+		dev-libs/libxml2
+		)"
+RDEPEND="${COMMON_DEPEND}
+	udev? ( virtual/udev )"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+DOCS="ChangeLog NEWS doc/README.txt"
+
+pkg_setup() {
+	CONFIG_CHECK="~USB_SERIAL_CYBERJACK"
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+#	epatch "${FILESDIR}/${P}-install.patch"
+#	epatch "${FILESDIR}/${P}-manpages.patch"
+#	epatch "${FILESDIR}/${P}-returnvalue.patch"
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--sysconfdir=/etc/${PN} \
+		--disable-hal \
+		--enable-pcsc \
+		$(use_enable static-libs static) \
+		$(use_enable usb nonserial) \
+		$(use_enable threads) \
+		$(use_enable fox xml2) \
+		$(use_enable fox) \
+		--with-usbdropdir="$($(tc-getPKG_CONFIG) libpcsclite --variable=usbdropdir)"
+}
+
+src_install() {
+	default
+
+	prune_libtool_files --all
+
+	use udev && udev_newrules "${FILESDIR}"/${PN}-r1.rules 92-${PN}.rules #388329
+}
+
+pkg_postinst() {
+	local conf="${EROOT}etc/${PN}/${PN}.conf"
+	elog
+	elog "To configure logging, key beep behaviour etc. you need to"
+	elog "copy ${conf}.default"
+	elog "to ${conf}"
+	elog "and modify the latter as needed."
+	elog
+}
diff --git a/dev-libs/cyberjack/files/cyberjack-3.99.5_p03-gcc47.patch b/dev-libs/cyberjack/files/cyberjack-3.99.5_p03-gcc47.patch
new file mode 100644
index 0000000..035d414
--- /dev/null
+++ b/dev-libs/cyberjack/files/cyberjack-3.99.5_p03-gcc47.patch
@@ -0,0 +1,34 @@
+http://bugs.gentoo.org/423757
+
+--- libcyberjack/checksuite/cm_distri.cpp
++++ libcyberjack/checksuite/cm_distri.cpp
+@@ -15,6 +15,7 @@
+ #include "cm_distri.h"
+ #include "checksuite.h"
+ 
++#include <unistd.h> /* unlink */
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <errno.h>
+--- tools/fox-dialog/main.cpp
++++ tools/fox-dialog/main.cpp
+@@ -9,6 +9,8 @@
+ 
+ #include <fx.h>
+ 
++#include <unistd.h> /* unlink */
++
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <pwd.h>
+--- tools/mac-ui-helper/main.m
++++ tools/mac-ui-helper/main.m
+@@ -31,6 +31,8 @@
+ #import "PinDialog.h"
+ #import "Delegate.h"
+ 
++#include <unistd.h> /* unlink */
++
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <pwd.h>
diff --git a/dev-libs/cyberjack/files/cyberjack-3.99.5_p05-install.patch b/dev-libs/cyberjack/files/cyberjack-3.99.5_p05-install.patch
new file mode 100644
index 0000000..f0a2f0a
--- /dev/null
+++ b/dev-libs/cyberjack/files/cyberjack-3.99.5_p05-install.patch
@@ -0,0 +1,26 @@
+From c107dd6db4967a04297eab120500a7fc5c93f221 Mon Sep 17 00:00:00 2001
+From: Christian Ruppert <idl0r@gentoo.org>
+Date: Thu, 13 Feb 2014 23:10:37 +0100
+Subject: [PATCH 3/3] Do not install pcscd_init.diff
+
+Signed-off-by: Christian Ruppert <idl0r@gentoo.org>
+---
+ tools/cyberjack/scripts/Makefile.am | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tools/cyberjack/scripts/Makefile.am b/tools/cyberjack/scripts/Makefile.am
+index e9cc408..e2098d2 100644
+--- a/tools/cyberjack/scripts/Makefile.am
++++ b/tools/cyberjack/scripts/Makefile.am
+@@ -1,6 +1,6 @@
+ 
+ cdscriptdir=$(libdir)/cyberjack
+-cdscript_SCRIPTS=getdist.sh pcscd_init.diff
++cdscript_SCRIPTS=getdist.sh
+ 
+-EXTRA_DIST=$(cdscript_SCRIPTS)
++EXTRA_DIST=$(cdscript_SCRIPTS) pcscd_init.diff
+ 
+-- 
+1.8.3.2
+
diff --git a/dev-libs/cyberjack/files/cyberjack-3.99.5_p05-manpages.patch b/dev-libs/cyberjack/files/cyberjack-3.99.5_p05-manpages.patch
new file mode 100644
index 0000000..98568f3
--- /dev/null
+++ b/dev-libs/cyberjack/files/cyberjack-3.99.5_p05-manpages.patch
@@ -0,0 +1,34 @@
+From e5d3ac2ab70cb773671a63dfed45816d6e24d36d Mon Sep 17 00:00:00 2001
+From: Christian Ruppert <idl0r@gentoo.org>
+Date: Thu, 13 Feb 2014 21:40:48 +0100
+Subject: [PATCH 1/3] Fix installation of man pages
+
+Signed-off-by: Christian Ruppert <idl0r@gentoo.org>
+---
+ doc/Makefile.am | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+index a0a68f4..cba2e30 100644
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -6,14 +6,12 @@ DOCFILES=\
+ #docfiledir=$(datarootdir)/doc/$(PACKAGE)
+ #docfile_DATA=$(DOCFILES)
+ 
+-manpagedir=$(mandir)
+-manpage_DATA= \
+-  cyberjack.8
++man8_MANS=cyberjack.8
+ 
+ EXTRA_DIST=\
+   README.xml LIESMICH.xml \
+   verifypin_ascii.c verifypin_fpin2.c \
+-  $(DOCFILES) $(manpage_DATA)
++  $(DOCFILES) $(man8_MANS)
+ 
+ 
+ %.ps: %.xml
+-- 
+1.8.3.2
+
diff --git a/dev-libs/cyberjack/files/cyberjack-3.99.5_p05-returnvalue.patch b/dev-libs/cyberjack/files/cyberjack-3.99.5_p05-returnvalue.patch
new file mode 100644
index 0000000..0bdf275
--- /dev/null
+++ b/dev-libs/cyberjack/files/cyberjack-3.99.5_p05-returnvalue.patch
@@ -0,0 +1,29 @@
+From b6d3ab6d0324f8b462f57aaa551bd1d4aa1465f3 Mon Sep 17 00:00:00 2001
+From: Christian Ruppert <idl0r@gentoo.org>
+Date: Thu, 13 Feb 2014 22:19:40 +0100
+Subject: [PATCH 2/3] Fix return value of rsct_platform_create_com if
+ --disable-nonserial
+
+Return NULL instead of CJ_ERR_OPENING_DEVICE (int).
+
+Signed-off-by: Christian Ruppert <idl0r@gentoo.org>
+---
+ cjeca32/Platform_unix.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cjeca32/Platform_unix.cpp b/cjeca32/Platform_unix.cpp
+index e3f4997..cbe6876 100644
+--- a/cjeca32/Platform_unix.cpp
++++ b/cjeca32/Platform_unix.cpp
+@@ -54,7 +54,7 @@ CBaseCommunication *rsct_platform_create_com(const char *deviceName, CReader *re
+     com=new CUSBUnix(deviceName, reader);
+ # else
+   /* libusb and libhal not supported for serial devices */
+-  return CJ_ERR_OPENING_DEVICE;
++  return NULL;
+ # endif
+   else
+     com=new CSerialUnix(deviceName, reader);
+-- 
+1.8.3.2
+
diff --git a/dev-libs/cyberjack/files/cyberjack-r1.rules b/dev-libs/cyberjack/files/cyberjack-r1.rules
new file mode 100644
index 0000000..775ed4c
--- /dev/null
+++ b/dev-libs/cyberjack/files/cyberjack-r1.rules
@@ -0,0 +1,18 @@
+# If not adding the device, go away
+ACTION!="add", GOTO="cyberjack_rules_end"
+SUBSYSTEM!="usb", GOTO="cyberjack_rules_end"
+ENV{DEVTYPE}!="usb_device", GOTO="cyberjack_rules_end"
+
+
+ATTR{idVendor}=="0c4b", ATTR{idProduct}=="0100", MODE="660", GROUP="pcscd"
+ATTR{idVendor}=="0c4b", ATTR{idProduct}=="0300", MODE="660", GROUP="pcscd"
+ATTR{idVendor}=="0c4b", ATTR{idProduct}=="0400", MODE="660", GROUP="pcscd"
+ATTR{idVendor}=="0c4b", ATTR{idProduct}=="0401", MODE="660", GROUP="pcscd"
+ATTR{idVendor}=="0c4b", ATTR{idProduct}=="0500", MODE="660", GROUP="pcscd"
+ATTR{idVendor}=="0c4b", ATTR{idProduct}=="0501", MODE="660", GROUP="pcscd"
+ATTR{idVendor}=="0c4b", ATTR{idProduct}=="0502", MODE="660", GROUP="pcscd"
+ATTR{idVendor}=="0c4b", ATTR{idProduct}=="0504", MODE="660", GROUP="pcscd"
+ATTR{idVendor}=="0c4b", ATTR{idProduct}=="0505", MODE="660", GROUP="pcscd"
+
+# All done
+LABEL="cyberjack_rules_end"
diff --git a/dev-libs/cyberjack/files/cyberjack.rules b/dev-libs/cyberjack/files/cyberjack.rules
new file mode 100644
index 0000000..ac94b1b
--- /dev/null
+++ b/dev-libs/cyberjack/files/cyberjack.rules
@@ -0,0 +1,10 @@
+# If not adding the device, go away
+ACTION!="add", GOTO="cyberjack_rules_end"
+SUBSYSTEM!="usb", GOTO="cyberjack_rules_end"
+ENV{DEVTYPE}!="usb_device", GOTO="cyberjack_rules_end"
+
+# Tested on cyberJack RFID standard
+ATTRS{idVendor}=="0c4b", ATTRS{idProduct}=="0500", ENV{PCSCD}="1"
+
+# All done
+LABEL="cyberjack_rules_end"
diff --git a/dev-libs/cyberjack/metadata.xml b/dev-libs/cyberjack/metadata.xml
new file mode 100644
index 0000000..aa53286
--- /dev/null
+++ b/dev-libs/cyberjack/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>wschlich@gentoo.org</email>
+		<name>Wolfram Schlich</name>
+	</maintainer>
+	<use>
+		<flag name="fox">Enable installation of <pkg>x11-libs/fox</pkg> based fxcyberjack program</flag>
+	</use>
+</pkgmetadata>
diff --git a/dev-libs/libdebian-installer/Manifest b/dev-libs/libdebian-installer/Manifest
new file mode 100644
index 0000000..9d545ef
--- /dev/null
+++ b/dev-libs/libdebian-installer/Manifest
@@ -0,0 +1,3 @@
+DIST libdebian-installer_0.91.tar.gz 74692 SHA256 03c3980471ec786171187ff5ea508382c63c6996ccf832864f3e6b8540d036d8 SHA512 4b28f7ef650dd5054b381f0384071abd66997eb60b31a9a60f551066c69699a8fe1f523ba62aef330eb54120bdb28c5998e363096915d48c3f6d97ef000ce9e3 WHIRLPOOL 24e70d58d2b152b5596c4210d71531a08146fe2958b2ec367a8ba10c8494e75249b11b2c3050de1b5145e58038213f4a70641158189c8f295f2f01406684e994
+EBUILD libdebian-installer-0.91.ebuild 1040 SHA256 7fc98b3b3eb4a0b9b5a28495b507d50962767d04a317b98044f8ad4d90e9bd26 SHA512 25078913bc7a3c81710d3e8054531b55944f23939fe3e63f79a820e876f0ba86f311d442cf219b93904b4c71a8c0202e40c5a54370e2749c0283ce1bdb2420f0 WHIRLPOOL d548150cb52a98c94cfa97ddd9e63fabde472af5af2b6d1f575a514ad472905e0238a788b884d3cb6d95cac7b4761dc60d0c032b2f8762577b8e6b8c5980a92f
+MISC metadata.xml 241 SHA256 6c8bf650f92e35ce441f4f7e664c261c396bf0b7387eead268ac7ac8c78d018a SHA512 4fd289d5889d95606c00514daf808a41d37c998c80c21fed5337cd259ef3605c14dd75186bedfd1b5abed98fcb590232553332468cb218cddcc7c089af81bc76 WHIRLPOOL e98ff9e57da40346406b3827c648ca386de579ea4a4c8904dc6288a1b1018c39d4e7c81787ff6ceec710c9f05465378920feba7745d5f27261d7c49436eee54e
diff --git a/dev-libs/libdebian-installer/libdebian-installer-0.91.ebuild b/dev-libs/libdebian-installer/libdebian-installer-0.91.ebuild
new file mode 100644
index 0000000..78cb211
--- /dev/null
+++ b/dev-libs/libdebian-installer/libdebian-installer-0.91.ebuild
@@ -0,0 +1,51 @@
+# Copyright 2009 Ricardo Salveti de Araujo
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit autotools
+
+DESCRIPTION="Library of common debian-installer functions"
+HOMEPAGE="http://packages.qa.debian.org/libd/libdebian-installer.html"
+SRC_URI="mirror://debian/pool/main/libd/${PN}/${PN}_${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="doc"
+
+DEPEND="sys-devel/libtool
+		dev-util/pkgconfig
+		doc? ( app-doc/doxygen )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+    # Remove problematic LDFLAGS declaration
+    sed -i -e '/^LDFLAGS/d' src/Makefile.am || die
+
+    # Rerun autotools
+    einfo "Regenerating autotools files..."
+	eautoreconf
+}
+
+src_compile() {
+	emake || die "emake failed"
+
+	if use doc; then
+		emake -C doc doc || die "emake for docs failed"
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	if use doc; then
+		dohtml -r doc/html/*
+	fi
+
+	dodoc HACKING debian/changelog 
+}
diff --git a/dev-libs/libdebian-installer/metadata.xml b/dev-libs/libdebian-installer/metadata.xml
new file mode 100644
index 0000000..f078bb8
--- /dev/null
+++ b/dev-libs/libdebian-installer/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>andy@ndyk.de</email>
+		<name>Andrew Karpow</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-lua/ldbus/Manifest b/dev-lua/ldbus/Manifest
deleted file mode 100644
index a8f161f..0000000
--- a/dev-lua/ldbus/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-EBUILD ldbus-9999.ebuild 516 SHA256 1ecf3c803f3db40c7fc96c789df9fc2cf792c0305182555cf850ca6d2c2e918b SHA512 2671165a65d9f24117debd2a5724e9df695749a5a08c63e9180a06faa72f34d34d012c97fe1371288777277c5416a143cfb0f816e11d0ab16b46f3ee304667e7 WHIRLPOOL 176d8c4ab235a5e7d331d9d05489a89f559beb4835924ef7fa8ef48ccfb9cc0af820238dc93846ea1287611477ddd88acca08fc67c0aff59291167713bce63e9
diff --git a/dev-lua/ldbus/ldbus-9999.ebuild b/dev-lua/ldbus/ldbus-9999.ebuild
deleted file mode 100644
index d13e420..0000000
--- a/dev-lua/ldbus/ldbus-9999.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit cmake-utils git-2
-
-DESCRIPTION="Lightweight DBus library for Lua 5.1"
-HOMEPAGE="http://sourceforge.net/projects/ldbus/"
-SRC_URI=""
-EGIT_REPO_URI="git://git.code.sf.net/p/ldbus/code"
-EGIT_MASTER="develop"
-
-LICENSE="AFL-3.0"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-DEPEND=">=dev-lang/lua-5.1[deprecated]
-		dev-libs/libev
-		sys-apps/dbus"
-RDEPEND="${DEPEND}"
-DOCS="AUTHORS README ChangeLog"
-
diff --git a/dev-util/cdebootstrap/Manifest b/dev-util/cdebootstrap/Manifest
new file mode 100644
index 0000000..0df8469
--- /dev/null
+++ b/dev-util/cdebootstrap/Manifest
@@ -0,0 +1,3 @@
+DIST cdebootstrap_0.5.10.tar.gz 160558 SHA256 8dd0e1ff0ebb3019a2abdda99630143d18ca5fed6823330f4c2754c3f0767980 SHA512 eb7f4fbfc74b8f8e6cbc7bc59f2546cb35e467529566868ee62ae478d6182060c54affb74a9660ceaf16e2adcf07c99ba96fdc93e1ad8d6a8828c859532650af WHIRLPOOL 08cb11db224253b79b3ed3e5a12139b28357d0582ae3d3b1ff2435036ba3ab9e4816689d2303f160f18335a620642751ad434135adb59ac2404b17c3542e563e
+EBUILD cdebootstrap-0.5.10.ebuild 483 SHA256 35d10835f63944955acdb18f23c6076e9ecc5e52f0b9944a3680d8889daf1565 SHA512 9b4e841ca1f0d46e54ef767a0579d54d7e53b28d147d91c951c20a144ffbf9d7932f860812ec5e92741308d08fd74121ad36085212302c804c15590fb4157fe8 WHIRLPOOL c738604eebd7f9c646c6ca04fe0a92d6c679d2a1ab1a47135ab418edbd544c1b7a79108c615491b9836033e039bfdcc23b8a99ab26bb681facb98033f7b3b59e
+MISC metadata.xml 241 SHA256 6c8bf650f92e35ce441f4f7e664c261c396bf0b7387eead268ac7ac8c78d018a SHA512 4fd289d5889d95606c00514daf808a41d37c998c80c21fed5337cd259ef3605c14dd75186bedfd1b5abed98fcb590232553332468cb218cddcc7c089af81bc76 WHIRLPOOL e98ff9e57da40346406b3827c648ca386de579ea4a4c8904dc6288a1b1018c39d4e7c81787ff6ceec710c9f05465378920feba7745d5f27261d7c49436eee54e
diff --git a/dev-util/cdebootstrap/cdebootstrap-0.5.10.ebuild b/dev-util/cdebootstrap/cdebootstrap-0.5.10.ebuild
new file mode 100644
index 0000000..c476924
--- /dev/null
+++ b/dev-util/cdebootstrap/cdebootstrap-0.5.10.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+DESCRIPTION="Bootstrap a Debian system"
+HOMEPAGE="http://packages.qa.debian.org/c/cdebootstrap.html"
+SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+
+DEPEND="net-misc/wget
+		app-arch/xz-utils
+		sys-libs/zlib
+		dev-libs/libdebian-installer"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}"
diff --git a/dev-util/cdebootstrap/metadata.xml b/dev-util/cdebootstrap/metadata.xml
new file mode 100644
index 0000000..f078bb8
--- /dev/null
+++ b/dev-util/cdebootstrap/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>andy@ndyk.de</email>
+		<name>Andrew Karpow</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-vcs/git-remote-gcrypt/Manifest b/dev-vcs/git-remote-gcrypt/Manifest
index d1d6179..65b4d56 100644
--- a/dev-vcs/git-remote-gcrypt/Manifest
+++ b/dev-vcs/git-remote-gcrypt/Manifest
@@ -1 +1,2 @@
 EBUILD git-remote-gcrypt-9999.ebuild 575 SHA256 cca116338fe4610fc828747ade7f308cadc9ddf1385ca2a5c418496242720ecd SHA512 09eaf9ed8605390b3dd346c711d74772a96628bfcf2268f72a0fde66b6065ec8b7772c3479722a363b4ee3dfc51a0a7eb4b1ae2f3070797c9d69dbdb905d616c WHIRLPOOL c598b801dc64fd560a4ca98b6e12c2ccea1d941cde12cc3e71d39c0128b69a74c50b9e97dbeb3a1b65c60af9eed4343cb0c60e0cc8181e320c1b91e55e815466
+MISC metadata.xml 241 SHA256 6c8bf650f92e35ce441f4f7e664c261c396bf0b7387eead268ac7ac8c78d018a SHA512 4fd289d5889d95606c00514daf808a41d37c998c80c21fed5337cd259ef3605c14dd75186bedfd1b5abed98fcb590232553332468cb218cddcc7c089af81bc76 WHIRLPOOL e98ff9e57da40346406b3827c648ca386de579ea4a4c8904dc6288a1b1018c39d4e7c81787ff6ceec710c9f05465378920feba7745d5f27261d7c49436eee54e
diff --git a/dev-vcs/git-remote-gcrypt/metadata.xml b/dev-vcs/git-remote-gcrypt/metadata.xml
new file mode 100644
index 0000000..f078bb8
--- /dev/null
+++ b/dev-vcs/git-remote-gcrypt/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>andy@ndyk.de</email>
+		<name>Andrew Karpow</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/games-board/infector/Manifest b/games-board/infector/Manifest
deleted file mode 100644
index fd5c834..0000000
--- a/games-board/infector/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST infector-0.4.tar.gz 205102 SHA256 3d1fcef38037845cdb050e4631a3cd1d3a3cf656d30bc07313fedcb3452a53e2 SHA512 7627e17da23b209b90b96af08b5828d58a69187588ff5b5a78ba30e434d07aa4a9c592f00ae632ae2319786b09b9cd1393c84c2ae2133c354eadfc9668fa1f5a WHIRLPOOL 4e8b2627d5495c1ce8da2c7fffb3699fff454225445cff0e55bae2187a20b51925c9d7e218c6a6f76aefec398f3f655d81f63842226443e9ca74b122bee83de0
-EBUILD infector-0.4.ebuild 863 SHA256 34d4fa9cd6afeaee8b4224d04bf95d9a58d99e9150c87a25aa013a0d60434c38 SHA512 07f8ecfa5a8941216d750544480014d467ffce8a3b95890df1b923f4c92af0c7151099644351640db793a0e57300b56cab28e2bbdbbdaf5ff0206ad2f61d9f09 WHIRLPOOL d60e8ec290c1aa4ca3bd410e20c679ba76d9b7bcec3cea125487e19b259ec89a98c1a2b635f12393b3ca4a6295f57766739d179c41bdc8b223973a5f0fe6399e
-MISC metadata.xml 208 SHA256 c4841c87f0c2b9b5e679a27dc72180be8d508fb3f5df0fbab2ec2c805c0a6d82 SHA512 21d90d4547c76c80e50e134359dfbec42b158bbc16e4741738bdde5f67b7926d158dae1905948a477405b74e754ce4ed63cad910f220a709db8dfccf160e5288 WHIRLPOOL 33ec53f42c7a8c4c419989bd94e083c417574463e19c9c1322e6b96d0f5a6a52e3dd69fbedf2d11a7a77d24a93b81f3a604b6b33cac62548389537bf3e42df0e
diff --git a/games-board/infector/infector-0.4.ebuild b/games-board/infector/infector-0.4.ebuild
deleted file mode 100644
index 5ab6c59..0000000
--- a/games-board/infector/infector-0.4.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-
-inherit games
-
-DESCRIPTION="Ataxx/Hexxagon clone."
-
-HOMEPAGE="http://infector.mangobrain.co.uk/"
-SRC_URI="http://infector.mangobrain.co.uk/downloads/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-RDEPEND="dev-cpp/gtkmm:2.4
-         x11-misc/xdg-utils
-		 x11-libs/gdk-pixbuf"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	# Remove xdg install calls due violating sandbox
-	sed -i "s/install-data-am: install-data-local/install-data-am: ${PN}.desktop/" \
-		data/Makefile.in
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	for d in ChangeLog AUTHORS NEWS README; do
-		dodoc "${d}"
-	done
-
-	sizes="16 22 24 32 48 64 72 96 128"
-	for i in ${sizes}; do
-		doicon "data/infector-$i.png"
-	done
-
-	domenu "data/${PN}.desktop"
-}
diff --git a/licenses/Brother-lpr b/licenses/Brother-lpr
new file mode 100644
index 0000000..56e9bdd
--- /dev/null
+++ b/licenses/Brother-lpr
@@ -0,0 +1,8 @@
+License Agreement
+This Agreement provides terms and conditions for license grant from Brother Industries, Ltd ("Brother"). Brother, who owns all copyrights to the software that is distributed with this Agreement ("Software") to recipients thereof ("User"), for use of the Software. User shall have the right to use the Software only in accordance with the terms and conditions of this Agreement. Any use by User of the Software shall be deemed as its agreement hereto.
+
+Brother retains any and all copyrights to the Software. In no case this Agreement shall be construed to assign or otherwise transfer from Brother to User any copyrights or other intellectual property rights to whole or any part of the Software.
+
+Brother grants User a non-exclusive license: to reproduce and/or distribute (via Internet or in any other manner) the Software. Further, Brother grants User a non-exclusive license to modify, alter, translate or otherwise prepare derivative works of the Software and to reproduce and distribute (via Internet or in any other manner) such modification, alteration, translation or other derivative works for any purpose.
+
+The license of the Software from Brother hereunder is granted "AS IS." BROTHER HEREBY DISCLAIMS ANY WARRANTIES WITH RESPECT TO THE SOFTWARE, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO WARRANTY FOR THE QUALITY, MERCHANTABILITY, FITNESS FOR PARTICULAR PURPOSE OR NON-INFRINGEMENT. Brother shall have no liability in contract, tort (including negligence or breach of statutory duty) or otherwise for any interruption of use, loss of data, or for any indirect, incidental, punitive or consequential loss or damage, or for any loss of profit, revenue, data, goodwill or anticipated savings that arises under, out of, or in contemplation of this Agreement or otherwise arises due to any error, inaccuracy or defect in the Software even if Brother has been advised of the possibility of such loss or damage. Further, Brother shall have no liability to disclose and/or distribute the source code of the Software to User under any circumstances. In no case shall the above license by Brother to modify, alter, translate or otherwise prepare derivative works of the Software be construed as Brother's implied agreement or undertakings to disclose and/or distribute the source code of the Software.
diff --git a/media-fonts/terminus-font/Manifest b/media-fonts/terminus-font/Manifest
index cb77a05..dce14ea 100644
--- a/media-fonts/terminus-font/Manifest
+++ b/media-fonts/terminus-font/Manifest
@@ -1,5 +1,5 @@
 AUX terminus-font-4.38-powerline-symbols.patch 55844 SHA256 1f12efa3546107311e66a0e59906217e3401cc4a2f157b1dcc2aa1a948932340 SHA512 d3cee76aacfeed7465cba6201193e51066390f9c7d7283428625e8624b04ee37075c28db5fb30b79c203f81266d9ce1f5aaff08e3a9f34275d27ea55da98f4b7 WHIRLPOOL 65164474cf8324cd92ef45129f6d1e9801aeff2b63b9e2937e2b409c1f872a5a1b1859feba67c5c2d9cc8c7d587f7a908a119c491af47af42add4a2168f7e36e
 DIST terminus-font-4.38.tar.gz 316507 SHA256 f6f4876a4dabe6a37c270c20bb9e141e38fb50e0bba200e1b9d0470e5eed97b7 SHA512 e37e20852645b247dffedf37f864e1cdbe2a23287e7f5737d89289eef1058f9621ef8d6339045b1be9ef603237a855a9f295022b8117685a6840c1f260966fd5 WHIRLPOOL e7f8c1b0040eb2e41869351360463783a0394d3c2ad3cccffbd80769046994b0cd76f8e16d1a38c88f1bee97ed28c8c6c2ce4166c0138fe6cb25848754dd0b44
-EBUILD terminus-font-4.38-r1.ebuild 2392 SHA256 7104feb96654734e2ddb901810d5a799ff25cd8a68a33839ac22b6ca90c6e88d SHA512 5d36d14ade401cd8a2af678d30d35ff85b593b7fe42ae18f462b32c8ab8ecaed3103a9fb35c7c8931f23727831df7e253074551dc6e8b7caa78b3cb682c8e7db WHIRLPOOL d267d7fe926ddb7d3db3e9c4492b06b10038440e1c386a6590bc0529f6341798e679c1c339f7c2e8abe3c6bc9b4544b9f5f7ad416a24d020b7339b36d0dd6a20
+EBUILD terminus-font-4.38-r2.ebuild 2379 SHA256 869d7b791d09b044c30292fe2dba2b64d4ec5ca1769d8f3627e9553cd6d66c85 SHA512 d85bfa8b64ee46eb75aba9ffd510ecd6e1b6fb027afa49efafb044a1b4349e88a18647d9cd6c88831961e837f6ec9ef9b3292080a0f3ad46c133cabbf536adbc WHIRLPOOL a854c4edf174ac3ec9fe6a85f6ca49a83a43b9e949155b4d553a4c129bb87311892613d4f053da0a7c70f8548687809c2f4375647c60d32176ee689d70290ab2
 MISC ChangeLog 14328 SHA256 16eaae95c3755feff30f848c18c87b8bd26f84af977978658219203b4f57faaf SHA512 b21648e014106fd328e8884f6c0001f40e72415925481ff8dad964a2abfe9357c98f88bf2a0369876143f58a275f30a88902d2ed3b466c8c40d4e6c44dbb6a8e WHIRLPOOL c1a4974bc06fa5fe111bfce90b8c060d8cf95cae9ae1e2d6fb7afa582923da646ee1ec9862cd9e5d725840520c5655115bc893c686cd297dcaeddea40b8ba304
-MISC metadata.xml 1499 SHA256 8b56685f9456ee0e678af12b6fb0ef7786418781866f8f9ab70c7fa15f8e1027 SHA512 99dba5e40294af5b547a1eb59bd47ce15f6bb527891c205b4a231c6b2c5ca4db79b51bad3053f47feaf8d9d61b6339fd136461c8e462a4c1481fe9da6da55863 WHIRLPOOL 88c1655e113c778b25b79833253e18dacbc058521292d7018e9205bad8263165d58dd6f689c31594aa8ee94502fcb9d479da1ae412791b159610b72e7d88a5af
+MISC metadata.xml 1478 SHA256 6d6738834aa2dc0d30747ad5773f89c1145a715a0ad32c3cfadb3432e34054a5 SHA512 f2b58052868761a6bd96acce3be54d1f5d0e8241f16d0bd7c5af7ccb7a41e67ff94972d4ff0d1e94ac2065b7183b150ba9fcb59979d870abe4ea67b5fa167a73 WHIRLPOOL e6e20716dd7b106cf89e515b3d707ad3ce8b65bd503ea83365e83e7988af0c34cbdacc5a69159a59f9f295db5a7c104e6639584bb4dc8735be20f5f6a05c5590
diff --git a/media-fonts/terminus-font/metadata.xml b/media-fonts/terminus-font/metadata.xml
index 9601253..6fc6839 100644
--- a/media-fonts/terminus-font/metadata.xml
+++ b/media-fonts/terminus-font/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>fonts</herd>
   <use>
     <flag name="a-like-o">
       Changes view of letter 'a' - a looks like o (see homepage)
diff --git a/media-fonts/terminus-font/terminus-font-4.38-r1.ebuild b/media-fonts/terminus-font/terminus-font-4.38-r2.ebuild
index 50da4eb..426d859 100644
--- a/media-fonts/terminus-font/terminus-font-4.38-r1.ebuild
+++ b/media-fonts/terminus-font/terminus-font-4.38-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/media-fonts/terminus-font/terminus-font-4.38.ebuild,v 1.13 2013/09/06 14:58:02 ago Exp $
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}/${P}.tar.gz"
 
 LICENSE="OFL-1.1 GPL-2"
 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 ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="a-like-o +center-tilde distinct-l ru-dv +ru-g quote ru-i ru-k +psf raw-font-data +pcf +powerline"
 
 DEPEND="app-arch/gzip
diff --git a/media-gfx/brscan4/Manifest b/media-gfx/brscan4/Manifest
index c2b3fbb..81b22ba 100644
--- a/media-gfx/brscan4/Manifest
+++ b/media-gfx/brscan4/Manifest
@@ -2,4 +2,4 @@ DIST brscan4-0.4.3-3.i386.rpm 68521 SHA256 5c8937c5edd2cf8afd014a66e9bf2b19cede2
 DIST brscan4-0.4.3-3.x86_64.rpm 79980 SHA256 713f3bde6649c110367669b53c6c7dcc9a974ae594ca4854c95a531f938b6ab9 SHA512 8dc3fccf200cbad4e803918bd663d31c66c84e3b40b9c974a1b0e002e134ba24d92f923939868af150dc00f75a5db8ec672909b54d500f841a2efdbd45b045d5 WHIRLPOOL 80701015bda7dccbf4ecf6145e599295c6ad63063a26807e0b8b87bc640fbc110be8ee370bf61730d6c0827c9ecf6feaa8fb759d1638c0bc33004c7972f80bc2
 EBUILD brscan4-0.4.3.3.ebuild 1378 SHA256 bccec60939cb225e825d9c697a089c292b422492e8946fb927950561efb738c3 SHA512 66012dcb7d6885c1cc4d93c9715988dd2cd17d0c416c8978665e7be6d3dc6b2af6ff39b119e89fea937c8e0485e2c52493f886b9097ef2b899819252c0d8f59b WHIRLPOOL bfb8ffbbf507fc900329bcad4bebc019738424a7f4b5403940bb3c8856e9a1aac1e979f2a8ab20a94b338883a12550092cfce72c9db2dbf903e2501155d2cc76
 MISC ChangeLog 1118 SHA256 21ebaaab6df71f0d56121eb44ea602112994974366ba06bd4fa3f729b8097acd SHA512 7baf6ff5a350dbf44d43bb097c0ddc58c07561f69061f305d18bdc20bd7b6c5a02c1cd817342eacfa168ab555ea5c0bd25365eaab209d1a6e77f923ab96e093a WHIRLPOOL c67a5e1e5b5c247d1d06f2171610e66888a98ff02d7f5611bad2cbb72b9fb702b738e870a39efc02fe9908a5535c16dfef995b3434d34e795b3f155551298c8d
-MISC metadata.xml 198 SHA256 6998c57a835c2c7b81d26f91ae232a8df3128b85ad0348e1fa9444f157c28481 SHA512 5607a8c66738198e21639247c46f41240819c2e0894855a05543e88edd7bac8ef5c5e2f3ca762f9c9bcf85f033235f013d8b40406acda50c1857c4ad51945c40 WHIRLPOOL 60b0c8b7be2ee31dc62d3668b6347266085a756f3f565cb3a962a91877afc1f6beaff21a36b7a2d4de1a4eb5798a9baa1533e2a9495b1552517036d733308873
+MISC metadata.xml 212 SHA256 de74121c61a32da4efe984edecb71e0d5d947d179dd8228f60eb7c8bd94d6b8c SHA512 3919b8b096abf61c7edaa6a76898603b6ca2e206e2eccd27c671957a9d085bc2591a2fb4839a85ef2a51dcbf887bb2c752d4b38e82ea19c48dfd6d99b67954fa WHIRLPOOL f203947dfb1f7a9ab97fd689bd02229e4e48ad74e0f246d810d85d6f49f9802e4be4e7cf75d214a0428fd80dec6d953f5186c7856c266882eab60e712a732da2
diff --git a/media-gfx/brscan4/metadata.xml b/media-gfx/brscan4/metadata.xml
index e153d85..c665e48 100644
--- a/media-gfx/brscan4/metadata.xml
+++ b/media-gfx/brscan4/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
+<maintainer type="person">
   <email>ulm@gentoo.org</email>
 </maintainer>
 </pkgmetadata>
diff --git a/media-gfx/gfxtablet/Manifest b/media-gfx/gfxtablet/Manifest
index 89d4c69..51e1c2f 100644
--- a/media-gfx/gfxtablet/Manifest
+++ b/media-gfx/gfxtablet/Manifest
@@ -3,3 +3,4 @@ DIST android-app-1.2.tar.gz 39362 SHA256 d67f3faba79650c228d2a253282b723d8cdf626
 EBUILD gfxtablet-1.1.ebuild 987 SHA256 60095b99215cfd730e45e79831ae7851ec493f4cff7d8a8c5660cd1bb206251d SHA512 255d7c5399df7be85fd64531c18a27f90756c427f3198cddd271103454ba547146206b039176ee578e9ddf76f072a88f95277aaad42bd2cb8d0412928cd9ac0e WHIRLPOOL d149f1a9ed640e45fb5698e3498062b3fa601f96553ec15fd90fc6d1738e97b762831c4703d5ea6c425d9fb66a66f7f3eddc1dc298328e3d1028fc3661965847
 EBUILD gfxtablet-1.2.ebuild 987 SHA256 60095b99215cfd730e45e79831ae7851ec493f4cff7d8a8c5660cd1bb206251d SHA512 255d7c5399df7be85fd64531c18a27f90756c427f3198cddd271103454ba547146206b039176ee578e9ddf76f072a88f95277aaad42bd2cb8d0412928cd9ac0e WHIRLPOOL d149f1a9ed640e45fb5698e3498062b3fa601f96553ec15fd90fc6d1738e97b762831c4703d5ea6c425d9fb66a66f7f3eddc1dc298328e3d1028fc3661965847
 EBUILD gfxtablet-9999.ebuild 987 SHA256 60095b99215cfd730e45e79831ae7851ec493f4cff7d8a8c5660cd1bb206251d SHA512 255d7c5399df7be85fd64531c18a27f90756c427f3198cddd271103454ba547146206b039176ee578e9ddf76f072a88f95277aaad42bd2cb8d0412928cd9ac0e WHIRLPOOL d149f1a9ed640e45fb5698e3498062b3fa601f96553ec15fd90fc6d1738e97b762831c4703d5ea6c425d9fb66a66f7f3eddc1dc298328e3d1028fc3661965847
+MISC metadata.xml 241 SHA256 6c8bf650f92e35ce441f4f7e664c261c396bf0b7387eead268ac7ac8c78d018a SHA512 4fd289d5889d95606c00514daf808a41d37c998c80c21fed5337cd259ef3605c14dd75186bedfd1b5abed98fcb590232553332468cb218cddcc7c089af81bc76 WHIRLPOOL e98ff9e57da40346406b3827c648ca386de579ea4a4c8904dc6288a1b1018c39d4e7c81787ff6ceec710c9f05465378920feba7745d5f27261d7c49436eee54e
diff --git a/media-gfx/gfxtablet/metadata.xml b/media-gfx/gfxtablet/metadata.xml
new file mode 100644
index 0000000..f078bb8
--- /dev/null
+++ b/media-gfx/gfxtablet/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>andy@ndyk.de</email>
+		<name>Andrew Karpow</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/media-libs/rsound/Manifest b/media-libs/rsound/Manifest
index 412d203..0a509ea 100644
--- a/media-libs/rsound/Manifest
+++ b/media-libs/rsound/Manifest
@@ -1,2 +1,3 @@
 AUX fix-vlc.patch 587 SHA256 afbd75a6665c7f36a619970e92ac24d4705a64e2b929d13b1f3e7b69ed4fc538 SHA512 5c81d440f22c60cb2ac35b290e6f33d36557888ec09956e328095f63fd03bbb2add6d9f7a701900b24b9d41ce752406007d403acbd3e39ade0ad8cc406c67bc4 WHIRLPOOL 201ff09c6d860b72a598dc2ea4d3f55db9e7acd4753f18a48c571793a43e5667bfb35a640d46a01d92b18c9faa4c32a4d1ef21428b018b3632dab0087a635859
 EBUILD rsound-9999.ebuild 1462 SHA256 5865cdeff521a25e9cf1b896740b82f06617ccba5f33d3438beeb5b784d990ff SHA512 23ec6ceff5bb9fda0cdc73e8151adaede7a7ad1d171b8acbb93856e8c4aaa299860f90702805ca6a3fa51973342adf3e226341ddbe42c8cc792c6319dfd7f167 WHIRLPOOL 568e74b16414f83552f3a5a8a0c7f91afe81f68ba77ba0717f39d4817acffba116cb5bc48730fa5d3572bb0765f6785420fe2f6aa74f4f1f8bb489869dd3ec39
+MISC metadata.xml 301 SHA256 fd9fd485fcd68d33768a96058a34362cd7d63df0176491a54a3560562fd984ad SHA512 248346390e46e5c1be16edfa2a5aa4521f494c1424af25e9170cf5b9067cccd1ae2f2af016d063d1f2b9b570fcff642ac2e7fd52200ba79b18259113be4f2248 WHIRLPOOL dbae82fe60bd9fe703046572379e37e9251f963ca1853a2dc0ffd69d22113f56b13393570fdf3dca60179778fecca4f4f0b900efa006440f50d4fc133c4f6aa1
diff --git a/media-libs/rsound/metadata.xml b/media-libs/rsound/metadata.xml
new file mode 100644
index 0000000..037b8c4
--- /dev/null
+++ b/media-libs/rsound/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>andy@ndyk.de</email>
+		<name>Andrew Karpow</name>
+	</maintainer>
+	<use>
+		<flag name="vlc">Install VLC plugin</flag>
+	</use>
+</pkgmetadata>
diff --git a/media-tv/opencaster/Manifest b/media-tv/opencaster/Manifest
new file mode 100644
index 0000000..439b757
--- /dev/null
+++ b/media-tv/opencaster/Manifest
@@ -0,0 +1,4 @@
+AUX opencaster-3.2.2-patch-tun-path.patch 511 SHA256 a971ee98e3e4aa105f5e68074c6474b43b7e800450c6e0bc20ec2975205b0cd3 SHA512 ad43d7ba689625688c39852ea120284af254de341e38e9eb2dc5382a5e44b40936593135f29fd98661f1c1719a7939d3c223f990c4b7af03c59eac6af5fe75ac WHIRLPOOL 56f33c26796af11ed078080a524af4b243980dc9ca2387cc14126639237d2081d805089b18dcbdd76373bf7836aded408e15c58f0489b3a128a9ccd55ae472d3
+DIST opencaster_3.2.2+dfsg.orig.tar.gz 137167 SHA256 c9d77f98b31d53f521e3179003a9cb66b0586704717e9d401f3bc0dafa243865 SHA512 66713cf8f551a82b6b94f3763d0f1ae45a8d9d0394cdd3c4932e9b6a92837eda0596e230776694f1836f2a1d4b469c4a05f360d8406c3834bdcf2b49c20b2ef5 WHIRLPOOL 1cb06a929ec96249cd19d00f779e0faeb937f1b12f213fd12fdc3447865b040b89af75235ab4aa18a84772c3128fb6238b492cd86ef0c9227bd944c4c9cd98b9
+EBUILD opencaster-3.2.2.ebuild 893 SHA256 679074ecf1a4b5d9d75c096310a70b193bf337a720e392e78d6600b7839408da SHA512 8e521842798c98e01da8b7ac80698ed21eb6fb14369a6ba21daf0c956fbd5073e8f604164fc194d5ea2a2b5c6945279cedd7587d9aba25faadebef450d3d71ce WHIRLPOOL 93b5a32d7746f5a2b8fd2eebf2d08624db61c372a55636839a03607e5fe4fc25ed7b9d0c12c1d63b32655f02ddce54ba8332050a1af5e95323611b44cd869b29
+MISC metadata.xml 241 SHA256 6c8bf650f92e35ce441f4f7e664c261c396bf0b7387eead268ac7ac8c78d018a SHA512 4fd289d5889d95606c00514daf808a41d37c998c80c21fed5337cd259ef3605c14dd75186bedfd1b5abed98fcb590232553332468cb218cddcc7c089af81bc76 WHIRLPOOL e98ff9e57da40346406b3827c648ca386de579ea4a4c8904dc6288a1b1018c39d4e7c81787ff6ceec710c9f05465378920feba7745d5f27261d7c49436eee54e
diff --git a/media-tv/opencaster/files/opencaster-3.2.2-patch-tun-path.patch b/media-tv/opencaster/files/opencaster-3.2.2-patch-tun-path.patch
new file mode 100644
index 0000000..f18ed2c
--- /dev/null
+++ b/media-tv/opencaster/files/opencaster-3.2.2-patch-tun-path.patch
@@ -0,0 +1,23 @@
+diff --git a/libs/Makefile b/libs/Makefile
+index 23d951b..c442057 100755
+--- a/libs/Makefile
++++ b/libs/Makefile
+@@ -1,4 +1,4 @@
+-SUBDIRS = sectioncrc dvbobjects
++SUBDIRS = sectioncrc
+ 
+ subdirs:        $(SUBDIRS)
+ $(SUBDIRS):
+diff --git a/tools/mpe2sec/mpe.c b/tools/mpe2sec/mpe.c
+index 18417af..1b3777a 100644
+--- a/tools/mpe2sec/mpe.c
++++ b/tools/mpe2sec/mpe.c
+@@ -12,7 +12,7 @@
+ #include <sys/socket.h>
+ #include <net/if.h>
+ 
+-#include <net/if_tun.h>
++#include <linux/if_tun.h>
+ 
+ #include "sectioncrc.h"
+ 
diff --git a/media-tv/opencaster/metadata.xml b/media-tv/opencaster/metadata.xml
new file mode 100644
index 0000000..f078bb8
--- /dev/null
+++ b/media-tv/opencaster/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>andy@ndyk.de</email>
+		<name>Andrew Karpow</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/media-tv/opencaster/opencaster-3.2.2.ebuild b/media-tv/opencaster/opencaster-3.2.2.ebuild
new file mode 100644
index 0000000..6235f4b
--- /dev/null
+++ b/media-tv/opencaster/opencaster-3.2.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+PYTHON_COMPAT=( python2_6 python2_7 )
+
+inherit eutils distutils-r1
+
+DESCRIPTION="MPEG2 transport stream data generator and packet manipulator"
+HOMEPAGE="http://www.avalpa.com/the-key-values"
+SRC_URI="mirror://debian/pool/main/o/opencaster/${P/-/_}+dfsg.orig.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-patch-tun-path.patch"
+	cd libs/dvbobjects && distutils-r1_src_prepare
+}
+
+src_compile() {
+	default
+	cd libs/dvbobjects && distutils-r1_src_compile
+}
+
+src_install() {
+	mkdir -p "${D}usr/bin/"
+	emake DESTDIR="${D}usr/bin/" INSTHOME=${D}usr install
+
+	for d in README CHANGES ; do
+		[[ -s "${d}" ]] && dodoc "${d}"
+	done
+	
+	cd libs/dvbobjects && distutils-r1_src_install
+}
+
diff --git a/net-libs/libwebsockets/Manifest b/net-libs/libwebsockets/Manifest
deleted file mode 100644
index 8d5e48a..0000000
--- a/net-libs/libwebsockets/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD libwebsockets-9999.ebuild 597 SHA256 4f62e532ad0fdabd3278c19cce14aae869de8785007f9f03bd358ac7e1f625ae SHA512 75345fdce298ec2a170ee974e38c96b965d7fa9fa4fb422d323671fc930eedf6a9c025c179e4bf162639e38b9e1aebbf98d0624dd128492a453bd475f4144bc8 WHIRLPOOL 124b89470723e6dd6cba9014c98b7d7c175afd078ee439432ac8309d54dea9d1fa56fa67fb65b35f6aeb425bc9d675b539cf0de0a6a562fa482a010f0011920f
-MISC metadata.xml 442 SHA256 ede51dc4b99d9509f4b625f3023e4905447c529bc9fbdbce1448798928980756 SHA512 9532a54833da35adaa3346906f354d960d849072e5bcf2d24435051d69828f8aa5160eb4e3333242696543e2e9a5cbc21250f9afe27eabd3bac84468dffefd39 WHIRLPOOL fb2dec89055ec26bc171a0c818925a3324114383f0ae829440b0c7bde74b3e08ce214062bf74d3a6329297774590d18c2a7cd03e1a2bca1fffa4ff12b56369a6
diff --git a/net-libs/libwebsockets/libwebsockets-9999.ebuild b/net-libs/libwebsockets/libwebsockets-9999.ebuild
deleted file mode 100644
index 610aeb0..0000000
--- a/net-libs/libwebsockets/libwebsockets-9999.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-EGIT_REPO_URI="git://git.libwebsockets.org/libwebsockets"
-
-inherit git-2 cmake-utils
-
-DESCRIPTION="Lightweight pure C library for websockets api."
-HOMEPAGE="https://libwebsockets.org"
-EGIT_BRANCH="master"
-KEYWORDS=""
-
-
-SRC_URI=""
-
-LICENSE="LGPL-2-with-linking-exception"
-SLOT="0"
-IUSE="ssl"
-DEPEND="ssl? ( dev-libs/openssl )"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-    local mycmakeargs=(
-        $(cmake-utils_use_with ssl SSL)
-    )
-    cmake-utils_src_configure
-}
-
diff --git a/net-libs/libwebsockets/metadata.xml b/net-libs/libwebsockets/metadata.xml
deleted file mode 100644
index 4d7c1d4..0000000
--- a/net-libs/libwebsockets/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<longdescription lang="en">
-		Libwebsockets is a lightweight pure C library built to use minimal CPU and memory resources, and provide fast throughput in both directions as client or server.
-	</longdescription>
-	<use>
-		<flag name="ssl">Enable SSL support
-			<pkg>dev-libs/openssl</pkg></flag>
-	</use>
-</pkgmetadata>
diff --git a/net-misc/connman-ui/Manifest b/net-misc/connman-ui/Manifest
deleted file mode 100644
index 5728861..0000000
--- a/net-misc/connman-ui/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-EBUILD connman-ui-9999.ebuild 519 SHA256 5178446e408c43371df5e9827bdb1377843d63e657cafe756d56cb8dcf2efa94 SHA512 09c04b7dbe932abe3bf5d416bfe11f7d404cb8fb10b1cc4fe5bcffadde3b6d91715d22099c7978de72fba32660f1add06c294057d7a835bd0f75ba9cedabd15d WHIRLPOOL d982503de10367f2408df5b44bfc152be39ddc044e21a1bf1171b90176b711bf1f7768932e54cfc58ed11237bd9e61261e656c358374639aae88861a7683672b
diff --git a/net-misc/connman-ui/connman-ui-9999.ebuild b/net-misc/connman-ui/connman-ui-9999.ebuild
deleted file mode 100644
index e604450..0000000
--- a/net-misc/connman-ui/connman-ui-9999.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit git-2 autotools
-
-DESCRIPTION="A full-featured GTK based trayicon UI for ConnMan"
-HOMEPAGE="https://github.com/tbursztyka/connman-ui"
-EGIT_REPO_URI="git://github.com/tbursztyka/${PN}.git"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-DEPEND="net-misc/connman
-        >=sys-apps/dbus-1.4
-		>=dev-libs/glib-2.28
-		x11-libs/gtk+:3"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	eautoreconf
-}
-
diff --git a/net-misc/devolo-dlan-cockpit/Manifest b/net-misc/devolo-dlan-cockpit/Manifest
new file mode 100644
index 0000000..0b193d8
--- /dev/null
+++ b/net-misc/devolo-dlan-cockpit/Manifest
@@ -0,0 +1 @@
+MISC metadata.xml 241 SHA256 6c8bf650f92e35ce441f4f7e664c261c396bf0b7387eead268ac7ac8c78d018a SHA512 4fd289d5889d95606c00514daf808a41d37c998c80c21fed5337cd259ef3605c14dd75186bedfd1b5abed98fcb590232553332468cb218cddcc7c089af81bc76 WHIRLPOOL e98ff9e57da40346406b3827c648ca386de579ea4a4c8904dc6288a1b1018c39d4e7c81787ff6ceec710c9f05465378920feba7745d5f27261d7c49436eee54e
diff --git a/net-misc/devolo-dlan-cockpit/metadata.xml b/net-misc/devolo-dlan-cockpit/metadata.xml
new file mode 100644
index 0000000..f078bb8
--- /dev/null
+++ b/net-misc/devolo-dlan-cockpit/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>andy@ndyk.de</email>
+		<name>Andrew Karpow</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-misc/esniper/Manifest b/net-misc/esniper/Manifest
index c22f756..ef64568 100644
--- a/net-misc/esniper/Manifest
+++ b/net-misc/esniper/Manifest
@@ -1,6 +1,6 @@
-DIST esniper-2-26-0.tgz 129965 SHA256 5fd9a0f4b27b98deca303cd3d16c1ed060e05a165a40b2f4a9f8546db5e3877d
+DIST esniper-2-26-0.tgz 129965 SHA256 5fd9a0f4b27b98deca303cd3d16c1ed060e05a165a40b2f4a9f8546db5e3877d SHA512 bf62df71edabfc58ab0d56ad988ddc174ee052d9dbae02b0ae3ef5862609b41485566a362a4ab0800f091df355660db773b5e6c58cfbca59c4418ab5309e93e9 WHIRLPOOL ed90fa413de2f9654ff98bd91bdf965d7916defff40ad3119fb9324d6e6ecd582a23cac3f294c595048bce1347afca14410f44ffaa34ac0496d84047ba3ae20a
 DIST esniper-2-28-0.tgz 130173 SHA256 c2b0ccb757616b32f2d6cf54a4a5e367405fa7bcd6e6ed11835fe4f8a06a016b SHA512 8f402a6370c2186784ccc3be096ddd73750ce97683c4f820f7b54a2574d4369860a49a4085d91673ccb47ecd937ef69ab89997adab0ccc2d124a0ce38a2e8fa2 WHIRLPOOL fd4eedec363fb226826f3b7dd8c5a136ed7ffc8cda0f4096d07f667f3ebb9ab2c66f07d39d1315e4963454c1c9e26886356551af62c3dae066372dc8b5c4b7a1
 EBUILD esniper-2.26.0.ebuild 811 SHA256 5c6b10d8f76781d628843ac14df59f498069b7a2d468bb25af0cc6a103582bdd SHA512 18bf615dec1f5cc9df5d07dc562fd5a912299f74fabc7e56a9b32e165cbd4bd85ed62ca6a48c307dfa6a557331de4e7906ef67730bcc21dab6a5b1017efbacae WHIRLPOOL 2299c916618be96ed305f3b6ff6d2a6eeb74785180ce3940310693a41925574a4e5aaa13e041a10423fb5dffe4cbd23d2127c82aa339ead56f9381a810519c87
 EBUILD esniper-2.28.0.ebuild 811 SHA256 5c6b10d8f76781d628843ac14df59f498069b7a2d468bb25af0cc6a103582bdd SHA512 18bf615dec1f5cc9df5d07dc562fd5a912299f74fabc7e56a9b32e165cbd4bd85ed62ca6a48c307dfa6a557331de4e7906ef67730bcc21dab6a5b1017efbacae WHIRLPOOL 2299c916618be96ed305f3b6ff6d2a6eeb74785180ce3940310693a41925574a4e5aaa13e041a10423fb5dffe4cbd23d2127c82aa339ead56f9381a810519c87
 MISC ChangeLog 1150 SHA256 849f8d9491e3bc76dcab92fc7d2a78861d9a1fe392e3b924fe8d7952831f7906 SHA512 f1a5e2266ccfebb030c3b484e9b9579758eb0be6a13bb3ae15eafe730901995b38a8fb5e048e52cff7d77f428d07fbeb947023a801dd93713bbac5234fbba97c WHIRLPOOL 14c56c189f76a4f1dfef3e67803d8d0029931e10012b293ae9d6a7fb4b2dce41cc859fcd0efd2626fee1a03ccd2b8600fb896c4f16c2eb958ef33ea08f4d9f55
-MISC metadata.xml 208 SHA256 c4841c87f0c2b9b5e679a27dc72180be8d508fb3f5df0fbab2ec2c805c0a6d82 SHA512 21d90d4547c76c80e50e134359dfbec42b158bbc16e4741738bdde5f67b7926d158dae1905948a477405b74e754ce4ed63cad910f220a709db8dfccf160e5288 WHIRLPOOL 33ec53f42c7a8c4c419989bd94e083c417574463e19c9c1322e6b96d0f5a6a52e3dd69fbedf2d11a7a77d24a93b81f3a604b6b33cac62548389537bf3e42df0e
+MISC metadata.xml 223 SHA256 7291eff4e17777956dd7f9b9a4dfe813f1df682dd8cd610d0c324761f4adf1bd SHA512 cdf1a21541ac7d2632b31879682dca06d34a37107bc333082ecb5b80f6952202a938b09af051a3f58d03e009c1411add99720cbe9a09e3c2682ab305b0ac618d WHIRLPOOL 3eeb65b78331ea90170bc834d58e6e6dcadba4b079731db29b86fabaf82f5b6f41d163b439ee5499b2de553c3e1b064ecaa4d9bb55b844b6f2a72d4e3805a94d
diff --git a/net-misc/esniper/metadata.xml b/net-misc/esniper/metadata.xml
index 31dc017..b969149 100644
--- a/net-misc/esniper/metadata.xml
+++ b/net-misc/esniper/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-wanted@gentoo.org</email></maintainer>
+<maintainer type="project"><email>maintainer-wanted@gentoo.org</email></maintainer>
 </pkgmetadata>
diff --git a/net-p2p/vanitygen/Manifest b/net-p2p/vanitygen/Manifest
index 6d865cd..7603f74 100644
--- a/net-p2p/vanitygen/Manifest
+++ b/net-p2p/vanitygen/Manifest
@@ -1,3 +1,4 @@
 AUX respect-cflags.patch 313 SHA256 8bca4f112c24f44d0830647714026555919310f30f7e29986e45e2c59d7c9ac2 SHA512 11670c89fbfeab8743430bd32a0346a12ebd909d6d1ffdf5a4219e83ef70c01c1e984cc270bb57cc460056448ca48ce18f46533cc4444cf7da2d196c2e07bf22 WHIRLPOOL 2a55c1a7831018079937ba7af61c4d114008672b4df17363a2c5b0a3ef2048aa8992af3f79de6ca028cdeb7bfea3290ba33e6c1626a0f0551bffe265e3d3a1dc
 DIST vanitygen-0.21.tar.gz 77441 SHA256 58c56e1ec51c654077ace5599d4f9dc512110e2150fe40a05380f948b305be7f SHA512 339fd0ddb7e78d55f95c7e4797d3e2e92dce407a8221f42f3e9971d07210fcea0d681e32247d2d1d46a0946a7e735597eb32dc981ac4f1796abe2ec0a141e88f WHIRLPOOL 46bc750668834a7aa15faf56af95900d758d5a5fe51fa8c4886f78485a9afabfd9b625cea5a287e41f78fac3cd44f81f87d87aa6318a91826fc46446d690a06d
 EBUILD vanitygen-0.21.ebuild 825 SHA256 796cf852a7f28590a2b81b924d620d58942b12c45a1cdc49e56d08f1d6e94971 SHA512 89e2175ab25ad583680100774e781fee1b228576ea34570046538ff1d9dcce5923d9e84c22140bdcda3bb46d727b3b2b8bf7e7c0834e854b60d87288824e170c WHIRLPOOL 165801ed8fba7595ec025dc3567d0d66171d36806ab2c7dd260805dfeaaaa3ac3b811a7971b758d4bd93473ea53bb0b8065a9ceea7aa78a13823de75f00297bd
+MISC metadata.xml 322 SHA256 d13715bc9a4b87a350b88bb3830fd5cc3a8fdd1c3542ebca20c15b8e1d16960d SHA512 705257197d62cd5a2caec449d8e8c7ab611907fa4e9e1bc668e5cee3df4f45ec746e31c98d422ed770baf4e884750f0476cbfd9b1232cdb10f853dc1d0d03624 WHIRLPOOL 9849af07d09b2b5e9c37899798edb07ea9d4b85f78a3df6e09ba7238d2d9bccfca8d45c8dbf7676bfe78bddd844f453e3b20248fab748c73e7be8e0635b40683
diff --git a/net-p2p/vanitygen/metadata.xml b/net-p2p/vanitygen/metadata.xml
new file mode 100644
index 0000000..2b33b7a
--- /dev/null
+++ b/net-p2p/vanitygen/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>andy@ndyk.de</email>
+		<name>Andrew Karpow</name>
+	</maintainer>
+	<use>
+		<flag name="opencl">Enable opencl hardware accelleration</flag>
+	</use>
+</pkgmetadata>
diff --git a/net-print/brother-mfcj480dw/Manifest b/net-print/brother-mfcj480dw/Manifest
index 6f727ab..e5485f0 100644
--- a/net-print/brother-mfcj480dw/Manifest
+++ b/net-print/brother-mfcj480dw/Manifest
@@ -2,4 +2,4 @@ DIST mfcj480dwcupswrapper-1.0.0-0.i386.rpm 17459 SHA256 2a18c4943adc92a2e97f674a
 DIST mfcj480dwlpr-1.0.0-0.i386.rpm 2654483 SHA256 2a1e03b59d6af9dc8d67a9799f06ab439e67565410373081f2f8be65eb697a64 SHA512 9e683e3398737b766e3408449145d91539f3e4276464b0a6e5be457feefaa64c6915bd26f127ae20e15ce4a9d5075176aa4076bf11542745d70bd5638eecf17a WHIRLPOOL df9a1d5595bac95b69695cf19de865e68767f5c269c220cac5ed45beee8083599eebb173deef588dfd6c25385b00826b32407a659d44a9a94a6248eb68f880f3
 EBUILD brother-mfcj480dw-20150110.ebuild 2191 SHA256 d8cd9e995c01d1f1e73df3d73a09bb417da943689900af964c8ca4e419687018 SHA512 fea46cd4214fd50b2be6ba192df156e06054bc33e9c0529d09ad8ca772e1897afa3201b0a51ea80241e63eb2921b05085536e19c58a8963c81a7d23b71012ccc WHIRLPOOL 0971bd200f754a99ef9ab3f68982b05eb09c564321aef53b5bd2ea50f9c4e19110b200de708a5ec2cf9a987bfd7168778f4e83ed7c0b06f685f1cf4ffdfbadb6
 MISC ChangeLog 388 SHA256 8caa1d8ec70966fb5129008cb0976c653028eb6b8dec9655f847f5b8de5c10c0 SHA512 ae4486a32a0cc6df80f1eddcebeb01acd6e8bd942be46369c850c0f0c2683e2675b04aacc46da55d76bee21a53e0ddb006e73937c765ad71a412f57ea45d242b WHIRLPOOL 3170570184c1600d8323e02e39efc2d1f101968bb5e2364202606043a5c4ff674d66768b8ad090cfde3df7873c710555477f74fbce1dbbc7eeb6f38968d52b65
-MISC metadata.xml 263 SHA256 962d97f242ce31ca012f0495e7969a2c3b6a2c44722d3b5dc7b4cd6de71963ee SHA512 c9b64416d22357260d43a8e663790bf1db558b652c92908855d4ce6e2ec7cc12d661edbc4222a51859ef8532413ea732e853761a31137a933318b9b87a602b2e WHIRLPOOL 33063b3431b6f3be522b462881e18d5cc62384ca450047425d45135fe6054a1b361452b111ba09c4ddded86011b2f47f6eed3c66f93e41346abdc63c2158ae6c
+MISC metadata.xml 277 SHA256 33ba601cb97b6d73c28b6eb10149999e5983978aa22085e0f76ef69594087959 SHA512 f2109a1f98e72d236dd57c888b2d0337a4895ee1150839b720dba368bf6ed0124961da2dc6efe1f6c47304d1877d5c3aeb5fcd48761da8476491ffd101eb8f5f WHIRLPOOL de6a5a0c00d7ab87889731894326db37e90e69a082fed640d83cc151dd59f5ffad34a3b50cb75c454acafd82e83268372a14d11e5e14199e3f7eb3d2504cfae8
diff --git a/net-print/brother-mfcj480dw/metadata.xml b/net-print/brother-mfcj480dw/metadata.xml
index 2c7de38..7225c04 100644
--- a/net-print/brother-mfcj480dw/metadata.xml
+++ b/net-print/brother-mfcj480dw/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
+<maintainer type="person">
   <email>andy@ndyk.de</email>
 </maintainer>
 <use>
diff --git a/sys-apps/lms/Manifest b/sys-apps/lms/Manifest
index dade791..da117bb 100644
--- a/sys-apps/lms/Manifest
+++ b/sys-apps/lms/Manifest
@@ -1,3 +1,5 @@
+AUX lms-8.0.0.7-missing-unistd.patch 308 SHA256 2fec6fd65d28337be6036596da078c0557c14ab8ab0120ee3c26525f267da382 SHA512 a3234469597442c28ce415e2d6710d285e41b0634b003515fc5a00233c66a7dfd5d349167ac58aa4a9e4d01992a7cae777ca5050f295839b12c6c25eef22a8d5 WHIRLPOOL 460cb9eea9de4a8cf8ef314037c9ab2103edefa90477f442933348e7d9ff1dd84dd26da49a1337d0159f45906efd31595cd7e3544f33ec056934acc84edd6c94
 AUX lms.initd 516 SHA256 44affc8baf3708535f8dce7c966d6b72b7cb748625dda74cd6b0be54b87742e2 SHA512 ecc65bc7f54ae7aa4762028ac452e260f051577954b3e4af7f0d831c04a4baec53aa8e422d4daef6cdcd228b2c9ea1b045c747360008a30b6cc3ae5a99aaa9af WHIRLPOOL 63120f10d1802d1bbd8ed7ffd12ddceb6fbdf5bf2ef10269524f96fcb5be4d45f4b7109922973f0db3042f515cf56027763887e36e6c7991f8130abfe09eaee4
 DIST lms-8.0.0-7.tar.gz 382509 SHA256 7077db6f2f381e67cb37565b20c40ff0c7d3f98f014e65622a4b4b66c2b1d637 SHA512 1b1a92466061518d939bf541aaf39553ee1d6eb27a9fdfcb4b6b39dd88179d7edc51b4b3cde20caba7c6d62d2485b969804a32e44cca9db60e5cc7fc89bbda5c WHIRLPOOL 3c9219105687a0ec2a8b29afbabbaf9d4321815280656a234115097b08562a6d18f67eaac1b140d933f77f80839e13ee399d704d459c5440207550b88cc396ad
-EBUILD lms-8.0.0.7.ebuild 1158 SHA256 2e7082464eec3d38d84f458bbddd1e982b2c3e950ed30529e557178aeaf0b53a SHA512 21f6ab87f22dadc3b7940b23338150a531d73b5a94a259fc91f16945024198b2c05687f09e3d80a7986578bea380b0734a04cf6d360c4e8f3974279033524039 WHIRLPOOL 2d58e1ce7f33741f3b576f15c1fc7a9504b5ceb56625ab2837fcb0a973fd31ce9857ecfadd2cdf7f9e26bcc263b8cce6fd2b9aee598c78f8fdd510b2d79a7c77
+EBUILD lms-8.0.0.7-r1.ebuild 1336 SHA256 7e26d29616f8139623bfde14692fc423cafd900bdd29d0799ee88aeaf518b36e SHA512 4ed90db7fba6798baca3ef246d4a2db0cce803d0425bb8ec4eaf3535fbb0d83937a95bcc668c03f4ad92570790ef8ad1468587777506c53ca8599a5b5f100e55 WHIRLPOOL 85fd9b4e39922db40eb13017dd7fabf960a571a8625a6d0da38997ad94b2b198c8e22ea9e6a6d7526724db035f38b64e8a6c7a5d07d011382d39011f01b885f8
+MISC metadata.xml 241 SHA256 6c8bf650f92e35ce441f4f7e664c261c396bf0b7387eead268ac7ac8c78d018a SHA512 4fd289d5889d95606c00514daf808a41d37c998c80c21fed5337cd259ef3605c14dd75186bedfd1b5abed98fcb590232553332468cb218cddcc7c089af81bc76 WHIRLPOOL e98ff9e57da40346406b3827c648ca386de579ea4a4c8904dc6288a1b1018c39d4e7c81787ff6ceec710c9f05465378920feba7745d5f27261d7c49436eee54e
diff --git a/sys-apps/lms/files/lms-8.0.0.7-missing-unistd.patch b/sys-apps/lms/files/lms-8.0.0.7-missing-unistd.patch
new file mode 100644
index 0000000..8932721
--- /dev/null
+++ b/sys-apps/lms/files/lms-8.0.0.7-missing-unistd.patch
@@ -0,0 +1,10 @@
+--- lms-8.0.0-7/src/tools/ATVersion.cpp	2011-06-29 04:45:54.000000000 -0500
++++ /tmp/ATVersion.cpp	2017-03-08 13:46:49.100021793 -0600
+@@ -40,6 +40,7 @@
+ #include <cerrno>
+ #include <fstream>
+ #include <dirent.h>
++#include <unistd.h>
+ 
+ #define AT_VERSION_ARGUMENT "--version"
+ #define AT_VERSION_MAXSIZE 40
diff --git a/sys-apps/lms/lms-8.0.0.7.ebuild b/sys-apps/lms/lms-8.0.0.7-r1.ebuild
index bde89e2..15c1ccf 100644
--- a/sys-apps/lms/lms-8.0.0.7.ebuild
+++ b/sys-apps/lms/lms-8.0.0.7-r1.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
-inherit versionator linux-info
+inherit versionator linux-info eutils flag-o-matic
 
 MY_PV=$(replace_version_separator 3 '-' )
 MY_P="${PN}-${MY_PV}"
 
-DESCRIPTION="Local Manageability Service (LMS) allows access to Intel® Active Management"
+DESCRIPTION="Local Manageability Service (LMS) allows access to Intel Active Management"
 HOMEPAGE="http://software.intel.com/en-us/articles/download-the-latest-intel-amt-open-source-drivers"
 SRC_URI="http://software.intel.com/sites/default/files/${MY_P}.tar.gz"
 
@@ -37,12 +37,20 @@ pkg_pretend() {
     fi
 }
 
+src_unpack() {
+   	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-missing-unistd.patch"
+}
+
 src_prepare() {
-	edos2unix README
+    append-cppflags -ansi
+    edos2unix README
 }
 
+
 src_install() {
-	emake DESTDIR="${D}" install
+	emake DESTDIR="${D}" OPTFLAGS="-ansi -pedantic ${CFLAGS}" install
 	dodoc README
 	newinitd "${FILESDIR}/lms.initd" lms
 }
diff --git a/sys-apps/lms/metadata.xml b/sys-apps/lms/metadata.xml
new file mode 100644
index 0000000..f078bb8
--- /dev/null
+++ b/sys-apps/lms/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>andy@ndyk.de</email>
+		<name>Andrew Karpow</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/sys-devel/gcc-arm-embedded-bin/Manifest b/sys-devel/gcc-arm-embedded-bin/Manifest
index 93d6ff2..ee06dfb 100644
--- a/sys-devel/gcc-arm-embedded-bin/Manifest
+++ b/sys-devel/gcc-arm-embedded-bin/Manifest
@@ -1,4 +1,5 @@
 DIST gcc-arm-none-eabi-4_7-2013q3-20130916-linux.tar.bz2 59548217 SHA256 0d10891d3a3b0b4c340650d576d62c016670e4dec166e06f16b60384535ca9ad SHA512 7af7f20e52858ffd373bf1aa6a9b1f49ef4e8907b41ae1008eb36b0bbe8d6038267a85294511ac93d35acb8e8796608b8d1aa6131cd3c9dfa8b4c6c1273a18ea WHIRLPOOL 819b333e5734cc173a5703c1b05628c5e9a8a8eef9a396312756d78af7b84b9ff15ece96c5891a30e3218e62d8a9f4b3a0b67e0611c5fd19cda5378e53d42634
 DIST gcc-arm-none-eabi-4_9-2015q1-20150306-linux.tar.bz2 74404999 SHA256 c5e0025b065750bbd76b5357b4fc8606d88afbac9ff55b8a82927b4b96178154 SHA512 0e551c4159fd2fe29c8124396eab9856628426be76c2a5b06f503e7401f30c71d6fbccced2af24859a83c2ec78c28f5e50d79c5112d96d087f6d07b68ce73917 WHIRLPOOL 2aacc75be764126873311397aee6d630751bc54f0174e7efb3f7f404879084cbe7db87b55beb83368fedf30467dc5cf2825ac8b8c6239bd9e64a8c4cafe45143
-EBUILD gcc-arm-embedded-bin-4.7_p20130916.ebuild 1152 SHA256 aab8a0eb5fc1a7c278035ae1d788a8bf6a6b9c8f71d4e23386712ee241d5551c SHA512 e23e9063998023c34c1dcb72fa4e0c3a74bc5781e28a983c95d6d18c9428e73de768e07607c59d8e3655fa087be295746892f742100ec81e5c287cf525a14671 WHIRLPOOL 6ceb86ca52af6990fefa728769c64dcffc8a4c68278e22d6e238073224b445f55a162aa9f18b63020a68654dad1eb8b674d7df8ac01b688ab0f9d11503afcca7
-EBUILD gcc-arm-embedded-bin-4.9_p20150306.ebuild 1151 SHA256 17aa0cc3095afae32677efbfac5b3c7eb71421600fcd7065a12251054a5e4f95 SHA512 e09df7bd9d6e8d80872fbbb5e0350b3fd3d4b1b6e53cc8797b3bdf1626e5db43d565ba5363ea8476178b8c429b292e536d495eba8ea0c4411ef31bed2e467963 WHIRLPOOL b96056b4cbea8f61712fd36a65cc76393a52294164e1cde4efa9494deffe8470da2d497008f3cd10a5486c9368ca5af66d98a9ee74ebdab249dc044386c2f30d
+EBUILD gcc-arm-embedded-bin-4.7_p20130916.ebuild 1158 SHA256 ce305c11a701d5482ffcfc4c7979c8fb6736e5d05baed3e804f576cb21e3fbb5 SHA512 e1def2fec2ff198ea174ed5ff73130c776c7c48db9e1d8a386324cbd62fb16621c1cfafd565094c939e105a6c16d69abf5e788bff0064d68c9cb4fb98951cc34 WHIRLPOOL 0dbb14ff90f858349d119b413a7e9254f1163ab26daa5da39ca34742ac03594d8e0bfab4769b53cb01dfa3b5c8910d7ac08cac7d654578cf5910f3b187f5751b
+EBUILD gcc-arm-embedded-bin-4.9_p20150306.ebuild 1157 SHA256 d054f3951864eb62f3198af918ed5347fee10096d704648a2882e56ecab7a86a SHA512 1e64efdbdc765856b30f2c4afe1d38b6496945c211d5e6498616f68e763eaa4cd896d866cd9a1e3ce115f8a6a2067a4d0ea86b29cb3fa27e1d1ac15657f780ca WHIRLPOOL f2a1bb7a86e6523435bc791063dce5ed959ecc485f2a6965ec3839a210f9224aa01c6dbd06f2730895f5bb37566168b11fb044d96bb7f3a7a9916f7b7b723f35
+MISC metadata.xml 319 SHA256 e00785c49d80fbed89007ec55f39a5596cfd6c935d9d9334205d8c5104d041ad SHA512 ff608e38f0d09e8ae87d44cad001fee4540a3310f643281f9326e9a4c298b525ca13edf30f857b251a17222b0efad3eefa61124f2ea2fc4215c76e2c20234eef WHIRLPOOL 0c0da795ff42d545f07bd1aacd91f66e438abcb3fa4bcaf5f1c24e9cd1eb6e7d8779c5c6dabeca774db6e43e77cbda08e69818ed31817604ec33dd274cd477b9
diff --git a/sys-devel/gcc-arm-embedded-bin/gcc-arm-embedded-bin-4.7_p20130916.ebuild b/sys-devel/gcc-arm-embedded-bin/gcc-arm-embedded-bin-4.7_p20130916.ebuild
index fd47898..32694b7 100644
--- a/sys-devel/gcc-arm-embedded-bin/gcc-arm-embedded-bin-4.7_p20130916.ebuild
+++ b/sys-devel/gcc-arm-embedded-bin/gcc-arm-embedded-bin-4.7_p20130916.ebuild
@@ -1,21 +1,24 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=5
+EAPI=6
+
+inherit multilib-build
+
+MULTILIB_COMPAT=( abi_x86_32 )
 
 DESCRIPTION="Pre-built GNU toolchain from ARM Cortex-M & Cortex-R processors (Cortex-M0/M0+/M3/M4, Cortex-R4/R5/R7)."
 HOMEPAGE="https://launchpad.net/gcc-arm-embedded"
 SRC_URI="https://launchpad.net/gcc-arm-embedded/4.7/4.7-2013-q3-update/+download/gcc-arm-none-eabi-4_7-2013q3-20130916-linux.tar.bz2"
 
-LICENSE="BSD GPL GPL-2 LGPL-2 LGPL-3 MIT NEWLIB ZLIB"
+LICENSE="BSD GPL-2 LGPL-2 LGPL-3 MIT NEWLIB ZLIB"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 -*"
 IUSE="doc samples"
 RESTRICT="strip binchecks"
 
 DEPEND=""
-RDEPEND="amd64? ( sys-libs/glibc[multilib] )"
 
 S="${WORKDIR}"/gcc-arm-none-eabi-4_7-2013q3/
 
diff --git a/sys-devel/gcc-arm-embedded-bin/gcc-arm-embedded-bin-4.9_p20150306.ebuild b/sys-devel/gcc-arm-embedded-bin/gcc-arm-embedded-bin-4.9_p20150306.ebuild
index 9f666dd..9375062 100644
--- a/sys-devel/gcc-arm-embedded-bin/gcc-arm-embedded-bin-4.9_p20150306.ebuild
+++ b/sys-devel/gcc-arm-embedded-bin/gcc-arm-embedded-bin-4.9_p20150306.ebuild
@@ -1,21 +1,24 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=5
+EAPI=6
+
+inherit multilib-build
+
+MULTILIB_COMPAT=( abi_x86_32 )
 
 DESCRIPTION="Pre-built GNU toolchain from ARM Cortex-M & Cortex-R processors (Cortex-M0/M0+/M3/M4, Cortex-R4/R5/R7)."
 HOMEPAGE="https://launchpad.net/gcc-arm-embedded"
 SRC_URI="https://launchpad.net/gcc-arm-embedded/4.9/4.9-2015-q1-update/+download/gcc-arm-none-eabi-4_9-2015q1-20150306-linux.tar.bz2"
 
-LICENSE="BSD GPL GPL-2 LGPL-2 LGPL-3 MIT NEWLIB ZLIB"
+LICENSE="BSD GPL-2 LGPL-2 LGPL-3 MIT NEWLIB ZLIB"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 -*"
 IUSE="doc samples"
 RESTRICT="strip binchecks"
 
 DEPEND=""
-RDEPEND="amd64? ( sys-libs/glibc[multilib] )"
 
 S="${WORKDIR}"/gcc-arm-none-eabi-4_9-2015q1
 
diff --git a/sys-devel/gcc-arm-embedded-bin/metadata.xml b/sys-devel/gcc-arm-embedded-bin/metadata.xml
new file mode 100644
index 0000000..547f68b
--- /dev/null
+++ b/sys-devel/gcc-arm-embedded-bin/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>andy@ndyk.de</email>
+		<name>Andrew Karpow</name>
+	</maintainer>
+	<use>
+		<flag name="samples">Enable code samples installation</flag>
+	</use>
+</pkgmetadata>
diff --git a/www-apps/ympd/Manifest b/www-apps/ympd/Manifest
deleted file mode 100644
index 7009bd1..0000000
--- a/www-apps/ympd/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST v1.0.0.tar.gz 212980 SHA256 b19bf83546608d07798eae96a0166cf068c5d4ccd2f1c8ffce775e68cea846f9 SHA512 dce92b894e6e382e659085ca8304c9d3beb0157e40b404341ace29ebbd973f6697127da2aa79242d057553732fb1f5a7eb6258cd79f104cc9359a7dbe31d1b36 WHIRLPOOL 6238daa9b6cdc222320da4e22ca4abc5cdc0134bb1beb6d219dd0c452d113e406d4c8494b371463a50375e9ffb1cdd95cd98eecf148704ee4229d79a439deee2
-EBUILD ympd-1.0.0.ebuild 590 SHA256 2e7873fea0934aaade3a01c6fcea8863058f9f3086828382121d7485d2cec7b7 SHA512 8bfb9ab6ca48502063068ae2f639a591eb0c19aa575289b160b1082067a6957d8fab71e687b159ca4d4edcedfa9396e7b33cba480f7148bccdff042be4cb25c9 WHIRLPOOL 04aeed6ab5b52350010ccb7e94580e382d7e41ae77ed74e92c8c7cc29275f072d9ea8d619ddc514f44fcac0e222c383d881cd603ee607733cb153207656ddca5
-MISC metadata.xml 495 SHA256 45ba8f508f3f02dbd5d860965863d1bfed00f2b1ff52f267745f2e1e630f7ccd SHA512 eebc78bb3e8ce3f69dc5ebe6f4a771a415b6824e606e6c8ec4cfe52ee9e0be76d82da93f80c578fadc78c8107a73d69b41ccda96e21672fa4589bb13f4a27ee6 WHIRLPOOL a944c9b24427d1aeba35cd6900c1d5b4b732ec80138b99ea91b4688b82b2d040455c31ab219712e6b549d501b3c5a71e585725408404401c5ebdf00363f58510
diff --git a/www-apps/ympd/metadata.xml b/www-apps/ympd/metadata.xml
deleted file mode 100644
index 40c878f..0000000
--- a/www-apps/ympd/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <longdescription lang="en">
-    ympd is a lightweight MPD (Music Player Daemon) web client that runs without a dedicated webserver or interpreters like PHP, NodeJS or Ruby. It's tuned for minimal resource usage and requires only very litte dependencies.
-  </longdescription>
-  <use>
-    <flag name='static'>Link libwebsockets statically</flag>
-  </use>
-</pkgmetadata>
-
diff --git a/www-apps/ympd/ympd-1.0.0.ebuild b/www-apps/ympd/ympd-1.0.0.ebuild
deleted file mode 100644
index 63f9f1d..0000000
--- a/www-apps/ympd/ympd-1.0.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="MPD Web GUI - written in C, utilizing Websockets and Bootstrap/JS"
-HOMEPAGE="http://www.ympd.org"
-SRC_URI="https://github.com/notandy/${PN}/archive/v${PV}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="static openssl"
-
-DEPEND=">=net-libs/libwebsockets-9999[openssl?]"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_with static STATIC_WEBSOCKETS)
-	)
-	cmake-utils_src_configure
-}
diff --git a/x11-misc/autorandr/Manifest b/x11-misc/autorandr/Manifest
index 8e8be7e..49ce896 100644
--- a/x11-misc/autorandr/Manifest
+++ b/x11-misc/autorandr/Manifest
@@ -1 +1,2 @@
-EBUILD autorandr-9999.ebuild 825 SHA256 500562228ea254fba9dc5be9abe30d32d508915116fcc226e20a8612a6aebf12 SHA512 505914584e14066767ee7e5e2967928ffeefd69d3a116dc973e9e939c006ca27e08088a2c58424bbad4317c18bd5a4b0b797556e1dd95326a110edbd383c46b7 WHIRLPOOL 0c25142b2c5eab50a7cb2e56ce15849f429a1402744194b3dc0dfaf5a7ff513f9ed568ec78d185471924415f5328f43cc1dbc3ffe7dd9578854ff97046d28a21
+EBUILD autorandr-9999.ebuild 830 SHA256 61f04258077950eed4534e796267d9636dde9e516529622100894d6fec42bfbd SHA512 2af6015224b03630fc8fd7445909378889d79901597a987c4fcda97620ab761f0a333e1427052f34baa231c592870bf823da46e35d794b41f384e62f9a55eb50 WHIRLPOOL e0d0660a749e8607f4da8617fe6ccbbfc92318a33f431efbbff9faec6f13c7713b57f5b0878ab9afeebbc7c31c4b51b7f4e74264e29daf62ff40bde3efe9f47f
+MISC metadata.xml 311 SHA256 7ba7c905887c96c5888084738da4eedd0a3490b4769c9a1f47de9519af3741a9 SHA512 955dff7466c5a1b5fdb967476d907d64936573eed91af98a7e0d7056e5d06fe118e8b43cccee34086988d960088feb3e18617557e7b347a72fe834b4ad40691f WHIRLPOOL f7bd84d8aceb36a042cd40b43a4621962b684409489eb43b0f5a417e0110d44b5417af54a12b64f80c7f181c08c4f909d7787e9a969da83e6aff5909f188b4e8
diff --git a/x11-misc/autorandr/autorandr-9999.ebuild b/x11-misc/autorandr/autorandr-9999.ebuild
index a9fa636..a6ba23c 100644
--- a/x11-misc/autorandr/autorandr-9999.ebuild
+++ b/x11-misc/autorandr/autorandr-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -11,7 +11,7 @@ HOMEPAGE="https://github.com/phillipberndt/autorandr"
 SRC_URI=""
 EGIT_REPO_URI="${HOMEPAGE}"
 
-LICENSE=""
+LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS=""
 IUSE="udev +pm-utils"
diff --git a/x11-misc/autorandr/metadata.xml b/x11-misc/autorandr/metadata.xml
new file mode 100644
index 0000000..99d3650
--- /dev/null
+++ b/x11-misc/autorandr/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>andy@ndyk.de</email>
+		<name>Andrew Karpow</name>
+	</maintainer>
+	<use>
+		<flag name="pm-utils">Enable pm utils support</flag>
+	</use>
+</pkgmetadata>
diff --git a/x11-misc/dspdfviewer/Manifest b/x11-misc/dspdfviewer/Manifest
index b3ba4a0..1061d6a 100644
--- a/x11-misc/dspdfviewer/Manifest
+++ b/x11-misc/dspdfviewer/Manifest
@@ -1,3 +1,3 @@
 DIST dspdfviewer-1.10.1.tar.gz 29197 SHA256 4292662ce31dff89568248cb4b0dcb61621aa3875f0b1f81daf345d45038e5ff SHA512 bbb3848cbae81bf4650dfc836ca56f703c94e307de42db593f9218da77416f7ce6773b7d54695d781961e5b0884ef914d94b555670a412301036cd72f4751efe WHIRLPOOL 783cfbc1775c19d660aaa257524cc3ede79d57053a1b5521040a1c68d30893c085ae65856ae8b3ed9bc89d246981da67e40a974f9cd99b1019c1505f9a4181c0
 EBUILD dspdfviewer-1.10.1.ebuild 503 SHA256 29765a704ff034af92d69860f53871072b4172851a52b2297ea8751a44ce1d1f SHA512 56bf76c504e69fe394a24a74776d8114f522d91f8cf1202e16bd05c64137698bbefb2078f6acedd00817144939fd52b518384c53b3cc877eead028adb748435c WHIRLPOOL e97b2127fdd59075671c882226e3dc8fcc95b6b45adab1f2546ab0edf5bebd400591cfcee234582973943eb1720b33a50b126832aa3ba3153a368b6075cd6409
-MISC metadata.xml 218 SHA256 c2becfc3260a1b57a64c3de67159aee663b596fbb18448656d1deddabe18b668 SHA512 f37f76dd9c094e824f26112097ec550d0bc44af0df5ac0a12b8c485047db9b52a229b691adf4d775866839f58220f21279c95fc786e9cec80e71d8e48b0c14f9 WHIRLPOOL bc6ac0c617f4a7372635ba89eb93eaf7e02fd4379a1478bf2c1865ed2bd30e2f10bd424c4c98b1f14f9a81dd2f69104c053ca9ae8b2b49187e6fa4500e62fadf
+MISC metadata.xml 233 SHA256 85df80e09434d1176cc888eb1b19e2819f2d0f687545c19cbf92545bd6d1ee6d SHA512 f2faaf74ff1db03bbe93786b559ab48646766f26d3313820b309b6c297a056409bf5038177d5b771479d86db9b9c652adf441b1171b9eb8a1c7942399bd997cb WHIRLPOOL 787e1846406917df0b88956b4f438f21abb32543e6bc4815d450266eb75fc7b108ef01c19ce0ff80ce18d1ffc9eeb67ade38b795511061cf21691b81b08e5f78
diff --git a/x11-misc/dspdfviewer/metadata.xml b/x11-misc/dspdfviewer/metadata.xml
index a759be0..2c53357 100644
--- a/x11-misc/dspdfviewer/metadata.xml
+++ b/x11-misc/dspdfviewer/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="project">
     <email>maintainer-wanted@gentoo.org</email>
   </maintainer>
 </pkgmetadata>
diff --git a/x11-misc/icat/Manifest b/x11-misc/icat/Manifest
index ee9a932..872e03b 100644
--- a/x11-misc/icat/Manifest
+++ b/x11-misc/icat/Manifest
@@ -1,3 +1,4 @@
-AUX icat-0.4-flags.patch 265 SHA256 3915e62b4111f64fc2eacba82b6043bd962ab0ecfc713ec2a7c851b1df16e00b SHA512 ced29387a676cc20400b21ea9c745f48326681850bf8d5d2b51f53dbc48516c18b821d5ea61a804ba02f2b668debe80edd7bb05854f0d64e5cf0cb6250a5a643 WHIRLPOOL a3beb4f3446d7330904a901db54c4c53677cdc547c3fe9c0f8b4caaaeb802f63595b4c3a7d46e3c6aac1f2a5fde1a017b0170190bf890e251a0f593049e872ff
+AUX icat-0.4-flags.patch 259 SHA256 f991f2435e3412cf1323e59409443c82e2cd3e2051196ea22d90aec952020654 SHA512 b247537df5d0fecb2f0a2086c2c36d0f6ac63bd2406b7222a163072e788d576126168500adbeff955a0f5f66877e1a324583c7f9ba36bf2463f361f891f6f074 WHIRLPOOL 94c852480a9b498722062f5a5988cb886206c8c941ede92fadb8506cb3a248f5da820ad3603a4b688d0e1281232e7c84bd4d16006479d8a366da057b171988a0
 DIST icat-0.4.tar.gz 7858 SHA256 b286495047cdfa04375cdd788f246fa227725460a66cb151c9a22957bbdb567f SHA512 18e6a8fdf1e9f817f118c0037a28f91fe1a88bd8d2476a99522e61cdcbfe29f7928a3ffe5d52aab46b0e648f98103b592bd55f70b454054dcdcab4f6b10588db WHIRLPOOL 3a137fbdc1857740f83d9a48fca43b96990d59930b65fa1c5bea5fa94cd4515c84af4a4ddbd2b65621c6e4be8ae8fea3199156963109145d1e8876b0e1c60e25
 EBUILD icat-0.4.ebuild 620 SHA256 6717276ffcc7bd05f687db1b9dbc604cada3994fb7847499ff0fb052cc454909 SHA512 9b4a755b8a37ceadfbf95fbe7d3fc6de57510bcc599dae68876ebfd25428e6f75fb873a23dfaf7d8b26b6e70c7c53ffc2d791d031fd8b7dcd69c1ffda3e4a843 WHIRLPOOL 81997a3da99dff69b9a4cf022477ddc1f9a25fb71783812fbdeee6bf5ee243bf63e862c80d5a8eef321343825a48d9dd78e7c289a85dce789206e9f9a2babe25
+MISC metadata.xml 241 SHA256 6c8bf650f92e35ce441f4f7e664c261c396bf0b7387eead268ac7ac8c78d018a SHA512 4fd289d5889d95606c00514daf808a41d37c998c80c21fed5337cd259ef3605c14dd75186bedfd1b5abed98fcb590232553332468cb218cddcc7c089af81bc76 WHIRLPOOL e98ff9e57da40346406b3827c648ca386de579ea4a4c8904dc6288a1b1018c39d4e7c81787ff6ceec710c9f05465378920feba7745d5f27261d7c49436eee54e
diff --git a/x11-misc/icat/metadata.xml b/x11-misc/icat/metadata.xml
new file mode 100644
index 0000000..f078bb8
--- /dev/null
+++ b/x11-misc/icat/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>andy@ndyk.de</email>
+		<name>Andrew Karpow</name>
+	</maintainer>
+</pkgmetadata>