diff --git a/app-backup/insync/Manifest b/app-backup/insync/Manifest
index 58b3dae8..96125332 100644
--- a/app-backup/insync/Manifest
+++ b/app-backup/insync/Manifest
@@ -5,6 +5,6 @@ DIST insync-dolphin-3.4.0.40973-1.noarch.rpm 85874 BLAKE2B 15e2716b60b84dcf92678
 DIST insync-nautilus-3.4.0.40973-1.noarch.rpm 54942 BLAKE2B 271db9639a73e5851fe3d0492813ce70941d903cb05ba0f4203c4944051a5820460ae1b3a3d1f506766f1cbc1a017143b30ec775849840ec0e45c1c03d1553d1 SHA512 5290f605ee0303838c7374feae3fdc7e703177a4e21d97699b7fbef1f4ca8b5786c889078357ae074b832cacff164229b198682ea4a8d58fa301c430fefd65dd
 DIST insync-nemo-3.4.0.40973-1.noarch.rpm 53621 BLAKE2B 629202b584d4f99ed2113c2dcb0e102ce18544fb5a3cc7362a176ef901eb70c6f4755c029dd14f40cf0ec4af1c44a8d6593af0c654b0104bd60839e4d6c6fd33 SHA512 348b65409bb7b4f706cb9a6c2da317aa67e9f902d341e9dcae4a3cb9005ff891f728476b2bd14f599f524e06f8ed15ff70011ebcfe660df4472c9025a5b00c2a
 DIST insync-thunar-3.0.23.40579-1.x86_64.rpm 12661 BLAKE2B f673ae7cda3290190e025319f6bf0f1bed179ee3a1a11dbe65438924959a0b8d32ba4528f19e90b81635dbb20f1436fe2baf531ef20b1d355d1fcc1453d69280 SHA512 f30edf41dfffa51c31ebc53eaeb94675fb11265e52c35b0999d16b352c077ddc377889f31b54cd9bd8ac1d43021efa3895991164f4c276a8b0cf3aa1faa576b3
-EBUILD insync-3.4.1.40977.ebuild 2949 BLAKE2B 4534928023e837c85c875626a282ecea1513bff20ff78ebca22bc187bf0d614bd07e7a365f83f37e8abff3298cb071e5f5e3d2f8982cc8bc11c9e12d7ec1a430 SHA512 b1e7045d79f7f957bf80e0882e24276ddd889160f00ad0dbf1d0710da0b873cf82d82ff614dcd3141ac338cf6b5db85cb9954767ef885c7033004728abc82c84
+EBUILD insync-3.4.1.40977.ebuild 3152 BLAKE2B 3e589531d7c22e59d8750b44894282354bc06db26cdbd3340c4a1531bbc834f20124b82c22d897891610bbe3a2b07c0838499b62f25f7165837d286061d50b68 SHA512 d4bd30cb9ef882e8ab096cf75006525cbb6b86d87d9f582d25a6d7bc13246b59ba815ddea9a13258750ec6ed75259ede326df86d6cba891f9e4e27bc4c18d50d
 MISC ChangeLog 443 BLAKE2B e45792709bf6bc7389b7009d0295aea8ed96d3caf2e1ef7516ce919e296260a66b9d11f5dbfba5f7344026bd390c53535fd22f123ba239529fc3aeccd19a27cb SHA512 ef37435181408ff3e657a096bb576a5314b9dd1da0eac6841845d6f918dca52f6f72fcef2044264184a525c9b8938a0a4684ac1f93be1893f9680d76b92cb5cc
 MISC metadata.xml 212 BLAKE2B a2d92e87aa3254bad22abdfbeab35fcea7eb5d7fb605dc804f370bf33e540c8967eaf7a153fcc5aa948d86ba6ec61011c8675a09bca013065d892df341c1b801 SHA512 969198cbf4b7a090c0935fda474f57d4660756a1d00ee8020b70b7f926fe1c4c017432493e293cdbfdeca8c79b8509cfd4d68441355c59434273b1d09cef07bd
diff --git a/app-backup/insync/insync-1.2.18.35198.ebuild b/app-backup/insync/insync-1.2.18.35198.ebuild
deleted file mode 100644
index 9d299258..00000000
--- a/app-backup/insync/insync-1.2.18.35198.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-DESCRIPTION="Advanced cross-platform Google Drive client"
-HOMEPAGE="https://www.insynchq.com/"
-MODPV="1.2.8.35136"
-SRC_URI="
-	x86?      ( http://s.insynchq.com/builds/insync_${PV}-trusty_i386.deb )
-	amd64?    ( http://s.insynchq.com/builds/insync_${PV}-trusty_amd64.deb )
-	nautilus? ( http://s.insynchq.com/builds/insync-nautilus_${MODPV}-precise_all.deb )
-	dolphin?  ( http://s.insynchq.com/builds/insync-dolphin_${MODPV}-precise_all.deb )
-	thunar?   ( http://s.insynchq.com/builds/insync-thunar_${MODPV}-precise_all.deb )
-	nemo?     ( http://s.insynchq.com/builds/insync-nemo_${MODPV}-precise_all.deb )
-	caja?     ( http://s.insynchq.com/builds/insync-caja_${MODPV}-precise_all.deb )"
-
-SLOT="0"
-KEYWORDS="-* ~x86 ~amd64"
-DEPEND=""
-RDEPEND="${DEPEND}
-	nautilus? ( dev-python/nautilus-python )
-	dolphin? ( kde-apps/dolphin )
-	thunar? ( dev-python/thunarx-python )"
-IUSE="nautilus dolphin thunar caja nemo"
-
-src_unpack() {
-	elog "If this fails with a deb2targz error, see"
-	elog "https://github.com/mrpdaemon/gentoo-overlay/issues/4"
-	mkdir "${S}"
-	cd "${S}"
-
-	if use amd64 ; then
-		unpack insync_${PV}-trusty_amd64.deb
-	else
-		unpack insync_${PV}-trusty_i386.deb
-	fi
-
-	unpack ./data.tar.gz
-
-	if use nautilus ; then
-		unpack insync-nautilus_${MODPV}-precise_all.deb
-	elif use dolphin ; then
-		unpack insync-dolphin_${MODPV}-precise_all.deb
-	elif use thunar ; then
-		unpack insync-thunar_${MODPV}-precise_all.deb
-	elif use nemo ; then
-		unpack insync-nemo_${MODPV}-precise_all.deb
-	elif use caja ; then
-		unpack insync-caja_${MODPV}-precise_all.deb
-	fi
-
-	unpack ./data.tar.gz
-}
-
-src_install() {
-	cp -pPR "${S}"/usr "${D}"/ || die "Installation failed"
-
-	echo "SEARCH_DIRS_MASK=\"/usr/lib*/insync\"" > "${T}/70${PN}" || die
-	insinto "/etc/revdep-rebuild" && doins "${T}/70${PN}" || die
-}
-
-pkg_postinst() {
-	elog "To automatically start insync add 'insync' to your session"
-	elog "startup scripts. GNOME users can also choose to enable"
-	elog "the insync extension via gnome-tweak-tool."
-}
diff --git a/app-backup/insync/insync-1.3.10.36104.ebuild b/app-backup/insync/insync-1.3.10.36104.ebuild
deleted file mode 100644
index dcfa256e..00000000
--- a/app-backup/insync/insync-1.3.10.36104.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-DESCRIPTION="Advanced cross-platform Google Drive client"
-HOMEPAGE="https://www.insynchq.com/"
-MODPV="1.3.8.36087"
-SRC_URI="
-	x86?      ( http://s.insynchq.com/builds/insync_${PV}-trusty_i386.deb )
-	amd64?    ( http://s.insynchq.com/builds/insync_${PV}-trusty_amd64.deb )
-	nautilus? ( http://s.insynchq.com/builds/insync-nautilus_${MODPV}-precise_all.deb )
-	dolphin?  ( http://s.insynchq.com/builds/insync-dolphin_${MODPV}-precise_all.deb )
-	thunar?   ( http://s.insynchq.com/builds/insync-thunar_${MODPV}-precise_all.deb )
-	nemo?     ( http://s.insynchq.com/builds/insync-nemo_${MODPV}-precise_all.deb )
-	caja?     ( http://s.insynchq.com/builds/insync-caja_${MODPV}-precise_all.deb )"
-
-SLOT="0"
-KEYWORDS="-* ~x86 ~amd64"
-DEPEND=""
-RDEPEND="${DEPEND}
-	nautilus? ( dev-python/nautilus-python )
-	dolphin? ( kde-apps/dolphin )
-	thunar? ( dev-python/thunarx-python )"
-IUSE="nautilus dolphin thunar caja nemo"
-
-src_unpack() {
-	elog "If this fails with a deb2targz error, see"
-	elog "https://github.com/mrpdaemon/gentoo-overlay/issues/4"
-	mkdir "${S}"
-	cd "${S}"
-
-	if use amd64 ; then
-		unpack insync_${PV}-trusty_amd64.deb
-	else
-		unpack insync_${PV}-trusty_i386.deb
-	fi
-
-	unpack ./data.tar.gz
-
-	if use nautilus ; then
-		unpack insync-nautilus_${MODPV}-precise_all.deb
-	elif use dolphin ; then
-		unpack insync-dolphin_${MODPV}-precise_all.deb
-	elif use thunar ; then
-		unpack insync-thunar_${MODPV}-precise_all.deb
-	elif use nemo ; then
-		unpack insync-nemo_${MODPV}-precise_all.deb
-	elif use caja ; then
-		unpack insync-caja_${MODPV}-precise_all.deb
-	fi
-
-	unpack ./data.tar.gz
-}
-
-src_install() {
-	cp -pPR "${S}"/usr "${D}"/ || die "Installation failed"
-
-	echo "SEARCH_DIRS_MASK=\"/usr/lib*/insync\"" > "${T}/70${PN}" || die
-	insinto "/etc/revdep-rebuild" && doins "${T}/70${PN}" || die
-}
-
-pkg_postinst() {
-	elog "To automatically start insync add 'insync' to your session"
-	elog "startup scripts. GNOME users can also choose to enable"
-	elog "the insync extension via gnome-tweak-tool."
-}
diff --git a/app-backup/insync/insync-1.3.14.36131.ebuild b/app-backup/insync/insync-1.3.14.36131.ebuild
deleted file mode 100644
index b28379cb..00000000
--- a/app-backup/insync/insync-1.3.14.36131.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-DESCRIPTION="Advanced cross-platform Google Drive client"
-HOMEPAGE="https://www.insynchq.com/"
-MODPV="1.3.12.36116"
-SRC_URI="
-	x86?      ( http://s.insynchq.com/builds/insync_${PV}-trusty_i386.deb )
-	amd64?    ( http://s.insynchq.com/builds/insync_${PV}-trusty_amd64.deb )
-	nautilus? ( http://s.insynchq.com/builds/insync-nautilus_${MODPV}-precise_all.deb )
-	dolphin?  ( http://s.insynchq.com/builds/insync-dolphin_${MODPV}-precise_all.deb )
-	thunar?   ( http://s.insynchq.com/builds/insync-thunar_${MODPV}-precise_all.deb )
-	nemo?     ( http://s.insynchq.com/builds/insync-nemo_${MODPV}-precise_all.deb )
-	caja?     ( http://s.insynchq.com/builds/insync-caja_${MODPV}-precise_all.deb )"
-
-SLOT="0"
-KEYWORDS="-* ~x86 ~amd64"
-DEPEND=""
-RDEPEND="${DEPEND}
-	nautilus? ( dev-python/nautilus-python )
-	dolphin? ( kde-apps/dolphin )
-	thunar? ( dev-python/thunarx-python )"
-IUSE="nautilus dolphin thunar caja nemo"
-
-src_unpack() {
-	elog "If this fails with a deb2targz error, see"
-	elog "https://github.com/mrpdaemon/gentoo-overlay/issues/4"
-	mkdir "${S}"
-	cd "${S}"
-
-	if use amd64 ; then
-		unpack insync_${PV}-trusty_amd64.deb
-	else
-		unpack insync_${PV}-trusty_i386.deb
-	fi
-
-	unpack ./data.tar.gz
-
-	if use nautilus ; then
-		unpack insync-nautilus_${MODPV}-precise_all.deb
-	elif use dolphin ; then
-		unpack insync-dolphin_${MODPV}-precise_all.deb
-	elif use thunar ; then
-		unpack insync-thunar_${MODPV}-precise_all.deb
-	elif use nemo ; then
-		unpack insync-nemo_${MODPV}-precise_all.deb
-	elif use caja ; then
-		unpack insync-caja_${MODPV}-precise_all.deb
-	fi
-
-	unpack ./data.tar.gz
-}
-
-src_install() {
-	cp -pPR "${S}"/usr "${D}"/ || die "Installation failed"
-
-	echo "SEARCH_DIRS_MASK=\"/usr/lib*/insync\"" > "${T}/70${PN}" || die
-	insinto "/etc/revdep-rebuild" && doins "${T}/70${PN}" || die
-}
-
-pkg_postinst() {
-	elog "To automatically start insync add 'insync' to your session"
-	elog "startup scripts. GNOME users can also choose to enable"
-	elog "the insync extension via gnome-tweak-tool."
-}
diff --git a/app-backup/insync/insync-1.3.2.36049.ebuild b/app-backup/insync/insync-1.3.2.36049.ebuild
deleted file mode 100644
index 9d299258..00000000
--- a/app-backup/insync/insync-1.3.2.36049.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-DESCRIPTION="Advanced cross-platform Google Drive client"
-HOMEPAGE="https://www.insynchq.com/"
-MODPV="1.2.8.35136"
-SRC_URI="
-	x86?      ( http://s.insynchq.com/builds/insync_${PV}-trusty_i386.deb )
-	amd64?    ( http://s.insynchq.com/builds/insync_${PV}-trusty_amd64.deb )
-	nautilus? ( http://s.insynchq.com/builds/insync-nautilus_${MODPV}-precise_all.deb )
-	dolphin?  ( http://s.insynchq.com/builds/insync-dolphin_${MODPV}-precise_all.deb )
-	thunar?   ( http://s.insynchq.com/builds/insync-thunar_${MODPV}-precise_all.deb )
-	nemo?     ( http://s.insynchq.com/builds/insync-nemo_${MODPV}-precise_all.deb )
-	caja?     ( http://s.insynchq.com/builds/insync-caja_${MODPV}-precise_all.deb )"
-
-SLOT="0"
-KEYWORDS="-* ~x86 ~amd64"
-DEPEND=""
-RDEPEND="${DEPEND}
-	nautilus? ( dev-python/nautilus-python )
-	dolphin? ( kde-apps/dolphin )
-	thunar? ( dev-python/thunarx-python )"
-IUSE="nautilus dolphin thunar caja nemo"
-
-src_unpack() {
-	elog "If this fails with a deb2targz error, see"
-	elog "https://github.com/mrpdaemon/gentoo-overlay/issues/4"
-	mkdir "${S}"
-	cd "${S}"
-
-	if use amd64 ; then
-		unpack insync_${PV}-trusty_amd64.deb
-	else
-		unpack insync_${PV}-trusty_i386.deb
-	fi
-
-	unpack ./data.tar.gz
-
-	if use nautilus ; then
-		unpack insync-nautilus_${MODPV}-precise_all.deb
-	elif use dolphin ; then
-		unpack insync-dolphin_${MODPV}-precise_all.deb
-	elif use thunar ; then
-		unpack insync-thunar_${MODPV}-precise_all.deb
-	elif use nemo ; then
-		unpack insync-nemo_${MODPV}-precise_all.deb
-	elif use caja ; then
-		unpack insync-caja_${MODPV}-precise_all.deb
-	fi
-
-	unpack ./data.tar.gz
-}
-
-src_install() {
-	cp -pPR "${S}"/usr "${D}"/ || die "Installation failed"
-
-	echo "SEARCH_DIRS_MASK=\"/usr/lib*/insync\"" > "${T}/70${PN}" || die
-	insinto "/etc/revdep-rebuild" && doins "${T}/70${PN}" || die
-}
-
-pkg_postinst() {
-	elog "To automatically start insync add 'insync' to your session"
-	elog "startup scripts. GNOME users can also choose to enable"
-	elog "the insync extension via gnome-tweak-tool."
-}
diff --git a/app-backup/insync/insync-1.4.3.37063.ebuild b/app-backup/insync/insync-1.4.3.37063.ebuild
deleted file mode 100644
index b28379cb..00000000
--- a/app-backup/insync/insync-1.4.3.37063.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-DESCRIPTION="Advanced cross-platform Google Drive client"
-HOMEPAGE="https://www.insynchq.com/"
-MODPV="1.3.12.36116"
-SRC_URI="
-	x86?      ( http://s.insynchq.com/builds/insync_${PV}-trusty_i386.deb )
-	amd64?    ( http://s.insynchq.com/builds/insync_${PV}-trusty_amd64.deb )
-	nautilus? ( http://s.insynchq.com/builds/insync-nautilus_${MODPV}-precise_all.deb )
-	dolphin?  ( http://s.insynchq.com/builds/insync-dolphin_${MODPV}-precise_all.deb )
-	thunar?   ( http://s.insynchq.com/builds/insync-thunar_${MODPV}-precise_all.deb )
-	nemo?     ( http://s.insynchq.com/builds/insync-nemo_${MODPV}-precise_all.deb )
-	caja?     ( http://s.insynchq.com/builds/insync-caja_${MODPV}-precise_all.deb )"
-
-SLOT="0"
-KEYWORDS="-* ~x86 ~amd64"
-DEPEND=""
-RDEPEND="${DEPEND}
-	nautilus? ( dev-python/nautilus-python )
-	dolphin? ( kde-apps/dolphin )
-	thunar? ( dev-python/thunarx-python )"
-IUSE="nautilus dolphin thunar caja nemo"
-
-src_unpack() {
-	elog "If this fails with a deb2targz error, see"
-	elog "https://github.com/mrpdaemon/gentoo-overlay/issues/4"
-	mkdir "${S}"
-	cd "${S}"
-
-	if use amd64 ; then
-		unpack insync_${PV}-trusty_amd64.deb
-	else
-		unpack insync_${PV}-trusty_i386.deb
-	fi
-
-	unpack ./data.tar.gz
-
-	if use nautilus ; then
-		unpack insync-nautilus_${MODPV}-precise_all.deb
-	elif use dolphin ; then
-		unpack insync-dolphin_${MODPV}-precise_all.deb
-	elif use thunar ; then
-		unpack insync-thunar_${MODPV}-precise_all.deb
-	elif use nemo ; then
-		unpack insync-nemo_${MODPV}-precise_all.deb
-	elif use caja ; then
-		unpack insync-caja_${MODPV}-precise_all.deb
-	fi
-
-	unpack ./data.tar.gz
-}
-
-src_install() {
-	cp -pPR "${S}"/usr "${D}"/ || die "Installation failed"
-
-	echo "SEARCH_DIRS_MASK=\"/usr/lib*/insync\"" > "${T}/70${PN}" || die
-	insinto "/etc/revdep-rebuild" && doins "${T}/70${PN}" || die
-}
-
-pkg_postinst() {
-	elog "To automatically start insync add 'insync' to your session"
-	elog "startup scripts. GNOME users can also choose to enable"
-	elog "the insync extension via gnome-tweak-tool."
-}
diff --git a/app-backup/insync/insync-1.4.9.37127.ebuild b/app-backup/insync/insync-1.4.9.37127.ebuild
deleted file mode 100644
index b28379cb..00000000
--- a/app-backup/insync/insync-1.4.9.37127.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-DESCRIPTION="Advanced cross-platform Google Drive client"
-HOMEPAGE="https://www.insynchq.com/"
-MODPV="1.3.12.36116"
-SRC_URI="
-	x86?      ( http://s.insynchq.com/builds/insync_${PV}-trusty_i386.deb )
-	amd64?    ( http://s.insynchq.com/builds/insync_${PV}-trusty_amd64.deb )
-	nautilus? ( http://s.insynchq.com/builds/insync-nautilus_${MODPV}-precise_all.deb )
-	dolphin?  ( http://s.insynchq.com/builds/insync-dolphin_${MODPV}-precise_all.deb )
-	thunar?   ( http://s.insynchq.com/builds/insync-thunar_${MODPV}-precise_all.deb )
-	nemo?     ( http://s.insynchq.com/builds/insync-nemo_${MODPV}-precise_all.deb )
-	caja?     ( http://s.insynchq.com/builds/insync-caja_${MODPV}-precise_all.deb )"
-
-SLOT="0"
-KEYWORDS="-* ~x86 ~amd64"
-DEPEND=""
-RDEPEND="${DEPEND}
-	nautilus? ( dev-python/nautilus-python )
-	dolphin? ( kde-apps/dolphin )
-	thunar? ( dev-python/thunarx-python )"
-IUSE="nautilus dolphin thunar caja nemo"
-
-src_unpack() {
-	elog "If this fails with a deb2targz error, see"
-	elog "https://github.com/mrpdaemon/gentoo-overlay/issues/4"
-	mkdir "${S}"
-	cd "${S}"
-
-	if use amd64 ; then
-		unpack insync_${PV}-trusty_amd64.deb
-	else
-		unpack insync_${PV}-trusty_i386.deb
-	fi
-
-	unpack ./data.tar.gz
-
-	if use nautilus ; then
-		unpack insync-nautilus_${MODPV}-precise_all.deb
-	elif use dolphin ; then
-		unpack insync-dolphin_${MODPV}-precise_all.deb
-	elif use thunar ; then
-		unpack insync-thunar_${MODPV}-precise_all.deb
-	elif use nemo ; then
-		unpack insync-nemo_${MODPV}-precise_all.deb
-	elif use caja ; then
-		unpack insync-caja_${MODPV}-precise_all.deb
-	fi
-
-	unpack ./data.tar.gz
-}
-
-src_install() {
-	cp -pPR "${S}"/usr "${D}"/ || die "Installation failed"
-
-	echo "SEARCH_DIRS_MASK=\"/usr/lib*/insync\"" > "${T}/70${PN}" || die
-	insinto "/etc/revdep-rebuild" && doins "${T}/70${PN}" || die
-}
-
-pkg_postinst() {
-	elog "To automatically start insync add 'insync' to your session"
-	elog "startup scripts. GNOME users can also choose to enable"
-	elog "the insync extension via gnome-tweak-tool."
-}
diff --git a/app-backup/insync/insync-3.0.27.40677.ebuild b/app-backup/insync/insync-3.0.27.40677.ebuild
deleted file mode 100644
index db5f0f07..00000000
--- a/app-backup/insync/insync-3.0.27.40677.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MULTILIB_COMPAT=( abi_x86_64 )
-
-inherit pax-utils rpm multilib-build xdg-utils
-
-DESCRIPTION="Advanced cross-platform Google Drive client"
-HOMEPAGE="https://www.insynchq.com/"
-NAUTILUSPV="3.0.23.40579"
-DOLPHINPV="3.0.22.40446"
-THUNARPV="3.0.23.40579"
-NEMOPV="3.0.11.40167"
-CAJAPV="3.0.11.40167"
-SRC_URI="
-        x86?      ( http://s.insynchq.com/builds/insync-1.4.9.37127-fc25.i686.rpm )
-        amd64?    ( http://yum.insync.io/fedora/31/x86_64/insync-${PV}-fc30.x86_64.rpm
-                    http://yum.insync.io/fedora/31/noarch/insync-nautilus-${NAUTILUSPV}-1.noarch.rpm
-                    http://yum.insync.io/fedora/31/noarch/insync-dolphin-${DOLPHINPV}-1.noarch.rpm
-                    http://yum.insync.io/fedora/31/noarch/insync-thunar-${THUNARPV}-1.x86_64.rpm
-                    http://yum.insync.io/fedora/31/noarch/insync-nemo-${NEMOPV}-1.noarch.rpm
-                    http://yum.insync.io/fedora/31/noarch/insync-caja-${CAJAPV}-1.noarch.rpm )"
-
-LICENSE="no-source-code"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="pax_kernel nautilus dolphin thunar caja nemo"
-
-S="${WORKDIR}"
-QA_PREBUILT=opt/skypeforlinux/skypeforlinux
-QA_TEXTRELS=opt/skypeforlinux/resources/app.asar.unpacked/node_modules/slimcore/bin/slimcore.node
-QA_EXECSTACK=opt/skypeforlinux/resources/app.asar.unpacked/node_modules/slimcore/bin/slimcore.node
-RESTRICT="mirror bindist strip" #299368
-RDEPEND=""
-
-src_unpack() {
-	rpm_src_unpack
-}
-
-src_prepare() {
-	default
-	sed -e "s!^cd.*!cd ${EPREFIX}/opt/insync!" \
-		-i usr/bin/insync || die
-	sed -e "s!^Exec=insync start!Exec=${EPREFIX}/opt/bin/insync start --ca-path=/etc/ssl/certs!" \
-		-i usr/share/applications/insync.desktop || die
-	sed -e "s!^Exec=insync!Exec=${EPREFIX}/opt/bin/insync!" \
-		-i usr/share/applications/insync-helper.desktop || die
-	sed -e "s!^Exec=insync!Exec=${EPREFIX}/opt/bin/insync!" \
-		-i usr/share/kde4/services/ServiceMenus/insync_servicemenu.desktop || die
-	sed -e "s!^Exec=insync!Exec=${EPREFIX}/opt/bin/insync!" \
-		-i usr/share/kservices5/ServiceMenus/insync_servicemenu.desktop || die
-}
-
-src_install() {
-        dodir /opt
-        cp -a usr/lib/insync "${D}"/opt || die
-
-        dodir /usr
-        cp -a usr/share "${D}"/usr || die
-
-	into /opt
-        dobin usr/bin/insync
-
-	if use pax_kernel; then
-		pax-mark -Cm "${ED%/}"/opt/skypeforlinux/skypeforlinux
-		pax-mark -Cm "${ED%/}"/opt/skypeforlinux/resources/app.asar.unpacked/node_modules/slimcore/bin/slimcore.node
-		eqawarn "You have set USE=pax_kernel meaning that you intend to run"
-		eqawarn "${PN} under a PaX enabled kernel. To do so, we must modify"
-		eqawarn "the ${PN} binary itself and this *may* lead to breakage! If"
-		eqawarn "you suspect that ${PN} is being broken by this modification,"
-		eqawarn "please open a bug."
-	fi
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/app-backup/insync/insync-3.2.9.40883.ebuild b/app-backup/insync/insync-3.2.9.40883.ebuild
deleted file mode 100644
index a65fdc6e..00000000
--- a/app-backup/insync/insync-3.2.9.40883.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MULTILIB_COMPAT=( abi_x86_64 )
-
-inherit pax-utils rpm multilib-build xdg-utils
-
-DESCRIPTION="Advanced cross-platform Google Drive client"
-HOMEPAGE="https://www.insynchq.com/"
-NAUTILUSPV="3.0.30.40732"
-DOLPHINPV="3.0.22.40446"
-THUNARPV="3.0.23.40579"
-NEMOPV="3.0.11.40167"
-CAJAPV="3.0.11.40167"
-SRC_URI="
-        x86?      ( http://s.insynchq.com/builds/insync-1.4.9.37127-fc25.i686.rpm )
-        amd64?    ( http://yum.insync.io/fedora/31/x86_64/insync-${PV}-fc30.x86_64.rpm
-                    http://yum.insync.io/fedora/31/noarch/insync-nautilus-${NAUTILUSPV}-1.noarch.rpm
-                    http://yum.insync.io/fedora/31/noarch/insync-dolphin-${DOLPHINPV}-1.noarch.rpm
-                    http://yum.insync.io/fedora/31/noarch/insync-thunar-${THUNARPV}-1.x86_64.rpm
-                    http://yum.insync.io/fedora/31/noarch/insync-nemo-${NEMOPV}-1.noarch.rpm
-                    http://yum.insync.io/fedora/31/noarch/insync-caja-${CAJAPV}-1.noarch.rpm )"
-
-LICENSE="no-source-code"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="pax_kernel nautilus dolphin thunar caja nemo"
-
-S="${WORKDIR}"
-QA_PREBUILT=opt/skypeforlinux/skypeforlinux
-QA_TEXTRELS=opt/skypeforlinux/resources/app.asar.unpacked/node_modules/slimcore/bin/slimcore.node
-QA_EXECSTACK=opt/skypeforlinux/resources/app.asar.unpacked/node_modules/slimcore/bin/slimcore.node
-RESTRICT="mirror bindist strip" #299368
-RDEPEND=""
-
-src_unpack() {
-	rpm_src_unpack
-}
-
-src_prepare() {
-	default
-	sed -e "s!^cd.*!cd ${EPREFIX}/opt/insync!" \
-		-i usr/bin/insync || die
-	sed -e "s!^Exec=insync start!Exec=${EPREFIX}/opt/bin/insync start --ca-path=/etc/ssl/certs!" \
-		-i usr/share/applications/insync.desktop || die
-	sed -e "s!^Exec=insync!Exec=${EPREFIX}/opt/bin/insync!" \
-		-i usr/share/applications/insync-helper.desktop || die
-	sed -e "s!^Exec=insync!Exec=${EPREFIX}/opt/bin/insync!" \
-		-i usr/share/kde4/services/ServiceMenus/insync_servicemenu.desktop || die
-	sed -e "s!^Exec=insync!Exec=${EPREFIX}/opt/bin/insync!" \
-		-i usr/share/kservices5/ServiceMenus/insync_servicemenu.desktop || die
-}
-
-src_install() {
-        dodir /opt
-        cp -a usr/lib/insync "${D}"/opt || die
-
-        dodir /usr
-        cp -a usr/share "${D}"/usr || die
-
-	into /opt
-        dobin usr/bin/insync
-
-	if use pax_kernel; then
-		pax-mark -Cm "${ED%/}"/opt/skypeforlinux/skypeforlinux
-		pax-mark -Cm "${ED%/}"/opt/skypeforlinux/resources/app.asar.unpacked/node_modules/slimcore/bin/slimcore.node
-		eqawarn "You have set USE=pax_kernel meaning that you intend to run"
-		eqawarn "${PN} under a PaX enabled kernel. To do so, we must modify"
-		eqawarn "the ${PN} binary itself and this *may* lead to breakage! If"
-		eqawarn "you suspect that ${PN} is being broken by this modification,"
-		eqawarn "please open a bug."
-	fi
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/app-backup/insync/insync-3.4.1.40977.ebuild b/app-backup/insync/insync-3.4.1.40977.ebuild
index 26117f6a..b4e2a531 100644
--- a/app-backup/insync/insync-3.4.1.40977.ebuild
+++ b/app-backup/insync/insync-3.4.1.40977.ebuild
@@ -24,14 +24,24 @@ SRC_URI="
 LICENSE="no-source-code"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="pax_kernel nautilus dolphin thunar caja nemo"
+IUSE="pax_kernel"
 
 S="${WORKDIR}"
 QA_PREBUILT=opt/skypeforlinux/skypeforlinux
 QA_TEXTRELS=opt/skypeforlinux/resources/app.asar.unpacked/node_modules/slimcore/bin/slimcore.node
 QA_EXECSTACK=opt/skypeforlinux/resources/app.asar.unpacked/node_modules/slimcore/bin/slimcore.node
 RESTRICT="mirror bindist strip" #299368
-RDEPEND=""
+RDEPEND="dev-qt/qtcore:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtpositioning:5
+	dev-qt/qtwebchannel:5
+	dev-qt/qtwebengine:5
+	sys-libs/zlib
+	|| ( sys-devel/base-gcc sys-devel/gcc )
+	media-libs/libglvnd
+	sys-libs/glibc"
 
 src_unpack() {
 	rpm_src_unpack
diff --git a/app-editors/xxe/Manifest b/app-editors/xxe/Manifest
index b3ff3a17..e1dadec4 100644
--- a/app-editors/xxe/Manifest
+++ b/app-editors/xxe/Manifest
@@ -1,14 +1,4 @@
-DIST xxe-perso-5_3_0.tar.gz 27324575 BLAKE2B a21124805e4ccee216f51c131279fcbac50d10d0eb88c07a52fabea6c90af9ab1c2aa05b110b2d44ae8413208f043fa5be8cc85a5370ea3e33b0fe8d47f47229 SHA512 011824df5f88de3079181ce7f7e7a0844890e49e28b0fdb32858206d3e649cbeaa162d478f58e0b1c1e7748c78ff16eaf1d9bc692c85824528f060cc97d5fbc3
-DIST xxe-perso-7_3_0.zip 77703539 BLAKE2B 9ae5d0343f8e09681eff73e00b5e6f11413b75ba6959878ca605c01afa614b4c05c57522f6d900637f2bd952a5e4ad47b08dbd79549315aed047ed0757611520 SHA512 234d01f37a1836c3862cd0fff9c4c52d954768854918eb6dd6271018ddbe5da4cb427c9a9a745605c5caab3c9c47697928db11b4368eb3cffadd25fc815fb0b7
-DIST xxe-perso-8_0_0.zip 75565050 BLAKE2B ba356efa387ec6ce3a954edbc48c3ab411ef94fc1c587fb32d1282091fde5db85337e9c958bc29cd09cd0b9cacdab4f0a7c760e9eda438315cfea410ae000428 SHA512 1fb416718a30170286e249ccf971e2df1cac2ee3c3a9b9a8cfcf60cd4edcb4b8c046de12db81db6d94d6aa5063d8d0f6918d10bb91683d83f20f20a1f6f51d58
-DIST xxe-perso-9_1_0.zip 83146264 BLAKE2B bc05156c4cd19812b8b87ba9f74490ea7c7606e687c1d3ea4b4b943fc3cf892f393012f387d25d68f4e14bb68fe799932afdaaf5da4ac4ff027fb5428ebc09bc SHA512 ac1a37b77e860e4f3aaa1eba9b7e68621d43a1b57cd8b2d5fd487e43ece5ef81a10e7ad5c22c9e7f4bf760aadeccdba64ecfa6ce80a431075ca080c60b5774bc
-DIST xxe-perso-9_2_0.zip 84273785 BLAKE2B 54add1b1835b5f4ef641bf51a30cdd7baef91b62588240ae4f20f9b38e71e8b788e22ffbfd8b14b3b8a18fbde1626ee17a4be40242efab1af53c2b36f967606e SHA512 771a54381796891a0a83622b89c9bd8b11d84f6cc7136b566385c49f565015e1013d2bc08f723b7cef23fd24649dfd7c42b6fc9535176ed7f918503593a5f147
 DIST xxe-perso-9_5_1.zip 85838081 BLAKE2B 19c9a6c9dd03d3ee5ea177bb4bd28e91fbff08f127deb164f33f2a9c3447f5519e23f071159247acdd67673d241ab3a50f990358242a6737935dbc415e512367 SHA512 c6cfb0fac47781ec5889803a6223751429a01c27ebdfbd87fcdf52bba7120588e14dfbd9a77ed42d55147d4dcf55a1dda31f97a168467cdd1a11b517e1f37813
-EBUILD xxe-5.3.0.ebuild 2783 BLAKE2B f57142d711b1de2549f2ea92dec9a3f4b00c5f0410fa10eb52688e638b93d4691d136d361429e476688fb90d962981f51779dad56e849fe1cbe6e8e8b0a1f7e8 SHA512 30889e2d48a11623415b99107fbd44e583ffb9294c6e4aa66ccee676e60de8604122ca6134f48ce3662b4fc468eaf88b2da9d8979f4dc3341aa8cbd401e369bb
-EBUILD xxe-7.3.0.ebuild 2702 BLAKE2B 279779edd80cdb05ca3466e62222cd1f3b304b74558755773fde36aea349cda2c2f388c99c9c10faa7fd4a2e9e8c07d4141bcaf6f04926067fd82e636465bd70 SHA512 9567ce06b97d69429c48bffd89b1236d386877510528b152be94605ad132ed01191f95a874ae825a7c774707571200e6c89479e64e107cb623b5861c9a1e1248
-EBUILD xxe-8.0.0.ebuild 2702 BLAKE2B 279779edd80cdb05ca3466e62222cd1f3b304b74558755773fde36aea349cda2c2f388c99c9c10faa7fd4a2e9e8c07d4141bcaf6f04926067fd82e636465bd70 SHA512 9567ce06b97d69429c48bffd89b1236d386877510528b152be94605ad132ed01191f95a874ae825a7c774707571200e6c89479e64e107cb623b5861c9a1e1248
-EBUILD xxe-9.1.0.ebuild 2683 BLAKE2B b331967b9142f69b7d6b29cefe17cb40dcde10c98163d1795e6a4f6166aa9fd1fa53311bffc17111f686e42335fce2596e90ee7b2fcee8771b6987b692a3247a SHA512 a847bb9ccb85790dd1c55f74597d4f882261e87c8161a1786917305cb673a6a2db5a88c7a1aace9085fe4d5ea52270ff82986f9fdda2ecbbada3d3bd8a1ac8a2
-EBUILD xxe-9.2.0.ebuild 2683 BLAKE2B b331967b9142f69b7d6b29cefe17cb40dcde10c98163d1795e6a4f6166aa9fd1fa53311bffc17111f686e42335fce2596e90ee7b2fcee8771b6987b692a3247a SHA512 a847bb9ccb85790dd1c55f74597d4f882261e87c8161a1786917305cb673a6a2db5a88c7a1aace9085fe4d5ea52270ff82986f9fdda2ecbbada3d3bd8a1ac8a2
-EBUILD xxe-9.5.1.ebuild 2683 BLAKE2B b331967b9142f69b7d6b29cefe17cb40dcde10c98163d1795e6a4f6166aa9fd1fa53311bffc17111f686e42335fce2596e90ee7b2fcee8771b6987b692a3247a SHA512 a847bb9ccb85790dd1c55f74597d4f882261e87c8161a1786917305cb673a6a2db5a88c7a1aace9085fe4d5ea52270ff82986f9fdda2ecbbada3d3bd8a1ac8a2
+EBUILD xxe-9.5.1.ebuild 2683 BLAKE2B 200619ef15735a2ce98ec6dd58df726df85d867a9f5b1980c05fd94c6fbf074740527d32c0805193a246c6a27ae8e41415f06efb19fa7a48d0115c253e208d51 SHA512 5a9c2b91c156c8137520092548334b0f5b449a048a9a2a790e81227de6cd0ee224e578c3c68524edc890d6bc2c267e4f246c0369cab870919a5da6870c7b6f79
 MISC ChangeLog 2827 BLAKE2B 0051513e1e9afc82175837aaa0ac00519ca2ffb7991f41a6c15d85d11da6c820240b6a0aebe65a7340b90be793ab69c36a3ee517b3c65000cbef568d1665c209 SHA512 a68a23ad84e22f78c16d797f22f6a4eaa4b46d3d515683e3cc03f073281cb60dec4e1f8a76feddea3f33cb1fb733fc97b5aeeced8f227e0dbec6af56dbb1ebd8
 MISC metadata.xml 205 BLAKE2B 2885a6508cc84e8c20c79cd20d9fd3269df33e1ce3c6394fda79b8f7f17b6f92ade1a3177ca71e41b027cd1f16cb7795f1dfb4b99a3aa1f6f8055bb778d633a4 SHA512 ef3a39d2cd131cd29451ec2d009484e89b60e8cbeed5fc0f5f899cebb0c5f9867682ce603982e4de32004493944c6ff99a4c797e7ef2441d6049e5a616143a8b
diff --git a/app-editors/xxe/xxe-9.5.1.ebuild b/app-editors/xxe/xxe-9.5.1.ebuild
index 5f693682..82572c69 100644
--- a/app-editors/xxe/xxe-9.5.1.ebuild
+++ b/app-editors/xxe/xxe-9.5.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 inherit java-pkg-2 versionator
 
diff --git a/app-emulation/vice/Manifest b/app-emulation/vice/Manifest
index 4c046adb..f3a6b31a 100644
--- a/app-emulation/vice/Manifest
+++ b/app-emulation/vice/Manifest
@@ -1,5 +1,5 @@
-AUX vice-2.3-notexi.patch 395 SHA256 15897692063aac52306082f5ce933a17ba94ecfe8a5c3b65f72db62d478cefbc SHA512 3e48ab7e34653d5b16faedfb982c647e83ca4312981df68085c482369618ae36057702fead219b46c796efc396e87bbb15d24508c52b0a83488dad6babf5f0dc WHIRLPOOL 22ad13e6fff82b2ca65e9db96545d78fd4554f00278664641c4191a3315b32a4f6273b0f18548bf4fb96da872a013749bfb5acf6c25c0f7f3a6ac3f692092793
-DIST vice-2.3.tar.gz 11602378 SHA256 b1817c8dce023069d5c15234c2b4da0a152d297ee8ed01f0b361795c4beeb50e
-EBUILD vice-2.3.ebuild 2948 SHA256 2fc53b7bf7f534cf2517350bef9c5e1771b7788f603cf19e5cd04d09dd66e817 SHA512 4fc396f2086a7a2eeea3ed2b647d5938dd3f5554a0d193bb1f510499b7bc45e3b1c71776b3767d28bfc231da6aac4e80bb0727e18bfc04dcfc67e2b5250f1db9 WHIRLPOOL da6db8bfab26b02d39a7b49818c08e035a83eb3ad02acc7f2d292249b4cf9ba4c29490aa7ab236a9aaf4a0fda44112b621ee6259a64ccde00d2c457de2c97fc6
-MISC ChangeLog 10317 SHA256 54e44437784c7640d37deaadbf881a09d91e0fd0810f81d7e025bcbb8c035121 SHA512 01ce1918922df767f36580047a4425b875d883ca90356d76739e1b6483e32ecdaff60168fa103843ab36083ddd42e98cd19ffe62d77d92535f388def371fcf30 WHIRLPOOL 94b8f8e343f2f4f41861b6222b0f7d747cc9ca8bb06f20fcf8c9763abe36df4c39caa48850cf3193837fe5375d48338e0f241b81222a82c00ff6a72d44d4b585
-MISC metadata.xml 355 SHA256 74dd1a42d4949ea4d7e8f1267fb2b6d0f63b8cee0f1aa2cb9278f674192edb1f SHA512 d0086c4b840f65a1dd594060b7ff5be4e3e04c0eca662e709c3cded434d1987c480a77e522d629daa3d50b49975d68a242098cf03d5b661c4fe7539ed5490ac7 WHIRLPOOL f650bb60ecb985f5428f27feb87dccf4addf7c09818cb09b704bb2c71b7c974a5938843835898812ee322330d64e37e4fd3cd57c16f21faf4271483826db2cfb
+AUX vice-2.3-notexi.patch 395 BLAKE2B 83bafa978b9984731c44f5da620a38452a3b4bfbf5bb1e1671eb7dc0319277b99dcfe2dc9497429cc50d9a0895b867aaf2dd39d4176afaf7e8b694b19c830a11 SHA512 3e48ab7e34653d5b16faedfb982c647e83ca4312981df68085c482369618ae36057702fead219b46c796efc396e87bbb15d24508c52b0a83488dad6babf5f0dc
+DIST vice-3.5.tar.gz 22557578 BLAKE2B 5573951052c2c7b2beb4dd194ad8612c53e484e47a4d935e0dbc880f2f06611252add3631f99c9656f2c941088d0147b0783020ffcc5a29505bab75ef8dc128e SHA512 02f364c1645138cacb461346d44de8f524fb2aba7d980181caf039c46ca9d30db98466e5b0e56e6a41417cd7bbd63d73bf6eb110af1271e23732e320dd1fab70
+EBUILD vice-3.5.ebuild 4140 BLAKE2B 4bff9943a56a980b1fd49ebb114a7b46bc29a32fdbcec886a01ba51171e27bc416089a1ae13e8d84446363c7e497d456d8960c4451dbfd59ad198ec4ba0896bb SHA512 dd95fa1eb1d2c50e3440e1405554c6cc17a53551fc7f47c435de966506fd86c009bcd4b9baae304cd322ef6af526c36def2cacb297efdda178bde8dc1ce544f3
+MISC ChangeLog 10317 BLAKE2B e4b09b8fcbefe03a7286cc804db2acb9c0dbf33813b200aac27d7ed63b0e7ce906195ffbb5bdff6583550799afe42bc3b620a642b5c4a7dfe0ab1c61c4c9c4a1 SHA512 01ce1918922df767f36580047a4425b875d883ca90356d76739e1b6483e32ecdaff60168fa103843ab36083ddd42e98cd19ffe62d77d92535f388def371fcf30
+MISC metadata.xml 355 BLAKE2B bcaff95114c4ce87569bb1cf5f10d978ad682b054ecc68f4a3ee5b8bcb5113b592980560fcd7e988affe55665524cdcc6c3a735d246c83811581fdab5d61b001 SHA512 d0086c4b840f65a1dd594060b7ff5be4e3e04c0eca662e709c3cded434d1987c480a77e522d629daa3d50b49975d68a242098cf03d5b661c4fe7539ed5490ac7
diff --git a/app-emulation/vice/vice-2.3.ebuild b/app-emulation/vice/vice-2.3.ebuild
deleted file mode 100644
index 817abbaf..00000000
--- a/app-emulation/vice/vice-2.3.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vice/vice-2.3.ebuild,v 1.4 2011/10/24 04:12:24 mr_bones_ Exp $
-
-EAPI=2
-inherit autotools eutils games
-
-DESCRIPTION="The Versatile Commodore 8-bit Emulator"
-HOMEPAGE="http://vice-emu.sourceforge.net/"
-SRC_URI="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc x86"
-IUSE="Xaw3d alsa gnome nls png readline sdl ipv6 memmap ethernet oss zlib X gif jpeg xv dga xrandr ffmpeg lame pulseaudio"
-
-RDEPEND="
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXpm
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libXt
-	x11-libs/libXxf86vm
-	x11-apps/xset
-	app-emulation/opencbm
-	Xaw3d? ( x11-libs/libXaw3d )
-	!Xaw3d? ( !gnome? ( x11-libs/libXaw ) )
-	alsa? ( media-libs/alsa-lib )
-	gnome? (
-		x11-libs/gtk+:2
-		dev-libs/atk
-		x11-libs/pango
-	)
-	lame? ( media-sound/lame )
-	ffmpeg? ( virtual/ffmpeg )
-	ethernet? (
-	    >=net-libs/libpcap-0.9.8
-	    >=net-libs/libnet-1.1.2.1
-	)
-	nls? ( virtual/libintl )
-	png? ( media-libs/libpng )
-	readline? ( sys-libs/readline )
-	sdl? ( media-libs/libsdl )
-	gif? ( media-libs/giflib )
-	jpeg? ( virtual/jpeg )
-	xv? ( x11-libs/libXv )
-	dga? ( x11-libs/libXxf86dga )
-	xrandr? ( x11-libs/libXrandr )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	x11-apps/bdftopcf
-	x11-apps/mkfontdir
-	x11-proto/xproto
-	x11-proto/xf86vidmodeproto
-	x11-proto/xextproto
-	dga? ( x11-proto/xf86dgaproto )
-	xv? ( x11-proto/videoproto )
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-notexi.patch
-	sed -i \
-		-e "s:/usr/local/lib/VICE:${GAMES_DATADIR}/${PN}:" \
-		man/vice.1 \
-		$(grep -rl /usr/local/lib doc) \
-		|| die "sed failed"
-	sed -i \
-		-e "/VICEDIR=/s:=.*:=\"${GAMES_DATADIR}/${PN}\";:" \
-		configure.in \
-		|| die "sed failed"
-	sed -i \
-		-e "s:\(#define LIBDIR \).*:\1\"${GAMES_DATADIR}/${PN}\":" \
-		-e "s:\(#define DOCDIR \).*:\1\"/usr/share/doc/${PF}\":" \
-		src/arch/unix/archdep.h \
-		src/arch/sdl/archdep_unix.h
-	AT_NO_RECURSIVE=1 eautoreconf
-}
-
-src_configure() {
-	# don't try to actually run fc-cache (bug #280976)
-	FCCACHE=/bin/true \
-	PKG_CONFIG=pkg-config \
-	egamesconf \
-		--disable-dependency-tracking \
-		--enable-fullscreen \
-		--enable-parsid \
-		--enable-realdevice \
-		--with-resid \
-		--without-arts \
-		--without-midas \
-		$(use_enable ffmpeg) \
-		$(use_enable lame) \
-		$(use_enable gnome gnomeui) \
-		$(use_enable nls) \
-		$(use_with Xaw3d xaw3d) \
-		$(use_with alsa) \
-		$(use_with pulseaudio pulse) \
-		$(use_with png) \
-		$(use_with readline) \
-		$(use_with sdl sdlsound) \
-		$(use_enable ipv6) \
-		$(use oss || echo --without-oss) \
-		$(use_enable memmap) \
-		$(use_enable ethernet) \
-		$(use_with zlib) \
-		$(use_with X x)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog FEEDBACK README
-	prepgamesdirs
-}
diff --git a/app-emulation/vice/vice-3.5.ebuild b/app-emulation/vice/vice-3.5.ebuild
new file mode 100644
index 00000000..c4a610e2
--- /dev/null
+++ b/app-emulation/vice/vice-3.5.ebuild
@@ -0,0 +1,181 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multibuild toolchain-funcs xdg
+
+DESCRIPTION="The Versatile Commodore Emulator"
+HOMEPAGE="https://vice-emu.sourceforge.io/"
+SRC_URI="mirror://sourceforge/vice-emu/releases/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="
+	alsa cpuhistory debug doc ethernet ffmpeg flac gif +gtk headless
+	ipv6 jpeg lame mpg123 ogg oss parport pci png portaudio pulseaudio
+	sdl zlib"
+REQUIRED_USE="
+	|| ( gtk headless sdl )
+	gtk? ( zlib )"
+
+RDEPEND="
+	sys-libs/readline:0=
+	virtual/libintl
+	app-emulation/opencbm
+	alsa? ( media-libs/alsa-lib )
+	ethernet? (
+		>=net-libs/libnet-1.1.2.1:1.1
+		>=net-libs/libpcap-0.9.8
+	)
+	ffmpeg? ( media-video/ffmpeg:= )
+	flac? ( media-libs/flac )
+	gif? ( media-libs/giflib:= )
+	gtk? (
+		dev-libs/glib:2
+		media-libs/fontconfig:1.0
+		media-libs/glew:0=
+		virtual/opengl
+		x11-libs/cairo
+		x11-libs/gtk+:3
+		x11-libs/pango
+	)
+	jpeg? ( virtual/jpeg )
+	lame? ( media-sound/lame )
+	mpg123? ( media-sound/mpg123 )
+	ogg? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
+	parport? ( sys-libs/libieee1284 )
+	pci? ( sys-apps/pciutils )
+	png? ( media-libs/libpng:0= )
+	portaudio? ( media-libs/portaudio )
+	pulseaudio? ( media-sound/pulseaudio )
+	sdl? (
+		media-libs/libsdl2[video]
+		media-libs/sdl2-image
+	)
+	zlib? ( sys-libs/zlib )"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto"
+BDEPEND="
+	app-arch/unzip
+	app-text/dos2unix
+	dev-embedded/xa
+	dev-lang/perl
+	sys-apps/texinfo
+	sys-devel/flex
+	sys-devel/gettext
+	virtual/pkgconfig
+	virtual/yacc
+	doc? ( virtual/texi2dvi )
+	gtk? ( x11-misc/xdg-utils )"
+
+src_prepare() {
+	default
+
+	# Delete some bundled libraries.
+	rm -r src/lib/lib{ffmpeg,lame,x264} || die
+
+	# Strip the predefined C(XX)FLAGS.
+	sed -i -r 's:(VICE_C(XX)?FLAGS=)"[^$]+":\1:' configure || die
+
+	MULTIBUILD_VARIANTS=(
+		$(usev gtk)
+		$(usev headless)
+		$(usev sdl)
+	)
+
+	# Debug build currently broken without copy sources.
+	multibuild_copy_sources
+}
+
+src_configure() {
+	tc-export AR
+
+	multibuild_foreach_variant run_in_build_dir multibuild_src_configure
+}
+
+multibuild_enable() {
+	if [[ ${MULTIBUILD_VARIANT} == ${1} ]]; then
+		echo --enable-${2}
+	else
+		echo --disable-${2}
+	fi
+}
+
+multibuild_src_configure() {
+	# Append ".variant" to x* programs if building multiple variants.
+	local xform
+	if [[ ${#MULTIBUILD_VARIANTS[@]} -gt 1 ]]; then
+		xform="/^x/s/\$/.${MULTIBUILD_VARIANT}/"
+	fi
+
+	local econfargs=(
+		--program-transform-name="${xform}"
+		$(multibuild_enable gtk desktop-files)
+		$(multibuild_enable gtk native-gtk3ui)
+		$(multibuild_enable headless headlessui)
+		$(multibuild_enable sdl sdlui2)
+
+		$(use_enable cpuhistory)
+		$(use_enable debug debug-gtk3ui)
+		$(use_enable debug)
+		$(use_enable doc pdf-docs)
+		$(use_enable ethernet)
+		$(use_enable ffmpeg external-ffmpeg)
+		$(use_enable ipv6)
+		$(use_enable lame)
+		$(use_enable parport libieee1284)
+		$(use_enable portaudio)
+		$(use_with alsa)
+		$(use_with flac)
+		$(use_with gif)
+		$(use_with jpeg)
+		$(use_with mpg123)
+		$(use_with ogg vorbis)
+		$(use_with oss)
+		$(use_with png)
+		$(use_with pulseaudio pulse)
+		$(use_with zlib)
+		--disable-arch
+		--disable-sdlui
+		--disable-shared-ffmpeg
+		--disable-static-ffmpeg
+		--enable-html-docs
+		--enable-realdevice
+
+
+		# Some dependencies lack configure options so prevent them becoming
+		# automagic by using configure cache variables.
+		$(usex pci '' ac_cv_header_pci_pci_h=no)
+
+		# Ensure we use giflib, not ungif.
+		ac_cv_lib_ungif_EGifPutLine=no
+	)
+
+	econf "${econfargs[@]}"
+}
+
+src_compile() {
+	multibuild_foreach_variant run_in_build_dir emake
+}
+
+src_install() {
+	# Get xdg-desktop-menu to play nicely while doing the install.
+	dodir /etc/xdg/menus /usr/share/{applications,desktop-directories}
+
+	XDG_UTILS_INSTALL_MODE=system \
+	XDG_DATA_DIRS="${ED}"/usr/share \
+	XDG_CONFIG_DIRS="${ED}"/etc/xdg \
+		multibuild_foreach_variant run_in_build_dir default
+
+	rm -f "${ED}"/usr/share/applications/*.cache || die
+
+	# Delete the bundled fonts. These could be packaged separately but
+	# they're only for the HTML documentation.
+	rm -r "${ED}"/usr/share/doc/${PF}/html/fonts || die
+}
diff --git a/app-misc/irtrans-irclient/Manifest b/app-misc/irtrans-irclient/Manifest
index efada502..42ccd7b7 100644
--- a/app-misc/irtrans-irclient/Manifest
+++ b/app-misc/irtrans-irclient/Manifest
@@ -1,7 +1,5 @@
-DIST irclient-src-6.01.10.tar.gz 109707 BLAKE2B dbc7297c24e015393d163ab5606e326da90ad0fa46e18297f0271cdf6c5df92daa179510ab7a72b5031c78ba9bfd5b5277257dad15907600e1b765ba533c7560 SHA512 a239575272988b2945c0f0f2fa421bb934a4f256d2dddbc9bdeb1ca3ea77a8cf0af1a73b1fef350eb0403a23930eb5efe5a3357d325fef69ed2aafadbb00a35b
 DIST irclient-src-6.01.16.tar.gz 153254 BLAKE2B ec4880699ff3bef0419f52b2df381e2f0f1b1202f3358648486400540fe420f0012cb78e38ac429791ea39d40e9b59a63ede9b7777957c69c2c30f1512468035 SHA512 904451e03e9a508aa78954a9dd8d34462b5c47937ea127f1ff1ec52f07f645f60861f055347dba178b9c37455a5d749d987144f3be882bcb24e479f02643eaea
 DIST irtrans-irclient-5.11.04-ip_assign-1.patch.bz2 5051 BLAKE2B 79b8fb9249c69e8a868771a288e5f0e7c4d6658d36f97ce1ac0c577dae5c810207780406bb7a87df3392eb795463b9c62c6ce7d99ef349111db99637ee8d2432 SHA512 9be72f7f6fcc24c9bda73cf5dd8a2c112c6cb82e2ef50d40c17b43d7dcb8f11bcf8bc0ebb914046b5429bce1b4936278ade936db6c916384fbd637a300f528cf
-EBUILD irtrans-irclient-6.01.10.ebuild 1852 BLAKE2B 995c5a4740e9afa02d077e0a0d6c1d73007909d98fabad8d4bd6e6e4cc26dd20602ec4ea4b4ef66e48520b57ff58cde1ea502941627da3080ac316beb7de5f5b SHA512 e762ed167802423641e7dd9b2cf6a4a3da8354556ae1998f901cd46eeaa22934c9aecc758faa24aa9449c5d230e0f931d4a36661508da4485e3f0caae851f2bf
 EBUILD irtrans-irclient-6.01.16.ebuild 1398 BLAKE2B 792927ea45549573e45b0c09068f8e7cf15b21ca6608dd5e6cf33558385f54b431a156f633b25cd6f2c306866c6b4a9f3ad03b9f8645bae69c3b29e5874a5541 SHA512 9496c8eeaffd98a9bdb944aba322aa0a1d472b6fe3d19261434405459ba2338d0eefd0b54768439219aa2dbde74e407d3bd7468b7d348d0c5328d9c4a54e402d
 MISC ChangeLog 3803 BLAKE2B 299fe2997c5862df2c0994a06deac3bd4132ed16eeaa6729213d0cf19c4e42602b18d4590dbc0333e42f3adcef44e07fd5057349ff74173da842215c2883c29e SHA512 dd242601fb1b6dcd8a08befe6fc9786ab3730910a88334687e3bcc0284f62cf0e0d5d8afae540cab37c6f0275f0e0ceded5a13f4f37d30df3082b6067a181670
 MISC metadata.xml 205 BLAKE2B 2885a6508cc84e8c20c79cd20d9fd3269df33e1ce3c6394fda79b8f7f17b6f92ade1a3177ca71e41b027cd1f16cb7795f1dfb4b99a3aa1f6f8055bb778d633a4 SHA512 ef3a39d2cd131cd29451ec2d009484e89b60e8cbeed5fc0f5f899cebb0c5f9867682ce603982e4de32004493944c6ff99a4c797e7ef2441d6049e5a616143a8b
diff --git a/app-misc/irtrans-irclient/irtrans-irclient-6.01.10.ebuild b/app-misc/irtrans-irclient/irtrans-irclient-6.01.10.ebuild
deleted file mode 100644
index c0b18914..00000000
--- a/app-misc/irtrans-irclient/irtrans-irclient-6.01.10.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/irtrans-irclient/irtrans-irclient-6.01.05.ebuild,v 1.2 2011/02/02 11:54:04 hd_brummy Exp $
-
-EAPI="2"
-
-inherit eutils flag-o-matic toolchain-funcs
-
-RESTRICT="strip"
-
-DESCRIPTION="IRTrans Server"
-HOMEPAGE="http://www.irtrans.de"
-SRC_URI="http://www.irtrans.de/download/Client/irclient-src.tar.gz -> irclient-src-${PV}.tar.gz
-	http://ftp.disconnected-by-peer.at/irtrans/irclient-src-${PV}.tar.gz
-	http://ftp.disconnected-by-peer.at/irtrans/${PN}-5.11.04-ip_assign-1.patch.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~x86 ~amd64 ~arm"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${RDEPND}"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	epatch "${WORKDIR}/${PN}"-5.11.04-ip_assign-1.patch
-}
-
-src_compile() {
-
-	append-flags -DLINUX
-
-	# Set sane defaults (arm target has no -D flags added)
-	irbuild=irclient_arm
-	irclient=irclient
-	ipbuild=ip_assign_arm
-	ip_assign=ip_assign
-
-	# change variable by need
-	if use x86 ; then
-		irbuild=irclient
-		ipbuild=ip_assign
-	elif use amd64 ; then
-		irbuild=irclient64
-		irclient=irclient64
-		ipbuild=ip_assign64
-		ip_assign=ip_assign64
-	fi
-
-	# Some output for bugreport
-	einfo "CFLAGS=\"${CFLAGS}\""
-	einfo "Build client Target=\"${irbuild}\""
-	einfo "Build client Binary=\"${irclient}\""
-	einfo "Build ip_assign Target=\"${ipbuild}\""
-	einfo "Build ip_assign Binary=\"${ip_assign}\""
-
-	# Build
-	emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CXXFLAGS="${CXXFLAGS}" "${irbuild}" || die "emake irclient failed"
-	emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CXXFLAGS="${CXXFLAGS}" "${ipbuild}" || die "emake ip_assign failed"
-}
-
-src_install() {
-
-	newbin "${WORKDIR}/${irclient}" irclient
-	newbin "${WORKDIR}/${ip_assign}" ip_assign
-}
diff --git a/app-misc/irtrans-irserver/Manifest b/app-misc/irtrans-irserver/Manifest
index b8e55c96..b7b982a5 100644
--- a/app-misc/irtrans-irserver/Manifest
+++ b/app-misc/irtrans-irserver/Manifest
@@ -1,10 +1,8 @@
 AUX irtrans-server.confd 405 BLAKE2B fa94ea017cb77fbde5e3d06b9b4db0a8ab718603657be9c847049bd51b84356e4f32cf737cceb882fc002193e4163bf75c8dabb0f7e81d80934ea41a0d9f1fdb SHA512 1de71558faf723b6f2b8b133f81d20addc7c0775e3859307a78e1ae41bd9fb122ccc43f483d7e9e33cb21de611e283246562e1a8d1cd3d6cfd9d1a3002b8593b
 AUX irtrans-server.initd 576 BLAKE2B 836c5f78a24309a4b2460593cde2e0cec1270eb37dafc85e7585101cb6fb93d41dcabfc57bc7bf11bc3113e811a8ec5447b11e123eee1cc812c786773d2eb573 SHA512 8a22400ada008775c10c136f9913ad4d6bee833808d29034ec37b47e609509909cf9df3d7c08858a9a8d245363997fbeab04778c14c1e15ba74c785dd225bd2d
-DIST irserver-6.09.04.tar.gz 665809 BLAKE2B 1f336e34a3a79490266a762520083c74f79d34b2b8603a9d4b8e29347346c658c1723608627590d39ebb66bebe9886a4052376ade81704db3b2c1cccf229b87e SHA512 d63f8bc79c2a5a8050c5ac21b086be3826f66102dc2f111bf8084b57756c6bcd84615d1675781b26520c34f7a3e08726dbc4ae94dd4f4afc446383597c433399
+AUX irtrans-server.service 218 BLAKE2B 3eb1d695da2e0f1baaba6a2abb6aef6864ecb11f20230e5b7ec4e5f54cf3d7bbee62a647a6ec98ea47f9f594308e826e53f365af92410f29f1d305c5ec520d91 SHA512 e16002a3b31b9015a42c9edd75e462108199ad46c74e7b83ed1bc39e5c08497388ce099798b0e73acfaf59078e62df938b021ca076abaa346e423446378f6ccb
 DIST irserver-6.10.23.tar.gz 864840 BLAKE2B a046fc394f6a39b261d448f0e67816f5cacd8bbe6b075650e50318bb5042b29d7972c14eac0923d36afaafd000c32682e8b68be238b57fd5cc1f4e4c22205651 SHA512 81934293ffb7e5d34ff04276612f9e7fe20b4fc401a63cda64da360fb8a7c48f94a57631c1c19d2fd7e75d2e1e3fe34c08319a743d444a38febf1fb4f9c0767d
-DIST irserver-src-6.09.04.tar.gz 200481 BLAKE2B 7eaffd5bb335dfcbe6f0716af57aa898d2cce1a984a2f050081bd71a9c63d5d1e5949fdebdcbbbee05c337141d0efe5c6ebcb937726ff9506a766f69ed8d2f58 SHA512 09c38066e64404808856a89a8451e41a6eb8a51b98635b1515fc07050f25b4552b9cc912bd9612c6746ba67cd9b1bb45f3d4871dfa820c9e9bd810ede20f28d6
 DIST irserver-src-6.10.23.tar.gz 532755 BLAKE2B 6550ecacf007fe4a69c523c181feb1a96e3309c86d9d2040af05bd02d00391c3c37e7ef4c9f829db37b97dc590c88baf746544a5996e44b4fdc8088ea2ea9589 SHA512 ef453381ae4802a40a76c27a685c6892d1d0f6a88ef2975868e901eb06b5e70ba6e6f40333c4ea45a83f2b4419a49b9b16d08f23f303e1911d856f8b6afc2d85
-EBUILD irtrans-irserver-6.09.04.ebuild 2139 BLAKE2B dce61dc4956621c20e0aa43861371dad1921f0c7eaf638d88c477224916c60e0a3c3f55ec60ab17febae7213793f962578fe963d316e08c7584851eaa3fc4422 SHA512 42b6e8581d398879e10192a99f54ecd42400b4600a02fc5b970a4009833d37e92c4158da6b3b8929ead1975b63296b007bc7b757fba1609375749dd2217380fd
 EBUILD irtrans-irserver-6.10.23.ebuild 1879 BLAKE2B b7b2863ab4fe59391803a06836d1f18c3c7107128d0d30addfe98740f9378a7ecf810f2566e855bd9590100b2f091221c2e4c7e50e07876e294e9c3adaf97fe4 SHA512 b60b4f6ce52a8c40e6057fa9efe9704be3eb87b37d1398922c1db7773d9aa5e65aca6988f5a652cb330aebb7da8a3a98390b90f5b040b382d9b47b571d17ead9
 MISC ChangeLog 5894 BLAKE2B 62a2951358fde9038e6965fadfd9a00690c3b38c29a3143f8ef3aa9e0d29c2f3b1ed7c460a5659efaadaea8a1e0baa10066bfde0bc13dcd0c210ef78d42c0eaf SHA512 b1abf5ce2cb71455f687267c3914b8cd7d7860bd6de11de12a2534d6e1bd482c34d706e67c8e197643c3baa3562022ea24e181b14340dd8e98d7b72e4b85a5cf
 MISC metadata.xml 205 BLAKE2B 2885a6508cc84e8c20c79cd20d9fd3269df33e1ce3c6394fda79b8f7f17b6f92ade1a3177ca71e41b027cd1f16cb7795f1dfb4b99a3aa1f6f8055bb778d633a4 SHA512 ef3a39d2cd131cd29451ec2d009484e89b60e8cbeed5fc0f5f899cebb0c5f9867682ce603982e4de32004493944c6ff99a4c797e7ef2441d6049e5a616143a8b
diff --git a/app-misc/irtrans-irserver/irtrans-irserver-6.09.04.ebuild b/app-misc/irtrans-irserver/irtrans-irserver-6.09.04.ebuild
deleted file mode 100644
index 66dc4fd4..00000000
--- a/app-misc/irtrans-irserver/irtrans-irserver-6.09.04.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/irtrans-irserver/irtrans-irserver-6.09.04.ebuild,v 1.1 2015/06/26 02:28:23 idella4 Exp $
-
-EAPI="5"
-
-inherit eutils flag-o-matic toolchain-funcs mono-env multilib
-
-RESTRICT="strip"
-
-DESCRIPTION="IRTrans Server"
-HOMEPAGE="http://www.irtrans.de"
-SRC_URI="http://ftp.disconnected-by-peer.at/irtrans/irserver-src-${PV}.tar.gz
-	 http://ftp.disconnected-by-peer.at/irtrans/irserver-${PV}.tar.gz
-	http://www.irtrans.de/download/Server/Linux/irserver-src.tar.gz -> irserver-src-${PV}.tar.gz
-	http://www.irtrans.de/download/Server/Linux/irserver.tar.gz -> irserver-${PV}.tar.gz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64 ~arm"
-IUSE="mono"
-
-RDEPEND="mono? ( >=dev-lang/mono-2.10.5 )"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	sed -e 's!^ODIRARM = .*!ODIRARM = n800!' -i makefile
-}
-
-src_compile() {
-	append-flags -DLINUX -DMEDIACENTER
-	append-ldflags --static
-
-	# Set sane defaults (arm target has no -D flags added)
-	irbuild=irserver_arm_noccf
-	irserver=irserver
-
-	# change variable by need
-	if use x86 ; then
-		irbuild=irserver
-	elif use amd64 ; then
-		irbuild=irserver64
-		irserver=irserver64
-	elif use arm ; then
-		irbuild=irserver_arm
-	fi
-
-	# Some output for bugreport
-	einfo "CFLAGS=\"${CFLAGS}\""
-	einfo "Build Target=\"${irbuild}\""
-	einfo "Build Binary=\"${irserver}\""
-
-	# Build
-	emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" CFLAGS="${CFLAGS}" \
-		CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" "${irbuild}"
-}
-
-src_install() {
-	newbin "${WORKDIR}/${irserver}" irserver
-
-	keepdir /etc/irserver/remotes
-
-	docinto remotes
-	dodoc remotes/*
-
-	newinitd "${FILESDIR}"/irtrans-server.initd irtrans-server
-	newconfd "${FILESDIR}"/irtrans-server.confd irtrans-server
-
-	if use mono ; then
-		# Wrapper script to launch mono
-		make_wrapper irguiclient "mono /usr/$(get_libdir)/${PN}/GUIClient.exe"
-
-		insinto /usr/$(get_libdir)/${PN}/
-		exeinto /usr/$(get_libdir)/${PN}/
-
-		# The Libs and Translations
-		doins GUIClient/*.tra
-		doexe GUIClient/*.dll
-
-		# The actual executable
-		doexe GUIClient/*.exe
-	fi
-}
diff --git a/dev-embedded/acme/Manifest b/dev-embedded/acme/Manifest
index 354318f6..5d676bd3 100644
--- a/dev-embedded/acme/Manifest
+++ b/dev-embedded/acme/Manifest
@@ -1,4 +1,4 @@
 DIST acme-sources-0.96.4.zip 403868 BLAKE2B b57d4e1f399fca0bef0a64556982e48cfd47c54696e514d3e6511cc19b87de613949b0fc7f779413a80efe6f61a6e660fdd66c58cbe4a30b71ce0202ef5e8614 SHA512 7a76b4ed98f8793fdac6bf023160e9d5fc12d4ea415921a4c2926c9f4a890080578f46bdb821021def780ae301851f7b09cdf52f5799cb2045e318a8704d9f5e
-EBUILD acme-0.96.4.ebuild 1078 BLAKE2B 4baeaadb0479078b5e1f427a441eca212d3844855d65fc504f42c7ccffdb790767c4aa62fd7d1571c956d0208e10c6e15e98400bf7ee34edef0150f94274e8a1 SHA512 447dbc67310827e092d8d53c79e167bcae738ae2f4a057ebcdd5c0005487624ad785b8b927e44c5fdf44ea1e359a264950e48e27a3f5270b2e183374d886dd58
+EBUILD acme-0.96.4.ebuild 1078 BLAKE2B 1bbb3f1bb32423b2d5a1ba6342c8363b2bc517f3f4d234f71138da273476ddcd8aa07edea61c309b3b8d2f23234c567b8c27bbc894e91c4778173d67e4f12f11 SHA512 d3a3ed2db69edd29133d877c07b8074ff1001120947f4715eb5b1b9b2e9677444e4936fb7bb9a6b1bb46e5711680d2cce3c438fd7e98403d5953294f8f0b506d
 MISC ChangeLog 3435 BLAKE2B 8fcd42d35073f0c6a4e3fc7e5ccc3546655aa0b7e5c9b9a1fd39178e2cfe12063e881f38e2f0bac802d37026d1746a1d82382017e8553fc7958757640109c9dc SHA512 697503823ef66475d816025b167e9ab0c20f054a360270c8d741bd77810806f35aa7f3add0724755a3bf1218e9f0dca62e1c0ea31d810f70b43f6529d8661049
 MISC metadata.xml 205 BLAKE2B 2885a6508cc84e8c20c79cd20d9fd3269df33e1ce3c6394fda79b8f7f17b6f92ade1a3177ca71e41b027cd1f16cb7795f1dfb4b99a3aa1f6f8055bb778d633a4 SHA512 ef3a39d2cd131cd29451ec2d009484e89b60e8cbeed5fc0f5f899cebb0c5f9867682ce603982e4de32004493944c6ff99a4c797e7ef2441d6049e5a616143a8b
diff --git a/dev-embedded/acme/acme-0.96.4.ebuild b/dev-embedded/acme/acme-0.96.4.ebuild
index 28db24ac..e56214bf 100644
--- a/dev-embedded/acme/acme-0.96.4.ebuild
+++ b/dev-embedded/acme/acme-0.96.4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="2"
+EAPI="5"
 
 inherit eutils toolchain-funcs multilib
 
diff --git a/dev-embedded/arduino-bin/Manifest b/dev-embedded/arduino-bin/Manifest
index a0e6648c..8bafc59b 100644
--- a/dev-embedded/arduino-bin/Manifest
+++ b/dev-embedded/arduino-bin/Manifest
@@ -1,11 +1,8 @@
 AUX 10arduino-bin 69 BLAKE2B 7e420563bc46a63b26b1df1099b20f41acf45d1996cdccd77d516f2b4e9a222aa4fe4ea6c1896ade562a13513b251d3dfd92fe4324dd1ed39018a8c41e3d3510 SHA512 8bace112decfd895fdf45821dfd96fe868032a8da184dc383dce3a2173fba9fdee103f134b7a7dc8bd5364e598f6249455f0f3d624fceaff7dd7974378ce0192
 AUX arduino.1 15213 BLAKE2B cb1c41c0a7345812344d41a55115f534e445b5c6f789309e8a9f422e76117d5f10d475692717dff377691098850248d6c3297dd1cbe517e4cbd28c6232ade713 SHA512 837cae1a434152ac507a0e229e384077392024d01db4d7b9d9820bfbe8877c4822c3f52467a7c02756c04958af9e8464925a254703d2ed9ca75b51e5e917f88a
 AUX arduino.desktop 274 BLAKE2B 1a2ad9fc7bd99f2c4517713abc62135777767000c3c9bb8d03fb5a0a50a0315d0776c3efe4a1d8b4958eb963b19f85199435362947c85e7e37832c4570e2cc2b SHA512 d9c4f65b720ad0b6a5874e4fb6cf4c4ebccaf3e97451984c6aec75b3c83630e209be0c045c6b731c582ec78e47240006678f182fa1d671fc0459382755d8ac8c
-DIST TeensyduinoInstall-153.linux32 68710388 BLAKE2B 23a76bc01edb23975cdc96d3a7f285bd03cc55926027864704369228dae1391f00a6a087164063259bc4465029961c7cfb9d63de3c8de2752a8d4970829ef7e7 SHA512 6cf0a6e9a20630cda3fbd39087ff3f76c0ce723dcf7d5be883f9e4db87a7161b27a409d0a9e61e393816dc78a27282ef733d0a595e92a9e6b037a38aad42a1c6
-DIST TeensyduinoInstall-153.linux64 68710388 BLAKE2B 23a76bc01edb23975cdc96d3a7f285bd03cc55926027864704369228dae1391f00a6a087164063259bc4465029961c7cfb9d63de3c8de2752a8d4970829ef7e7 SHA512 6cf0a6e9a20630cda3fbd39087ff3f76c0ce723dcf7d5be883f9e4db87a7161b27a409d0a9e61e393816dc78a27282ef733d0a595e92a9e6b037a38aad42a1c6
-DIST arduino-1.8.10-linux32.tar.xz 133610152 BLAKE2B 0ded9618c169cd1be715808c52179f141ab5ce91a773222d24deec36a095d298f5844cb5191a6842a883ffc67b8221457d9d70d8a521e8b9d99cd6f9d32bf67d SHA512 f091c633bfc74a377d8cde958f1a4e7e0ecaef962fa2771479e18bfe303d47f910293eb867aacea2cc42f5f4d5d13c76a425d42633bd9c56f572405184da6233
-DIST arduino-1.8.10-linux64.tar.xz 131012484 BLAKE2B 7ce926a809da70f22b01c4f00d86eece387d30495b3821485285a3eb2d1e6bb94242708e6df0dd18a0ad93334520bc37381af8763c50d037f895020644860b9b SHA512 5ba5ada406aac8596d388e95bf5eaebc1b9b6960d1a56829a4e51c801e01ef949ef233f74d07d25be5ab8a4eb5a358beea8246af3e43be8fa458b4d6d229a003
-DIST arduino-1.8.13-linux32.tar.xz 130644464 BLAKE2B 54bc1486366af5ff2e3a369e4c551e481fe4118f397fbac9002b392dc5200e6917af087ec090b6e65e538835a3138750b7dded9d02151bcc1ce9070b82a695a7 SHA512 e572a24e56af6e8c0b6970367abf3e3534f636fa20f71f7ba3d4520df859672c619a2d16d72300600af95ba7a83dd1f7d5f57e1c9d42836726f60653da6f6bc7
-DIST arduino-1.8.13-linux64.tar.xz 128225404 BLAKE2B c3a26f18c452d4dc0b29ac0d558b947f21925df8da36958f77491e1167606acd6399e475bec5d1eaef39bc3bdeb132a59ea5eb0f2da0b311c08eeec94dd9ab86 SHA512 865a442ac7c2406794d93669afbff6b54a598c22bc9b6e39e5257ad8305a56cca5537aa4b19048a087688d8bf2f1fb046577f5565f66c471cbe14dd399004eb3
-EBUILD arduino-bin-1.8.10.ebuild 899 BLAKE2B 281963a2ec4c7598ee3a24b45eb6d8d8a56f5a0e2d56ed2515b60093808d0db036f4335b31de644281d06cfd295ea0d0be442c126d2920f353610b3b70466cc5 SHA512 a544343389375b60fb8bb761ba9a154507878ed306a5db0aa4d87d5908005295f5add3efe2a85db9367bf3aaf6c9a5a037876fecb66cf7f19120795dc14b3a58
-EBUILD arduino-bin-1.8.13.ebuild 1372 BLAKE2B bc36d65cd974b0e34fcffa1383534dee825dda718a981dac5421bbe27f345ae6e09d1f1c0851e47a2678e7489b1903a105e04e33daf3f90d4bea594231289a08 SHA512 fc30a673d102a5aa85078a6a8e4dc6f9861088a947eb3b3a713f709b12e7150463e128df71ddd3dad979b21c6dec0570bac3006da19fd4e04ed7058cf8ddef83
+DIST TeensyduinoInstall-154-beta12.linux32 73398680 BLAKE2B 4c5cc3666686c7b1f272e4eaf98440d8eef4d42f64e0ee244773d0518801befd511fa9e6a3937d274ec20ec3e2b8e9780de95b921ede48690f93132e9078f70d SHA512 4886cccec3e587fee90c55d02279a951931ac367508f253df675d3b74f7d697d512ce2e61bba9568a934ea29abc9bcc8b8c69085c8db35b72163947bfb642ad7
+DIST TeensyduinoInstall-154-beta12.linux64 73398680 BLAKE2B 4c5cc3666686c7b1f272e4eaf98440d8eef4d42f64e0ee244773d0518801befd511fa9e6a3937d274ec20ec3e2b8e9780de95b921ede48690f93132e9078f70d SHA512 4886cccec3e587fee90c55d02279a951931ac367508f253df675d3b74f7d697d512ce2e61bba9568a934ea29abc9bcc8b8c69085c8db35b72163947bfb642ad7
+DIST arduino-1.8.15-linux32.tar.xz 134054724 BLAKE2B 2105e6598403c9bbb781b92a1414bfc707a4a94865d7c62afdfb9748e7d52e22df8c91225bfb288aea342520b4b7e07bc9118649384ec8742ab7d9b7c9c59dc4 SHA512 02a10831c7125144ac6f701528f9d176a1a7ac0df6d9391d31d6758ae8f3dea3f8b8390320c7e7d3efb9ed45fb79527caa798ad354bc8a857c2f9c42f4612a8f
+DIST arduino-1.8.15-linux64.tar.xz 131705480 BLAKE2B 5fef93baf6c6f7e8a5e1e0b0dfca5080e45e6a3b9398614edf082bc8a1757ce2d03e912f76e9f589c99dc2e21e4c8e9a937ce07ea8d044d550833c54ea24c225 SHA512 ae84a8f62cbd3ecf5400a357ac5ebd04cbc80b31a2fbc80f280850465f7460ad3a02b32830021ef980b72c60d52eb65a4fc551988c91d01b25e8d646596175f8
+EBUILD arduino-bin-1.8.15.ebuild 1391 BLAKE2B 11153e6be31d57e4075d9f575df8ee7e9be50d3978247b7226b508f6457721731054f42c6fd9be4069b211d15963a8552a9ecc3d78f5395c4df7efc8305a926c SHA512 53e68ce77f7d58c64ea7f3e917280a17383f202c6b132af4d790914e874995337c54f8005d1e533557ba40fc8ffc33ca4a48af4d68985235bfeb1dd7a4860df4
diff --git a/dev-embedded/arduino-bin/arduino-bin-1.8.10.ebuild b/dev-embedded/arduino-bin/arduino-bin-1.8.10.ebuild
deleted file mode 100644
index d3739976..00000000
--- a/dev-embedded/arduino-bin/arduino-bin-1.8.10.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils
-
-DESCRIPTION="electronics prototyping platform based on easy-to-use hardware and software"
-HOMEPAGE="https://www.arduino.cc/"
-MY_PN="${PN/-bin}"
-MY_P="${MY_PN}-${PV}"
-SRC_URI="
-	amd64? ( https://downloads.arduino.cc/${MY_P}-linux64.tar.xz -> ${MY_P}-linux64.tar.xz )
-	x86? ( https://downloads.arduino.cc/${MY_P}-linux32.tar.xz -> ${MY_P}-linux32.tar.xz )
-"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-
-RESTRICT="binchecks preserve-libs strip"
-
-src_install() {
-	newicon lib/arduino.png "${MY_PN}".png
-	make_desktop_entry "${MY_PN}" Arduino "${MY_PN}"
-
-	mkdir -p "${D}"/opt/"${PN}" || die
-	cp -a * "${D}"/opt/"${PN}" || die
-
-	make_wrapper ${MY_PN} "${EROOT}opt/${PN}/${MY_PN}" "${EROOT}opt/${PN}"
-}
diff --git a/dev-embedded/arduino-bin/arduino-bin-1.8.13.ebuild b/dev-embedded/arduino-bin/arduino-bin-1.8.15.ebuild
similarity index 84%
rename from dev-embedded/arduino-bin/arduino-bin-1.8.13.ebuild
rename to dev-embedded/arduino-bin/arduino-bin-1.8.15.ebuild
index 4d0ecf9b..b6f796c4 100644
--- a/dev-embedded/arduino-bin/arduino-bin-1.8.13.ebuild
+++ b/dev-embedded/arduino-bin/arduino-bin-1.8.15.ebuild
@@ -7,13 +7,13 @@ inherit eutils
 
 DESCRIPTION="electronics prototyping platform based on easy-to-use hardware and software"
 HOMEPAGE="https://www.arduino.cc/ https://www.pjrc.com/teensy/"
-TEENSY_PV="153"
+TEENSY_PV="154-beta12"
 MY_PN="${PN/-bin}"
 MY_P="${MY_PN}-${PV}"
 SRC_URI="
-	amd64? ( https://downloads.arduino.cc/${MY_P}-linux64.tar.xz -> ${MY_P}-linux64.tar.xz
+	amd64? ( https://downloads.arduino.cc/arduino-${PV}-linux64.tar.xz -> ${MY_P}-linux64.tar.xz
 		https://www.pjrc.com/teensy/td_${TEENSY_PV}/TeensyduinoInstall.linux64 -> TeensyduinoInstall-${TEENSY_PV}.linux64 )
-	x86? ( https://downloads.arduino.cc/${MY_P}-linux32.tar.xz -> ${MY_P}-linux32.tar.xz
+	x86? ( https://downloads.arduino.cc/arduino-${PV}-linux32.tar.xz -> ${MY_P}-linux32.tar.xz
 		https://www.pjrc.com/teensy/td_${TEENSY_PV}/TeensyduinoInstall.linux64 -> TeensyduinoInstall-${TEENSY_PV}.linux32 )
 "
 
diff --git a/dev-embedded/cc65/Manifest b/dev-embedded/cc65/Manifest
index f1125ebf..663598ea 100644
--- a/dev-embedded/cc65/Manifest
+++ b/dev-embedded/cc65/Manifest
@@ -2,7 +2,7 @@ AUX cc65-2.13.2-asneeded-1.patch 4394 BLAKE2B 3e54a7bf09282f87f6cf6ed8bff08fa9e8
 AUX package-version.patch 2046 BLAKE2B b4a74650e9226dfe677a9edcc84ab17cb055f2c161a5787b8dfd4d96f8e321027acba913340c2ecdbe51a89fc3b7816d48daf06d50037609f97e2610e270f31f SHA512 5658a26b7f7ae020f5f16702b5833913bbd0d7ca1d54cf370c72fe7af00ea582f0a3bd2ee8b4b580f2d6f215807687c4e1cfe9ae5892cfb8e6de6bcfe2196871
 DIST cc65-sources-2.13.3.tar.bz2 1103245 BLAKE2B d111a6354176e5fbfacfcc65a26d10a33868660c674cf0ea614a55748c3e8087be33901801ec038fd21db51459ccaca57a2aeb3ab0c0825771819c95eb64ef5d SHA512 135004bdd50abc749409f4a3efbc5c93a09e940d787b6a2034df4de8459e78fa5f813e2e0673cdf9f8bf50c6df8b1313b36ff395d6e82560d0e669da03130776
 DIST cc65-sources-2.18.tar.gz 2254374 BLAKE2B 2a7a41aca7a8ae300f6b8bd65d083741fc6bad92f37187bae4ffd720c1e0de500e631c765b34dda8fdd36e87d6039daac339348396733a3a92046f5746bec279 SHA512 47e530052911c8fdac0ea560fef78f5971441509f37b4020df54937cf9b5420e07653b3d191c844da0af5dddd17a61e90c3ad3fb56bf7623214977017b4bc9a1
-EBUILD cc65-2.13.3.ebuild 2937 BLAKE2B 9eb8625901d14b90f35b41d7db5f98ab9c008556e4247a44590410dd980170f91ff1ee45fa59b6b0f15bcf2c3b56aedf073cbe2a120c340b407f1c83e1b6f5df SHA512 63195c8bafb9c0c1caeb6f59854bdaa447172b55150554d58ef25af15faf49f68e3734f1710668c754dbbe4186914d9ffe762f3b367a223acd1658685e39bf2d
-EBUILD cc65-2.18.ebuild 1561 BLAKE2B ba33d51dbe100020325851e7a8d0d0532f74ec3582c21a0e1981bf47a6fdbb790ac52c154274fd4f20953f33cef1953eeb3fc128d3b2e39cab2e652ac3f929c6 SHA512 922ee38ec82176773308d1e952b5ad3c3b2762f78378cf691583a4701883053b3d339d928801f1fac885db4a502eaaff550dc708622de8fab0c76af29664d6b4
+EBUILD cc65-2.13.3.ebuild 2937 BLAKE2B 3194bf88c19049f831b1d0d4bb3befb86386d2946f78ec36c09bbdb5c671e3ee34e3fa344bb49564f2a9546d89390cefa7a907cfc4004c324dc2eb5c96b7b6e4 SHA512 d5d64a98e11c036b0853fc3296198da792820c699af0f841fcc98405222a32855a3887996c7f223ef728f4d1218359ef1f5fbcf94a15265bca8033709f7a756e
+EBUILD cc65-2.18.ebuild 1561 BLAKE2B 35e2946d5e32c932f45cc4954b22af8d18109adfa89ff51d67adf3fafe0fbdfd68d514459d3a06ed38e8ac68711ecfc07109296b15eb43d96e069613e26457cf SHA512 5c7e3f02f490f5d1eb4c525789046eeb432fe1d62bdc39fdad8d1aadccc4335c3dbc52c39ef4c9d1436ce71ad9d72eb856d8bae878de52c6dfecb02e29017830
 MISC ChangeLog 3435 BLAKE2B 8fcd42d35073f0c6a4e3fc7e5ccc3546655aa0b7e5c9b9a1fd39178e2cfe12063e881f38e2f0bac802d37026d1746a1d82382017e8553fc7958757640109c9dc SHA512 697503823ef66475d816025b167e9ab0c20f054a360270c8d741bd77810806f35aa7f3add0724755a3bf1218e9f0dca62e1c0ea31d810f70b43f6529d8661049
 MISC metadata.xml 205 BLAKE2B 2885a6508cc84e8c20c79cd20d9fd3269df33e1ce3c6394fda79b8f7f17b6f92ade1a3177ca71e41b027cd1f16cb7795f1dfb4b99a3aa1f6f8055bb778d633a4 SHA512 ef3a39d2cd131cd29451ec2d009484e89b60e8cbeed5fc0f5f899cebb0c5f9867682ce603982e4de32004493944c6ff99a4c797e7ef2441d6049e5a616143a8b
diff --git a/dev-embedded/cc65/cc65-2.13.3.ebuild b/dev-embedded/cc65/cc65-2.13.3.ebuild
index dda8e15c..a35cf81c 100644
--- a/dev-embedded/cc65/cc65-2.13.3.ebuild
+++ b/dev-embedded/cc65/cc65-2.13.3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="2"
+EAPI="5"
 
 inherit eutils toolchain-funcs multilib
 
diff --git a/dev-embedded/cc65/cc65-2.18.ebuild b/dev-embedded/cc65/cc65-2.18.ebuild
index 44987de6..7f22b971 100644
--- a/dev-embedded/cc65/cc65-2.18.ebuild
+++ b/dev-embedded/cc65/cc65-2.18.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="2"
+EAPI="5"
 
 inherit eutils toolchain-funcs multilib
 
diff --git a/media-tv/otrdecoder-bin/Manifest b/media-tv/otrdecoder-bin/Manifest
index 4011acd0..64bf3541 100644
--- a/media-tv/otrdecoder-bin/Manifest
+++ b/media-tv/otrdecoder-bin/Manifest
@@ -1,3 +1,3 @@
-DIST otrdecoder-bin-linux-Ubuntu_8.04.2-x86_64-0.4.614.tar.bz2 499608 BLAKE2B 8bd1bf5267ae1c9b1b6cf59f1a7862d182c5a161bdb3c8e36deb249a2d03d636a651fd01273f1892748f258c9fe11ddd2b6f9549abe3b867c1fa14915259d370 SHA512 ae18ecbb9d50118be63dd7701cb479cad226ba1a30f7549f7388721457343b7405eb44cc55421ed45d6a8ad274ab4ff5b9163bd0e3f9a074407e67f24b7f7cd8
-DIST otrdecoder-bin-linux-Ubuntu_9.04-i686-0.4.593.tar.bz2 476946 BLAKE2B 5453d2375875e277174de3eaf8741e6cca8be4f7908026faee0b137ad3d24c113bfbbed7efc384b91ecd58496d73b1fbbfd7bba71fd09700fbb3c1663a882f22 SHA512 07d1e4d3c5e93b5fc0c0a8366f17b031d8a910bfe241e325cbbc3ca5cfdf0ad7ca2d408a048758c255d64f3a843cf60e44679aeb873a40ddb1e36f3aacac7536
-EBUILD otrdecoder-bin-0.4.614.ebuild 982 BLAKE2B 9e3d31c2889fde0979fa35b4bd69fc56c934fa5b2c18ef74722a7719a947c559c320b6aea652a78e5ee958513b8e382c5647b0a1bc822a58389d35dd57b5a9ed SHA512 864c82dd4857da9a956cfaceae9a166564f1272335720c433b43e98233b1c4e2f9237c252ef330380ccbbf0138f7d7830ead4bb2a4358355fcd185d92c3282db
+DIST otrdecoder-bin-linux-Ubuntu_8.04-i686-0.4.1133.tar.bz2 2860359 BLAKE2B ee6230c868d9ea2dfb8a0cac03210e6d12aa164ecd6fd5a61c079842716f7ab0f41d72d3de70be7bc4b183498f475fbcbb008ce6dd4d8da050e6fb01893291db SHA512 c95b394c24b1a842ba13519425a5859972cc0d22df76a0d5165bc4461f2b1c4de64719f993763f3d5cf2a13e9e2a78cfcba4778cc0b104de5dfb54223b0ce2d5
+DIST otrdecoder-bin-x86_64-unknown-linux-gnu-0.4.1133.tar.bz2 2863081 BLAKE2B c6a2614232aebea2f72f9e6664563d26e96dcc04b29f78bc0ef951bcf175600696db966baf122db2d759bb3943c0edec31795c16641393c866047256eb38687c SHA512 224ad9f730e87de00b96a995919fd920556507a481c5e5d0de5a3fa6ec99aef5be5a87c8341305096b18c7436c01eaf344b00032d3018633b6ece92bd24c3612
+EBUILD otrdecoder-bin-0.4.1133.ebuild 987 BLAKE2B f320af8b6d47896c1edc5bbaf123a06f4ce51927cf162069f034a15e602e5b616176f4bfa0bd5413200befd65da4be203c2ab7f59e9485aa57ada8fb7edffab0 SHA512 db77760f5586580904648ff769efdd3bf303b000a57b173868b249272d17bf0fb46feb593184cc2800d3755d2d22e13918b664dd4747ceaf08a92878b0e12542
diff --git a/media-tv/otrdecoder-bin/otrdecoder-bin-0.4.614.ebuild b/media-tv/otrdecoder-bin/otrdecoder-bin-0.4.1133.ebuild
similarity index 74%
rename from media-tv/otrdecoder-bin/otrdecoder-bin-0.4.614.ebuild
rename to media-tv/otrdecoder-bin/otrdecoder-bin-0.4.1133.ebuild
index 28a11249..6b0f193d 100644
--- a/media-tv/otrdecoder-bin/otrdecoder-bin-0.4.614.ebuild
+++ b/media-tv/otrdecoder-bin/otrdecoder-bin-0.4.1133.ebuild
@@ -6,8 +6,8 @@ EAPI=2
 
 DESCRIPTION="Decoder for onlinetvrecorder.com (German)"
 HOMEPAGE="http://www.onlinetvrecorder.com/"
-SRC_URI="amd64? ( http://www.onlinetvrecorder.com/downloads/${PN}-linux-Ubuntu_8.04.2-x86_64-0.4.614.tar.bz2 )
-	x86? ( http://www.onlinetvrecorder.com/downloads/${PN}-linux-Ubuntu_9.04-i686-0.4.593.tar.bz2 )"
+SRC_URI="amd64? ( http://www.onlinetvrecorder.com/downloads/otrdecoder-bin-x86_64-unknown-linux-gnu-0.4.1133.tar.bz2 )
+	x86? ( http://www.onlinetvrecorder.com/downloads/otrdecoder-bin-linux-Ubuntu_8.04-i686-0.4.1133.tar.bz2 )"
 
 LICENSE="as-is"
 SLOT="0"
@@ -21,7 +21,7 @@ RESTRICT="strip"
 
 src_unpack() {
 	default
-	mv ${PN}-linux-Ubuntu_* "${S}" || die
+	mv ${PN}-* "${S}" || die
 }
 
 src_prepare() {
diff --git a/media-video/vidcutter/Manifest b/media-video/vidcutter/Manifest
index 0146f0dc..d72dfbf6 100644
--- a/media-video/vidcutter/Manifest
+++ b/media-video/vidcutter/Manifest
@@ -1,4 +1,4 @@
-DIST vidcutter-6.0.0.tar.gz 9877867 BLAKE2B 91f153222f37d452ed8af5c4f24e32790189f058b5cbb3c80f7805ed48b5e953bfeeb8be92f04e049384dc30f416d0ee603237b8a59a329b0bc0cd61bf0fdbe2 SHA512 9970d9918cca9a7681bc5ca8d8b5d16212cf3dad0f2bc3e9c6727340c340801696dcb7ff4e901c2c0a25b86e9cb165bb3f783c18b4a8fd5f4ddba8490a7fd7a0
-EBUILD vidcutter-6.0.0.ebuild 840 BLAKE2B b09ecdc876d451c39b15d0513174936f58e2bdf877fb5004ebaa3c905e7478144dcd7488638c52f9e663294bce74c20f8c849e5a78054d4da57cd5ad26b3a09c SHA512 9a767e8663269398c3bc1d944bdaa2aa2fd2857c1200862c1f31d57278bff9ec36249bfb1cb8f0fb2c0d17a8626b771346f1442b72fea2e663d0c85ee544b945
-EBUILD vidcutter-9999-r1.ebuild 872 BLAKE2B 9b14baed1e7b0098e8c394656bdc018a08cde674a8c689abe846fdfdc6fd2e6412421fadeaae83eca8e326930d95c5924e7dce0e681d87ad607c07a1b4f190af SHA512 bf3e27a7caf9f71c6b6925bc9cdc4ecd4634cc54b2a555b4d9ea371d5eb264bbc113caa888ee5f7afc7fccbe134fd5603de6c0545ddb6e84c667ddd497b2fc1a
+DIST vidcutter-6.0.5.tar.gz 9911435 BLAKE2B 2d901768064b7c3b7444289db84e8f8d6e179d915b04f870a6b397f0d905c6b4ecab0768d045a8c1aa43b3bf7bccb2dcd60e9c043595f2aaf857ce657ec997f8 SHA512 b4a0e0cc3132038e9216f05117768695ba30840f04251c60561b7555cde9064efcf12440c801c834c2160d5b5acad011dc31055d9547269a5689361c875bca80
+EBUILD vidcutter-6.0.5.ebuild 1017 BLAKE2B 190df679b975619b91bc2aeb9cc597efd0053326a014c2093a2ce37df4e4bf8fc28e497b40d5ad135322796dda5e185ed38e1074f46c26d623b64414f098bda3 SHA512 4330e92f3ff88eeb051594b4a0e3128d1c2d876e36c2f4838a70294246fda959af636506ee52b76eb5612e8828c1ca7e330746c5acb329ad83b585e4e8dbb8f5
+EBUILD vidcutter-9999.ebuild 1016 BLAKE2B 2330ce6d6115d0fc5c6b539f565211f274efc239e87de27875c61cb80989f066a7725eb2e78b9fda28d02db79d9e22803fb1d244969c6d5f9ded7d26e3b17a39 SHA512 cee6ac913c1f37f003437a48aba2e101e395072a15f7874efddbc57c8112e1f24ed67b2207fdd6bd7102317786de4aed4d43047dd9d458cdc07b0703393464a1
 MISC metadata.xml 317 BLAKE2B a064dab932a673a4ccd23732ebc842cd57c3b9faca938fe291ad7286b5649ff5f3cd8ac1191b340e621a20f3888dcab3470ec041aae115e3cba0a9eab7b67068 SHA512 2b7cae78785fa166c52e6d3eba008543924b3b057ffce125c9afce60453dbde9e8b65546042de78bd48cf4697d6487213a281e7ccad4ac44a944b41d89f2387b
diff --git a/media-video/vidcutter/vidcutter-6.0.0.ebuild b/media-video/vidcutter/vidcutter-6.0.5.ebuild
similarity index 58%
rename from media-video/vidcutter/vidcutter-6.0.0.ebuild
rename to media-video/vidcutter/vidcutter-6.0.5.ebuild
index 20982ade..8ec68eb7 100644
--- a/media-video/vidcutter/vidcutter-6.0.0.ebuild
+++ b/media-video/vidcutter/vidcutter-6.0.5.ebuild
@@ -1,12 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 
-inherit distutils-r1
+inherit distutils-r1 xdg
 
 DESCRIPTION="FFmpeg-based simple video cutter & joiner with a modern PyQt5 GUI"
 HOMEPAGE="http://vidcutter.ozmartians.com https://github.com/ozmartian/vidcutter"
@@ -14,10 +13,9 @@ HOMEPAGE="http://vidcutter.ozmartians.com https://github.com/ozmartian/vidcutter
 if [[ ${PV} == 9999 ]];then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/ozmartian/vidcutter"
-	KEYWORDS=""
 else
 	SRC_URI="https://github.com/ozmartian/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~x86 ~amd64"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="GPL-3"
@@ -28,9 +26,16 @@ DEPEND="
 	>=media-video/mpv-0.25[libmpv]
 "
 RDEPEND="${DEPEND}
-	>=dev-python/PyQt5-5.7[dbus,multimedia,${PYTHON_USEDEP}]
-	media-video/mediainfo
-	virtual/ffmpeg[X,encode]"
+	>=dev-python/PyQt5-5.7[dbus,multimedia,widgets,${PYTHON_USEDEP}]
+	dev-python/pyopengl[${PYTHON_USEDEP}]
+	media-video/ffmpeg[X,encode]
+	media-video/mediainfo"
 BDEPEND="
 	${PYTHON_DEPS}
 	dev-python/setuptools[${PYTHON_USEDEP}]"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+src_install() {
+	distutils-r1_src_install
+	mv "${ED}/usr/share/doc/${PN}" "${ED}/usr/share/doc/${P}"
+}
diff --git a/media-video/vidcutter/vidcutter-9999-r1.ebuild b/media-video/vidcutter/vidcutter-9999.ebuild
similarity index 58%
rename from media-video/vidcutter/vidcutter-9999-r1.ebuild
rename to media-video/vidcutter/vidcutter-9999.ebuild
index c529d7c5..c9cedb96 100644
--- a/media-video/vidcutter/vidcutter-9999-r1.ebuild
+++ b/media-video/vidcutter/vidcutter-9999.ebuild
@@ -1,12 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 
-inherit distutils-r1
+inherit distutils-r1 xdg
 
 DESCRIPTION="FFmpeg-based simple video cutter & joiner with a modern PyQt5 GUI"
 HOMEPAGE="http://vidcutter.ozmartians.com https://github.com/ozmartian/vidcutter"
@@ -14,11 +13,9 @@ HOMEPAGE="http://vidcutter.ozmartians.com https://github.com/ozmartian/vidcutter
 if [[ ${PV} == 9999 ]];then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/nullSoup/vidcutter"
-	EGIT_BRANCH="mkvmerge_cutter"
-	KEYWORDS=""
 else
 	SRC_URI="https://github.com/ozmartian/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~x86 ~amd64"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="GPL-3"
@@ -29,9 +26,16 @@ DEPEND="
 	>=media-video/mpv-0.25[libmpv]
 "
 RDEPEND="${DEPEND}
-	>=dev-python/PyQt5-5.7[dbus,multimedia,${PYTHON_USEDEP}]
-	media-video/mediainfo
-	virtual/ffmpeg[X,encode]"
+	>=dev-python/PyQt5-5.7[dbus,multimedia,widgets,${PYTHON_USEDEP}]
+	dev-python/pyopengl[${PYTHON_USEDEP}]
+	media-video/ffmpeg[X,encode]
+	media-video/mediainfo"
 BDEPEND="
 	${PYTHON_DEPS}
 	dev-python/setuptools[${PYTHON_USEDEP}]"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+src_install() {
+	distutils-r1_src_install
+	mv "${ED}/usr/share/doc/${PN}" "${ED}/usr/share/doc/${P}"
+}
diff --git a/net-analyzer/fing/Manifest b/net-analyzer/fing/Manifest
index ed80b657..7a744ee6 100644
--- a/net-analyzer/fing/Manifest
+++ b/net-analyzer/fing/Manifest
@@ -1,2 +1,2 @@
 DIST overlook-fing-CLI_Linux_others_5.4.0.zip 57266162 BLAKE2B abdb87d6c9134877112be313b99145d2480f0d6840384bcc4f24c642b18cd92a878e788046696e22f686005ae842778011fd340c20eb20af487ba57c953384a9 SHA512 e7e85e1cd44dc2c012bb831e3a083ff4def912846878d1b713461d1f4d70f3f70d605d216b21f2e7f9cb2c03f1fb4d4918fc6b3a915c7f4d72721a04c22e9db0
-EBUILD fing-5.4.0.ebuild 1711 BLAKE2B d704b5a5df75b09a0143e3678fc45e437901d8b5620ca7c4b1f5bb41b80459f8dc88c1cc5acdf6b53ff493fc2ad76ebd1d941d10650ae2fea37620d9d245e064 SHA512 a811e3f9c7903222c779560fcedf1a50acbabba443e3cf943549798b0947a6bb6d569576194c533a1bf7bd07c16ee1c8e8b6b7473be63a473d0f44461a8f7598
+EBUILD fing-5.4.0.ebuild 1712 BLAKE2B f778d440ce5af35611e02b871c2220e0de692bf92901eef04ad61b97a65795bd8c3534b20e6af5adf86a58a46fcef4866c7525737fcf8635886eec90cb65f68c SHA512 e031de0ddf63792220ae67c9a1707e306b0adb8c8e14bc397bd9f0f512d70f44e58a41cdd5c7c456c521144a4cd546e23018448d65ff77f505349f5a98d634cf
diff --git a/net-analyzer/fing/fing-5.4.0.ebuild b/net-analyzer/fing/fing-5.4.0.ebuild
index afb78c04..6a1f1274 100644
--- a/net-analyzer/fing/fing-5.4.0.ebuild
+++ b/net-analyzer/fing/fing-5.4.0.ebuild
@@ -3,6 +3,7 @@
 # $Header: $
 
 EAPI=6
+
 inherit eutils versionator multilib
 
 MAJOR_PV="$(get_version_component_range 1-3)"
diff --git a/net-misc/remotedesktopmanager-free/Manifest b/net-misc/remotedesktopmanager-free/Manifest
index e29b53ac..997dfaa7 100644
--- a/net-misc/remotedesktopmanager-free/Manifest
+++ b/net-misc/remotedesktopmanager-free/Manifest
@@ -1,4 +1,2 @@
-DIST RemoteDesktopManager.Free_2020.3.2.2_amd64.deb 49021324 BLAKE2B 46302441b5a8306411bce4ebcc158197e8e3eae71f7989b79bdb32457777634d971b13cc4106b469b5e60e44b6291bf42e7a70a1475c962538bb93c566fec02c SHA512 60d72e8b3f90be41e32453cfbd3b3998739b145459f3b2784f35045fbd4c247cccf66ac37a97ee1fafb41bb55b3a316eaac45ef659c1d40d1b872f3d115b971e
-DIST RemoteDesktopManager.Free_2021.1.1.4_amd64.deb 50317320 BLAKE2B b602923274956617d47016bf33cf9b7a64a9f8c470cf78fa9ef4f52ab60b018168e63e6d72ca8441b590f434f8529c5566f75f8f5d001fa7211fa3cbe1f1bf75 SHA512 2727186bee9cf1cb2f9b7b86f6aacc0b23102f7df252b9020e6b229561d4b9b25a2f4fc7408d3f9a30092f0b7417620dd72dd2541715d223554f83de59a6b3ce
-EBUILD remotedesktopmanager-free-2020.3.2.2.ebuild 1743 BLAKE2B fd07d1079d5f09efa40e4c9e79e06aff0b5ecd86eda651fdec4ad3e2f1f3cb0ea798170b04f273cbc2b00f62bc8a25066ec7637fa105e796dc9736d8b0fbbcdf SHA512 7d1c5633b6f19a6142f6b063441b7d6f0600db592911c4abadc5621945964b6159e119ff3ba9e9dddd3e3fcf230e6aaf76952f2916d8d02d992ba2b62af7d9c8
-EBUILD remotedesktopmanager-free-2021.1.1.4.ebuild 1743 BLAKE2B fd07d1079d5f09efa40e4c9e79e06aff0b5ecd86eda651fdec4ad3e2f1f3cb0ea798170b04f273cbc2b00f62bc8a25066ec7637fa105e796dc9736d8b0fbbcdf SHA512 7d1c5633b6f19a6142f6b063441b7d6f0600db592911c4abadc5621945964b6159e119ff3ba9e9dddd3e3fcf230e6aaf76952f2916d8d02d992ba2b62af7d9c8
+DIST RemoteDesktopManager.Free_2021.1.2.3_amd64.deb 50732748 BLAKE2B e0ea8a014654050c43f329affbbd7e227c67967426dfd1642e0e2d66112549dc9cbb6f640acd52bf514b5eb52e33b591991eaa588dd82fb7eeef88d09cdc676c SHA512 3234d6673224e3295f88721fb58b02cc0eef9b6ad814dc40e19faf9d6a3dae330d0708088ebfe1c652161975244a4c2e907789969995d61a56ae6de92170d96b
+EBUILD remotedesktopmanager-free-2021.1.2.3.ebuild 1204 BLAKE2B 89006880057c091b565768a9a4c3182a186c9d11afaada9b089c0f89fe4455ae02adf6c75f2ba016943e0512e2bc485c613bad4cfe522fc9fd63c029d86c2fdf SHA512 0dad7b4df80c9e932991b23026e1fef036d3241aed5b4db0e8eb951b396539c49f27432c14b8c327d726e9a98211bde1edb92206dab980f0dfa8e0b5498ab1f0
diff --git a/net-misc/remotedesktopmanager-free/remotedesktopmanager-free-2021.1.1.4.ebuild b/net-misc/remotedesktopmanager-free/remotedesktopmanager-free-2021.1.1.4.ebuild
deleted file mode 100644
index cb98a799..00000000
--- a/net-misc/remotedesktopmanager-free/remotedesktopmanager-free-2021.1.1.4.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit eutils unpacker user pam
-
-DESCRIPTION="Remote DesktopManager"
-HOMEPAGE="https://remotedesktopmanager.com"
-
-SRC_URI="https://cdn.devolutions.net/download/Linux/RDM/${PV}/RemoteDesktopManager.Free_${PV}_amd64.deb"
-
-LICENSE=""
-
-SLOT="0"
-
-KEYWORDS="~amd64"
-
-IUSE=""
-
-RESTRICT="strip mirror test"
-
-DEPEND="net-libs/webkit-gtk:4
-	app-misc/ca-certificates
-	app-crypt/libsecret:0
-	gnome-base/gnome-keyring:0"
-RDEPEND="${DEPEND}"
-
-#QA_TEXTRELS="opt/${PN}/$(get_libdir)/${PN}/*
-#        opt/${PN}/$(get_libdir)/libNeroAPI.so"
-#QA_EXECSTACK="opt/${PN}/$(get_libdir)/nero/*"
-#QA_PREBUILT="opt/${PN}/${PN}.*
-#        opt/${PN}/${PN}
-#        opt/${PN}/$(get_libdir)/.*so
-#        opt/${PN}/$(get_libdir)/${PN}/*
-#        opt/${PN}/$(get_libdir)/${PN}/plug-ins/*
-#        usr/share/${PN}/helpers/splash/nerosplash"
-
-S=${WORKDIR}
-
-#pkg_setup() {
-#        enewgroup openvpn_as
-#        enewuser openvpn_as -1 -1 -1 openvpn_as
-#}
-
-
-src_unpack() {
-	unpack_deb ${A}
-}
-
-#src_prepare() {
-#	epatch "${FILESDIR}/gentoo-specific.patch"
-#}
-
-src_install() {
-	dodir /opt/devolutions/RemoteDesktopManager.Free
-	cp -aR usr/lib/devolutions/RemoteDesktopManager.Free/* "${D}/opt/devolutions/RemoteDesktopManager.Free"
-	dodir /opt/bin
-	sed -e 's!usr/lib!opt!g' bin/remotedesktopmanager.free > "${D}/opt/bin/remotedesktopmanager.free"
-	chmod +x ${D}/opt/bin/remotedesktopmanager.free
-	dodir /usr/share/applications
-	sed -e "s!usr/lib!opt!g" usr/share/applications/remotedesktopmanager.free.desktop > "${D}/usr/share/applications/remotedesktopmanager.free.desktop"
-	dodir /usr/share/icons
-	cp -aR usr/share/icons/* "${D}/usr/share/icons"
-}
diff --git a/net-misc/remotedesktopmanager-free/remotedesktopmanager-free-2020.3.2.2.ebuild b/net-misc/remotedesktopmanager-free/remotedesktopmanager-free-2021.1.2.3.ebuild
similarity index 62%
rename from net-misc/remotedesktopmanager-free/remotedesktopmanager-free-2020.3.2.2.ebuild
rename to net-misc/remotedesktopmanager-free/remotedesktopmanager-free-2021.1.2.3.ebuild
index cb98a799..c377a629 100644
--- a/net-misc/remotedesktopmanager-free/remotedesktopmanager-free-2020.3.2.2.ebuild
+++ b/net-misc/remotedesktopmanager-free/remotedesktopmanager-free-2021.1.2.3.ebuild
@@ -21,38 +21,21 @@ IUSE=""
 
 RESTRICT="strip mirror test"
 
-DEPEND="net-libs/webkit-gtk:4
-	app-misc/ca-certificates
-	app-crypt/libsecret:0
-	gnome-base/gnome-keyring:0"
+DEPEND="|| ( sys-devel/base-gcc sys-devel/gcc )
+	sys-apps/dbus
+	sys-apps/systemd
+	sys-libs/glibc
+	sys-libs/pam"
+
+
 RDEPEND="${DEPEND}"
 
-#QA_TEXTRELS="opt/${PN}/$(get_libdir)/${PN}/*
-#        opt/${PN}/$(get_libdir)/libNeroAPI.so"
-#QA_EXECSTACK="opt/${PN}/$(get_libdir)/nero/*"
-#QA_PREBUILT="opt/${PN}/${PN}.*
-#        opt/${PN}/${PN}
-#        opt/${PN}/$(get_libdir)/.*so
-#        opt/${PN}/$(get_libdir)/${PN}/*
-#        opt/${PN}/$(get_libdir)/${PN}/plug-ins/*
-#        usr/share/${PN}/helpers/splash/nerosplash"
-
 S=${WORKDIR}
 
-#pkg_setup() {
-#        enewgroup openvpn_as
-#        enewuser openvpn_as -1 -1 -1 openvpn_as
-#}
-
-
 src_unpack() {
 	unpack_deb ${A}
 }
 
-#src_prepare() {
-#	epatch "${FILESDIR}/gentoo-specific.patch"
-#}
-
 src_install() {
 	dodir /opt/devolutions/RemoteDesktopManager.Free
 	cp -aR usr/lib/devolutions/RemoteDesktopManager.Free/* "${D}/opt/devolutions/RemoteDesktopManager.Free"
diff --git a/net-nds/apachedirectorystudio/Manifest b/net-nds/apachedirectorystudio/Manifest
new file mode 100644
index 00000000..a3034258
--- /dev/null
+++ b/net-nds/apachedirectorystudio/Manifest
@@ -0,0 +1,2 @@
+DIST ApacheDirectoryStudio-2.0.0.v20210213-M16-linux.gtk.x86_64.tar.gz 140053791 BLAKE2B 90cff8a6ac8ac6d8a24afd35ddedb4e6f2f88a1bd5c45a5ef316aeaf77e2ca0e7e231845079c84a3eda69f3ee3866ac6440f1513c60bad353eff9e0f80b148d5 SHA512 6d5dcffc90e2fb3b32e325a9372a5e9ee581af339cd615a9f4371fb504b5109d29fc2c6bc5530f616a6a0d9c0abf827a923a7d4937542d2aa9c35eb57dfa6ee9
+EBUILD apachedirectorystudio-2.0.0.20210213.ebuild 1162 BLAKE2B 383e238c6ab7b296b858f29edda8e075423c50bc6f0fd21eed47b50cfdcf5e7633ee2027b1903afbcac53c7b37c0162f939e0e13c0f4a0cdf62fa958195ec53b SHA512 a383ce2f2f16851a9485238f75839c4a4deb219e38a08b5671ff1b79198ac1c9c9b51413795d2558989ce4cb0d264c56dbc45f2f57c8b7c6d23cb011c70a993c
diff --git a/net-nds/apachedirectorystudio/apachedirectorystudio-2.0.0.20210213.ebuild b/net-nds/apachedirectorystudio/apachedirectorystudio-2.0.0.20210213.ebuild
new file mode 100644
index 00000000..e4e51376
--- /dev/null
+++ b/net-nds/apachedirectorystudio/apachedirectorystudio-2.0.0.20210213.ebuild
@@ -0,0 +1,48 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop eutils
+
+MY_PV="${PV//.20/.v20}"
+MY_PN="ApacheDirectoryStudio"
+MY_PKGM=16
+
+DESCRIPTION="Apache Directory Studio is an universal LDAP directory tool."
+SRC_URI="https://downloads.apache.org/directory/studio/${MY_PV}-M${MY_PKGM}/${MY_PN}-${MY_PV}-M${MY_PKGM}-linux.gtk.x86_64.tar.gz"
+HOMEPAGE="https://directory.apache.org/studio/"
+
+KEYWORDS="~amd64"
+SLOT="2"
+LICENSE="Apache-2.0"
+IUSE=""
+
+#	>=virtual/jre-11
+
+RDEPEND="
+	dev-java/openjdk-bin:11
+	app-crypt/libsecret
+	x11-libs/gtk+:3
+"
+
+MY_ARCH="$ARCH"
+INSTALL_DIR="/opt/${MY_PN}"
+S="${WORKDIR}/${MY_PN}"
+
+src_install() {
+
+	insinto "${INSTALL_DIR}"
+	newicon "features/org.apache.directory.studio.schemaeditor.feature_${MY_PV}-M${MY_PKGM}/studio.png" "${MY_PN}.png"
+
+	make_desktop_entry "${MY_PN}" "Apache Directory Studio" "${MY_PN}" "System"
+
+	sed -e "s!#-vm!-vm!" -i ApacheDirectoryStudio.ini
+	sed -e "s!#/usr/lib.*!/usr/lib/jvm/openjdk-bin-11/bin/java!" -i ApacheDirectoryStudio.ini
+
+	doins -r *
+
+	fperms +x "${INSTALL_DIR}/${MY_PN}"
+
+	dosym "${INSTALL_DIR}/${MY_PN}" "/usr/bin/${MY_PN}"
+}
diff --git a/sci-electronics/saleae-logic-bin/Manifest b/sci-electronics/saleae-logic-bin/Manifest
index 5712a072..ffe24cc0 100644
--- a/sci-electronics/saleae-logic-bin/Manifest
+++ b/sci-electronics/saleae-logic-bin/Manifest
@@ -1,2 +1,2 @@
-DIST Logic-2.3.27-master.AppImage 138036506 BLAKE2B d2c1f57a3887adab51f02b848b441b549e5bb723b03d271fbd02a248b091d6ab9a1e25aba7797471cc02c1f6c8fa2cd6e76e4b440b6b6524b59adc0c309ac31d SHA512 8cfa16e08193e3aba2c8aa242360d49dc30db53dacee7b0488d066d31c80bb525e80bbcc4a6c69b81534ea270df0609b6adb5316b1356d532108a78c33159609
-EBUILD Logic-bin-2.3.27.ebuild 1054 BLAKE2B 9f33fe8cf9fd2678e12957b0716ba0bfa6d4c69f53c26797420546bb34a535f94c188488a3296754de0c5ec0e607fae264c530016e074dda52b5a08f9a4eb745 SHA512 4bf572544ce46da226fab70845a7bcdb8fa02e038396a25b277a78edf1b32921abc046df8ca7deabd02d7a2d6c79191ce3f00af6fc3c581a4e713b32d2406a0f
+DIST Logic-2.3.30-master.AppImage 138331721 BLAKE2B e914c54c79c49a39a8dc397094ad03d6dcbfca18a7c3eed3003dad19035ce60c9d524c98965230e03c3a0bac9d7ff5ca725cdb33fd193430da3e985e11313597 SHA512 0667363283a3f57056787ff4cc4476037c8331af4e14147b3286a96bb7b013f26abacf79e67ed97ae6e1819c49eb2fe474cfa0319c1b3a0b00d2553aac793c40
+EBUILD saleae-logic-bin-2.3.30.ebuild 2424 BLAKE2B 051c867f1c0cfae3ecec4b434bef4a1b3664bc0d3396135e6d08f1eb1f0e4d957449b75bf10ba93a463190d361987ed1d7348cb7cd7dc4543b3ff09d6cb62f6e SHA512 ea42bbf58c46e669fd52f70d5f9723d55314140adae7bd3b4788acee7b7745f5b0b11939323513713115f86071120bfd3bd2a155b04b9939ef40c455e7b9c13f
diff --git a/sci-electronics/saleae-logic-bin/saleae-logic-bin-2.3.30.ebuild b/sci-electronics/saleae-logic-bin/saleae-logic-bin-2.3.30.ebuild
index abfaed10..d2b49a56 100644
--- a/sci-electronics/saleae-logic-bin/saleae-logic-bin-2.3.30.ebuild
+++ b/sci-electronics/saleae-logic-bin/saleae-logic-bin-2.3.30.ebuild
@@ -3,7 +3,9 @@
 
 EAPI=7
 
-inherit appimage desktop
+MULTILIB_COMPAT=( abi_x86_64 )
+
+inherit appimage chromium-2 desktop pax-utils multilib-build xdg
 
 DESCRIPTION="Debug hardware like the pros."
 HOMEPAGE="https://www.saleae.com/"
@@ -15,33 +17,67 @@ LICENSE="EULA"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
-RESTRICT="bindist mirror splitdebug"
+RESTRICT="bindist mirror splitdebug strip"
 
 RDEPEND="
-	net-print/cups
+	app-accessibility/at-spi2-atk[${MULTILIB_USEDEP}]
+	app-accessibility/at-spi2-core[${MULTILIB_USEDEP}]
+	dev-libs/atk[${MULTILIB_USEDEP}]
+	dev-libs/expat[${MULTILIB_USEDEP}]
+	dev-libs/glib[${MULTILIB_USEDEP}]
+	dev-libs/nspr[${MULTILIB_USEDEP}]
+	dev-libs/nss[${MULTILIB_USEDEP}]
+	x11-libs/cairo[${MULTILIB_USEDEP}]
+	x11-libs/gdk-pixbuf[${MULTILIB_USEDEP}]
+	x11-libs/pango[${MULTILIB_USEDEP}]
+	net-print/cups[${MULTILIB_USEDEP}]
+	|| ( sys-devel/base-gcc[cxx] sys-devel/gcc[cxx] )
+	sys-apps/dbus[${MULTILIB_USEDEP}]
+	x11-libs/gtk+[${MULTILIB_USEDEP}]
+	x11-libs/libX11[${MULTILIB_USEDEP}]
+	x11-libs/libXcomposite[${MULTILIB_USEDEP}]
+	x11-libs/libXcursor[${MULTILIB_USEDEP}]
+	x11-libs/libXdamage[${MULTILIB_USEDEP}]
+	x11-libs/libXext[${MULTILIB_USEDEP}]
+	x11-libs/libXfixes[${MULTILIB_USEDEP}]
+	x11-libs/libXi[${MULTILIB_USEDEP}]
+	x11-libs/libXrandr[${MULTILIB_USEDEP}]
+	x11-libs/libXrender[${MULTILIB_USEDEP}]
+	x11-libs/libXtst[${MULTILIB_USEDEP}]
+	media-libs/alsa-lib[${MULTILIB_USEDEP}]
+	sys-libs/glibc[${MULTILIB_USEDEP}]
+	x11-libs/libXScrnSaver[${MULTILIB_USEDEP}]
+	x11-libs/libxcb[${MULTILIB_USEDEP}]
 "
 
 S="${WORKDIR}"
 QA_PREBUILT="opt/Saleae/${PN}/Logic opt/Saleae/${PN}/libffmpeg.so opt/Saleae/${PN}/libnode.so"
 
-MY_PN=${PN/-bin/}
+MY_PN=Logic
+
+pkg_setup() {
+        chromium_suid_sandbox_check_kernel_config
+}
 
 src_prepare() {
 	rm -r ${P}/usr/lib
-	sed -i 's/^Exec=AppRun/Exec=${MY_PN}/' "${P}/${MY_PN}.desktop" \
+	sed -i 's/^Exec=AppRun/Exec=${MY_PN}/' "${P}/Logic.desktop" \
 		|| die "Failed to patch desktop file"
 
 	default_src_prepare
 }
 
 src_install() {
-	mv ${P}/usr "${ED}"
-	rm -f ${P}/${MY_PN}.png
+	cp -a ${P}/usr "${ED}"
 	rm -f ${P}/.DirIcon
 	dodir /opt/Saleae/Logic
-	mv ${P}/* "${ED}"/opt/Saleae/Logic || die "Failed to move directory"
+	cp -a ${P}/* "${ED}"/opt/Saleae/Logic || die "Failed to move directory"
 
-	dosym ../../opt/Saleae/${MY_PN}/${MY_PN} /usr/bin/${MY_PN}
-	domenu "${ED}"/opt/Saleae/${MY_PN}/${MY_PN}.desktop
-	#doicon "${ED}"/opt/${P}/${MY_PN}.png
+        # remove chrome-sandbox binary, users should use kernel namespaces
+        # https://bugs.gentoo.org/692692#c18
+        rm "${ED}"/opt/Saleae/Logic/chrome-sandbox || die
+
+	dosym ../../opt/Saleae/Logic/Logic /usr/bin/Logic
+	domenu "${ED}"/opt/Saleae/Logic/Logic.desktop
+	doicon "${ED}"/opt/Saleae/Logic/Logic.png
 }