diff --git a/app-admin/customrescuecd-x86/Manifest b/app-admin/customrescuecd-x86/Manifest
index fbeeb1a2fe..17dfa9e881 100644
--- a/app-admin/customrescuecd-x86/Manifest
+++ b/app-admin/customrescuecd-x86/Manifest
@@ -1,2 +1,3 @@
 DIST CUSTOMRESCUECD-x86-0.3.1.iso 1426063360 BLAKE2B 8116b657aed9f5fb9ac0d56f6284bc45a4e050ad7e84cd4cb7c5217b07c9151c82776589aefa3c030cf766106bca7948d48cde2055c408c4e32ea081297b6117 SHA512 3aa0d2ab54920a19046fc1038313e01a99287301b06f25b1346c54d680c4ca2395e9c9010b3299cdc94a0198ec0f63209d09a1d086243e3b82216e7f4d63e0e6
 DIST CUSTOMRESCUECD-x86-0.4.0.iso 1322811392 BLAKE2B f93550977a41d1d19a35f7ff2cc2cb7cdd94eb1ca1ade9fed6db7d7963297366b839c5590a17f85f2dec13e86588d651e94792dd12064f094eaffe3608117e03 SHA512 45bb47fc2b72e653c8f9d23a483aa5c59a92aabd306240d06f33d1c7249c905d7961670cbefc6d9d132a9a5fe1fdc7743ee3f1356a8e58724fea6a3073b08a86
+DIST CUSTOMRESCUECD-x86-0.4.1.iso 1322811392 BLAKE2B bd63d40baf6426ed525c13e91ce65469f8f2a263072003c4dc1adea1ca75f894d2517c94063488fa75e1fa6012202ddbbf5281378c17a26edad683ce49996391 SHA512 46f1a2f20697b666fc4506abb405a8ebf58b63a83c5faacfc70e352c9eb9cd4a75ca742ac0011119e8baadd6fb467cfb306d8009994dbf2879a45486ccfe57bc
diff --git a/app-admin/customrescuecd-x86/customrescuecd-x86-0.4.1.ebuild b/app-admin/customrescuecd-x86/customrescuecd-x86-0.4.1.ebuild
new file mode 100644
index 0000000000..4c3a5f629c
--- /dev/null
+++ b/app-admin/customrescuecd-x86/customrescuecd-x86-0.4.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P="CUSTOMRESCUECD-x86"
+DESCRIPTION="A system rescue cd or usbstick for desktop and server based on gentoo"
+HOMEPAGE="https://sourceforge.net/projects/customrescuecd"
+SRC_URI="mirror://sourceforge/customrescuecd/"${MY_P}"-"${PV}".iso"
+
+LICENSE="GPL-3"
+SLOT="${PV}"
+KEYWORDS="~x86"
+RESTRICT="bindist mirror"
+
+S=${WORKDIR}
+
+src_unpack() { :; }
+
+src_install() {
+	insinto "/usr/share/${PN%-*}"
+	doins "${DISTDIR}/${MY_P}-${PV}.iso"
+}
+
+pkg_postinst() {
+	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+	# no version newer than ours? we're the newest!
+	if ! has_version ">${CATEGORY}/${PF}"; then
+		ln -f -s -v "${MY_P}-${PV}.iso" "${f}" || die
+	fi
+}
+
+pkg_postrm() {
+	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+	# if there is no version newer than ours installed
+	if ! has_version ">${CATEGORY}/${PF}"; then
+		# and we are truly and completely uninstalled...
+		if [[ ! ${REPLACED_BY_VERSION} ]]; then
+			# then find an older version to set the symlink to
+			local newest_version=$(best_version "<${CATEGORY}/${PF}")
+
+			if [[ ${newest_version} ]]; then
+				# update the symlink
+				ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
+			else
+				# last version removed? clean up the symlink
+				rm -v "${f}" || die
+				# and the parent directory
+				rmdir "${f%/*}" || die
+			fi
+		fi
+	fi
+}
diff --git a/app-admin/customrescuecd-x86_64/Manifest b/app-admin/customrescuecd-x86_64/Manifest
index 56fdf6affa..39fa287c28 100644
--- a/app-admin/customrescuecd-x86_64/Manifest
+++ b/app-admin/customrescuecd-x86_64/Manifest
@@ -1,2 +1,3 @@
 DIST CUSTOMRESCUECD-x86_64-0.10.3.iso 1537474560 BLAKE2B d4812074013323d8372bd71bea1c81cbe8cb88e0cf87dd1ec7c4373a1c4f4023cfec383ea3327cb75aa903021d929ac7a29290a2a9a7a75857c591827af7a148 SHA512 1092dc85a82c1f17c362b19e91d36602debaab7d52a98945ebb494f9d8bec03fb07b16649c7401233a060ce95905c3f9259107c2eb9f80bd63d759740754105e
 DIST CUSTOMRESCUECD-x86_64-0.11.0.iso 1265106944 BLAKE2B f6732d1f903c02a49ed13525e19f957ccc5a78466cdc62d609579d2aaf2bfa5bcdf5cf2597089d3634fa8124cff3293030703e95187771c7517d890226997245 SHA512 6099c5a344c701936743bbbfad02206dca7937b6c6b796fa7cb42ad42a544c731fa2e0895a94d138cd3d91d34791a5ed88d723973e2e383e900ad1a385a27482
+DIST CUSTOMRESCUECD-x86_64-0.11.1.iso 1261371392 BLAKE2B b12dc61fb2c91fd04832ba22af3421f7223c40ae8e1fe2bd4fc0beeb0aafbc1b11a82aacb16282ce7dd14621e3be717af90363d157c5f36ee33f3eb03a36e26a SHA512 07475353e883756b2782ad6727440132d6f97b9bca7f3cd9180b5a47290a8a0361fb672ef01ac5a5ea5862b1b4ec7bec85990710a53b7a190cce321b24660d01
diff --git a/app-admin/customrescuecd-x86_64/customrescuecd-x86_64-0.11.1.ebuild b/app-admin/customrescuecd-x86_64/customrescuecd-x86_64-0.11.1.ebuild
new file mode 100644
index 0000000000..96d32df69b
--- /dev/null
+++ b/app-admin/customrescuecd-x86_64/customrescuecd-x86_64-0.11.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P="CUSTOMRESCUECD-x86_64"
+DESCRIPTION="A system rescue cd or usbstick for desktop and server based on gentoo"
+HOMEPAGE="https://sourceforge.net/projects/customrescuecd"
+SRC_URI="mirror://sourceforge/customrescuecd/"${MY_P}"-"${PV}".iso"
+
+LICENSE="GPL-3"
+SLOT="${PV}"
+KEYWORDS="~amd64"
+RESTRICT="bindist mirror"
+
+S=${WORKDIR}
+
+src_unpack() { :; }
+
+src_install() {
+	insinto "/usr/share/${PN%-*}"
+	doins "${DISTDIR}/${MY_P}-${PV}.iso"
+}
+
+pkg_postinst() {
+	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+	# no version newer than ours? we're the newest!
+	if ! has_version ">${CATEGORY}/${PF}"; then
+		ln -f -s -v "${MY_P}-${PV}.iso" "${f}" || die
+	fi
+}
+
+pkg_postrm() {
+	local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso
+
+	# if there is no version newer than ours installed
+	if ! has_version ">${CATEGORY}/${PF}"; then
+		# and we are truly and completely uninstalled...
+		if [[ ! ${REPLACED_BY_VERSION} ]]; then
+			# then find an older version to set the symlink to
+			local newest_version=$(best_version "<${CATEGORY}/${PF}")
+
+			if [[ ${newest_version} ]]; then
+				# update the symlink
+				ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die
+			else
+				# last version removed? clean up the symlink
+				rm -v "${f}" || die
+				# and the parent directory
+				rmdir "${f%/*}" || die
+			fi
+		fi
+	fi
+}
diff --git a/dev-python/pydantic/Manifest b/dev-python/pydantic/Manifest
deleted file mode 100644
index 08803723d7..0000000000
--- a/dev-python/pydantic/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST pydantic-1.6.1.tar.gz 244677 BLAKE2B 0a1d6986858ab753cbc4dd262bd268b2a365c241a7de106a7bf21714c6c499c7dbacaea095789d3503507965ca50106da32545be670ed0261827f1fe0316ff67 SHA512 b0442f78a661f56d29697da7e27393261420bdb0f08473d2f7872145a49a18de8c17c903d0899a44263bcd8229e8790161da032dd5a3d5f2dae347c66bd6a567
diff --git a/dev-python/pydantic/metadata.xml b/dev-python/pydantic/metadata.xml
deleted file mode 100644
index 1705b4d7c4..0000000000
--- a/dev-python/pydantic/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-
-<pkgmetadata>
-	<maintainer type="person">
-		<email>andrewammerlaan@riseup.net</email>
-		<name>Andrew Ammerlaan</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">samuelcolvin/pydantic</remote-id>
-		<remote-id type="pypi">pydantic</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/pydantic/pydantic-1.6.1.ebuild b/dev-python/pydantic/pydantic-1.6.1.ebuild
deleted file mode 100644
index 138f7b7e9c..0000000000
--- a/dev-python/pydantic/pydantic-1.6.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-DOCBUILDER="mkdocs"
-DOCDEPEND="
-	dev-python/mkdocs-material
-	dev-python/mkdocs-exclude
-	dev-python/markdown-include
-"
-
-inherit distutils-r1 docs
-
-DESCRIPTION="Data parsing and validation using Python type hints"
-HOMEPAGE="https://github.com/samuelcolvin/pydantic"
-SRC_URI="https://github.com/samuelcolvin/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-
-distutils_enable_tests pytest
-
-BDEPEND="dev-python/cython"
-
-DEPEND="test? (
-	dev-python/mypy[${PYTHON_USEDEP}]
-	dev-python/pytest-mock[${PYTHON_USEDEP}]
-)"
-
-RDEPEND="
-	>=dev-python/devtools-0.5.1[${PYTHON_USEDEP}]
-	>=dev-python/python-email-validator-1.1.1[${PYTHON_USEDEP}]
-	>=dev-python/python-dotenv-0.13.0[${PYTHON_USEDEP}]
-	dev-python/typing-extensions[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	# AssertionError: assert 'pydantic-1.5.1.tar.gz' == 'config a'
-	sed -i -e 's:test_config_file_settings_nornir:_&:' \
-		tests/test_settings.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-vcs/gitqlient/Manifest b/dev-vcs/gitqlient/Manifest
index 1767e9ca04..df05a28ccd 100644
--- a/dev-vcs/gitqlient/Manifest
+++ b/dev-vcs/gitqlient/Manifest
@@ -1,2 +1,3 @@
 DIST QLogger-d33cb64.tar.gz 15378 BLAKE2B adb5bed0c9cc3692b384542306466046242ff50d0c7dd176f439172047991ce4252e315e8289524a9e346abc225aeb9ca89b958f00cd11710294b2885ca0f69d SHA512 bec4785dcdb4cf3434621f68830628c737ee0664223228ec68f09991b5a2090eac024fbce86d6d0614d8a709efd55e0f126c1bbf8451c1c100080df3b8cdd17f
 DIST gitqlient-1.2.0.tar.gz 3768498 BLAKE2B 0daa49b79c6390e367b24d8843f37c6a633d1e12c8e3d2b7d3245fb06ea0f89c6fb3b360fdc3dfaae13568d36a413353c67fbb29e60f19221341dcb71469491a SHA512 4dd4a21a7b222c6d7586bcbf5eec26f321fc18dd6ef52507a4eb4004675b04f437f8801c817a12f16f5b5ea9b3c2e2930f445e8bb09e64d33b89f69dbf310c74
+DIST gitqlient-1.3.0_beta.tar.gz 4320202 BLAKE2B f45e615fd9d4ee8a90df872c40b1c1b4eaefd7612458cf51bbeb69a920f6ea00704de61ba2446f41d2d4f847919cb6b119b397e0a910bf4244bbf3bf41dfa98c SHA512 79ca8211eaa84016d9eb43dea6b1773fd11121e7b0c47152642a03ab0e3d37bafbfc2cc5749f4864d5877699333a47d5bf6afede85246365ce3d281857247637
diff --git a/dev-vcs/gitqlient/gitqlient-1.3.0_beta.ebuild b/dev-vcs/gitqlient/gitqlient-1.3.0_beta.ebuild
new file mode 100644
index 0000000000..b1e18e0a7e
--- /dev/null
+++ b/dev-vcs/gitqlient/gitqlient-1.3.0_beta.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop qmake-utils xdg
+
+MY_PN="GitQlient"
+MY_PV=$(ver_rs 3 -)
+
+DESCRIPTION="Multi-platform Git client written with Qt"
+HOMEPAGE="https://github.com/francescmm/GitQlient"
+
+SRC_URI="https://github.com/francescmm/${MY_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+S="${WORKDIR}/${MY_PN}-${MY_PV}"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+"
+
+RDEPEND="
+	${DEPEND}
+	dev-vcs/git
+"
+
+src_prepare() {
+	default
+	sed -i -e "/QMAKE_CXXFLAGS/s:-Werror::" "${MY_PN}".pro || die
+
+	sed -i -e "s:Office:Development:" "${S}/src/resources/${PN}.desktop" || die
+}
+
+src_configure() {
+	eqmake5 PREFIX=/usr "${MY_PN}".pro
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+}
diff --git a/media-video/kikoplay/Manifest b/media-video/kikoplay/Manifest
index b9a3fb9b82..81416f2456 100644
--- a/media-video/kikoplay/Manifest
+++ b/media-video/kikoplay/Manifest
@@ -1 +1 @@
-DIST kikoplay-0.7.1.tar.gz 8176092 BLAKE2B d0798272b1e58fa45738dc8ffc5c3c14c076d9bb15feed31aa4c4076b644f4c5c910665f55c69c3babb9c8a5aed781cc46da7b43c47e81333e3608204f9f249c SHA512 4817ac9a39470598ebe965235cb0afb247fe5435d4ab6292d6d1f0219c8039dcccef5a4f3bf1a53113958be0641418cb48a7d37b74b6b610ca073b1d94121199
+DIST kikoplay-0.7.2.tar.gz 9036604 BLAKE2B 1909e8b5505110c8548923594acb2861d7d7c3bf92137d670b748bd2c2960293cdab4ba86c3c48cb32a3d276c823630de12ea8ee3665e7c4ded968fdaa9b7a5a SHA512 d80819c97dd7f02670d2ae4338961c1eab40890b7d7876fef855ba7b0fa333158da7429cff04309baf22c5a24781356ecbac9822b939dcfc403df38ffa749e93
diff --git a/media-video/kikoplay/kikoplay-0.7.1.ebuild b/media-video/kikoplay/kikoplay-0.7.2.ebuild
similarity index 100%
rename from media-video/kikoplay/kikoplay-0.7.1.ebuild
rename to media-video/kikoplay/kikoplay-0.7.2.ebuild
diff --git a/net-misc/openbgpd/Manifest b/net-misc/openbgpd/Manifest
index 5e4abe2908..419d2c1cd5 100644
--- a/net-misc/openbgpd/Manifest
+++ b/net-misc/openbgpd/Manifest
@@ -1,2 +1,3 @@
 DIST openbgpd-6.6p0.tar.gz 676732 BLAKE2B 80b391ead81d8d3bd20fe9b3eb3f8976485d29241f30c7395c678ff3f0fd87b2f3036b2ebb502ff0ca27d79f4fbbe6ba93576069edb32f004705d71d92e2b3a2 SHA512 07a7599b3ab14181575dc38647b307a4efa7d5dfa8a7aefe70483eb6773cb792eac788a10ea865d78daa59f197fc2d9cd2ce96d0c0251564507963716057fee0
 DIST openbgpd-6.7p0.tar.gz 699211 BLAKE2B 981105c3a9ba6a7b143ad6d926459382686f23b6355392fedaecaaf572c0d6054f6ce7656eaf7461d5bdc753e0be3d70f7ae44ee85395fd0d310d2bef7251bf8 SHA512 7309fe00ada74503ae6c739886e8a78af6cba93cbe6d29f9656eb95f96124401ac7b00ebe1b345b1c786582f661c72caf22c9193968662db2a1f19703f34cd2e
+DIST openbgpd-6.8p0.tar.gz 701164 BLAKE2B 458e3aeab026b3c2ee3f676d35d657ef2b8b9b2cb11efc6a32f18c387e6f08594fa3e736b53f9413e9ec59139adfd3c89d26da780bcdcb4b2925124cf9a1ea05 SHA512 0c99a94a9a1401c22a3400d424ac1e682bdab92d09844717f8bb576c0ede67140d918f48c15b318abebf21b39468333f8f1c2d963a1541f4ead9067f85434a94
diff --git a/net-misc/openbgpd/openbgpd-6.8_p0.ebuild b/net-misc/openbgpd/openbgpd-6.8_p0.ebuild
new file mode 100644
index 0000000000..ccd7a6baf9
--- /dev/null
+++ b/net-misc/openbgpd/openbgpd-6.8_p0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd
+
+MY_PV="${PV/_p/p}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="OpenBGPD is a free implementation of BGPv4"
+HOMEPAGE="http://www.openbgpd.org/index.html"
+SRC_URI="mirror://openbsd/OpenBGPD/${PN}-${MY_PV}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="
+	${DEPEND}
+	!!net-misc/quagga
+	acct-group/_bgpd
+	acct-user/_bgpd
+"
+BDEPEND="
+	sys-devel/libtool
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}/${PN}-init.d" bgpd
+	newconfd "${FILESDIR}/${PN}-conf.d" bgpd
+	systemd_newunit "${FILESDIR}/${PN}.service" bgpd.service
+}
+
+pkg_postinst() {
+	if [ -z "${REPLACING_VERSIONS}" ]; then
+		ewarn ""
+		ewarn "OpenBGPD portable (not running on OpenBSD) can’t export its RIB"
+		ewarn "to the FIB. It’s only suitable for route-reflectors or"
+		ewarn "route-servers."
+		ewarn ""
+	fi
+}
diff --git a/net-misc/rpki-client/Manifest b/net-misc/rpki-client/Manifest
index 6c43856ebb..c3079c3546 100644
--- a/net-misc/rpki-client/Manifest
+++ b/net-misc/rpki-client/Manifest
@@ -1,2 +1,4 @@
 DIST rpki-client-6.6_p2.tar.gz 42840 BLAKE2B f5075376925cad57893a27c463c6727362e108cbccb348785ca4940fbaa8262286342ecb6f5fa59a0615009bc16571b15218483822c827528ecc19e1963c9e6b SHA512 5acdabef9b0373fb2fe47a2b9cb2638809ac1260b273c1566e3dbd34287c3703dd7979a7ba98b7d5b305664add6f2d5af4564ad2315033406e5e835f1051951f
 DIST rpki-client-6.7_p0.tar.gz 44454 BLAKE2B 2336f3a8f4a0cb53a9c6f4df6dbd269ff1e8bcb11b61d4c283c3153e563054efb163339ec7852f45e12cc7e9544522d7dabc62d0f79b5a6951014e47980caad9 SHA512 018e237a4075779850f18bdc69c49dac03d8bb2d377dbd680f1faa307057647ea3188acb6b78766e6563dd48afadd5eaea419413c41a018882d1a8b147bb6630
+DIST rpki-client-6.7_p1.tar.gz 44463 BLAKE2B c269a502c680a4c41c2201fceed2f3bab7b83e3a6a173fea5081ced073e10f02fd7aaa07ef4b9d14f816c88871ffee8c65126f0efcda9e8ca7c08032cac179d6 SHA512 bc9815ab6cd930715e9494b82b1547a419706db3fa4eca003767d6e39c3a63c0a3f3048c211c773e1f0e87043b0bfd622b0d5be856ccced27f893eefc9511211
+DIST rpki-client-6.8p0.tar.gz 388472 BLAKE2B e0a3f7d8a3fa0503ba3d41556fa17fe5f1407513ed7417cc0fb185c206c7b525bc49d125723436f1e27b0b3c5f0c58a862579cd4b9ad23009ca0341959029e00 SHA512 cb34fbf9367e522a924d3ecaaff6d2be45cdec968946b491250949cbd07744b87b84c664bd70303b6568d387671217da99aba7fb35e4d8ed4eb33103063b00cd
diff --git a/net-misc/rpki-client/rpki-client-6.7_p1.ebuild b/net-misc/rpki-client/rpki-client-6.7_p1.ebuild
new file mode 100644
index 0000000000..b9a0673ba5
--- /dev/null
+++ b/net-misc/rpki-client/rpki-client-6.7_p1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools git-r3
+
+MY_PN="${PN}-portable"
+MY_PV="${PV/_p/p}"
+MY_P="${MY_PN}-${MY_PV}"
+
+DESCRIPTION="Portability shim for OpenBSD's rpki-client"
+HOMEPAGE="https://rpki-client.org/"
+SRC_URI="https://github.com/${PN}/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+EGIT_REPO_URI="https://github.com/${PN}/${PN}-openbsd.git"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	acct-group/_rpki-client
+	acct-user/_rpki-client
+"
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+PATCHES=(
+	"${FILESDIR}/${PN}-${PV%_*}-update.patch"
+)
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	default
+
+	EGIT_BRANCH=$(cat "${S}"/OPENBSD_BRANCH)
+	EGIT_CHECKOUT_DIR="${S}/openbsd"
+	git-r3_fetch
+	git-r3_checkout
+}
+
+src_prepare() {
+	default
+
+	cd "${S}"
+	./autogen.sh
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--with-rsync=rsync
+		--with-base-dir="/var/cache/${PN}"
+		--with-output-dir="/var/db/${PN}"
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" BINDIR="/usr/bin" MANDIR="/usr/share/man" install
+	insinto /etc/rpki
+	doins *.tal
+	keepdir "/var/db/${PN}/"
+	fowners -R _rpki-client "/var/db/${PN}/"
+}
diff --git a/net-misc/rpki-client/rpki-client-6.8_p0.ebuild b/net-misc/rpki-client/rpki-client-6.8_p0.ebuild
new file mode 100644
index 0000000000..7ea95a3b8f
--- /dev/null
+++ b/net-misc/rpki-client/rpki-client-6.8_p0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PV="${PV/_p/p}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Portability shim for OpenBSD's rpki-client"
+HOMEPAGE="https://rpki-client.org/"
+SRC_URI="mirror://openbsd/${PN}/${PN}-${MY_PV}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	acct-group/_rpki-client
+	acct-user/_rpki-client
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	sys-devel/libtool
+"
+
+S="${WORKDIR}/${MY_P}"
+src_configure() {
+	local myeconfargs=(
+		--with-rsync=rsync
+		--with-base-dir="/var/cache/${PN}"
+		--with-output-dir="/var/db/${PN}"
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" BINDIR="/usr/bin" MANDIR="/usr/share/man" install
+	insinto /etc/rpki
+	doins *.tal
+	keepdir "/var/db/${PN}/"
+	fowners -R _rpki-client "/var/db/${PN}/"
+}
diff --git a/net-misc/wsdd/Manifest b/net-misc/wsdd/Manifest
index 3a89e728bb..b9fdbef715 100644
--- a/net-misc/wsdd/Manifest
+++ b/net-misc/wsdd/Manifest
@@ -1,3 +1,4 @@
 DIST wsdd-0.5.tar.gz 16820 BLAKE2B 3744cf45812a54d1857d75adb9ad24868f6a29520cda3de5c69877196ffafea242e3c68f54a7849c6399fb038366825c6e42a3e1e98d37c893b7c4cde7cd49c2 SHA512 fe300de7d900f34b43c81358506b2e62ecbf980e6c65b377f87e3a9618afeef9dff2ed041b660b58bce0944d221ca26b2fc1c1ff7e0155edef615ed6d5ec5cd5
 DIST wsdd-0.6.1.tar.gz 27254 BLAKE2B 745eab6f8b404d56cfa99bf4691936ac294931495990b75e29d4d28db5bef82804b1215aca76b4e2f941e8d58daee8dbbbe091ce3bfe90bc82856f6960ffec75 SHA512 62d7694972dbd571b5c5d9a2f1086bc0ba244896df237d6514b0a7cf814d11faec8299a1618e2da8550bcaee3feede3e2e057d3a1d2e7296947b09d6894ac2a2
+DIST wsdd-0.6.2.tar.gz 27654 BLAKE2B 07a518517f8896682a6a04a4f904b3f696874da71b1b09202fc4b6117a32e2eaa463a111c5265a643d6cde49fef275ac0adcfdd4e21f89f2721719426f1926a0 SHA512 fb18c5018bbd0a6389ad8a58040351ddebab5628c7315d57d9aaf32effe1d7a4f5b91dfa9afae77d41c0eb408de6ad788c40d1cd6158e975fc94f8c3a9f8bd4b
 DIST wsdd-0.6.tar.gz 27067 BLAKE2B ea8ca4235d7a8dc32ed6cdf04f3ceeb0b41114c8fdc38beb783d839e7771d4557af0c411b1568809d1ba6a3dcdc94436a3990852b6b7f0d47eb6c0e4261a8f89 SHA512 a57a7d75118e73b63269f7de44da22ee571c922455e1be2820595209c7eabeb4c95ba6b54a56d35c5a4bf0210e05ed8578f967170728edff854cc7d40c19ef48
diff --git a/net-misc/wsdd/wsdd-0.6.2.ebuild b/net-misc/wsdd/wsdd-0.6.2.ebuild
new file mode 100644
index 0000000000..f35381e5e6
--- /dev/null
+++ b/net-misc/wsdd/wsdd-0.6.2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit python-r1 systemd
+
+DESCRIPTION="A Web Service Discovery host daemon."
+HOMEPAGE="https://github.com/christgau/wsdd"
+SRC_URI="https://github.com/christgau/wsdd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="samba"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}"
+# Samba is technically no requiredment of wsdd, but depend on it if the use flags is set.
+RDEPEND="${DEPEND} samba? ( net-fs/samba )"
+BDEPEND=""
+
+src_install() {
+	python_foreach_impl python_newscript src/wsdd.py wsdd
+
+	# remove dependency on samba from init.d script if samba is not in use flags
+	if ! use samba ; then
+		sed -i -e '/need samba/d' etc/openrc/init.d/wsdd
+	fi
+
+	doinitd etc/openrc/init.d/wsdd
+	doconfd etc/openrc/conf.d/wsdd
+
+	# install systemd unit file with wsdd user and dependency on samba service if use flag is set
+	sed -i -e 's/=nobody/=daemon/' etc/systemd/wsdd.service
+	if use samba; then
+		sed -i -e 's/;Wants=smb.service/Wants=samba.service/' etc/systemd/wsdd.service
+	fi
+	systemd_dounit etc/systemd/wsdd.service
+
+	dodoc README.md
+	doman man/wsdd.1
+}
diff --git a/sci-electronics/verilator/Manifest b/sci-electronics/verilator/Manifest
index ce3deaa4ed..8d77541f9f 100644
--- a/sci-electronics/verilator/Manifest
+++ b/sci-electronics/verilator/Manifest
@@ -1 +1 @@
-DIST verilator-4.100.tar.gz 2113464 BLAKE2B 8f8b0d9f10680cc6763d3588056b6dbd3717f3697ce300d217c8f42636b847b39bc49c9a048e90f47fc87396f401da0dda67d06dc9ef327ab823c6d9cc3d0c60 SHA512 056a863bfbe6221c866f67c9c0c915ff282165d53d8e8f614b04cfed18cbe9ed5082bbcf4c1021ab391d20f5047c0185bc2be59d3e7204bf6cb1d2c48c79da4f
+DIST verilator-4.102.tar.gz 2128472 BLAKE2B 5dabc2e0a74f336da84ff4006a63408d127e26996e4a6f454b2b1fa98e98792b5ab5dbc41e25db0a72b58e0b0352c58bb34868ddf0ee9234bce8569666a7d1b0 SHA512 85ccd09eaaa72d6afd5b68027d5cdec1d3223a81b51e13e3de794d301cb086ee3283b18d96c38f67908c3fe9a73b26172afbf7ce5cc3fd38874b631029b31997
diff --git a/sci-electronics/verilator/verilator-4.100.ebuild b/sci-electronics/verilator/verilator-4.102.ebuild
similarity index 100%
rename from sci-electronics/verilator/verilator-4.100.ebuild
rename to sci-electronics/verilator/verilator-4.102.ebuild