gentoo resync : 18.12.2020

28 files changed, 333 insertions, 549 deletions

diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index ff22938997e1..53502e1bd64d 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/ca-certificates/Manifest b/app-misc/ca-certificates/Manifest
index 43523db00709..577e376822eb 100644
--- a/app-misc/ca-certificates/Manifest
+++ b/app-misc/ca-certificates/Manifest
@@ -2,7 +2,10 @@ AUX ca-certificates-20150426-root.patch 1336 BLAKE2B f52a2ab1f84a18e447b37905f2d
 DIST ca-certificates_20200601.tar.xz 245668 BLAKE2B 1249782dba046f52832d365e4770e02ed24c0b50bff4ceec5e5af932c807eb8120f8e3bc7858503e74789ecb2da577509819f3ffdf9bd1ec5cc22d61f2194ad5 SHA512 7bfd3122430be0a46bd10dcb0e0664561d1e0b2656b9f37677d89f71a1dcb0e668c25ffe08412888125fa9a53ee8245a4b3fc1004c419a159766665b1241113c
 DIST nss-3.53.tar.gz 81178428 BLAKE2B 5e67b02bf0ba9390311d77ee4d7b86fd7339bd4f7d830b32563799e4eef126143f0b76b2933ad14c5c5d3da6cb3fa0e670aca7ce9654316123abadce25a728ec SHA512 280edf24356b764584200bff949af4a7f88514ee8ac80bf5348a9a844a8b1eb263e9aa1d772644bd8bb1bd195c12b6cc173280cfc88cd97e56562e1c40e71503
 DIST nss-3.59.tar.gz 82141516 BLAKE2B 74959b14ec42b4628dfc3365af00420cdbd41d202541e9379f6a4448c4496b76307af48c9ec405b370f8770327ce56742b4382f8cd49724b42732ce5cc5b0779 SHA512 8963e846f2ff7222457ae59f042672cf4e44f7752807226f46c215a772fd1cbd65d0ce634da4afb698eabd4eb1c1e78146cc2a089339ada11da03d259c609a38
+DIST nss-3.60.tar.gz 82035831 BLAKE2B fffc0e26d58d4625be1b8b0123f248a0c7994b18868ece534ba4d60131dd4897d075d7b2dba672c31ccd333e0c18ea384e2aa2f495c23b5430d6d10b91922873 SHA512 6463b2da28b5d9f1f20d45f77a3179e2b93c874af5742c7fc51eb7c44cef93270acacf79174dc63905f227256cbcee23a36f98f1cfed10dd5c56ffc0a76e2695
+DIST nss-cacert-class1-class3-r1.patch 22503 BLAKE2B d2ba6b5c3675484dab5b6709478101a9dadc0baded3dbf891dcd04e5eb912079b87cdd17f893a0f539a2a53fb05357c6dd309fb624facac3b021c82c7424a91f SHA512 68906d2442986ad13ebf9cd97c26fac34af3efd5cfaacb3d7824adad966349ad796c9cec8dec44c46d5c571df88ce83aea02ce82e71da337aa4e1aeef58eda66
 DIST nss-cacert-class1-class3.patch 22950 BLAKE2B 9d5e60df5f161a3c27c41e5a9419440a54f888eda454e3cde5ebe626d4075b65cf9938b5144d0fb022377f4bd415bff5e5c67d104409860aa9391b3eb8872c68 SHA512 a5aa740bf110a3f0262e3f1ef2fc739ac2b44f042e220039d48aee8e97cd764d5c10718220364f4098aba955882bd02cadb5481512388971a8290312f88a7df0
 EBUILD ca-certificates-20200601.3.53.ebuild 6033 BLAKE2B 8e441c0dab72a630718ed0ecba44a3bf9298f4aaf673a259ba36b796234eaacd0db21bb4956321567ba01a7efd39a9c552498eb15e0b90f179a112db2182feb8 SHA512 ae0ffe155f7600d00226e40aa5fc0241b43eee08f19fb8711d3ae0fbf6fe38325400ac9d02e9f32716651a014c4cec157918edd00874f48e71a64b7dc2a3377c
 EBUILD ca-certificates-20200601.3.59.ebuild 6042 BLAKE2B dc40f5b0a90206e59290932f62e514298b9bc25d9dc100843623a16651b436c38bfce700572a82d1eab3969e32167cce3aaf389600d882143017272f17d789f4 SHA512 7c7d391b234c77e7827b5ce1b49327b3b246930dbbb11eee781a9b5c85d35f6d96f2fc1c9e72d9c2192237315afec627212c1cccb281d93b5d7e887059c12b42
+EBUILD ca-certificates-20200601.3.60.ebuild 6178 BLAKE2B d8fb5b666a1d3dcd0903e72c6b442df05a6b8131e3f035e2461b99996fecfc32e75bfcbd8cd1ff9281f49dce63737f352821fbc1137a38659c2870158f00436e SHA512 2b3db98fb0b0bda4038962ef4f754c31e0c08fffc6c011c019cb3a0b9b9876458b3baff0cc458a0fbaeda7af6e18a3ec04a952a40bfe3b9e9c924dc0d5252c4a
 MISC metadata.xml 436 BLAKE2B f37fed732b387ea5e778bb88c349c78127b0db613def815d75e5cc2b7a7dbd049131eef33617fe3139975bd0c6bb187cf20e98c27e3ee10c3928b394fe6f02ac SHA512 dade84534ac0e574b3d127a1dc367b2f206874500057662d6139a00dc30506e1d977e3020b8e983750a8ef243bcfb34e152391d12027d88f8c116d151090ed9b
diff --git a/app-misc/ca-certificates/ca-certificates-20200601.3.60.ebuild b/app-misc/ca-certificates/ca-certificates-20200601.3.60.ebuild
new file mode 100644
index 000000000000..5a9c6f7d4b4f
--- /dev/null
+++ b/app-misc/ca-certificates/ca-certificates-20200601.3.60.ebuild
@@ -0,0 +1,197 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# The Debian ca-certificates package merely takes the CA database as it exists
+# in the nss package and repackages it for use by openssl.
+#
+# The issue with using the compiled debs directly is two fold:
+# - they do not update frequently enough for us to rely on them
+# - they pull the CA database from nss tip of tree rather than the release
+#
+# So we take the Debian source tools and combine them with the latest nss
+# release to produce (largely) the same end result.  The difference is that
+# now we know our cert database is kept in sync with nss and, if need be,
+# can be sync with nss tip of tree more frequently to respond to bugs.
+
+# When triaging bugs from users, here's some handy tips:
+# - To see what cert is hitting errors, use openssl:
+#   openssl s_client -port 443 -CApath /etc/ssl/certs/ -host $HOSTNAME
+#   Focus on the errors written to stderr.
+#
+# - Look at the upstream log as to why certs were added/removed:
+#   https://hg.mozilla.org/projects/nss/log/tip/lib/ckfw/builtins/certdata.txt
+#
+# - If people want to add/remove certs, tell them to file w/mozilla:
+#   https://bugzilla.mozilla.org/enter_bug.cgi?product=NSS&component=CA%20Certificates&version=trunk
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit python-any-r1
+
+if [[ ${PV} == *.* ]] ; then
+	# Compile from source ourselves.
+	PRECOMPILED=false
+
+	DEB_VER=$(ver_cut 1)
+	NSS_VER=$(ver_cut 2-)
+	RTM_NAME="NSS_${NSS_VER//./_}_RTM"
+else
+	# Debian precompiled version.
+	PRECOMPILED=true
+	inherit unpacker
+fi
+
+DESCRIPTION="Common CA Certificates PEM files"
+HOMEPAGE="https://packages.debian.org/sid/ca-certificates"
+NMU_PR=""
+if ${PRECOMPILED} ; then
+	SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${PV}${NMU_PR:++nmu}${NMU_PR}_all.deb"
+else
+	SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${DEB_VER}${NMU_PR:++nmu}${NMU_PR}.tar.xz
+		https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/nss-${NSS_VER}.tar.gz
+		cacert? (
+			https://dev.gentoo.org/~whissi/dist/ca-certificates/nss-cacert-class1-class3-r1.patch
+		)"
+fi
+
+LICENSE="MPL-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE=""
+${PRECOMPILED} || IUSE+=" cacert"
+
+# c_rehash: we run `c_rehash`
+# debianutils: we run `run-parts`
+CDEPEND="app-misc/c_rehash
+	sys-apps/debianutils"
+
+BDEPEND="${CDEPEND}"
+if ! ${PRECOMPILED} ; then
+	BDEPEND+=" ${PYTHON_DEPS}"
+fi
+
+DEPEND=""
+if ${PRECOMPILED} ; then
+	DEPEND+=" !<sys-apps/portage-2.1.10.41"
+fi
+
+RDEPEND="${CDEPEND}
+	${DEPEND}"
+
+S=${WORKDIR}
+
+pkg_setup() {
+	# For the conversion to having it in CONFIG_PROTECT_MASK,
+	# we need to tell users about it once manually first.
+	[[ -f "${EPREFIX}"/etc/env.d/98ca-certificates ]] \
+		|| ewarn "You should run update-ca-certificates manually after etc-update"
+}
+
+src_unpack() {
+	if ! ${PRECOMPILED} ; then
+		default
+		# Initial 20200601 deb release had bad naming inside the debian source tarball.
+		DEB_S="${WORKDIR}/${PN}-${DEB_VER}"
+		DEB_BAD_S="${WORKDIR}/work"
+		if [[ -d "${DEB_BAD_S}" ]] && [[ ! -d "${DEB_S}" ]] ; then
+			mv "${DEB_BAD_S}" "${DEB_S}"
+		fi
+	fi
+
+	# Do all the work in the image subdir to avoid conflicting with source
+	# dirs in ${WORKDIR}.  Need to perform everything in the offset #381937
+	mkdir -p "image/${EPREFIX}" || die
+	cd "image/${EPREFIX}" || die
+
+	${PRECOMPILED} && unpacker_src_unpack
+}
+
+src_prepare() {
+	cd "image/${EPREFIX}" || die
+	if ! ${PRECOMPILED} ; then
+		mkdir -p usr/sbin || die
+		cp -p "${S}"/${PN}-${DEB_VER}/sbin/update-ca-certificates \
+			usr/sbin/ || die
+
+		if use cacert ; then
+			pushd "${S}"/nss-${NSS_VER} >/dev/null || die
+			eapply "${DISTDIR}"/nss-cacert-class1-class3-r1.patch
+			popd >/dev/null || die
+		fi
+	fi
+
+	default
+	eapply -p2 "${FILESDIR}"/${PN}-20150426-root.patch
+	local relp=$(echo "${EPREFIX}" | sed -e 's:[^/]\+:..:g')
+	sed -i \
+		-e '/="$ROOT/s:ROOT:ROOT'"${EPREFIX}"':' \
+		-e '/RELPATH="\.\./s:"$:'"${relp}"'":' \
+		-e 's/openssl rehash/c_rehash/' \
+		usr/sbin/update-ca-certificates || die
+}
+
+src_compile() {
+	cd "image/${EPREFIX}" || die
+	if ! ${PRECOMPILED} ; then
+		python_setup
+		local d="${S}/${PN}-${DEB_VER}/mozilla" c="usr/share/${PN}"
+		# Grab the database from the nss sources.
+		cp "${S}"/nss-${NSS_VER}/nss/lib/ckfw/builtins/{certdata.txt,nssckbi.h} "${d}" || die
+		emake -C "${d}"
+
+		# Now move the files to the same places that the precompiled would.
+		mkdir -p etc/ssl/certs \
+			etc/ca-certificates/update.d \
+			"${c}"/mozilla \
+			|| die
+		if use cacert ; then
+			mkdir -p "${c}"/cacert.org || die
+			mv "${d}"/CA_Cert_Signing_Authority.crt \
+				"${c}"/cacert.org/cacert.org_class1.crt || die
+			mv "${d}"/CAcert_Class_3_Root.crt \
+				"${c}"/cacert.org/cacert.org_class3.crt || die
+		fi
+		mv "${d}"/*.crt "${c}"/mozilla/ || die
+	else
+		mv usr/share/doc/{ca-certificates,${PF}} || die
+	fi
+
+	(
+		echo "# Automatically generated by ${CATEGORY}/${PF}"
+		echo "# $(date -u)"
+		echo "# Do not edit."
+		cd "${c}" || die
+		find * -name '*.crt' | LC_ALL=C sort
+	) > etc/ca-certificates.conf
+
+	sh usr/sbin/update-ca-certificates --root "${S}/image" || die
+}
+
+src_install() {
+	cp -pPR image/* "${D}"/ || die
+	if ! ${PRECOMPILED} ; then
+		cd ${PN}-${DEB_VER} || die
+		doman sbin/*.8
+		dodoc debian/README.* examples/ca-certificates-local/README
+	fi
+
+	echo 'CONFIG_PROTECT_MASK="/etc/ca-certificates.conf"' > 98ca-certificates
+	doenvd 98ca-certificates
+}
+
+pkg_postinst() {
+	if [[ -d "${EROOT}/usr/local/share/ca-certificates" ]] ; then
+		# if the user has local certs, we need to rebuild again
+		# to include their stuff in the db.
+		# However it's too overzealous when the user has custom certs in place.
+		# --fresh is to clean up dangling symlinks
+		"${EROOT}"/usr/sbin/update-ca-certificates --root "${ROOT}"
+	fi
+
+	if [[ -n "$(find -L "${EROOT}"/etc/ssl/certs/ -type l)" ]] ; then
+		ewarn "Removing the following broken symlinks:"
+		ewarn "$(find -L "${EROOT}"/etc/ssl/certs/ -type l -printf '%p -> %l\n' -delete)"
+	fi
+}
diff --git a/app-misc/cdcat/Manifest b/app-misc/cdcat/Manifest
index 4e6c9ce9ee88..5cf429aee6ab 100644
--- a/app-misc/cdcat/Manifest
+++ b/app-misc/cdcat/Manifest
@@ -1,3 +1,3 @@
 DIST cdcat-0.3.tar.gz 7464 BLAKE2B 24d0acce5bca9f84d24944e74a463ec64fee19a989ef89c187dc283d5c87dbdffb76e9471159903603c07924e0affef6f1b48dc7ab5e7292e5ae427510f7a259 SHA512 6d30a22c29a1846a3899f384bcc395444af77b62024cb9f45da877819614c3f1ff495e03f7d7b498716fe4725c569c88a14480a37fc4e4fef5cfd9a640e4cfa3
-EBUILD cdcat-0.3-r1.ebuild 1239 BLAKE2B ac07365db2ca0d52437ea84268db936669044fa2d97502bcd79b1f86a9cade70b426c788430267609b4e7e28abaa84092e918a2142484ee1b923e4c1e521404c SHA512 c2e0c151bd9b306fdf6a10fa3c760fdbec1be83e83c92f8f54e67d811be0a396b4ed86d6daebf99640374e6d811c3c00744e5fab681f947fa5b085d81f1c4423
+EBUILD cdcat-0.3-r1.ebuild 1239 BLAKE2B 8bb864e99030a4ae67a4dd12314e3b713aa585c51b377fb3ec084707f9620b66b97274d8b3a391433224c2e9dd82fb49c4042b1d18fc8899f3b75760195ab129 SHA512 9778292d93b1d62d98521317161e60b603074cd45acdff6633f5ad4d686ff4a6e288e098ebcf4aa731388fd5151f6e9992e6522f934b8e34f939a2f6d99e3348
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/cdcat/cdcat-0.3-r1.ebuild b/app-misc/cdcat/cdcat-0.3-r1.ebuild
index 8ad49a3e87e9..ae81f769f031 100644
--- a/app-misc/cdcat/cdcat-0.3-r1.ebuild
+++ b/app-misc/cdcat/cdcat-0.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
 
-RDEPEND="virtual/cdrtools
+RDEPEND="app-cdr/cdrtools
 	!app-backup/cdbkup"
 
 src_prepare() {
diff --git a/app-misc/datovka/Manifest b/app-misc/datovka/Manifest
index db35755cfc1f..6fd68cab7384 100644
--- a/app-misc/datovka/Manifest
+++ b/app-misc/datovka/Manifest
@@ -1,7 +1,3 @@
-AUX datovka-4.15.0-appdata-to-metainfo.patch 404 BLAKE2B 667cdb41220c9de92f1eb60affd48045c45494dc14c6c6ac1cbd79b56ee1e5e1174f99b4c7bfe7c261445272304ad9dc8efbaf885d26fd61e6d9e6191c74a16a SHA512 a70432722acb3e34295fbcb8e4657f4bfd3a372d329c20121fdce2b52ad487a31b10ac78a8bb97a0107af1355909d0daa67d4f9a6cdf2fb8395ce60073a620af
-AUX datovka-4.15.0-include-QPainterPath.patch 344 BLAKE2B c1de736f8936ebf8104d9977e5c7fd274c6c35ef56264ed94174e106d07efadd2c2dec0ad4a6718442158d6fced3da0ab48742b211001f95a46971df02a0e227 SHA512 2211aa5122d3dc15fb53fcee4b392ce527b9658dc6679d934c068ffc1a8eb67ae546e9e4bc8a937fdb712c9f34a5aeea70f6cb5e1df7d72976faa806d827a9c0
-DIST datovka-4.15.0.tar.xz 2816380 BLAKE2B 4e7d74bfc95286f9b6af3e84cd1439ca22b9aa83735cdde76827d49957bc210105ef82d6c1cb2c6ab861cd38ef852d043bf1fc30c22264aedb22f598c6c78ab0 SHA512 c379c61e091b92db0a061bff943f0f95e8627b2806641e001de090fafe8407b9a1167697b0b009217c0999c4ec2f61cb2bf3d3a8f5b234ed823ec6b88b6232fb
-DIST datovka-4.15.1.tar.xz 2821764 BLAKE2B ebc0eb75b239579224f77f1894d05fb617dc1556033ee1e82a27fb13b71284dcbe3b4dfff1711084869f7cc82837487f3676d9c3d681e91b0232cee0c77b7da0 SHA512 7f2286f6af5350be668a83098d65f49ead31473b0d2f3d4d336089bdd73cf6a6cec007112c0e10f08ecbb90e1a29c2ee12cd4773f41c677ebe1127366d06ca20
-EBUILD datovka-4.15.0.ebuild 1195 BLAKE2B bf3cf76bd71bd77191d480c723b89958202f076fac33b59c1de0e2dbe5d126c0737550d10db3420bff461df9291f6dbab733af88f41783e96d4a5e2c92c246b9 SHA512 3e94d0958c1c5988ef72cdb3e86a051a394d848e9cc333a876b3d2fd74917f393885b3fff3d809274160e1ee82c7b800757660dbacedcc99a6fa86fd7d0bdd1c
-EBUILD datovka-4.15.1.ebuild 1089 BLAKE2B 4c0bcf9c74adc67452e9f568a0ffd4b7a3f90db313fcb9fc33624a9b51a17b8303ddf6333d9854120c698342dfda60f3f5ec267381edcbb4e5325c3ba33d5bac SHA512 cccf1623c0127be3c5193693724bdbce09d8eafee481940c3dd40cca267ce45d8ab5a049bf314dba07752dc6ba1af23403f269df861147693aed10ef65789404
+DIST datovka-4.15.3.tar.xz 2827960 BLAKE2B 765b48f0608f3cbd947e5191778a0ae88e1fcb6679bc252160c8f5ed2b186f672fcfe2b55db67182d9a07676ebab01a272b70fced151e7f8ae027a632c6d9879 SHA512 e3791dae451ce7b42bd50cfdf0191430e3d1b5d8101a70e5c1466296b03d94e798dc080b663ff98bdf9dd80138f5d067ae5d493aeaf89285d66095b24ce15f1a
+EBUILD datovka-4.15.3.ebuild 1089 BLAKE2B 4c0bcf9c74adc67452e9f568a0ffd4b7a3f90db313fcb9fc33624a9b51a17b8303ddf6333d9854120c698342dfda60f3f5ec267381edcbb4e5325c3ba33d5bac SHA512 cccf1623c0127be3c5193693724bdbce09d8eafee481940c3dd40cca267ce45d8ab5a049bf314dba07752dc6ba1af23403f269df861147693aed10ef65789404
 MISC metadata.xml 445 BLAKE2B 52a23fa53d98a5f8a9890ee261fb8021f5125eb8981a9826f64747022668a26da1d74e7e5acc025d984324eb8c4996728cca0e856ff1435c4b35d6cf015e96a7 SHA512 682fca99a52a692346a2dc85281b1108c4c660afc70924e52e79be01fdd7122e76d0a9dbed4aa7816ff3020c4d4782d4bf9f79d880c46ab2bb02f99039f34a16
diff --git a/app-misc/datovka/datovka-4.15.0.ebuild b/app-misc/datovka/datovka-4.15.0.ebuild
deleted file mode 100644
index c1b58089938d..000000000000
--- a/app-misc/datovka/datovka-4.15.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qmake-utils xdg-utils
-
-DESCRIPTION="GUI to access the Czech data box e-government system"
-HOMEPAGE="https://www.datovka.cz/"
-SRC_URI="https://secure.nic.cz/files/datove_schranky/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# minimum Qt version required
-QT_PV="5.14.0:5"
-
-RDEPEND="
-	>=dev-libs/openssl-1.0.2:0=
-	>=dev-qt/qtcore-${QT_PV}
-	>=dev-qt/qtgui-${QT_PV}
-	>=dev-qt/qtnetwork-${QT_PV}
-	>=dev-qt/qtprintsupport-${QT_PV}
-	>=dev-qt/qtsql-${QT_PV}[sqlite]
-	>=dev-qt/qtsvg-${QT_PV}
-	>=dev-qt/qtwidgets-${QT_PV}
-	>=net-libs/libisds-0.11
-"
-DEPEND="
-	${RDEPEND}
-	>=dev-qt/linguist-tools-${QT_PV}
-	virtual/pkgconfig
-"
-PATCHES=( "${FILESDIR}/${P}-appdata-to-metainfo.patch"
-	  "${FILESDIR}/${P}-include-QPainterPath.patch" )
-DOCS=( ChangeLog README )
-
-src_configure() {
-	lrelease datovka.pro || die
-	eqmake5 PREFIX="/usr" DISABLE_VERSION_NOTIFICATION=1 TEXT_FILES_INST_DIR="/usr/share/${PN}/"
-}
-
-src_install() {
-	emake install INSTALL_ROOT="${D}"
-	einstalldocs
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/app-misc/datovka/datovka-4.15.1.ebuild b/app-misc/datovka/datovka-4.15.3.ebuild
index 89144ad68b57..89144ad68b57 100644
--- a/app-misc/datovka/datovka-4.15.1.ebuild
+++ b/app-misc/datovka/datovka-4.15.3.ebuild
diff --git a/app-misc/datovka/files/datovka-4.15.0-appdata-to-metainfo.patch b/app-misc/datovka/files/datovka-4.15.0-appdata-to-metainfo.patch
deleted file mode 100644
index c824777436e7..000000000000
--- a/app-misc/datovka/files/datovka-4.15.0-appdata-to-metainfo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/datovka.pro	2020-04-01 09:22:29.110403965 +0200
-+++ b/datovka.pro	2020-04-01 09:24:11.984441796 +0200
-@@ -72,7 +72,7 @@
- 	desktop.path = "$${DATADIR}/applications"
- 	desktop.files += deployment/datovka.desktop
- 
--	appdata.path = "$${DATADIR}/appdata"
-+	appdata.path = "$${DATADIR}/metainfo"
- 	appdata.files += deployment/datovka.appdata.xml
- 
- 	icon16.path = "$${DATADIR}/icons/hicolor/16x16/apps"
diff --git a/app-misc/datovka/files/datovka-4.15.0-include-QPainterPath.patch b/app-misc/datovka/files/datovka-4.15.0-include-QPainterPath.patch
deleted file mode 100644
index e381c40b5925..000000000000
--- a/app-misc/datovka/files/datovka-4.15.0-include-QPainterPath.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/delegates/tag_item.cpp	2020-03-04 11:05:08.000000000 +0100
-+++ b/src/delegates/tag_item.cpp	2020-06-08 14:52:06.000000000 +0200
-@@ -23,6 +23,7 @@
- 
- #include <algorithm> /* std::sort */
- #include <QPainter>
-+#include <QPainterPath>
- 
- #include "src/datovka_shared/localisation/localisation.h"
- #include "src/datovka_shared/log/log.h"
diff --git a/app-misc/golly/Manifest b/app-misc/golly/Manifest
index 19db43c46816..459e9c1aea05 100644
--- a/app-misc/golly/Manifest
+++ b/app-misc/golly/Manifest
@@ -1,10 +1,4 @@
-AUX golly-3.3-allow-py23-exec.patch 688 BLAKE2B d72ba8e9264f2b677818f46e94efac0b185cfb72fdac045b124a931ed8c727d644df8e76cc8d237bdb09a8adcc4a085a780c7f443a9c5c5df510efc3e3f028e2 SHA512 af7a7e132464594726d71d056105f88661e0e585f6833ea222977c5f659d3b02f4c12f2231e645955a3fea1de31cf9481cdf0949bc71adec12876550ee190393
-AUX golly-3.3-allow-py3.patch 3018 BLAKE2B ca05bc615f2bce230bb80bddcfca5d017181fba11c3117c438ec8cbff16fbd645a49b0f8f1cb3f52efb6a5c6548e2398b95167b738dfa3df36336ff43fc59d4f SHA512 409f765d7107b1f9d7df8389a57a06c7be37c050eed26f5724f24bed36fa5d93ff074d6ded991faf1c02341c726c4c8ceca268f89b64fef38f98c5c331a51f23
-AUX golly-3.3-glife-py23.patch 1087 BLAKE2B bc00e95ac7f07bae2c778f1faf93fee7e1ccd92947e12bb1fbc97c0a074c5a347c6ff084a47085c656a94bd2add2fe14c313aff39f60174c983670be006ad9b3 SHA512 814c8a9ac2e96bf4ff61bd46b86a5ef7cfd5a4ba027fd5af78029cfbfb2b8334c76bede82770912509b0c858a2e3ff3af8258aec6e8ee328710d805d527a2863
-AUX golly-3.3-nondynamic-python.patch 1830 BLAKE2B b202aebb3975f55de4748a925d3e4ef87e2033fa6dca7773327e5ca272872bdd817000a02a9bf5a6630eb1716ffa220844bfc324271d9b9a889a4f3cb25257e4 SHA512 5e12d9e6800cf4f3a495964d9320dae1a8a9ad4350d374c9ffa0ec61316d48d4d545d95e200a4b04a700fdb923a841214788da05d0d05bb8768018f83e5bf9a4
 AUX golly-4.0-CFLAGS.patch 686 BLAKE2B 1d82b951bee9f336931ad2589bae03bd8e52ac2f982294f18abd5297bc0d5cbd877ece2716736ce8dfcf044c823cb707d6ce8923177b3ab2bbf09a3d0e247b92 SHA512 b883702ed44bd8469255bbc43191bbf91da64ff0048d4cc3c7cc0c5103e01fe49f9017ad1723d041ab080dfa46b68f4bab0b9abd850b74b1803d5bcebb04c36a
-DIST golly-3.4-src.tar.gz 5480295 BLAKE2B 6bd0c71083d021adb660ed8fd333399865e5f486b6d95d2851aefd31fd2ad09a04419e6e3b2e0ff38b1d934ebb975525c07ca841210cc05f60f9ecf92362bc48 SHA512 bb2b1a653f9556901aa18d2d56c75c2c5e55bd7451b2b5bfb6268793758c12a6b00d30fa52c08ebd47e5db98fbec6fb80c64194cd93a1a41846adbd824c7af47
 DIST golly-4.0-src.tar.gz 5579026 BLAKE2B fc6c9d4db80e92635ac466250ca65c5cbe496c668f2fbd583226a2ecd686ac022aa4d47f453628284bceeb16554b91340b442216eab8412506243e30085a3a32 SHA512 3a39e170ceddfa4f8c261a81f7b45039e9cc2aef901915d83d3227231514bf66e254d307802cb0afddd7458722b8cbf2ce527cb9ee84a2710b52bf5bdb15484d
-EBUILD golly-3.4.ebuild 1364 BLAKE2B 4e3ec9e4fd7a5746b30dca2a01d4e3b77eb0728a56aaf7936c5ff58372461e13076bbff0755ad2e375b35f65e3d3f0abe68743a55c45da48970e33548e108cfb SHA512 88bede339f2178bcdf8f83c33813495d45e51a301abd8796c93da7a7b39a97a049079efeaddf13b61f84229efd6384ce9387b882f1bdf112153c3c67e56b34a0
-EBUILD golly-4.0.ebuild 1382 BLAKE2B a0f68d1b52f96b1720c5eb6c9b1c76b98d85b3a520d76d7ff7b8db9a3576fd4788c88517427675ae9910f640ac3c756021157dae4232ef72d473f3c60419c6d1 SHA512 ae21035d11f692ba999286e4ddfcef0211da37353211fe2992778e49ff12214ade434a354928f46d3c184e5e8f227e7284f72d58333541a1b2df1d12daa50ae0
+EBUILD golly-4.0.ebuild 1381 BLAKE2B 182a9f197db7e0634c1baf06eb38b1bc923ab6bd39b90f529badfd3c3072b3f8597df57eb6ae5273545875b58f88fa2e6695f668cfcc869ca7e45341344cefb2 SHA512 394c3b8217a3fcc4be09391ffb504289fbbda991f9c7682defdacdc4a4570d6516d5c106690b9643912b5fcfce7f61725f5d963f3ac60e49fda86b480835082f
 MISC metadata.xml 326 BLAKE2B 6064832ecd0867971a46cd3c998419df96a09aea31c361b98cc81212e1a84bb99053f14a86321b194196df7e74d1859d7c82c2f55adcf0dd887224754aed381e SHA512 be4d2ed3256cbb48987657dc4a6569c4fa415a495488f17bffe0954bd54127bfc4f6652912b18666a02887bfe31769d1b0c1a67c311e286abca347a9b756301f
diff --git a/app-misc/golly/files/golly-3.3-allow-py23-exec.patch b/app-misc/golly/files/golly-3.3-allow-py23-exec.patch
deleted file mode 100644
index e46b608ed6c5..000000000000
--- a/app-misc/golly/files/golly-3.3-allow-py23-exec.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-'execfile' is python-2-only. 'exec/open' works for both python2 and python3.
---- a/gui-wx/wxpython.cpp
-+++ b/gui-wx/wxpython.cpp
-@@ -3356,7 +3388,7 @@ void RunPythonScript(const wxString& filepath)
-     // for the global namespace so that this script cannot change the
-     // globals of a caller script (which is possible now that RunScript
-     // is re-entrant)
--    wxString command = wxT("execfile('") + fpath + wxT("',{})");
-+    wxString command = wxT("exec(open('") + fpath + wxT("').read(),{})");
-     PyRun_SimpleString(command.mb_str(wxConvLocal));
-     // don't use wxConvUTF8 in above line because caller has already converted
-     // filepath to decomposed UTF8 if on a Mac
diff --git a/app-misc/golly/files/golly-3.3-allow-py3.patch b/app-misc/golly/files/golly-3.3-allow-py3.patch
deleted file mode 100644
index 54a047830818..000000000000
--- a/app-misc/golly/files/golly-3.3-allow-py3.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-The patch allows python3 as a python implementation.
-Ports module loading to conditional python3 support.
---- a/gui-wx/configure/configure.ac
-+++ b/gui-wx/configure/configure.ac
-@@ -19,7 +19,7 @@ AC_ARG_WITH([python-shlib], [AS_HELP_STRING([--with-python-shlib=ARG],
- 	, [with_python_shlib=check])
- AC_ARG_VAR([GOLLYDIR], [golly data directory [default=DATADIR/golly]])
- AC_ARG_VAR([PERL], [Perl 5 interpreter])
--AC_ARG_VAR([PYTHON], [Python 2 interpreter])
-+AC_ARG_VAR([PYTHON], [Python interpreter])
- 
- # Check for build tools:
- m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
-@@ -76,7 +76,7 @@ AS_IF([test "x$enable_perl" = xyes], [
- ])
- 
- # Find Python
--AC_PATH_PROGS(PYTHON, [python2 python])
-+AC_CHECK_PROGS(PYTHON, [python python3 python2])
- AS_IF([test "x$PYTHON" = x], [AC_MSG_ERROR([missing Python])])
- AC_SUBST([PYTHON_INCLUDE], [-I"'`$PYTHON -c "import distutils.sysconfig; print(distutils.sysconfig.get_python_inc())"`'"])
- AS_IF([test "x$with_python_shlib" = xcheck],
---- a/gui-wx/wxpython.cpp
-+++ b/gui-wx/wxpython.cpp
-@@ -90,6 +90,12 @@
-     #include <Python.h>
- #endif
- 
-+#if PY_MAJOR_VERSION >= 3
-+    // python-3 got rid of int/log distinction
-+    #define PyInt_AsLong PyLong_AsLong
-+    #define PyInt_FromLong PyLong_FromLong
-+#endif
-+
- #ifdef USE_PYTHON_DYNAMIC
- 
- #ifndef __WXMAC__
-@@ -3268,6 +3274,22 @@ static PyMethodDef py_methods[] = {
-     { NULL, NULL, 0, NULL }
- };
- 
-+#if PY_MAJOR_VERSION >= 3
-+static PyModuleDef golly_module = {
-+    PyModuleDef_HEAD_INIT,
-+    "golly", /* name */
-+    NULL,    /* doc */
-+    -1,      /* size */
-+    py_methods, /* methoods */
-+};
-+
-+PyMODINIT_FUNC
-+PyInit_golly(void)
-+{
-+    return PyModule_Create(&golly_module);
-+}
-+#endif
-+
- // =============================================================================
- 
- bool pyinited = false;     // InitPython has been successfully called?
-@@ -3280,6 +3302,13 @@ bool InitPython()
-             if (!LoadPythonLib()) return false;
-         #endif
-         
-+        #if PY_MAJOR_VERSION >= 3
-+            // Autoload 'golly' builtin module at interpreter start.
-+            if (PyImport_AppendInittab("golly", PyInit_golly) == -1) {
-+                Warning(_("Error: could not extend in-built modules table\n"));
-+            }
-+        #endif
-+
-         // only initialize the Python interpreter once, mainly because multiple
-         // Py_Initialize/Py_Finalize calls cause leaks of about 12K each time!
-         Py_Initialize();
-@@ -3287,9 +3316,12 @@ bool InitPython()
-         #ifdef USE_PYTHON_DYNAMIC
-             GetPythonExceptions();
-         #endif
--        
--        // allow Python to call the above py_* routines
--        Py_InitModule((char*)"golly", py_methods);
-+
-+        // Python-3 uses module constructor
-+        #if PY_MAJOR_VERSION < 3
-+            // allow Python to call the above py_* routines
-+            Py_InitModule((char*)"golly", py_methods);
-+        #endif
-         
-         // catch Python messages sent to stderr and pass them to py_stderr
-         if (PyRun_SimpleString(
diff --git a/app-misc/golly/files/golly-3.3-glife-py23.patch b/app-misc/golly/files/golly-3.3-glife-py23.patch
deleted file mode 100644
index 8b1599712508..000000000000
--- a/app-misc/golly/files/golly-3.3-glife-py23.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Use python-3 compatible syntax.
---- a/Scripts/Python/glife/__init__.py
-+++ b/Scripts/Python/glife/__init__.py
-@@ -90,7 +90,7 @@ def rule(s = "B3/S23"):
- def description(s):
-     """Supply a textual description to the whole pattern."""
-     for line in s.split("\n"):
--        print "#D", line
-+        print("#D", line)
- 
- # --------------------------------------------------------------------
- 
-@@ -161,7 +161,7 @@ class pattern(list):
-   It is also the base for computing generations subsequent to N-th."""
-         if N < 0:
-             raise ValueError("backward evolving requested")
--        if self.__phases.has_key(N):
-+        if N in self.__phases:
-             return self.__phases[N]
-         M = 0
-         for k in self.__phases.keys():
---- a/Scripts/Python/glife/text.py
-+++ b/Scripts/Python/glife/text.py
-@@ -173,7 +173,7 @@ def make_text (string, font='Snakial'):
-         unknown = '-'
- 
-     for c in string:
--        if not f.has_key (c): c = unknown
-+        if not (c in f): c = unknown
-         symbol = f[c]
-         p += symbol (x, 0)
-         x += symbol.width
diff --git a/app-misc/golly/files/golly-3.3-nondynamic-python.patch b/app-misc/golly/files/golly-3.3-nondynamic-python.patch
deleted file mode 100644
index bc1c81a61917..000000000000
--- a/app-misc/golly/files/golly-3.3-nondynamic-python.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-Don't use runtime python loading via dlopen().
-
-Just link to libpython directly. That makes python dependency
-more explicit and allows catching more compile-time bugs.
---- a/gui-wx/configure/Makefile.am
-+++ b/gui-wx/configure/Makefile.am
-@@ -22,7 +22,7 @@ golly_CPPFLAGS = $(AM_CPPFLAGS) $(WX_CPPFLAGS) $(PYTHON_INCLUDE) \
- 	$(PERL_CPPFLAGS) $(PERL_INCLUDE) \
- 	$(liblua_a_CPPFLAGS) -I$(top_srcdir)/../../lua
- golly_CXXFLAGS = $(AM_CXXFLAGS) $(WX_CXXFLAGS_ONLY)
--golly_LDADD = $(WX_LIBS) libgolly.a liblua.a
-+golly_LDADD = $(WX_LIBS) $(PYTHON_LIBS) libgolly.a liblua.a
- 
- if WINDOWS
- golly_LDADD += gollyres.o
---- a/gui-wx/configure/configure.ac
-+++ b/gui-wx/configure/configure.ac
-@@ -86,6 +86,16 @@ AS_IF([test "x$with_python_shlib" = xcheck],
- AS_IF([test "x$shlib" = x], AC_MSG_ERROR([could not determine Python shared library name]))
- AC_DEFINE_UNQUOTED([PYTHON_SHLIB], [$shlib])
- 
-+# Find python interpreter
-+# 1. --embed is needed for python>=3.8
-+# 2. statuc check is needed because python-3.7-config outputs error to stdout, not stderr
-+if ${PYTHON}-config --libs --embed; then
-+    PYTHON_LIBS=`${PYTHON}-config --libs --embed`
-+elif ${PYTHON}-config --libs; then
-+    PYTHON_LIBS=`${PYTHON}-config --libs`
-+fi
-+AC_SUBST(PYTHON_LIBS)
-+
- # Find zlib (unless explicitly disabled)
- AS_IF([test "x$with_zlib" != xno],
- 	[	AC_CHECK_HEADER([zlib.h], , [AC_MSG_ERROR([missing zlib])])
---- a/gui-wx/wxpython.cpp
-+++ b/gui-wx/wxpython.cpp
-@@ -59,8 +59,12 @@
-     #undef SIZEOF_SIZE_T
-     #undef SIZEOF_VOID_P
- #else
--    // load Python lib at runtime
--    #define USE_PYTHON_DYNAMIC
-+    // On gentoo just link against python to make
-+    // python dependency more explicit.
-+    # if 0
-+      // load Python lib at runtime
-+      #define USE_PYTHON_DYNAMIC
-+    #endif
- 
-     #ifdef __UNIX__
-         // avoid warning on Linux
diff --git a/app-misc/golly/golly-3.4.ebuild b/app-misc/golly/golly-3.4.ebuild
deleted file mode 100644
index b1dcbb7f8201..000000000000
--- a/app-misc/golly/golly-3.4.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-WX_GTK_VER=3.0-gtk3
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit autotools desktop python-single-r1 wxwidgets xdg-utils
-
-DESCRIPTION="simulator for Conway's Game of Life and other cellular automata"
-HOMEPAGE="http://golly.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="virtual/opengl
-	sys-libs/zlib
-	x11-libs/wxGTK:${WX_GTK_VER}[X,opengl,tiff]
-	${PYTHON_DEPS}
-"
-
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${P}-src
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.3-nondynamic-python.patch
-	"${FILESDIR}"/${PN}-3.3-allow-py23-exec.patch
-	"${FILESDIR}"/${PN}-3.3-glife-py23.patch
-	"${FILESDIR}"/${PN}-3.3-allow-py3.patch
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	setup-wxwidgets
-}
-
-src_prepare() {
-	default
-
-	# patches change configure.ac and Makefile.am
-	pushd gui-wx/configure
-		eautoreconf
-	popd
-}
-
-src_configure() {
-	ECONF_SOURCE=gui-wx/configure econf \
-		--with-wxshared
-}
-
-src_install() {
-	emake docdir= DESTDIR="${D}" install
-	dodoc docs/ReadMe.html
-	newicon --size 32 gui-wx/icons/appicon.xpm ${PN}.xpm
-	make_desktop_entry ${PN} "Golly" ${PN} "Science"
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/app-misc/golly/golly-4.0.ebuild b/app-misc/golly/golly-4.0.ebuild
index c6e352c091fb..e62cf1408e20 100644
--- a/app-misc/golly/golly-4.0.ebuild
+++ b/app-misc/golly/golly-4.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/app-misc/khal/Manifest b/app-misc/khal/Manifest
index 6443076d903d..a02d5b38a027 100644
--- a/app-misc/khal/Manifest
+++ b/app-misc/khal/Manifest
@@ -1,3 +1,5 @@
 DIST khal-0.10.1.tar.gz 173636 BLAKE2B 97158bc78dfbda3a3555df3588c61f6a5e8b20d71921099a74ba997eb7ccef05ed931e930afbb09f9c125f3e0e782143dd2cdf4d0da6bd09952765b9117d6ac4 SHA512 5b81a60099c201fa112ab17740b73edb17b29efa1548086766d57d9d595451e7d779aad5a2ce7a2afc78050116782ff6696c4bd284021a5e12c87fe361d15e47
+DIST khal-0.10.2.tar.gz 182534 BLAKE2B 0c7c4ab1234ebe90ef9ad8291f2a0087a3f6a60d25f5426445eedadb25f236b3598dacc051e959a108ad472efc56628bf7ba11ed714c885d956f1a8f905029ca SHA512 e15449b73175190f02b6fe5774a8feef8a5390966da3836624c94a044d146cc6e8a73985d991042fbb617f736c6759ded387a65292529e71f5b2f34bc80a686e
 EBUILD khal-0.10.1-r1.ebuild 1278 BLAKE2B f88037dcccd4f5bf878687f42a96459b84d4c1e57b3b2e797542db99cafc14efa9c65d08bfad762a450b53d2338087138ed64dc440b1d155a0057d028b7e8dbc SHA512 6e6156925243a298f179b0bd3d9815d7c869fc837ba7c1e26cabb0e4911c8a469e32ece04338c2bf5366da98991ba650938477552492947e04739b74a7608d1b
+EBUILD khal-0.10.2.ebuild 1286 BLAKE2B 321c33092d322a11ba93cd0800ecc062a47d9ded1170e164ba779ce0337a326585938f5b1a1fb7f823e4ba91c316768fb5a863de3306276e5ab0b30bae5719c2 SHA512 ca02801fee34aa421636b14776d4330c57337bd3b86bf666105510c225f010179a7d057b19e1f92c789d9cc663a32d3880353c2be2f43910cb01bd1cbe517ae2
 MISC metadata.xml 284 BLAKE2B 4707a8b6986fae8507e28c42ab61a8cad2b420743fccb5cbfa1bd28b1b4cd507903a3dc59e82411309ae03cf94f10a393a24e94627a15c9698ad26ead19d3db6 SHA512 f820693ee6476d881b86783e810e6be3ad1df41f35dc1c30d03f44551ae71b1e5a99a1aa5f8543ffa15a0a5a1e420193c57d6ef4b88fa98257bf0d4f2fab5934
diff --git a/app-misc/khal/khal-0.10.2.ebuild b/app-misc/khal/khal-0.10.2.ebuild
new file mode 100644
index 000000000000..aab3b6993446
--- /dev/null
+++ b/app-misc/khal/khal-0.10.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1
+
+DESCRIPTION="A CalDAV based calendar"
+HOMEPAGE="http://lostpackets.de/khal/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+SLOT="0"
+IUSE="zsh-completion"
+
+RDEPEND=">=dev-python/click-3.2[${PYTHON_USEDEP}]
+	>=dev-python/click-log-0.2.0[${PYTHON_USEDEP}]
+	>=dev-python/icalendar-4.0.3[${PYTHON_USEDEP}]
+	>=dev-python/urwid-1.3.0[${PYTHON_USEDEP}]
+	dev-python/pyxdg[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/configobj[${PYTHON_USEDEP}]
+	>=dev-python/atomicwrites-0.1.7[${PYTHON_USEDEP}]
+	>=dev-python/tzlocal-1.0[${PYTHON_USEDEP}]
+	dev-python/setproctitle[${PYTHON_USEDEP}]
+	zsh-completion? ( app-shells/zsh )"
+DEPEND=">dev-python/setuptools_scm-1.12.0[${PYTHON_USEDEP}]
+	dev-python/vdirsyncer[${PYTHON_USEDEP}]
+	dev-python/freezegun[${PYTHON_USEDEP}]"
+
+DOCS=( AUTHORS.txt CHANGELOG.rst CONTRIBUTING.rst README.rst khal.conf.sample )
+
+src_install() {
+	distutils-r1_src_install
+	if use zsh-completion; then
+		insinto /usr/share/zsh/site-functions
+		doins misc/__khal
+	fi
+}
diff --git a/app-misc/klavaro/Manifest b/app-misc/klavaro/Manifest
index 55f865d1aa5a..1c7cd3bd9ca6 100644
--- a/app-misc/klavaro/Manifest
+++ b/app-misc/klavaro/Manifest
@@ -3,5 +3,5 @@ AUX klavaro-3.0.1-out-of-source.patch 334 BLAKE2B d511ce6bafcc56882e42871d3e04b8
 AUX klavaro-3.0.1-static.patch 295 BLAKE2B f2a95fd25aa8d931176788523ca7b00c5670a617ed540b6b6409b3a7f47c9f636d7224a62caac2f7760a9aae7ee16052c923485d12727f1286f4c1aed3fd2843 SHA512 9b7bbe2fe977df36afc7ebcb286b71e081c78ec1b72d611d78442250360fb8da2e8c424bcc327194268a39ab8ab1cce2a27be6a182bf7872284432e28a340863
 AUX klavaro-desktop-keywords.patch 488 BLAKE2B b6c34f6bd99f239a8815e58c0b574e70c02890d030c40a055afba0f27d84e180bf61441a5a06e2aad66d992a38edfbc4f97759b32efa7b93f8a3a2b15a188197 SHA512 34ee19f48c34ab5c79afc83eca15b24fe4ee85fee9105926cee9291815f2be0f9d991e740cacced1c27602c23121b03a630db3308f77aa7325c26fe07715f07b
 DIST klavaro-3.01.tar.bz2 1140146 BLAKE2B fcd26cc6dfabd7ae0147fc279361a890ab928e42e02837a3322eae51fc6e959b02896ce789fae6a10b2f600eeb026c45955571d5264a29950cc7183eeb22a4cf SHA512 5d58269867d2b39309e07ca9dd6c525d67acaca93dea0010332e39e8f3dd444070dbc75abad00ac4ca3fd4155f41cf871cb8ccee3dc332aa31f85c8b17d7c48b
-EBUILD klavaro-3.0.1.ebuild 859 BLAKE2B e3a4a983238b9e557f2e1d5f5f34c0b1b17683f4b7bd31e2a855f2719f3a4a501dbd640265e73fc0d8baf9c47fcdbf0e3d3c985757bf4a6eed94ec7220d78ef8 SHA512 05b3d4c7b737430bdb4c8b0aed2384a93b3bf7e52d51030b594b28b9cd28a918143c19577ef0130db9a2fd6d681e79d7f9e1b9ead7d8bbac4173cfc2607f411a
+EBUILD klavaro-3.0.1.ebuild 844 BLAKE2B 4154666ddb1c451a195fd1b75c8a6ad720a86fadd8c83f26f819d4b459ad63a15b818942fe407088750b14fccb9de6bf31f76ac9c4815aadd6e5ef547b885479 SHA512 3446ddccb68e4915947b809e4edf283dd19f08da7293872e052d39f7071bea1cb60e92b342aaf29c33fa002e4a2f70011adc7371eede1bb2aad0179981245864
 MISC metadata.xml 244 BLAKE2B d00878c0c5edc36629a30cd4005404290bd7eb773d5d715f189d89e05f019b84e0c25dd18c2b8a0010e9737d7c4da343d3fd79db1c196dd01c47bebe2ff30077 SHA512 cba7dce2e4ffc562ca054e00c09dc2d6ef32c8ba4928224c361374f4ae61164624a56ff7778328d624feb4a1de20be8c69f1bc4762f30babbfd67658a78694a4
diff --git a/app-misc/klavaro/klavaro-3.0.1.ebuild b/app-misc/klavaro/klavaro-3.0.1.ebuild
index 85aeeb7371d5..41246e2a5e58 100644
--- a/app-misc/klavaro/klavaro-3.0.1.ebuild
+++ b/app-misc/klavaro/klavaro-3.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/project/${PN}/${MY_P}.tar.bz2"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="+static-libs"
+IUSE=""
 
 RDEPEND="
 	net-misc/curl
diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index 236068216ad4..32ccc7fefb90 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -1,9 +1,6 @@
-AUX mc-4.8.24-mc-lib-twice-4070.patch 1962 BLAKE2B db6f627507fd94443ea0fe13ebd026cd71fbf23d88d6c441d379ae15d19e509a5874bf894e88c3a91e608b34bf39f83bbfc6e4c4f7db2c46bdac80f1d8d688ee SHA512 35765acf211b9519958505e36c3aa30f87575ab904dcd59c7d0feae0afbdaaf83250f73a6e14fc4e9902dc9f4e5b216ffb4c365e1000e767759592048f48c48d
 AUX mc-4.8.25-alacritty-tmux.patch 429 BLAKE2B 2621145cb976e0f9c09abf1071752a2a89a7b143aedde63c7b0c447cb930f1647b0b8c63a96f5f69b6f7abf718ca3b7784e0fa5b30a507f2a8d32fa3923c738f SHA512 32e27a75c55b9044cb2d4c392974e5e9916f1e73755f578102c7826f97525c0410bcc16a1e8b9600d4facc8be7a90fbef4932ef622fb59dc7c1838ad448e5f59
-DIST mc-4.8.24.tar.xz 2434988 BLAKE2B 18bd730d5bfbad19fa5e70fb578cf587a3df8da33885543b3d316548ac0d29bd67e4683d32b2751471e148e89390c7658edb622fd741eae054b7fae774996b60 SHA512 ec9e40198455e7001bb1d06ea060b9b4c32ad3a3750d0cc9bac334b53eb666df1746335bfcd411213fa4386b23e516f6026fe3d74ad9119b2340b26c63ccd4fc
 DIST mc-4.8.25.tar.xz 2488324 BLAKE2B 47047c85fbe3ce1c54b9a3477c35fb05d76b3688205bfd13db03844bb9d8b3e74498ef4d6b449cfcf79c0188687accd93602274b7e8c0cbffc5247d433e33272 SHA512 51913fd41df18b49498b97ad8e13aa4365cec24ab24169b1abe93209263e4cfea4b52e0faccaf934182c84e8eb5dc49336c885358b4b66c48d38900f890fde5e
-EBUILD mc-4.8.24.ebuild 2855 BLAKE2B 74fdf3aac3459a98b10520e036f3c752866b105c81c875245341960c28d77981cf6cdd3bfd7cc4b244689feb7008f9297f6028e394bfba60693f593c9021176e SHA512 457dd712e0ecc24c8a6d1ea180b49ff53b56ba8cbd27b74cf63041c47cf5671e6fa5b934ef37a3ad57fca74502c249100337a46b28d91956e755aae9405f3ea8
 EBUILD mc-4.8.25-r1.ebuild 2871 BLAKE2B 5d9fc7fcdf3d9d6c3a7f8d31799d82d471f9259098724bc0ab0298c4888faa121f852035e1b95c2a7bfcdaf1072e09b380fa99dce47d456ab5b0313553cec16f SHA512 77b2f606b468b292ee958159166436e067cb082a6a5302b5271fc034ca97ba2eb35365f900f47c51503c4fb642a9e502cba1d2b8f0c47447d843ed302e458c64
-EBUILD mc-4.8.25.ebuild 2802 BLAKE2B 604a07ddd8285551e0e0a4b283d891b6ddf6e778c51cba8868a5b976a91915b5403fafb362cc721c2573829d794d7da286f17089125d8e3c7b010464a8912af5 SHA512 236127c33c8d21c694dfb36bcc1ff9e526692eeef68ff20e281c4919a05af52c7bccd2600d8a67b8c20a296988cc6a4fdb4f94323cf9765507a9aa99c9111510
+EBUILD mc-4.8.25.ebuild 2801 BLAKE2B e7d9bf37ea23557b49bb7862175aae72ec932ef1f03e965db0cddd86c97507adb826ea49dfbb6ea12f102b5558abc39f8d729cb99c6d51a9779ac238094ba02f SHA512 7aa941058c2b8236123787e527c37311245122a61d2524a35c5905807fef45accc4227e2475adba5b2bc1e9a9e6010a84afa603a301f1ea5ca7b628f599adb79
 EBUILD mc-9999.ebuild 3050 BLAKE2B 101a2fa59995345bbca727af306f2dc367ebb30028137f52bcc618235914e80fc8c2c8411fa859092a1fd1d4014c1d20b675f25f4a2d744f11db304c14b95e1f SHA512 ad30cbbe132a4e3ab2477e03fd4a4eaa2a518d3b237b27b90a37178288278211ff90af7a6d111442990ea055586bd181641ef8147e4e56b83aed4ef3263c4dfd
 MISC metadata.xml 773 BLAKE2B c7f3bb9bfb49c380a0493eabadcedec215df8696c5d52433aaccdffa0bf5ba3b89c77c291e19ed88c5ac29718e34eece1d3dabbc3ba6c1ec7862970f3900e204 SHA512 c5c0ca5a41a78cf746e14264b291f81ccffaa9c34a4149d27a9293cca8d304cb4844c07979b31218b250c3baeaccef2cba529c2ab43e81dc5552dca34ddbd4da
diff --git a/app-misc/mc/files/mc-4.8.24-mc-lib-twice-4070.patch b/app-misc/mc/files/mc-4.8.24-mc-lib-twice-4070.patch
deleted file mode 100644
index 8db6fdfb2ea3..000000000000
--- a/app-misc/mc/files/mc-4.8.24-mc-lib-twice-4070.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-https://midnight-commander.org/ticket/4070
-
-From 30fd157a73f148dbc150c18b206b85e1a4a93e9c Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <slyfox@gentoo.org>
-Date: Tue, 3 Mar 2020 09:26:12 +0000
-Subject: [PATCH] misc/Makefile.am: install 'mc.lib' only once (#4070)
-
-Before the change `mc.lib` was installed twice due to being
-in two `_DATA` variables:
-
-```
-dist_pkgdata_DATA = \
-        mc.lib
-
-pkgdata_DATA = \
-        $(dist_pkgdata_DATA) \
-        $(PKGDATA_OUT)
-```
-
-This causes occasional install failures when two parallel
-`/usr/bin/install` calls race in installing the file:
-
-```
-$ make -j20 DESTDIR=/var/tmp/portage/app-misc/mc-4.8.24/image install
-...
- /usr/lib/portage/python3.6/ebuild-helpers/xattr/install \
-    -c -m 644 mc.lib '/var/tmp/portage/app-misc/mc-4.8.24/image/usr/share/mc'
- /usr/lib/portage/python3.6/ebuild-helpers/xattr/install \
-    -c -m 644 mc.lib mc.charsets '/var/tmp/portage/app-misc/mc-4.8.24/image/usr/share/mc'
-...
- /usr/bin/install: cannot create regular file
-   '/var/tmp/portage/app-misc/mc-4.8.24/image/usr/share/mc/mc.lib': File exists
-```
-
-After the change `mc.lib` is present only in `dist_pkgdata_DATA`.
-
-Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
----
- misc/Makefile.am | 2 --
- 1 file changed, 2 deletions(-)
-
---- a/misc/Makefile.am
-+++ b/misc/Makefile.am
-@@ -17,7 +17,7 @@ dist_pkgdata_DATA = \
- 	mc.lib
- 
- pkgdata_DATA = \
--	$(dist_pkgdata_DATA) \
-+	\
- 	$(PKGDATA_OUT)
- 
- SCRIPTS_IN = \
-@@ -54,7 +53,7 @@ EXTRA_DIST = \
- 	$(LIBFILES_SCRIPT) \
- 	$(SCRIPTS_IN) \
- 	$(noinst_DATA) \
--	$(dist_pkgdata_DATA) \
-+	\
- 	$(PKGDATA_IN)
- 
- install-data-hook:
---- a/misc/Makefile.in
-+++ b/misc/Makefile.in
-@@ -472,7 +473,7 @@ dist_pkgdata_DATA = \
- 	mc.lib
- 
- pkgdata_DATA = \
--	$(dist_pkgdata_DATA) \
-+	\
- 	$(PKGDATA_OUT)
- 
- SCRIPTS_IN = \
-@@ -508,7 +509,7 @@ EXTRA_DIST = \
- 	$(LIBFILES_SCRIPT) \
- 	$(SCRIPTS_IN) \
- 	$(noinst_DATA) \
--	$(dist_pkgdata_DATA) \
-+	\
- 	$(PKGDATA_IN)
- 
- all: all-recursive
--- 
-2.25.1
-
diff --git a/app-misc/mc/mc-4.8.24.ebuild b/app-misc/mc/mc-4.8.24.ebuild
deleted file mode 100644
index de7e49b86895..000000000000
--- a/app-misc/mc/mc-4.8.24.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic
-
-MY_P=${P/_/-}
-
-DESCRIPTION="GNU Midnight Commander is a text based file manager"
-HOMEPAGE="https://www.midnight-commander.org"
-SRC_URI="http://ftp.midnight-commander.org/${MY_P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
-IUSE="+edit gpm nls samba sftp +slang spell test unicode X +xdg"
-
-REQUIRED_USE="spell? ( edit )"
-
-RDEPEND=">=dev-libs/glib-2.26.0:2
-	gpm? ( sys-libs/gpm )
-	kernel_linux? ( sys-fs/e2fsprogs )
-	samba? ( net-fs/samba )
-	sftp? ( net-libs/libssh2 )
-	slang? ( >=sys-libs/slang-2 )
-	!slang? ( sys-libs/ncurses:0=[unicode?] )
-	spell? ( app-text/aspell )
-	X? ( x11-libs/libX11
-		x11-libs/libICE
-		x11-libs/libXau
-		x11-libs/libXdmcp
-		x11-libs/libSM )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	test? ( dev-libs/check )
-	"
-
-RESTRICT="!test? ( test )"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=("${FILESDIR}"/${P}-mc-lib-twice-4070.patch)
-
-pkg_pretend() {
-	if use slang && use unicode ; then
-		ewarn "\"unicode\" USE flag only takes effect when the \"slang\" USE flag is disabled."
-	fi
-}
-
-src_configure() {
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket"
-
-	local myeconfargs=(
-		--enable-charset
-		--enable-vfs
-		--with-homedir=$(usex xdg 'XDG' '.mc')
-		--with-screen=$(usex slang 'slang' "ncurses$(usex unicode 'w' '')")
-		$(use_enable kernel_linux vfs-undelfs)
-		# Today mclib does not expose any headers and is linked to
-		# single 'mc' binary. Thus there is no advantage of having
-		# a library. Let's avoid shared library altogether
-		# as it also conflicts with sci-libs/mc: bug #685938
-		--disable-mclib
-		$(use_enable nls)
-		$(use_enable samba vfs-smb)
-		$(use_enable sftp vfs-sftp)
-		$(use_enable spell aspell)
-		$(use_enable test tests)
-		$(use_with gpm gpm-mouse)
-		$(use_with X x)
-		$(use_with edit internal-edit)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	# CK_FORK=no to avoid using fork() in check library
-	# as mc mocks fork() itself: bug #644462.
-	#
-	# VERBOSE=1 to make test failures contain detailed
-	# information.
-	CK_FORK=no emake check VERBOSE=1
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS README NEWS
-
-	# fix bug #334383
-	if use kernel_linux && [[ ${EUID} == 0 ]] ; then
-		fowners root:tty /usr/libexec/mc/cons.saver
-		fperms g+s /usr/libexec/mc/cons.saver
-	fi
-
-	if ! use xdg ; then
-		sed 's@MC_XDG_OPEN="xdg-open"@MC_XDG_OPEN="/bin/false"@' \
-			-i "${ED}"/usr/libexec/mc/ext.d/*.sh || die
-	fi
-}
-
-pkg_postinst() {
-	elog "To enable exiting to latest working directory,"
-	elog "put this into your ~/.bashrc:"
-	elog ". ${EPREFIX}/usr/libexec/mc/mc.sh"
-}
diff --git a/app-misc/mc/mc-4.8.25.ebuild b/app-misc/mc/mc-4.8.25.ebuild
index 75d0a3f5c742..50564c23a106 100644
--- a/app-misc/mc/mc-4.8.25.ebuild
+++ b/app-misc/mc/mc-4.8.25.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://ftp.midnight-commander.org/${MY_P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
 IUSE="+edit gpm nls samba sftp +slang spell test unicode X +xdg"
 
 REQUIRED_USE="spell? ( edit )"
diff --git a/app-misc/piper/Manifest b/app-misc/piper/Manifest
new file mode 100644
index 000000000000..3be6ef79dcb1
--- /dev/null
+++ b/app-misc/piper/Manifest
@@ -0,0 +1,3 @@
+DIST piper-0.5.1.tar.gz 234944 BLAKE2B 1df33ca6e2d0dae95b34f8e3a98c6829a8f113ae68fb60980ff40374090b9272f86d69103c33fe0a4e1b0ac21a84724e7cabccca4ce8dd23d02f6d56e67d072b SHA512 13368521a9c32b2dc3300b129ed3bb07a6204623fa750f8f75ca31d2a3b60f43ae5f5066ef755814960d4890a489bdfd21b0e1b8f456b3445e0ba35ac06bc877
+EBUILD piper-0.5.1.ebuild 1110 BLAKE2B bd4c37b5e9416cc4e7c3c926220faa0e824f59e08e19203ac900e2c48a0d52b6341580a4fae9e98a37b5e504a5bf4e74b11f3bf94db20d7cee3591cc722a887d SHA512 9c00f3c2aaabcd3769ebfd71dede6dfb41e31a13cdd8f08597732f4ed1e433c6ea420d8a9ebb3dc6c55b56f3c53f85bcff7d45beb5ec7b66246c7be083463d8c
+MISC metadata.xml 630 BLAKE2B 21a1ff2104078c5a1e13ca8981d4c0db9e693c0a060fda89fc097c1d3fd4b5f6169cd026b6e62ee9aadd746b31c00469dc305e96eeeea9ab24b39e643d74c9b9 SHA512 01eb922d5a1b216d47da29d00febac07c89760898eb4e2ef24435879330a81255be63d139bebf5ea2a97fabe73dadd7049e11c3f09ec45ee5ea22267a628f939
diff --git a/app-misc/piper/metadata.xml b/app-misc/piper/metadata.xml
new file mode 100644
index 000000000000..293e65b38d2b
--- /dev/null
+++ b/app-misc/piper/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>alex@1stleg.com</email>
+    <name>Alex Barker</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>polynomial-c@gentoo.org</email>
+    <name>Lars Wendler</name>
+    <description>Proxy maintainer for Alex</description>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">libratbag/piper</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-misc/piper/piper-0.5.1.ebuild b/app-misc/piper/piper-0.5.1.ebuild
new file mode 100644
index 000000000000..33eae628b921
--- /dev/null
+++ b/app-misc/piper/piper-0.5.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit meson python-single-r1 udev
+
+DESCRIPTION="GTK configuration application for libratbag"
+HOMEPAGE="https://github.com/libratbag/piper"
+SRC_URI="https://github.com/libratbag/piper/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+"
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-libs/gobject-introspection
+	>=dev-libs/libratbag-0.13
+	gnome-base/librsvg[introspection]
+	x11-libs/gdk-pixbuf[introspection]
+	x11-libs/gtk+:3[introspection]
+	$(python_gen_cond_dep '
+		dev-python/lxml[${PYTHON_MULTI_USEDEP}]
+		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+		dev-python/python-evdev[${PYTHON_MULTI_USEDEP}]
+	')
+"
+DEPEND="
+	${RDEPEND}
+	dev-libs/libevdev
+	virtual/libudev
+"
+
+src_configure() {
+	python_setup
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	python_optimize
+	python_fix_shebang "${ED}"/usr/bin/
+}